1 |
commit: d7675df85cdc0851c7ce306290677afb08b8dcbe |
2 |
Author: Jan Chren <dev.rindeal <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Apr 28 20:55:05 2016 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 8 04:19:32 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7675df8 |
7 |
|
8 |
net-libs/libproxy: update patches |
9 |
|
10 |
Patches were simply ported from 0.4.11. |
11 |
|
12 |
.../libproxy/files/libproxy-0.4.12-macosx.patch | 70 ++++++++++++++++++++++ |
13 |
.../libproxy/files/libproxy-0.4.12-mozjs.pc.patch | 23 +++++++ |
14 |
net-libs/libproxy/libproxy-0.4.13.ebuild | 18 +++--- |
15 |
3 files changed, 102 insertions(+), 9 deletions(-) |
16 |
|
17 |
diff --git a/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch b/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch |
18 |
new file mode 100644 |
19 |
index 0000000..052e6b0 |
20 |
--- /dev/null |
21 |
+++ b/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch |
22 |
@@ -0,0 +1,70 @@ |
23 |
+https://trac.macports.org/browser/trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff |
24 |
+ |
25 |
+diff -ur libproxy/cmake.orig/libproxy.cmk libproxy/cmake/libproxy.cmk |
26 |
+--- a/libproxy/cmake/libproxy.cmk 2012-10-02 07:20:40.000000000 -0700 |
27 |
++++ b/libproxy/cmake/libproxy.cmk 2012-10-19 13:47:50.000000000 -0700 |
28 |
+@@ -18,7 +18,7 @@ |
29 |
+ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp |
30 |
+ PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES}) |
31 |
+ # When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings. |
32 |
+-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) |
33 |
++set_target_properties(libproxy PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" PREFIX "" VERSION 1.0.0 SOVERSION 1) |
34 |
+ set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") |
35 |
+ set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") |
36 |
+ install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) |
37 |
+diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk |
38 |
+--- libproxy/cmake.orig/modules/config_envvar.cmk 2010-06-14 10:40:47.000000000 -0700 |
39 |
++++ b/libproxy/cmake/modules/config_envvar.cmk 2012-10-19 13:45:42.000000000 -0700 |
40 |
+@@ -1,3 +1,3 @@ |
41 |
+-if (NOT WIN32 AND NOT APPLE) |
42 |
++if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) |
43 |
+ set(ENVVAR_FOUND 1) |
44 |
+-endif() |
45 |
+\ No newline at end of file |
46 |
++endif() |
47 |
+diff -ur libproxy/cmake.orig/modules/config_gnome.cmk libproxy/cmake/modules/config_gnome.cmk |
48 |
+--- libproxy/cmake.orig/modules/config_gnome.cmk 2012-10-02 07:20:40.000000000 -0700 |
49 |
++++ b/libproxy/cmake/modules/config_gnome.cmk 2012-10-19 13:45:42.000000000 -0700 |
50 |
+@@ -1,4 +1,4 @@ |
51 |
+-if (NOT WIN32 AND NOT APPLE) |
52 |
++if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) |
53 |
+ option(WITH_GNOME2 "Target a GNOME 2 system (gconf)" OFF) |
54 |
+ option(WITH_GNOME3 "Target a GNOME 3 system (gsettings)" ON) |
55 |
+ if(WITH_GNOME3) |
56 |
+diff -ur libproxy/cmake.orig/modules/config_macosx.cmk libproxy/cmake/modules/config_macosx.cmk |
57 |
+--- libproxy/cmake.orig/modules/config_macosx.cmk 2010-06-14 10:40:47.000000000 -0700 |
58 |
++++ b/libproxy/cmake/modules/config_macosx.cmk 2012-10-19 13:45:42.000000000 -0700 |
59 |
+@@ -1,4 +1,4 @@ |
60 |
+-if(APPLE) |
61 |
++if(APPLE AND MP_MACOSX) |
62 |
+ find_library(SC_LIBRARIES SystemConfiguration) |
63 |
+ find_library(CF_LIBRARIES CoreFoundation) |
64 |
+ if(SC_LIBRARIES) |
65 |
+@@ -7,4 +7,4 @@ |
66 |
+ if(CF_LIBRARIES) |
67 |
+ set(CF_FOUND 1) |
68 |
+ endif() |
69 |
+-endif() |
70 |
+\ No newline at end of file |
71 |
++endif() |
72 |
+diff -ur libproxy/cmake.orig/modules/pacrunner_webkit.cmk libproxy/cmake/modules/pacrunner_webkit.cmk |
73 |
+--- libproxy/cmake.orig/modules/pacrunner_webkit.cmk 2012-10-02 07:20:40.000000000 -0700 |
74 |
++++ b/libproxy/cmake/modules/pacrunner_webkit.cmk 2012-10-19 13:45:42.000000000 -0700 |
75 |
+@@ -6,7 +6,7 @@ |
76 |
+ link_directories(WEBKIT_LIBRARIES) |
77 |
+ include_directories("${WEBKIT_INCLUDE_DIR}") |
78 |
+ endif() |
79 |
+-elseif(APPLE) |
80 |
++elseif(APPLE AND MP_MACOSX) |
81 |
+ find_library(WEBKIT_LIBRARIES JavaScriptCore) |
82 |
+ if(WEBKIT_LIBRARIES) |
83 |
+ set(WEBKIT_FOUND 1) |
84 |
+diff -ur libproxy/cmake.orig/pkgconfig.cmk libproxy/cmake/pkgconfig.cmk |
85 |
+--- libproxy/cmake.orig/pkgconfig.cmk 2012-10-02 07:20:40.000000000 -0700 |
86 |
++++ b/libproxy/cmake/pkgconfig.cmk 2012-10-19 13:45:42.000000000 -0700 |
87 |
+@@ -1,4 +1,4 @@ |
88 |
+-if(NOT WIN32 AND NOT APPLE) |
89 |
++if(NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) |
90 |
+ find_package(PkgConfig) |
91 |
+ |
92 |
+ # Define our magical px_check_modules function |
93 |
|
94 |
diff --git a/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch b/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch |
95 |
new file mode 100644 |
96 |
index 0000000..bf69fc3 |
97 |
--- /dev/null |
98 |
+++ b/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch |
99 |
@@ -0,0 +1,23 @@ |
100 |
+--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk 2011-06-20 04:31:41.000000000 -0600 |
101 |
++++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk 2013-03-24 19:20:17.910765954 -0600 |
102 |
+@@ -9,12 +9,18 @@ |
103 |
+ elseif(NOT APPLE) |
104 |
+ option(WITH_MOZJS "Search for MOZJS package" ON) |
105 |
+ if (WITH_MOZJS) |
106 |
+- pkg_search_module(MOZJS mozjs185) |
107 |
++ pkg_search_module(MOZJS mozjs187) |
108 |
+ if(MOZJS_FOUND) |
109 |
+ include_directories(${MOZJS_INCLUDE_DIRS}) |
110 |
+ link_directories(${MOZJS_LIBRARY_DIRS}) |
111 |
+ else() |
112 |
+- set(MOZJS_FOUND 0) |
113 |
++ pkg_search_module(MOZJS mozjs185) |
114 |
++ if(MOZJS_FOUND) |
115 |
++ include_directories(${MOZJS_INCLUDE_DIRS}) |
116 |
++ link_directories(${MOZJS_LIBRARY_DIRS}) |
117 |
++ else() |
118 |
++ set(MOZJS_FOUND 0) |
119 |
++ endif() |
120 |
+ endif() |
121 |
+ else() |
122 |
+ set(MOZJS_FOUND 0) |
123 |
|
124 |
diff --git a/net-libs/libproxy/libproxy-0.4.13.ebuild b/net-libs/libproxy/libproxy-0.4.13.ebuild |
125 |
index ab33a4f..0a9b94c 100644 |
126 |
--- a/net-libs/libproxy/libproxy-0.4.13.ebuild |
127 |
+++ b/net-libs/libproxy/libproxy-0.4.13.ebuild |
128 |
@@ -35,19 +35,19 @@ DEPEND="${RDEPEND} |
129 |
# avoid dependency loop, bug #467696 |
130 |
PDEPEND="networkmanager? ( net-misc/networkmanager )" |
131 |
|
132 |
-src_prepare() { |
133 |
- # Gentoo's spidermonkey doesn't set Version: in mozjs18[57].pc |
134 |
- epatch "${FILESDIR}/${P}-mozjs.pc.patch" |
135 |
- |
136 |
+PATCHES=( |
137 |
# get-pac-test freezes when run by the ebuild, succeeds when building |
138 |
# manually; virtualx.eclass doesn't help :( |
139 |
- epatch "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch" |
140 |
- |
141 |
- epatch "${FILESDIR}"/${P}-macosx.patch |
142 |
+ "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch" |
143 |
|
144 |
# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696 |
145 |
- epatch "${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch" |
146 |
-} |
147 |
+ "${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch" |
148 |
+ |
149 |
+ # Gentoo's spidermonkey doesn't set Version: in mozjs18[57].pc |
150 |
+ "${FILESDIR}/${PN}-0.4.12-mozjs.pc.patch" |
151 |
+ |
152 |
+ "${FILESDIR}/${PN}-0.4.12-macosx.patch" |
153 |
+) |
154 |
|
155 |
src_configure() { |
156 |
[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl |