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

[Jan Steffens]

    Date: Saturday, December 5, 2020 @ 13:42:35
  Author: heftig
Revision: 402896

0.4.16-1

Modified:
  libproxy/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-05 13:15:59 UTC (rev 402895)
+++ PKGBUILD	2020-12-05 13:42:35 UTC (rev 402896)
@@ -1,10 +1,10 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgbase=libproxy
-pkgname=(libproxy libproxy-mozjs libproxy-webkit)
-pkgver=0.4.15+33+g454a499
-pkgrel=4
+pkgname=(libproxy libproxy-webkit)
+pkgver=0.4.16
+pkgrel=1
 pkgdesc="Automatic proxy configuration management library"
 url="https://libproxy.github.io/libproxy/"
 arch=(x86_64)
@@ -11,7 +11,7 @@
 license=(LGPL)
 depends=(gcc-libs glib2 dbus)
 makedepends=(cmake python python2 perl webkit2gtk git js60)
-_commit=454a499692b8fd36c376d4555ddf343316bfddd4  # master
+_commit=0da9e01980a93aa13c40de492dca3c47cde50bfc  # tags/0.4.16
 source=("git+https://github.com/libproxy/libproxy#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -25,7 +25,7 @@
 }
 
 build() {
-  cmake -H$pkgbase -Bbuild \
+  cmake -S $pkgbase -B build \
     -DBIPR=0 \
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
@@ -35,7 +35,6 @@
     -DLIBEXEC_INSTALL_DIR=/usr/lib \
     -DPERL_VENDORINSTALL=yes \
     -DPYTHON2_EXECUTABLE:FILEPATH=/usr/bin/python2 \
-    -DWITH_MOZJS=ON \
     -DWITH_WEBKIT3=ON
   cmake --build build
 }
@@ -59,25 +58,18 @@
               'perl: Perl bindings'
               'python2: Python 2.x bindings'
               'python: Python 3.x bindings'
-              'libproxy-mozjs: PAC proxy support (via MozJS)'
               'libproxy-webkit: PAC proxy support (via WebKit)')
   provides+=(libproxy.so)
 
-  DESTDIR="$pkgdir" cmake --build build --target install
+  DESTDIR="$pkgdir" cmake --install build
 
 ### Split
-  _pick mozjs "$pkgdir"/usr/lib/libproxy/*/modules/pacrunner_mozjs.so
   _pick webkit "$pkgdir"/usr/lib/libproxy/*/modules/pacrunner_webkit.so
 }
 
-package_libproxy-mozjs() {
-  pkgdesc="SpiderMonkey-based PAC proxy support for libproxy"
-  depends=(libproxy js60)
-  mv mozjs/* "$pkgdir"
-}
-
 package_libproxy-webkit() {
   pkgdesc="JavaScriptCore-based PAC proxy support for libproxy"
-  depends=(libproxy webkit2gtk)
+  depends=(libproxy.so webkit2gtk)
+  replaces=('libproxy-mozjs<0.4.16-1')
   mv webkit/* "$pkgdir"
 }