[arch-commits] Commit in libproxy/trunk (2 files)

[Jan de Groot]

    Date: Thursday, January 26, 2017 @ 12:33:26
  Author: jgc
Revision: 287508

upgpkg: libproxy 0.4.13-2

Remove mozjs pacrunner, add hack to make webkit pacrunner optional

Modified:
  libproxy/trunk/PKGBUILD
Deleted:
  libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch

----------------------------------------------------+
 0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch |   90 -------------------
 PKGBUILD                                           |   15 +--
 2 files changed, 6 insertions(+), 99 deletions(-)

Deleted: 0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
===================================================================
--- 0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch	2017-01-26 12:05:48 UTC (rev 287507)
+++ 0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch	2017-01-26 12:33:26 UTC (rev 287508)
@@ -1,90 +0,0 @@
-From cccc44ce0c8a251d987d0d83f05e93d31aa659d7 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters at verbum.org>
-Date: Mon, 3 Jun 2013 17:09:25 -0400
-Subject: [PATCH] pacrunner_mozjs: Also support mozjs-17.0
-
-GNOME 3.10 is moving to hard require mozjs-17.0, so we should support
-it too.  See also:
-
-https://bugs.freedesktop.org/show_bug.cgi?id=59830
-https://bugzilla.gnome.org/show_bug.cgi?id=690982
----
- libproxy/cmake/modules/pacrunner_mozjs.cmk |    8 +++++++-
- libproxy/modules/pacrunner_mozjs.cpp       |   16 +++++++++++++---
- 2 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk
-index 21072db..49856a6 100644
---- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
-+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
-@@ -14,7 +14,13 @@ elseif(NOT APPLE)
-       include_directories(${MOZJS_INCLUDE_DIRS})
-       link_directories(${MOZJS_LIBRARY_DIRS})
-     else()
--      set(MOZJS_FOUND 0)
-+      pkg_search_module(MOZJS mozjs-17.0)
-+      if(MOZJS_FOUND)
-+        include_directories(${MOZJS_INCLUDE_DIRS})
-+        link_directories(${MOZJS_LIBRARY_DIRS})
-+      else()
-+        set(MOZJS_FOUND 0)
-+      endif()
-     endif()
-   else()
-     set(MOZJS_FOUND 0)
-diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
-index abb4b9d..f5e678c 100644
---- a/libproxy/modules/pacrunner_mozjs.cpp
-+++ b/libproxy/modules/pacrunner_mozjs.cpp
-@@ -19,6 +19,7 @@
- 
- #include <cstring> // ?
- #include <unistd.h> // gethostname
-+#include <stdint.h>
- 
- #include "../extension_pacrunner.hpp"
- using namespace libproxy;
-@@ -76,12 +77,12 @@ static JSBool dnsResolve_(JSContext *cx, jsval hostname, jsval *vp) {
- 		return true;
- }
- 
--static JSBool dnsResolve(JSContext *cx, uintN /*argc*/, jsval *vp) {
-+static JSBool dnsResolve(JSContext *cx, uint32_t /*argc*/, jsval *vp) {
- 	jsval *argv = JS_ARGV(cx, vp);
- 	return dnsResolve_(cx, argv[0], vp);
- }
- 
--static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) {
-+static JSBool myIpAddress(JSContext *cx, uint32_t /*argc*/, jsval *vp) {
- 	char *hostname = (char *) JS_malloc(cx, 1024);
- 	if (!gethostname(hostname, 1023)) {
- 		JSString *myhost = JS_NewStringCopyN(cx, hostname, strlen(hostname));
-@@ -98,7 +99,12 @@ static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) {
- static JSClass cls = {
- 		"global", JSCLASS_GLOBAL_FLAGS,
- 		JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
--		JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
-+		JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub,
-+#if JS_VERSION == 186      
-+		NULL,
-+#else
-+		JS_FinalizeStub,
-+#endif
- 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
- };
- 
-@@ -117,7 +123,11 @@ public:
- 	    //JS_SetOptions(this->jsctx, JSOPTION_VAROBJFIX);
- 	    //JS_SetVersion(this->jsctx, JSVERSION_LATEST);
- 	    //JS_SetErrorReporter(cx, reportError);
-+#if JS_VERSION == 186
-+		if (!(this->jsglb = JS_NewGlobalObject(this->jsctx, &cls, NULL))) goto error;
-+#else
- 		if (!(this->jsglb = JS_NewCompartmentAndGlobalObject(this->jsctx, &cls, NULL))) goto error;
-+#endif
- 		if (!JS_InitStandardClasses(this->jsctx, this->jsglb))            goto error;
- 
- 		// Define Javascript functions
--- 
-1.7.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-26 12:05:48 UTC (rev 287507)
+++ PKGBUILD	2017-01-26 12:33:26 UTC (rev 287508)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.13
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -12,21 +12,17 @@
             'perl: Perl bindings'
             'python2: Python bindings'
             'glib2: gsettings configuration module'
-            'js17: PAC proxy support - Mozilla based pacrunner'
-            'webkit2gtk: PAC proxy support - Webkit based pacrunner')
-makedepends=('cmake' 'networkmanager' 'python2' 'perl' 'js17' 'webkit2gtk')
+            'webkit2gtk: PAC proxy support')
+makedepends=('cmake' 'networkmanager' 'python2' 'perl' 'webkit2gtk')
 url="http://libproxy.github.io/libproxy/"
 source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz
-        0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
         libproxy-0.4.11-crash.patch)
 md5sums=('de293bb311f185a2ffa3492700a694c2'
-         '16cb8ad1292f04279108a80f36434c7b'
          'a45f2195c164a48639e963e8341f5d93')
 
 prepare() {
   mkdir build
   cd $pkgname-$pkgver
-  patch -Np1 -i ../0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
   patch -Np1 -i ../libproxy-0.4.11-crash.patch
 }
 
@@ -39,10 +35,11 @@
     -DPERL_VENDORINSTALL=yes \
     -DCMAKE_BUILD_TYPE=Release \
     -DWITH_WEBKIT3=ON \
-    -DWITH_MOZJS=ON \
+    -DWITH_MOZJS=OFF \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
     -DCMAKE_C_FLAGS="${CFLAGS}" \
-    -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2
+    -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2 \
+    -DBIPR=0
   make
 }