1 |
commit: 79f0cc6cde1905da4564a20fd1320df470774994 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Oct 9 13:05:13 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 9 15:50:21 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f0cc6c |
7 |
|
8 |
kde-frameworks/networkmanager-qt: More fixes for NM-1.4.0 |
9 |
|
10 |
Let's install kde-frameworks/networkmanager-qt-5.27.0 behind the scenes. |
11 |
|
12 |
Package-Manager: portage-2.3.0 |
13 |
|
14 |
.../files/networkmanager-qt-5.27.0-tests.patch | 111 +++++++++++++++++++++ |
15 |
...0.ebuild => networkmanager-qt-5.26.0-r2.ebuild} | 13 +++ |
16 |
.../networkmanager-qt-5.27.0.ebuild | 2 + |
17 |
3 files changed, 126 insertions(+) |
18 |
|
19 |
diff --git a/kde-frameworks/networkmanager-qt/files/networkmanager-qt-5.27.0-tests.patch b/kde-frameworks/networkmanager-qt/files/networkmanager-qt-5.27.0-tests.patch |
20 |
new file mode 100644 |
21 |
index 00000000..0d4d9bf |
22 |
--- /dev/null |
23 |
+++ b/kde-frameworks/networkmanager-qt/files/networkmanager-qt-5.27.0-tests.patch |
24 |
@@ -0,0 +1,111 @@ |
25 |
+commit cc9d198676e8c8afae9e55286bd401f40634ce6b |
26 |
+Author: Jan Grulich <jgrulich@××××××.com> |
27 |
+Date: Wed Oct 5 11:46:01 2016 +0200 |
28 |
+ |
29 |
+ Fix unit tests |
30 |
+ |
31 |
+ In case we build against NetworkManager 1.4.x, we have to avoid using |
32 |
+ o.f.DBus.Properties interface for monitoring property changes, because |
33 |
+ our FakeNetwork doesn't support that yet. |
34 |
+ |
35 |
+ BUG:369881 |
36 |
+ |
37 |
+diff --git a/src/activeconnection.cpp b/src/activeconnection.cpp |
38 |
+index 6601d74..22ab7d0 100644 |
39 |
+--- a/src/activeconnection.cpp |
40 |
++++ b/src/activeconnection.cpp |
41 |
+@@ -66,12 +66,19 @@ NetworkManager::ActiveConnection::ActiveConnection(const QString &path, QObject |
42 |
+ d->propertiesChanged(initialProperties); |
43 |
+ } |
44 |
+ |
45 |
++#ifndef NMQT_STATIC |
46 |
+ #if NM_CHECK_VERSION(1, 4, 0) |
47 |
+ QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, |
48 |
+ QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); |
49 |
+ #else |
50 |
+ connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); |
51 |
+ #endif |
52 |
++#endif |
53 |
++ |
54 |
++#ifdef NMQT_STATIC |
55 |
++ connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); |
56 |
++#endif |
57 |
++ |
58 |
+ /* |
59 |
+ * Workaround: Re-check connection state before we watch changes in case it gets changed too quickly |
60 |
+ * BUG:352326 |
61 |
+diff --git a/src/manager.cpp b/src/manager.cpp |
62 |
+index 4cd3353..6565299 100644 |
63 |
+--- a/src/manager.cpp |
64 |
++++ b/src/manager.cpp |
65 |
+@@ -97,6 +97,9 @@ NetworkManager::NetworkManagerPrivate::NetworkManagerPrivate() |
66 |
+ this, &NetworkManagerPrivate::onDeviceAdded); |
67 |
+ connect(&iface, &OrgFreedesktopNetworkManagerInterface::DeviceRemoved, |
68 |
+ this, &NetworkManagerPrivate::onDeviceRemoved); |
69 |
++ |
70 |
++ |
71 |
++#ifndef NMQT_STATIC |
72 |
+ #if NM_CHECK_VERSION(1, 4, 0) |
73 |
+ QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, NetworkManagerPrivate::DBUS_DAEMON_PATH, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, |
74 |
+ QLatin1String("PropertiesChanged"), this, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); |
75 |
+@@ -104,6 +107,13 @@ NetworkManager::NetworkManagerPrivate::NetworkManagerPrivate() |
76 |
+ connect(&iface, &OrgFreedesktopNetworkManagerInterface::PropertiesChanged, |
77 |
+ this, &NetworkManagerPrivate::propertiesChanged); |
78 |
+ #endif |
79 |
++#endif |
80 |
++ |
81 |
++#ifdef NMQT_STATIC |
82 |
++ connect(&iface, &OrgFreedesktopNetworkManagerInterface::PropertiesChanged, |
83 |
++ this, &NetworkManagerPrivate::propertiesChanged); |
84 |
++#endif |
85 |
++ |
86 |
+ connect(&watcher, &QDBusServiceWatcher::serviceRegistered, |
87 |
+ this, &NetworkManagerPrivate::daemonRegistered); |
88 |
+ connect(&watcher, &QDBusServiceWatcher::serviceUnregistered, |
89 |
+diff --git a/src/wireddevice.cpp b/src/wireddevice.cpp |
90 |
+index 8e66299..e64492f 100644 |
91 |
+--- a/src/wireddevice.cpp |
92 |
++++ b/src/wireddevice.cpp |
93 |
+@@ -53,12 +53,18 @@ NetworkManager::WiredDevice::WiredDevice(const QString &path, QObject *parent) |
94 |
+ d->propertiesChanged(initialProperties); |
95 |
+ } |
96 |
+ |
97 |
++#ifndef NMQT_STATIC |
98 |
+ #if NM_CHECK_VERSION(1, 4, 0) |
99 |
+ QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, |
100 |
+ QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); |
101 |
+ #else |
102 |
+ connect(&d->wiredIface, &OrgFreedesktopNetworkManagerDeviceWiredInterface::PropertiesChanged, d, &WiredDevicePrivate::propertiesChanged); |
103 |
+ #endif |
104 |
++#endif |
105 |
++ |
106 |
++#ifdef NMQT_STATIC |
107 |
++ connect(&d->wiredIface, &OrgFreedesktopNetworkManagerDeviceWiredInterface::PropertiesChanged, d, &WiredDevicePrivate::propertiesChanged); |
108 |
++#endif |
109 |
+ } |
110 |
+ |
111 |
+ NetworkManager::WiredDevice::~WiredDevice() |
112 |
+diff --git a/src/wirelessdevice.cpp b/src/wirelessdevice.cpp |
113 |
+index 1f47c28..10c47da 100644 |
114 |
+--- a/src/wirelessdevice.cpp |
115 |
++++ b/src/wirelessdevice.cpp |
116 |
+@@ -66,12 +66,19 @@ NetworkManager::WirelessDevice::WirelessDevice(const QString &path, QObject *par |
117 |
+ d->propertiesChanged(initialProperties); |
118 |
+ } |
119 |
+ |
120 |
++#ifndef NMQT_STATIC |
121 |
+ #if NM_CHECK_VERSION(1, 4, 0) |
122 |
+ QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, |
123 |
+ QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); |
124 |
+ #else |
125 |
+ connect(&d->wirelessIface, &OrgFreedesktopNetworkManagerDeviceWirelessInterface::PropertiesChanged, d, &WirelessDevicePrivate::propertiesChanged); |
126 |
+ #endif |
127 |
++#endif |
128 |
++ |
129 |
++#ifdef NMQT_STATIC |
130 |
++ connect(&d->wirelessIface, &OrgFreedesktopNetworkManagerDeviceWirelessInterface::PropertiesChanged, d, &WirelessDevicePrivate::propertiesChanged); |
131 |
++#endif |
132 |
++ |
133 |
+ connect(&d->wirelessIface, &OrgFreedesktopNetworkManagerDeviceWirelessInterface::AccessPointAdded, d, &WirelessDevicePrivate::accessPointAdded); |
134 |
+ connect(&d->wirelessIface, &OrgFreedesktopNetworkManagerDeviceWirelessInterface::AccessPointRemoved, d, &WirelessDevicePrivate::accessPointRemoved); |
135 |
+ } |
136 |
|
137 |
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.27.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.26.0-r2.ebuild |
138 |
similarity index 62% |
139 |
copy from kde-frameworks/networkmanager-qt/networkmanager-qt-5.27.0.ebuild |
140 |
copy to kde-frameworks/networkmanager-qt/networkmanager-qt-5.26.0-r2.ebuild |
141 |
index 1696e34..06f8c67 100644 |
142 |
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.27.0.ebuild |
143 |
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.26.0-r2.ebuild |
144 |
@@ -4,9 +4,12 @@ |
145 |
|
146 |
EAPI=6 |
147 |
|
148 |
+MY_PV="5.27.0" |
149 |
inherit kde5 |
150 |
|
151 |
DESCRIPTION="NetworkManager bindings for Qt" |
152 |
+SRC_URI="mirror://kde/stable/frameworks/${MY_PV%.0}/${PN}-${MY_PV}.tar.xz" |
153 |
+ |
154 |
LICENSE="LGPL-2" |
155 |
KEYWORDS="~amd64 ~arm ~x86" |
156 |
IUSE="teamd" |
157 |
@@ -25,3 +28,13 @@ DEPEND="${COMMON_DEPEND} |
158 |
RDEPEND="${COMMON_DEPEND} |
159 |
!net-libs/libnm-qt:5 |
160 |
" |
161 |
+ |
162 |
+S="${WORKDIR}/${PN}-${MY_PV}" |
163 |
+ |
164 |
+PATCHES=( "${FILESDIR}/${PN}-5.27.0-tests.patch" ) |
165 |
+ |
166 |
+src_prepare(){ |
167 |
+ sed -e "s/${MY_PV}/${PV}/" \ |
168 |
+ -i CMakeLists.txt || die "Failed to lower ECM version requirement" |
169 |
+ kde5_src_prepare |
170 |
+} |
171 |
|
172 |
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.27.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.27.0.ebuild |
173 |
index 1696e34..9cd96e8 100644 |
174 |
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.27.0.ebuild |
175 |
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.27.0.ebuild |
176 |
@@ -25,3 +25,5 @@ DEPEND="${COMMON_DEPEND} |
177 |
RDEPEND="${COMMON_DEPEND} |
178 |
!net-libs/libnm-qt:5 |
179 |
" |
180 |
+ |
181 |
+PATCHES=( "${FILESDIR}/${PN}-5.27.0-tests.patch" ) |