From f92faa61094e7fb2e30d05d14f6cddf17f0907a6 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 6 Sep 2010 09:56:22 +0900 Subject: [PATCH 01/50] Update to -0.18. --- .gitignore | 1 + ...h-on-Open-Image-in-New-Window-FS-231.patch | 42 +++++++++++++++++++ uzbl.spec | 7 +++- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch 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 +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 - 0-0.18.20100626gitafc0f873e +- add patch to avoid crash on "Open Image in New Window" (#584733) + * Fri Aug 20 2010 Ben Boeckel - 0-0.17.20100626gitafc0f873e - Add Requires: on xclip From 381154769ea92bd1bb38afacd1c9c96d9516f5d5 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 10 Oct 2010 15:44:28 -0400 Subject: [PATCH 02/50] Use %{optflags} instead of -O0 --- uzbl-makefile.patch | 2 +- uzbl.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uzbl-makefile.patch b/uzbl-makefile.patch index 2f313d6..a8e1f9e 100644 --- a/uzbl-makefile.patch +++ b/uzbl-makefile.patch @@ -5,7 +5,7 @@ diff -urN uzbl-ae15d257a.orig/Makefile uzbl-ae15d257a/Makefile # 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:=-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!=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) diff --git a/uzbl.spec b/uzbl.spec index bd61054..cee9023 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -89,7 +89,7 @@ mv examples/data/uzbl.png icons/hicolor/32x32/apps %build -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="%{optflags}" %install From 62a6ce9e9b7780d2bab14a0f31055cc074fdaa5f Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 10 Oct 2010 15:45:20 -0400 Subject: [PATCH 03/50] Ship vim highlighting files --- uzbl.spec | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/uzbl.spec b/uzbl.spec index cee9023..5cdcd30 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -1,4 +1,5 @@ %global uzblcommit afc0f873e +%global vim_version 72 Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy @@ -77,6 +78,14 @@ 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. +%package vim +Summary: Vim highlighting for uzbl's config +Group: Applications/Text +Requires: vim-enhanced + +%description vim +Highlighting files for uzbl's configuration. + %prep %setup -q -n %{name}-%{uzblcommit} @@ -100,6 +109,13 @@ cp -pr icons %{buildroot}%{_datadir} desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE1} +mkdir -p %{buildroot}%{_datadir}/vim/vim%{vim_version}/ftdetect/ +install -p extras/vim/ftdetect/uzbl.vim %{buildroot}%{_datadir}/vim/vim%{vim_version}/ftdetect/uzbl.vim +mkdir -p %{buildroot}%{_datadir}/vim/vim%{vim_version}/ftplugin/ +install -p extras/vim/ftplugin/uzbl.vim %{buildroot}%{_datadir}/vim/vim%{vim_version}/ftplugin/uzbl.vim +mkdir -p %{buildroot}%{_datadir}/vim/vim%{vim_version}/syntax/ +install -p extras/vim/syntax/uzbl.vim %{buildroot}%{_datadir}/vim/vim%{vim_version}/syntax/uzbl.vim + %clean rm -rf %{buildroot} @@ -142,6 +158,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-, root, root, -) %{_bindir}/uzbl-tabbed +%files vim +%defattr(-, root, root, -) +%{_datadir}/vim/vim%{vim_version}/ftdetect/uzbl.vim +%{_datadir}/vim/vim%{vim_version}/ftplugin/uzbl.vim +%{_datadir}/vim/vim%{vim_version}/syntax/uzbl.vim + + %changelog * Mon Sep 6 2010 Daiki Ueno - 0-0.18.20100626gitafc0f873e - add patch to avoid crash on "Open Image in New Window" (#584733) From 9825df88f08155fca732d92966debf6e5c6ba041 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 10 Oct 2010 15:46:12 -0400 Subject: [PATCH 04/50] Split out -defaults package --- uzbl.spec | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/uzbl.spec b/uzbl.spec index 5cdcd30..3373018 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -28,21 +28,7 @@ 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 +Requires: uzbl-defaults = %{version}-%{release} %description Uzbl is a lightweight web browser based on WebKit/Gtk+. Uzbl follows @@ -78,6 +64,29 @@ 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. +%package defaults +Summary: Default configuration for uzbl +Group: Applications/Internet +Requires: %{name}-browser = %{version}-%{release} + +# XXX: Be aware that script dependencies need enumerated here +# Dialog for bookmarks and authentication +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 defaults +Default configuration for uzbl. + %package vim Summary: Vim highlighting for uzbl's config Group: Applications/Text @@ -138,10 +147,6 @@ 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, -) @@ -158,6 +163,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-, root, root, -) %{_bindir}/uzbl-tabbed +%files defaults +%defattr(-, root, root, -) +%{_datadir}/icons/*/*/apps/%{name}.* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/%{name}/examples/config/ +%{_datadir}/%{name}/examples/data/ + %files vim %defattr(-, root, root, -) %{_datadir}/vim/vim%{vim_version}/ftdetect/uzbl.vim From 8603c3ae4cf822b445e0eacc50cb151134f08d93 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 10 Oct 2010 15:48:13 -0400 Subject: [PATCH 05/50] Add a message for new users without uzbl-defaults --- ...e-global-configuration-as-a-fallback.patch | 43 +++++++++++++++++++ ...pecific-error-messages-on-no-configs.patch | 37 ++++++++++++++++ uzbl.spec | 4 ++ 3 files changed, 84 insertions(+) create mode 100644 0001-Use-the-global-configuration-as-a-fallback.patch create mode 100644 0002-Fedora-specific-error-messages-on-no-configs.patch diff --git a/0001-Use-the-global-configuration-as-a-fallback.patch b/0001-Use-the-global-configuration-as-a-fallback.patch new file mode 100644 index 0000000..0e5c100 --- /dev/null +++ b/0001-Use-the-global-configuration-as-a-fallback.patch @@ -0,0 +1,43 @@ +From ee3e5ccc576041baeacf9ee3082d453e2fe74fb6 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Sat, 2 Oct 2010 16:19:18 -0400 +Subject: [PATCH] Use the global configuration as a fallback + +First check if there isn't a global config. If there isn't *then* we can +fail. If there is and the copy fails, at least run with the global +configuration. +--- + src/uzbl-browser | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/uzbl-browser b/src/uzbl-browser +index de4f7af..fabefc4 100755 +--- a/src/uzbl-browser ++++ b/src/uzbl-browser +@@ -40,10 +40,16 @@ done + # if no config exists yet in the recommended location, put the default (recommended) config there + if [ ! -f $XDG_CONFIG_HOME/uzbl/config ] + then ++ if [ ! -r $PREFIX/share/uzbl/examples/config/config ] ++ then ++ echo "Error: Global config not found; please check if your distribution ships them separately" ++ exit 3 ++ fi + if ! cp $PREFIX/share/uzbl/examples/config/config $XDG_CONFIG_HOME/uzbl/config + then + echo "Could not copy default config to $XDG_CONFIG_HOME/uzbl/config" >&2 +- exit 3 ++ # Run with the global configs as a last resort ++ config="--config $PREFIX/share/uzbl/examples/config/config" + fi + fi + +@@ -63,4 +69,4 @@ DAEMON_PID=${DAEMON_SOCKET}.pid + uzbl-event-manager -va start + #fi + +-exec uzbl-core "$@" --connect-socket $DAEMON_SOCKET ++exec uzbl-core "$@" $config --connect-socket $DAEMON_SOCKET +-- +1.7.3.1 + diff --git a/0002-Fedora-specific-error-messages-on-no-configs.patch b/0002-Fedora-specific-error-messages-on-no-configs.patch new file mode 100644 index 0000000..e18e57e --- /dev/null +++ b/0002-Fedora-specific-error-messages-on-no-configs.patch @@ -0,0 +1,37 @@ +From 92bc0e4d7f8d3d81d75de4513a51253ac3a29cf0 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Sat, 2 Oct 2010 16:57:33 -0400 +Subject: [PATCH 2/2] Fedora-specific error messages on no configs + +--- + src/uzbl-browser | 14 +++++++++++++- + 1 files changed, 13 insertions(+), 1 deletions(-) + +diff --git a/src/uzbl-browser b/src/uzbl-browser +index fabefc4..a299620 100755 +--- a/src/uzbl-browser ++++ b/src/uzbl-browser +@@ -42,7 +42,19 @@ if [ ! -f $XDG_CONFIG_HOME/uzbl/config ] + then + if [ ! -r $PREFIX/share/uzbl/examples/config/config ] + then +- echo "Error: Global config not found; please check if your distribution ships them separately" ++ text="Global config not found; please install the uzbl-defaults package" ++ if [ -x zenity ] ++ then ++ zenity --error --text="$text" ++ elif [ -x kdialog ] ++ then ++ kdialog --error "$text" ++ elif [ -x Xdialog ] ++ then ++ Xdialog --msgbox "Error: $text" ++ else ++ echo "Error: $text" ++ fi + exit 3 + fi + if ! cp $PREFIX/share/uzbl/examples/config/config $XDG_CONFIG_HOME/uzbl/config +-- +1.7.3.1 + diff --git a/uzbl.spec b/uzbl.spec index 3373018..1b22cfa 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -21,6 +21,8 @@ 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 +Patch3: 0001-Use-the-global-configuration-as-a-fallback.patch +Patch4: 0002-Fedora-specific-error-messages-on-no-configs.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: webkitgtk-devel @@ -101,6 +103,8 @@ Highlighting files for uzbl's configuration. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 mkdir -p icons/hicolor/32x32/apps mv examples/data/uzbl.png icons/hicolor/32x32/apps From d1abc0702cc2f4e7acd129bbf9110100066d0ec4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 10 Oct 2010 15:48:55 -0400 Subject: [PATCH 06/50] Bump release --- uzbl.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index 1b22cfa..621b6df 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -5,7 +5,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.18.20100626git%{uzblcommit}%{?dist} +Release: 0.19.20100626git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -182,6 +182,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Oct 10 2010 Ben Boeckel - 0-0.19.20100626gitafc0f873e +- Split out -defaults package +- Install vim files +- Remove -O0 compile flag +- Use %{optflags} + * Mon Sep 6 2010 Daiki Ueno - 0-0.18.20100626gitafc0f873e - add patch to avoid crash on "Open Image in New Window" (#584733) From 2e5f099678a08fc48b68777c6f255084aed77c6b Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 10 Oct 2010 16:09:01 -0400 Subject: [PATCH 07/50] Link glib-2.0 as well --- uzbl-makefile.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uzbl-makefile.patch b/uzbl-makefile.patch index a8e1f9e..759597c 100644 --- a/uzbl-makefile.patch +++ b/uzbl-makefile.patch @@ -5,7 +5,7 @@ diff -urN uzbl-ae15d257a.orig/Makefile uzbl-ae15d257a/Makefile # 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 ++CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0 glib-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic 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) From b76bd8d842b494866cab68910964751925bb5b4d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 10 Oct 2010 16:11:47 -0400 Subject: [PATCH 08/50] Missing BR on pkg-config --- uzbl.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/uzbl.spec b/uzbl.spec index 621b6df..b476116 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -27,6 +27,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: webkitgtk-devel BuildRequires: desktop-file-utils +BuildRequires: pkg-config # New users probably want a tabbed browser Requires: uzbl-tabbed = %{version}-%{release} From f36ae116fac895ffac876072e1714fceed044d1b Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 10 Oct 2010 16:15:14 -0400 Subject: [PATCH 09/50] Fix CFLAGS exporting --- uzbl.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/uzbl.spec b/uzbl.spec index b476116..e40b45f 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -23,11 +23,13 @@ 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 Patch3: 0001-Use-the-global-configuration-as-a-fallback.patch Patch4: 0002-Fedora-specific-error-messages-on-no-configs.patch +Patch5: 0001-Added-EXPOSE-signal.-It-may-be-used-to-resurect-scro.patch +Patch6: 0002-Add-scroll-percentage-back-into-uzbl.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: webkitgtk-devel BuildRequires: desktop-file-utils -BuildRequires: pkg-config +BuildRequires: pkgconfig # New users probably want a tabbed browser Requires: uzbl-tabbed = %{version}-%{release} @@ -112,7 +114,9 @@ mv examples/data/uzbl.png icons/hicolor/32x32/apps %build -make %{?_smp_mflags} CFLAGS="%{optflags}" +CFLAGS="%{optflags}" +export CFLAGS +make %{?_smp_mflags} %install From 97e75c9c5fcae555b704cf6cc5de05309729c7d0 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 10 Oct 2010 16:19:02 -0400 Subject: [PATCH 10/50] Remove references to local patches --- uzbl.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/uzbl.spec b/uzbl.spec index e40b45f..da69bad 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -23,8 +23,6 @@ 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 Patch3: 0001-Use-the-global-configuration-as-a-fallback.patch Patch4: 0002-Fedora-specific-error-messages-on-no-configs.patch -Patch5: 0001-Added-EXPOSE-signal.-It-may-be-used-to-resurect-scro.patch -Patch6: 0002-Add-scroll-percentage-back-into-uzbl.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: webkitgtk-devel From d8cbcfe2f9905efed1ff94950bb57c7ae6933f17 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 29 Nov 2010 15:17:36 +0900 Subject: [PATCH 11/50] Update to 0-0.20.20101125git518004933. --- .gitignore | 1 + ...-interpret-SELECTED_URI-fixes-FS-240.patch | 25 ----------- ...pecific-error-messages-on-no-configs.patch | 14 +++--- ...h-on-Open-Image-in-New-Window-FS-231.patch | 42 ------------------ ...e-global-configuration-as-a-fallback.patch | 43 ------------------- sources | 2 +- uzbl-makefile.patch | 39 ++++++----------- uzbl.spec | 21 ++++----- 8 files changed, 30 insertions(+), 157 deletions(-) delete mode 100644 0001-Don-t-shell-interpret-SELECTED_URI-fixes-FS-240.patch rename 0002-Fedora-specific-error-messages-on-no-configs.patch => 0001-Fedora-specific-error-messages-on-no-configs.patch (65%) delete mode 100644 0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch delete mode 100644 0001-Use-the-global-configuration-as-a-fallback.patch diff --git a/.gitignore b/.gitignore index ed164c3..272026e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ uzbl-afc0f873e.tar.gz /uzbl-afc0f873e.tar.gz +/uzbl-518004933.tar.gz diff --git a/0001-Don-t-shell-interpret-SELECTED_URI-fixes-FS-240.patch b/0001-Don-t-shell-interpret-SELECTED_URI-fixes-FS-240.patch deleted file mode 100644 index bb8d9b9..0000000 --- a/0001-Don-t-shell-interpret-SELECTED_URI-fixes-FS-240.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8fbe72f35afa9953c7b150c636fa26f182a9fce7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pawe=C5=82=20Zuzelski?= -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 = sh 'if [ "\@SELECTED_URI" ]; then uzbl-browser -u "\@SELECTED_URI"; else echo "uri $(xclip -o | sed s/\\\@/%40/g)" > $4; fi' -+@bind = 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 - diff --git a/0002-Fedora-specific-error-messages-on-no-configs.patch b/0001-Fedora-specific-error-messages-on-no-configs.patch similarity index 65% rename from 0002-Fedora-specific-error-messages-on-no-configs.patch rename to 0001-Fedora-specific-error-messages-on-no-configs.patch index e18e57e..f954d8b 100644 --- a/0002-Fedora-specific-error-messages-on-no-configs.patch +++ b/0001-Fedora-specific-error-messages-on-no-configs.patch @@ -1,19 +1,19 @@ -From 92bc0e4d7f8d3d81d75de4513a51253ac3a29cf0 Mon Sep 17 00:00:00 2001 +From fe8a23f0875e4daa8c506ebfeb6e65ae6775410b Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 2 Oct 2010 16:57:33 -0400 -Subject: [PATCH 2/2] Fedora-specific error messages on no configs +Subject: [PATCH] Fedora-specific error messages on no configs --- src/uzbl-browser | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/uzbl-browser b/src/uzbl-browser -index fabefc4..a299620 100755 +index 88d3742..61a2f56 100755 --- a/src/uzbl-browser +++ b/src/uzbl-browser -@@ -42,7 +42,19 @@ if [ ! -f $XDG_CONFIG_HOME/uzbl/config ] +@@ -37,7 +37,19 @@ if [ ! -f "$XDG_CONFIG_HOME"/uzbl/config ] then - if [ ! -r $PREFIX/share/uzbl/examples/config/config ] + if [ ! -r "$EXAMPLES"/config/config ] then - echo "Error: Global config not found; please check if your distribution ships them separately" + text="Global config not found; please install the uzbl-defaults package" @@ -31,7 +31,7 @@ index fabefc4..a299620 100755 + fi exit 3 fi - if ! cp $PREFIX/share/uzbl/examples/config/config $XDG_CONFIG_HOME/uzbl/config + if ! cp "$EXAMPLES"/config/config "$XDG_CONFIG_HOME"/uzbl/config -- -1.7.3.1 +1.7.3.2 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 deleted file mode 100644 index 5a667da..0000000 --- a/0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c202a6b79eb3658c12ba2077cb175a2fe5ae30a1 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -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/0001-Use-the-global-configuration-as-a-fallback.patch b/0001-Use-the-global-configuration-as-a-fallback.patch deleted file mode 100644 index 0e5c100..0000000 --- a/0001-Use-the-global-configuration-as-a-fallback.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ee3e5ccc576041baeacf9ee3082d453e2fe74fb6 Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Sat, 2 Oct 2010 16:19:18 -0400 -Subject: [PATCH] Use the global configuration as a fallback - -First check if there isn't a global config. If there isn't *then* we can -fail. If there is and the copy fails, at least run with the global -configuration. ---- - src/uzbl-browser | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/uzbl-browser b/src/uzbl-browser -index de4f7af..fabefc4 100755 ---- a/src/uzbl-browser -+++ b/src/uzbl-browser -@@ -40,10 +40,16 @@ done - # if no config exists yet in the recommended location, put the default (recommended) config there - if [ ! -f $XDG_CONFIG_HOME/uzbl/config ] - then -+ if [ ! -r $PREFIX/share/uzbl/examples/config/config ] -+ then -+ echo "Error: Global config not found; please check if your distribution ships them separately" -+ exit 3 -+ fi - if ! cp $PREFIX/share/uzbl/examples/config/config $XDG_CONFIG_HOME/uzbl/config - then - echo "Could not copy default config to $XDG_CONFIG_HOME/uzbl/config" >&2 -- exit 3 -+ # Run with the global configs as a last resort -+ config="--config $PREFIX/share/uzbl/examples/config/config" - fi - fi - -@@ -63,4 +69,4 @@ DAEMON_PID=${DAEMON_SOCKET}.pid - uzbl-event-manager -va start - #fi - --exec uzbl-core "$@" --connect-socket $DAEMON_SOCKET -+exec uzbl-core "$@" $config --connect-socket $DAEMON_SOCKET --- -1.7.3.1 - diff --git a/sources b/sources index c7374c6..c4b4ea6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34e114e3a1954ba7497fa94d12996870 uzbl-afc0f873e.tar.gz +2375b5c899e35b75bc43001b5576cbb9 uzbl-518004933.tar.gz diff --git a/uzbl-makefile.patch b/uzbl-makefile.patch index 759597c..bfcb013 100644 --- a/uzbl-makefile.patch +++ b/uzbl-makefile.patch @@ -1,21 +1,10 @@ -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 +diff --git a/Makefile b/Makefile +index 04f35d0..cbabd35 100644 +--- a/Makefile ++++ b/Makefile +@@ -112,16 +112,13 @@ install-dirs: --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 glib-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic - 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-uzbl-core: all install-dirs install -d $(INSTALLDIR)/share/uzbl/ - install -d $(DOCDIR) - install -m644 docs/* $(DOCDIR)/ @@ -25,14 +14,10 @@ diff -urN uzbl-ae15d257a.orig/Makefile uzbl-ae15d257a/Makefile 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 + mv $(INSTALLDIR)/share/uzbl/examples/config/config $(INSTALLDIR)/share/uzbl/examples/config/config.bak + sed 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' < $(INSTALLDIR)/share/uzbl/examples/config/config.bak > $(INSTALLDIR)/share/uzbl/examples/config/config + rm $(INSTALLDIR)/share/uzbl/examples/config/config.bak ++ rm $(INSTALLDIR)/share/uzbl/examples/uzbl-cookie-manager.c + install -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 + install-uzbl-browser: uzbl-cookie-manager install-dirs diff --git a/uzbl.spec b/uzbl.spec index da69bad..083f1bd 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -1,11 +1,11 @@ -%global uzblcommit afc0f873e +%global uzblcommit 518004933 %global vim_version 72 Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.19.20100626git%{uzblcommit}%{?dist} +Release: 0.20.20101125git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -18,11 +18,7 @@ URL: http://www.uzbl.org 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 -Patch3: 0001-Use-the-global-configuration-as-a-fallback.patch -Patch4: 0002-Fedora-specific-error-messages-on-no-configs.patch +Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: webkitgtk-devel @@ -103,9 +99,6 @@ Highlighting files for uzbl's configuration. %setup -q -n %{name}-%{uzblcommit} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 mkdir -p icons/hicolor/32x32/apps mv examples/data/uzbl.png icons/hicolor/32x32/apps @@ -163,7 +156,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files browser %defattr(-, root, root, -) %{_bindir}/uzbl-browser -%{_bindir}/uzbl-cookie-daemon +%{_bindir}/uzbl-cookie-manager %{_bindir}/uzbl-event-manager %files tabbed @@ -185,11 +178,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Nov 29 2010 Daiki Ueno - 0-0.20.20101125git518004933 +- new upstream snapshot. +- remove patches incorporated into the upstream git master. + * Sun Oct 10 2010 Ben Boeckel - 0-0.19.20100626gitafc0f873e - Split out -defaults package - Install vim files - Remove -O0 compile flag -- Use %{optflags} +- Use %%{optflags} * Mon Sep 6 2010 Daiki Ueno - 0-0.18.20100626gitafc0f873e - add patch to avoid crash on "Open Image in New Window" (#584733) From 77f071721446b1d21dea16070ee16e30d2f2d4e2 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 29 Nov 2010 17:11:50 +0900 Subject: [PATCH 12/50] Update to 0-0.21.20101125git518004933. --- uzbl.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/uzbl.spec b/uzbl.spec index 083f1bd..c442678 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -5,7 +5,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.20.20101125git%{uzblcommit}%{?dist} +Release: 0.21.20101125git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -19,7 +19,6 @@ Source0: %{name}-%{uzblcommit}.tar.gz Source1: %{name}.desktop Patch0: %{name}-makefile.patch Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: webkitgtk-devel BuildRequires: desktop-file-utils @@ -111,7 +110,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} make DESTDIR=%{buildroot} PREFIX=%{_prefix} install cp -pr icons %{buildroot}%{_datadir} @@ -126,10 +124,6 @@ mkdir -p %{buildroot}%{_datadir}/vim/vim%{vim_version}/syntax/ install -p extras/vim/syntax/uzbl.vim %{buildroot}%{_datadir}/vim/vim%{vim_version}/syntax/uzbl.vim -%clean -rm -rf %{buildroot} - - %post touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : @@ -178,6 +172,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Nov 29 2010 Daiki Ueno - 0-0.21.20101125git518004933 +- omit unnecessary buildroot stuff + * Mon Nov 29 2010 Daiki Ueno - 0-0.20.20101125git518004933 - new upstream snapshot. - remove patches incorporated into the upstream git master. From c39cb331b486356e37a4179fa750cbc6d3e2fcda Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Jan 2011 13:47:08 -0500 Subject: [PATCH 13/50] - Update the vim subpackage to install for 7.3 --- uzbl.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uzbl.spec b/uzbl.spec index c442678..a7c34ad 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -1,11 +1,11 @@ %global uzblcommit 518004933 -%global vim_version 72 +%global vim_version 73 Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.21.20101125git%{uzblcommit}%{?dist} +Release: 0.22.20101125git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -172,6 +172,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Jan 25 2011 Ben Boeckel - 0-0.22.20101125git518004933 +- Update the vim subpackage to install for 7.3 + * Mon Nov 29 2010 Daiki Ueno - 0-0.21.20101125git518004933 - omit unnecessary buildroot stuff From b9482f0bb4ad92b3e955a12f811dd8ab0cad1220 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:50:20 -0600 Subject: [PATCH 14/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index a7c34ad..145f6bf 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -5,7 +5,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.22.20101125git%{uzblcommit}%{?dist} +Release: 0.23.20101125git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -172,6 +172,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0-0.23.20101125git518004933 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Jan 25 2011 Ben Boeckel - 0-0.22.20101125git518004933 - Update the vim subpackage to install for 7.3 From 8df971f1cdf553c1c48068b46f4b3ced6acd97df Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 2 Mar 2011 18:00:23 +0900 Subject: [PATCH 15/50] Update to 0-0.24.20110215git8bbc39b83. --- .gitignore | 1 + sources | 2 +- uzbl-makefile.patch | 12 +++++------- uzbl.spec | 7 +++++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 272026e..81e7aa7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ uzbl-afc0f873e.tar.gz /uzbl-afc0f873e.tar.gz /uzbl-518004933.tar.gz +/uzbl-8bbc39b83.tar.gz diff --git a/sources b/sources index c4b4ea6..2fc6306 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2375b5c899e35b75bc43001b5576cbb9 uzbl-518004933.tar.gz +5c270549a01c4b6e7b95e7f10843e4fc uzbl-8bbc39b83.tar.gz diff --git a/uzbl-makefile.patch b/uzbl-makefile.patch index bfcb013..827318e 100644 --- a/uzbl-makefile.patch +++ b/uzbl-makefile.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index 04f35d0..cbabd35 100644 +index f33a626..fc1f0a1 100644 --- a/Makefile +++ b/Makefile -@@ -112,16 +112,13 @@ install-dirs: +@@ -128,14 +128,11 @@ install-dirs: install-uzbl-core: all install-dirs install -d $(INSTALLDIR)/share/uzbl/ @@ -13,11 +13,9 @@ index 04f35d0..cbabd35 100644 - 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 - mv $(INSTALLDIR)/share/uzbl/examples/config/config $(INSTALLDIR)/share/uzbl/examples/config/config.bak - sed 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' < $(INSTALLDIR)/share/uzbl/examples/config/config.bak > $(INSTALLDIR)/share/uzbl/examples/config/config - rm $(INSTALLDIR)/share/uzbl/examples/config/config.bak -+ rm $(INSTALLDIR)/share/uzbl/examples/uzbl-cookie-manager.c install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core ++ chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js ++ rm $(INSTALLDIR)/share/uzbl/examples/uzbl-cookie-manager.[co] install-uzbl-browser: uzbl-cookie-manager install-dirs + install -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser diff --git a/uzbl.spec b/uzbl.spec index 145f6bf..061f323 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -1,11 +1,11 @@ -%global uzblcommit 518004933 +%global uzblcommit 8bbc39b83 %global vim_version 73 Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.23.20101125git%{uzblcommit}%{?dist} +Release: 0.24.20110215git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -172,6 +172,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Mar 2 2011 Daiki Ueno - 0-0.24.20110215git8bbc39b83 +- New upstream snapshot + * Mon Feb 07 2011 Fedora Release Engineering - 0-0.23.20101125git518004933 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 7380eaf552bf2514292acdfc73c17fa4e74f9686 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 4 Apr 2011 18:02:14 +0900 Subject: [PATCH 16/50] Update to 0-0.25.20110402gite7578e27c. --- .gitignore | 1 + sources | 2 +- uzbl-makefile.patch | 6 +++--- uzbl.spec | 9 ++++++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 81e7aa7..ef84970 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ uzbl-afc0f873e.tar.gz /uzbl-afc0f873e.tar.gz /uzbl-518004933.tar.gz /uzbl-8bbc39b83.tar.gz +/uzbl-e7578e27c.tar.gz diff --git a/sources b/sources index 2fc6306..5d0fe2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c270549a01c4b6e7b95e7f10843e4fc uzbl-8bbc39b83.tar.gz +5b09de34e57e7afde1b3ec66872d6144 uzbl-e7578e27c.tar.gz diff --git a/uzbl-makefile.patch b/uzbl-makefile.patch index 827318e..1401e7f 100644 --- a/uzbl-makefile.patch +++ b/uzbl-makefile.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index f33a626..fc1f0a1 100644 +index 91b66b6..e197cc8 100644 --- a/Makefile +++ b/Makefile -@@ -128,14 +128,11 @@ install-dirs: +@@ -124,14 +124,11 @@ install-dirs: install-uzbl-core: all install-dirs install -d $(INSTALLDIR)/share/uzbl/ @@ -17,5 +17,5 @@ index f33a626..fc1f0a1 100644 + chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js + rm $(INSTALLDIR)/share/uzbl/examples/uzbl-cookie-manager.[co] - install-uzbl-browser: uzbl-cookie-manager install-dirs + install-uzbl-browser: install-dirs install -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser diff --git a/uzbl.spec b/uzbl.spec index 061f323..ff81edd 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -1,18 +1,18 @@ -%global uzblcommit 8bbc39b83 +%global uzblcommit e7578e27c %global vim_version 73 Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.24.20110215git%{uzblcommit}%{?dist} +Release: 0.25.20110402git%{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 +# export uzblcommit=e7578e27c # git archive --format tar --prefix uzbl-${uzblcommit}/ ${uzblcommit} |\ # gzip -c > ../uzbl-${uzblcommit}.tar.gz Source0: %{name}-%{uzblcommit}.tar.gz @@ -172,6 +172,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Apr 4 2011 Daiki Ueno - 0-0.25.20110402gite7578e27c +- New upstream snapshot + * Wed Mar 2 2011 Daiki Ueno - 0-0.24.20110215git8bbc39b83 - New upstream snapshot From afcb097d58d19a1a9fbf3c94fd4fd37769c74305 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 4 Apr 2011 18:10:06 +0900 Subject: [PATCH 17/50] Update uzbl-makefile.patch not to remove non-existent files. --- uzbl-makefile.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/uzbl-makefile.patch b/uzbl-makefile.patch index 1401e7f..3adb042 100644 --- a/uzbl-makefile.patch +++ b/uzbl-makefile.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index 91b66b6..e197cc8 100644 +index 91b66b6..44e06a7 100644 --- a/Makefile +++ b/Makefile -@@ -124,14 +124,11 @@ install-dirs: +@@ -124,14 +124,10 @@ install-dirs: install-uzbl-core: all install-dirs install -d $(INSTALLDIR)/share/uzbl/ @@ -15,7 +15,6 @@ index 91b66b6..e197cc8 100644 chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/* install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core + chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js -+ rm $(INSTALLDIR)/share/uzbl/examples/uzbl-cookie-manager.[co] install-uzbl-browser: install-dirs install -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser From 0ed72488ad21030709074d98338c17e134635c80 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 4 Apr 2011 18:19:25 +0900 Subject: [PATCH 18/50] Don't install removed uzbl-cookie-manager. --- uzbl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index ff81edd..c1dc739 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -150,7 +150,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files browser %defattr(-, root, root, -) %{_bindir}/uzbl-browser -%{_bindir}/uzbl-cookie-manager %{_bindir}/uzbl-event-manager %files tabbed @@ -174,6 +173,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Mon Apr 4 2011 Daiki Ueno - 0-0.25.20110402gite7578e27c - New upstream snapshot +- Don't install removed uzbl-cookie-manager and related files. * Wed Mar 2 2011 Daiki Ueno - 0-0.24.20110215git8bbc39b83 - New upstream snapshot From ef8b311e61316aa0cc6b7be62cb84d23c0374243 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 12:04:16 -0400 Subject: [PATCH 19/50] Update snapshot --- .gitignore | 1 + sources | 2 +- uzbl.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ef84970..bbca904 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ uzbl-afc0f873e.tar.gz /uzbl-518004933.tar.gz /uzbl-8bbc39b83.tar.gz /uzbl-e7578e27c.tar.gz +/uzbl-9576f59f05.tar.gz diff --git a/sources b/sources index 5d0fe2d..f355fe9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b09de34e57e7afde1b3ec66872d6144 uzbl-e7578e27c.tar.gz +0220d4a8c1ca8d531b3e0fa22e94539c uzbl-9576f59f05.tar.gz diff --git a/uzbl.spec b/uzbl.spec index c1dc739..3ecb0cc 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -1,18 +1,18 @@ -%global uzblcommit e7578e27c +%global uzblcommit 9576f59f05 %global vim_version 73 Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.25.20110402git%{uzblcommit}%{?dist} +Release: 0.26.20111001git%{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=e7578e27c +# export uzblcommit=9576f59f05 # git archive --format tar --prefix uzbl-${uzblcommit}/ ${uzblcommit} |\ # gzip -c > ../uzbl-${uzblcommit}.tar.gz Source0: %{name}-%{uzblcommit}.tar.gz @@ -171,6 +171,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Oct 25 2011 Ben Boeckel - 0-0.26.20111001git9576f59f05 +- New upstream snapshot + * Mon Apr 4 2011 Daiki Ueno - 0-0.25.20110402gite7578e27c - New upstream snapshot - Don't install removed uzbl-cookie-manager and related files. From e3dccf87c797cced6067a8b44d120bb5b27c9185 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 12:04:27 -0400 Subject: [PATCH 20/50] Add conditional support for webkitgtk3 --- uzbl.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/uzbl.spec b/uzbl.spec index 3ecb0cc..d7280bf 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -1,5 +1,6 @@ %global uzblcommit 9576f59f05 %global vim_version 73 +%global use_webkitgtk3 1 Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy @@ -20,7 +21,11 @@ Source1: %{name}.desktop Patch0: %{name}-makefile.patch Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch +%if %{use_webkitgtk3} +BuildRequires: webkitgtk3-devel +%else BuildRequires: webkitgtk-devel +%endif BuildRequires: desktop-file-utils BuildRequires: pkgconfig @@ -173,6 +178,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Tue Oct 25 2011 Ben Boeckel - 0-0.26.20111001git9576f59f05 - New upstream snapshot +- Add conditional support for webkitgtk3 * Mon Apr 4 2011 Daiki Ueno - 0-0.25.20110402gite7578e27c - New upstream snapshot From cf39d078ea19943980aba493c06698889218fd77 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 12:30:05 -0400 Subject: [PATCH 21/50] Update Fedora-specific patch --- ...pecific-error-messages-on-no-configs.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/0001-Fedora-specific-error-messages-on-no-configs.patch b/0001-Fedora-specific-error-messages-on-no-configs.patch index f954d8b..09d7ff5 100644 --- a/0001-Fedora-specific-error-messages-on-no-configs.patch +++ b/0001-Fedora-specific-error-messages-on-no-configs.patch @@ -1,17 +1,17 @@ -From fe8a23f0875e4daa8c506ebfeb6e65ae6775410b Mon Sep 17 00:00:00 2001 +From 496e9af495db28e19781b60f05a52efe7bcc47eb Mon Sep 17 00:00:00 2001 From: Ben Boeckel -Date: Sat, 2 Oct 2010 16:57:33 -0400 +Date: Tue, 25 Oct 2011 12:28:51 -0400 Subject: [PATCH] Fedora-specific error messages on no configs --- - src/uzbl-browser | 14 +++++++++++++- + bin/uzbl-browser | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) -diff --git a/src/uzbl-browser b/src/uzbl-browser -index 88d3742..61a2f56 100755 ---- a/src/uzbl-browser -+++ b/src/uzbl-browser -@@ -37,7 +37,19 @@ if [ ! -f "$XDG_CONFIG_HOME"/uzbl/config ] +diff --git a/bin/uzbl-browser b/bin/uzbl-browser +index fb9a368..8d2f9e3 100755 +--- a/bin/uzbl-browser ++++ b/bin/uzbl-browser +@@ -39,7 +39,19 @@ if [ ! -f "$XDG_CONFIG_HOME"/uzbl/config ] then if [ ! -r "$EXAMPLES"/config/config ] then @@ -31,7 +31,7 @@ index 88d3742..61a2f56 100755 + fi exit 3 fi - if ! cp "$EXAMPLES"/config/config "$XDG_CONFIG_HOME"/uzbl/config + if ! cp "$EXAMPLES"/config/* "$XDG_CONFIG_HOME"/uzbl/ -- -1.7.3.2 +1.7.6 From 08e7c4a28bbdf912ed0258a4ef2b5a959ef04f7a Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 12:39:49 -0400 Subject: [PATCH 22/50] Rediff the makefile patch --- uzbl-makefile.patch | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/uzbl-makefile.patch b/uzbl-makefile.patch index 3adb042..b4b8e82 100644 --- a/uzbl-makefile.patch +++ b/uzbl-makefile.patch @@ -1,8 +1,9 @@ -diff --git a/Makefile b/Makefile -index 91b66b6..44e06a7 100644 ---- a/Makefile -+++ b/Makefile -@@ -124,14 +124,10 @@ install-dirs: +diff -u -r -U5 uzbl-9576f59f05/Makefile uzbl-9576f59f05.makefile/Makefile +--- uzbl-9576f59f05/Makefile 2011-09-27 11:16:28.000000000 -0400 ++++ uzbl-9576f59f05.makefile/Makefile 2011-10-25 12:38:55.874132408 -0400 +@@ -113,16 +113,12 @@ + install-dirs: + [ -d "$(INSTALLDIR)/bin" ] || install -d -m755 $(INSTALLDIR)/bin install-uzbl-core: all install-dirs install -d $(INSTALLDIR)/share/uzbl/ @@ -11,10 +12,10 @@ index 91b66b6..44e06a7 100644 - 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/* install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core + chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js - install-uzbl-browser: install-dirs - install -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser + install-event-manager: install-dirs + sed "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" < bin/uzbl-event-manager > $(INSTALLDIR)/bin/uzbl-event-manager + chmod 755 $(INSTALLDIR)/bin/uzbl-event-manager + From fb62613bf9e6c2f7893514b4ab97db564660e0d2 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 12:55:04 -0400 Subject: [PATCH 23/50] Add patch to link with jscore --- ...regtk-3.0-is-required-for-webkitgtk3.patch | 25 +++++++++++++++++++ uzbl.spec | 7 ++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch diff --git a/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch b/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch new file mode 100644 index 0000000..53fbcce --- /dev/null +++ b/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch @@ -0,0 +1,25 @@ +From 6bc7b4b43d402d1ccef6d7214a5e0bbd007621d9 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Tue, 25 Oct 2011 12:51:36 -0400 +Subject: [PATCH] javascriptcoregtk-3.0 is required for webkitgtk3 + +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 6c2269f..00a8f89 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,7 +10,7 @@ RUN_PREFIX?=$(PREFIX) + USE_GTK3 = $(shell pkg-config --exists gtk+-3.0 webkitgtk-3.0 && echo 1) + + ifeq ($(USE_GTK3),1) +- REQ_PKGS += gtk+-3.0 webkitgtk-3.0 ++ REQ_PKGS += gtk+-3.0 webkitgtk-3.0 javascriptcoregtk-3.0 + CPPFLAGS = -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED + else + REQ_PKGS += gtk+-2.0 webkit-1.0 +-- +1.7.6 + diff --git a/uzbl.spec b/uzbl.spec index d7280bf..8d243e8 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -20,6 +20,8 @@ Source0: %{name}-%{uzblcommit}.tar.gz Source1: %{name}.desktop Patch0: %{name}-makefile.patch Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch +# Submitted at https://github.com/Dieterbe/uzbl/pull/71 +Patch2: 0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch %if %{use_webkitgtk3} BuildRequires: webkitgtk3-devel @@ -101,8 +103,9 @@ Highlighting files for uzbl's configuration. %prep %setup -q -n %{name}-%{uzblcommit} -%patch0 -p1 -%patch1 -p1 +%patch0 -p1 -b .makefile +%patch1 -p1 -b .fedora +%patch2 -p1 -b .jscore mkdir -p icons/hicolor/32x32/apps mv examples/data/uzbl.png icons/hicolor/32x32/apps From 83af9a3184fd0bc1822abf266dcbcf5a5ff41c57 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 13:15:09 -0400 Subject: [PATCH 24/50] Add patches to fix warnings and the build --- 0001-Get-the-click-context-all-the-time.patch | 31 +++++++++++++++++++ 0001-Include-glib.h.patch | 26 ++++++++++++++++ uzbl.spec | 4 +++ 3 files changed, 61 insertions(+) create mode 100644 0001-Get-the-click-context-all-the-time.patch create mode 100644 0001-Include-glib.h.patch diff --git a/0001-Get-the-click-context-all-the-time.patch b/0001-Get-the-click-context-all-the-time.patch new file mode 100644 index 0000000..3dc9908 --- /dev/null +++ b/0001-Get-the-click-context-all-the-time.patch @@ -0,0 +1,31 @@ +From 4e9672c31ee7790cb4a0453b7d45d3e89613c035 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Tue, 25 Oct 2011 13:10:48 -0400 +Subject: [PATCH] Get the click context all the time + +--- + src/callbacks.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/callbacks.c b/src/callbacks.c +index ae5c2e3..f939454 100644 +--- a/src/callbacks.c ++++ b/src/callbacks.c +@@ -165,12 +165,13 @@ button_press_cb (GtkWidget* window, GdkEventButton* event) { + gboolean propagate = FALSE, + sendev = FALSE; + ++ context = get_click_context(NULL); ++ + if(event->type == GDK_BUTTON_PRESS) { + if(uzbl.state.last_button) + gdk_event_free((GdkEvent *)uzbl.state.last_button); + uzbl.state.last_button = (GdkEventButton *)gdk_event_copy((GdkEvent *)event); + +- context = get_click_context(NULL); + /* left click */ + if(event->button == 1) { + if((context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE)) +-- +1.7.6 + diff --git a/0001-Include-glib.h.patch b/0001-Include-glib.h.patch new file mode 100644 index 0000000..be1c165 --- /dev/null +++ b/0001-Include-glib.h.patch @@ -0,0 +1,26 @@ +From 689d174ab095508e9579bc5f3de359b3aa09b9ef Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Tue, 25 Oct 2011 13:13:40 -0400 +Subject: [PATCH] Include glib.h + +It seems to be needed for webkitgtk3 +--- + src/uzbl-core.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/uzbl-core.c b/src/uzbl-core.c +index f90c5dd..a3c36fb 100644 +--- a/src/uzbl-core.c ++++ b/src/uzbl-core.c +@@ -40,6 +40,8 @@ + #include "variables.h" + #include "type.h" + ++#include ++ + UzblCore uzbl; + + /* commandline arguments (set initial values for the state variables) */ +-- +1.7.6 + diff --git a/uzbl.spec b/uzbl.spec index 8d243e8..7aeb920 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -22,6 +22,8 @@ Patch0: %{name}-makefile.patch Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch # Submitted at https://github.com/Dieterbe/uzbl/pull/71 Patch2: 0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch +Patch3: 0001-Get-the-click-context-all-the-time.patch +Patch4: 0001-Include-glib.h.patch %if %{use_webkitgtk3} BuildRequires: webkitgtk3-devel @@ -106,6 +108,8 @@ Highlighting files for uzbl's configuration. %patch0 -p1 -b .makefile %patch1 -p1 -b .fedora %patch2 -p1 -b .jscore +%patch3 -p1 -b .context +%patch4 -p1 -b .include mkdir -p icons/hicolor/32x32/apps mv examples/data/uzbl.png icons/hicolor/32x32/apps From 577ec9d52728a3bacb55cc82f0ef136b212b42ec Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 13:25:39 -0400 Subject: [PATCH 25/50] Also link gthread-2.0 --- 0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch b/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch index 53fbcce..25495fa 100644 --- a/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch +++ b/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch @@ -16,7 +16,7 @@ index 6c2269f..00a8f89 100644 ifeq ($(USE_GTK3),1) - REQ_PKGS += gtk+-3.0 webkitgtk-3.0 -+ REQ_PKGS += gtk+-3.0 webkitgtk-3.0 javascriptcoregtk-3.0 ++ REQ_PKGS += gtk+-3.0 webkitgtk-3.0 javascriptcoregtk-3.0 gthread-2.0 CPPFLAGS = -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED else REQ_PKGS += gtk+-2.0 webkit-1.0 From 799769f7deef2182415440d13b071c006b9e5b66 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 13:34:36 -0400 Subject: [PATCH 26/50] Include gthread.h, not glib.h --- 0001-Include-glib.h.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0001-Include-glib.h.patch b/0001-Include-glib.h.patch index be1c165..6a3dc2e 100644 --- a/0001-Include-glib.h.patch +++ b/0001-Include-glib.h.patch @@ -16,7 +16,7 @@ index f90c5dd..a3c36fb 100644 #include "variables.h" #include "type.h" -+#include ++#include + UzblCore uzbl; From 5cd1f89ca88d8d064e1658778218bb486c6b75bc Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 14:03:17 -0400 Subject: [PATCH 27/50] Revert "Include gthread.h, not glib.h" This reverts commit 799769f7deef2182415440d13b071c006b9e5b66. --- 0001-Include-glib.h.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0001-Include-glib.h.patch b/0001-Include-glib.h.patch index 6a3dc2e..be1c165 100644 --- a/0001-Include-glib.h.patch +++ b/0001-Include-glib.h.patch @@ -16,7 +16,7 @@ index f90c5dd..a3c36fb 100644 #include "variables.h" #include "type.h" -+#include ++#include + UzblCore uzbl; From 7699ce6d8b33a178b3cd43ea53f0d3d670df57a1 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 14:28:48 -0400 Subject: [PATCH 28/50] Fix up patches and add upstreaming links --- 0001-Include-glib.h.patch | 26 ---------- ...regtk-3.0-is-required-for-webkitgtk3.patch | 4 +- 0002-Check-if-glib-needs-g_thread_init.patch | 49 +++++++++++++++++++ uzbl.spec | 11 +++-- 4 files changed, 58 insertions(+), 32 deletions(-) delete mode 100644 0001-Include-glib.h.patch create mode 100644 0002-Check-if-glib-needs-g_thread_init.patch diff --git a/0001-Include-glib.h.patch b/0001-Include-glib.h.patch deleted file mode 100644 index be1c165..0000000 --- a/0001-Include-glib.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 689d174ab095508e9579bc5f3de359b3aa09b9ef Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Tue, 25 Oct 2011 13:13:40 -0400 -Subject: [PATCH] Include glib.h - -It seems to be needed for webkitgtk3 ---- - src/uzbl-core.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/uzbl-core.c b/src/uzbl-core.c -index f90c5dd..a3c36fb 100644 ---- a/src/uzbl-core.c -+++ b/src/uzbl-core.c -@@ -40,6 +40,8 @@ - #include "variables.h" - #include "type.h" - -+#include -+ - UzblCore uzbl; - - /* commandline arguments (set initial values for the state variables) */ --- -1.7.6 - diff --git a/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch b/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch index 25495fa..846b824 100644 --- a/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch +++ b/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch @@ -1,7 +1,7 @@ From 6bc7b4b43d402d1ccef6d7214a5e0bbd007621d9 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 12:51:36 -0400 -Subject: [PATCH] javascriptcoregtk-3.0 is required for webkitgtk3 +Subject: [PATCH 1/2] javascriptcoregtk-3.0 is required for webkitgtk3 --- Makefile | 2 +- @@ -16,7 +16,7 @@ index 6c2269f..00a8f89 100644 ifeq ($(USE_GTK3),1) - REQ_PKGS += gtk+-3.0 webkitgtk-3.0 -+ REQ_PKGS += gtk+-3.0 webkitgtk-3.0 javascriptcoregtk-3.0 gthread-2.0 ++ REQ_PKGS += gtk+-3.0 webkitgtk-3.0 javascriptcoregtk-3.0 CPPFLAGS = -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED else REQ_PKGS += gtk+-2.0 webkit-1.0 diff --git a/0002-Check-if-glib-needs-g_thread_init.patch b/0002-Check-if-glib-needs-g_thread_init.patch new file mode 100644 index 0000000..3613444 --- /dev/null +++ b/0002-Check-if-glib-needs-g_thread_init.patch @@ -0,0 +1,49 @@ +From cfa68177245890a03e467412075f84e9c9647c71 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Tue, 25 Oct 2011 14:24:10 -0400 +Subject: [PATCH 2/2] Check if glib needs g_thread_init + +Newer glib versions don't need g_thread_init. Of course, there is no +announcement or whatever, so you have to go to the docs to discover +this. Nevermind the lack of backwards compatibility with a nice message +about when it will be removed for a while either. +--- + Makefile | 5 +++++ + src/uzbl-core.c | 3 ++- + 2 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 00a8f89..86ff7f6 100644 +--- a/Makefile ++++ b/Makefile +@@ -21,6 +21,11 @@ endif + + REQ_PKGS += libsoup-2.4 gthread-2.0 glib-2.0 + ++# Check for a new glib version ++ifeq ($(shell pkg-config --exists "glib-2.0 >= 2.31.0"),1) ++ CPPFLAGS += -DUZBL_GTHREAD_NO_INIT ++endif ++ + ARCH:=$(shell uname -m) + + COMMIT_HASH:=$(shell ./misc/hash.sh) +diff --git a/src/uzbl-core.c b/src/uzbl-core.c +index f90c5dd..f756740 100644 +--- a/src/uzbl-core.c ++++ b/src/uzbl-core.c +@@ -962,9 +962,10 @@ initialize(int argc, char** argv) { + if (uzbl.state.socket_id || uzbl.state.embed) + uzbl.state.plug_mode = TRUE; + ++#ifndef UZBL_GTHREAD_NO_INIT + if (!g_thread_supported()) + g_thread_init(NULL); +- ++#endif + + /* TODO: move the handler setup to event_buffer_timeout and disarm the + * handler in empty_event_buffer? */ +-- +1.7.6 + diff --git a/uzbl.spec b/uzbl.spec index 7aeb920..44ec476 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -18,12 +18,15 @@ URL: http://www.uzbl.org # gzip -c > ../uzbl-${uzblcommit}.tar.gz Source0: %{name}-%{uzblcommit}.tar.gz Source1: %{name}.desktop +# RPM handles docs for us, won't be upstreamed Patch0: %{name}-makefile.patch +# Fedora-specific, won't be upstreamed Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch # Submitted at https://github.com/Dieterbe/uzbl/pull/71 Patch2: 0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch -Patch3: 0001-Get-the-click-context-all-the-time.patch -Patch4: 0001-Include-glib.h.patch +Patch3: 0002-Check-if-glib-needs-g_thread_init.patch +# Submitted at https://github.com/Dieterbe/uzbl/pull/72 +Patch4: 0001-Get-the-click-context-all-the-time.patch %if %{use_webkitgtk3} BuildRequires: webkitgtk3-devel @@ -108,8 +111,8 @@ Highlighting files for uzbl's configuration. %patch0 -p1 -b .makefile %patch1 -p1 -b .fedora %patch2 -p1 -b .jscore -%patch3 -p1 -b .context -%patch4 -p1 -b .include +%patch3 -p1 -b .gthread_init +%patch4 -p1 -b .context mkdir -p icons/hicolor/32x32/apps mv examples/data/uzbl.png icons/hicolor/32x32/apps From 0dcd6c6f4808a9546d634c165aae578af0d8417b Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 14:41:19 -0400 Subject: [PATCH 29/50] Update gthread patch --- 0002-Check-if-glib-needs-g_thread_init.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/0002-Check-if-glib-needs-g_thread_init.patch b/0002-Check-if-glib-needs-g_thread_init.patch index 3613444..62ca054 100644 --- a/0002-Check-if-glib-needs-g_thread_init.patch +++ b/0002-Check-if-glib-needs-g_thread_init.patch @@ -1,4 +1,4 @@ -From cfa68177245890a03e467412075f84e9c9647c71 Mon Sep 17 00:00:00 2001 +From 47f84c9c76366da2fefff0fd29d57712c695bc68 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 14:24:10 -0400 Subject: [PATCH 2/2] Check if glib needs g_thread_init @@ -13,7 +13,7 @@ about when it will be removed for a while either. 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile -index 00a8f89..86ff7f6 100644 +index 00a8f89..83be153 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,11 @@ endif @@ -21,7 +21,7 @@ index 00a8f89..86ff7f6 100644 REQ_PKGS += libsoup-2.4 gthread-2.0 glib-2.0 +# Check for a new glib version -+ifeq ($(shell pkg-config --exists "glib-2.0 >= 2.31.0"),1) ++ifeq ($(shell pkg-config --exists "glib-2.0 >= 2.31.0" && echo 1),1) + CPPFLAGS += -DUZBL_GTHREAD_NO_INIT +endif + From c6831043e762c14b0c24e58d9f6534ece4d37f31 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 15:09:54 -0400 Subject: [PATCH 30/50] Fix the makefile patch one more time --- uzbl-makefile.patch | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/uzbl-makefile.patch b/uzbl-makefile.patch index b4b8e82..5db47cb 100644 --- a/uzbl-makefile.patch +++ b/uzbl-makefile.patch @@ -1,7 +1,7 @@ diff -u -r -U5 uzbl-9576f59f05/Makefile uzbl-9576f59f05.makefile/Makefile ---- uzbl-9576f59f05/Makefile 2011-09-27 11:16:28.000000000 -0400 -+++ uzbl-9576f59f05.makefile/Makefile 2011-10-25 12:38:55.874132408 -0400 -@@ -113,16 +113,12 @@ +--- uzbl-9576f59f05/Makefile 2011-10-25 15:04:48.995533888 -0400 ++++ uzbl-9576f59f05.makefile/Makefile 2011-10-25 15:08:10.280520126 -0400 +@@ -113,15 +113,10 @@ install-dirs: [ -d "$(INSTALLDIR)/bin" ] || install -d -m755 $(INSTALLDIR)/bin @@ -13,9 +13,19 @@ diff -u -r -U5 uzbl-9576f59f05/Makefile uzbl-9576f59f05.makefile/Makefile - install -m644 README $(DOCDIR)/ - install -m644 AUTHORS $(DOCDIR)/ install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core -+ chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js install-event-manager: install-dirs sed "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" < bin/uzbl-event-manager > $(INSTALLDIR)/bin/uzbl-event-manager chmod 755 $(INSTALLDIR)/bin/uzbl-event-manager +@@ -129,10 +124,11 @@ + install-uzbl-browser: install-dirs install-uzbl-core install-event-manager + sed 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' < bin/uzbl-browser > $(INSTALLDIR)/bin/uzbl-browser + chmod 755 $(INSTALLDIR)/bin/uzbl-browser + cp -r examples $(INSTALLDIR)/share/uzbl/ + chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/* ++ chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js + install-uzbl-tabbed: install-dirs + install -m755 bin/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed + + # you probably only want to do this manually when testing and/or to the sandbox. not meant for distributors From 1bd2daf1843df3d10f2488ef20b9b33fae050d69 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:43:05 -0600 Subject: [PATCH 31/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index 44ec476..cf443bb 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -6,7 +6,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.26.20111001git%{uzblcommit}%{?dist} +Release: 0.27.20111001git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -186,6 +186,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0-0.27.20111001git9576f59f05 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Oct 25 2011 Ben Boeckel - 0-0.26.20111001git9576f59f05 - New upstream snapshot - Add conditional support for webkitgtk3 From d2b791f45ef6dbea378631a7dd067015a02f4a9b Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 23 Feb 2012 20:09:09 -0500 Subject: [PATCH 32/50] Narrow the vim dependencies --- uzbl.spec | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/uzbl.spec b/uzbl.spec index cf443bb..95497f2 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -1,5 +1,4 @@ %global uzblcommit 9576f59f05 -%global vim_version 73 %global use_webkitgtk3 1 Name: uzbl @@ -100,7 +99,7 @@ Default configuration for uzbl. %package vim Summary: Vim highlighting for uzbl's config Group: Applications/Text -Requires: vim-enhanced +Requires: vim-filesystem %description vim Highlighting files for uzbl's configuration. @@ -131,12 +130,12 @@ cp -pr icons %{buildroot}%{_datadir} desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE1} -mkdir -p %{buildroot}%{_datadir}/vim/vim%{vim_version}/ftdetect/ -install -p extras/vim/ftdetect/uzbl.vim %{buildroot}%{_datadir}/vim/vim%{vim_version}/ftdetect/uzbl.vim -mkdir -p %{buildroot}%{_datadir}/vim/vim%{vim_version}/ftplugin/ -install -p extras/vim/ftplugin/uzbl.vim %{buildroot}%{_datadir}/vim/vim%{vim_version}/ftplugin/uzbl.vim -mkdir -p %{buildroot}%{_datadir}/vim/vim%{vim_version}/syntax/ -install -p extras/vim/syntax/uzbl.vim %{buildroot}%{_datadir}/vim/vim%{vim_version}/syntax/uzbl.vim +mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/ +install -p extras/vim/ftdetect/uzbl.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/uzbl.vim +mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/ftplugin/ +install -p extras/vim/ftplugin/uzbl.vim %{buildroot}%{_datadir}/vim/vimfiles/ftplugin/uzbl.vim +mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/syntax/ +install -p extras/vim/syntax/uzbl.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/uzbl.vim %post @@ -180,9 +179,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files vim %defattr(-, root, root, -) -%{_datadir}/vim/vim%{vim_version}/ftdetect/uzbl.vim -%{_datadir}/vim/vim%{vim_version}/ftplugin/uzbl.vim -%{_datadir}/vim/vim%{vim_version}/syntax/uzbl.vim +%{_datadir}/vim/vimfiles/ftdetect/uzbl.vim +%{_datadir}/vim/vimfiles/ftplugin/uzbl.vim +%{_datadir}/vim/vimfiles/syntax/uzbl.vim %changelog From fc6f0c5af1790ec86bfcf446c9262058517f1fb4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 23 Feb 2012 20:15:56 -0500 Subject: [PATCH 33/50] Add patch for cookie file permissions --- ...arty-access-to-cookie-jar-CVE-2012-0.patch | 79 +++++++++++++++++++ uzbl.spec | 9 ++- 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 0001-Restrict-third-party-access-to-cookie-jar-CVE-2012-0.patch diff --git a/0001-Restrict-third-party-access-to-cookie-jar-CVE-2012-0.patch b/0001-Restrict-third-party-access-to-cookie-jar-CVE-2012-0.patch new file mode 100644 index 0000000..e0c7363 --- /dev/null +++ b/0001-Restrict-third-party-access-to-cookie-jar-CVE-2012-0.patch @@ -0,0 +1,79 @@ +From 0d747f8715f2b9d2acddda8748e0c3f838f197de Mon Sep 17 00:00:00 2001 +From: Luca Bruno +Date: Sat, 11 Feb 2012 15:23:14 +0100 +Subject: [PATCH] Restrict third-party access to cookie jar (CVE-2012-0843) + +Make sure new cookie jar is created with no permission for "others", +and remove excessive rights on existing jar if any. +This fixes CVE-2012-0843 and uzbl bug #291. + +Signed-off-by: Luca Bruno +--- + examples/data/plugins/cookies.py | 20 +++++++++++++++++++- + 1 files changed, 19 insertions(+), 1 deletions(-) + +diff --git a/examples/data/plugins/cookies.py b/examples/data/plugins/cookies.py +index e29ee36..721feef 100644 +--- a/examples/data/plugins/cookies.py ++++ b/examples/data/plugins/cookies.py +@@ -2,7 +2,7 @@ + forwards cookies to all other instances connected to the event manager""" + + from collections import defaultdict +-import os, re ++import os, re, stat + + # these are symbolic names for the components of the cookie tuple + symbolic = {'domain': 0, 'path':1, 'name':2, 'value':3, 'scheme':4, 'expires':5} +@@ -32,6 +32,14 @@ class ListStore(list): + class TextStore(object): + def __init__(self, filename): + self.filename = filename ++ try: ++ # make sure existing cookie jar is not world-open ++ perm_mode = os.stat(self.filename).st_mode ++ if (perm_mode & (stat.S_IRWXO | stat.S_IRWXG)) > 0: ++ safe_perm = stat.S_IMODE(perm_mode) & ~(stat.S_IRWXO | stat.S_IRWXG) ++ os.chmod(self.filename, safe_perm) ++ except OSError: ++ pass + + def as_event(self, cookie): + """Convert cookie.txt row to uzbls cookie event format""" +@@ -76,16 +84,25 @@ class TextStore(object): + # delete equal cookies (ignoring expire time, value and secure flag) + self.delete_cookie(None, cookie[:-3]) + ++ # restrict umask before creating the cookie jar ++ curmask=os.umask(0) ++ os.umask(curmask| stat.S_IRWXO | stat.S_IRWXG) ++ + first = not os.path.exists(self.filename) + with open(self.filename, 'a') as f: + if first: + print >> f, "# HTTP Cookie File" + print >> f, '\t'.join(self.as_file(cookie)) ++ os.umask(curmask) + + def delete_cookie(self, rkey, key): + if not os.path.exists(self.filename): + return + ++ # restrict umask before creating the cookie jar ++ curmask=os.umask(0) ++ os.umask(curmask | stat.S_IRWXO | stat.S_IRWXG) ++ + # read all cookies + with open(self.filename, 'r') as f: + cookies = f.readlines() +@@ -96,6 +113,7 @@ class TextStore(object): + c = self.as_event(l.split('\t')) + if c is None or not match(key, c): + print >> f, l, ++ os.umask(curmask) + + xdg_data_home = os.environ.get('XDG_DATA_HOME', os.path.join(os.environ['HOME'], '.local/share')) + DefaultStore = TextStore(os.path.join(xdg_data_home, 'uzbl/cookies.txt')) +-- +1.7.9.1 + diff --git a/uzbl.spec b/uzbl.spec index 95497f2..f10f0c2 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -5,7 +5,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.27.20111001git%{uzblcommit}%{?dist} +Release: 0.28.20111001git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -26,6 +26,8 @@ Patch2: 0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch Patch3: 0002-Check-if-glib-needs-g_thread_init.patch # Submitted at https://github.com/Dieterbe/uzbl/pull/72 Patch4: 0001-Get-the-click-context-all-the-time.patch +# From upstream +Patch5: 0001-Restrict-third-party-access-to-cookie-jar-CVE-2012-0.patch %if %{use_webkitgtk3} BuildRequires: webkitgtk3-devel @@ -112,6 +114,7 @@ Highlighting files for uzbl's configuration. %patch2 -p1 -b .jscore %patch3 -p1 -b .gthread_init %patch4 -p1 -b .context +%patch5 -p1 -b .cookie-perms mkdir -p icons/hicolor/32x32/apps mv examples/data/uzbl.png icons/hicolor/32x32/apps @@ -185,6 +188,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Feb 23 2012 Ben Boeckel - 0-0.28.20111001git9576f59f05 +- Lock down permissions on cookie files (CVE-2012-0843) +- Clean up vim subpackage + * Sat Jan 14 2012 Fedora Release Engineering - 0-0.27.20111001git9576f59f05 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 3da8714271714541f72200666951bddc358a07c1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:19:44 -0500 Subject: [PATCH 34/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index f10f0c2..1dd2090 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -5,7 +5,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.28.20111001git%{uzblcommit}%{?dist} +Release: 0.29.20111001git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -188,6 +188,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0-0.29.20111001git9576f59f05 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Feb 23 2012 Ben Boeckel - 0-0.28.20111001git9576f59f05 - Lock down permissions on cookie files (CVE-2012-0843) - Clean up vim subpackage From 7232fa1a7396d3391cf7d44892aac27ca48fcfb7 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 4 Nov 2012 22:23:48 -0500 Subject: [PATCH 35/50] Update to new snapshot --- .gitignore | 7 +- 0001-Get-the-click-context-all-the-time.patch | 31 ----- ...arty-access-to-cookie-jar-CVE-2012-0.patch | 79 ------------ ...regtk-3.0-is-required-for-webkitgtk3.patch | 25 ---- 0002-Check-if-glib-needs-g_thread_init.patch | 49 -------- sources | 2 +- uzbl.spec | 114 +++++++++--------- 7 files changed, 61 insertions(+), 246 deletions(-) delete mode 100644 0001-Get-the-click-context-all-the-time.patch delete mode 100644 0001-Restrict-third-party-access-to-cookie-jar-CVE-2012-0.patch delete mode 100644 0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch delete mode 100644 0002-Check-if-glib-needs-g_thread_init.patch diff --git a/.gitignore b/.gitignore index bbca904..5dc1964 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -uzbl-afc0f873e.tar.gz -/uzbl-afc0f873e.tar.gz -/uzbl-518004933.tar.gz -/uzbl-8bbc39b83.tar.gz -/uzbl-e7578e27c.tar.gz -/uzbl-9576f59f05.tar.gz +/uzbl-228bc38cbd.tar.gz diff --git a/0001-Get-the-click-context-all-the-time.patch b/0001-Get-the-click-context-all-the-time.patch deleted file mode 100644 index 3dc9908..0000000 --- a/0001-Get-the-click-context-all-the-time.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4e9672c31ee7790cb4a0453b7d45d3e89613c035 Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Tue, 25 Oct 2011 13:10:48 -0400 -Subject: [PATCH] Get the click context all the time - ---- - src/callbacks.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/src/callbacks.c b/src/callbacks.c -index ae5c2e3..f939454 100644 ---- a/src/callbacks.c -+++ b/src/callbacks.c -@@ -165,12 +165,13 @@ button_press_cb (GtkWidget* window, GdkEventButton* event) { - gboolean propagate = FALSE, - sendev = FALSE; - -+ context = get_click_context(NULL); -+ - if(event->type == GDK_BUTTON_PRESS) { - if(uzbl.state.last_button) - gdk_event_free((GdkEvent *)uzbl.state.last_button); - uzbl.state.last_button = (GdkEventButton *)gdk_event_copy((GdkEvent *)event); - -- context = get_click_context(NULL); - /* left click */ - if(event->button == 1) { - if((context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE)) --- -1.7.6 - diff --git a/0001-Restrict-third-party-access-to-cookie-jar-CVE-2012-0.patch b/0001-Restrict-third-party-access-to-cookie-jar-CVE-2012-0.patch deleted file mode 100644 index e0c7363..0000000 --- a/0001-Restrict-third-party-access-to-cookie-jar-CVE-2012-0.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 0d747f8715f2b9d2acddda8748e0c3f838f197de Mon Sep 17 00:00:00 2001 -From: Luca Bruno -Date: Sat, 11 Feb 2012 15:23:14 +0100 -Subject: [PATCH] Restrict third-party access to cookie jar (CVE-2012-0843) - -Make sure new cookie jar is created with no permission for "others", -and remove excessive rights on existing jar if any. -This fixes CVE-2012-0843 and uzbl bug #291. - -Signed-off-by: Luca Bruno ---- - examples/data/plugins/cookies.py | 20 +++++++++++++++++++- - 1 files changed, 19 insertions(+), 1 deletions(-) - -diff --git a/examples/data/plugins/cookies.py b/examples/data/plugins/cookies.py -index e29ee36..721feef 100644 ---- a/examples/data/plugins/cookies.py -+++ b/examples/data/plugins/cookies.py -@@ -2,7 +2,7 @@ - forwards cookies to all other instances connected to the event manager""" - - from collections import defaultdict --import os, re -+import os, re, stat - - # these are symbolic names for the components of the cookie tuple - symbolic = {'domain': 0, 'path':1, 'name':2, 'value':3, 'scheme':4, 'expires':5} -@@ -32,6 +32,14 @@ class ListStore(list): - class TextStore(object): - def __init__(self, filename): - self.filename = filename -+ try: -+ # make sure existing cookie jar is not world-open -+ perm_mode = os.stat(self.filename).st_mode -+ if (perm_mode & (stat.S_IRWXO | stat.S_IRWXG)) > 0: -+ safe_perm = stat.S_IMODE(perm_mode) & ~(stat.S_IRWXO | stat.S_IRWXG) -+ os.chmod(self.filename, safe_perm) -+ except OSError: -+ pass - - def as_event(self, cookie): - """Convert cookie.txt row to uzbls cookie event format""" -@@ -76,16 +84,25 @@ class TextStore(object): - # delete equal cookies (ignoring expire time, value and secure flag) - self.delete_cookie(None, cookie[:-3]) - -+ # restrict umask before creating the cookie jar -+ curmask=os.umask(0) -+ os.umask(curmask| stat.S_IRWXO | stat.S_IRWXG) -+ - first = not os.path.exists(self.filename) - with open(self.filename, 'a') as f: - if first: - print >> f, "# HTTP Cookie File" - print >> f, '\t'.join(self.as_file(cookie)) -+ os.umask(curmask) - - def delete_cookie(self, rkey, key): - if not os.path.exists(self.filename): - return - -+ # restrict umask before creating the cookie jar -+ curmask=os.umask(0) -+ os.umask(curmask | stat.S_IRWXO | stat.S_IRWXG) -+ - # read all cookies - with open(self.filename, 'r') as f: - cookies = f.readlines() -@@ -96,6 +113,7 @@ class TextStore(object): - c = self.as_event(l.split('\t')) - if c is None or not match(key, c): - print >> f, l, -+ os.umask(curmask) - - xdg_data_home = os.environ.get('XDG_DATA_HOME', os.path.join(os.environ['HOME'], '.local/share')) - DefaultStore = TextStore(os.path.join(xdg_data_home, 'uzbl/cookies.txt')) --- -1.7.9.1 - diff --git a/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch b/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch deleted file mode 100644 index 846b824..0000000 --- a/0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6bc7b4b43d402d1ccef6d7214a5e0bbd007621d9 Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Tue, 25 Oct 2011 12:51:36 -0400 -Subject: [PATCH 1/2] javascriptcoregtk-3.0 is required for webkitgtk3 - ---- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index 6c2269f..00a8f89 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,7 +10,7 @@ RUN_PREFIX?=$(PREFIX) - USE_GTK3 = $(shell pkg-config --exists gtk+-3.0 webkitgtk-3.0 && echo 1) - - ifeq ($(USE_GTK3),1) -- REQ_PKGS += gtk+-3.0 webkitgtk-3.0 -+ REQ_PKGS += gtk+-3.0 webkitgtk-3.0 javascriptcoregtk-3.0 - CPPFLAGS = -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED - else - REQ_PKGS += gtk+-2.0 webkit-1.0 --- -1.7.6 - diff --git a/0002-Check-if-glib-needs-g_thread_init.patch b/0002-Check-if-glib-needs-g_thread_init.patch deleted file mode 100644 index 62ca054..0000000 --- a/0002-Check-if-glib-needs-g_thread_init.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 47f84c9c76366da2fefff0fd29d57712c695bc68 Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Tue, 25 Oct 2011 14:24:10 -0400 -Subject: [PATCH 2/2] Check if glib needs g_thread_init - -Newer glib versions don't need g_thread_init. Of course, there is no -announcement or whatever, so you have to go to the docs to discover -this. Nevermind the lack of backwards compatibility with a nice message -about when it will be removed for a while either. ---- - Makefile | 5 +++++ - src/uzbl-core.c | 3 ++- - 2 files changed, 7 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index 00a8f89..83be153 100644 ---- a/Makefile -+++ b/Makefile -@@ -21,6 +21,11 @@ endif - - REQ_PKGS += libsoup-2.4 gthread-2.0 glib-2.0 - -+# Check for a new glib version -+ifeq ($(shell pkg-config --exists "glib-2.0 >= 2.31.0" && echo 1),1) -+ CPPFLAGS += -DUZBL_GTHREAD_NO_INIT -+endif -+ - ARCH:=$(shell uname -m) - - COMMIT_HASH:=$(shell ./misc/hash.sh) -diff --git a/src/uzbl-core.c b/src/uzbl-core.c -index f90c5dd..f756740 100644 ---- a/src/uzbl-core.c -+++ b/src/uzbl-core.c -@@ -962,9 +962,10 @@ initialize(int argc, char** argv) { - if (uzbl.state.socket_id || uzbl.state.embed) - uzbl.state.plug_mode = TRUE; - -+#ifndef UZBL_GTHREAD_NO_INIT - if (!g_thread_supported()) - g_thread_init(NULL); -- -+#endif - - /* TODO: move the handler setup to event_buffer_timeout and disarm the - * handler in empty_event_buffer? */ --- -1.7.6 - diff --git a/sources b/sources index f355fe9..b408ccc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0220d4a8c1ca8d531b3e0fa22e94539c uzbl-9576f59f05.tar.gz +ce3fe2aa60ce8044fa94520e11fa251a uzbl-228bc38cbd.tar.gz diff --git a/uzbl.spec b/uzbl.spec index 1dd2090..38fddae 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -1,45 +1,40 @@ -%global uzblcommit 9576f59f05 -%global use_webkitgtk3 1 +%global uzblcommit 228bc38cbd -Name: uzbl -Summary: Lightweight WebKit browser following the UNIX philosophy -Group: Applications/Internet -Version: 0 -Release: 0.29.20111001git%{uzblcommit}%{?dist} -License: GPLv3 -URL: http://www.uzbl.org +%bcond_without gtk3 +%bcond_with webkit2 + +Name: uzbl +Summary: Lightweight WebKit browser following the UNIX philosophy +Group: Applications/Internet +Version: 0 +Release: 0.30.20120514%{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=9576f59f05 +# export uzblcommit=228bc38cbd # git archive --format tar --prefix uzbl-${uzblcommit}/ ${uzblcommit} |\ # gzip -c > ../uzbl-${uzblcommit}.tar.gz -Source0: %{name}-%{uzblcommit}.tar.gz -Source1: %{name}.desktop +Source0: %{name}-%{uzblcommit}.tar.gz +Source1: %{name}.desktop # RPM handles docs for us, won't be upstreamed -Patch0: %{name}-makefile.patch +Patch0: %{name}-makefile.patch # Fedora-specific, won't be upstreamed -Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch -# Submitted at https://github.com/Dieterbe/uzbl/pull/71 -Patch2: 0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch -Patch3: 0002-Check-if-glib-needs-g_thread_init.patch -# Submitted at https://github.com/Dieterbe/uzbl/pull/72 -Patch4: 0001-Get-the-click-context-all-the-time.patch -# From upstream -Patch5: 0001-Restrict-third-party-access-to-cookie-jar-CVE-2012-0.patch +Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch -%if %{use_webkitgtk3} -BuildRequires: webkitgtk3-devel +%if %{with gtk3} +BuildRequires: webkitgtk3-devel %else -BuildRequires: webkitgtk-devel +BuildRequires: webkitgtk-devel %endif -BuildRequires: desktop-file-utils -BuildRequires: pkgconfig +BuildRequires: desktop-file-utils +BuildRequires: pkgconfig # New users probably want a tabbed browser -Requires: uzbl-tabbed = %{version}-%{release} -Requires: uzbl-defaults = %{version}-%{release} +Requires: uzbl-tabbed = %{version}-%{release} +Requires: uzbl-defaults = %{version}-%{release} %description Uzbl is a lightweight web browser based on WebKit/Gtk+. Uzbl follows @@ -48,26 +43,26 @@ 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 +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} +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 +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 @@ -76,32 +71,32 @@ embedded uzbl-browser Ideal as a quick and simple solution to manage multiple uzbl-browser instances without getting lost. %package defaults -Summary: Default configuration for uzbl -Group: Applications/Internet -Requires: %{name}-browser = %{version}-%{release} +Summary: Default configuration for uzbl +Group: Applications/Internet +Requires: %{name}-browser = %{version}-%{release} # XXX: Be aware that script dependencies need enumerated here # Dialog for bookmarks and authentication -Requires: zenity +Requires: zenity # Communication -Requires: socat +Requires: socat # scripts/formfiller.sh (dmenu also used by loading history/bookmarks) -Requires: dmenu -Requires: xterm +Requires: dmenu +Requires: xterm # scripts/auth.py -Requires: pygtk2 +Requires: pygtk2 # scripts/download.sh -Requires: wget +Requires: wget # Default config -Requires: xclip +Requires: xclip %description defaults Default configuration for uzbl. %package vim -Summary: Vim highlighting for uzbl's config -Group: Applications/Text -Requires: vim-filesystem +Summary: Vim highlighting for uzbl's config +Group: Applications/Text +Requires: vim-filesystem %description vim Highlighting files for uzbl's configuration. @@ -111,10 +106,6 @@ Highlighting files for uzbl's configuration. %setup -q -n %{name}-%{uzblcommit} %patch0 -p1 -b .makefile %patch1 -p1 -b .fedora -%patch2 -p1 -b .jscore -%patch3 -p1 -b .gthread_init -%patch4 -p1 -b .context -%patch5 -p1 -b .cookie-perms mkdir -p icons/hicolor/32x32/apps mv examples/data/uzbl.png icons/hicolor/32x32/apps @@ -123,7 +114,17 @@ mv examples/data/uzbl.png icons/hicolor/32x32/apps %build CFLAGS="%{optflags}" export CFLAGS -make %{?_smp_mflags} +make %{?_smp_mflags} \ +%if %{with gtk3} + ENABLE_GTK3=yes \ +%else + ENABLE_GTK3=no \ +%endif +%if %{with webkit2} + ENABLE_WEBKIT2=yes \ +%else + ENABLE_WEBKIT2=no \ +%endif %install @@ -188,6 +189,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Nov 04 2012 Ben Boeckel - 0-0.30.20120514git228bc38cbd +- Update to new snapshot + * Sun Jul 22 2012 Fedora Release Engineering - 0-0.29.20111001git9576f59f05 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From c0be76be09ce6591c1cb783a7fc03f0ba3442edc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:36:28 -0600 Subject: [PATCH 36/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index 38fddae..23d00f9 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.30.20120514%{uzblcommit}%{?dist} +Release: 0.31.20120514%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -189,6 +189,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0-0.31.20120514228bc38cbd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Nov 04 2012 Ben Boeckel - 0-0.30.20120514git228bc38cbd - Update to new snapshot From e7252f45520a68e5d68b953b404163a01b12cc0e Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 20 Jun 2013 02:07:56 -0400 Subject: [PATCH 37/50] Fix NULL dereference --- uzbl-null-window.patch | 16 ++++++++++++++++ uzbl.spec | 8 +++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 uzbl-null-window.patch diff --git a/uzbl-null-window.patch b/uzbl-null-window.patch new file mode 100644 index 0000000..80d8789 --- /dev/null +++ b/uzbl-null-window.patch @@ -0,0 +1,16 @@ +diff -u -r -U5 uzbl-228bc38cbd/src/variables.c uzbl-228bc38cbd.null-window/src/variables.c +--- uzbl-228bc38cbd/src/variables.c 2012-04-28 14:27:17.000000000 -0400 ++++ uzbl-228bc38cbd.null-window/src/variables.c 2013-06-20 02:05:26.904083524 -0400 +@@ -251,11 +251,11 @@ + return G_OBJECT(webkit_web_view_get_settings(uzbl.gui.web_view)); + } + + void + set_window_property(const gchar* prop, const gchar* value) { +- if(GTK_IS_WIDGET(uzbl.gui.main_window)) { ++ if(uzbl.gui.main_window && GTK_IS_WIDGET(uzbl.gui.main_window)) { + gdk_property_change( + gtk_widget_get_window (GTK_WIDGET (uzbl.gui.main_window)), + gdk_atom_intern_static_string(prop), + gdk_atom_intern_static_string("STRING"), + 8, diff --git a/uzbl.spec b/uzbl.spec index 23d00f9..f5a4496 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.31.20120514%{uzblcommit}%{?dist} +Release: 0.32.20120514git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -23,6 +23,8 @@ Source1: %{name}.desktop Patch0: %{name}-makefile.patch # Fedora-specific, won't be upstreamed Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch +# Upstream has moved on. Will drop when updated. +Patch2: uzbl-null-window.patch %if %{with gtk3} BuildRequires: webkitgtk3-devel @@ -106,6 +108,7 @@ Highlighting files for uzbl's configuration. %setup -q -n %{name}-%{uzblcommit} %patch0 -p1 -b .makefile %patch1 -p1 -b .fedora +%patch2 -p1 -b .null-window mkdir -p icons/hicolor/32x32/apps mv examples/data/uzbl.png icons/hicolor/32x32/apps @@ -189,6 +192,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jun 20 2013 Ben Boeckel - 0-0.32.20120514git228bc38cbd +- Fix NULL-ptr dereference when setting the UZBL_URI window property + * Fri Feb 15 2013 Fedora Release Engineering - 0-0.31.20120514228bc38cbd - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From cf491fa2777aadbeb9878a63d234d22cded14bd3 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 20 Jun 2013 02:16:42 -0400 Subject: [PATCH 38/50] Handle errors in event handlers in uzbl-tabbed --- uzbl-tab-index.patch | 19 +++++++++++++++++++ uzbl.spec | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 uzbl-tab-index.patch diff --git a/uzbl-tab-index.patch b/uzbl-tab-index.patch new file mode 100644 index 0000000..5423d8c --- /dev/null +++ b/uzbl-tab-index.patch @@ -0,0 +1,19 @@ +diff -u -r -U5 uzbl-228bc38cbd/bin/uzbl-tabbed uzbl-228bc38cbd.tab-index/bin/uzbl-tabbed +--- uzbl-228bc38cbd/bin/uzbl-tabbed 2012-04-28 14:27:17.000000000 -0400 ++++ uzbl-228bc38cbd.tab-index/bin/uzbl-tabbed 2013-06-20 02:15:17.813822801 -0400 +@@ -398,11 +398,14 @@ + method = getattr(self, message_type.lower(), None) + + if method is None: + return False + +- method(*args) ++ try: ++ method(*args) ++ except: ++ print_exc() + return True + + class GlobalEventDispatcher(EventDispatcher): + def __init__(self, uzbl_tabbed): + self.uzbl_tabbed = uzbl_tabbed diff --git a/uzbl.spec b/uzbl.spec index f5a4496..f17c442 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -25,6 +25,7 @@ Patch0: %{name}-makefile.patch Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch # Upstream has moved on. Will drop when updated. Patch2: uzbl-null-window.patch +Patch3: uzbl-tab-index.patch %if %{with gtk3} BuildRequires: webkitgtk3-devel @@ -109,6 +110,7 @@ Highlighting files for uzbl's configuration. %patch0 -p1 -b .makefile %patch1 -p1 -b .fedora %patch2 -p1 -b .null-window +%patch3 -p1 -b .tab-index mkdir -p icons/hicolor/32x32/apps mv examples/data/uzbl.png icons/hicolor/32x32/apps @@ -194,6 +196,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Thu Jun 20 2013 Ben Boeckel - 0-0.32.20120514git228bc38cbd - Fix NULL-ptr dereference when setting the UZBL_URI window property +- Handle errors in uzbl-tabbed * Fri Feb 15 2013 Fedora Release Engineering - 0-0.31.20120514228bc38cbd - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 13e1dbb889872427a43d8984ba0e75edb669fc5f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 00:52:14 -0500 Subject: [PATCH 39/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index f17c442..6b7ffa5 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.32.20120514git%{uzblcommit}%{?dist} +Release: 0.33.20120514git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -194,6 +194,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0-0.33.20120514git228bc38cbd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Jun 20 2013 Ben Boeckel - 0-0.32.20120514git228bc38cbd - Fix NULL-ptr dereference when setting the UZBL_URI window property - Handle errors in uzbl-tabbed From 981d625ac328daed86868d42c186d62d1df5209b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:11:03 -0500 Subject: [PATCH 40/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index 6b7ffa5..be4f435 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.33.20120514git%{uzblcommit}%{?dist} +Release: 0.34.20120514git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -194,6 +194,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0-0.34.20120514git228bc38cbd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 0-0.33.20120514git228bc38cbd - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 57f6b26ed8c66e890ec4f95b1dfc3442a857317f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:23:07 +0000 Subject: [PATCH 41/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index be4f435..3e4cffb 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.34.20120514git%{uzblcommit}%{?dist} +Release: 0.35.20120514git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -194,6 +194,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0-0.35.20120514git228bc38cbd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 0-0.34.20120514git228bc38cbd - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 87125589788e6ae923e4df0b802eea7dfbdc5022 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 8 Feb 2015 20:31:05 -0500 Subject: [PATCH 42/50] Make the vim subpackage noarch --- uzbl.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index 3e4cffb..3b1458b 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.35.20120514git%{uzblcommit}%{?dist} +Release: 0.36.20120514git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -100,6 +100,8 @@ Default configuration for uzbl. Summary: Vim highlighting for uzbl's config Group: Applications/Text Requires: vim-filesystem +BuildArch: noarch +Obsoletes: %{name}-vim < 0-0.36 %description vim Highlighting files for uzbl's configuration. @@ -194,6 +196,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Feb 08 2015 Ben Boeckel - 0-0.34.20120514git +- Make the vim subpackage noarch + * Mon Aug 18 2014 Fedora Release Engineering - 0-0.35.20120514git228bc38cbd - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 4c3cbe821902c8291da41ae72bebab65956d8ef4 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 26 Mar 2015 16:45:34 +0000 Subject: [PATCH 43/50] Add an AppData file for the software center --- uzbl.spec | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index 3b1458b..e02a6a8 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.36.20120514git%{uzblcommit}%{?dist} +Release: 0.37.20120514git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -148,6 +148,43 @@ install -p extras/vim/ftplugin/uzbl.vim %{buildroot}%{_datadir}/vim/vimfiles/ftp mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/syntax/ install -p extras/vim/syntax/uzbl.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/uzbl.vim +# Register as an application to be visible in the software center +# +# NOTE: It would be *awesome* if this file was maintained by the upstream +# project, translated and installed into the right place during `make install`. +# +# See http://www.freedesktop.org/software/appstream/docs/ for more details. +# +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < + + + + uzbl.desktop + CC0-1.0 + Web Browser + +

+ Uzbl is a webkit based web browser with a vi-like modal user interface. + It has two modes, the command mode for running tasks such as opening a + new URI ("o" on the keyboard) or opening a new window (the "w" command). + Insert is the other mode, and is used for the input of text into the + browser window itself. +

+ + http://www.uzbl.org/ + + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/uzbl/a.png + + + +EOF %post touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : @@ -184,6 +221,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files defaults %defattr(-, root, root, -) %{_datadir}/icons/*/*/apps/%{name}.* +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/examples/config/ %{_datadir}/%{name}/examples/data/ @@ -196,6 +234,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Mar 26 2015 Richard Hughes - 0-0.37.20120514git228bc38cbd +- Add an AppData file for the software center + * Sun Feb 08 2015 Ben Boeckel - 0-0.34.20120514git - Make the vim subpackage noarch From 2b3ea9c444f20ef91e16ab6e8ad25ac9dcb27472 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:45:33 +0000 Subject: [PATCH 44/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index e02a6a8..697b688 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.37.20120514git%{uzblcommit}%{?dist} +Release: 0.38.20120514git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -234,6 +234,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0-0.38.20120514git228bc38cbd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Mar 26 2015 Richard Hughes - 0-0.37.20120514git228bc38cbd - Add an AppData file for the software center From 862dae50da9faf6202916874dc62873cc6b995c4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 2 Aug 2015 12:30:43 -0400 Subject: [PATCH 45/50] use %make_install --- uzbl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index 697b688..bf16467 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -135,7 +135,7 @@ make %{?_smp_mflags} \ %install -make DESTDIR=%{buildroot} PREFIX=%{_prefix} install +%make_install PREFIX=%{_prefix} cp -pr icons %{buildroot}%{_datadir} desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ From 0b54a8c00cbbd060ff0513d488e245b62905efd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:30:09 +0000 Subject: [PATCH 46/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index bf16467..40ccaef 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.38.20120514git%{uzblcommit}%{?dist} +Release: 0.39.20120514git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -234,6 +234,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0-0.39.20120514git228bc38cbd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 0-0.38.20120514git228bc38cbd - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From db21f100e471f91cf0fc8fa0888d92f6baec7670 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:52:55 +0000 Subject: [PATCH 47/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index 40ccaef..2c7a995 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.39.20120514git%{uzblcommit}%{?dist} +Release: 0.40.20120514git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -234,6 +234,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0-0.40.20120514git228bc38cbd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 0-0.39.20120514git228bc38cbd - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 7dbcdaa23092895b388cf859d0e885fbd421931a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:07:58 +0000 Subject: [PATCH 48/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index 2c7a995..1f0e02a 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.40.20120514git%{uzblcommit}%{?dist} +Release: 0.41.20120514git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -234,6 +234,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0-0.41.20120514git228bc38cbd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0-0.40.20120514git228bc38cbd - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From fd166be1b437c6e138df5a5f44c175526a1fa4b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:56:28 +0000 Subject: [PATCH 49/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- uzbl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uzbl.spec b/uzbl.spec index 1f0e02a..974d6d4 100644 --- a/uzbl.spec +++ b/uzbl.spec @@ -7,7 +7,7 @@ Name: uzbl Summary: Lightweight WebKit browser following the UNIX philosophy Group: Applications/Internet Version: 0 -Release: 0.41.20120514git%{uzblcommit}%{?dist} +Release: 0.42.20120514git%{uzblcommit}%{?dist} License: GPLv3 URL: http://www.uzbl.org # The source for this package was pulled from upstream's vcs. Use the @@ -234,6 +234,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0-0.42.20120514git228bc38cbd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0-0.41.20120514git228bc38cbd - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 5c69f5dfbd5e68a75852b59b6cb216976afe9dd4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 8 Dec 2017 11:56:31 -0500 Subject: [PATCH 50/50] requires webkit1 which has been retired --- .gitignore | 1 - ...pecific-error-messages-on-no-configs.patch | 37 -- dead.package | 1 + sources | 1 - uzbl-makefile.patch | 31 -- uzbl-null-window.patch | 16 - uzbl-tab-index.patch | 19 - uzbl.desktop | 9 - uzbl.spec | 383 ------------------ 9 files changed, 1 insertion(+), 497 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Fedora-specific-error-messages-on-no-configs.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 uzbl-makefile.patch delete mode 100644 uzbl-null-window.patch delete mode 100644 uzbl-tab-index.patch delete mode 100644 uzbl.desktop delete mode 100644 uzbl.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5dc1964..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/uzbl-228bc38cbd.tar.gz diff --git a/0001-Fedora-specific-error-messages-on-no-configs.patch b/0001-Fedora-specific-error-messages-on-no-configs.patch deleted file mode 100644 index 09d7ff5..0000000 --- a/0001-Fedora-specific-error-messages-on-no-configs.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 496e9af495db28e19781b60f05a52efe7bcc47eb Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Tue, 25 Oct 2011 12:28:51 -0400 -Subject: [PATCH] Fedora-specific error messages on no configs - ---- - bin/uzbl-browser | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) - -diff --git a/bin/uzbl-browser b/bin/uzbl-browser -index fb9a368..8d2f9e3 100755 ---- a/bin/uzbl-browser -+++ b/bin/uzbl-browser -@@ -39,7 +39,19 @@ if [ ! -f "$XDG_CONFIG_HOME"/uzbl/config ] - then - if [ ! -r "$EXAMPLES"/config/config ] - then -- echo "Error: Global config not found; please check if your distribution ships them separately" -+ text="Global config not found; please install the uzbl-defaults package" -+ if [ -x zenity ] -+ then -+ zenity --error --text="$text" -+ elif [ -x kdialog ] -+ then -+ kdialog --error "$text" -+ elif [ -x Xdialog ] -+ then -+ Xdialog --msgbox "Error: $text" -+ else -+ echo "Error: $text" -+ fi - exit 3 - fi - if ! cp "$EXAMPLES"/config/* "$XDG_CONFIG_HOME"/uzbl/ --- -1.7.6 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a3d2afe --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +requires webkit1 which has been retired diff --git a/sources b/sources deleted file mode 100644 index b408ccc..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -ce3fe2aa60ce8044fa94520e11fa251a uzbl-228bc38cbd.tar.gz diff --git a/uzbl-makefile.patch b/uzbl-makefile.patch deleted file mode 100644 index 5db47cb..0000000 --- a/uzbl-makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -u -r -U5 uzbl-9576f59f05/Makefile uzbl-9576f59f05.makefile/Makefile ---- uzbl-9576f59f05/Makefile 2011-10-25 15:04:48.995533888 -0400 -+++ uzbl-9576f59f05.makefile/Makefile 2011-10-25 15:08:10.280520126 -0400 -@@ -113,15 +113,10 @@ - install-dirs: - [ -d "$(INSTALLDIR)/bin" ] || install -d -m755 $(INSTALLDIR)/bin - - install-uzbl-core: all install-dirs - 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)/ - install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core - - install-event-manager: install-dirs - sed "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" < bin/uzbl-event-manager > $(INSTALLDIR)/bin/uzbl-event-manager - chmod 755 $(INSTALLDIR)/bin/uzbl-event-manager -@@ -129,10 +124,11 @@ - install-uzbl-browser: install-dirs install-uzbl-core install-event-manager - sed 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' < bin/uzbl-browser > $(INSTALLDIR)/bin/uzbl-browser - chmod 755 $(INSTALLDIR)/bin/uzbl-browser - cp -r examples $(INSTALLDIR)/share/uzbl/ - chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/* -+ chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js - - install-uzbl-tabbed: install-dirs - install -m755 bin/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed - - # you probably only want to do this manually when testing and/or to the sandbox. not meant for distributors diff --git a/uzbl-null-window.patch b/uzbl-null-window.patch deleted file mode 100644 index 80d8789..0000000 --- a/uzbl-null-window.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -u -r -U5 uzbl-228bc38cbd/src/variables.c uzbl-228bc38cbd.null-window/src/variables.c ---- uzbl-228bc38cbd/src/variables.c 2012-04-28 14:27:17.000000000 -0400 -+++ uzbl-228bc38cbd.null-window/src/variables.c 2013-06-20 02:05:26.904083524 -0400 -@@ -251,11 +251,11 @@ - return G_OBJECT(webkit_web_view_get_settings(uzbl.gui.web_view)); - } - - void - set_window_property(const gchar* prop, const gchar* value) { -- if(GTK_IS_WIDGET(uzbl.gui.main_window)) { -+ if(uzbl.gui.main_window && GTK_IS_WIDGET(uzbl.gui.main_window)) { - gdk_property_change( - gtk_widget_get_window (GTK_WIDGET (uzbl.gui.main_window)), - gdk_atom_intern_static_string(prop), - gdk_atom_intern_static_string("STRING"), - 8, diff --git a/uzbl-tab-index.patch b/uzbl-tab-index.patch deleted file mode 100644 index 5423d8c..0000000 --- a/uzbl-tab-index.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -u -r -U5 uzbl-228bc38cbd/bin/uzbl-tabbed uzbl-228bc38cbd.tab-index/bin/uzbl-tabbed ---- uzbl-228bc38cbd/bin/uzbl-tabbed 2012-04-28 14:27:17.000000000 -0400 -+++ uzbl-228bc38cbd.tab-index/bin/uzbl-tabbed 2013-06-20 02:15:17.813822801 -0400 -@@ -398,11 +398,14 @@ - method = getattr(self, message_type.lower(), None) - - if method is None: - return False - -- method(*args) -+ try: -+ method(*args) -+ except: -+ print_exc() - return True - - class GlobalEventDispatcher(EventDispatcher): - def __init__(self, uzbl_tabbed): - self.uzbl_tabbed = uzbl_tabbed diff --git a/uzbl.desktop b/uzbl.desktop deleted file mode 100644 index b1cc8af..0000000 --- a/uzbl.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Uzbl -GenericName=Uzbl Web Browser -Comment=Browse the Web -Exec=uzbl-browser -Icon=uzbl -Terminal=false -Type=Application -Categories=Network;WebBrowser; diff --git a/uzbl.spec b/uzbl.spec deleted file mode 100644 index 974d6d4..0000000 --- a/uzbl.spec +++ /dev/null @@ -1,383 +0,0 @@ -%global uzblcommit 228bc38cbd - -%bcond_without gtk3 -%bcond_with webkit2 - -Name: uzbl -Summary: Lightweight WebKit browser following the UNIX philosophy -Group: Applications/Internet -Version: 0 -Release: 0.42.20120514git%{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=228bc38cbd -# git archive --format tar --prefix uzbl-${uzblcommit}/ ${uzblcommit} |\ -# gzip -c > ../uzbl-${uzblcommit}.tar.gz -Source0: %{name}-%{uzblcommit}.tar.gz -Source1: %{name}.desktop -# RPM handles docs for us, won't be upstreamed -Patch0: %{name}-makefile.patch -# Fedora-specific, won't be upstreamed -Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch -# Upstream has moved on. Will drop when updated. -Patch2: uzbl-null-window.patch -Patch3: uzbl-tab-index.patch - -%if %{with gtk3} -BuildRequires: webkitgtk3-devel -%else -BuildRequires: webkitgtk-devel -%endif -BuildRequires: desktop-file-utils -BuildRequires: pkgconfig - -# New users probably want a tabbed browser -Requires: uzbl-tabbed = %{version}-%{release} -Requires: uzbl-defaults = %{version}-%{release} - -%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. - -%package defaults -Summary: Default configuration for uzbl -Group: Applications/Internet -Requires: %{name}-browser = %{version}-%{release} - -# XXX: Be aware that script dependencies need enumerated here -# Dialog for bookmarks and authentication -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 defaults -Default configuration for uzbl. - -%package vim -Summary: Vim highlighting for uzbl's config -Group: Applications/Text -Requires: vim-filesystem -BuildArch: noarch -Obsoletes: %{name}-vim < 0-0.36 - -%description vim -Highlighting files for uzbl's configuration. - - -%prep -%setup -q -n %{name}-%{uzblcommit} -%patch0 -p1 -b .makefile -%patch1 -p1 -b .fedora -%patch2 -p1 -b .null-window -%patch3 -p1 -b .tab-index - -mkdir -p icons/hicolor/32x32/apps -mv examples/data/uzbl.png icons/hicolor/32x32/apps - - -%build -CFLAGS="%{optflags}" -export CFLAGS -make %{?_smp_mflags} \ -%if %{with gtk3} - ENABLE_GTK3=yes \ -%else - ENABLE_GTK3=no \ -%endif -%if %{with webkit2} - ENABLE_WEBKIT2=yes \ -%else - ENABLE_WEBKIT2=no \ -%endif - - -%install -%make_install PREFIX=%{_prefix} - -cp -pr icons %{buildroot}%{_datadir} -desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ -%{SOURCE1} - -mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/ -install -p extras/vim/ftdetect/uzbl.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/uzbl.vim -mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/ftplugin/ -install -p extras/vim/ftplugin/uzbl.vim %{buildroot}%{_datadir}/vim/vimfiles/ftplugin/uzbl.vim -mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/syntax/ -install -p extras/vim/syntax/uzbl.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/uzbl.vim - -# Register as an application to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < - - - - uzbl.desktop - CC0-1.0 - Web Browser - -

- Uzbl is a webkit based web browser with a vi-like modal user interface. - It has two modes, the command mode for running tasks such as opening a - new URI ("o" on the keyboard) or opening a new window (the "w" command). - Insert is the other mode, and is used for the input of text into the - browser window itself. -

- - http://www.uzbl.org/ - - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/uzbl/a.png - - - -EOF - -%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, -) - -%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-event-manager - -%files tabbed -%defattr(-, root, root, -) -%{_bindir}/uzbl-tabbed - -%files defaults -%defattr(-, root, root, -) -%{_datadir}/icons/*/*/apps/%{name}.* -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/applications/%{name}.desktop -%{_datadir}/%{name}/examples/config/ -%{_datadir}/%{name}/examples/data/ - -%files vim -%defattr(-, root, root, -) -%{_datadir}/vim/vimfiles/ftdetect/uzbl.vim -%{_datadir}/vim/vimfiles/ftplugin/uzbl.vim -%{_datadir}/vim/vimfiles/syntax/uzbl.vim - - -%changelog -* Thu Aug 03 2017 Fedora Release Engineering - 0-0.42.20120514git228bc38cbd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0-0.41.20120514git228bc38cbd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0-0.40.20120514git228bc38cbd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0-0.39.20120514git228bc38cbd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0-0.38.20120514git228bc38cbd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Mar 26 2015 Richard Hughes - 0-0.37.20120514git228bc38cbd -- Add an AppData file for the software center - -* Sun Feb 08 2015 Ben Boeckel - 0-0.34.20120514git -- Make the vim subpackage noarch - -* Mon Aug 18 2014 Fedora Release Engineering - 0-0.35.20120514git228bc38cbd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0-0.34.20120514git228bc38cbd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0-0.33.20120514git228bc38cbd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jun 20 2013 Ben Boeckel - 0-0.32.20120514git228bc38cbd -- Fix NULL-ptr dereference when setting the UZBL_URI window property -- Handle errors in uzbl-tabbed - -* Fri Feb 15 2013 Fedora Release Engineering - 0-0.31.20120514228bc38cbd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Nov 04 2012 Ben Boeckel - 0-0.30.20120514git228bc38cbd -- Update to new snapshot - -* Sun Jul 22 2012 Fedora Release Engineering - 0-0.29.20111001git9576f59f05 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Feb 23 2012 Ben Boeckel - 0-0.28.20111001git9576f59f05 -- Lock down permissions on cookie files (CVE-2012-0843) -- Clean up vim subpackage - -* Sat Jan 14 2012 Fedora Release Engineering - 0-0.27.20111001git9576f59f05 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Oct 25 2011 Ben Boeckel - 0-0.26.20111001git9576f59f05 -- New upstream snapshot -- Add conditional support for webkitgtk3 - -* Mon Apr 4 2011 Daiki Ueno - 0-0.25.20110402gite7578e27c -- New upstream snapshot -- Don't install removed uzbl-cookie-manager and related files. - -* Wed Mar 2 2011 Daiki Ueno - 0-0.24.20110215git8bbc39b83 -- New upstream snapshot - -* Mon Feb 07 2011 Fedora Release Engineering - 0-0.23.20101125git518004933 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 25 2011 Ben Boeckel - 0-0.22.20101125git518004933 -- Update the vim subpackage to install for 7.3 - -* Mon Nov 29 2010 Daiki Ueno - 0-0.21.20101125git518004933 -- omit unnecessary buildroot stuff - -* Mon Nov 29 2010 Daiki Ueno - 0-0.20.20101125git518004933 -- new upstream snapshot. -- remove patches incorporated into the upstream git master. - -* Sun Oct 10 2010 Ben Boeckel - 0-0.19.20100626gitafc0f873e -- Split out -defaults package -- Install vim files -- Remove -O0 compile flag -- Use %%{optflags} - -* Mon Sep 6 2010 Daiki Ueno - 0-0.18.20100626gitafc0f873e -- add patch to avoid crash on "Open Image in New Window" (#584733) - -* Fri Aug 20 2010 Ben Boeckel - 0-0.17.20100626gitafc0f873e -- Add Requires: on xclip - -* Fri Aug 06 2010 Ben Boeckel - 0-0.16.20100626gitafc0f873e -- Add patch for shell escaping bug (BZ#621965) - -* Sat Jul 03 2010 Ben Boeckel - 0-0.15.20100626gitafc0f873e -- Rebuild against webkitgtk - -* Wed Jun 30 2010 Daiki Ueno - 0-0.14.20100626gitafc0f873e -- new upstream snapshot. - -* Mon May 31 2010 Daiki Ueno - 0-0.13.20100410gitec473e124 -- new upstream snapshot. - -* Wed Apr 14 2010 Ben Boeckel - 0-0.12.20100405gitae15d257a -- Split out core and browser subpackages -- Enumerate dependencies of the default scripts -- Minor reorganization - -* Thu Apr 8 2010 Daiki Ueno - 0-0.11.20100405gitae15d257a -- don't strip uzbl-core with the install command (closes #580250). - -* Mon Apr 5 2010 Daiki Ueno - 0-0.10.20100405gitae15d257a -- split out uzbl-tabbed as a seperate package to avoid dependency on - pygtk2 (partially merged a patch from Ben Boeckel ). -- new upstream snapshot. - -* Fri Mar 26 2010 Daiki Ueno - 0-0.9.20100221gitabbffe5c3 -- add dist number to Release. - -* Fri Mar 19 2010 Daiki Ueno - 0-0.8.20100221gitabbffe5c3 -- use the macro "global" instead of "define". - -* Thu Mar 18 2010 Daiki Ueno - 0-0.7.20100221gitabbffe5c3 -- copy files under /usr/share/uzbl/ only once. - -* Tue Mar 16 2010 Daiki Ueno - 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 - 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 - 0-0.4.20100221gitabbffe5c3 -- make sure support scripts are not executable. - -* Sun Mar 7 2010 Daiki Ueno - 0-0.3.20100221gitabbffe5c3 -- use LDFLAGS from x11.pc to follow the F-13 DSO linking change. - -* Sun Mar 7 2010 Daiki Ueno - 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 - 1:0-0.1.20100221gitabbffe5c3 -- initial packaging for fedora.