diff options
Diffstat (limited to '0005-Make-sure-.pc-files-are-installed-correctly.patch')
| -rw-r--r-- | 0005-Make-sure-.pc-files-are-installed-correctly.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0005-Make-sure-.pc-files-are-installed-correctly.patch b/0005-Make-sure-.pc-files-are-installed-correctly.patch index 77cc1ad19b9e..194b1fc084cd 100644 --- a/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 08286bb3f862fdc5f6cbdbb104d56d29d06b840a Mon Sep 17 00:00:00 2001 +From 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 05/34] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index f824f12bce..07abba9e5f 100644 +index 7762e47f41..bc466d35b3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index f824f12bce..07abba9e5f 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -36,7 +36,7 @@ index f824f12bce..07abba9e5f 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index 0535017ff6..b2f8b961c0 100644 +index 350ebd377a..d0c234b864 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -92,7 +92,7 @@ protected: @@ -62,5 +62,5 @@ index 6046e5791e..87157f31ae 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.20.1 +2.21.0 |