From 31afbeb2d3841ca27bca313cf720d56d59d15601 Mon Sep 17 00:00:00 2001 From: 18302918689 <1360148247@qq.com> Date: Mon, 19 Oct 2020 16:00:13 +0800 Subject: [PATCH] build with mozjs60 --- libproxy-0.4.15-mozjs60.patch | 23 +++++++++++++++++++++++ libproxy.spec | 11 +++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 libproxy-0.4.15-mozjs60.patch diff --git a/libproxy-0.4.15-mozjs60.patch b/libproxy-0.4.15-mozjs60.patch new file mode 100644 index 0000000..5e81a70 --- /dev/null +++ b/libproxy-0.4.15-mozjs60.patch @@ -0,0 +1,23 @@ +From 1600c6af7ed775d4ccbb239937acd92ef7162409 Mon Sep 17 00:00:00 2001 +From: Laurent Bigonville +Date: Sun, 9 Dec 2018 16:07:55 +0100 +Subject: [PATCH] Build with mozjs 60 instead + +This seems enough to make it work with mozjs 60 +--- + libproxy/cmake/modules/pacrunner_mozjs.cmk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk +index 20857fb..871cc85 100644 +--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk ++++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk +@@ -9,7 +9,7 @@ if(WIN32) + elseif(NOT APPLE) + option(WITH_MOZJS "Search for MOZJS package" ON) + if (WITH_MOZJS) +- pkg_search_module(MOZJS mozjs-52) ++ pkg_search_module(MOZJS mozjs-60) + if(MOZJS_FOUND) + include_directories(${MOZJS_INCLUDE_DIRS}) + link_directories(${MOZJS_LIBRARY_DIRS}) diff --git a/libproxy.spec b/libproxy.spec index b0964b7..d71151a 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -1,6 +1,6 @@ Name: libproxy Version: 0.4.15 -Release: 14 +Release: 15 Summary: Libproxy is a library that provides automatic proxy configuration management License: LGPLv2+ @@ -14,9 +14,10 @@ Patch1: libproxy-0.4.11-crash.patch # Patch 2 and 3 are backported from upstream commuity Patch2: libproxy-0.4.15-python3738.patch Patch3: libproxy-0.4.15-mozjs52.patch +Patch4: libproxy-0.4.15-mozjs60.patch BuildRequires: cmake >= 2.6.0 gcc-c++ -BuildRequires: pkgconfig(gio-2.0) >= 2.26 pkgconfig(mozjs-52) pkgconfig(libnm) python2-devel python3-devel +BuildRequires: pkgconfig(gio-2.0) >= 2.26 pkgconfig(mozjs-60) pkgconfig(libnm) python2-devel python3-devel BuildRequires: pkgconfig(dbus-1) pkgconfig(javascriptcoregtk-4.0) Provides: %{name}-bin %{name}-gnome %{name}-kde %{name}-mozjs %{name}-networkmanager %{name}-pacrunner @@ -122,6 +123,12 @@ make test %{_mandir}/man1/proxy.1* %changelog +* Mon Oct 19 2020 hanhui - 0.4.15-15 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:build with mozjs60 + * Thu Aug 6 2020 zengwefeng - 0.4.15-14 - Type:bugfix - Id:NA -- Gitee