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

2020-12-05 Thread Jan Steffens via arch-commits 
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
===
--- PKGBUILD2020-12-05 13:15:59 UTC (rev 402895)
+++ PKGBUILD2020-12-05 13:42:35 UTC (rev 402896)
@@ -1,10 +1,10 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Maintainer: Jan de Groot 
 
 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"
 }

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

2020-11-10 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, November 11, 2020 @ 06:54:07
  Author: foutrelis
Revision: 400232

upgpkg: libproxy 0.4.15+33+g454a499-4: Python 3.9 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-11 06:54:06 UTC (rev 400231)
+++ PKGBUILD2020-11-11 06:54:07 UTC (rev 400232)
@@ -4,7 +4,7 @@
 pkgbase=libproxy
 pkgname=(libproxy libproxy-mozjs libproxy-webkit)
 pkgver=0.4.15+33+g454a499
-pkgrel=3
+pkgrel=4
 pkgdesc="Automatic proxy configuration management library"
 url="https://libproxy.github.io/libproxy/";
 arch=(x86_64)

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

2020-11-09 Thread Felix Yan via arch-commits 
Date: Monday, November 9, 2020 @ 11:31:31
  Author: felixonmars
Revision: 399677

upgpkg: libproxy 0.4.15+33+g454a499-3: Python 3.9 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-09 11:30:43 UTC (rev 399676)
+++ PKGBUILD2020-11-09 11:31:31 UTC (rev 399677)
@@ -4,7 +4,7 @@
 pkgbase=libproxy
 pkgname=(libproxy libproxy-mozjs libproxy-webkit)
 pkgver=0.4.15+33+g454a499
-pkgrel=2
+pkgrel=3
 pkgdesc="Automatic proxy configuration management library"
 url="https://libproxy.github.io/libproxy/";
 arch=(x86_64)

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

2020-06-21 Thread Evangelos Foutras via arch-commits 
Date: Sunday, June 21, 2020 @ 10:56:10
  Author: foutrelis
Revision: 389787

upgpkg: libproxy 0.4.15+33+g454a499-2: Perl 5.32 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-21 10:56:00 UTC (rev 389786)
+++ PKGBUILD2020-06-21 10:56:10 UTC (rev 389787)
@@ -4,7 +4,7 @@
 pkgbase=libproxy
 pkgname=(libproxy libproxy-mozjs libproxy-webkit)
 pkgver=0.4.15+33+g454a499
-pkgrel=1
+pkgrel=2
 pkgdesc="Automatic proxy configuration management library"
 url="https://libproxy.github.io/libproxy/";
 arch=(x86_64)

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

2020-03-07 Thread Jan Steffens via arch-commits 
Date: Sunday, March 8, 2020 @ 00:09:18
  Author: heftig
Revision: 376923

0.4.15+33+g454a499-1

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |  100 +
 1 file changed, 68 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-07 23:58:30 UTC (rev 376922)
+++ PKGBUILD2020-03-08 00:09:18 UTC (rev 376923)
@@ -1,47 +1,83 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Maintainer: Jan de Groot 
 
-pkgname=libproxy
-pkgver=0.4.15
-pkgrel=13
-pkgdesc="A library that provides automatic proxy configuration management"
+pkgbase=libproxy
+pkgname=(libproxy libproxy-mozjs libproxy-webkit)
+pkgver=0.4.15+33+g454a499
+pkgrel=1
+pkgdesc="Automatic proxy configuration management library"
+url="https://libproxy.github.io/libproxy/";
 arch=(x86_64)
-license=('LGPL')
-depends=('gcc-libs')
-optdepends=('networkmanager: NetworkManager configuration module'
-'perl: Perl bindings'
-'python2: Python 2.x bindings'
-'python: Python 3.x bindings'
-'glib2: gsettings configuration module'
-'webkit2gtk: PAC proxy support (Webkit2gtk engine)')
-makedepends=('cmake' 'networkmanager' 'python' 'python2' 'perl' 'webkit2gtk')
-url="https://libproxy.github.io/libproxy/";
-source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz)
-sha256sums=('18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0')
+license=(LGPL)
+depends=(gcc-libs glib2 dbus)
+makedepends=(cmake python python2 perl webkit2gtk git js60)
+_commit=454a499692b8fd36c376d4555ddf343316bfddd4  # master
+source=("git+https://github.com/libproxy/libproxy#commit=$_commit";)
+sha256sums=('SKIP')
 
+pkgver() {
+  cd $pkgbase
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  if [ ! -d build ]; then
-mkdir build
-  fi
+  cd $pkgbase
 }
 
 build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake -H$pkgbase -Bbuild \
+-DBIPR=0 \
+-DCMAKE_BUILD_TYPE=None \
+-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+-DCMAKE_C_FLAGS="$CFLAGS" \
 -DCMAKE_INSTALL_PREFIX=/usr \
--DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
 -DCMAKE_SKIP_RPATH=ON \
+-DLIBEXEC_INSTALL_DIR=/usr/lib \
 -DPERL_VENDORINSTALL=yes \
--DCMAKE_BUILD_TYPE=Release \
--DWITH_WEBKIT3=ON \
--DWITH_MOZJS=OFF \
--DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
--DCMAKE_C_FLAGS="${CFLAGS}" \
 -DPYTHON2_EXECUTABLE:FILEPATH=/usr/bin/python2 \
--DBIPR=0
-  make
+-DWITH_MOZJS=ON \
+-DWITH_WEBKIT3=ON
+  cmake --build build
 }
 
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
+check() {
+  cmake --build build --target test
 }
