diff options
| author | Martchus | 2021-04-14 11:37:02 +0200 |
|---|---|---|
| committer | Martchus | 2021-04-14 11:37:02 +0200 |
| commit | d813c625b99efacfb3c93c5359ff247238b0adae (patch) | |
| tree | f96ed8f07b8cfd999f5a702ab67dbdf088c8dcb5 /0004-Make-sure-.pc-files-are-installed-correctly.patch | |
| parent | b50768911b01d8a81790ee2fa0dda1fcc4c33267 (diff) | |
| download | aur-d813c625b99efacfb3c93c5359ff247238b0adae.tar.gz | |
Update to use KDE fork patches
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 7ad86637cf39..a9c2066ff07c 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 45491f6d0b4d828f3b4ce6b76ec3c7d68cec6b06 Mon Sep 17 00:00:00 2001 +From f041def0ede2e36edd35ddae430fb7c06186756e 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 5c61a3c65c..e94084381c 100644 +index a901332312..f1e8966123 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3211,7 +3211,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3218,7 +3218,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index 5c61a3c65c..e94084381c 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3236,7 +3236,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3243,7 +3243,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 5c61a3c65c..e94084381c 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index a96b9c54da..5a7913be7a 100644 +index dc612c392c..7bfd2e1953 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.29.2 +2.31.1 |