diff options
| author | Martchus | 2017-10-16 19:36:24 +0200 |
|---|---|---|
| committer | Martchus | 2017-10-16 19:36:24 +0200 |
| commit | 3e19ccfbbef7d70aff50d047063155091be8c4e8 (patch) | |
| tree | f5b27b98148bef5f91e884b86528d7a6700a7fac /0009-Fix-linking-against-static-D-Bus.patch | |
| parent | 94def18b2668f9650f74ffec756e176ccc4c4fb3 (diff) | |
| download | aur-3e19ccfbbef7d70aff50d047063155091be8c4e8.tar.gz | |
Update to 5.9.2
Diffstat (limited to '0009-Fix-linking-against-static-D-Bus.patch')
| -rw-r--r-- | 0009-Fix-linking-against-static-D-Bus.patch | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/0009-Fix-linking-against-static-D-Bus.patch b/0009-Fix-linking-against-static-D-Bus.patch index 6f325993e8c6..d07abaee8c3c 100644 --- a/0009-Fix-linking-against-static-D-Bus.patch +++ b/0009-Fix-linking-against-static-D-Bus.patch @@ -1,41 +1,33 @@ -From dbbf044c7f0b3b521f90376f87fe94f45d74b795 Mon Sep 17 00:00:00 2001 +From 3e04b4a701a7dde06f5ea046198ac5646b644e86 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 19:36:25 +0100 -Subject: [PATCH 09/31] Fix linking against static D-Bus +Subject: [PATCH 09/33] Fix linking against static D-Bus --- - config.tests/unix/dbus/dbus.cpp | 4 ++++ - configure.json | 6 +++++- - src/dbus/qdbus_symbols_p.h | 4 ++++ - 3 files changed, 13 insertions(+), 1 deletion(-) + configure.json | 9 +++++++-- + src/dbus/qdbus_symbols_p.h | 4 ++++ + 2 files changed, 11 insertions(+), 2 deletions(-) -diff --git a/config.tests/unix/dbus/dbus.cpp b/config.tests/unix/dbus/dbus.cpp -index 295c904400..80d3e9c044 100644 ---- a/config.tests/unix/dbus/dbus.cpp -+++ b/config.tests/unix/dbus/dbus.cpp -@@ -37,6 +37,10 @@ - ** - ****************************************************************************/ - -+#ifdef QT_STATIC -+# define DBUS_STATIC_BUILD -+#endif -+ - #define DBUS_API_SUBJECT_TO_CHANGE - #include <dbus/dbus.h> - diff --git a/configure.json b/configure.json -index b572a3d1f5..cd918abc98 100644 +index a91456aaf3..55c56369ba 100644 --- a/configure.json +++ b/configure.json -@@ -159,12 +159,16 @@ +@@ -171,18 +171,23 @@ + "CONFIG(debug, debug|release): \\", + " LIBS += $$LIBS_DEBUG", + "else: \\", +- " LIBS += $$LIBS_RELEASE" ++ " LIBS += $$LIBS_RELEASE", ++ "static: DEFINES += DBUS_STATIC_BUILD" + ] + }, "sources": [ { "type": "pkgConfig", "args": "dbus-1 >= 1.2" }, - { ++ { + "libs": "-ldbus-1 -lws2_32 -liphlpapi", + "condition": "config.win32 && !features.shared" + }, -+ { + { "libs": "", "builds": { "debug": "-ldbus-1d", @@ -62,5 +54,5 @@ index cfc0e12046..65f1397cd6 100644 # include <dbus/dbus.h> #else -- -2.13.2 +2.14.2 |