+
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+d="$srcdir/$p/${f#$pkgdir/}"
+mkdir -p "$(dirname "$d")"
+mv "$f" "$d"
+rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
+package_libproxy() {
+  optdepends=('networkmanager: NetworkManager configuration module'
+  '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
+
+### 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)
+  mv webkit/* "$pkgdir"
+}

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

2019-10-27 Thread Felix Yan via arch-commits 
Date: Sunday, October 27, 2019 @ 07:02:24
  Author: felixonmars
Revision: 365906

Python 3.8 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-27 07:00:55 UTC (rev 365905)
+++ PKGBUILD2019-10-27 07:02:24 UTC (rev 365906)
@@ -2,7 +2,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=12
+pkgrel=13
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(x86_64)
 license=('LGPL')

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

2019-10-25 Thread Felix Yan via arch-commits 
Date: Friday, October 25, 2019 @ 15:00:53
  Author: felixonmars
Revision: 365593

Python 3.8 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-25 15:00:30 UTC (rev 365592)
+++ PKGBUILD2019-10-25 15:00:53 UTC (rev 365593)
@@ -2,7 +2,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=11
+pkgrel=12
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(x86_64)
 license=('LGPL')

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

2019-10-25 Thread Evangelos Foutras via arch-commits 
Date: Friday, October 25, 2019 @ 13:40:44
  Author: foutrelis
Revision: 365538

Python 3.8 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-25 13:39:58 UTC (rev 365537)
+++ PKGBUILD2019-10-25 13:40:44 UTC (rev 365538)
@@ -2,7 +2,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=10
+pkgrel=11
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(x86_64)
 license=('LGPL')

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

2019-06-01 Thread Evangelos Foutras via arch-commits 
Date: Saturday, June 1, 2019 @ 09:23:26
  Author: foutrelis
Revision: 354637

Perl 5.30 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-01 09:22:37 UTC (rev 354636)
+++ PKGBUILD2019-06-01 09:23:26 UTC (rev 354637)
@@ -2,7 +2,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=9
+pkgrel=10
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(x86_64)
 license=('LGPL')

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

2019-05-25 Thread Evangelos Foutras via arch-commits 
Date: Saturday, May 25, 2019 @ 09:26:08
  Author: foutrelis
Revision: 354097

Perl 5.30 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-25 09:25:42 UTC (rev 354096)
+++ PKGBUILD2019-05-25 09:26:08 UTC (rev 354097)
@@ -2,7 +2,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=8
+pkgrel=9
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(x86_64)
 license=('LGPL')

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

2019-05-06 Thread Antonio Rojas via arch-commits 
Date: Monday, May 6, 2019 @ 20:23:28
  Author: arojas
Revision: 352614

https

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-06 20:22:57 UTC (rev 352613)
+++ PKGBUILD2019-05-06 20:23:28 UTC (rev 352614)
@@ -14,7 +14,7 @@
 'glib2: gsettings configuration module'
 'webkit2gtk: PAC proxy support (Webkit2gtk engine)')
 makedepends=('cmake' 'networkmanager' 'python' 'python2' 'perl' 'webkit2gtk')
-url="http://libproxy.github.io/libproxy/";
+url="https://libproxy.github.io/libproxy/";
 source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz)
 sha256sums=('18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0')

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

2018-08-01 Thread Florian Pritz via arch-commits 
Date: Wednesday, August 1, 2018 @ 09:24:00
  Author: bluewind
Revision: 330068

Perl 5.28 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-01 09:23:54 UTC (rev 330067)
+++ PKGBUILD2018-08-01 09:24:00 UTC (rev 330068)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=7
+pkgrel=8
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(x86_64)
 license=('LGPL')

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

2018-07-17 Thread Felix Yan via arch-commits 
Date: Wednesday, July 18, 2018 @ 01:50:26
  Author: felixonmars
Revision: 328934

Python 3.7 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-18 01:48:06 UTC (rev 328933)
+++ PKGBUILD2018-07-18 01:50:26 UTC (rev 328934)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=6
+pkgrel=7
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(x86_64)
 license=('LGPL')

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

2017-08-26 Thread Evangelos Foutras 
Date: Saturday, August 26, 2017 @ 13:52:49
  Author: foutrelis
Revision: 303954

Perl versioned binary modules rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-26 13:52:44 UTC (rev 303953)
+++ PKGBUILD2017-08-26 13:52:49 UTC (rev 303954)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=5
+pkgrel=6
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')

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

2017-08-24 Thread Evangelos Foutras 
Date: Thursday, August 24, 2017 @ 13:52:02
  Author: foutrelis
Revision: 303463

Perl versioned binary modules rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-24 13:50:58 UTC (rev 303462)
+++ PKGBUILD2017-08-24 13:52:02 UTC (rev 303463)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=4
+pkgrel=5
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')

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

2017-07-27 Thread 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
===
--- PKGBUILD2017-07-27 09:12:26 UTC (rev 301297)
+++ PKGBUILD2017-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.0 -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

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

2017-06-21 Thread Jan de Groot 
Date: Wednesday, June 21, 2017 @ 08:28:55
  Author: jgc
Revision: 299100

upgpkg: libproxy 0.4.15-3

Re-add fix for https://bugzilla.redhat.com/show_bug.cgi?id=998232
Should fix https://bugzilla.redhat.com/show_bug.cgi?id=1459779
And so FS#54528, FS#54403

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

-+
 PKGBUILD|   10 +++---
 libproxy-0.4.11-crash.patch |   12 
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-21 07:08:55 UTC (rev 299099)
+++ PKGBUILD2017-06-21 08:28:55 UTC (rev 299100)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=2
+pkgrel=3
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -17,11 +17,15 @@
 '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)
-sha256sums=('18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0')
+source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz
+libproxy-0.4.11-crash.patch)
+sha256sums=('18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0'
+'d82e111b18f6b793676dcc4cfc1f4678303f58171038c38704d89ed92e5416a2')
 
 prepare() {
   mkdir build
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../libproxy-0.4.11-crash.patch
 }
 
 build() {

Added: libproxy-0.4.11-crash.patch
===
--- libproxy-0.4.11-crash.patch (rev 0)
+++ libproxy-0.4.11-crash.patch 2017-06-21 08:28:55 UTC (rev 299100)
@@ -0,0 +1,12 @@
+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.0 -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

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

2017-06-01 Thread Evangelos Foutras 
Date: Thursday, June 1, 2017 @ 11:28:39
  Author: foutrelis
Revision: 297230

Perl 5.26 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-01 11:27:35 UTC (rev 297229)
+++ PKGBUILD2017-06-01 11:28:39 UTC (rev 297230)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')

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

2017-05-11 Thread 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
===
--- PKGBUILD2017-05-11 21:20:18 UTC (rev 295843)
+++ PKGBUILD2017-05-11 21:36:58 UTC (rev 295844)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot 
 
 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.0 -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);
-   }

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

2016-10-31 Thread Jan de Groot 
Date: Monday, October 31, 2016 @ 09:24:02
  Author: jgc
Revision: 279521

upgpkg: libproxy 0.4.13-1

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-31 09:07:33 UTC (rev 279520)
+++ PKGBUILD2016-10-31 09:24:02 UTC (rev 279521)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot 
 
 pkgname=libproxy
-pkgver=0.4.12
-pkgrel=2
+pkgver=0.4.13
+pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -13,13 +13,13 @@
 'python2: Python bindings'
 'glib2: gsettings configuration module'
 'js17: PAC proxy support - Mozilla based pacrunner'
-'webkitgtk: PAC proxy support - Webkit based pacrunner')
-makedepends=('cmake' 'networkmanager' 'python2' 'perl' 'js17' 'webkitgtk')
+'webkit2gtk: PAC proxy support - Webkit based pacrunner')
+makedepends=('cmake' 'networkmanager' 'python2' 'perl' 'js17' '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=('258d89cc052e0a3c09aa1f42d7f93045'
+md5sums=('de293bb311f185a2ffa3492700a694c2'
  '16cb8ad1292f04279108a80f36434c7b'
  'a45f2195c164a48639e963e8341f5d93')

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

2016-05-10 Thread Felix Yan 
Date: Wednesday, May 11, 2016 @ 05:53:34
  Author: fyan
Revision: 267719

upgpkg: libproxy 0.4.12-2

rebuild with perl 5.24

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-11 03:53:20 UTC (rev 267718)
+++ PKGBUILD2016-05-11 03:53:34 UTC (rev 267719)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')

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

2016-02-19 Thread Jan de Groot 
Date: Friday, February 19, 2016 @ 15:46:06
  Author: jgc
Revision: 259998

fix pkgrel
upgpkg: libproxy 0.4.12-1

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-19 14:44:26 UTC (rev 259997)
+++ PKGBUILD2016-02-19 14:46:06 UTC (rev 259998)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.12
-pkgrel=8
+pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')

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

2015-12-06 Thread Evangelos Foutras 
Date: Sunday, December 6, 2015 @ 13:00:25
  Author: foutrelis
Revision: 252764

C++11 ABI rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 11:57:04 UTC (rev 252763)
+++ PKGBUILD2015-12-06 12:00:25 UTC (rev 252764)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.11
-pkgrel=7
+pkgrel=8
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')

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

2015-12-05 Thread Evangelos Foutras 
Date: Sunday, December 6, 2015 @ 06:42:33
  Author: foutrelis
Revision: 252597

C++11 ABI rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 05:41:01 UTC (rev 252596)
+++ PKGBUILD2015-12-06 05:42:33 UTC (rev 252597)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.11
-pkgrel=6
+pkgrel=7
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')

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

2015-06-14 Thread Evangelos Foutras 
Date: Sunday, June 14, 2015 @ 17:26:20
  Author: foutrelis
Revision: 240759

upgpkg: libproxy 0.4.11-6

Perl 5.22 rebuild.

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-14 15:26:11 UTC (rev 240758)
+++ PKGBUILD2015-06-14 15:26:20 UTC (rev 240759)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.11
-pkgrel=5
+pkgrel=6
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')

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

2014-06-11 Thread Jan de Groot 
Date: Wednesday, June 11, 2014 @ 16:55:59
  Author: jgc
Revision: 215031

upgpkg: libproxy 0.4.11-4

Disable KDE4 module. Segfaults QT5 applications when run from KDE, because this 
module loads kdelibs and qt4 libs into the process

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-11 14:31:55 UTC (rev 215030)
+++ PKGBUILD2014-06-11 14:55:59 UTC (rev 215031)
@@ -3,16 +3,16 @@
 
 pkgname=libproxy
 pkgver=0.4.11
-pkgrel=3
+pkgrel=4
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('gcc-libs')
-optdepends=('kdelibs: KDE configuration module'
-'networkmanager: NetworkManager configuration module'
+optdepends=('networkmanager: NetworkManager configuration module'
 'perl: Perl bindings'
-'python2: Python bindings')
-makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl')
+'python2: Python bindings'
+'glib2: gsettings configuration module')
+makedepends=('cmake' 'networkmanager' 'python2' 'perl')
 url="http://libproxy.googlecode.com";
 source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 md5sums=('3cd1ae2a4abecf44b3f24d6639d2cd84')
@@ -29,6 +29,7 @@
 -DWITH_WEBKIT=OFF \
 -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
 -DCMAKE_C_FLAGS="${CFLAGS}" \
+-DWITH_KDE4=OFF \
 -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2
   make
 }

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

2014-05-28 Thread Felix Yan 
Date: Thursday, May 29, 2014 @ 06:55:31
  Author: fyan
Revision: 213790

upgpkg: libproxy 0.4.11-3

perl 5.20 rebuild

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-29 04:55:12 UTC (rev 213789)
+++ PKGBUILD2014-05-29 04:55:31 UTC (rev 213790)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.11
-pkgrel=2
+pkgrel=3
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')

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

2014-04-14 Thread Jan de Groot 
Date: Monday, April 14, 2014 @ 11:32:35
  Author: jgc
Revision: 210325

Fix build with python2+3 installed (FS#39493)

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-14 09:06:03 UTC (rev 210324)
+++ PKGBUILD2014-04-14 09:32:35 UTC (rev 210325)
@@ -18,8 +18,6 @@
 md5sums=('3cd1ae2a4abecf44b3f24d6639d2cd84')
 
 build() {
-  cd "${srcdir}"
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -30,11 +28,12 @@
 -DCMAKE_BUILD_TYPE=Release \
 -DWITH_WEBKIT=OFF \
 -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
--DCMAKE_C_FLAGS="${CFLAGS}"
+-DCMAKE_C_FLAGS="${CFLAGS}" \
+-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2
   make
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }

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

2013-05-20 Thread Evangelos Foutras 
Date: Monday, May 20, 2013 @ 20:22:02
  Author: foutrelis
Revision: 186042

upgpkg: libproxy 0.4.11-2

Perl 5.18 rebuild.

Modified:
  libproxy/trunk/PKGBUILD   (contents, properties)

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-20 18:21:52 UTC (rev 186041)
+++ PKGBUILD2013-05-20 18:22:02 UTC (rev 186042)
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 24494 2009-01-17 20:42:01Z jgc $
+# $Id$
 # Maintainer: Jan de Groot 
 
 pkgname=libproxy
 pkgver=0.4.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')


Property changes on: libproxy/trunk/PKGBUILD
___
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property

[arch-commits] Commit in libproxy/trunk (PKGBUILD libproxy-0.4.7-unistd.patch)

2013-03-18 Thread Jan de Groot 
Date: Monday, March 18, 2013 @ 11:24:59
  Author: jgc
Revision: 180146

upgpkg: libproxy 0.4.11-1

Modified:
  libproxy/trunk/PKGBUILD
Deleted:
  libproxy/trunk/libproxy-0.4.7-unistd.patch

-+
 PKGBUILD|   14 --
 libproxy-0.4.7-unistd.patch |   40 
 2 files changed, 4 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-18 09:11:19 UTC (rev 180145)
+++ PKGBUILD2013-03-18 10:24:59 UTC (rev 180146)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot 
 
 pkgname=libproxy
-pkgver=0.4.7
-pkgrel=2
+pkgver=0.4.11
+pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -14,19 +14,13 @@
 'python2: Python bindings')
 makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl')
 url="http://libproxy.googlecode.com";
-source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
-libproxy-0.4.7-unistd.patch)
+source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5'
- 'e90c03f296e553ace347b46f4fea3625')
+md5sums=('3cd1ae2a4abecf44b3f24d6639d2cd84')
 
 build() {
   cd "${srcdir}"
 
-  # Fix build with GCC 4.7 (patch from Fedora)
-  patch -d "${pkgname}-${pkgver}" -Np1 -i \
-"${srcdir}/libproxy-0.4.7-unistd.patch"
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \

Deleted: libproxy-0.4.7-unistd.patch
===
--- libproxy-0.4.7-unistd.patch 2013-03-18 09:11:19 UTC (rev 180145)
+++ libproxy-0.4.7-unistd.patch 2013-03-18 10:24:59 UTC (rev 180146)
@@ -1,40 +0,0 @@
 libproxy-0.4.7/libproxy/url.cpp.orig   2012-02-28 21:05:15.572948027 
+
-+++ libproxy-0.4.7/libproxy/url.cpp2012-02-28 21:05:45.635937474 +
-@@ -27,6 +27,7 @@
- #define close _close
- #endif
- #include  // For ::open()
-+#include  // For ::read() and ::close()
- #include  // For memcpy()
- #include  // For int/string conversion (using stringstream)
- #include   // For sscanf()
 libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp.orig  2012-02-28 
21:06:01.552943358 +
-+++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp   2012-02-28 
21:11:21.429953982 +
-@@ -18,6 +18,7 @@
-  
**/
- 
- #include 
-+#include 
- #include 
- #include 
- #include 
 libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp.orig   2012-02-28 
21:06:11.637943033 +
-+++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp2012-02-28 
21:11:46.560961409 +
-@@ -17,6 +17,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 
USA
-  
**/
- 
-+#include  // for ::gethostname()
- #include  // ?
- 
- #include "../extension_pacrunner.hpp"
 libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp.orig  2012-02-28 
21:06:29.615943614 +
-+++ libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp   2012-02-28 
21:12:35.530965553 +
-@@ -17,6 +17,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 
USA
-  
**/
- 
-+#include  // for ::gethostname()
- #include "../extension_pacrunner.hpp"
- using namespace libproxy;
-

[arch-commits] Commit in libproxy/trunk (PKGBUILD libproxy-0.4.7-unistd.patch)

2012-05-26 Thread Evangelos Foutras 
Date: Sunday, May 27, 2012 @ 02:42:37
  Author: foutrelis
Revision: 159817

upgpkg: libproxy 0.4.7-2

Perl 5.16 rebuild.

Added:
  libproxy/trunk/libproxy-0.4.7-unistd.patch
Modified:
  libproxy/trunk/PKGBUILD

-+
 PKGBUILD|   13 ++---
 libproxy-0.4.7-unistd.patch |   40 
 2 files changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-27 06:38:09 UTC (rev 159816)
+++ PKGBUILD2012-05-27 06:42:37 UTC (rev 159817)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -14,12 +14,19 @@
 'python2: Python bindings')
 makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl')
 url="http://libproxy.googlecode.com";
-source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
+libproxy-0.4.7-unistd.patch)
 options=('!libtool')
