From d89a73496615f312561765f94586e4ab6b0d0c7894ac6052151a01f305508a5f Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 8 Jun 2011 14:22:58 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/libproxy revision 32.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=8e09729b21e27d074da408a94dd4ef6a --- libproxy-plugins.spec | 12 ++++++++++-- libproxy.spec | 10 +++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 00364bc..f1cc436 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package libproxy +# spec file for package libproxy-plugins # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -215,9 +215,12 @@ libproxy offers the following features: * extremely small core %else %if 0%{?favor_gtk2} + %package -n libproxy1-config-gnome + Summary: Libproxy module for GNOME configuration %else + %package -n libproxy1-config-gnome3 Summary: Libproxy module for GNOME3 configuration %endif @@ -238,14 +241,17 @@ Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} %if 0%{?favor_gtk2} + %description -n libproxy1-config-gnome + %else + %description -n libproxy1-config-gnome3 + %endif A module to extend libproxy with capabilities to query GNOME about proxy settings. - %package -n libproxy1-config-kde4 License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for KDE configuration @@ -465,11 +471,13 @@ make test %{_libdir}/libproxy-%{version}/modules/config_kde4.so %if 0%{?favor_gtk2} + %files -n libproxy1-config-gnome %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome.so %{_libexecdir}/libproxy-%{version}/pxgconf %else + %files -n libproxy1-config-gnome3 %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome3.so diff --git a/libproxy.spec b/libproxy.spec index 9c6cc62..19b060d 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -215,9 +215,12 @@ libproxy offers the following features: * extremely small core %else %if 0%{?favor_gtk2} + %package -n libproxy1-config-gnome + Summary: Libproxy module for GNOME configuration %else + %package -n libproxy1-config-gnome3 Summary: Libproxy module for GNOME3 configuration %endif @@ -238,14 +241,17 @@ Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} %if 0%{?favor_gtk2} + %description -n libproxy1-config-gnome + %else + %description -n libproxy1-config-gnome3 + %endif A module to extend libproxy with capabilities to query GNOME about proxy settings. - %package -n libproxy1-config-kde4 License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for KDE configuration @@ -465,11 +471,13 @@ make test %{_libdir}/libproxy-%{version}/modules/config_kde4.so %if 0%{?favor_gtk2} + %files -n libproxy1-config-gnome %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome.so %{_libexecdir}/libproxy-%{version}/pxgconf %else + %files -n libproxy1-config-gnome3 %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome3.so From 8e3a57d343d2b4d901a24cf6b5959cc10da13b03cecbd5172ea2997db1517266 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 20 Jun 2011 18:33:26 +0000 Subject: [PATCH 2/2] Accepting request 74231 from home:dimstar:branches:GNOME:Factory Fix build of the plugins when using libwebkitgtk-3.0 1.5.1 OBS-URL: https://build.opensuse.org/request/show/74231 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=65 --- libproxy-javascriptcoregtk.patch | 17 +++++++++++++++++ libproxy-plugins.changes | 8 ++++++++ libproxy-plugins.spec | 5 ++++- libproxy.changes | 8 ++++++++ libproxy.spec | 3 +++ 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 libproxy-javascriptcoregtk.patch diff --git a/libproxy-javascriptcoregtk.patch b/libproxy-javascriptcoregtk.patch new file mode 100644 index 0000000..affab35 --- /dev/null +++ b/libproxy-javascriptcoregtk.patch @@ -0,0 +1,17 @@ +Index: libproxy/cmake/modules/pacrunner_webkit.cmk +=================================================================== +--- libproxy/cmake/modules/pacrunner_webkit.cmk (revision 815) ++++ libproxy/cmake/modules/pacrunner_webkit.cmk (working copy) +@@ -13,7 +13,10 @@ + endif() + else() + if(WITH_WEBKIT3) +- px_check_modules(WEBKIT webkitgtk-3.0) ++ px_check_modules(WEBKIT javascriptcoregtk-3.0>=1.5.0) ++ if(NOT WEBKIT_LIBRARIES) ++ px_check_modules(WEBKIT webkitgtk-3.0<1.5.0) ++ endif(NOT WEBKIT_LIBRARIES) + else() + px_check_modules(WEBKIT webkit-1.0) + endif() + diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 5fd0547..9c1ee30 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 20 18:26:49 UTC 2011 - dimstar@opensuse.org + +- Add libproxy-javascriptcoregtk.patch: Fix build with + webkitgtk-3.0 version 1.5.1: javascriptcoregtk became independent + and can be used on it's own now and is actually what libproxy + depends on. Patch taken from upstream svn, r816. + ------------------------------------------------------------------- Mon Jun 6 21:51:45 UTC 2011 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index f1cc436..e482b61 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package libproxy-plugins +# spec file for package libproxy # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -53,6 +53,8 @@ Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf +# PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dimstar@opensuse.org -- Fix build with javascriptcoregtk3, which got split out of webkitgtk3. Patch from upstream svn. +Patch0: libproxy-javascriptcoregtk.patch License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -319,6 +321,7 @@ about network configuration changes. %prep %setup -q -n %{_sourcename} +%patch0 -p0 mkdir build %build diff --git a/libproxy.changes b/libproxy.changes index 5fd0547..9c1ee30 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 20 18:26:49 UTC 2011 - dimstar@opensuse.org + +- Add libproxy-javascriptcoregtk.patch: Fix build with + webkitgtk-3.0 version 1.5.1: javascriptcoregtk became independent + and can be used on it's own now and is actually what libproxy + depends on. Patch taken from upstream svn, r816. + ------------------------------------------------------------------- Mon Jun 6 21:51:45 UTC 2011 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index 19b060d..1e0f04e 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -53,6 +53,8 @@ Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf +# PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dimstar@opensuse.org -- Fix build with javascriptcoregtk3, which got split out of webkitgtk3. Patch from upstream svn. +Patch0: libproxy-javascriptcoregtk.patch License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -319,6 +321,7 @@ about network configuration changes. %prep %setup -q -n %{_sourcename} +%patch0 -p0 mkdir build %build