pool/kf6-kconfig
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1158724 from KDE:Frameworks

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1158724
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kf6-kconfig?expand=0&rev=2
This commit is contained in:
Ana Guerrero 2024-03-18 15:43:18 +00:00 committed by Git OBS Bridge
commit b9d5f9da72
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0001-kconf_update-Also-run-.upd-files-if-times-match-but-.patch Normal file
View File

@ -0,0 +1,33 @@
From e948c74332e5385383e8f831de8cfc29d1b2a50e Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 16 Mar 2024 23:36:01 +0100
Subject: [PATCH] kconf_update: Also run .upd files if times match but done is
empty
Workaround that kconf_update5 adds entries for .upd files it doesn't run.
BUG: 483795
---
src/kconf_update/kconf_update.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
index 0d1cd251..348e1c9a 100644
--- a/src/kconf_update/kconf_update.cpp
+++ b/src/kconf_update/kconf_update.cpp
@@ -151,9 +151,11 @@ QStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
KConfigGroup cg(m_config, fileName);
const qint64 ctime = cg.readEntry("ctime", 0);
const qint64 mtime = cg.readEntry("mtime", 0);
+ const QString done = cg.readEntry("done", QString());
if (!dirtyOnly //
|| (ctime != 0 && ctime != info.birthTime().toSecsSinceEpoch()) //
- || mtime != info.lastModified().toSecsSinceEpoch()) {
+ || mtime != info.lastModified().toSecsSinceEpoch() //
+ || (mtime != 0 && done.isEmpty())) {
result.append(file);
}
}
--
2.43.0

6
kf6-kconfig.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Mar 16 22:38:58 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix missing config migration (kde#483795):
* 0001-kconf_update-Also-run-.upd-files-if-times-match-but-.patch
-------------------------------------------------------------------
Wed Feb 21 19:27:50 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>

6
kf6-kconfig.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package kf6-kconfig
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,7 +28,7 @@ Name: kf6-kconfig
Version: 6.0.0
Release: 0
Summary: Advanced configuration system
License: LGPL-2.1-or-later AND GPL-2.0-or-later
License: GPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://www.kde.org
Source: %{rname}-%{version}.tar.xz
%if %{with released}
@ -36,6 +36,8 @@ Source1: %{rname}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
Source99: kf6-kconfig-rpmlintrc
# https://invent.kde.org/frameworks/kconfig/-/merge_requests/283
Patch1: 0001-kconf_update-Also-run-.upd-files-if-times-match-but-.patch
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: kf6-extra-cmake-modules >= %{_kf6_bugfix_version}