-md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5')
+md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5'
+ 'e90c03f296e553ace347b46f4fea3625')
 
 build() {
   cd "${srcdir}"
+
+  # Fix build with GCC 4.7 (patch from Fedora)
+  patch -d "${pkgname}-${pkgver}" -Np1 -i \
+"${srcdir}/libproxy-0.4.7-unistd.patch"
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \

Added: libproxy-0.4.7-unistd.patch
===
--- libproxy-0.4.7-unistd.patch (rev 0)
+++ libproxy-0.4.7-unistd.patch 2012-05-27 06:42:37 UTC (rev 159817)
@@ -0,0 +1,40 @@
+--- libproxy-0.4.7/libproxy/url.cpp.orig   2012-02-28 21:05:15.572948027 
+
 libproxy-0.4.7/libproxy/url.cpp2012-02-28 21:05:45.635937474 +
+@@ -27,6 +27,7 @@
+ #define close _close
+ #endif
+ #include  // For ::open()
++#include  // For ::read() and ::close()
+ #include  // For memcpy()
+ #include  // For int/string conversion (using stringstream)
+ #include   // For sscanf()
+--- libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp.orig  2012-02-28 
21:06:01.552943358 +
 libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp   2012-02-28 
21:11:21.429953982 +
+@@ -18,6 +18,7 @@
+  
**/
+ 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+--- libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp.orig   2012-02-28 
21:06:11.637943033 +
 libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp2012-02-28 
21:11:46.560961409 +
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 
USA
+  
**/
+ 
++#include  // for ::gethostname()
+ #include  // ?
+ 
+ #include "../extension_pacrunner.hpp"
+--- libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp.orig  2012-02-28 
21:06:29.615943614 +
 libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp   2012-02-28 
21:12:35.530965553 +
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 
USA
+  
**/
+ 
++#include  // for ::gethostname()
+ #include "../extension_pacrunner.hpp"
+ using namespace libproxy;
+

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

2011-07-02 Thread Ionut Biru 
Date: Saturday, July 2, 2011 @ 08:49:41
  Author: ibiru
Revision: 130098

we don't really want namcap here

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-02 12:40:13 UTC (rev 130097)
+++ PKGBUILD2011-07-02 12:49:41 UTC (rev 130098)
@@ -12,7 +12,7 @@
 'networkmanager: NetworkManager configuration module'
 'perl: Perl bindings'
 'python2: Python bindings')
-makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl' 
'namcap')
+makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl')
 url="http://libproxy.googlecode.com";
 source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')

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

2011-07-02 Thread Ionut Biru 
Date: Saturday, July 2, 2011 @ 08:28:56
  Author: ibiru
Revision: 130095

update to 0.4.7

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-02 07:58:42 UTC (rev 130094)
+++ PKGBUILD2011-07-02 12:28:56 UTC (rev 130095)
@@ -2,22 +2,21 @@
 # Maintainer: Jan de Groot 
 
 pkgname=libproxy
-pkgver=0.4.6
-pkgrel=7
+pkgver=0.4.7
+pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('gcc-libs')
-optdepends=('gconf: GNOME configuration module'
-'kdelibs: KDE configuration module'
+optdepends=('kdelibs: KDE configuration module'
 'networkmanager: NetworkManager configuration module'
 'perl: Perl bindings'
 'python2: Python bindings')
-makedepends=('gconf' 'cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 
'perl')
+makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl' 
'namcap')
 url="http://libproxy.googlecode.com";
 source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('199c6b120baf1f7258a55f38d5ec74f5')
+md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5')
 
 build() {
   cd "${srcdir}"

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

2011-06-06 Thread Andrea Scarpino 
Date: Monday, June 6, 2011 @ 17:24:06
  Author: andrea
Revision: 126731

build as Release

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-06 21:21:22 UTC (rev 126730)
+++ PKGBUILD2011-06-06 21:24:06 UTC (rev 126731)
@@ -20,22 +20,22 @@
 md5sums=('199c6b120baf1f7258a55f38d5ec74f5')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"
   mkdir build
   cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_INSTALL_PREFIX=/usr \
 -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
 -DCMAKE_SKIP_RPATH=ON \
 -DPERL_VENDORINSTALL=yes \
--DCMAKE_BUILD_TYPE=None \
+-DCMAKE_BUILD_TYPE=Release \
 -DWITH_WEBKIT=OFF \
 -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
--DCMAKE_C_FLAGS="${CFLAGS}" \
-..
+-DCMAKE_C_FLAGS="${CFLAGS}"
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  cd "${srcdir}/build"
   make DESTDIR="${pkgdir}" install
 }

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

