Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (40701c65a9799bb29a0f1bd1c55ae7c6d5149b45)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (40701c65a9799bb29a0f1bd1c55ae7c6d5149b45)
  • Date: Sun, 7 Feb 2016 21:11:21 +0000

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

ChangeLog | 3 +++
FUNCTIONS | 9 +++++++++
qt5/qtbase/BUILD | 1 +
qt5/qtbase/CONFLICTS | 1 -
qt5/qtbase/HISTORY | 6 ++++++
qt5/qtdeclarative/CONFLICTS | 1 -
qt5/qtdeclarative/HISTORY | 4 ++++
7 files changed, 23 insertions(+), 2 deletions(-)

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 &&

./configure -opensource -confirm-license \
-prefix $QT5DIR -platform linux-g++ \
+ -no-rpath \
-reduce-relocations -reduce-exports $OPTS -v &&
make

diff --git a/qt5/qtbase/CONFLICTS b/qt5/qtbase/CONFLICTS
deleted file mode 100755
index 5556dab..0000000
--- a/qt5/qtbase/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtbase y
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 2d221fc..d7b1e76 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,9 @@
+2016-02-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: avoid the conflict with installed version by not
+ building RPATH into binaries (overrides LD_LIBRARY_PATH at build
time).
+ See https://bugreports.qt.io/browse/QTBUG-3069 .
+ * CONFLICTS: removed again
+
2016-02-07 Treeve Jelbert <treeve AT sourcemage.org>
* CONFLICTS: added

diff --git a/qt5/qtdeclarative/CONFLICTS b/qt5/qtdeclarative/CONFLICTS
deleted file mode 100755
index eb943aa..0000000
--- a/qt5/qtdeclarative/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtdeclarative y
diff --git a/qt5/qtdeclarative/HISTORY b/qt5/qtdeclarative/HISTORY
index 0e880ac..f30a36c 100644
--- a/qt5/qtdeclarative/HISTORY
+++ b/qt5/qtdeclarative/HISTORY
@@ -1,3 +1,7 @@
+2016-02-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: removed again, the hacked qt5_build avoids it
+ (tested for upgrade from 5.4.1 to 5.5.1)
+
2016-02-07 Treeve Jelbert <treeve AT sourcemage.org>
* CONFLICTS: added




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (40701c65a9799bb29a0f1bd1c55ae7c6d5149b45), Thomas Orgis, 02/07/2016

Archive powered by MHonArc 2.6.24.

Top of Page