This commit is contained in:
Ertuğrul Erata
2018-07-24 22:06:52 +03:00
parent 292aa95773
commit 78a6f55c5e
2 changed files with 33 additions and 4 deletions
@@ -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
+18 -4
View File
@@ -3,7 +3,7 @@
<PISI>
<Source>
<Name>libproxy</Name>
<Homepage>http://code.google.com/p/libproxy/</Homepage>
<Homepage>https://github.com/libproxy/libproxy</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
@@ -12,7 +12,7 @@
<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>
<Archive sha1sum="2dc0fc31cad78ce3d7a5ceb8fa8df07010f5c13e" type="targz">https://github.com/libproxy/libproxy/archive/0.4.15.tar.gz</Archive>
<BuildDependencies>
<Dependency>gconf-devel</Dependency>
<Dependency>libXmu-devel</Dependency>
@@ -23,13 +23,16 @@
<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>
<Patch>libproxy-pac-modules.patch</Patch>
</Patches>
</Source>
<Package>
<Name>libproxy</Name>
<RuntimeDependencies>
<Dependency>glib2</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
@@ -42,6 +45,7 @@
<Name>libproxy-gnome3</Name>
<RuntimeDependencies>
<Dependency>libproxy</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/libproxy/*/modules/config_gnome3.*</Path>
@@ -54,6 +58,8 @@
<Name>libproxy-networkmanager</Name>
<RuntimeDependencies>
<Dependency>libproxy</Dependency>
<Dependency>dbus</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/libproxy/*/modules/network_networkmanager.*</Path>
@@ -65,6 +71,7 @@
<RuntimeDependencies>
<Dependency>libproxy</Dependency>
<Dependency>webkit-gtk2</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/libproxy/*/modules/pacrunner_webkit*</Path>
@@ -95,6 +102,13 @@
</Package>
<History>
<Update release="4">
<Date>2018-07-24</Date>
<Version>0.4.15</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="3">
<Date>2017-07-30</Date>
<Version>0.4.10</Version>