From 09e2d4576bc0b84493580e34c2e2ae62a5f4b911 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 19 Jul 2022 15:51:54 +0200 Subject: [PATCH] Change WebKitGTK API dependency to 4.1 (using libsoup3) --- libproxy.spec | 9 +++++++-- webkitdep.patch | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 webkitdep.patch diff --git a/libproxy.spec b/libproxy.spec index 4765797..d30e1a2 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -4,7 +4,7 @@ Name: libproxy Version: 0.4.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library handling all the details of proxy configuration License: LGPLv2+ @@ -13,6 +13,8 @@ Source0: https://github.com/libproxy/%{name}/releases/download/%{version} # Taken from the Debian package. Source1: proxy.1 +Patch01: webkitdep.patch + BuildRequires: cmake >= 2.6.0 BuildRequires: gcc-c++ @@ -24,7 +26,7 @@ BuildRequires: pkgconfig(libnm) # pacrunner (and NetworkManager) BuildRequires: pkgconfig(dbus-1) # webkit (gtk3) -BuildRequires: pkgconfig(javascriptcoregtk-4.0) +BuildRequires: pkgconfig(javascriptcoregtk-4.1) # Python BuildRequires: python3-devel %else @@ -208,6 +210,9 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1 %changelog +* Tue Jul 19 2022 Milan Crha - 0.4.18-2 +- Change WebKitGTK API dependency to 4.1 (using libsoup3) + * Tue Jun 21 2022 David King - 0.4.18-1 - Update to 0.4.18 diff --git a/webkitdep.patch b/webkitdep.patch new file mode 100644 index 0000000..7c1c8b1 --- /dev/null +++ b/webkitdep.patch @@ -0,0 +1,21 @@ +diff -up libproxy-0.4.18/libproxy/cmake/modules/pacrunner_webkit.cmk.1 libproxy-0.4.18/libproxy/cmake/modules/pacrunner_webkit.cmk +--- libproxy-0.4.18/libproxy/cmake/modules/pacrunner_webkit.cmk.1 2022-07-19 15:50:24.029762425 +0200 ++++ libproxy-0.4.18/libproxy/cmake/modules/pacrunner_webkit.cmk 2022-07-19 15:50:27.977762571 +0200 +@@ -13,11 +13,14 @@ elseif(APPLE) + endif() + else() + if(WITH_WEBKIT3) +- px_check_modules(WEBKIT "javascriptcoregtk-4.0") ++ px_check_modules(WEBKIT "javascriptcoregtk-4.1") + if(NOT WEBKIT_LIBRARIES) +- 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) + endif(NOT WEBKIT_LIBRARIES) + else(WITH_WEBKIT)