guix_mirror_bot pushed a commit to branch kde-team
in repository guix.
commit a91bf3c79965a71d89f857b6a25932cb6452fbdf
Author: Rodion Goritskov <[email protected]>
AuthorDate: Tue Aug 25 22:09:37 2026 +0200
gnu: calligra: Update to 26.04.3.
Latest releases of Calligra are not available as tar.xz,
but git tags are present.
* gnu/packages/kde-office.scm (calligra): Update to 26.04.3.
[source]: Change method to git-fetch. Drop patch.
* gnu/packages/patches/calligra-qt-6.9.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister patch.
Signed-off-by: Andreas Enge <[email protected]>
---
gnu/local.mk | 1 -
gnu/packages/kde-office.scm | 14 ++++-----
gnu/packages/patches/calligra-qt-6.9.patch | 46 ------------------------------
3 files changed, 7 insertions(+), 54 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 1f146ac030..241fd8fcaf 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1098,7 +1098,6 @@ 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-sip-test.patch \
%D%/packages/patches/camlboot-dynamically-allocate-stack-signal.patch
\
%D%/packages/patches/cartridges-fix-non-parallel-build.patch \
diff --git a/gnu/packages/kde-office.scm b/gnu/packages/kde-office.scm
index bb2a25dabb..38892cc2d2 100644
--- a/gnu/packages/kde-office.scm
+++ b/gnu/packages/kde-office.scm
@@ -64,15 +64,15 @@
(define-public calligra
(package
(name "calligra")
- (version "4.0.1")
+ (version "26.04.3")
(source (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/calligra/"
- "calligra-" version ".tar.xz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://invent.kde.org/office/calligra.git";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "0pyri2ypzva4b4rnl2p3xp0ph5xcn181msj86l5xq6sg7zkza0fl"))
- (patches (search-patches "calligra-qt-6.9.patch"))))
+ (base32
"1b9yyrq307y129aaa6k4myi8xwz0pd7kzhvn2svgjcswm945w1i6"))))
(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
deleted file mode 100644
index 04b17cddf2..0000000000
--- a/gnu/packages/patches/calligra-qt-6.9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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()
