diff --git a/network/misc/libproxy/actions.py b/network/misc/libproxy/actions.py new file mode 100644 index 0000000000..ae7ce7c7f0 --- /dev/null +++ b/network/misc/libproxy/actions.py @@ -0,0 +1,26 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import cmaketools +from pisi.actionsapi import shelltools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DPERL_VENDORINSTALL=yes \ + -DCMAKE_BUILD_TYPE=Release \ + -DWITH_WEBKIT=ON \ + -DWITH_MOZJS=ON") + +def build(): + cmaketools.make() + +def install(): + cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("README", "ChangeLog", "COPYING") diff --git a/network/misc/libproxy/files/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch b/network/misc/libproxy/files/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch new file mode 100644 index 0000000000..034257ea96 --- /dev/null +++ b/network/misc/libproxy/files/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch @@ -0,0 +1,89 @@ +From cccc44ce0c8a251d987d0d83f05e93d31aa659d7 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 3 Jun 2013 17:09:25 -0400 +Subject: [PATCH] pacrunner_mozjs: Also support mozjs-17.0 + +GNOME 3.10 is moving to hard require mozjs-17.0, so we should support +it too. See also: + +https://bugs.freedesktop.org/show_bug.cgi?id=59830 +https://bugzilla.gnome.org/show_bug.cgi?id=690982 +--- + libproxy/cmake/modules/pacrunner_mozjs.cmk | 8 +++++++- + libproxy/modules/pacrunner_mozjs.cpp | 16 +++++++++++++--- + 2 files changed, 20 insertions(+), 4 deletions(-) + +diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk +index 21072db..49856a6 100644 +--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk ++++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk +@@ -14,7 +14,13 @@ elseif(NOT APPLE) + include_directories(${MOZJS_INCLUDE_DIRS}) + link_directories(${MOZJS_LIBRARY_DIRS}) + else() +- set(MOZJS_FOUND 0) ++ pkg_search_module(MOZJS mozjs-17.0) ++ if(MOZJS_FOUND) ++ include_directories(${MOZJS_INCLUDE_DIRS}) ++ link_directories(${MOZJS_LIBRARY_DIRS}) ++ else() ++ set(MOZJS_FOUND 0) ++ endif() + endif() + else() + set(MOZJS_FOUND 0) +diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp +index abb4b9d..f5e678c 100644 +--- a/libproxy/modules/pacrunner_mozjs.cpp ++++ b/libproxy/modules/pacrunner_mozjs.cpp +@@ -19,6 +19,7 @@ + + #include // ? + #include // gethostname ++#include + + #include "../extension_pacrunner.hpp" + using namespace libproxy; +@@ -76,12 +77,12 @@ static JSBool dnsResolve_(JSContext *cx, jsval hostname, jsval *vp) { + return true; + } + +-static JSBool dnsResolve(JSContext *cx, uintN /*argc*/, jsval *vp) { ++static JSBool dnsResolve(JSContext *cx, uint32_t /*argc*/, jsval *vp) { + jsval *argv = JS_ARGV(cx, vp); + return dnsResolve_(cx, argv[0], vp); + } + +-static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) { ++static JSBool myIpAddress(JSContext *cx, uint32_t /*argc*/, jsval *vp) { + char *hostname = (char *) JS_malloc(cx, 1024); + if (!gethostname(hostname, 1023)) { + JSString *myhost = JS_NewStringCopyN(cx, hostname, strlen(hostname)); +@@ -98,7 +99,12 @@ static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) { + static JSClass cls = { + "global", JSCLASS_GLOBAL_FLAGS, + JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, +- JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub, ++ JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, ++#if JS_VERSION == 186 ++ NULL, ++#else ++ JS_FinalizeStub, ++#endif + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL + }; + +@@ -117,7 +123,11 @@ public: + //JS_SetOptions(this->jsctx, JSOPTION_VAROBJFIX); + //JS_SetVersion(this->jsctx, JSVERSION_LATEST); + //JS_SetErrorReporter(cx, reportError); ++#if JS_VERSION == 186 ++ if (!(this->jsglb = JS_NewGlobalObject(this->jsctx, &cls, NULL))) goto error; ++#else + if (!(this->jsglb = JS_NewCompartmentAndGlobalObject(this->jsctx, &cls, NULL))) goto error; ++#endif + if (!JS_InitStandardClasses(this->jsctx, this->jsglb)) goto error; + + // Define Javascript functions +-- +1.7.1 diff --git a/network/misc/libproxy/files/libproxy-0.4.10-mozjs.patch b/network/misc/libproxy/files/libproxy-0.4.10-mozjs.patch new file mode 100644 index 0000000000..0ce5e6eae5 --- /dev/null +++ b/network/misc/libproxy/files/libproxy-0.4.10-mozjs.patch @@ -0,0 +1,11 @@ +--- libproxy/cmake/modules/pacrunner_mozjs.cmk.orig 2012-10-02 16:20:40.000000000 +0200 ++++ libproxy/cmake/modules/pacrunner_mozjs.cmk 2012-10-17 00:36:43.645579472 +0200 +@@ -9,7 +9,7 @@ if(WIN32) + elseif(NOT APPLE) + option(WITH_MOZJS "Search for MOZJS package" ON) + if (WITH_MOZJS) +- pkg_search_module(MOZJS mozjs185>=1.8.5) ++ pkg_search_module(MOZJS mozjs185) + if(MOZJS_FOUND) + include_directories(${MOZJS_INCLUDE_DIRS}) + link_directories(${MOZJS_LIBRARY_DIRS}) diff --git a/network/misc/libproxy/pspec.xml b/network/misc/libproxy/pspec.xml new file mode 100644 index 0000000000..080e017b10 --- /dev/null +++ b/network/misc/libproxy/pspec.xml @@ -0,0 +1,106 @@ + + + + + libproxy + http://code.google.com/p/libproxy/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + 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 + + gconf-devel + libXmu-devel + NetworkManager-devel + webkit-gtk2-devel + spidermonkey-devel + cmake + intltool + + + libproxy-0.4.10-mozjs.patch + 0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch + + + + + libproxy + + /usr/bin + /usr/lib + /usr/libexec/ + /usr/share/doc + + + + + libproxy-gnome3 + + libproxy + + + /usr/lib/libproxy/*/modules/config_gnome3.* + + /usr/libexec/pxgconf + + + + + libproxy-networkmanager + + libproxy + + + /usr/lib/libproxy/*/modules/network_networkmanager.* + + + + + libproxy-webkit-gtk2 + + libproxy + webkit-gtk2 + + + /usr/lib/libproxy/*/modules/pacrunner_webkit* + + + + + libproxy-mozjs + + libproxy + + + /usr/lib/libproxy/*/modules/pacrunner_mozjs* + + + + + libproxy-devel + Development files for libproxy + + libproxy + + + /usr/include + /usr/lib/pkgconfig + /usr/share/cmake + + + + + + 2016-11-01 + 0.4.10 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/network/misc/libproxy/translations.xml b/network/misc/libproxy/translations.xml new file mode 100644 index 0000000000..10e9589414 --- /dev/null +++ b/network/misc/libproxy/translations.xml @@ -0,0 +1,13 @@ + + + + libproxy + Proxy yapılandırma kitaplığı + Otomatik proxy yapılandırma yönetimini sağlayan bir kitaplığı. + + + + libproxy-devel + libproxy için geliştirme dosyaları + + diff --git a/pisi-index.xml b/pisi-index.xml index 5b7de2e106..e1e2279451 100644 --- a/pisi-index.xml +++ b/pisi-index.xml @@ -6677,6 +6677,107 @@ + + + libproxy + http://code.google.com/p/libproxy/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + app:console + network.misc + Proxy configuration library + Proxy yapılandırma kitaplığı + libproxy is a library that provides automatic proxy configuration management. + Otomatik proxy yapılandırma yönetimini sağlayan bir kitaplığı. + http://pkgs.fedoraproject.org/repo/pkgs/libproxy/libproxy-0.4.11.tar.gz/3cd1ae2a4abecf44b3f24d6639d2cd84/libproxy-0.4.11.tar.gz + + gconf-devel + libXmu-devel + NetworkManager-devel + webkit-gtk2-devel + spidermonkey-devel + cmake + intltool + + + libproxy-0.4.10-mozjs.patch + 0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch + + network/misc/libproxy/pspec.xml + + + libproxy + + /usr/bin + /usr/lib + /usr/libexec/ + /usr/share/doc + + + + libproxy-gnome3 + + libproxy + + + /usr/lib/libproxy/*/modules/config_gnome3.* + /usr/libexec/pxgconf + + + + libproxy-networkmanager + + libproxy + + + /usr/lib/libproxy/*/modules/network_networkmanager.* + + + + libproxy-webkit-gtk2 + + libproxy + webkit-gtk2 + + + /usr/lib/libproxy/*/modules/pacrunner_webkit* + + + + libproxy-mozjs + + libproxy + + + /usr/lib/libproxy/*/modules/pacrunner_mozjs* + + + + libproxy-devel + Development files for libproxy + libproxy için geliştirme dosyaları + + libproxy + + + /usr/include + /usr/lib/pkgconfig + /usr/share/cmake + + + + + 2016-11-01 + 0.4.10 + First release + PisiLinux Community + admins@pisilinux.org + + + bash-completion diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum index 15828c28fa..9dc04868e7 100644 --- a/pisi-index.xml.sha1sum +++ b/pisi-index.xml.sha1sum @@ -1 +1 @@ -a86f83640f4084ee9f61a0e018d32b7e49ca4907 \ No newline at end of file +4bc9d3eb34bf69b3c4fa9f35a5e1530c57ae1718 \ No newline at end of file diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz index cb37359f30..256e23a0df 100644 Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum index 25338cdc84..d84f145e03 100644 --- a/pisi-index.xml.xz.sha1sum +++ b/pisi-index.xml.xz.sha1sum @@ -1 +1 @@ -41d8263b0588c0270aff27238fe868fec323437d \ No newline at end of file +50e43ce05b5cfc28dbe2ab6fc9ea17861a1127b3 \ No newline at end of file