| 1 |
tetromino 13/04/30 03:46:47 |
| 2 |
|
| 3 |
Added: libproxy-0.4.11-avoid-nm-build-dep.patch |
| 4 |
Removed: libproxy-0.4.6-backports.patch |
| 5 |
libproxy-0.4.6-mozjs-link_directory.patch |
| 6 |
libproxy-0.4.6-flags-mixing.patch |
| 7 |
libproxy-0.4.6-xulrunner-2.patch |
| 8 |
libproxy-0.4.7-gcc-4.7.patch |
| 9 |
Log: |
| 10 |
Update to EAPI5 and python-r1.eclass. Drop obsolete versions. Add patch to avoid build-time dependency on networkmanager to fix a dependency loop (bug #467696, thanks to Ling Kun). |
| 11 |
|
| 12 |
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 13 |
|
| 14 |
Revision Changes Path |
| 15 |
1.1 net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch |
| 16 |
|
| 17 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch?rev=1.1&view=markup |
| 18 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch?rev=1.1&content-type=text/plain |
| 19 |
|
| 20 |
Index: libproxy-0.4.11-avoid-nm-build-dep.patch |
| 21 |
=================================================================== |
| 22 |
From 518214ee85e10c5bc99d3b115ae7ac9cc3fc14fc Mon Sep 17 00:00:00 2001 |
| 23 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 24 |
Date: Mon, 29 Apr 2013 23:02:25 -0400 |
| 25 |
Subject: [PATCH] Avoid build-time dependency on NetworkManager |
| 26 |
|
| 27 |
Needed to prevent a dependency loop: |
| 28 |
nm -> libsoup -> glib-networking -> libproxy -> nm |
| 29 |
|
| 30 |
https://bugs.gentoo.org/467696 |
| 31 |
--- |
| 32 |
libproxy/cmake/modules/network_networkmanager.cmk | 4 ++-- |
| 33 |
libproxy/modules/network_networkmanager.cpp | 21 ++++++++++++++++++++- |
| 34 |
2 files changed, 22 insertions(+), 3 deletions(-) |
| 35 |
|
| 36 |
diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk |
| 37 |
index d9f9588..2586bbd 100644 |
| 38 |
--- a/libproxy/cmake/modules/network_networkmanager.cmk |
| 39 |
+++ b/libproxy/cmake/modules/network_networkmanager.cmk |
| 40 |
@@ -1,3 +1,3 @@ |
| 41 |
if (NOT WIN32 AND NOT APPLE) |
| 42 |
- px_check_modules(NM NetworkManager dbus-1) |
| 43 |
-endif() |
| 44 |
\ No newline at end of file |
| 45 |
+ px_check_modules(NM dbus-1) |
| 46 |
+endif() |
| 47 |
diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp |
| 48 |
index 564c275..a03425b 100644 |
| 49 |
--- a/libproxy/modules/network_networkmanager.cpp |
| 50 |
+++ b/libproxy/modules/network_networkmanager.cpp |
| 51 |
@@ -23,7 +23,26 @@ |
| 52 |
using namespace libproxy; |
| 53 |
|
| 54 |
#include <dbus/dbus.h> |
| 55 |
-#include <NetworkManager/NetworkManager.h> |
| 56 |
+ |
| 57 |
+ |
| 58 |
+/* |
| 59 |
+ * copy-pasted from NetworkManager-0.9.6.4's NetworkManager.h to prevent |
| 60 |
+ * a circular dependency; https://bugs.gentoo.org/467696 |
| 61 |
+ */ |
| 62 |
+#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" |
| 63 |
+#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" |
| 64 |
+typedef enum { |
| 65 |
+ NM_STATE_UNKNOWN = 0, |
| 66 |
+ NM_STATE_ASLEEP = 10, |
| 67 |
+ NM_STATE_DISCONNECTED = 20, |
| 68 |
+ NM_STATE_DISCONNECTING = 30, |
| 69 |
+ NM_STATE_CONNECTING = 40, |
| 70 |
+ NM_STATE_CONNECTED_LOCAL = 50, |
| 71 |
+ NM_STATE_CONNECTED_SITE = 60, |
| 72 |
+ NM_STATE_CONNECTED_GLOBAL = 70 |
| 73 |
+} NMState; |
| 74 |
+#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL |
| 75 |
+ |
| 76 |
|
| 77 |
class networkmanager_network_extension : public network_extension { |
| 78 |
public: |
| 79 |
-- |
| 80 |
1.8.2.1 |
Archives