[arch-commits] Commit in libproxy/trunk (PKGBUILD libproxy-0.4.11-crash.patch)

[Jan de Groot]

    Date: Thursday, May 11, 2017 @ 21:36:58
  Author: jgc
Revision: 295844

upgpkg: libproxy 0.4.15-1

Re-add mozjs pacrunner, based on js38 now
Compile both python 2.x and 3.x bindings

Modified:
  libproxy/trunk/PKGBUILD
Deleted:
  libproxy/trunk/libproxy-0.4.11-crash.patch

-----------------------------+
 PKGBUILD                    |   24 +++++++++++-------------
 libproxy-0.4.11-crash.patch |   41 -----------------------------------------
 2 files changed, 11 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-11 21:20:18 UTC (rev 295843)
+++ PKGBUILD	2017-05-11 21:36:58 UTC (rev 295844)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libproxy
-pkgver=0.4.13
-pkgrel=2
+pkgver=0.4.15
+pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -10,20 +10,18 @@
 depends=('gcc-libs')
 optdepends=('networkmanager: NetworkManager configuration module'
             'perl: Perl bindings'
-            'python2: Python bindings'
+            'python2: Python 2.x bindings'
+            'python: Python 3.x bindings'
             'glib2: gsettings configuration module'
-            'webkit2gtk: PAC proxy support')
-makedepends=('cmake' 'networkmanager' 'python2' 'perl' 'webkit2gtk')
+            'webkit2gtk: PAC proxy support (Webkit2gtk engine)'
+            'js38: PAC proxy support (spidermonkey engine)')
+makedepends=('cmake' 'networkmanager' 'python' 'python2' 'perl' 'webkit2gtk' 'js38')
 url="http://libproxy.github.io/libproxy/"
-source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz
-        libproxy-0.4.11-crash.patch)
-md5sums=('de293bb311f185a2ffa3492700a694c2'
-         'a45f2195c164a48639e963e8341f5d93')
+source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz)
+sha256sums=('18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0')
 
 prepare() {
   mkdir build
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../libproxy-0.4.11-crash.patch
 }
 
 build() {
@@ -35,10 +33,10 @@
     -DPERL_VENDORINSTALL=yes \
     -DCMAKE_BUILD_TYPE=Release \
     -DWITH_WEBKIT3=ON \
-    -DWITH_MOZJS=OFF \
+    -DWITH_MOZJS=ON \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
     -DCMAKE_C_FLAGS="${CFLAGS}" \
-    -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2 \
+    -DPYTHON2_EXECUTABLE:FILEPATH=/usr/bin/python2 \
     -DBIPR=0
   make
 }

Deleted: libproxy-0.4.11-crash.patch
===================================================================
--- libproxy-0.4.11-crash.patch	2017-05-11 21:20:18 UTC (rev 295843)
+++ libproxy-0.4.11-crash.patch	2017-05-11 21:36:58 UTC (rev 295844)
@@ -1,41 +0,0 @@
-diff -up libproxy-0.4.11/libproxy/extension_pacrunner.cpp.crash libproxy-0.4.11/libproxy/extension_pacrunner.cpp
---- libproxy-0.4.11/libproxy/extension_pacrunner.cpp.crash	2010-07-29 08:14:59.000000000 -0400
-+++ libproxy-0.4.11/libproxy/extension_pacrunner.cpp	2013-11-11 15:23:56.987266457 -0500
-@@ -22,20 +22,10 @@ using namespace libproxy;
- 
- pacrunner::pacrunner(string, const url&) {}
- 
--pacrunner_extension::pacrunner_extension() {
--	this->pr = NULL;
--}
-+pacrunner_extension::pacrunner_extension() {}
- 
--pacrunner_extension::~pacrunner_extension() {
--	if (this->pr) delete this->pr;
--}
-+pacrunner_extension::~pacrunner_extension() {}
- 
- pacrunner* pacrunner_extension::get(string pac, const url& pacurl) throw (bad_alloc) {
--	if (this->pr) {
--		if (this->last == pac)
--			return this->pr;
--		delete this->pr;
--	}
--
--	return this->pr = this->create(pac, pacurl);
-+	return this->create(pac, pacurl);
- }
-diff -up libproxy-0.4.11/libproxy/proxy.cpp.crash libproxy-0.4.11/libproxy/proxy.cpp
---- libproxy-0.4.11/libproxy/proxy.cpp.crash	2013-11-11 15:25:27.309271353 -0500
-+++ libproxy-0.4.11/libproxy/proxy.cpp	2013-11-11 15:25:31.569271584 -0500
-@@ -416,7 +416,9 @@ void proxy_factory::run_pac(url &realurl
- 
- 		/* Run the PAC, but only try one PACRunner */
- 		if (debug) cerr << "Using pacrunner: " << typeid(*pacrunners[0]).name() << endl;
--		string pacresp = pacrunners[0]->get(this->pac, this->pacurl->to_string())->run(realurl);
-+		pacrunner* runner = pacrunners[0]->get(this->pac, this->pacurl->to_string());
-+		string pacresp = runner->run(realurl);
-+		delete runner;
- 		if (debug) cerr << "Pacrunner returned: " << pacresp << endl;
- 		format_pac_response(pacresp, response);
- 	}