Publish baldeagleos-repo candidate 0000000325-20260922-184323

3 files changed, 4 insertions, 91 deletions

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 1f6ad23bb4f0..ff5564d37253 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1,2 @@
-DIST calligra-26.04.1.tar.xz 58062620 BLAKE2B 320175310200e73cf9328b8ec8ab42358f0b5060d15790e788c8ca8507b5c6de7b5c7575c82ee5463349689f04578ac09171eb480a073cb871579d372a660d55 SHA512 fd3449dad459c34c77813499ff71ef34ae3f33274a1dfc652e71301f34330f241f8836af81c5de4a140b244cc262d7fefd00a0c4ef04c1c946d160f2cf697dd9
+DIST calligra-26.08.1.tar.xz 58192888 BLAKE2B 04deb3218a5077f863eeb8db3927a8f54eabf8b4d862258db9368b4b2cda28e35fc6c7bac576c195b43bed258c7b15693f53b8486fe3e371b04d4bfdd19d6442 SHA512 7e30672ff84e29aa18ebf0e7b65815b102fea3b97ff2b38affcbffb0c8ed7a7268203b6527625c66d008a95863ebc2ebbe24b0231db6f7e83111e6be9c056324
 DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc
diff --git a/app-office/calligra/calligra-26.04.1.ebuild b/app-office/calligra/calligra-26.08.1.ebuild
index 7c44e266093c..b95ec3cb2dd4 100644
--- a/app-office/calligra/calligra-26.04.1.ebuild
+++ b/app-office/calligra/calligra-26.08.1.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 CHECKREQS_DISK_BUILD="4G"
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=6.19.0
-QTMIN=6.9.1
+KFMIN=6.29.0
+QTMIN=6.11.2
 inherit check-reqs ecm gear.kde.org xdg
 
 DESCRIPTION="KDE Office Suite"
@@ -94,10 +94,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch # downstream
-	"${FILESDIR}"/${P}-poppler-26.04.patch # in git master
-)
+PATCHES=( "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch ) # downstream
 
 src_configure() {
 	local cal_ft myproducts
diff --git a/app-office/calligra/files/calligra-26.04.1-poppler-26.04.patch b/app-office/calligra/files/calligra-26.04.1-poppler-26.04.patch
deleted file mode 100644
index afa3a8e81fc9..000000000000
--- a/app-office/calligra/files/calligra-26.04.1-poppler-26.04.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From e9aae90db47ca87d639b8f2b17ec75c1b6093e27 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Sat, 11 Apr 2026 10:09:58 +0200
-Subject: [PATCH] Fix build with poppler >= 26.04.0
-
-BUG: 518774
----
- filters/karbon/pdf/SvgOutputDev.cpp | 25 +++++++++++++++++++------
- filters/karbon/pdf/SvgOutputDev.h   |  4 ++++
- 2 files changed, 23 insertions(+), 6 deletions(-)
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 94a5e91087d..6aa8faabffd 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -386,7 +386,11 @@ QString SvgOutputDev::printStroke()
-     return stroke;
- }
- 
-+#if POPPLER_VERSION_MACRO >= QT_VERSION_CHECK(26, 4, 0)
-+void SvgOutputDev::drawString(GfxState *state, const std::string &s)
-+#else
- void SvgOutputDev::drawString(GfxState *state, const GooString *s)
-+#endif
- {
-     int render = state->getRender();
-     // check for invisible text -- this is used by Acrobat Capture
-@@ -395,10 +399,12 @@ void SvgOutputDev::drawString(GfxState *state, const GooString *s)
-     }
- 
-     // ignore empty strings
--#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(25, 10, 0)
--    if (s->getLength() == 0) {
--#else
-+#if POPPLER_VERSION_MACRO >= QT_VERSION_CHECK(26, 4, 0)
-+    if (s.size() == 0) {
-+#elif POPPLER_VERSION_MACRO >= QT_VERSION_CHECK(25, 10, 0)
-     if (s->size() == 0) {
-+#else
-+    if (s->getLength() == 0) {
- #endif
-         return;
-     }
-@@ -407,11 +413,18 @@ void SvgOutputDev::drawString(GfxState *state, const GooString *s)
- 
-     QString str;
- 
--    const char *p = s->c_str();
--#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(25, 10, 0)
--    int len = s->getLength();
-+#if POPPLER_VERSION_MACRO >= QT_VERSION_CHECK(26, 4, 0)
-+    const char *p = s.c_str();
- #else
-+    const char *p = s->c_str();
-+#endif
-+
-+#if POPPLER_VERSION_MACRO >= QT_VERSION_CHECK(26, 4, 0)
-+    int len = s.size();
-+#elif POPPLER_VERSION_MACRO >= QT_VERSION_CHECK(25, 10, 0)
-     int len = s->size();
-+#else
-+    int len = s->getLength();
- #endif
-     CharCode code;
-     const Unicode *u = nullptr;
-diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
-index 721894b1de6..952ca366c17 100644
---- a/filters/karbon/pdf/SvgOutputDev.h
-+++ b/filters/karbon/pdf/SvgOutputDev.h
-@@ -44,7 +44,11 @@ public:
-     void eoFill(GfxState *state) override;
- 
-     // text
-+#if POPPLER_VERSION_MACRO >= QT_VERSION_CHECK(26, 4, 0)
-+    void drawString(GfxState *state, const std::string &s) override;
-+#else
-     void drawString(GfxState *state, const GooString *s) override;
-+#endif
- 
-     // images
-     void drawImage(GfxState *state,
--- 
-GitLab
-