diff options
Diffstat (limited to '0004-Make-sure-.pc-files-are-installed-correctly.patch')
-rw-r--r-- | 0004-Make-sure-.pc-files-are-installed-correctly.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch index c46d359c2650..ab7ade7f8599 100644 --- a/0004-Make-sure-.pc-files-are-installed-correctly.patch +++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,7 +1,7 @@ -From d758e71cb38b4fec2f012121605185bf395206cf Mon Sep 17 00:00:00 2001 +From ed34f597de640c8ef123db60931353894564aa8d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:54:12 +0200 -Subject: [PATCH 04/31] Make sure *.pc files are installed correctly +Subject: [PATCH 04/32] Make sure *.pc files are installed correctly --- qmake/generators/makefile.cpp | 8 ++++++-- @@ -10,10 +10,10 @@ Subject: [PATCH 04/31] 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 7e471f126c..f9532e0db9 100644 +index 7ff921549da..fc996663d8d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3215,7 +3215,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3242,7 +3242,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index 7e471f126c..f9532e0db9 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3240,7 +3240,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3267,7 +3267,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 7e471f126c..f9532e0db9 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index ab970c966f..01f97c61d4 100644 +index 106069c454b..5252a7eaa12 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -96,7 +96,7 @@ protected: @@ -49,10 +49,10 @@ index ab970c966f..01f97c61d4 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 86d10c213c..c1b28a52e9 100644 +index 5e446bd7e2b..183cef29089 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp -@@ -761,7 +761,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) +@@ -775,7 +775,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) } if(!ret.isEmpty()) ret += "\n\t"; @@ -62,5 +62,5 @@ index 86d10c213c..c1b28a52e9 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.25.0 +2.44.0 |