Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 kde4/kde4-l10n/BUILD   |   12 ++++++++----
 kde4/kde4-l10n/HISTORY |    3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit f35a4cacc860f5556e47679679dbd49730a315d6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    kde4-l10n: hotfix build when qt3 is also installed (wrong qmake found)

diff --git a/kde4/kde4-l10n/BUILD b/kde4/kde4-l10n/BUILD
index dbe1530..7ff3092 100755
--- a/kde4/kde4-l10n/BUILD
+++ b/kde4/kde4-l10n/BUILD
@@ -1,10 +1,13 @@
-QTDIR=$INSTALL_ROOT/usr                         &&
-PATH=$QTDIR/bin/qt4:$PATH                       &&
-
 persistent_add KDE4DIR                          &&
-KDE4DIR=$INSTALL_ROOT/usr                  &&
+KDE4DIR=$INSTALL_ROOT/usr                       &&
 
 PATH=$KDE4DIR/bin:$PATH                         &&
+
+# We need to be sure that the correct qmake is found first.
+# Do not push any paths before this!
+QTDIR=$INSTALL_ROOT/usr                         &&
+PATH=$QTDIR/bin/qt4:$PATH                       &&
+
 LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH   &&
 QT_PLUGIN_PATH=$KDE4DIR/lib/kde4/plugins        &&
 
@@ -23,6 +26,7 @@ do
     cd $BUILD_SUBDIRECTORY                                                   
&&
     mkdir -p build                                  &&
     cd build                                        &&
+    echo "PATH=$PATH" &&
     cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR           \
           -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION      \
           ../                                       &&
diff --git a/kde4/kde4-l10n/HISTORY b/kde4/kde4-l10n/HISTORY
index 830f0c3..fcdce18 100644
--- a/kde4/kde4-l10n/HISTORY
+++ b/kde4/kde4-l10n/HISTORY
@@ -1,3 +1,6 @@
+2012-01-07 Thomas Orgis <sobukus AT sourcemage.org>
+       * BUILD: make sure qt4 bin path is topmost (build finds wrong qmake)
+
 2011-12-10 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 4.7.4