summarylogtreecommitdiffstats
path: root/0003-Fix-using-static-PCRE2-and-DBus-1.patch
diff options
context:
space:
mode:
authorMartchus2022-06-15 02:03:33 +0200
committerMartchus2022-06-15 02:03:33 +0200
commitf05eb91a3d0c0a61dfd4fbd8e50fa90516e9cd6a (patch)
treeedf05fefa245549b0fd7f445fb73906374703d23 /0003-Fix-using-static-PCRE2-and-DBus-1.patch
parent613e5fda84b7dd7a29c7118c2c1fe4097bfaea44 (diff)
downloadaur-f05eb91a3d0c0a61dfd4fbd8e50fa90516e9cd6a.tar.gz
Update to 6.3.1
Diffstat (limited to '0003-Fix-using-static-PCRE2-and-DBus-1.patch')
-rw-r--r--0003-Fix-using-static-PCRE2-and-DBus-1.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index e4bbed146952..0356ebeaf180 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 c32b8866da5b01a75b61c26a288d4c1497bd197b Mon Sep 17 00:00:00 2001
+From 84ec824d5bb73e85ef383b01859b8ada6e1ff686 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 21:13:19 +0100
-Subject: [PATCH 3/8] Fix using static PCRE2 and DBus-1
+Subject: [PATCH 03/12] 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 1db27fc4e4..0438d1401a 100644
+index 1657ef1418..cdf8875981 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -57,6 +57,11 @@
@@ -44,5 +44,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h>
#else
--
-2.35.1
+2.36.1