rpms/libproxy
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Change WebKitGTK API dependency to 4.1 (using libsoup3)

Browse Source
This commit is contained in:
Milan Crha 2022-07-19 15:51:54 +02:00
parent 8738c3fe7e
commit 09e2d4576b
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libproxy.spec
View File

@ -4,7 +4,7 @@
Name: libproxy Name: libproxy
Version: 0.4.18 Version: 0.4.18
Release: 1%{?dist} Release: 2%{?dist}
Summary: A library handling all the details of proxy configuration Summary: A library handling all the details of proxy configuration
License: LGPLv2+ License: LGPLv2+
@ -13,6 +13,8 @@ Source0: https://github.com/libproxy/%{name}/releases/download/%{version}
# Taken from the Debian package. # Taken from the Debian package.
Source1: proxy.1 Source1: proxy.1
Patch01: webkitdep.patch
BuildRequires: cmake >= 2.6.0 BuildRequires: cmake >= 2.6.0
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -24,7 +26,7 @@ BuildRequires: pkgconfig(libnm)
# pacrunner (and NetworkManager) # pacrunner (and NetworkManager)
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
# webkit (gtk3) # webkit (gtk3)
BuildRequires: pkgconfig(javascriptcoregtk-4.0) BuildRequires: pkgconfig(javascriptcoregtk-4.1)
# Python # Python
BuildRequires: python3-devel BuildRequires: python3-devel
%else %else
@ -208,6 +210,9 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1
%changelog %changelog
* Tue Jul 19 2022 Milan Crha <mcrha@redhat.com> - 0.4.18-2
- Change WebKitGTK API dependency to 4.1 (using libsoup3)
* Tue Jun 21 2022 David King <amigadave@amigadave.com> - 0.4.18-1 * Tue Jun 21 2022 David King <amigadave@amigadave.com> - 0.4.18-1
- Update to 0.4.18 - Update to 0.4.18

21
webkitdep.patch Normal file
View File

@ -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)