[uzbl/f14/master] Update to -0.18.
Daiki Ueno
ueno at fedoraproject.org
Mon Sep 6 01:13:41 UTC 2010
commit b461561a0747385558a6dbceaf87afa2fde1bdef
Author: Daiki Ueno <ueno at unixuser.org>
Date: Mon Sep 6 10:15:38 2010 +0900
Update to -0.18.
.gitignore | 1 +
...-crash-on-Open-Image-in-New-Window-FS-231.patch | 42 ++++++++++++++++++++
uzbl.spec | 7 +++-
3 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cfe8052..ed164c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
uzbl-afc0f873e.tar.gz
+/uzbl-afc0f873e.tar.gz
diff --git a/0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch b/0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch
new file mode 100644
index 0000000..5a667da
--- /dev/null
+++ b/0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch
@@ -0,0 +1,42 @@
+From c202a6b79eb3658c12ba2077cb175a2fe5ae30a1 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at unixuser.org>
+Date: Thu, 2 Sep 2010 12:35:41 +0900
+Subject: [PATCH] Fix crash on "Open Image in New Window" (FS#231).
+
+- create_web_view_js2_cb(): don't destroy web_view if uri is not a
+ "javascript:" URI.
+- create_web_view_js_cb(): fix g_object_connect() call which must terminate
+ with a NULL signal name.
+---
+ src/callbacks.c | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/callbacks.c b/src/callbacks.c
+index d2352b2..37f392a 100644
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -703,11 +703,10 @@ create_web_view_js2_cb (WebKitWebView* web_view, GParamSpec param_spec) {
+
+ if (strncmp(uri, "javascript:", strlen("javascript:")) == 0) {
+ eval_js(uzbl.gui.web_view, (gchar*) uri + strlen("javascript:"), NULL, "javascript:");
++ gtk_widget_destroy(GTK_WIDGET(web_view));
+ }
+ else
+ send_event(NEW_WINDOW, uri, NULL);
+-
+- gtk_widget_destroy(GTK_WIDGET(web_view));
+ }
+
+
+@@ -717,7 +716,7 @@ create_web_view_js_cb (WebKitWebView* web_view, gpointer user_data) {
+ (void) user_data;
+
+ g_object_connect (web_view, "signal::notify::uri",
+- G_CALLBACK(create_web_view_js2_cb), NULL);
++ G_CALLBACK(create_web_view_js2_cb), NULL, NULL);
+ return TRUE;
+ }
+
+--
+1.7.2.2
+
diff --git a/uzbl.spec b/uzbl.spec
index 54033f0..bd61054 100644
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -4,7 +4,7 @@ Name: uzbl
Summary: Lightweight WebKit browser following the UNIX philosophy
Group: Applications/Internet
Version: 0
-Release: 0.17.20100626git%{uzblcommit}%{?dist}
+Release: 0.18.20100626git%{uzblcommit}%{?dist}
License: GPLv3
URL: http://www.uzbl.org
# The source for this package was pulled from upstream's vcs. Use the
@@ -19,6 +19,7 @@ Source1: %{name}.desktop
Patch0: %{name}-makefile.patch
# Security bug (RHBZ#621965)
Patch1: 0001-Don-t-shell-interpret-SELECTED_URI-fixes-FS-240.patch
+Patch2: 0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: webkitgtk-devel
@@ -81,6 +82,7 @@ multiple uzbl-browser instances without getting lost.
%setup -q -n %{name}-%{uzblcommit}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
mkdir -p icons/hicolor/32x32/apps
mv examples/data/uzbl.png icons/hicolor/32x32/apps
@@ -141,6 +143,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/uzbl-tabbed
%changelog
+* Mon Sep 6 2010 Daiki Ueno <dueno at redhat.com> - 0-0.18.20100626gitafc0f873e
+- add patch to avoid crash on "Open Image in New Window" (#584733)
+
* Fri Aug 20 2010 Ben Boeckel <mathstuf at gmail.com> - 0-0.17.20100626gitafc0f873e
- Add Requires: on xclip
More information about the scm-commits
mailing list