* [gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/files/
@ 2020-01-16 20:22 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-01-16 20:22 UTC (permalink / raw
To: gentoo-commits
commit: 91b67ce86892d7b9315ae469cc02e371359653be
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 20:16:19 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 20:22:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b67ce8
net-libs/libproxy: Properly fix patch to avoid NM dependency loop
Previously a second attempt at finding it would succeed.
Bug: https://bugs.gentoo.org/705552
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libproxy-0.4.15-avoid-nm-build-dep.patch | 53 ++++++++++++++++------
1 file 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 0b9320a6dfd..e896baa3bac 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
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/files/
@ 2021-01-26 15:54 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-01-26 15:54 UTC (permalink / raw
To: gentoo-commits
commit: 642d99b784c7096c6a49f22c79a5189a2ec9bd90
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jan 26 07:16:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 15:53:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=642d99b7
net-libs/libproxy: remove unused patch
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19224
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libproxy-0.4.15-avoid-nm-build-dep.patch | 86 ----------------------
1 file changed, 86 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
deleted file mode 100644
index e896baa3bac..00000000000
--- a/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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
-
-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
----
- 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 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)
-- 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..4dc3d8d 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-0.9.6.4'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.25.0
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/files/
@ 2021-07-10 17:28 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-07-10 17:28 UTC (permalink / raw
To: gentoo-commits
commit: 0b2d5b0def4e00bc230c7266778ed3c59fd69bee
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 10 17:20:40 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 17:28:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b2d5b0d
net-libs/libproxy: add link to NetworkManager circular dep bug upstream
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch
index 4a287955bba..a50bcc130cc 100644
--- a/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch
+++ b/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch
@@ -1,3 +1,5 @@
+https://github.com/libproxy/libproxy/issues/28
+
From 703ac16ea2b508dc16d433b3fd597fcd496d05c1 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Mon, 29 Apr 2013 23:02:25 -0400
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/files/
@ 2023-06-21 22:10 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2023-06-21 22:10 UTC (permalink / raw
To: gentoo-commits
commit: 94509ec5f30f147c84f2608f84e3ac96af3dc976
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 20 10:46:28 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 21 22:10:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94509ec5
net-libs/libproxy: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31551
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...ager-test-with-pacrunner-duktape-option-2.patch | 26 ----------------------
1 file changed, 26 deletions(-)
diff --git a/net-libs/libproxy/files/0.5.0-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch b/net-libs/libproxy/files/0.5.0-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch
deleted file mode 100644
index 6af2ebbe7f86..000000000000
--- a/net-libs/libproxy/files/0.5.0-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f6aab7bc2a821117b2079f7504ab444dd13f4708 Mon Sep 17 00:00:00 2001
-From: Jan-Michael Brummer <jan.brummer@tabos.org>
-Date: Tue, 16 May 2023 15:10:53 +0200
-Subject: [PATCH] Guard PxManager test with pacrunner-duktape option (#215)
-
-Fixes: https://github.com/libproxy/libproxy/issues/213
----
- tests/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 4ae8e7d..c8fe11f 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -17,7 +17,7 @@ if get_option('tests')
- env: envs
- )
-
-- if soup_dep.found()
-+ if soup_dep.found() and get_option('pacrunner-duktape')
- px_manager_test = executable('test-px-manager',
- ['px-manager-test.c', 'px-manager-helper.c'],
- include_directories: px_backend_inc,
---
-2.39.3
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-21 22:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-21 22:10 [gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2021-07-10 17:28 Sam James
2021-01-26 15:54 Sam James
2020-01-16 20:22 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox