diff options
author | Martchus | 2019-06-26 14:41:36 +0200 |
---|---|---|
committer | Martchus | 2019-06-26 14:41:36 +0200 |
commit | f817cbcc8c47496a5967fa06c162cddfa98f386a (patch) | |
tree | 62a3008a3b3ebe67f5007c5f46ed48b85ea5c383 /0009-Fix-linking-against-static-D-Bus.patch | |
parent | 7cd2ce36c60bf5e1ad40f9af6ef97c9c539d345c (diff) | |
download | aur-f817cbcc8c47496a5967fa06c162cddfa98f386a.tar.gz |
Update to 5.13.0
Diffstat (limited to '0009-Fix-linking-against-static-D-Bus.patch')
-rw-r--r-- | 0009-Fix-linking-against-static-D-Bus.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/0009-Fix-linking-against-static-D-Bus.patch b/0009-Fix-linking-against-static-D-Bus.patch deleted file mode 100644 index 40086a487e6e..000000000000 --- a/0009-Fix-linking-against-static-D-Bus.patch +++ /dev/null @@ -1,58 +0,0 @@ -From bef46a6c727a1370768b9d270bd76fc9b4ded4cd Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Fri, 3 Feb 2017 19:36:25 +0100 -Subject: [PATCH 09/34] 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 9fce6d039e..c673f9a5fc 100644 ---- a/configure.json -+++ b/configure.json -@@ -169,18 +169,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 7cce0d71aa..4d3d774d45 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.21.0 - |