diff options
| author | Martchus | 2022-03-08 23:34:58 +0100 |
|---|---|---|
| committer | Martchus | 2022-03-08 23:34:58 +0100 |
| commit | 9048ef5906c24140f2acbef7ecb9d8cec8878e62 (patch) | |
| tree | de20bcd920aa88c54548b33c39e7fb34b4e4acf0 /0004-Make-sure-.pc-files-are-installed-correctly.patch | |
| parent | ee032f41f813d60bf81c47cae489ad91db3ad5f0 (diff) | |
| download | aur-9048ef5906c24140f2acbef7ecb9d8cec8878e62.tar.gz | |
Rebase against 5.15.3
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 8194b3948f1c..ad9f53a5cee0 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 89b22a5f59e9896363e4903bdcce4b9695b8400b Mon Sep 17 00:00:00 2001 +From 868525161830dfdb98ad2ae9b8a01b7778b3d133 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/32] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 04/32] 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 a901332312..f1e8966123 100644 +index dfbbde3b26..a33017e19d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3218,7 +3218,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index a901332312..f1e8966123 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3243,7 +3243,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3252,7 +3252,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 a901332312..f1e8966123 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index dc612c392c..7bfd2e1953 100644 +index 0ea587f607..6bf24d4708 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -96,7 +96,7 @@ protected: @@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.34.1 +2.35.1 |