diff options
Diffstat (limited to '0008-Fix-linking-against-static-D-Bus.patch')
| -rw-r--r-- | 0008-Fix-linking-against-static-D-Bus.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch new file mode 100644 index 000000000000..27e30094ad7d --- /dev/null +++ b/0008-Fix-linking-against-static-D-Bus.patch @@ -0,0 +1,58 @@ +From a1cd8b87b57eee2b9724d64a2c3b2c949981c544 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Fri, 3 Feb 2017 19:36:25 +0100 +Subject: [PATCH 08/32] Fix linking against static D-Bus + +--- + configure.json | 9 +++++++-- + src/dbus/qdbus_symbols_p.h | 4 ++++ + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/configure.json b/configure.json +index 4763ff645f0..e97969ab25c 100644 +--- a/configure.json ++++ b/configure.json +@@ -190,18 +190,23 @@ + "dbus": { + "label": "D-Bus >= 1.2", + "test": { +- "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);" ++ "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);", ++ "qmake": "static: DEFINES += DBUS_STATIC_BUILD" + }, + "headers": "dbus/dbus.h", + "sources": [ + { "type": "pkgConfig", "args": "dbus-1 >= 1.2" }, ++ { ++ "libs": "-ldbus-1 -lws2_32 -liphlpapi", ++ "condition": "config.win32 && !features.shared" ++ }, + { + "libs": "", + "builds": { + "debug": "-ldbus-1d", + "release": "-ldbus-1" + }, +- "condition": "config.win32" ++ "condition": "config.win32 && features.shared" + }, + { "libs": "-ldbus-1", "condition": "!config.win32" } + ] +diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h +index accaa4f5ed5..4b11c74caa7 100644 +--- a/src/dbus/qdbus_symbols_p.h ++++ b/src/dbus/qdbus_symbols_p.h +@@ -57,6 +57,10 @@ + + #ifndef QT_NO_DBUS + ++#ifdef QT_STATIC ++# define DBUS_STATIC_BUILD ++#endif ++ + #ifdef QT_LINKED_LIBDBUS + # include <dbus/dbus.h> + #else +-- +2.44.0 + |