Update to -0.18.

Conflicts:
	uzbl.spec

.gitignore

@@ -0,0 +1,2 @@
+uzbl-afc0f873e.tar.gz
+/uzbl-afc0f873e.tar.gz

0001-Don-t-shell-interpret-SELECTED_URI-fixes-FS-240.patch

@@ -0,0 +1,25 @@
+From 8fbe72f35afa9953c7b150c636fa26f182a9fce7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pawe=C5=82=20Zuzelski?= <pawelz@pld-linux.org>
+Date: Tue, 3 Aug 2010 09:25:10 +0200
+Subject: [PATCH] Don't shell-interpret \@SELECTED_URI (fixes FS#240)
+
+---
+ examples/config/config |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/examples/config/config b/examples/config/config
+index 3fe911c..b6d9fe3 100644
+--- a/examples/config/config
++++ b/examples/config/config
+@@ -173,7 +173,7 @@ set ebind     = @mode_bind global,-insert
+ # --- Mouse bindings ---------------------------------------------------------
+ 
+ # Middle click open in new window
+-@bind  <Button2>  = sh 'if [ "\@SELECTED_URI" ]; then uzbl-browser -u "\@SELECTED_URI"; else echo "uri $(xclip -o | sed s/\\\@/%40/g)" > $4; fi'
++@bind  <Button2>  = sh 'if [ "$8" ]; then uzbl-browser -u "$8"; else echo "uri $(xclip -o | sed s/\\\@/%40/g)" > $4; fi' \@SELECTED_URI
+ 
+ # --- Keyboard bindings ------------------------------------------------------
+ 
+-- 
+1.7.2
+

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@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
+

dead.package

@@ -1 +0,0 @@
-requires webkit1 which has been retired

sources

@@ -0,0 +1 @@
+34e114e3a1954ba7497fa94d12996870  uzbl-afc0f873e.tar.gz

uzbl-makefile.patch

