Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 ChangeLog                  |    3 +++
 FUNCTIONS                  |    4 ++++
 kde5-apps/kaffeine/DETAILS |    4 ++--
 kde5-apps/kaffeine/HISTORY |    3 +++
 qt5/qtdeclarative/BUILD    |    2 ++
 qt5/qtdeclarative/HISTORY  |    3 +++
 shell-term-fm/mc/DEPENDS   |    3 ++-
 shell-term-fm/mc/HISTORY   |    3 +++
 x11-libs/wine/DETAILS      |    4 ++--
 x11-libs/wine/HISTORY      |    3 +++
 10 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit 1d901ae3e13f7b8fee052d7664eecacd914d3c4b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kaffeine: => 2.0.4

commit 7a817d666cad9da7778a04197db16b1e0794a73d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qtdeclarative - gcc-6 fix

commit e6817d29d3b12d3efeaa9800bffc883fdf2b60be
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qt5-qmake now uses QMAKE_CXXFLAGS

commit ebb8e9cb52f50ab6017fbbfb4cf2e1107ae2c1e1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    mc - may depends on libssh2

commit dea909a56f48fb839cb7a7b0868d46de5ed8970c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    wine: => 1.9.13

diff --git a/ChangeLog b/ChangeLog
index 5a1a922..6041a9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
 2016-06-28 Pavel Vinogradov <public AT sourcemage.org>
        * http/uwsgi: new spell, a WSGI application server
 
+2016-06-28 Treeve Jelbert <treeve AT sourcemage.org>
+       * FUNCTIONS: qt5_build - qmake uses  QMAKE_CXXFLAGS
+
 2016-06-25 Vlad Glagolev <stealth AT sourcemage.org>
        * libs/libb64: new spell, Base64 encoding/decoding routines
 
diff --git a/FUNCTIONS b/FUNCTIONS
index 674fd13..6eff7b0 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -7,6 +7,10 @@ QT5DIR=$INSTALL_ROOT/opt/qt5
 
 qt5_build() {
   PATH="$QT5DIR/bin:$PATH"
+# qmake uses its own flag settings
+  QMAKE_CXXFLAGS="CXXFLAGS"
+  QMAKE_CFLAGS="CFLAGS"
+
   export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
   qmake PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib \
     $OPTS *.pro &&
diff --git a/kde5-apps/kaffeine/DETAILS b/kde5-apps/kaffeine/DETAILS
index 0e7addb..3ab8a2f 100755
--- a/kde5-apps/kaffeine/DETAILS
+++ b/kde5-apps/kaffeine/DETAILS
@@ -1,6 +1,6 @@
            SPELL=kaffeine
-         VERSION=2.0.3
-     
SOURCE_HASH=sha512:dc0b4538e672afbc82ad8aa67561a909d7c88d5049e1c9ab7796a5c1365275010c3b7a24929021c9fd959bc3c1d2a4dfa86082afcd506626e841e28d574ff21c
+         VERSION=2.0.4
+     
SOURCE_HASH=sha512:bb27f967d8106425d8b9f60f157a6bc8372b1fb0d0b28319d447f4ff8b81ed821569f9554940aaf2d35457ae195a7b783b25012ac5839b4213209dcc82ff93e0
           SOURCE=$SPELL-$VERSION.tar.xz
       SOURCE_URL=http://download.kde.org/stable/$SPELL/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde5-apps/kaffeine/HISTORY b/kde5-apps/kaffeine/HISTORY
index 8674e3d..170a555 100644
--- a/kde5-apps/kaffeine/HISTORY
+++ b/kde5-apps/kaffeine/HISTORY
@@ -1,3 +1,6 @@
+2016-06-30 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.0.4
+
 2016-06-10 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.0.3
        * DEPENDS: remove some kf5 frameworks
diff --git a/qt5/qtdeclarative/BUILD b/qt5/qtdeclarative/BUILD
new file mode 100755
index 0000000..feb86f7
--- /dev/null
+++ b/qt5/qtdeclarative/BUILD
@@ -0,0 +1,2 @@
+CXXFLAGS+=" -fno-delete-null-pointer-checks"
+default_build
diff --git a/qt5/qtdeclarative/HISTORY b/qt5/qtdeclarative/HISTORY
index 7694507..0f06551 100644
--- a/qt5/qtdeclarative/HISTORY
+++ b/qt5/qtdeclarative/HISTORY
@@ -1,3 +1,6 @@
+2016-06-21 Treeve Jelbert <treeve AT sourcemage.org>
+       * BUILD: added, fix gcc-6 problem
+
 2016-06-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.7.0
 
diff --git a/shell-term-fm/mc/DEPENDS b/shell-term-fm/mc/DEPENDS
index 788c1cc..84cf596 100755
--- a/shell-term-fm/mc/DEPENDS
+++ b/shell-term-fm/mc/DEPENDS
@@ -30,4 +30,5 @@ optional_depends gettext \
 
 if is_depends_enabled $SPELL libx11; then
   optional_depends libxevie '' '' 'X11 event support'
-fi
+fi &&
+optional_depends libssh2 '' '' 'vfs_sftp support'
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index 623fb7b..2547f1b 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,6 @@
+2016-06-25 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: add optional libssh2
+
 2016-05-08 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.8.17
 
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index caded36..777bbe0 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -1,7 +1,7 @@
 . "$GRIMOIRE/FUNCTIONS"
            SPELL=wine
 if  [[ $WINE_BRANCH == scm ]];  then
-         VERSION=1.8.3
+         VERSION=1.9
           SOURCE=$SPELL-git.tar.bz2
    SOURCE_URL[0]=git://source.winehq.org/git/wine.git:wine-git
    SOURCE_IGNORE=volatile
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
   FORCE_DOWNLOAD=1
 else
   if [[ $WINE_BRANCH == devel ]]; then
-         VERSION=1.9.12
+         VERSION=1.9.13
   else
          VERSION=1.8.3
   fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 7a9eae7..1780af1 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2016-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.9.13
+
 2016-06-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.8.3 / 1.9.12