2011-05-25 Thread Evangelos Foutras 
Date: Wednesday, May 25, 2011 @ 15:12:26
  Author: foutrelis
Revision: 125229

upgpkg: libproxy 0.4.6-7
Perl 5.14.0 rebuild.

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-25 19:11:42 UTC (rev 125228)
+++ PKGBUILD2011-05-25 19:12:26 UTC (rev 125229)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.6
-pkgrel=6
+pkgrel=7
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')

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

2011-03-28 Thread Andrea Scarpino 
Date: Monday, March 28, 2011 @ 12:57:06
  Author: andrea
Revision: 117091

fix cmake syntax

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-28 15:59:46 UTC (rev 117090)
+++ PKGBUILD2011-03-28 16:57:06 UTC (rev 117091)
@@ -28,7 +28,7 @@
 -DCMAKE_SKIP_RPATH=ON \
 -DPERL_VENDORINSTALL=yes \
 -DCMAKE_BUILD_TYPE=None \
--WITH_WEBKIT=OFF \
+-DWITH_WEBKIT=OFF \
 -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
 -DCMAKE_C_FLAGS="${CFLAGS}" \
 ..

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

2011-03-28 Thread Ionut Biru 
Date: Monday, March 28, 2011 @ 07:10:14
  Author: ibiru
