summarylogtreecommitdiffstats
path: root/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
diff options
context:
space:
mode:
authorMartchus2018-05-28 21:50:43 +0200
committerMartchus2018-05-28 21:50:43 +0200
commit1de5b17c1169b308c3a014303dc8217228b90cca (patch)
treed2cdeb79f6dc53b2c55cbfbc84e191ca59508b7b /0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
parent5522f822fc1124b7feaa9b9ed1e958a5f8897a9c (diff)
downloadaur-1de5b17c1169b308c3a014303dc8217228b90cca.tar.gz
Update to 5.11.0
Diffstat (limited to '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch')
-rw-r--r--0030-Prevent-qmake-from-messing-static-lib-dependencies.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 33aee858ed8..38f184dfaaf 100644
--- a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,7 +1,7 @@
-From 8f96fb6b8b9ebeb7643cbab4420bef214b617aae Mon Sep 17 00:00:00 2001
+From a401f6740c459cc21909ec406814852ff3ec233d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 30/32] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
In particular, it messes resolving cyclic dependency between
static freetype2 and harfbuzz
@@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644
static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
for (int i = 0; lflags[i]; i++) {
--
-2.16.1
+2.17.0