Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

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

 audio-creation/hydrogen/BUILD   |    1 -
 audio-creation/hydrogen/DEPENDS |    5 ++++-
 audio-creation/hydrogen/DETAILS |    6 +++---
 audio-creation/hydrogen/HISTORY |    5 +++++
 qt5/qtdeclarative/HISTORY       |    3 +++
 qt5/qtdeclarative/PRE_BUILD     |   16 ++++++++++++++++
 6 files changed, 31 insertions(+), 5 deletions(-)

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

    hydrogen: version 1.0.2
    
    This now means one user of qt4 less.

commit 217cc0c6ebf578d14c7a448478bbed6ed8a33c50
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    qtdeclarative: fix build with GCC 11

diff --git a/audio-creation/hydrogen/BUILD b/audio-creation/hydrogen/BUILD
index 3599c4e..4f784b5 100755
--- a/audio-creation/hydrogen/BUILD
+++ b/audio-creation/hydrogen/BUILD
@@ -1,4 +1,3 @@
-export QTDIR=$QT4DIR  &&
 # Refuses to use ladspa unless path to plugins specified.
 export LADSPA_PATH=$INSTALL_ROOT/usr/lib/ladspa &&
 OPTS+=" $HYDROGEN_OSS" &&
diff --git a/audio-creation/hydrogen/DEPENDS b/audio-creation/hydrogen/DEPENDS
index bda2606..66c47b8 100755
--- a/audio-creation/hydrogen/DEPENDS
+++ b/audio-creation/hydrogen/DEPENDS
@@ -1,6 +1,9 @@
 depends -sub CXX gcc &&
-depends  qt4         &&
+depends  qtbase      &&
+depends  qttools     &&
+depends  qtxmlpatterns &&
 depends  cmake       &&
+depends  cppunit     &&
 depends  libsndfile  &&
 
 optional_depends  libarchive \
diff --git a/audio-creation/hydrogen/DETAILS b/audio-creation/hydrogen/DETAILS
index d60404a..11727fe 100755
--- a/audio-creation/hydrogen/DETAILS
+++ b/audio-creation/hydrogen/DETAILS
@@ -1,9 +1,9 @@
            SPELL=hydrogen
-         VERSION=0.9.6.1
+         VERSION=1.0.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   
SOURCE_URL[0]=https://github.com/hydrogen-music/$SPELL/archive/$VERSION.tar.gz
-     
SOURCE_HASH=sha512:afb501fb1565a95677aa2702f5d93ee611f03f60dfc8aa5a22714bb261bfeecf2b28e0b591763ec4d1a0b60f8153ef01c3fdfae924ca252943a2396ac953717f
+   SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
+     
SOURCE_HASH=sha512:11b59808214b8499401054db2881a31eccdaf126d2a9167d1f172fd29fc7097619b4350a5be246e4d6d67406342f3df32a07e2fe270bdcbe4fa0912f70e6acdb
         WEB_SITE=http://www.hydrogen-music.org
          ENTERED=20031217
       LICENSE[0]=GPL
diff --git a/audio-creation/hydrogen/HISTORY b/audio-creation/hydrogen/HISTORY
index 323cf6e..1a7fe83 100644
--- a/audio-creation/hydrogen/HISTORY
+++ b/audio-creation/hydrogen/HISTORY
@@ -1,3 +1,8 @@
+2021-08-04 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: bump to 1.0.2, switch to official source tarball
+         (differs from github one)
+       * DEPENDS, BUILD: qt5 now
+
 2016-03-02 Thomas Orgis <sobukus AT sourcemage.org>
        DETAILS, CONFIGURE, DEPENDS, BUILD: update to 0.9.6.1
        INSTALL: gone
diff --git a/qt5/qtdeclarative/HISTORY b/qt5/qtdeclarative/HISTORY
index 74739d4..a2c020f 100644
--- a/qt5/qtdeclarative/HISTORY
+++ b/qt5/qtdeclarative/HISTORY
@@ -1,3 +1,6 @@
+2021-08-04 Thomas Orgis <sobukus AT sourcemage.org>
+       * PRE_BUILD: fix GCC 11 build
+
 2020-11-19 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.15.2
 
diff --git a/qt5/qtdeclarative/PRE_BUILD b/qt5/qtdeclarative/PRE_BUILD
new file mode 100755
index 0000000..9fc9ef9
--- /dev/null
+++ b/qt5/qtdeclarative/PRE_BUILD
@@ -0,0 +1,16 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# GCC 11 fix
+patch -p0 <<EOT
+ diff -u ./src/qmldebug/qqmlprofilerevent_p.h{.orig,}
+--- ./src/qmldebug/qqmlprofilerevent_p.h.orig  2021-08-04 16:12:35.790447494 
+0200
++++ ./src/qmldebug/qqmlprofilerevent_p.h       2021-08-04 16:13:03.205449096 
+0200
+@@ -49,6 +49,7 @@
+ 
+ #include <initializer_list>
+ #include <type_traits>
++#include <limits>
+ 
+ //
+ //  W A R N I N G
+EOT