libproxy
This commit is contained in:
bferturk
@@ -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")
|
||||
@@ -0,0 +1,89 @@
|
||||
From cccc44ce0c8a251d987d0d83f05e93d31aa659d7 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Walters <walters@verbum.org>
|
||||
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 <cstring> // ?
|
||||
#include <unistd.h> // gethostname
|
||||
+#include <stdint.h>
|
||||
|
||||
#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
|
||||
@@ -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})
|
||||
@@ -0,0 +1,106 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>libproxy</Name>
|
||||
<Homepage>http://code.google.com/p/libproxy/</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>LGPLv2.1</License>
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>Proxy configuration library</Summary>
|
||||
<Description>libproxy is a library that provides automatic proxy configuration management.</Description>
|
||||
<Archive sha1sum="c037969434095bc65d29437e11a7c9e0293a5149" type="targz">http://pkgs.fedoraproject.org/repo/pkgs/libproxy/libproxy-0.4.11.tar.gz/3cd1ae2a4abecf44b3f24d6639d2cd84/libproxy-0.4.11.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>gconf-devel</Dependency>
|
||||
<Dependency>libXmu-devel</Dependency>
|
||||
<Dependency>NetworkManager-devel</Dependency>
|
||||
<Dependency>webkit-gtk2-devel</Dependency>
|
||||
<Dependency>spidermonkey-devel</Dependency>
|
||||
<Dependency>cmake</Dependency>
|
||||
<Dependency>intltool</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="0">libproxy-0.4.10-mozjs.patch</Patch>
|
||||
<Patch level="1">0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>libproxy</Name>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="executable">/usr/libexec/</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libproxy-gnome3</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libproxy</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/libproxy/*/modules/config_gnome3.*</Path>
|
||||
<!-- add gconf helper to gnome package -->
|
||||
<Path fileType="executable">/usr/libexec/pxgconf</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libproxy-networkmanager</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libproxy</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/libproxy/*/modules/network_networkmanager.*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libproxy-webkit-gtk2</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libproxy</Dependency>
|
||||
<Dependency>webkit-gtk2</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/libproxy/*/modules/pacrunner_webkit*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libproxy-mozjs</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libproxy</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/libproxy/*/modules/pacrunner_mozjs*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libproxy-devel</Name>
|
||||
<Summary>Development files for libproxy</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">libproxy</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||
<Path fileType="data">/usr/share/cmake</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="1">
|
||||
<Date>2016-11-01</Date>
|
||||
<Version>0.4.10</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>libproxy</Name>
|
||||
<Summary xml:lang="tr">Proxy yapılandırma kitaplığı</Summary>
|
||||
<Description xml:lang="tr">Otomatik proxy yapılandırma yönetimini sağlayan bir kitaplığı.</Description>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>libproxy-devel</Name>
|
||||
<Summary xml:lang="tr">libproxy için geliştirme dosyaları</Summary>
|
||||
</Package>
|
||||
</PISI>
|
||||
+101
@@ -6677,6 +6677,107 @@
|
||||
</Update>
|
||||
</History>
|
||||
</SpecFile>
|
||||
<SpecFile>
|
||||
<Source>
|
||||
<Name>libproxy</Name>
|
||||
<Homepage>http://code.google.com/p/libproxy/</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>LGPLv2.1</License>
|
||||
<IsA>app:console</IsA>
|
||||
<PartOf>network.misc</PartOf>
|
||||
<Summary xml:lang="en">Proxy configuration library</Summary>
|
||||
<Summary xml:lang="tr">Proxy yapılandırma kitaplığı</Summary>
|
||||
<Description xml:lang="en">libproxy is a library that provides automatic proxy configuration management.</Description>
|
||||
<Description xml:lang="tr">Otomatik proxy yapılandırma yönetimini sağlayan bir kitaplığı.</Description>
|
||||
<Archive type="targz" sha1sum="c037969434095bc65d29437e11a7c9e0293a5149">http://pkgs.fedoraproject.org/repo/pkgs/libproxy/libproxy-0.4.11.tar.gz/3cd1ae2a4abecf44b3f24d6639d2cd84/libproxy-0.4.11.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>gconf-devel</Dependency>
|
||||
<Dependency>libXmu-devel</Dependency>
|
||||
<Dependency>NetworkManager-devel</Dependency>
|
||||
<Dependency>webkit-gtk2-devel</Dependency>
|
||||
<Dependency>spidermonkey-devel</Dependency>
|
||||
<Dependency>cmake</Dependency>
|
||||
<Dependency>intltool</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="0">libproxy-0.4.10-mozjs.patch</Patch>
|
||||
<Patch level="1">0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch</Patch>
|
||||
</Patches>
|
||||
<SourceURI>network/misc/libproxy/pspec.xml</SourceURI>
|
||||
</Source>
|
||||
<Package>
|
||||
<Name>libproxy</Name>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="executable">/usr/libexec/</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
<Package>
|
||||
<Name>libproxy-gnome3</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libproxy</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/libproxy/*/modules/config_gnome3.*</Path>
|
||||
<Path fileType="executable">/usr/libexec/pxgconf</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
<Package>
|
||||
<Name>libproxy-networkmanager</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libproxy</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/libproxy/*/modules/network_networkmanager.*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
<Package>
|
||||
<Name>libproxy-webkit-gtk2</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libproxy</Dependency>
|
||||
<Dependency>webkit-gtk2</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/libproxy/*/modules/pacrunner_webkit*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
<Package>
|
||||
<Name>libproxy-mozjs</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libproxy</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/libproxy/*/modules/pacrunner_mozjs*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
<Package>
|
||||
<Name>libproxy-devel</Name>
|
||||
<Summary xml:lang="en">Development files for libproxy</Summary>
|
||||
<Summary xml:lang="tr">libproxy için geliştirme dosyaları</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="1">libproxy</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||
<Path fileType="data">/usr/share/cmake</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
<History>
|
||||
<Update release="1">
|
||||
<Date>2016-11-01</Date>
|
||||
<Version>0.4.10</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</SpecFile>
|
||||
<SpecFile>
|
||||
<Source>
|
||||
<Name>bash-completion</Name>
|
||||
|
||||
@@ -1 +1 @@
|
||||
a86f83640f4084ee9f61a0e018d32b7e49ca4907
|
||||
4bc9d3eb34bf69b3c4fa9f35a5e1530c57ae1718
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
41d8263b0588c0270aff27238fe868fec323437d
|
||||
50e43ce05b5cfc28dbe2ab6fc9ea17861a1127b3
|
||||
Reference in New Issue
Block a user