summarylogtreecommitdiffstats
path: root/0003-Fix-using-static-PCRE2-and-DBus-1.patch
diff options
context:
space:
mode:
authorMartchus2020-11-08 20:31:14 +0100
committerMartchus2020-11-08 20:31:14 +0100
commit350c7dcd84db40b23e214c2dd55da3e359ef49d9 (patch)
tree24b02d07d084add60630ccbe297b9072eb79a16b /0003-Fix-using-static-PCRE2-and-DBus-1.patch
downloadaur-350c7dcd84db40b23e214c2dd55da3e359ef49d9.tar.gz
Add static mingw-w64-qt6-* packages
Diffstat (limited to '0003-Fix-using-static-PCRE2-and-DBus-1.patch')
-rw-r--r--0003-Fix-using-static-PCRE2-and-DBus-1.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
new file mode 100644
index 000000000000..d8a3748a30ff
--- /dev/null
+++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -0,0 +1,48 @@
+From 084aa1b73f9f33096c4a5f34cba773545da3ae33 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Thu, 5 Nov 2020 21:13:19 +0100
+Subject: [PATCH 3/7] Fix using static PCRE2 and DBus-1
+
+When making a static build of Qt we're using the static version of these
+libraries and must define the corresponding macros.
+
+Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e
+---
+ src/corelib/text/qregularexpression.cpp | 5 +++++
+ src/dbus/qdbus_symbols_p.h | 4 ++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
+index 827884d709..be5159186c 100644
+--- a/src/corelib/text/qregularexpression.cpp
++++ b/src/corelib/text/qregularexpression.cpp
+@@ -53,6 +53,11 @@
+ #include <QtCore/qdatastream.h>
+
+ #define PCRE2_CODE_UNIT_WIDTH 16
++#ifdef QT_STATIC
++#define PCRE_STATIC
++#define PCRE2_STATIC
++#endif
++#define PCRE2_EXP_DECL Q_CORE_EXPORT
+
+ #include <pcre2.h>
+
+diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
+index accaa4f5ed..4b11c74caa 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.29.2
+