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

[Jan de Groot]

    Date: Thursday, July 27, 2017 @ 09:33:01
  Author: jgc
Revision: 301298

upgpkg: libproxy 0.4.15-4

Kill mozjs pacrunner until upstream or fedora finds a fix that does not crash (FS#54403)

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

-----------------------------+
 PKGBUILD                    |   21 +++++++++------------
 libproxy-0.4.11-crash.patch |   12 ------------
 2 files changed, 9 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-27 09:12:26 UTC (rev 301297)
+++ PKGBUILD	2017-07-27 09:33:01 UTC (rev 301298)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=3
+pkgrel=4
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -13,19 +13,16 @@
             'python2: Python 2.x bindings'
             'python: Python 3.x bindings'
             'glib2: gsettings configuration module'
-            'webkit2gtk: PAC proxy support (Webkit2gtk engine)'
-            'js38: PAC proxy support (spidermonkey engine)')
-makedepends=('cmake' 'networkmanager' 'python' 'python2' 'perl' 'webkit2gtk' 'js38')
+            'webkit2gtk: PAC proxy support (Webkit2gtk engine)')
+makedepends=('cmake' 'networkmanager' 'python' 'python2' 'perl' 'webkit2gtk')
 url="http://libproxy.github.io/libproxy/"
-source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz
-        libproxy-0.4.11-crash.patch)
-sha256sums=('18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0'
-            'd82e111b18f6b793676dcc4cfc1f4678303f58171038c38704d89ed92e5416a2')
+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
+  if [ ! -d build ]; then
+    mkdir build
+  fi
 }
 
 build() {
@@ -37,7 +34,7 @@
     -DPERL_VENDORINSTALL=yes \
     -DCMAKE_BUILD_TYPE=Release \
     -DWITH_WEBKIT3=ON \
-    -DWITH_MOZJS=ON \
+    -DWITH_MOZJS=OFF \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
     -DCMAKE_C_FLAGS="${CFLAGS}" \
     -DPYTHON2_EXECUTABLE:FILEPATH=/usr/bin/python2 \

Deleted: libproxy-0.4.11-crash.patch
===================================================================
--- libproxy-0.4.11-crash.patch	2017-07-27 09:12:26 UTC (rev 301297)
+++ libproxy-0.4.11-crash.patch	2017-07-27 09:33:01 UTC (rev 301298)
@@ -1,12 +0,0 @@
-diff -up libproxy-0.4.11/libproxy/extension_pacrunner.cpp.mozjscrash libproxy-0.4.11/libproxy/extension_pacrunner.cpp
---- libproxy-0.4.11/libproxy/extension_pacrunner.cpp.mozjscrash	2010-07-29 08:14:59.000000000 -0400
-+++ libproxy-0.4.11/libproxy/extension_pacrunner.cpp	2013-09-19 09:22:13.031263766 -0400
-@@ -35,6 +35,7 @@ pacrunner* pacrunner_extension::get(stri
- 		if (this->last == pac)
- 			return this->pr;
- 		delete this->pr;
-+		this->pr = NULL;
- 	}
- 
- 	return this->pr = this->create(pac, pacurl);
-diff -up libproxy-0.4.11/libproxy/modules/pacrunner_mozjs.cpp.mozjscrash libproxy-0.4.11/libproxy/modules/pacrunner_mozjs.cpp