Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (715057e81746598d39c53aad58256e4aec407932)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (715057e81746598d39c53aad58256e4aec407932)
  • Date: Mon, 22 Sep 2025 08:21:38 +0000

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

database/libfq/BUILD | 1
database/libfq/DETAILS | 4 +--
database/libfq/HISTORY | 5 ++++
database/libfq/PRE_BUILD | 3 ++
database/libfq/patches/c23.diff | 41
++++++++++++++++++++++++++++++++++++++++
kde-extra/ktextaddons/DEPENDS | 3 ++
kde-extra/ktextaddons/DETAILS | 2 -
kde-extra/ktextaddons/HISTORY | 4 +++
kde-gear/calligra/DEPENDS | 1
kde-gear/calligra/HISTORY | 3 ++
qt6/qt6base/FINAL | 7 ++++++
qt6/qt6base/HISTORY | 3 ++
wm-addons/wlroots/DETAILS | 2 -
wm-addons/wlroots/HISTORY | 3 ++
14 files changed, 77 insertions(+), 5 deletions(-)

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

wlroots: => 0.19.1

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

libfq: => 0.6.1

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

ktextaddons: => 1.7.1

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

calligra - tweak depends

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

qt6base - prepare for qt6.10 changes

diff --git a/database/libfq/BUILD b/database/libfq/BUILD
index 4154405..9178f1f 100755
--- a/database/libfq/BUILD
+++ b/database/libfq/BUILD
@@ -1,5 +1,6 @@
cd $SOURCE_DIRECTORY &&
FB=$(get_spell_provider $SPELL FIREBIRD) &&
+OPTS+=' --disable-static' &&
CPPFLAGS+=" -I/opt/$FB/include" &&
LDFLAGS+=" -L/opt/$FB/lib" &&
LDFLAGS+=' -lfbclient' &&
diff --git a/database/libfq/DETAILS b/database/libfq/DETAILS
index 2b56c61..b17f3f9 100755
--- a/database/libfq/DETAILS
+++ b/database/libfq/DETAILS
@@ -1,6 +1,6 @@
SPELL=libfq
- VERSION=0.4.3
-
SOURCE_HASH=sha512:d99de7ca6e3836e7be9ab27d30d7c9155d532bcf5a74da532c7433b301c30a716af6d30713a50db7df2c170fd45bc30071161fac3c63ec3fb173a4337013709b
+ VERSION=0.6.1
+
SOURCE_HASH=sha512:4ffb4d8339c308bafbc319d07cc4aea5b66e96a0053d64948e2aa025344b8f080a1040eed191a910af9ba0b4ce9dd08810c0c0bd0346b623f8adac32f587e5e6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/ibarwick/libfq
diff --git a/database/libfq/HISTORY b/database/libfq/HISTORY
index f972ff2..ad25f6b 100644
--- a/database/libfq/HISTORY
+++ b/database/libfq/HISTORY
@@ -1,3 +1,8 @@
+2025-09-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.1
+ * PRE_BUILD c23.diff: add upstream patch for c23
+ * BUILD: disable static
+
2022-08-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.3
* BUILD: find firebird install
diff --git a/database/libfq/PRE_BUILD b/database/libfq/PRE_BUILD
new file mode 100755
index 0000000..4604ffc
--- /dev/null
+++ b/database/libfq/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/database/libfq/patches/c23.diff b/database/libfq/patches/c23.diff
new file mode 100644
index 0000000..71c9f05
--- /dev/null
+++ b/database/libfq/patches/c23.diff
@@ -0,0 +1,41 @@
+diff --git a/include/libfq.h b/include/libfq.h
+index 7e37e99..31a39ed 100644
+--- a/include/libfq.h
++++ b/include/libfq.h
+@@ -2,35 +2,12 @@
+ #define LIBFQ_H
+
+ #include <stdlib.h>
++#include <stdbool.h>
+ #include <ibase.h>
+
+ #ifndef C_H
+ #define C_H
+
+-
+-#ifndef BOOL
+-#define BOOL
+-typedef char bool;
+-
+-
+-#ifndef true
+-#define true ((bool) 1)
+-#endif
+-
+-#ifndef false
+-#define false ((bool) 0)
+-#endif
+-
+-typedef bool *BoolPtr;
+-
+-#ifndef TRUE
+-#define TRUE 1
+-#endif
+-
+-#ifndef FALSE
+-#define FALSE 0
+-#endif
+-#endif
+ /*
+ * lengthof
+ * Number of elements in an array.
diff --git a/kde-extra/ktextaddons/DEPENDS b/kde-extra/ktextaddons/DEPENDS
index 7dc5f05..5a9bd75 100755
--- a/kde-extra/ktextaddons/DEPENDS
+++ b/kde-extra/ktextaddons/DEPENDS
@@ -1,9 +1,12 @@
source $GRIMOIRE/KDE_DEPENDS &&
vdepends <<! &&
karchive
+ kcolorscheme
kconfigwidgets
kcoreaddons
ki18n
+ kitemviews
+ ktextwidgets
kwidgetsaddons
sonnet
syntax-highlighting
diff --git a/kde-extra/ktextaddons/DETAILS b/kde-extra/ktextaddons/DETAILS
index 1e35c1a..aed69ac 100755
--- a/kde-extra/ktextaddons/DETAILS
+++ b/kde-extra/ktextaddons/DETAILS
@@ -1,5 +1,5 @@
SPELL=ktextaddons
- VERSION=1.7.0
+ VERSION=1.7.1
source $GRIMOIRE/KDE_EXTRA
ENTERED=20230111
# SECURITY_PATCH=1
diff --git a/kde-extra/ktextaddons/HISTORY b/kde-extra/ktextaddons/HISTORY
index 72935e2..873a2e3 100644
--- a/kde-extra/ktextaddons/HISTORY
+++ b/kde-extra/ktextaddons/HISTORY
@@ -1,3 +1,7 @@
+2025-09-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.1
+ * DEPENDS: add more frameworks
+
2025-07-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.0

diff --git a/kde-gear/calligra/DEPENDS b/kde-gear/calligra/DEPENDS
index d2995ce..c824de5 100755
--- a/kde-gear/calligra/DEPENDS
+++ b/kde-gear/calligra/DEPENDS
@@ -9,7 +9,6 @@ vdepends <<! &&
boost
sqlite
shared-mime-info
- plasma-activities
karchive
kcodecs
kcompletion
diff --git a/kde-gear/calligra/HISTORY b/kde-gear/calligra/HISTORY
index 4504f31..d604617 100644
--- a/kde-gear/calligra/HISTORY
+++ b/kde-gear/calligra/HISTORY
@@ -1,3 +1,6 @@
+2025-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: delete plasma-activities
+
2024-09-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.1

diff --git a/qt6/qt6base/FINAL b/qt6/qt6base/FINAL
index 0574cda..07dcb7a 100755
--- a/qt6/qt6base/FINAL
+++ b/qt6/qt6base/FINAL
@@ -2,4 +2,11 @@ if ! grep -q qt6 "${INSTALL_ROOT}/etc/ld.so.conf";then
message "${MESSAGE_COLOR}Adding qt6 lib directory to
ld.so.conf$DEFAULT_COLOR"
echo "${INSTALL_ROOT}/opt/qt6/lib" >> "${INSTALL_ROOT}/etc/ld.so.conf"
ldconfig
+fi &&
+# qt-6.10 moves some wayland files
+if spell_ok qt6wayland;then
+ QTW=`installed_version qt6wayland`
+ if [[ ${VERSION%.*} != ${QTW%.*} ]];then
+ cleanse --nofix_quick qt6wayland
+ fi
fi
diff --git a/qt6/qt6base/HISTORY b/qt6/qt6base/HISTORY
index 4bf14ce..f1475ec 100644
--- a/qt6/qt6base/HISTORY
+++ b/qt6/qt6base/HISTORY
@@ -1,3 +1,6 @@
+2025-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * FINAL: check for qtwayland changes in qt-6.10
+
2025-08-26 Treeve Jelbert <treeve AT sourcemage.org>
* CVE-2025-5992-qtbase-6.9.patch: deleted

diff --git a/wm-addons/wlroots/DETAILS b/wm-addons/wlroots/DETAILS
index 04d8328..a91c6a8 100755
--- a/wm-addons/wlroots/DETAILS
+++ b/wm-addons/wlroots/DETAILS
@@ -18,7 +18,7 @@ case "${WLROOTS_BRANCH}" in

SOURCE_URL[0]="https://gitlab.freedesktop.org/${SPELL}/${SPELL}/-/archive/${WLROOTS_COMMIT}/${SOURCE}.tar.gz";
;;
(*)
- VERSION=0.19.0
+ VERSION=0.19.1
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$VERSION/downloads/$SOURCE";
SOURCE2=$SOURCE.sig
diff --git a/wm-addons/wlroots/HISTORY b/wm-addons/wlroots/HISTORY
index cca0c60..f076253 100644
--- a/wm-addons/wlroots/HISTORY
+++ b/wm-addons/wlroots/HISTORY
@@ -1,3 +1,6 @@
+2025-09-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.19.1
+
2025-08-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.19.0



  • [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (715057e81746598d39c53aad58256e4aec407932), Treeve Jelbert, 09/22/2025

Archive powered by MHonArc 2.6.24.

Top of Page