diff options
| author | Martchus | 2017-07-06 23:12:07 +0200 |
|---|---|---|
| committer | Martchus | 2017-07-06 23:12:07 +0200 |
| commit | 25e7d1738f2966725fd45605eb1cb7b584887348 (patch) | |
| tree | fe77d9494d1cf4b38d11f69e18c6e2a65ae29ce1 /0005-Make-sure-.pc-files-are-installed-correctly.patch | |
| parent | dea669da7483affe56a58aeae1b7ddb2f7b528d9 (diff) | |
| download | aur-25e7d1738f2966725fd45605eb1cb7b584887348.tar.gz | |
Update to 5.9.1
Diffstat (limited to '0005-Make-sure-.pc-files-are-installed-correctly.patch')
| -rw-r--r-- | 0005-Make-sure-.pc-files-are-installed-correctly.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/0005-Make-sure-.pc-files-are-installed-correctly.patch b/0005-Make-sure-.pc-files-are-installed-correctly.patch index ae67fc62c39f..3e510a596d3d 100644 --- a/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From ca3aca842c36f8d69320f5629071d29563b91081 Mon Sep 17 00:00:00 2001 +From 6c77b092c06551fbbed5df56e674f7ce0370a02a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/31] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 05/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 c76708285a..fb886e00d2 100644 +index a1f3352aa3..0be4b1ef01 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3152,7 +3152,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3146,7 +3146,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index c76708285a..fb886e00d2 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3177,7 +3177,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3171,7 +3171,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -49,10 +49,10 @@ index 4ced3bd121..f7cc3b9e9b 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 2013698c99..b6b8dda397 100644 +index 75bb5d236d..737f3abc3a 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp -@@ -724,7 +724,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) +@@ -726,7 +726,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) } if(!ret.isEmpty()) ret += "\n\t"; @@ -62,5 +62,5 @@ index 2013698c99..b6b8dda397 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.13.0 +2.13.2 |