summaryrefslogtreecommitdiff
path: root/x11/qt4-libs/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'x11/qt4-libs/patches/patch-aa')
-rw-r--r--x11/qt4-libs/patches/patch-aa10
1 files changed, 5 insertions, 5 deletions
diff --git a/x11/qt4-libs/patches/patch-aa b/x11/qt4-libs/patches/patch-aa
index b8b38bbd62e..482ad438e9d 100644
--- a/x11/qt4-libs/patches/patch-aa
+++ b/x11/qt4-libs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2009/10/11 09:14:52 adam Exp $
+$NetBSD: patch-aa,v 1.11 2010/01/29 18:19:09 adam Exp $
---- qmake/generators/unix/unixmake2.cpp.orig 2009-09-29 13:01:33.000000000 +0200
+--- qmake/generators/unix/unixmake2.cpp.orig 2010-01-15 17:01:30.000000000 +0000
+++ qmake/generators/unix/unixmake2.cpp
-@@ -232,6 +232,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -233,6 +233,8 @@ UnixMakefileGenerator::writeMakeParts(QT
if(!project->isEmpty("QMAKE_BUNDLE")) {
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl;
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.10 2009/10/11 09:14:52 adam Exp $
} else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl;
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
-@@ -993,8 +995,12 @@ void UnixMakefileGenerator::init2()
+@@ -994,8 +996,12 @@ void UnixMakefileGenerator::init2()
} else if (project->isActiveConfig("staticlib")) {
project->values("TARGET").first().prepend("lib");
project->values("TARGET").first() += ".a";
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.10 2009/10/11 09:14:52 adam Exp $
} else {
project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
if(project->isActiveConfig("compile_libtool"))
-@@ -1445,7 +1451,7 @@ UnixMakefileGenerator::writePkgConfigFil
+@@ -1439,7 +1445,7 @@ UnixMakefileGenerator::writePkgConfigFil
bundle = bundle.left(suffix);
pkgConfiglibName = "-framework " + bundle + " ";
} else {