@@ -0,0 +1,38 @@
+diff -urN uzbl-ae15d257a.orig/Makefile uzbl-ae15d257a/Makefile
+--- uzbl-ae15d257a.orig/Makefile	2010-04-04 04:42:03.000000000 +0900
++++ uzbl-ae15d257a/Makefile	2010-04-23 11:16:11.222727272 +0900
+@@ -1,9 +1,9 @@
+ # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
+ 
+-CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
++CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -O0
+ CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
+ 
+-LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
++LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0 x11) -pthread $(LDFLAGS)
+ LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
+ 
+ SRC = $(wildcard src/*.c)
+@@ -89,13 +89,9 @@
+ 
+ install-uzbl-core: all
+ 	install -d $(INSTALLDIR)/share/uzbl/
+-	install -d $(DOCDIR)
+-	install -m644 docs/* $(DOCDIR)/
+-	install -m644 src/config.h $(DOCDIR)/
+-	install -m644 README $(DOCDIR)/
+-	install -m644 AUTHORS $(DOCDIR)/
+ 	cp -r examples $(INSTALLDIR)/share/uzbl/
+ 	chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*
++	chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js
+ 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
+ 	install -D -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
+ 
+@@ -105,6 +101,7 @@
+ 	install -D -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
+ 	sed -i 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser
+ 	sed -i "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager
++	cp -r icons $(INSTALLDIR)/share
+ 
+ install-uzbl-tabbed:
+ 	install -D -m755 examples/data/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed

uzbl.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Uzbl
+GenericName=Uzbl Web Browser
+Comment=Browse the Web
+Exec=uzbl-browser
+Icon=uzbl
+Terminal=false
+Type=Application
+Categories=Network;WebBrowser;

uzbl.spec

@@ -0,0 +1,212 @@
+%global		uzblcommit	afc0f873e
+
+Name:		uzbl
+Summary:	Lightweight WebKit browser following the UNIX philosophy
+Group:		Applications/Internet
+Version:	0
+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
+# following commands to generate the tarball:
+#  git clone git://github.com/Dieterbe/uzbl.git
+#  cd uzbl
+#  export uzblcommit=afc0f873e
+#  git archive --format tar --prefix uzbl-${uzblcommit}/ ${uzblcommit} |\
+#      gzip -c > ../uzbl-${uzblcommit}.tar.gz
+Source0:	%{name}-%{uzblcommit}.tar.gz
+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
+BuildRequires:	desktop-file-utils
+
+# New users probably want a tabbed browser
+Requires:	uzbl-tabbed = %{version}-%{release}
+
+# XXX: Be aware that script dependencies need enumerated here
+# Dialog for bookmarks
+Requires:	zenity
+# Communication
+Requires:	socat
+# scripts/formfiller.sh (dmenu also used by loading history/bookmarks)
+Requires:	dmenu
+Requires:	xterm
+# scripts/auth.py
+Requires:	pygtk2
+# scripts/download.sh
+Requires:	wget
+# Default config
+Requires:	xclip
+
+%description
+Uzbl is a lightweight web browser based on WebKit/Gtk+.  Uzbl follows
+the UNIX philosophy - "Write programs that do one thing and do it
+well. Write programs to work together. Write programs to handle text
+streams, because that is a universal interface."
+
+%package core
+Summary:	Core component of Uzbl
+Group:		Applications/Internet
+
+%description core
+The core component to Uzbl. This part does little on its own. For a more
+complete browsing experience, see the uzbl package.
+
+%package browser
+Summary:	A complete browser using Uzbl
+Group:		Applications/Internet
+Requires:	%{name}-core = %{version}-%{release}
+
+%description browser
+A complete browsing experience based on Uzbl's core component.
+
+%package tabbed
+Summary:	Tabbed interface to Uzbl
+Group:		Applications/Internet
+Requires:	%{name}-browser = %{version}-%{release}
+Requires:	pygtk2
+
+%description tabbed
+Uzbl-tabbed wraps around uzbl-browser and multiplexes it. It spawns
+one window containing multiple tabs, each tab containing a full
+embedded uzbl-browser Ideal as a quick and simple solution to manage
+multiple uzbl-browser instances without getting lost.
+
+
+%prep
+%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
+
+
+%build
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+
+cp -pr icons %{buildroot}%{_datadir}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
+%{SOURCE1}
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files
+%defattr(-, root, root, -)
+%{_datadir}/icons/*/*/apps/%{name}.*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/examples/config/
+%{_datadir}/%{name}/examples/data/
+
+%files core
+%defattr(-, root, root, -)
+%doc AUTHORS LICENSE README docs/* src/config.h
+%{_bindir}/uzbl-core
+
+%files browser
+%defattr(-, root, root, -)
+%{_bindir}/uzbl-browser
+%{_bindir}/uzbl-cookie-daemon
+%{_bindir}/uzbl-event-manager
+
+%files tabbed
+%defattr(-, root, root, -)
+%{_bindir}/uzbl-tabbed
+
+%changelog
+* Mon Sep  6 2010 Daiki Ueno <dueno@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@gmail.com> - 0-0.17.20100626gitafc0f873e
+- Add Requires: on xclip
+
+* Fri Aug 06 2010 Ben Boeckel <mathstuf@gmail.com> - 0-0.16.20100626gitafc0f873e
+- Add patch for shell escaping bug (BZ#621965)
+
+* Sat Jul 03 2010 Ben Boeckel <mathstuf@gmail.com> - 0-0.15.20100626gitafc0f873e
+- Rebuild against webkitgtk
+
+* Wed Jun 30 2010 Daiki Ueno <dueno@redhat.com> - 0-0.14.20100626gitafc0f873e
+- new upstream snapshot.
+
+* Mon May 31 2010 Daiki Ueno <dueno@redhat.com> - 0-0.13.20100410gitec473e124
+- new upstream snapshot.
+
+* Wed Apr 14 2010 Ben Boeckel <MathStuf@gmail.com> - 0-0.12.20100405gitae15d257a
+- Split out core and browser subpackages
+- Enumerate dependencies of the default scripts
+- Minor reorganization
+
+* Thu Apr  8 2010 Daiki Ueno <dueno@redhat.com> - 0-0.11.20100405gitae15d257a
+- don't strip uzbl-core with the install command (closes #580250).
+
+* Mon Apr  5 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.10.20100405gitae15d257a
+- split out uzbl-tabbed as a seperate package to avoid dependency on
+  pygtk2 (partially merged a patch from Ben Boeckel <mathstuf@gmail.com>).
+- new upstream snapshot.
+
+* Fri Mar 26 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.9.20100221gitabbffe5c3
+- add dist number to Release.
+
+* Fri Mar 19 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.8.20100221gitabbffe5c3
+- use the macro "global" instead of "define".
+
+* Thu Mar 18 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.7.20100221gitabbffe5c3
+- copy files under /usr/share/uzbl/ only once.
+
+* Tue Mar 16 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.6.20100221gitabbffe5c3
+- preserve timestamp of installed files.
+- include scriptlets for icon cache.
+- claim ownership of the directory "uzbl" under datadir.
+
+* Sat Mar 13 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.5.20100221gitabbffe5c3
+- install 32x32 icon under the standard icon path.
+- fix the executable name in uzbl.desktop.
+- prevent re-compilation on "make install".
+- install examples/* under /usr/share/uzbl/examples, since the path is
+  hard-coded in bundled scripts.
+
+* Mon Mar  8 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.4.20100221gitabbffe5c3
+- make sure support scripts are not executable.
+
+* Sun Mar  7 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.3.20100221gitabbffe5c3
+- use LDFLAGS from x11.pc to follow the F-13 DSO linking change.
+
+* Sun Mar  7 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.2.20100221gitabbffe5c3
+- don't use Epoch.
+- make the build log more verbose.
+- don't use the makeinstall macro and use _prefix macro.
+- include uzbl.desktop.
+- install all document files under /usr/share/doc/uzbl-0.
+
+* Sun Feb 21 2010 Daiki Ueno <ueno@unixuser.org> - 1:0-0.1.20100221gitabbffe5c3
+- initial packaging for fedora.