summarylogtreecommitdiffstats
path: root/0003-Fix-using-static-PCRE2-and-DBus-1.patch
diff options
context:
space:
mode:
authorMartchus2022-10-01 18:19:41 +0200
committerMartchus2022-10-01 18:19:41 +0200
commit86a79a720000cefef2e624afeb34450ed69913c3 (patch)
treef33a473c08475f8cd68d2368bcc7c2a5afa5dec9 /0003-Fix-using-static-PCRE2-and-DBus-1.patch
parent2a1ac93370896e3b9a6c5dd332c29f4a18d8549b (diff)
downloadaur-86a79a720000cefef2e624afeb34450ed69913c3.tar.gz
Update to 6.4.0
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 cb0fbb4e0302..5794b2d3f6df 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 232614cab51bf6b18b42f37305ab65992d347be6 Mon Sep 17 00:00:00 2001
+From e650eac962da69b5ec93b249902f78bfc734dc18 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 21:13:19 +0100
Subject: [PATCH 03/12] Fix using static PCRE2 and DBus-1
@@ -13,10 +13,10 @@ Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e
2 files changed, 9 insertions(+)
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
-index a39977a34b..1b26a1e00e 100644
+index a9b7f99975..063de6d9e2 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
-@@ -57,6 +57,11 @@
+@@ -20,6 +20,11 @@
#endif
#define PCRE2_CODE_UNIT_WIDTH 16
@@ -29,10 +29,10 @@ index a39977a34b..1b26a1e00e 100644
#include <pcre2.h>
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
-index accaa4f5ed..4b11c74caa 100644
+index e3008be761..9c745c16c4 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
-@@ -57,6 +57,10 @@
+@@ -21,6 +21,10 @@
#ifndef QT_NO_DBUS