aboutsummarylogtreecommitdiffstats
path: root/0007-Prevent-debug-library-names-in-pkg-config-files.patch
diff options
context:
space:
mode:
authorMartchus2017-12-14 01:06:18 +0100
committerMartchus2017-12-14 01:06:18 +0100
commite66443501f7b410db4b278c8cff5e75792108285 (patch)
tree79c27c795c5df4a0d39222e2a07b5176aed24d7c /0007-Prevent-debug-library-names-in-pkg-config-files.patch
parent3e19ccfbbef7d70aff50d047063155091be8c4e8 (diff)
downloadaur-e66443501f7b410db4b278c8cff5e75792108285.tar.gz
Update to 5.10.0
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.patch8
1 files changed, 4 insertions, 4 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 f09d6fae4298..a3e932717e5f 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 285b5fee5b5ada6cd82ddaf33eb9c1a05b564bc6 Mon Sep 17 00:00:00 2001
+From b02e8af19e3d94f9c39bbcaf94e91ab6dc6ca3f8 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/34] 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,7 +15,7 @@ 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 0be4b1ef01..c7e075b5bc 100644
+index b9871ff49c..0d07d6c333 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
@@ -29,5 +29,5 @@ index 0be4b1ef01..c7e075b5bc 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
-2.14.2
+2.15.1