Revision: 117047

upgpkg: libproxy 0.4.6-6
drop libwebkit support to avoid cycle

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-28 09:18:03 UTC (rev 117046)
+++ PKGBUILD2011-03-28 11:10:14 UTC (rev 117047)
@@ -3,17 +3,17 @@
 
 pkgname=libproxy
 pkgver=0.4.6
-pkgrel=5
+pkgrel=6
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('gcc-libs' 'libwebkit')
+depends=('gcc-libs')
 optdepends=('gconf: GNOME configuration module'
 'kdelibs: KDE configuration module'
 'networkmanager: NetworkManager configuration module'
 'perl: Perl bindings'
 'python2: Python bindings')
-makedepends=('gconf' 'cmake' 'networkmanager' 'libwebkit' 'automoc4' 'python2' 
'kdelibs' 'perl')
+makedepends=('gconf' 'cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 
'perl')
 url="http://libproxy.googlecode.com";
 source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
@@ -28,6 +28,7 @@
 -DCMAKE_SKIP_RPATH=ON \
 -DPERL_VENDORINSTALL=yes \
 -DCMAKE_BUILD_TYPE=None \
+-WITH_WEBKIT=OFF \
 -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
 -DCMAKE_C_FLAGS="${CFLAGS}" \
 ..

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

2011-03-22 Thread Ionut Biru 
Date: Tuesday, March 22, 2011 @ 05:16:52
  Author: ibiru
Revision: 115863

upgpkg: libproxy 0.4.6-5
Rebuild against libwebkit

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-22 09:13:55 UTC (rev 115862)
+++ PKGBUILD2011-03-22 09:16:52 UTC (rev 115863)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.6
-pkgrel=4
+pkgrel=5
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')

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

2011-03-22 Thread Ionut Biru 
Date: Tuesday, March 22, 2011 @ 05:13:16
  Author: ibiru
Revision: 115858

upgpkg: libproxy 0.4.6-4
add libwebkit to dependency

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-22 08:58:48 UTC (rev 115857)
+++ PKGBUILD2011-03-22 09:13:16 UTC (rev 115858)
@@ -3,15 +3,14 @@
 
 pkgname=libproxy
 pkgver=0.4.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('gcc-libs')
+depends=('gcc-libs' 'libwebkit')
 optdepends=('gconf: GNOME configuration module'
 'kdelibs: KDE configuration module'
 'networkmanager: NetworkManager configuration module'
-'libwebkit: WPAD/PAC parsing via WebKit JavaScript engine'
 'perl: Perl bindings'
 'python2: Python bindings')
 makedepends=('gconf' 'cmake' 'networkmanager' 'libwebkit' 'automoc4' 'python2' 
'kdelibs' 'perl')

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

2011-03-21 Thread Ionut Biru 
Date: Monday, March 21, 2011 @ 14:24:26
  Author: ibiru
Revision: 115816

upgpkg: libproxy 0.4.6-3
drop xulrunner support

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-21 17:45:39 UTC (rev 115815)
+++ PKGBUILD2011-03-21 18:24:26 UTC (rev 115816)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -12,10 +12,9 @@
 'kdelibs: KDE configuration module'
 'networkmanager: NetworkManager configuration module'
 'libwebkit: WPAD/PAC parsing via WebKit JavaScript engine'
-'xulrunner: WPAD/PAC parsing via Mozilla JavaScript engine'
 'perl: Perl bindings'
 'python2: Python bindings')
-makedepends=('xulrunner' 'gconf' 'cmake' 'networkmanager' 'libwebkit' 
'automoc4' 'python2' 'kdelibs' 'perl')
+makedepends=('gconf' 'cmake' 'networkmanager' 'libwebkit' 'automoc4' 'python2' 
'kdelibs' 'perl')
 url="http://libproxy.googlecode.com";
 source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')

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

2010-09-20 Thread Rémy Oudompheng 
Date: Monday, September 20, 2010 @ 10:48:44
  Author: remy
Revision: 91005

