gentoo resync : 29.12.2022

2 files changed, 123 insertions, 0 deletions

diff --git a/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch b/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch
new file mode 100644
index 000000000000..dd834687553a
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch
@@ -0,0 +1,33 @@
+https://github.com/libproxy/libproxy/pull/180
+
+From 54a08b73f4a9bc43356dd50fe91942b4270bfe10 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 21 Jun 2022 00:08:57 -0400
+Subject: [PATCH] Fix building without duktape
+
+Otherwise configuring fails with
+
+CMake Error at libproxy/cmake/modules.cmk:26 (math):
+  math cannot parse the expression: "0+0+0+": syntax error, unexpected end of
+  file (6).
+Call Stack (most recent call first):
+  libproxy/CMakeLists.txt:14 (include)
+---
+ libproxy/cmake/modules/pacrunner_duktape.cmk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libproxy/cmake/modules/pacrunner_duktape.cmk b/libproxy/cmake/modules/pacrunner_duktape.cmk
+index e7918a8..a468125 100644
+--- a/libproxy/cmake/modules/pacrunner_duktape.cmk
++++ b/libproxy/cmake/modules/pacrunner_duktape.cmk
+@@ -17,5 +17,7 @@ else()
+       link_directories(${DUKTAPE_LIBRARIES})
+       link_libraries(duktape)
+     endif()
++  else()
++    set(DUKTAPE_FOUND 0)
+   endif()
+ endif()
+-- 
+2.35.1
+
diff --git a/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch
new file mode 100644
index 000000000000..d62eac9af879
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch
@@ -0,0 +1,90 @@
+From f0ae8a0022a18fb26dff0ace0608d1916c68d179 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
+
+Needed to prevent a dependency loop:
+nm -> libsoup -> glib-networking -> libproxy -> nm
+
+https://bugs.gentoo.org/467696
+
+* asturm@gentoo.org: Rebased on top of 0.4.15
+  also revert 423801295921ab1ec0d98565fcbc2635088d45da
+* sam@gentoo.org: Rebased on top of 0.4.16
+  (same revert included)
+* mattst88@gentoo.org: Rebased on top of 0.4.18
+  (same revert included)
+---
+ libproxy/cmake/modules.cmk                    |  6 ++---
+ .../cmake/modules/network_networkmanager.cmk  |  5 +---
+ libproxy/modules/network_networkmanager.cpp   | 23 ++++++++++++++-----
+ 3 files changed, 21 insertions(+), 13 deletions(-)
+
+diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk
+index 6eaaa01..0afce2f 100644
+--- a/libproxy/cmake/modules.cmk
++++ b/libproxy/cmake/modules.cmk
+@@ -43,10 +43,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)
+-  if (NOT NM_FOUND)
+-    px_check_modules(NMold NetworkManager dbus-1)
+-  endif (NOT NM_FOUND)
++  px_check_modules(NM dbus-1)
+ endif()
+diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp
+index 546a8ee..317f1ab 100644
+--- a/libproxy/modules/network_networkmanager.cpp
++++ b/libproxy/modules/network_networkmanager.cpp
+@@ -23,13 +23,24 @@
+ using namespace libproxy;
+ 
+ #include <dbus/dbus.h>
+-#include <NetworkManager.h>
+ 
+-// Backwards compatibility: with the switch to libnm, NM_STATE_CONNECTED is no
+-// longer defined. NM_STATE_CONNECTED_GLOBAL appeared with NM 0.9 and was aliased
+-#ifndef NM_STATE_CONNECTED
+-  #define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
+-#endif
++/*
++ * copy-pasted from NetworkManager-1.26.0's NetworkManager.h to prevent
++ * a circular dependency; https://bugs.gentoo.org/467696
++ */
++#define NM_DBUS_PATH                           "/org/freedesktop/NetworkManager"
++#define NM_DBUS_INTERFACE                      "org.freedesktop.NetworkManager"
++typedef enum {
++	NM_STATE_UNKNOWN          = 0,
++	NM_STATE_ASLEEP           = 10,
++	NM_STATE_DISCONNECTED     = 20,
++	NM_STATE_DISCONNECTING    = 30,
++	NM_STATE_CONNECTING       = 40,
++	NM_STATE_CONNECTED_LOCAL  = 50,
++	NM_STATE_CONNECTED_SITE   = 60,
++	NM_STATE_CONNECTED_GLOBAL = 70,
++} NMState;
++#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
+ 
+ class networkmanager_network_extension : public network_extension {
+ public:
+-- 
+2.35.1
+