[SM-Commit] GIT changes to master grimoire by Thomas Orgis (6a649defadf2f5d5bef76e2a2009707d29027a8f)

Thomas Orgis scm at sourcemage.org
Thu Jan 12 18:05:21 EST 2012


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

 ChangeLog           |    3 +++
 kde4-apps/FUNCTIONS |    7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 6a649defadf2f5d5bef76e2a2009707d29027a8f
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    kde4-apps/FUNCTIONS fix path to find correct QT binaries

diff --git a/ChangeLog b/ChangeLog
index faea2de..b6f5b0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-01-13 Thomas Orgis <sobukus at sourcemage.org>
+	* kde4-apps/FUNCTIONS: ensure build finds correct QT binaries first
+
 2012-01-12 Ladislav Hagara <hgr at vabo.cz>
 	* graphics-libs/libvisio: new spell, library for visio diagrams
 
diff --git a/kde4-apps/FUNCTIONS b/kde4-apps/FUNCTIONS
index 2ea66b4..527e375 100755
--- a/kde4-apps/FUNCTIONS
+++ b/kde4-apps/FUNCTIONS
@@ -1,12 +1,13 @@
 prepare_environment() {
-  QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"             &&
-  PATH="$QTDIR/bin/qt4:$PATH"                     &&
-
   persistent_add KDE4DIR                          &&
   KDE4DIR="$INSTALL_ROOT/usr"                &&
   KDE4ETC="$INSTALL_ROOT/etc"                &&
 
   PATH="$KDE4DIR/bin:$PATH"                       &&
+  # Correct QT binaries need to be found first!
+  QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"             &&
+  PATH="$QTDIR/bin/qt4:$PATH"                     &&
+
   LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
   QT_PLUGIN_PATH="$KDE4DIR/lib/kde4/plugins"
 }


More information about the SM-Commit mailing list