Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 qt5-qmake/dooble/BUILD     |   12 ++++++++++--
 qt5-qmake/dooble/DEPENDS   |   12 ++++++++++--
 qt5-qmake/dooble/DETAILS   |    4 ++--
 qt5-qmake/dooble/HISTORY   |    4 ++++
 qt5-qmake/dooble/INSTALL   |    2 +-
 qt5-qmake/dooble/PRE_BUILD |    9 +--------
 6 files changed, 28 insertions(+), 15 deletions(-)

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

    dooble  - qt6 support

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

    dooble: => 2023.04.01

diff --git a/qt5-qmake/dooble/BUILD b/qt5-qmake/dooble/BUILD
index 19612e6..5dc2acd 100755
--- a/qt5-qmake/dooble/BUILD
+++ b/qt5-qmake/dooble/BUILD
@@ -1,2 +1,10 @@
-cd $SOURCE_DIRECTORY/2.x &&
-default_build
+cd $SOURCE_DIRECTORY &&
+if is_depends_enabled qt6base;then
+  export PATH="$QT6DIR/bin:$PATH"
+  export PKG_CONFIG_PATH="$QT6DIR/lib/pkgconfig" 
+  export QT_MAJOR_VERSION=6
+  qt6_build
+else
+  export QT_MAJOR_VERSION=5
+  qt5_build  
+fi
diff --git a/qt5-qmake/dooble/DEPENDS b/qt5-qmake/dooble/DEPENDS
index 7e689ee..57d56ad 100755
--- a/qt5-qmake/dooble/DEPENDS
+++ b/qt5-qmake/dooble/DEPENDS
@@ -1,3 +1,11 @@
-source $GRIMOIRE/QT5_DEPENDS &&
-depends qtwebengine &&
+source $GRIMOIRE/QT_DEPENDS &&
+if is_depends_enabled $SPELL qt6base;then
+  depends qt6declarative &&
+  depends qt6webengine   &&
+  optional_depends qt6charts '' '' 'Charts support'
+else
+  depends qtdeclarative &&
+  depends qtwebengine   &&
+  optional_depends qtcharts '' '' 'Charts support'
+fi &&
 depends libgcrypt
diff --git a/qt5-qmake/dooble/DETAILS b/qt5-qmake/dooble/DETAILS
index 12a2bb0..9235015 100755
--- a/qt5-qmake/dooble/DETAILS
+++ b/qt5-qmake/dooble/DETAILS
@@ -1,9 +1,9 @@
            SPELL=dooble
-         VERSION=2021.02.20
+         VERSION=2023.04.01
               VX=${VERSION/+/-}
               VX=${VX/v1/1}
           SOURCE=$SPELL-$VERSION.tar.gz
-     
SOURCE_HASH=sha512:48fa6bc498a362023867c9c45e03b884b344eb52412944439791d9aafb70a27a901c6eef6e0b6ddbeb765a9366e7eab75b08b6df893d33e096aab3224c5d78ac
+     
SOURCE_HASH=sha512:c2b384834c04d9273dec4fc8ca1416b3723b8ee96388bdbbac7cbbd997d516b719964d46a88649a299c9092d4a6e7715a673bd6ec0f0bc738c5676b0c8f3f347
       
SOURCE_URL=https://github.com/textbrowser/dooble/archive/$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VX
         WEB_SITE=https://textbrowser.github.io/dooble/
diff --git a/qt5-qmake/dooble/HISTORY b/qt5-qmake/dooble/HISTORY
index 2ae92b0..974152b 100644
--- a/qt5-qmake/dooble/HISTORY
+++ b/qt5-qmake/dooble/HISTORY
@@ -1,3 +1,7 @@
+2023-04-02 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2023.04.01
+       * *: add qt6 support
+
 2021-05-29 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2021.02.20
          new WEB_SITE
diff --git a/qt5-qmake/dooble/INSTALL b/qt5-qmake/dooble/INSTALL
index 56de96d..311933d 100755
--- a/qt5-qmake/dooble/INSTALL
+++ b/qt5-qmake/dooble/INSTALL
@@ -1,4 +1,4 @@
-cd $SOURCE_DIRECTORY/2.x &&
+cd $SOURCE_DIRECTORY &&
 DEST=$INSTALL_ROOT/bin   &&
 mkdir -p $DEST &&
 cp Dooble $DEST
diff --git a/qt5-qmake/dooble/PRE_BUILD b/qt5-qmake/dooble/PRE_BUILD
index 81e168d..6655357 100755
--- a/qt5-qmake/dooble/PRE_BUILD
+++ b/qt5-qmake/dooble/PRE_BUILD
@@ -1,12 +1,5 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
-rm -r 1.x  &&
-cd  2.x &&
 rm -r Windows &&
-rm dooble.webkit.pro &&
-#rm dooble.{osx,win,freebsd.clang}.qt5.pro &&
-#rm -r Include.win32 Libraries.win32  &&
-sed -i "s|/usr/local|$QT5DIR|g" dooble.pro dooble.sh \
-       dooble.desktop
-#libSpotOn/Makefile.linux \
+sed -i "s|/usr/local/Cellar/qt/6.4.2_2|$QT6DIR|g" dooble.pro dooble.sh