summarylogtreecommitdiffstats
path: root/0003-Fix-using-static-PCRE2-and-DBus-1.patch
diff options
context:
space:
mode:
authorMartchus2021-10-28 12:25:53 +0200
committerMartchus2021-10-28 12:25:53 +0200
commit0bf4a27688582dd3480b067d49f2ed91f7e72bc8 (patch)
tree8e05382f7b75ea2dc6f1d2026b790b84d6058987 /0003-Fix-using-static-PCRE2-and-DBus-1.patch
parent2964fa6af356c0594634beb56a9d0b7bf24eae48 (diff)
downloadaur-0bf4a27688582dd3480b067d49f2ed91f7e72bc8.tar.gz
Update to 6.2.1
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 6846c84c30c3..b2d83a126796 100644
--- a/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -1,4 +1,4 @@
-From 62540d952c458408ee502168821aaeec1762c2e3 Mon Sep 17 00:00:00 2001
+From 42a00262b863de893a81fd289f39c317c5f0eebc 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
@@ -13,11 +13,11 @@ Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e
2 files changed, 9 insertions(+)
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
-index e055ae064a..6111bf6248 100644
+index b0728bca4a..2bfe48bd21 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
-@@ -53,6 +53,11 @@
- #include <QtCore/qdatastream.h>
+@@ -57,6 +57,11 @@
+ #endif
#define PCRE2_CODE_UNIT_WIDTH 16
+#ifdef QT_STATIC
@@ -44,5 +44,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h>
#else
--
-2.33.0
+2.33.1