New commits:
commit 40701c65a9799bb29a0f1bd1c55ae7c6d5149b45
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
qt5_build: Add a hack to prevent still present self-conflicts of Qt5
stuff.
commit f5a8f51f7f8f546bd78b1499e1c3c3b3d524be48
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
qtbase: avoid the conflict with itself
diff --git a/ChangeLog b/ChangeLog
index 41c97ad..8a65a3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-02-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * FUNCTIONS: brute force fix for self-conflicting Qt5 stuff
+
2016-01-30 Treeve Jelbert <treeve AT sourcemage.org>
* kde5-apps/kid3: added, metadata tagging
diff --git a/FUNCTIONS b/FUNCTIONS
index 45b30be..aedb6fa 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -8,6 +8,15 @@ QT5DIR=$INSTALL_ROOT/opt/qt5
qt5_build() {
PATH="$QT5DIR/bin:$PATH"
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
+ # Nasty hack to ensure that locally built libs are always
+ # used first to avoid conflict with installed old version.
+ # Issues of this kind crop up regularily since years.
+ # Supposedly, Qt 5.6 could fix this. My life is to short to
+ # wait for and test this.
+ # But see https://bugreports.qt.io/browse/QTBUG-50921 and
+ # decide about removing this hack once it is resolved.
+ sed -i "1s:^:LIBS+= -L$SOURCE_DIRECTORY/lib\n:" \
+ $(find . -name '*.pro') &&
qmake PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib \
$OPTS *.pro &&
make
diff --git a/qt5/qtbase/BUILD b/qt5/qtbase/BUILD
index 9253ed3..fadced3 100755
--- a/qt5/qtbase/BUILD
+++ b/qt5/qtbase/BUILD
@@ -13,6 +13,7 @@ cd $SOURCE_DIRECTORY &&