commit: d7675df85cdc0851c7ce306290677afb08b8dcbe Author: Jan Chren <dev.rindeal <AT> gmail <DOT> com> AuthorDate: Thu Apr 28 20:55:05 2016 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Sun May 8 04:19:32 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7675df8
net-libs/libproxy: update patches Patches were simply ported from 0.4.11. .../libproxy/files/libproxy-0.4.12-macosx.patch | 70 ++++++++++++++++++++++ .../libproxy/files/libproxy-0.4.12-mozjs.pc.patch | 23 +++++++ net-libs/libproxy/libproxy-0.4.13.ebuild | 18 +++--- 3 files changed, 102 insertions(+), 9 deletions(-) diff --git a/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch b/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch new file mode 100644 index 0000000..052e6b0 --- /dev/null +++ b/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch @@ -0,0 +1,70 @@ +https://trac.macports.org/browser/trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff + +diff -ur libproxy/cmake.orig/libproxy.cmk libproxy/cmake/libproxy.cmk +--- a/libproxy/cmake/libproxy.cmk 2012-10-02 07:20:40.000000000 -0700 ++++ b/libproxy/cmake/libproxy.cmk 2012-10-19 13:47:50.000000000 -0700 +@@ -18,7 +18,7 @@ + set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp + PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES}) + # When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings. +-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) ++set_target_properties(libproxy PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" PREFIX "" VERSION 1.0.0 SOVERSION 1) + set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") + set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") + install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) +diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk +--- libproxy/cmake.orig/modules/config_envvar.cmk 2010-06-14 10:40:47.000000000 -0700 ++++ b/libproxy/cmake/modules/config_envvar.cmk 2012-10-19 13:45:42.000000000 -0700 +@@ -1,3 +1,3 @@ +-if (NOT WIN32 AND NOT APPLE) ++if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) + set(ENVVAR_FOUND 1) +-endif() +\ No newline at end of file ++endif() +diff -ur libproxy/cmake.orig/modules/config_gnome.cmk libproxy/cmake/modules/config_gnome.cmk +--- libproxy/cmake.orig/modules/config_gnome.cmk 2012-10-02 07:20:40.000000000 -0700 ++++ b/libproxy/cmake/modules/config_gnome.cmk 2012-10-19 13:45:42.000000000 -0700 +@@ -1,4 +1,4 @@ +-if (NOT WIN32 AND NOT APPLE) ++if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) + option(WITH_GNOME2 "Target a GNOME 2 system (gconf)" OFF) + option(WITH_GNOME3 "Target a GNOME 3 system (gsettings)" ON) + if(WITH_GNOME3) +diff -ur libproxy/cmake.orig/modules/config_macosx.cmk libproxy/cmake/modules/config_macosx.cmk +--- libproxy/cmake.orig/modules/config_macosx.cmk 2010-06-14 10:40:47.000000000 -0700 ++++ b/libproxy/cmake/modules/config_macosx.cmk 2012-10-19 13:45:42.000000000 -0700 +@@ -1,4 +1,4 @@ +-if(APPLE) ++if(APPLE AND MP_MACOSX) + find_library(SC_LIBRARIES SystemConfiguration) + find_library(CF_LIBRARIES CoreFoundation) + if(SC_LIBRARIES) +@@ -7,4 +7,4 @@ + if(CF_LIBRARIES) + set(CF_FOUND 1) + endif() +-endif() +\ No newline at end of file ++endif() +diff -ur libproxy/cmake.orig/modules/pacrunner_webkit.cmk libproxy/cmake/modules/pacrunner_webkit.cmk +--- libproxy/cmake.orig/modules/pacrunner_webkit.cmk 2012-10-02 07:20:40.000000000 -0700 ++++ b/libproxy/cmake/modules/pacrunner_webkit.cmk 2012-10-19 13:45:42.000000000 -0700 +@@ -6,7 +6,7 @@ + link_directories(WEBKIT_LIBRARIES) + include_directories("${WEBKIT_INCLUDE_DIR}") + endif() +-elseif(APPLE) ++elseif(APPLE AND MP_MACOSX) + find_library(WEBKIT_LIBRARIES JavaScriptCore) + if(WEBKIT_LIBRARIES) + set(WEBKIT_FOUND 1) +diff -ur libproxy/cmake.orig/pkgconfig.cmk libproxy/cmake/pkgconfig.cmk +--- libproxy/cmake.orig/pkgconfig.cmk 2012-10-02 07:20:40.000000000 -0700 ++++ b/libproxy/cmake/pkgconfig.cmk 2012-10-19 13:45:42.000000000 -0700 +@@ -1,4 +1,4 @@ +-if(NOT WIN32 AND NOT APPLE) ++if(NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) + find_package(PkgConfig) + + # Define our magical px_check_modules function 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 new file mode 100644 index 0000000..bf69fc3 --- /dev/null +++ b/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch @@ -0,0 +1,23 @@ +--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk 2011-06-20 04:31:41.000000000 -0600 ++++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk 2013-03-24 19:20:17.910765954 -0600 +@@ -9,12 +9,18 @@ + elseif(NOT APPLE) + option(WITH_MOZJS "Search for MOZJS package" ON) + if (WITH_MOZJS) +- pkg_search_module(MOZJS mozjs185) ++ pkg_search_module(MOZJS mozjs187) + if(MOZJS_FOUND) + include_directories(${MOZJS_INCLUDE_DIRS}) + link_directories(${MOZJS_LIBRARY_DIRS}) + else() +- set(MOZJS_FOUND 0) ++ pkg_search_module(MOZJS mozjs185) ++ 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/net-libs/libproxy/libproxy-0.4.13.ebuild b/net-libs/libproxy/libproxy-0.4.13.ebuild index ab33a4f..0a9b94c 100644 --- a/net-libs/libproxy/libproxy-0.4.13.ebuild +++ b/net-libs/libproxy/libproxy-0.4.13.ebuild @@ -35,19 +35,19 @@ DEPEND="${RDEPEND} # avoid dependency loop, bug #467696 PDEPEND="networkmanager? ( net-misc/networkmanager )" -src_prepare() { - # Gentoo's spidermonkey doesn't set Version: in mozjs18[57].pc - epatch "${FILESDIR}/${P}-mozjs.pc.patch" - +PATCHES=( # get-pac-test freezes when run by the ebuild, succeeds when building # manually; virtualx.eclass doesn't help :( - epatch "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch" - - epatch "${FILESDIR}"/${P}-macosx.patch + "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch" # prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696 - epatch "${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch" -} + "${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch" + + # Gentoo's spidermonkey doesn't set Version: in mozjs18[57].pc + "${FILESDIR}/${PN}-0.4.12-mozjs.pc.patch" + + "${FILESDIR}/${PN}-0.4.12-macosx.patch" +) src_configure() { [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
