diff options
Diffstat (limited to 'net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch')
| -rw-r--r-- | net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch | 53 |
1 files changed, 38 insertions, 15 deletions
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch index 0b9320a6dfd5..e896baa3bacc 100644 --- a/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch +++ b/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch @@ -1,4 +1,4 @@ -From 518214ee85e10c5bc99d3b115ae7ac9cc3fc14fc Mon Sep 17 00:00:00 2001 +From 703ac16ea2b508dc16d433b3fd597fcd496d05c1 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev <tetromino@gentoo.org> Date: Mon, 29 Apr 2013 23:02:25 -0400 Subject: [PATCH] Avoid build-time dependency on NetworkManager @@ -9,25 +9,47 @@ nm -> libsoup -> glib-networking -> libproxy -> nm https://bugs.gentoo.org/467696 * asturm@gentoo.org: Rebased on top of 0.4.15 + also revert 423801295921ab1ec0d98565fcbc2635088d45da --- - libproxy/cmake/modules/network_networkmanager.cmk | 4 ++-- - libproxy/modules/network_networkmanager.cpp | 23 +++++++++++++++++------ - 2 files changed, 19 insertions(+), 8 deletions(-) + libproxy/cmake/modules.cmk | 6 ++--- + .../cmake/modules/network_networkmanager.cmk | 5 +--- + libproxy/modules/network_networkmanager.cpp | 23 ++++++++++++++----- + 3 files changed, 21 insertions(+), 13 deletions(-) ---- a/libproxy/cmake/modules/network_networkmanager.cmk 2017-05-11 11:33:33.000000000 +0200 -+++ b/libproxy/cmake/modules/network_networkmanager.cmk 2019-10-06 15:17:37.881932672 +0200 -@@ -1,6 +1,6 @@ +diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk +index b3211f2..d4436e1 100644 +--- a/libproxy/cmake/modules.cmk ++++ b/libproxy/cmake/modules.cmk +@@ -38,10 +38,10 @@ px_module(config_w32reg "${WIN32}" 1) + px_module(ignore_domain 1 1) + px_module(ignore_hostname 1 1) + px_module(ignore_ip 1 1) +-if(NM_FOUND OR NMold_FOUND) ++if(NM_FOUND) + set(NM_BUILD 1) +-endif(NM_FOUND OR NMold_FOUND) +-px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}${NMold_LIBRARIES}) ++endif(NM_FOUND) ++px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}) + px_module(pacrunner_mozjs "${MOZJS_FOUND}" ${BIPR} ${MOZJS_LIBRARIES}) + px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES}) + px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES}) +diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk +index 6ef6ead..2586bbd 100644 +--- a/libproxy/cmake/modules/network_networkmanager.cmk ++++ b/libproxy/cmake/modules/network_networkmanager.cmk +@@ -1,6 +1,3 @@ if (NOT WIN32 AND NOT APPLE) - px_check_modules(NM libnm dbus-1) -+ px_check_modules(NM dbus-1) - if (NOT NM_FOUND) +- if (NOT NM_FOUND) - px_check_modules(NMold NetworkManager dbus-1) -+ px_check_modules(NMold dbus-1) - endif (NOT NM_FOUND) +- endif (NOT NM_FOUND) ++ px_check_modules(NM dbus-1) endif() - ---- a/libproxy/modules/network_networkmanager.cpp 2017-05-11 11:33:33.000000000 +0200 -+++ b/libproxy/modules/network_networkmanager.cpp 2019-10-06 15:24:21.621173178 +0200 +diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp +index 546a8ee..4dc3d8d 100644 +--- a/libproxy/modules/network_networkmanager.cpp ++++ b/libproxy/modules/network_networkmanager.cpp @@ -23,13 +23,24 @@ using namespace libproxy; @@ -60,4 +82,5 @@ https://bugs.gentoo.org/467696 class networkmanager_network_extension : public network_extension { public: -- -1.8.2.1 +2.25.0 + |