[arch-commits] Commit in libproxy/repos (6 files)
Jan de Groot
jgc at archlinux.org
Thu May 11 21:37:08 UTC 2017
Date: Thursday, May 11, 2017 @ 21:37:07
Author: jgc
Revision: 295845
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libproxy/repos/extra-i686/PKGBUILD
(from rev 295844, libproxy/trunk/PKGBUILD)
libproxy/repos/extra-x86_64/PKGBUILD
(from rev 295844, libproxy/trunk/PKGBUILD)
Deleted:
libproxy/repos/extra-i686/PKGBUILD
libproxy/repos/extra-i686/libproxy-0.4.11-crash.patch
libproxy/repos/extra-x86_64/PKGBUILD
libproxy/repos/extra-x86_64/libproxy-0.4.11-crash.patch
------------------------------------------+
/PKGBUILD | 94 +++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 49 ---------------
extra-i686/libproxy-0.4.11-crash.patch | 41 ------------
extra-x86_64/PKGBUILD | 49 ---------------
extra-x86_64/libproxy-0.4.11-crash.patch | 41 ------------
5 files changed, 94 insertions(+), 180 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-05-11 21:36:58 UTC (rev 295844)
+++ extra-i686/PKGBUILD 2017-05-11 21:37:07 UTC (rev 295845)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libproxy
-pkgver=0.4.13
-pkgrel=2
-pkgdesc="A library that provides automatic proxy configuration management"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gcc-libs')
-optdepends=('networkmanager: NetworkManager configuration module'
- 'perl: Perl bindings'
- 'python2: Python bindings'
- 'glib2: gsettings configuration module'
- '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
- libproxy-0.4.11-crash.patch)
-md5sums=('de293bb311f185a2ffa3492700a694c2'
- 'a45f2195c164a48639e963e8341f5d93')
-
-prepare() {
- mkdir build
- cd $pkgname-$pkgver
- patch -Np1 -i ../libproxy-0.4.11-crash.patch
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
- -DCMAKE_SKIP_RPATH=ON \
- -DPERL_VENDORINSTALL=yes \
- -DCMAKE_BUILD_TYPE=Release \
- -DWITH_WEBKIT3=ON \
- -DWITH_MOZJS=OFF \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
- -DCMAKE_C_FLAGS="${CFLAGS}" \
- -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2 \
- -DBIPR=0
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: libproxy/repos/extra-i686/PKGBUILD (from rev 295844, libproxy/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-05-11 21:37:07 UTC (rev 295845)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libproxy
+pkgver=0.4.15
+pkgrel=1
+pkgdesc="A library that provides automatic proxy configuration management"
+arch=(i686 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)'
+ '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')
+
+prepare() {
+ mkdir build
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DPERL_VENDORINSTALL=yes \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_WEBKIT3=ON \
+ -DWITH_MOZJS=ON \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+ -DCMAKE_C_FLAGS="${CFLAGS}" \
+ -DPYTHON2_EXECUTABLE:FILEPATH=/usr/bin/python2 \
+ -DBIPR=0
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/libproxy-0.4.11-crash.patch
===================================================================
--- extra-i686/libproxy-0.4.11-crash.patch 2017-05-11 21:36:58 UTC (rev 295844)
+++ extra-i686/libproxy-0.4.11-crash.patch 2017-05-11 21:37:07 UTC (rev 295845)
@@ -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);
- }
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-05-11 21:36:58 UTC (rev 295844)
+++ extra-x86_64/PKGBUILD 2017-05-11 21:37:07 UTC (rev 295845)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libproxy
-pkgver=0.4.13
-pkgrel=2
-pkgdesc="A library that provides automatic proxy configuration management"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gcc-libs')
-optdepends=('networkmanager: NetworkManager configuration module'
- 'perl: Perl bindings'
- 'python2: Python bindings'
- 'glib2: gsettings configuration module'
- '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
- libproxy-0.4.11-crash.patch)
-md5sums=('de293bb311f185a2ffa3492700a694c2'
- 'a45f2195c164a48639e963e8341f5d93')
-
-prepare() {
- mkdir build
- cd $pkgname-$pkgver
- patch -Np1 -i ../libproxy-0.4.11-crash.patch
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
- -DCMAKE_SKIP_RPATH=ON \
- -DPERL_VENDORINSTALL=yes \
- -DCMAKE_BUILD_TYPE=Release \
- -DWITH_WEBKIT3=ON \
- -DWITH_MOZJS=OFF \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
- -DCMAKE_C_FLAGS="${CFLAGS}" \
- -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2 \
- -DBIPR=0
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: libproxy/repos/extra-x86_64/PKGBUILD (from rev 295844, libproxy/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-05-11 21:37:07 UTC (rev 295845)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libproxy
+pkgver=0.4.15
+pkgrel=1
+pkgdesc="A library that provides automatic proxy configuration management"
+arch=(i686 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)'
+ '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')
+
+prepare() {
+ mkdir build
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DPERL_VENDORINSTALL=yes \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_WEBKIT3=ON \
+ -DWITH_MOZJS=ON \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+ -DCMAKE_C_FLAGS="${CFLAGS}" \
+ -DPYTHON2_EXECUTABLE:FILEPATH=/usr/bin/python2 \
+ -DBIPR=0
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/libproxy-0.4.11-crash.patch
===================================================================
--- extra-x86_64/libproxy-0.4.11-crash.patch 2017-05-11 21:36:58 UTC (rev 295844)
+++ extra-x86_64/libproxy-0.4.11-crash.patch 2017-05-11 21:37:07 UTC (rev 295845)
@@ -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);
- }
More information about the arch-commits
mailing list