Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 net/bitcoin/BUILD        |    6 ++++--
 net/bitcoin/DETAILS      |    1 +
 net/bitcoin/HISTORY      |    4 ++++
 video/minitube/BUILD     |    2 +-
 video/minitube/DEPENDS   |    2 +-
 video/minitube/DETAILS   |   11 +++++------
 video/minitube/HISTORY   |    5 +++++
 video/minitube/PRE_BUILD |    3 +++
 8 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 9785b47e8ce2de62279325e98f254acb1d95a83b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    minitube 2.9

commit 082a9d2e74a3335cece30b95dab7c4870e0c4a58
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    bitcoin: Fix build against Qt 5

diff --git a/net/bitcoin/BUILD b/net/bitcoin/BUILD
index 653d42e..c33eb4f 100755
--- a/net/bitcoin/BUILD
+++ b/net/bitcoin/BUILD
@@ -1,8 +1,10 @@
 if is_depends_enabled $SPELL qt4; then
-  PATH="$QT4DIR:$PATH"
+  QTDIR="$QT4DIR"
 else
-  PATH="$QT5DIR:$PATH"
+  QTDIR="$QT5DIR"
 fi &&
+PATH="$QTDIR/bin:$PATH" &&
+export PKG_CONFIG_PATH="$QTDIR/lib/pkgconfig" &&
 db48="$INSTALL_ROOT/opt/db48" &&
 CPPFLAGS="$CPPFLAGS -I$db48/include" &&
 LDFLAGS="$LDFLAGS -L$db48/lib" &&
diff --git a/net/bitcoin/DETAILS b/net/bitcoin/DETAILS
index 9195b58..9e18d7a 100755
--- a/net/bitcoin/DETAILS
+++ b/net/bitcoin/DETAILS
@@ -1,6 +1,7 @@
            SPELL=bitcoin
          VERSION=0.15.1
   SECURITY_PATCH=1
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=https://github.com/$SPELL/$SPELL/archive/v$VERSION.tar.gz
      
SOURCE_HASH=sha512:bffbed3894039b30b4e6281fb7aeb2ef9703050aa5b8368accc091511c28f1a138337a8ff508ab02a2e5e83f87b71f06839ecbb96b8d468d5b771bde84840f6d
diff --git a/net/bitcoin/HISTORY b/net/bitcoin/HISTORY
index 81f9f0e..5f87db3 100644
--- a/net/bitcoin/HISTORY
+++ b/net/bitcoin/HISTORY
@@ -1,3 +1,7 @@
+2017-12-05 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: PATCHLEVEL++
+       * BUILD: fixed build against Qt 5
+
 2017-11-23 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: updated spell to 0.15.1
 
diff --git a/video/minitube/BUILD b/video/minitube/BUILD
index eec3de4..0694f56 100755
--- a/video/minitube/BUILD
+++ b/video/minitube/BUILD
@@ -1 +1 @@
-qt4_build
+qt5_build
diff --git a/video/minitube/DEPENDS b/video/minitube/DEPENDS
index 50c3d17..b281f1e 100755
--- a/video/minitube/DEPENDS
+++ b/video/minitube/DEPENDS
@@ -1,6 +1,6 @@
 depends -sub CXX gcc   &&
 depends dbus           &&
-depends qt4            &&
+depends qtbase         &&
 depends phonon         &&
 depends PHONON_BACKEND &&
 if is_depends_enabled $SPELL phonon-backend-gstreamer; then
diff --git a/video/minitube/DETAILS b/video/minitube/DETAILS
index 43ad4ca..9b63155 100755
--- a/video/minitube/DETAILS
+++ b/video/minitube/DETAILS
@@ -4,16 +4,15 @@ if [[ "${MINITUBE_BRANCH}" == "scm" ]] ; then
           VERSION=$(get_scm_version)
            SOURCE=${SPELL}-git.tar.bz2
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
-    SOURCE_URL[0]=git://gitorious.org/minitube/minitube.git
+    SOURCE_URL[0]=git://github.com/flaviotordini/minitube.git
     SOURCE_IGNORE=volatile
    FORCE_DOWNLOAD=on
 else
-         VERSION=2.2
+         VERSION=2.9
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-    XSOURCE_HASH="2a3d885e15917370e1602d7eef6bb8e1a9222f5d"
-   
SOURCE_URL[0]="https://gitorious.org/minitube/minitube/archive/${XSOURCE_HASH}.tar.gz";
-     
SOURCE_HASH=sha512:0ee6dd7c8c889c97845acc494c69a16521f90997594fb478265eaaee5101c3f39310eef492bebf3ef9020c91b8ef26f71897fa41039a571fbba6fd75786b2796
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${SPELL}"
+   
SOURCE_URL[0]="https://github.com/flaviotordini/minitube/archive/$VERSION.tar.gz";
+     
SOURCE_HASH=sha512:94bac1b7cb1b3388256d088bfb9ffdfe75cc3c1624f60722cedd561015e1afa96351d4ac55b6be27bb5e00641cd7e3198cf2285a0e9b0c586d62d1a7a8c510c9
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 fi
         WEB_SITE="http://flavio.tordini.org/minitube";
       LICENSE[0]=GPL
diff --git a/video/minitube/HISTORY b/video/minitube/HISTORY
index dfd938c..7a77fa9 100644
--- a/video/minitube/HISTORY
+++ b/video/minitube/HISTORY
@@ -1,3 +1,8 @@
+2017-12-05 Ismael Luceno <ismael AT sourcemage.org>
+       * PRE_BUILD: fixed path to phonon4qt5
+       * BUILD, DEPENDS: build against Qt 5
+       * DETAILS: updated spell to 2.9
+
 2014-07-30 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.2
        * PRE_BUILD, 0001-remove-reference-to-missing-translations.patch:
diff --git a/video/minitube/PRE_BUILD b/video/minitube/PRE_BUILD
new file mode 100755
index 0000000..4b228f6
--- /dev/null
+++ b/video/minitube/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit '\!^ *INCLUDEPATH += .*/phonon4qt5$!s!/usr/!/opt/qt5/!' minitube.pro