diff --git a/libproxy-0.4.15-mozjs52.patch b/libproxy-0.4.15-mozjs52.patch index 535df6d..a9e2ce9 100644 --- a/libproxy-0.4.15-mozjs52.patch +++ b/libproxy-0.4.15-mozjs52.patch @@ -99,3 +99,26 @@ index a70b2e9..ed07c69 100644 JSContext *jsctx; JS::Heap *jsglb; JSAutoCompartment *jsac; +From a9b052c6e30101fb0b702917f245a3e2a2f08366 Mon Sep 17 00:00:00 2001 +From: Laurent Bigonville +Date: Tue, 2 Oct 2018 10:22:56 +0200 +Subject: [PATCH] Add call to JS::InitSelfHostedCode() + +This is needed otherwise mozjs crashes +--- + libproxy/modules/pacrunner_mozjs.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp +index ed07c69..38e7d46 100644 +--- a/libproxy/modules/pacrunner_mozjs.cpp ++++ b/libproxy/modules/pacrunner_mozjs.cpp +@@ -118,6 +118,8 @@ class mozjs_pacrunner : public pacrunner { + // Initialize Javascript context + if (!(this->jsctx = JS_NewContext(1024 * 1024))) goto error; + { ++ if (!JS::InitSelfHostedCode(this->jsctx)) goto error; ++ + JS::RootedValue rval(this->jsctx); + JS::CompartmentOptions compart_opts; + 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 01828fc..64b69ca 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -4,7 +4,7 @@ Name: libproxy Version: 0.4.15 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A library handling all the details of proxy configuration License: LGPLv2+ @@ -17,7 +17,10 @@ Patch0: 0001-Add-config-module-for-querying-PacRunner-d-mon.patch Patch1: libproxy-0.4.11-crash.patch Patch2: libproxy-0.4.15-python3738.patch # https://github.com/libproxy/libproxy/pull/86 +# https://github.com/libproxy/libproxy/pull/87 Patch3: libproxy-0.4.15-mozjs52.patch +# https://github.com/libproxy/libproxy/pull/95 +Patch4: libproxy-0.4.15-mozjs60.patch BuildRequires: cmake >= 2.6.0 BuildRequires: gcc-c++ @@ -27,7 +30,7 @@ BuildRequires: libmodman-devel >= 2.0.1 # gnome BuildRequires: pkgconfig(gio-2.0) >= 2.26 # mozjs -BuildRequires: pkgconfig(mozjs-52) +BuildRequires: pkgconfig(mozjs-60) # NetworkManager BuildRequires: pkgconfig(libnm) # pacrunner (and NetworkManager) @@ -221,6 +224,9 @@ make test %changelog +* Fri Feb 08 2019 Kalev Lember - 0.4.15-13 +- Build with mozjs60 + * Fri Feb 01 2019 Fedora Release Engineering - 0.4.15-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild