New commits:
commit 5282ced069680ead76b15a245f9180ec0c1868bd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xinit: => 1.4.4
commit 02d064341983f816de0b68a20150ed420c3f6c0c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
QT_DEPENDS - use on_of
commit ca6b2f89a5ce07c06831ff7ba8b205469559b794
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
zint: => 2.15.0
commit 94524667625c561455d4561a18c35f67871348af
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
KDE_FUTURE - delete obsolete file
commit 071dad45d0f9697b6e0055f13e87b15721de78ca
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qalculate-qt: => 5.5.1
commit 066af0e8b2951c0e071149737004a90649db9613
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qalculate: => 5.5.2
commit fda9edfc6e51cd0a7baf2fe09b4f4f8375ef837e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
keepassxc: => 2.7.10
commit 68a03be0ad396e43c5ee7aa7b77c7314cb96cba7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qca: => 2.3.10
commit 5fa7d8bfba7fbea00fb48d3abbccc1aeee6fc1a0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
botan: => 3.7.1
diff --git a/ChangeLog b/ChangeLog
index 80d29a2..247b058 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2025-03-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * QT_DEPENDS: use one_of
+
2025-03-08 Pavel Vinogradov <public AT sourcemage.org>
* devel/umockdev: new spell, mocks hardware devices for creating unit
tests
and bug reporting
diff --git a/KDE_FUTURE b/KDE_FUTURE
deleted file mode 100644
index c5c7799..0000000
--- a/KDE_FUTURE
+++ /dev/null
@@ -1,41 +0,0 @@
-2024-09-04 maui/* 4.0.0 added
-
-2024-08-22 kde* 24.08.0
- Plasma 6.1.4
- kde-fw* 6.5.0
- digikam 6.4.0
-
-2024-04-17
-Added LXQt-2.0 stuff, which now depends on qt6.6 and kf6
-
-2024-04-12
-Kde-frameworks 6.1 released
-
-2024-04-02
-qt-6.7 released
-
-2024-03-03
-
-A major update to KDE/Plasma was released at the end of February.
-KDE6 is now based on Qt6, whereas KDE5 was based on Qt5, which is deprecated
and at end of life for non-commercial users.
-
-This update has involved a massive amount of work by many people.
-
-In addition to adapting program code to changes in Qt itself, there as also
been a significant amount of restructuring and code cleanup within KDE code.
-KDE frameworks have been restructured and improved. Some frameworks have
been removed, others merged, and some functions renamed or moved to
-different libraries.
-
-The various parts of KDE (frameworks, plasma, applications) amount to about
350 spells.
-
-There are a few programs which have not yet been adapted to Qt6/KDE6, but
the only major programs which do not yet have Kde6 compatible releases are
Krita and Calligra.
-
-There will probably be new releases of several programs in the next few
weeks.
-
-Most of the missing programs are likely to adapted by the time of the KDE
24.05 release in May.
-
-Because of the major structural changes within KDE, I have made a new set of
spells for KDE6.
-These spells are in a separate repository smgl-kde6 and can be used in
preference to the existing Qt5 based spells.
-
-At the moment I have 310+ spells and have been using them on two systems for
several months.
-
-At some point these spells will replace those in the SMGL grimoire.
diff --git a/QT_DEPENDS b/QT_DEPENDS
index d09d198..8c295bd 100755
--- a/QT_DEPENDS
+++ b/QT_DEPENDS
@@ -1,8 +1,10 @@
source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-if [[ -f /etc/KDE_USE_QT6 ]];then
- depends qt6base
-else
- depends -sub ACCESS qtbase &&
+source $GRIMOIRE/depends_one_of.function &&
+depends_one_of QT_FW\
+ qt6base ' -DBUILD_WITH_QT6=ON' \
+ qtbase '' \
+ 'Qt framework' &&
+if is_depends_enabled $SPELL qtbase;then
depends qtx11extras
fi
diff --git a/crypto/botan/DETAILS b/crypto/botan/DETAILS
index 73d2a31..a28701f 100755
--- a/crypto/botan/DETAILS
+++ b/crypto/botan/DETAILS
@@ -1,5 +1,5 @@
SPELL=botan
- VERSION=3.6.1
+ VERSION=3.7.1
SECURITY_PATCH=2
SOURCE=Botan-$VERSION.tar.xz
SOURCE_URL[0]=https://botan.randombit.net/releases/$SOURCE
diff --git a/crypto/botan/HISTORY b/crypto/botan/HISTORY
index b7b131b..edf8aef 100644
--- a/crypto/botan/HISTORY
+++ b/crypto/botan/HISTORY
@@ -1,3 +1,6 @@
+2025-03-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.7.1
+
2024-10-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.6.1
SECURITY_PATCH++ fix CVE-2024-50382
diff --git a/crypto/keepassxc/DETAILS b/crypto/keepassxc/DETAILS
index 13afd08..667b834 100755
--- a/crypto/keepassxc/DETAILS
+++ b/crypto/keepassxc/DETAILS
@@ -1,9 +1,9 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=keepassxc
- VERSION=2.7.9
+ VERSION=2.7.10
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://github.com/keepassxreboot/${SPELL}/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:5c5e9954be3312efafd2ee850341c71dc984a1973785e24b9d5558a89886fcc9135e32fb7498d59ff3d200865b3427bddef113771daf01502c732c6cecfab8f2
+
SOURCE_HASH=sha512:265edbafdfd2951219fac8f28fe72672be798dbd93242d6b6d528a017adfed2f16f98ad753b6cdff0eca3f4d7158c9de87aa626ff7e66d3bac470595e248e271
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://keepassxc.org/"
LICENSE[0]=GPL
diff --git a/crypto/keepassxc/HISTORY b/crypto/keepassxc/HISTORY
index 6027183..63b617e 100644
--- a/crypto/keepassxc/HISTORY
+++ b/crypto/keepassxc/HISTORY
@@ -1,3 +1,6 @@
+2025-03-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.7.10
+
2024-07-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.7.9