summarylogtreecommitdiffstats
path: root/0003-Fix-using-static-PCRE2-and-DBus-1.patch
diff options
context:
space:
mode:
Diffstat (limited to '0003-Fix-using-static-PCRE2-and-DBus-1.patch')
-rw-r--r--0003-Fix-using-static-PCRE2-and-DBus-1.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index e61464377e32..6e50a5b1f6e1 100644
--- a/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -1,7 +1,7 @@
-From a061819f2b68392ecff422c54d80cedb529acc15 Mon Sep 17 00:00:00 2001
+From a77593b453a5361feb0dd053dbe389fdd5501cdd Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 21:13:19 +0100
-Subject: [PATCH 03/13] Fix using static PCRE2 and DBus-1
+Subject: [PATCH 03/17] 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.
@@ -13,7 +13,7 @@ Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e
2 files changed, 9 insertions(+)
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
-index 93e4f7d1f9..23299af94b 100644
+index b00d263b710..032812ae861 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -20,6 +20,11 @@
@@ -29,7 +29,7 @@ index 93e4f7d1f9..23299af94b 100644
#include <pcre2.h>
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
-index e3008be761..9c745c16c4 100644
+index e3008be7619..9c745c16c41 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -21,6 +21,10 @@
@@ -44,5 +44,5 @@ index e3008be761..9c745c16c4 100644
# include <dbus/dbus.h>
#else
--
-2.43.0
+2.44.0