diff options
| author | Martchus | 2020-06-01 19:54:17 +0200 |
|---|---|---|
| committer | Martchus | 2020-06-01 19:54:17 +0200 |
| commit | 8598b5e1679cfdd50942e06d32dee06292b579b5 (patch) | |
| tree | 349d0c3845220a4ac514b790cc47aa5f8bdf578e /0004-Make-sure-.pc-files-are-installed-correctly.patch | |
| parent | 2bc290665d6960f6f0cb4d059f0bf8e53a66351e (diff) | |
| download | aur-8598b5e1679cfdd50942e06d32dee06292b579b5.tar.gz | |
Update to 5.15.0
Diffstat (limited to '0004-Make-sure-.pc-files-are-installed-correctly.patch')
| -rw-r--r-- | 0004-Make-sure-.pc-files-are-installed-correctly.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch index 99ab6bc01aff..4102e8b3db50 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 f1122d1929e271162eb062aad43097ad69c7159e Mon Sep 17 00:00:00 2001 +From 327b095fbcb10ed66342db3d68eeac1322c73124 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 @@ -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 5c61a3c65c..e94084381c 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3215,7 +3215,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3211,7 +3211,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) +@@ -3236,7 +3236,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 a96b9c54da..5a7913be7a 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -96,7 +96,7 @@ protected: @@ -49,7 +49,7 @@ index ab970c966f..01f97c61d4 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 3ec2704625..f33edb5bd9 100644 +index 6cbd20c187..fb9558055d 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -775,7 +775,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) @@ -62,5 +62,5 @@ index 3ec2704625..f33edb5bd9 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.26.1 +2.26.2 |