upgpkg: libproxy 0.4.6-2
Rebuild for python2.7

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-20 13:58:06 UTC (rev 91004)
+++ PKGBUILD2010-09-20 14:48:44 UTC (rev 91005)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -14,8 +14,8 @@
 'libwebkit: WPAD/PAC parsing via WebKit JavaScript engine'
 'xulrunner: WPAD/PAC parsing via Mozilla JavaScript engine'
 'perl: Perl bindings'
-'python: Python bindings')
-makedepends=('xulrunner' 'gconf' 'cmake' 'networkmanager' 'libwebkit' 
'automoc4' 'python' 'kdelibs' 'perl')
+'python2: Python bindings')
+makedepends=('xulrunner' 'gconf' 'cmake' 'networkmanager' 'libwebkit' 
'automoc4' 'python2' 'kdelibs' 'perl')
 url="http://libproxy.googlecode.com";
 source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')

[arch-commits] Commit in libproxy/trunk (PKGBUILD nm-dbus.patch)

2010-09-13 Thread Jan de Groot 
Date: Monday, September 13, 2010 @ 10:00:39
  Author: jgc
Revision: 90567

upgpkg: libproxy 0.4.6-1
Update to 0.4.6

Modified:
  libproxy/trunk/PKGBUILD
Deleted:
  libproxy/trunk/nm-dbus.patch

---+
 PKGBUILD  |   46 ++
 nm-dbus.patch |   39 ---
 2 files changed, 26 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-13 12:28:07 UTC (rev 90566)
+++ PKGBUILD2010-09-13 14:00:39 UTC (rev 90567)
@@ -2,35 +2,41 @@
 # Maintainer: Jan de Groot 
 
 pkgname=libproxy
-pkgver=0.3.1
-pkgrel=2
+pkgver=0.4.6
+pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('glibc')
-makedepends=('libxmu' 'gconf' 'networkmanager')
-optdepends=('libxmu: KDE and GNOME plugins'
-'gconf: GNOME plugin'
-   'networkmanager: NetworkManager plugin')
+depends=('gcc-libs')
+optdepends=('gconf: GNOME configuration module'
+'kdelibs: KDE configuration module'
+'networkmanager: NetworkManager configuration module'
+'libwebkit: WPAD/PAC parsing via WebKit JavaScript engine'
+'xulrunner: WPAD/PAC parsing via Mozilla JavaScript engine'
+'perl: Perl bindings'
+'python: Python bindings')
+makedepends=('xulrunner' 'gconf' 'cmake' 'networkmanager' 'libwebkit' 
'automoc4' 'python' 'kdelibs' 'perl')
 url="http://libproxy.googlecode.com";
-source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
-   nm-dbus.patch)
+source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('1745fe1bdf5beca1bf7269758f3906e8'
- 'a56ee1519bc3640257430b5fe5540a38')
+md5sums=('199c6b120baf1f7258a55f38d5ec74f5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/nm-dbus.patch" || return 1
-  libtoolize --force || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake --add-missing || return 1
-  ./configure --prefix=/usr --without-mozjs || return 1
-  make || return 1
+  mkdir build
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+-DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
+-DCMAKE_SKIP_RPATH=ON \
+-DPERL_VENDORINSTALL=yes \
+-DCMAKE_BUILD_TYPE=None \
+-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+-DCMAKE_C_FLAGS="${CFLAGS}" \
+..
+  make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  make DESTDIR="${pkgdir}" install
 }

Deleted: nm-dbus.patch
===
--- nm-dbus.patch   2010-09-13 12:28:07 UTC (rev 90566)
+++ nm-dbus.patch   2010-09-13 14:00:39 UTC (rev 90567)
@@ -1,39 +0,0 @@
-diff -Nur libproxy-0.3.1.orig//configure.ac libproxy-0.3.1/configure.ac
 libproxy-0.3.1.orig//configure.ac  2009-10-05 21:42:34.0 +0300
-+++ libproxy-0.3.1/configure.ac2010-05-05 18:45:29.569107696 +0300
-@@ -7,6 +7,7 @@
- ### Checks for programs.
- AC_PROG_CC
- AC_PROG_CPP
-+AM_PROG_CC_C_O
- AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_LIBTOOL
-@@ -34,8 +35,9 @@
-   [PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
-   [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, 
-   [PKG_CHECK_MODULES(mozjs, seamonkey-js, 
have_mozjs=yes,have_mozjs=no)])])])
--PKG_CHECK_MODULES(NetworkManager, NetworkManager dbus-1, 
--  have_networkmanager=yes, 
have_networkmanager=no)
-+PKG_CHECK_MODULES(NetworkManager, NetworkManager,
-+[PKG_CHECK_MODULES(DBUS, dbus-1, have_networkmanager=yes, 
have_networkmanager=no)],
-+  have_networkmanager=no)
- PKG_CHECK_MODULES(QtCore, QtCore, have_qtcore=yes, have_qtcore=no)
- 
- # Direct
-@@ -124,12 +126,12 @@
- [test x$have_networkmanager = xyes && with_networkmanager=yes])
- if test x$with_networkmanager = xyes; then
-   if test x$have_networkmanager = xyes; then
--  NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS"
--  NETWORKMANAGER_LIBS="$NetworkManager_LIBS"
-+  NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS $DBUS_CFLAGS"
-+  NETWORKMANAGER_LIBS="$NetworkManager_LIBS $DBUS_LIBS"
-   AC_SUBST(NETWORKMANAGER_CFLAGS)
-   AC_SUBST(NETWORKMANAGER_LIBS)
-   else
--  echo "NetworkManager module requires: NetworkManager!"
-+  echo "NetworkManager module requires: NetworkManager and DBus!"
-   exit 1
-   fi
- else

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

