aboutsummarylogtreecommitdiffstats
path: root/0007-Prevent-debug-library-names-in-pkg-config-files.patch
diff options
context:
space:
mode:
authorMartchus2018-09-25 15:26:21 +0200
committerMartchus2018-09-25 15:26:21 +0200
commitc1312e3ce7592b30f5454345d5ae8a61302b8ef3 (patch)
tree6d543ec39c6ae16aa08e726a348887e44caaabc5 /0007-Prevent-debug-library-names-in-pkg-config-files.patch
parenta9a3809bbbaab4f9db7fdc97314268df3641902c (diff)
downloadaur-c1312e3ce7592b30f5454345d5ae8a61302b8ef3.tar.gz
Update to 5.11.2
Diffstat (limited to '0007-Prevent-debug-library-names-in-pkg-config-files.patch')
-rw-r--r--0007-Prevent-debug-library-names-in-pkg-config-files.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/0007-Prevent-debug-library-names-in-pkg-config-files.patch
index b00a666fe6b8..afc5271a9588 100644
--- a/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/0007-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,7 +1,7 @@
-From 31cca3a47eea50156a5549574d934dd0264cb0f3 Mon Sep 17 00:00:00 2001
+From 541e805e6c9180089625700f498165d9e3a371d1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
qmake generates the pkgconfig .pc files two times, once for the
release build and once for the debug build (which we're not actually
@@ -15,10 +15,10 @@ files for the debug build an unique file name.
1 file changed, 3 insertions(+)
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 6c614fd868..bd87c5bd6d 100644
+index 6c977b3e0b..412278c8c6 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3197,6 +3197,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
if (dot != -1)
ret = ret.left(dot);
}
@@ -29,5 +29,5 @@ index 6c614fd868..bd87c5bd6d 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
-2.18.0
+2.19.0