File Prevent-signals-in-glib2-be-defined-by-Qt.patch of Package libNetworkManagerQt4

From 57dec3a3184e18a291b38511ace798b4aca94fb5 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Tue, 28 Mar 2017 07:42:46 +0200
Subject: Prevent signals in glib2 be defined by Qt

There are more places where glib2 gets included
---
 src/connection.cpp                  | 2 ++
 src/manager.cpp                     | 4 +++-
 src/secretagent.cpp                 | 2 ++
 src/settings/connectionsettings.cpp | 2 ++
 src/settings/connectionsettings.h   | 2 ++
 src/settings/setting.cpp            | 2 ++
 src/settings/setting.h              | 2 ++
 src/wirelessdevice.cpp              | 6 ++++--
 8 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/connection.cpp b/connection.cpp
index dae21c9..081d5ce 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -23,6 +23,7 @@
 
 #include "connection.h"
 
+#undef signals
 #include <nm-version.h>
 #if NM_CHECK_VERSION(1, 0, 0)
 #include <libnm/NetworkManager.h>
@@ -39,6 +40,7 @@
 #include <nm-setting-wimax.h>
 #include <nm-setting-olpc-mesh.h>
 #endif
+#define signals Q_SIGNALS
 
 #include <QDBusConnection>
 #include <QDBusPendingReply>
diff --git a/manager.cpp b/manager.cpp
index 2b16e9d..050a2dc 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -26,12 +26,14 @@
 
 #include "macros.h"
 
+#undef signals
 #include <nm-version.h>
 #if NM_CHECK_VERSION(1, 0, 0)
 #include <libnm/NetworkManager.h>
 #else
 #include <NetworkManager.h>
 #endif
+#define signals Q_SIGNALS
 
 #include "wireddevice.h"
 #include "wirelessdevice.h"
diff --git a/secretagent.cpp b/secretagent.cpp
index c7dfd72..ac07f77 100644
--- a/secretagent.cpp
+++ b/secretagent.cpp
@@ -22,11 +22,13 @@
 #include "secretagent_p.h"
 #include "manager_p.h"
 
+#undef signals
 #include <nm-version.h>
 #if NM_CHECK_VERSION(1, 0, 0)
 #include <libnm/NetworkManager.h>
 #include <NetworkManager.h>
 #endif
+#define signals Q_SIGNALS
 
 #include <QDBusArgument>
 #include <QDBusConnection>
diff --git a/settings/connectionsettings.cpp b/settings/connectionsettings.cpp
index 82b242a..91e85f6 100644
--- a/settings/connectionsettings.cpp
+++ b/settings/connectionsettings.cpp
@@ -45,6 +45,7 @@
 #include "vpnsetting.h"
 #include "wimaxsetting.h"
 
+#undef signals
 #if NM_CHECK_VERSION(1, 0, 0)
 #include <libnm/NetworkManager.h>
 #else
@@ -63,6 +64,7 @@
 #include <nm-setting-wired.h>
 #include <nm-setting-wireless.h>
 #endif
+#define signals Q_SIGNALS
 
 
 #include <QtCore/QUuid>
diff --git a/settings/connectionsettings.h b/settings/connectionsettings.h
index e74c848..936b9ea 100644
--- a/settings/connectionsettings.h
+++ b/settings/connectionsettings.h
@@ -25,12 +25,14 @@
 #include "../NetworkManagerQt-export.h"
 #include "setting.h"
 
+#undef signals
 #include <nm-version.h>
 #if NM_CHECK_VERSION(1, 0, 0)
 #include <libnm/NetworkManager.h>
 #else
 #include <NetworkManager.h>
 #endif
+#define signals Q_SIGNALS
 
 #include <QtCore/QString>
 #include <QtCore/QDateTime>
diff --git a/settings/setting.cpp b/settings/setting.cpp
index 7fcacef..bbde025 100644
--- a/settings/setting.cpp
+++ b/settings/setting.cpp
@@ -20,6 +20,7 @@
 
 #include "setting.h"
 
+#undef signals
 #include <nm-version.h>
 #if NM_CHECK_VERSION(1, 0, 0)
 #include <libnm/NetworkManager.h>
@@ -47,6 +48,7 @@
 #include <nm-setting-wireless-security.h>
 #include <nm-setting-wimax.h>
 #endif
+#define signals Q_SIGNALS
 
 #include <QtCore/QDebug>
 
diff --git a/settings/setting.h b/settings/setting.h
index f091223..faaaf58 100644
--- a/settings/setting.h
+++ b/settings/setting.h
@@ -29,10 +29,12 @@
 #include "../generic-types.h"
 #endif
 
+#undef signals
 #include <nm-version.h>
 #if NM_CHECK_VERSION(1, 0, 0)
 #include <libnm/NetworkManager.h>
 #endif
+#define signals Q_SIGNALS
 
 #include <QtCore/QVariantMap>
 #include <QtCore/QStringList>
diff --git a/wirelessdevice.cpp b/wirelessdevice.cpp
index 10c47da..31d3a1e 100644
--- a/wirelessdevice.cpp
+++ b/wirelessdevice.cpp
@@ -23,12 +23,14 @@
 #include "wirelessdevice.h"
 #include "wirelessdevice_p.h"
 
+#undef signals
 #include <nm-version.h>
 #if NM_CHECK_VERSION(1, 0, 0)
 #include <libnm/NetworkManager.h>
 #else
 #include <libnm-glib/nm-device-wifi.h>
 #endif
+#define signals Q_SIGNALS
 
 #include "accesspoint.h"
 #include "manager_p.h"
diff --git a/ipconfig.h b/ipconfig.h
index 9da5b5d..3b44bcd 100644
--- a/ipconfig.h
+++ b/ipconfig.h
@@ -26,12 +26,15 @@
 #include "ipaddress.h"
 #include "iproute.h"
 
+// To prevent signals in glib2 be defined by QT
+#undef signals
 #include <nm-version.h>
 #if NM_CHECK_VERSION(1, 0, 0)
 #include <libnm/NetworkManager.h>
 #else
 #include <NetworkManager.h>
 #endif
+#define signals Q_SIGNALS
 
 #include <QtCore/QStringList>
 #include <QNetworkAddressEntry>
-- 
cgit v1.1