From 78a6f55c5eee9b271d45fddb7baaec40a53e4269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Tue, 24 Jul 2018 22:06:52 +0300 Subject: [PATCH] update --- .../libproxy/files/libproxy-pac-modules.patch | 15 +++++++++++++ network/misc/libproxy/pspec.xml | 22 +++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 network/misc/libproxy/files/libproxy-pac-modules.patch diff --git a/network/misc/libproxy/files/libproxy-pac-modules.patch b/network/misc/libproxy/files/libproxy-pac-modules.patch new file mode 100644 index 0000000000..690cec65bb --- /dev/null +++ b/network/misc/libproxy/files/libproxy-pac-modules.patch @@ -0,0 +1,15 @@ +Always build pacrunners as separate modules, not libproxy builtins +--- libproxy-0.4.8/libproxy/cmake/modules.cmk.orig 2012-10-05 17:15:58.655470278 +0200 ++++ libproxy-0.4.8/libproxy/cmake/modules.cmk 2012-10-05 17:47:10.435431265 +0200 +@@ -19,10 +19,7 @@ + include(cmake/modules/pacrunner_webkit.cmk) + + # Build the pacrunner into libproxy unless we are building for multiple engines +-set(BIPR 1 CACHE BOOL "Build internal pacrunner? (Always false when building more than one PR") +-if((MOZJS_FOUND AND WEBKIT_FOUND) OR (MOZJS_FOUND AND NATUS_FOUND) OR (WEBKIT_FOUND AND NATUS_FOUND)) +- set(BIPR 0) +-endif() ++set(BIPR 0) + + # + ## Module definition diff --git a/network/misc/libproxy/pspec.xml b/network/misc/libproxy/pspec.xml index d504ef4feb..89b682d45a 100644 --- a/network/misc/libproxy/pspec.xml +++ b/network/misc/libproxy/pspec.xml @@ -3,7 +3,7 @@ libproxy - http://code.google.com/p/libproxy/ + https://github.com/libproxy/libproxy PisiLinux Community admins@pisilinux.org @@ -12,7 +12,7 @@ app:console Proxy configuration library libproxy is a library that provides automatic proxy configuration management. - http://pkgs.fedoraproject.org/repo/pkgs/libproxy/libproxy-0.4.11.tar.gz/3cd1ae2a4abecf44b3f24d6639d2cd84/libproxy-0.4.11.tar.gz + https://github.com/libproxy/libproxy/archive/0.4.15.tar.gz gconf-devel libXmu-devel @@ -23,13 +23,16 @@ intltool - libproxy-0.4.10-mozjs.patch - 0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch + libproxy-pac-modules.patch libproxy + + glib2 + libgcc + /usr/bin /usr/lib @@ -42,6 +45,7 @@ libproxy-gnome3 libproxy + libgcc /usr/lib/libproxy/*/modules/config_gnome3.* @@ -54,6 +58,8 @@ libproxy-networkmanager libproxy + dbus + libgcc /usr/lib/libproxy/*/modules/network_networkmanager.* @@ -65,6 +71,7 @@ libproxy webkit-gtk2 + libgcc /usr/lib/libproxy/*/modules/pacrunner_webkit* @@ -95,6 +102,13 @@ + + 2018-07-24 + 0.4.15 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2017-07-30 0.4.10