diff options
Diffstat (limited to 'x11/qt4-libs/patches/patch-aa')
| -rw-r--r-- | x11/qt4-libs/patches/patch-aa | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/x11/qt4-libs/patches/patch-aa b/x11/qt4-libs/patches/patch-aa index f87dc5d50c1..b61e97c866b 100644 --- a/x11/qt4-libs/patches/patch-aa +++ b/x11/qt4-libs/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2007/07/28 07:37:51 adam Exp $ +$NetBSD: patch-aa,v 1.6 2007/10/13 12:02:14 adam Exp $ ---- qmake/generators/unix/unixmake2.cpp.orig 2007-05-25 15:24:38.000000000 +0200 +--- qmake/generators/unix/unixmake2.cpp.orig 2007-10-01 15:06:33.000000000 +0200 +++ qmake/generators/unix/unixmake2.cpp -@@ -212,6 +212,8 @@ UnixMakefileGenerator::writeMakeParts(QT +@@ -227,6 +227,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.5 2007/07/28 07:37:51 adam Exp $ } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) { t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl; t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; -@@ -962,8 +964,12 @@ void UnixMakefileGenerator::init2() +@@ -977,8 +979,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.5 2007/07/28 07:37:51 adam Exp $ } else { project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a"); if(project->isActiveConfig("compile_libtool")) -@@ -1398,7 +1404,7 @@ UnixMakefileGenerator::writePkgConfigFil +@@ -1413,7 +1419,7 @@ UnixMakefileGenerator::writePkgConfigFil else libs << "QMAKE_LIBS"; //obvious one libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread? |