2010-09-02 Thread Rémy Oudompheng 
Date: Thursday, September 2, 2010 @ 16:23:21
  Author: remy
Revision: 89645

upgpkg: libproxy 0.3.1-2
Rebuild for python2.

Modified:
  libproxy/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-02 20:17:10 UTC (rev 89644)
+++ PKGBUILD2010-09-02 20:23:21 UTC (rev 89645)
@@ -3,7 +3,7 @@
 
 pkgname=libproxy
 pkgver=0.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -28,5 +28,9 @@
   automake --add-missing || return 1
   ./configure --prefix=/usr --without-mozjs || return 1
   make || return 1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install || return 1
 }

[arch-commits] Commit in libproxy/trunk (PKGBUILD nm-dbus.patch)

2010-05-05 Thread Ionut Biru 
Date: Wednesday, May 5, 2010 @ 11:54:25
  Author: ibiru
Revision: 79671

upgpkg: libproxy 0.3.1-1
update to 0.3.1

Modified:
  libproxy/trunk/PKGBUILD
  libproxy/trunk/nm-dbus.patch

---+
 PKGBUILD  |8 
 nm-dbus.patch |   38 +++---
 2 files changed, 23 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-05 12:52:07 UTC (rev 79670)
+++ PKGBUILD2010-05-05 15:54:25 UTC (rev 79671)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=libproxy
-pkgver=0.2.3
+pkgver=0.3.1
 pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
@@ -13,11 +13,11 @@
 'gconf: GNOME plugin'
'networkmanager: NetworkManager plugin')
 url="http://libproxy.googlecode.com";
-source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
+source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
nm-dbus.patch)
 options=('!libtool')
-md5sums=('86b635e1eb2d665cfbef4c6134fe6604'
-'1bd7576d591889fd76cbf05d79cfe4af')
+md5sums=('1745fe1bdf5beca1bf7269758f3906e8'
+ 'a56ee1519bc3640257430b5fe5540a38')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: nm-dbus.patch
===
--- nm-dbus.patch   2010-05-05 12:52:07 UTC (rev 79670)
+++ nm-dbus.patch   2010-05-05 15:54:25 UTC (rev 79671)
@@ -1,39 +1,39 @@
 libproxy-0.2.3/configure.ac2008-06-05 22:56:16.0 +0200
-+++ libproxy-0.2.3.new/configure.ac2009-01-07 13:42:48.0 +0100
-@@ -6,6 +6,7 @@
+diff -Nur libproxy-0.3.1.orig//configure.ac libproxy-0.3.1/configure.ac
+--- libproxy-0.3.1.orig//configure.ac  2009-10-05 21:42:34.0 +0300
 libproxy-0.3.1/configure.ac2010-05-05 18:45:29.569107696 +0300
+@@ -7,6 +7,7 @@
  ### Checks for programs.
  AC_PROG_CC
  AC_PROG_CPP
 +AM_PROG_CC_C_O
+ AC_PROG_CXX
  AC_PROG_INSTALL
  AC_PROG_LIBTOOL
- AC_PROG_LN_S
-@@ -19,8 +20,9 @@
- PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, 
+@@ -34,8 +35,9 @@
[PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
-   [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, 
have_mozjs=no)])])
--PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
+   [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, 
+   [PKG_CHECK_MODULES(mozjs, seamonkey-js, 
have_mozjs=yes,have_mozjs=no)])])])
+-PKG_CHECK_MODULES(NetworkManager, NetworkManager dbus-1, 
 -  have_networkmanager=yes, 
have_networkmanager=no)
 +PKG_CHECK_MODULES(NetworkManager, NetworkManager,
-+  [PKG_CHECK_MODULES(DBUS, dbus-1, have_networkmanager=yes, 
have_networkmanager=no)],
++[PKG_CHECK_MODULES(DBUS, dbus-1, have_networkmanager=yes, 
have_networkmanager=no)],
 +  have_networkmanager=no)
+ PKG_CHECK_MODULES(QtCore, QtCore, have_qtcore=yes, have_qtcore=no)
  
- # Environmental Variable
- AC_ARG_WITH([envvar],
-@@ -136,12 +138,12 @@
- [test x$have_networkmanager == xyes && with_networkmanager=yes])
+ # Direct
+@@ -124,12 +126,12 @@
+ [test x$have_networkmanager = xyes && with_networkmanager=yes])
  if test x$with_networkmanager = xyes; then
-   if test x$have_networkmanager == xyes; then
+   if test x$have_networkmanager = xyes; then
 -  NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS"
 -  NETWORKMANAGER_LIBS="$NetworkManager_LIBS"
-+  NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS $DBUS_CFLAGS"
-+  NETWORKMANAGER_LIBS="$NetworkManager_LIBS $DBUS_LIBS"
++  NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS $DBUS_CFLAGS"
++  NETWORKMANAGER_LIBS="$NetworkManager_LIBS $DBUS_LIBS"
AC_SUBST(NETWORKMANAGER_CFLAGS)
AC_SUBST(NETWORKMANAGER_LIBS)
else
--  echo "NetworkManager plugin requires: NetworkManager!"
-+  echo "NetworkManager plugin requires: NetworkManager and DBus!"
+-  echo "NetworkManager module requires: NetworkManager!"
++  echo "NetworkManager module requires: NetworkManager and DBus!"
exit 1
fi
  else
-