public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Steve Cossette <farchord@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/koko] epel10.3: 26.08.0
Date: Mon, 14 Sep 2026 16:59:45 GMT	[thread overview]
Message-ID: <178940518502.1.16131049104454198472.rpms-koko-745784e350e4@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/koko
Branch : epel10.3
Commit : 745784e350e44b9f5daf1f01a112f3d0ef76ca42
Author : Steve Cossette <farchord@gmail.com>
Date   : 2026-08-14T19:18:31-04:00
Stats  : +63/-3 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/koko/c/745784e350e44b9f5daf1f01a112f3d0ef76ca42?branch=epel10.3

Log:
26.08.0

---
diff --git a/.gitignore b/.gitignore
index 3559220..92a64ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@
 /koko-26.04.2.tar.xz
 /koko-26.04.3.tar.xz
 /koko-26.07.90.tar.xz
+/koko-26.08.0.tar.xz

diff --git a/347.patch b/347.patch
new file mode 100644
index 0000000..b420870
--- /dev/null
+++ b/347.patch
@@ -0,0 +1,51 @@
+From a6dbce40969bdd5016a62de42178c0accbc75903 Mon Sep 17 00:00:00 2001
+From: Oliver Beard <olib141@outlook.com>
+Date: Fri, 14 Aug 2026 20:04:44 +0100
+Subject: [PATCH] NavigationActions: Don't use API not available for 26.08
+
+`KirigamiActions::ActionCollection::removeAction()` is not available for 26.08, and was accidentally introduced in backporting fixes (d4a2bb8e).
+
+As such, remove it and instead keep the action around (as we can't remove it).
+
+We'll just `setEnabled`/`setVisible` `false` and restore it for later re-use (as otherwise action names will collide and `createAction()` will fail).
+---
+ src/navigationactions.cpp | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/navigationactions.cpp b/src/navigationactions.cpp
+index 2b87dc3f..0776857c 100644
+--- a/src/navigationactions.cpp
++++ b/src/navigationactions.cpp
+@@ -138,7 +138,11 @@ void NavigationActions::updateSavedFolders()
+ 
+     for (const auto &folder : m_savedFolderNames) {
+         if (!newSavedFoldersSet.contains(folder)) {
+-            coll->removeAction(folder);
++            // Can't remove it in 26.08 due to gear dep freeze requiring older kirigami-app-components
++            // Just keep it around and re-use later (because it'll still exist with that name)
++            auto placeAction = coll->action(folder);
++            placeAction->setEnabled(false);
++            placeAction->setVisible(false);
+         }
+     }
+     m_savedFolderNames.clear();
+@@ -155,7 +159,15 @@ void NavigationActions::updateSavedFolders()
+         }
+         text = text.split(u'/').constLast();
+ 
+-        auto placeAction = coll->createAction(normalizedFolder, KIO::iconNameForUrl(normalizedFolder), text);
++        QAction *placeAction = nullptr;
++        if (placeAction = coll->action(normalizedFolder); placeAction != nullptr) {
++            placeAction->setEnabled(true);
++            placeAction->setVisible(true);
++            // Updating icon/text should be unnecessary, and updating icon is not possible with API
++        } else {
++            placeAction = coll->createAction(normalizedFolder, KIO::iconNameForUrl(normalizedFolder), text);
++        }
++
+         placeAction->setCheckable(true);
+         placeAction->setActionGroup(m_pagesGroup);
+ 
+-- 
+GitLab
+

diff --git a/koko.spec b/koko.spec
index bf0cdd4..4a7069a 100644
--- a/koko.spec
+++ b/koko.spec
@@ -3,7 +3,7 @@
 ExcludeArch: %{ix86}
 
 Name:           koko
-Version:        26.07.90
+Version:        26.08.0
 Release:        1%{?dist}
 # Automatically converted from old format: GPLv2+ and GPLv3 and LGPLv2 and LGPLv2+ and CC0 and BSD - review is highly recommended.
 License:        GPL-2.0-or-later AND GPL-3.0-only AND LicenseRef-Callaway-LGPLv2 AND LicenseRef-Callaway-LGPLv2+ AND CC0-1.0 AND LicenseRef-Callaway-BSD
@@ -14,6 +14,11 @@ Source1:        https://download.geonames.org/export/dump/cities1000.zip
 Source2:        https://download.geonames.org/export/dump/admin1CodesASCII.txt
 Source3:        https://download.geonames.org/export/dump/admin2Codes.txt
 
+# Upstream patches
+# Don't use APIs not available for 26.08
+# https://invent.kde.org/graphics/koko/-/merge_requests/347
+Patch0:        347.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: extra-cmake-modules
 BuildRequires: gcc-c++
@@ -65,7 +70,7 @@ Obsoletes:     %{name}-devel < 24.01.80
 %{summary}.
 
 %prep
-%autosetup
+%autosetup -p1
 # Copying these to src dir as per https://invent.kde.org/graphics/koko/-/blob/master/README.md Packaging section.
 cp %{_topdir}/SOURCES/cities1000.zip src/
 cp %{_topdir}/SOURCES/admin1CodesASCII.txt src/
@@ -93,6 +98,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{
 %{_kf6_metainfodir}/org.kde.%{name}.appdata.xml
 
 %changelog
+* Fri Aug 14 2026 Steve Cossette <farchord@gmail.com> - 26.08.0-1
+- 26.08.0
+
 * Fri Jul 31 2026 Steve Cossette <farchord@gmail.com> - 26.07.90-1
 - 26.07.90
 

diff --git a/sources b/sources
index 71ee940..474c272 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (cities1000.zip) = 2922fc107c6f86696862f9f6a7a0c447782add250b565ae8f51cda916c568eb8b4227b20e0f5a75d3c5f961aacee6393939711785101fcf2ab8a2fcdd0a409a2
-SHA512 (koko-26.07.90.tar.xz) = 922ecc4bed2d92f3e2646be2868252d934a5b627a539320092fc8f3c8c5144a17984914747e1434af4dc51edd210c25375c88ed5f85bf39b2d364e6b42d36503
+SHA512 (koko-26.08.0.tar.xz) = 6aa3be5309afc5758dfd7171e347aa6ef4624d27068521b43d7aa8f02111f8605203cd9c62673f74237478d7c2ecb056c3356d61b170dd670e3d9bb788db9a8d

                 reply	other threads:[~2026-09-14 16:59 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178940518502.1.16131049104454198472.rpms-koko-745784e350e4@fedoraproject.org \
    --to=farchord@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox