diff --git a/libproxy-0.4.12-javascriptcoregtk4.patch b/libproxy-0.4.12-javascriptcoregtk4.patch new file mode 100644 index 0000000..bd43cdb --- /dev/null +++ b/libproxy-0.4.12-javascriptcoregtk4.patch @@ -0,0 +1,45 @@ +From 00975fa11220af11398f9d89ee2ee0cf17c655d2 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Mon, 18 Jan 2016 19:13:14 +0100 +Subject: [PATCH] pacrunner_webkit: allow linking against javascriptcore-4.0 + +--- + NEWS | 5 +++++ + libproxy/cmake/modules/pacrunner_webkit.cmk | 9 ++++++--- + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/NEWS b/NEWS +index 89ec2c7..0676831 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,8 @@ ++New in Version 0.4.13 ++============================== ++* Allow linking webkit pacrunner against javascriptcore-4.0 ++ (webkit2) ++ + New in version 0.4.12 + ============================== + * Move development to github.com/libproxy/libproxy +diff --git a/libproxy/cmake/modules/pacrunner_webkit.cmk b/libproxy/cmake/modules/pacrunner_webkit.cmk +index 0a99d18..c5afcc2 100644 +--- a/libproxy/cmake/modules/pacrunner_webkit.cmk ++++ b/libproxy/cmake/modules/pacrunner_webkit.cmk +@@ -13,11 +13,14 @@ elseif(APPLE) + endif() + else() + if(WITH_WEBKIT3) +- px_check_modules(WEBKIT "javascriptcoregtk-3.0 >= 1.5.0") ++ px_check_modules(WEBKIT "javascriptcoregtk-4.0") + if(NOT WEBKIT_LIBRARIES) +- px_check_modules(WEBKIT "webkitgtk-3.0 < 1.5.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) + endif(NOT WEBKIT_LIBRARIES) +- else() ++ else(WITH_WEBKIT3) + px_check_modules(WEBKIT webkit-1.0) + endif() + endif() diff --git a/libproxy.spec b/libproxy.spec index d3dd28b..e49d986 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -13,6 +13,8 @@ URL: https://libproxy.github.io/libproxy/ Source0: https://github.com/libproxy/%{name}/archive/%{version}.tar.gz # http://code.google.com/p/libproxy/issues/detail?id=152 Patch0: 0001-Add-config-module-for-querying-PacRunner-d-mon.patch +# Taken from upstream git. +Patch1: libproxy-0.4.12-javascriptcoregtk4.patch BuildRequires: python2-devel BuildRequires: libmodman-devel >= 2.0.1 @@ -28,7 +30,7 @@ BuildRequires: pkgconfig(NetworkManager) # pacrunner (and NetworkManager) BuildRequires: pkgconfig(dbus-1) # webkit (gtk3) -BuildRequires: pkgconfig(javascriptcoregtk-3.0) >= 1.5.0 +BuildRequires: pkgconfig(javascriptcoregtk-4.0) # kde BuildRequires: /usr/bin/kreadconfig5 %else @@ -105,14 +107,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-networkmanager package contains the %{name} plugin for networkmanager. -%package webkitgtk3 +%package webkitgtk4 Summary: Plugin for %{name} and webkitgtk3 Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Provides: %{name}-pac = %{version}-%{release} +# Remove compatibility in F26. +Provides: %{name}-webkitgtk3 = %{version}-%{release} +Obsoletes: %{name}-webkitgtk3 < 0.4.12-1 -%description webkitgtk3 -The %{name}-webkitgtk3 package contains the %{name} plugin for +%description webkitgtk4 +The %{name}-webkitgtk4 package contains the %{name} plugin for webkitgtk3. %package pacrunner @@ -139,6 +144,7 @@ developing applications that use %{name}. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{cmake} \ @@ -195,7 +201,7 @@ make test %files networkmanager %{_libdir}/%{name}/%{version}/modules/network_networkmanager.so -%files webkitgtk3 +%files webkitgtk4 %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so %files pacrunner @@ -216,6 +222,7 @@ make test - Use isa macro when requiring base package - Use license macro for COPYING - Use pkgconfig for BuildRequires +- Use javascriptcoregtk-4.0 * Thu Feb 04 2016 Fedora Release Engineering - 0.4.11-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild