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