aboutsummarylogtreecommitdiffstats
path: root/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
diff options
context:
space:
mode:
authorMartchus2022-09-10 20:51:34 +0200
committerMartchus2022-09-10 20:51:34 +0200
commit5f9969e8f06b00eef578a8e4c7c71715fc2a71f1 (patch)
tree514ea8bace628015ca050bec6604fc63973d4f97 /0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
parent8e15f8bcbfa1466c01a2b13de47fa017214c6e0c (diff)
downloadaur-5f9969e8f06b00eef578a8e4c7c71715fc2a71f1.tar.gz
Rebase against Qt 5.15.6
Diffstat (limited to '0028-Prevent-qmake-from-messing-static-lib-dependencies.patch')
-rw-r--r--0028-Prevent-qmake-from-messing-static-lib-dependencies.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 61875f195642..52f8a8f31cb2 100644
--- a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,7 +1,7 @@
-From 892c3bb8d9dfad8ef0d54112dc9d2af23c58638b Mon Sep 17 00:00:00 2001
+From f78cf68b18981cd16c8c0034f4d46517c7905f02 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 28/33] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies
In particular, it messes resolving cyclic dependency between
static freetype2 and harfbuzz
@@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644
int libidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
--
-2.36.1
+2.37.3