summarylogtreecommitdiffstats
path: root/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
diff options
context:
space:
mode:
authorMartchus2018-06-25 14:47:45 +0200
committerMartchus2018-06-25 14:47:45 +0200
commit47d3c78d9382f51be60b00b27c7f023e073a3635 (patch)
tree83bc729b1202813f495539e9a1e8e0c7652fdc6b /0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
parent1de5b17c1169b308c3a014303dc8217228b90cca (diff)
downloadaur-47d3c78d9382f51be60b00b27c7f023e073a3635.tar.gz
Update to 5.11.1
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 38f184dfaaf..6b9077cc5ec 100644
--- a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,4 +1,4 @@
-From a401f6740c459cc21909ec406814852ff3ec233d Mon Sep 17 00:00:00 2001
+From cfdde9962386c34c3f2bfe902aa2a522b0530dba Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
@@ -11,7 +11,7 @@ static freetype2 and harfbuzz
2 files changed, 6 insertions(+)
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 30f99174f8..154edd67d4 100644
+index 894020d2bd..5f57d6f5cb 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -414,6 +414,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
@@ -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.17.0
+2.18.0