diff options
| author | Martchus | 2019-09-09 20:28:26 +0200 |
|---|---|---|
| committer | Martchus | 2019-09-09 20:28:26 +0200 |
| commit | 3c0b7a4501468cb3f519bb65dac2f1837f03fa64 (patch) | |
| tree | 687d1d750d920a9589a55247d81f84e0d5438944 /0004-Make-sure-.pc-files-are-installed-correctly.patch | |
| parent | 7e9790ef70cdbf8552595445b938883ba09b475b (diff) | |
| download | aur-3c0b7a4501468cb3f519bb65dac2f1837f03fa64.tar.gz | |
Update to 5.13.1
Diffstat (limited to '0004-Make-sure-.pc-files-are-installed-correctly.patch')
| -rw-r--r-- | 0004-Make-sure-.pc-files-are-installed-correctly.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch index 7a73127b2895..fdb82a4ef54e 100644 --- a/0004-Make-sure-.pc-files-are-installed-correctly.patch +++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 3887b9693805365272de6101eab5c332862960e3 Mon Sep 17 00:00:00 2001 +From 7d3c1a5d57a996c8eaef937486df04ad0c2559cd Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/33] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 04/33] 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 b634ec622b..aac53cd0ea 100644 +index a45b676d5f..6065ca4c77 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3240,7 +3240,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index b634ec622b..aac53cd0ea 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3265,7 +3265,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -49,7 +49,7 @@ index 350ebd377a..d0c234b864 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 16f9361d13..d9887cd36d 100644 +index 266bae7e64..8222854cfc 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -753,7 +753,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) @@ -62,5 +62,5 @@ index 16f9361d13..d9887cd36d 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.22.0 +2.23.0 |