This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new ea4a3af739 gnu: calligra: Fix build.
ea4a3af739 is described below
commit ea4a3af73940e3fd578326510eccb2d5747352b4
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Mon Sep 15 23:43:32 2025 +0900
gnu: calligra: Fix build.
* gnu/packages/patches/calligra-qt-6.9.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/kde-office.scm (calligra) [source]: Apply it.
Change-Id: Iab4c1ccc3bd20f54d952564f1b6ba21934d42fc9
---
gnu/local.mk | 1 +
gnu/packages/kde-office.scm | 4 ++-
gnu/packages/patches/calligra-qt-6.9.patch | 46 ++++++++++++++++++++++++++++++
3 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index ced2d3a68e..1128a95466 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1072,6 +1072,7 @@ dist_patch_DATA =
\
%D%/packages/patches/calibre-remove-test-sqlite.patch \
%D%/packages/patches/calibre-remove-test-unrar.patch \
%D%/packages/patches/calibre-remove-test-import-modules.patch \
+ %D%/packages/patches/calligra-qt-6.9.patch \
%D%/packages/patches/calls-disable-application-test.patch \
%D%/packages/patches/calls-disable-sip-test.patch \
%D%/packages/patches/camlboot-dynamically-allocate-stack-signal.patch
\
diff --git a/gnu/packages/kde-office.scm b/gnu/packages/kde-office.scm
index dc3241d7ec..59ef0a8ace 100644
--- a/gnu/packages/kde-office.scm
+++ b/gnu/packages/kde-office.scm
@@ -24,6 +24,7 @@
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages boost)
#:use-module (gnu packages cdrom)
@@ -62,7 +63,8 @@
"calligra-" version ".tar.xz"))
(sha256
(base32
- "0pyri2ypzva4b4rnl2p3xp0ph5xcn181msj86l5xq6sg7zkza0fl"))))
+ "0pyri2ypzva4b4rnl2p3xp0ph5xcn181msj86l5xq6sg7zkza0fl"))
+ (patches (search-patches "calligra-qt-6.9.patch"))))
(build-system qt-build-system)
(arguments
(list #:qtbase qtbase
diff --git a/gnu/packages/patches/calligra-qt-6.9.patch
b/gnu/packages/patches/calligra-qt-6.9.patch
new file mode 100644
index 0000000000..04b17cddf2
--- /dev/null
+++ b/gnu/packages/patches/calligra-qt-6.9.patch
@@ -0,0 +1,46 @@
+From 659c88eec87160d908faf9b78b7b1006eb7e5bf3 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <[email protected]>
+Date: Fri, 10 Jan 2025 15:44:09 +0100
+Subject: [PATCH] Fix build with Qt 6.9
+
+Converting Qt::Key to QChar doesn't work any more
+---
+ libs/basicflakes/tools/KoCreatePathTool.cpp | 2 +-
+ plugins/textshape/TextTool.cpp | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libs/basicflakes/tools/KoCreatePathTool.cpp
b/libs/basicflakes/tools/KoCreatePathTool.cpp
+index 699f3b0e772..6cb7f11b4a4 100644
+--- a/libs/basicflakes/tools/KoCreatePathTool.cpp
++++ b/libs/basicflakes/tools/KoCreatePathTool.cpp
+@@ -444,7 +444,7 @@ QList<QPointer<QWidget>>
KoCreatePathTool::createOptionWidgets()
+ angleEdit->setValue(d->angleSnappingDelta);
+ angleEdit->setRange(1, 360);
+ angleEdit->setSingleStep(1);
+- angleEdit->setSuffix(QChar(Qt::Key_degree));
++ angleEdit->setSuffix(QStringLiteral("°"));
+ layout->addWidget(angleEdit, 0, 1);
+ layout->addWidget(new QLabel(i18n("Activate angle snap:"), angleWidget),
1, 0);
+ QCheckBox *angleSnap = new QCheckBox(angleWidget);
+diff --git a/plugins/textshape/TextTool.cpp b/plugins/textshape/TextTool.cpp
+index 79e88353408..bb82e7b90c5 100644
+--- a/plugins/textshape/TextTool.cpp
++++ b/plugins/textshape/TextTool.cpp
+@@ -2360,7 +2360,7 @@ void TextTool::nonbreakingSpace()
+ {
+ if (!m_allowActions || !m_textEditor.data())
+ return;
+- m_textEditor.data()->insertText(QString(QChar(Qt::Key_nobreakspace)));
++ m_textEditor.data()->insertText(QString(QChar(QChar::Nbsp)));
+ }
+
+ void TextTool::nonbreakingHyphen()
+@@ -2374,7 +2374,7 @@ void TextTool::softHyphen()
+ {
+ if (!m_allowActions || !m_textEditor.data())
+ return;
+- m_textEditor.data()->insertText(QString(QChar(Qt::Key_hyphen)));
++ m_textEditor.data()->insertText(QString(QChar(QChar::SoftHyphen)));
+ }
+
+ void TextTool::lineBreak()
