Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 kde5-apps/digikam/BUILD        |    5 +----
 kde5-apps/digikam/CONFIGURE    |    1 -
 kde5-apps/digikam/DEPENDS      |   17 +++++++++++++++--
 kde5-apps/digikam/DETAILS      |    9 ++++++---
 kde5-apps/digikam/HISTORY      |    8 ++++++++
 kde5-apps/kipi-plugins/DETAILS |    7 +++++--
 kde5-apps/kipi-plugins/HISTORY |    4 ++++
 7 files changed, 39 insertions(+), 12 deletions(-)

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

    kipi-plugins: => 6.0.0

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

    digikam: => 6.0.0

diff --git a/kde5-apps/digikam/BUILD b/kde5-apps/digikam/BUILD
index d49e523..3291cbf 100755
--- a/kde5-apps/digikam/BUILD
+++ b/kde5-apps/digikam/BUILD
@@ -1,6 +1,3 @@
-OPTS+=" -DDIGIKAMSC_COMPILE_PO=0 -DDIGIKAMSC_COMPILE_DOC=0 
-DDIGIKAMSC_COMPILE_KIPIPLUGINS=0" &&
+OPTS+=" -DDIGIKAMSC_COMPILE_PO=0 -DDIGIKAMSC_COMPILE_DOC=0" &&
 OPTS+=" -DENABLE_INTERNALMYSQL=OFF" &&
-if is_depends_enabled $SPELL opencv3;then
-  OPTS+=" -DENABLE_OPENCV3=1"
-fi &&
 default_build
diff --git a/kde5-apps/digikam/CONFIGURE b/kde5-apps/digikam/CONFIGURE
index 406e0bf..b2f02c3 100755
--- a/kde5-apps/digikam/CONFIGURE
+++ b/kde5-apps/digikam/CONFIGURE
@@ -1,2 +1 @@
 source $GRIMOIRE/CMAKE_CONFIGURE
-CMAKE_GEN=Make
diff --git a/kde5-apps/digikam/DEPENDS b/kde5-apps/digikam/DEPENDS
index 4ba6737..400761d 100755
--- a/kde5-apps/digikam/DEPENDS
+++ b/kde5-apps/digikam/DEPENDS
@@ -1,6 +1,10 @@
 source  "$GRIMOIRE/KDE5_DEPENDS"  &&
-depends qtwebkit   &&
+optional_depends qtwebengine ' -DENABLE_QWEBENGINE=1' '' 'support 
QtWebEngine'
+if ! is_depends_enabled $SPELL qtwebengine;then
+  depends qtwebkit
+fi &&
 depends qtx11extras &&
+depends qtxmlpatterns &&
 depends kcompletion &&
 depends kcoreaddons &&
 depends ki18n     &&
@@ -13,6 +17,7 @@ depends ktextwidgets   &&
 depends kwindowsystem  &&
 depends kxmlgui   &&
 depends solid     &&
+depends threadweaver &&
 depends JPEG      &&
 depends boost     &&
 depends exiv2     &&
@@ -20,7 +25,10 @@ depends lcms2     &&
 depends libpgf    &&
 depends libpng    &&
 depends libx11    &&
-depends -sub FACE OPENCV    &&
+depends libxml2   &&
+depends libxslt   &&
+depends -sub FACE opencv3  &&
+depends OPENGL    &&
 depends pkgconfig &&
 depends sqlite    &&
 depends tiff      &&
@@ -52,4 +60,9 @@ fi &&
 optional_depends  MYSQL      '' '' 'MySql database' &&
 optional_depends  liblqr     '' '' 'image resizing (thumbnails)' &&
 optional_depends qtav        '-DENABLE_MEDIAPLAYER=1' 
'-DENABLE_MEDIAPLAYER=0' 'enable multimedia support' &&
+if is_depends_enabled $SPELL qtav;then
+  depends LIBAVCODEC
+else
+  optional_depends LIBAVCODEC '' '' 'video support'
+fi &&
 suggest_depends  kipi-plugins '' '' 'manipulate/upload images'
diff --git a/kde5-apps/digikam/DETAILS b/kde5-apps/digikam/DETAILS
index beebf0a..69efb44 100755
--- a/kde5-apps/digikam/DETAILS
+++ b/kde5-apps/digikam/DETAILS
@@ -1,8 +1,11 @@
            SPELL=digikam
-         VERSION=5.9.0
-     
SOURCE_HASH=sha512:f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
+         VERSION=6.0.0
           SOURCE=$SPELL-$VERSION.tar.xz
-      SOURCE_URL=https://download.kde.org/stable/$SPELL/$SOURCE
+      SOURCE_URL=https://download.kde.org/unstable/$SPELL/$SOURCE
+         SOURCE2=$SOURCE.sig
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+      SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 
         WEB_SITE=https://digikam.org
diff --git a/kde5-apps/digikam/HISTORY b/kde5-apps/digikam/HISTORY
index d73683f..3663927 100644
--- a/kde5-apps/digikam/HISTORY
+++ b/kde5-apps/digikam/HISTORY
@@ -1,3 +1,11 @@
+2019-02-19 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 6.0.0
+       * DETAILS: add gpg checking
+       * DEPENDS: qtwebengine or qtwebkit, threadweaver, opencv3, LIBAVCODEC
+         various tweaks
+       * BUILD: remove older opencv
+       * CONFIGURE: do not force make usage
+
 2018-03-25 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.9.0
 
diff --git a/kde5-apps/kipi-plugins/DETAILS b/kde5-apps/kipi-plugins/DETAILS
index bd1d42f..adea7cd 100755
--- a/kde5-apps/kipi-plugins/DETAILS
+++ b/kde5-apps/kipi-plugins/DETAILS
@@ -1,9 +1,12 @@
            SPELL=kipi-plugins
           SPELLX=digikam
-         VERSION=5.9.0
-     
SOURCE_HASH=sha512:f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
+         VERSION=6.0.0
           SOURCE=$SPELLX-$VERSION.tar.xz
       SOURCE_URL=https://download.kde.org/stable/$SPELLX/$SOURCE
+         SOURCE2=$SOURCE.sig
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+      SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
 
         WEB_SITE=https://extragear.kde.org/apps/kipi
diff --git a/kde5-apps/kipi-plugins/HISTORY b/kde5-apps/kipi-plugins/HISTORY
index 06b27fe..811ada7 100644
--- a/kde5-apps/kipi-plugins/HISTORY
+++ b/kde5-apps/kipi-plugins/HISTORY
@@ -1,3 +1,7 @@
+2019-02-19 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 6.0.0
+       * DETAILS: add gpg checking
+
 2018-03-25 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.9.0