sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (efb88acc50828570dc482617115d16626688ece0)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (efb88acc50828570dc482617115d16626688ece0)
- Date: Wed, 26 Apr 2023 09:33:49 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
ChangeLog | 3
devel/qbs/BUILD | 4
devel/qbs/CONFIGURE | 1
devel/qbs/DEPENDS | 7 -
devel/qbs/DETAILS | 5 -
devel/qbs/HISTORY | 6 +
devel/qbs/INSTALL | 2
devel/qbs/PRE_BUILD | 5 -
kde-gear/kalzium/DEPENDS | 23 +++--
kde-gear/kalzium/HISTORY | 3
kde5-extra/kblog/CONFIGURE | 1
kde5-extra/kblog/DEPENDS | 6 -
kde5-extra/kblog/DETAILS | 18 ----
kde5-extra/kblog/HISTORY | 192
---------------------------------------------
kde5-pim/kmail/DEPENDS | 4
kde5-pim/kmail/HISTORY | 3
16 files changed, 40 insertions(+), 243 deletions(-)
New commits:
commit efb88acc50828570dc482617115d16626688ece0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kalzium - qt6 support
commit 8330607f91d12b19d2b6dd9bdb74e7a9a2d193db
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qbs - cmake build, qt6 support
commit 9ece088a90bae08e0982b06fd695f50db3b86344
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qbs: => 2.0.0
commit 4e615ffa2ac401153b44650cb0cbda63d104ce0f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
deprecate kde5-extra/kblog
commit 6771f7f72b5641c679e153a267973577d7541242
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kmail - tweak depends
diff --git a/ChangeLog b/ChangeLog
index 7309d0b..6171a09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2023-04-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde5-extra/kblog: spell deprecated
+
2023-04-23 Conner Clere <xenanthropy AT sourcemage.org>
* utils/corectrl: new spell, profile-based system control utility
diff --git a/devel/qbs/BUILD b/devel/qbs/BUILD
deleted file mode 100755
index caee442..0000000
--- a/devel/qbs/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-# do not use qt5_build
-cd $SOURCE_DIRECTORY &&
-$QT5DIR/bin/qmake -recursive qbs.pro &&
-make
diff --git a/devel/qbs/CONFIGURE b/devel/qbs/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/devel/qbs/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/devel/qbs/DEPENDS b/devel/qbs/DEPENDS
index fb9f7cb..6409c10 100755
--- a/devel/qbs/DEPENDS
+++ b/devel/qbs/DEPENDS
@@ -1,3 +1,4 @@
-depends -sub CXX gcc &&
-depends qtbase &&
-depends qtscript
+source $GRIMOIRE/QT_DEPENDS &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt5compat
+fi
diff --git a/devel/qbs/DETAILS b/devel/qbs/DETAILS
index d9bbe21..24c35cb 100755
--- a/devel/qbs/DETAILS
+++ b/devel/qbs/DETAILS
@@ -1,7 +1,8 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
QT_URL=https://download.qt.io/official_releases/
SPELL=qbs
- VERSION=1.19.0
-
SOURCE_HASH=sha512:a7713823da32537edc47fa0c7f6ec56f9d72ddf620a60f313d8a504c899b1a10ead21a385aa06a1f2672bbda3464953a8653c6c1fe61e1d34b227495fa432c8c
+ VERSION=2.0.0
+
SOURCE_HASH=sha512:dcf2115ce45ff6baed41e9d78bb9f9fab9436ae09e336518b501378f95827777b18ca33d71ee5fe634792a8a47208ea527ef78f1b5992b47b0d7a4090ad04554
SOURCE=qbs-src-$VERSION.tar.gz
SOURCE_URL=$QT_URL/qbs/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qbs-src-$VERSION
diff --git a/devel/qbs/HISTORY b/devel/qbs/HISTORY
index a5ace86..93433f3 100644
--- a/devel/qbs/HISTORY
+++ b/devel/qbs/HISTORY
@@ -1,3 +1,9 @@
+2023-04-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.0
+ * BUILD INSTALL PRE_BUILD: deleted
+ * *: use cmake build
+ * add qt6 support
+
2021-05-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.19.0
diff --git a/devel/qbs/INSTALL b/devel/qbs/INSTALL
deleted file mode 100755
index 7bf0a56..0000000
--- a/devel/qbs/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-cd $SOURCE_DIRECTORY &&
-make install INSTALL_ROOT=$QT5DIR
diff --git a/devel/qbs/PRE_BUILD b/devel/qbs/PRE_BUILD
deleted file mode 100755
index 3777eb6..0000000
--- a/devel/qbs/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-sed -i 's|/usr/local||' share/qbs/imports/qbs/Probes/FrameworkProbe.qbs \
- doc/qbs.qdoc src/install_prefix.pri
diff --git a/kde-gear/kalzium/DEPENDS b/kde-gear/kalzium/DEPENDS
index d2b34b3..35f584b 100755
--- a/kde-gear/kalzium/DEPENDS
+++ b/kde-gear/kalzium/DEPENDS
@@ -1,7 +1,19 @@
source $GRIMOIRE/KDE_DEPENDS &&
-depends qtdeclarative &&
-depends qtscript &&
-depends qtsvg &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt5compat &&
+ depends qt6declarative &&
+ depends qt6scxml &&
+ depends qt6svg
+else
+ depends qtdeclarative &&
+ depends qtscript &&
+ depends qtsvg
+ optional_depends avogadrolibs '' '' 'build molecular editor' &&
+ if is_depends_enabled $SPELL avogadrolibs;then
+ depends openbabel &&
+ depends eigen3
+ fi
+fi &&
depends karchive &&
depends kconfig &&
depends kcoreaddons &&
@@ -17,9 +29,4 @@ optional_depends facile '' '' 'OCaml scriptingsupport' &&
if is_depends_enabled $SPELL facile;then
depends ocaml
fi &&
-optional_depends avogadrolibs '' '' 'build molecular editor' &&
-if is_depends_enabled $SPELL avogadrolibs;then
- depends openbabel &&
- depends eigen3
-fi &&
optional_depends chemical-mime-data '' '' ''
diff --git a/kde-gear/kalzium/HISTORY b/kde-gear/kalzium/HISTORY
index 720d0de..1207960 100644
--- a/kde-gear/kalzium/HISTORY
+++ b/kde-gear/kalzium/HISTORY
@@ -1,3 +1,6 @@
+2023-04-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add qt6 support
+
2023-01-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 22.12.1
diff --git a/kde5-extra/kblog/CONFIGURE b/kde5-extra/kblog/CONFIGURE
deleted file mode 100755
index b2f02c3..0000000
--- a/kde5-extra/kblog/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/kde5-extra/kblog/DEPENDS b/kde5-extra/kblog/DEPENDS
deleted file mode 100755
index df339ee..0000000
--- a/kde5-extra/kblog/DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-source $GRIMOIRE/KDE_DEPENDS &&
-depends kcoreaddons &&
-depends kio &&
-depends kcalendarcore &&
-depends syndication &&
-depends kxmlrpcclient
diff --git a/kde5-extra/kblog/DETAILS b/kde5-extra/kblog/DETAILS
deleted file mode 100755
index 6ffdcc4..0000000
--- a/kde5-extra/kblog/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
- SPELL=kblog
- VERSION=20.04.3
- SOURCE=$SPELL-$VERSION.tar.xz
-
SOURCE_URL=https://download.kde.org/stable/release-service/${VERSION}/src/$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://community.kde.org/KDE_PIM
- ENTERED=20140329
-# SECURITY_PATCH=1
- LICENSE[0]=LGPL
- KEYWORDS="kde5"
- SHORT="C++ API for weblogging access"
-cat << EOF
-C++ API for weblogging access
-EOF
diff --git a/kde5-extra/kblog/HISTORY b/kde5-extra/kblog/HISTORY
deleted file mode 100644
index ccca45d..0000000
--- a/kde5-extra/kblog/HISTORY
+++ /dev/null
@@ -1,192 +0,0 @@
-2020-07-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 20.04.3
-
-2020-06-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 20.04.2
-
-2020-05-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 20.04.1
-
-2020-04-23 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 20.04.0
-
-2020-03-05 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.12.3
-
-2020-02-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.12.2
-
-2020-01-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.12.1
-
-2019-12-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.12.0
-
-2019-11-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.08.3
-
-2019-10-13 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: tweak
-
-2019-10-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.08.2
-
-2019-09-05 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.08.1
-
-2019-08-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.08.0
-
-2019-07-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.04.3
-
-2019-06-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.04.2
-
-2019-05-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.04.1
-
-2019-04-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 19.04.0
-
-2019-03-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.12.3
-
-2019-02-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.12.2
-
-2019-01-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.12.1
-
-2018-12-13 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.12.0
-
-2018-11-08 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.08.3
-
-2018-10-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.08.2
-
-2018-09-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.08.1
-
-2018-08-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.08.0
-
-2018-07-13 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.04.3
-
-2018-06-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.04.2
-
-2018-05-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.04.1
-
-2018-04-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 18.04.0
-
-2018-03-08 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.12.3
-
-2018-02-08 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.12.2
-
-2018-01-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.12.1
-
-2017-12-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.12.0
-
-2017-11-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.08.3
-
-2017-10-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.08.2
-
-2017-09-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.08.1
-
-2017-08-17 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.08.0
-
-2017-07-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.04.3
-
-2017-06-21 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.04.2
-
-2017-05-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.04.1
-
-2017-04-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 17.04.0
-
-2017-03-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 16.12.3
-
-2017-02-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 16.12.2
-
-2017-01-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 16.12.1
-
-2016-12-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 16.12.0
-
- * DETAILS: add gpg checking
-
-2016-10-13 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 16.08.2
-
-2016-09-08 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 16.08.1
-
-2016-08-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 16.08.0
-
-2016-07-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 16.04.3
-
-2016-06-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 16.04.2
-
-2016-05-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 16.04.1
-
-2016-04-23 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: update website
-
-2016-04-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 16.04.0
-
-2016-04-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: tweak
-
-2016-03-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 15.12.3
-
-2016-02-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 15.12.2
-
-2016-01-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 15.12.1
-
-2015-12-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 15.12.0
-
-2015-10-13 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 15.08.2
-
-2015-09-17 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 15.08.1
-
-2015-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 15.08.0
-
-2015-07-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 15.07.80
-
-2014-03-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version frameworks
- spell created, was part of kdepimlibs
-
diff --git a/kde5-pim/kmail/DEPENDS b/kde5-pim/kmail/DEPENDS
index 4b4c689..8873a1d 100755
--- a/kde5-pim/kmail/DEPENDS
+++ b/kde5-pim/kmail/DEPENDS
@@ -12,7 +12,7 @@ depends karchive &&
depends kdnssd &&
depends kbookmarks &&
depends kcmutils &&
-depends kcodecs
+depends kcodecs &&
depends kcompletion &&
depends kconfig &&
depends kconfigwidgets &&
@@ -29,7 +29,6 @@ depends kservice &&
depends ktextwidgets &&
depends kwallet &&
depends kxmlgui &&
-depends kxmlrpcclient &&
depends sonnet &&
depends syntax-highlighting &&
@@ -60,6 +59,7 @@ depends messagelib &&
depends pimcommon &&
depends gpgme &&
+depends ktextaddons &&
depends phonon &&
runtime_depends kdepim-runtime &&
suggest_depends kmail-account-wizard '' '' 'setup email accounts' &&
diff --git a/kde5-pim/kmail/HISTORY b/kde5-pim/kmail/HISTORY
index 9d27766..20cb466 100644
--- a/kde5-pim/kmail/HISTORY
+++ b/kde5-pim/kmail/HISTORY
@@ -1,3 +1,6 @@
+2023-04-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add ktextaddons; delete kxmlrpcclient
+
2023-01-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: tweak
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (efb88acc50828570dc482617115d16626688ece0), Treeve Jelbert, 04/26/2023
Archive powered by MHonArc 2.6.24.