Skip to Content.
Sympa Menu

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

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 (077f58dc9b8a29b6a114ed4799126d9e507cbf78)
  • Date: Sat, 25 Apr 2015 04:51:02 -0500

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

qt5/qtbase/CONFLICTS | 1 +
qt5/qtbase/HISTORY | 3 +++
qt5/qttools/BUILD | 8 ++++++++
qt5/qttools/DETAILS | 1 +
qt5/qttools/HISTORY | 6 ++++++
qt5/qttools/INSTALL | 8 ++++++++
xorg-lib/libxi/DEPENDS | 2 ++
xorg-lib/libxi/HISTORY | 3 +++
8 files changed, 32 insertions(+)

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

qttools: install some binaries that are referenced but missing
(namely qcollectiongenerator)

commit 8f3b14212c5d01acff30c135c6779cc2879e6cce
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libxi: depends libxfixes

commit 930ce79816b1de31b641c50c048323664dda8474
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qtbase: conflict with itself, like the others

Story: On icu update, the installed qtbase causes the build to
fail, trying to find the old icu library. We need a proper fix
to isolate these braindead self-conflicting builds!

diff --git a/qt5/qtbase/CONFLICTS b/qt5/qtbase/CONFLICTS
new file mode 100755
index 0000000..5556dab
--- /dev/null
+++ b/qt5/qtbase/CONFLICTS
@@ -0,0 +1 @@
+conflicts qtbase y
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 306acc7..6b47c1c 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2015-04-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: added, conflicts with itself during build
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1

diff --git a/qt5/qttools/BUILD b/qt5/qttools/BUILD
new file mode 100755
index 0000000..ada89aa
--- /dev/null
+++ b/qt5/qttools/BUILD
@@ -0,0 +1,8 @@
+default_build &&
+# Build some additional tools that might be missing otherwise.
+# The collectiongenerator is referenced in cmake files from
+# the normal install!
+cd "$SOURCE_DIRECTORY/src/assistant" &&
+make sub-qcollectiongenerator &&
+make sub-qhelpconverter &&
+make sub-qhelpgenerator
diff --git a/qt5/qttools/DETAILS b/qt5/qttools/DETAILS
index 9ce6191..9e599ed 100755
--- a/qt5/qttools/DETAILS
+++ b/qt5/qttools/DETAILS
@@ -2,6 +2,7 @@ QT_URL=http://download.qt.io/official_releases/
SPELL=qttools
SPELLX=$SPELL-opensource-src
VERSION=5.4.1
+ PATCHLEVEL=1

SOURCE_HASH=sha512:1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
diff --git a/qt5/qttools/HISTORY b/qt5/qttools/HISTORY
index 9cb2828..f606956 100644
--- a/qt5/qttools/HISTORY
+++ b/qt5/qttools/HISTORY
@@ -1,3 +1,9 @@
+2014-04-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD, INSTALL: make it install assistant tools, as those are
+ referenced in installed cmake stuff and their absence breaks
+ dependees (musescore)
+ * DETAILS: PATCHLEVEL++
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1

diff --git a/qt5/qttools/INSTALL b/qt5/qttools/INSTALL
new file mode 100755
index 0000000..d0d30f6
--- /dev/null
+++ b/qt5/qttools/INSTALL
@@ -0,0 +1,8 @@
+default_install &&
+# No working install target for those?!
+cd "$SOURCE_DIRECTORY" &&
+install -v -m 755 \
+bin/qcollectiongenerator \
+bin/qhelpconverter \
+bin/qhelpgenerator \
+$QT5DIR/bin
diff --git a/xorg-lib/libxi/DEPENDS b/xorg-lib/libxi/DEPENDS
index 95e7a26..29ea233 100755
--- a/xorg-lib/libxi/DEPENDS
+++ b/xorg-lib/libxi/DEPENDS
@@ -7,7 +7,9 @@ depends libxau &&
depends libxcb &&
depends libxdmcp &&
depends libxext &&
+depends libxfixes &&
depends pkgconfig &&
depends util-macros &&
depends xextproto &&
depends xproto
+
diff --git a/xorg-lib/libxi/HISTORY b/xorg-lib/libxi/HISTORY
index bbcb95d..f5edd62 100644
--- a/xorg-lib/libxi/HISTORY
+++ b/xorg-lib/libxi/HISTORY
@@ -1,3 +1,6 @@
+2015-04-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: libxfixes
+
2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: missing dependencies




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (077f58dc9b8a29b6a114ed4799126d9e507cbf78), Thomas Orgis, 04/25/2015

Archive powered by MHonArc 2.6.24.

Top of Page