aboutsummarylogtreecommitdiffstats
path: root/0006-Prevent-debug-library-names-in-pkg-config-files.patch
diff options
context:
space:
mode:
authorMartchus2020-06-01 19:54:24 +0200
committerMartchus2020-06-01 19:54:24 +0200
commitc58c615142506c4392e2db990ee7e162e1804a05 (patch)
tree3b8b0ebc331a523e8639391946820e1423097075 /0006-Prevent-debug-library-names-in-pkg-config-files.patch
parent1021e23282434c17a9b00f67ded4f1007d68e25b (diff)
downloadaur-c58c615142506c4392e2db990ee7e162e1804a05.tar.gz
Update to 5.15.0
Diffstat (limited to '0006-Prevent-debug-library-names-in-pkg-config-files.patch')
-rw-r--r--0006-Prevent-debug-library-names-in-pkg-config-files.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
index 909f59542d2d..4721cc1b6ccf 100644
--- a/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From 2cfd0a32516ba85f0c608fb81341090c28209750 Mon Sep 17 00:00:00 2001
+From dd50dd544fbf94606c08fa57b0393df24282c28b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 06/31] Prevent debug library names in pkg-config files
@@ -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 f9532e0db9..9c65f21ac0 100644
+index e94084381c..8e4d11484f 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -3229,6 +3229,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3225,6 +3225,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
if (dot != -1)
ret = ret.left(dot);
}
@@ -29,5 +29,5 @@ index f9532e0db9..9c65f21ac0 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
-2.26.1
+2.26.2