Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kf6-kcolorscheme for
openSUSE:Factory checked in at 2025-10-12 22:21:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf6-kcolorscheme (Old)
and /work/SRC/openSUSE:Factory/.kf6-kcolorscheme.new.18484 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kcolorscheme"
Sun Oct 12 22:21:41 2025 rev:20 rq:1310833 version:6.19.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kf6-kcolorscheme/kf6-kcolorscheme.changes
2025-09-15 19:52:31.458138409 +0200
+++
/work/SRC/openSUSE:Factory/.kf6-kcolorscheme.new.18484/kf6-kcolorscheme.changes
2025-10-12 22:22:00.063785857 +0200
@@ -1,0 +2,15 @@
+Tue Oct 7 17:06:13 UTC 2025 - Christophe Marin <[email protected]>
+
+- Update to 6.19.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/6/6.19.0
+- Changes since 6.18.0:
+ * Update dependency version to 6.19.0
+ * Don't overload activateScheme slot
+ * [SchemeManager] Use new id based approach
+ * Deprecate saveSchemeToConfigFile()
+ * [SchemeManager] Add id based endpoint
+ * Update version to 6.19.0
+
+-------------------------------------------------------------------
Old:
----
kcolorscheme-6.18.0.tar.xz
kcolorscheme-6.18.0.tar.xz.sig
New:
----
kcolorscheme-6.19.0.tar.xz
kcolorscheme-6.19.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kf6-kcolorscheme.spec ++++++
--- /var/tmp/diff_new_pack.0KQy5Q/_old 2025-10-12 22:22:01.495845819 +0200
+++ /var/tmp/diff_new_pack.0KQy5Q/_new 2025-10-12 22:22:01.511846489 +0200
@@ -19,11 +19,11 @@
%define qt6_version 6.8.0
%define rname kcolorscheme
-# Full KF6 version (e.g. 6.18.0)
+# Full KF6 version (e.g. 6.19.0)
%{!?_kf6_version: %global _kf6_version %{version}}
%bcond_without released
Name: kf6-kcolorscheme
-Version: 6.18.0
+Version: 6.19.0
Release: 0
Summary: Classes to read and interact with KColorScheme
License: LGPL-2.0-or-later
++++++ kcolorscheme-6.18.0.tar.xz -> kcolorscheme-6.19.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcolorscheme-6.18.0/CMakeLists.txt
new/kcolorscheme-6.19.0/CMakeLists.txt
--- old/kcolorscheme-6.18.0/CMakeLists.txt 2025-09-08 10:11:29.000000000
+0200
+++ new/kcolorscheme-6.19.0/CMakeLists.txt 2025-10-05 14:34:48.000000000
+0200
@@ -3,12 +3,12 @@
cmake_minimum_required(VERSION 3.16)
-set(KF_VERSION "6.18.0") # handled by release scripts
-set(KF_DEP_VERSION "6.18.0") # handled by release scripts
+set(KF_VERSION "6.19.0") # handled by release scripts
+set(KF_DEP_VERSION "6.19.0") # handled by release scripts
project(KColorScheme VERSION ${KF_VERSION})
include(FeatureSummary)
-find_package(ECM 6.18.0 NO_MODULE)
+find_package(ECM 6.19.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL "https://commits.kde.org/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -48,7 +48,7 @@
ecm_set_disabled_deprecation_versions(
QT 6.10.0
- KF 6.17.0
+ KF 6.18.0
)
add_definitions(-DTRANSLATION_DOMAIN=\"kcolorscheme6\")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcolorscheme-6.18.0/src/CMakeLists.txt
new/kcolorscheme-6.19.0/src/CMakeLists.txt
--- old/kcolorscheme-6.18.0/src/CMakeLists.txt 2025-09-08 10:11:29.000000000
+0200
+++ new/kcolorscheme-6.19.0/src/CMakeLists.txt 2025-10-05 14:34:48.000000000
+0200
@@ -40,7 +40,7 @@
VERSION ${KF_VERSION}
USE_VERSION_HEADER
DEPRECATED_BASE_VERSION 0
- DEPRECATION_VERSIONS 6.6
+ DEPRECATION_VERSIONS 6.6 6.19
EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcolorscheme-6.18.0/src/kcolorscheme.cpp
new/kcolorscheme-6.19.0/src/kcolorscheme.cpp
--- old/kcolorscheme-6.18.0/src/kcolorscheme.cpp 2025-09-08
10:11:29.000000000 +0200
+++ new/kcolorscheme-6.19.0/src/kcolorscheme.cpp 2025-10-05
14:34:48.000000000 +0200
@@ -17,7 +17,6 @@
#include <QBrush>
#include <QColor>
#include <QGuiApplication>
-#include <QPalette>
// BEGIN StateEffects
StateEffects::StateEffects(QPalette::ColorGroup state, const KSharedConfigPtr
&config)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcolorscheme-6.18.0/src/kcolorschememanager.cpp
new/kcolorscheme-6.19.0/src/kcolorschememanager.cpp
--- old/kcolorscheme-6.18.0/src/kcolorschememanager.cpp 2025-09-08
10:11:29.000000000 +0200
+++ new/kcolorscheme-6.19.0/src/kcolorschememanager.cpp 2025-10-05
14:34:48.000000000 +0200
@@ -168,11 +168,29 @@
KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup cg(config, QStringLiteral("UiSettings"));
+
const QString scheme = cg.readEntry("ColorScheme", QString());
+ auto index = indexForSchemeId(scheme);
+ bool updateDeprecated = false;
+ if (!scheme.isEmpty() && !index.isValid()) {
+ // No sucess treating value as ID maybe it is a scheme name?
+ // Until 6.16 we saved the scheme name instead of the id to ColorScheme
+ index = indexForScheme(scheme);
+ updateDeprecated = true;
+ }
+
+ QString schemeId;
+ if (index.isValid()) {
+ schemeId = index.data(KColorSchemeModel::IdRole).toString();
+
+ if (updateDeprecated) {
+ saveSchemeIdToConfigFile(schemeId);
+ }
+ }
QString schemePath;
- if (scheme.isEmpty() || scheme == QLatin1String("Default")) {
+ if (schemeId.isEmpty()) {
// Color scheme might be already set from a platform theme
// This is used for example by QGnomePlatform that can set color scheme
// matching GNOME settings. This avoids issues where QGnomePlatform
sets
@@ -183,7 +201,6 @@
schemePath = d->automaticColorSchemePath();
}
} else {
- const auto index = indexForScheme(scheme);
schemePath = index.data(KColorSchemeModel::PathRole).toString();
d->m_activatedScheme =
index.data(KColorSchemeModel::IdRole).toString();
}
@@ -245,29 +262,59 @@
if (index.isValid() && index.model() == d->model.get() && !isDefaultEntry)
{
d->m_activatedScheme =
index.data(KColorSchemeModel::IdRole).toString();
if (d->m_autosaveChanges) {
-
saveSchemeToConfigFile(index.data(KColorSchemeModel::NameRole).toString());
+
saveSchemeIdToConfigFile(index.data(KColorSchemeModel::IdRole).toString());
}
d->activateSchemeInternal(index.data(KColorSchemeModel::PathRole).toString());
} else {
d->m_activatedScheme = QString();
if (d->m_autosaveChanges) {
- saveSchemeToConfigFile(QString());
+ saveSchemeIdToConfigFile(QString());
+ }
+ d->activateSchemeInternal(d->automaticColorSchemePath());
+ }
+}
+
+void KColorSchemeManager::activateSchemeId(const QString &schemeId)
+{
+ auto index = d->indexForSchemeId(schemeId);
+ const bool isDefaultEntry =
index.data(KColorSchemeModel::IdRole).toString().isEmpty();
+
+ if (index.isValid() && !isDefaultEntry) {
+
d->activateSchemeInternal(index.data(KColorSchemeModel::PathRole).toString());
+ d->m_activatedScheme =
index.data(KColorSchemeModel::IdRole).toString();
+ if (d->m_autosaveChanges) {
+
saveSchemeIdToConfigFile(index.data(KColorSchemeModel::IdRole).toString());
}
+ } else {
d->activateSchemeInternal(d->automaticColorSchemePath());
+ d->m_activatedScheme = QString();
+ if (d->m_autosaveChanges) {
+ saveSchemeIdToConfigFile(QString());
+ }
}
}
+#if KCOLORSCHEME_ENABLE_DEPRECATED_SINCE(6, 19)
void KColorSchemeManager::saveSchemeToConfigFile(const QString &schemeName)
const
{
+ const auto index = indexForScheme(schemeName);
+ QString schemeId;
+ if (index.isValid()) {
+ schemeId = index.data(KColorSchemeModel::IdRole).toString();
+ }
+ saveSchemeIdToConfigFile(schemeId);
+}
+#endif
+
+void KColorSchemeManager::saveSchemeIdToConfigFile(const QString &schemeId)
const
+{
KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup cg(config, QStringLiteral("UiSettings"));
-
- if (schemeName.isEmpty() && !cg.hasDefault("ColorScheme")) {
+ if (schemeId.isEmpty() && !cg.hasDefault("ColorScheme")) {
cg.revertToDefault("ColorScheme");
} else {
- cg.writeEntry("ColorScheme",
KLocalizedString::removeAcceleratorMarker(schemeName));
+ cg.writeEntry("ColorScheme", schemeId);
}
-
cg.sync();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcolorscheme-6.18.0/src/kcolorschememanager.h
new/kcolorscheme-6.19.0/src/kcolorschememanager.h
--- old/kcolorscheme-6.18.0/src/kcolorschememanager.h 2025-09-08
10:11:29.000000000 +0200
+++ new/kcolorscheme-6.19.0/src/kcolorschememanager.h 2025-10-05
14:34:48.000000000 +0200
@@ -37,10 +37,13 @@
* which holds all the available color schemes. A possible usage looks like
the following:
*
* \code
- * KColorSchemeManager *schemes = new KColorSchemeManager(this);
+ * KColorSchemeManager *manager = new KColorSchemeManager(this);
* QListView *view = new QListView(this);
- * view->setModel(schemes->model());
- * connect(view, &QListView::activated, schemes,
&KColorSchemeManager::activateScheme);
+ * view->setModel(manager->model());
+ * connect(view, &QListView::activated, manager, [manager] (const QModelIndex
&index) {
+ *
manager->activateSchemeId(index.data(KColorSchemeModel::IdRole).toString());
+ * });
+ *
* \endcode
*
* A convenience function that creates a KActionMenu that contains and
activates color schemes exists
@@ -95,13 +98,28 @@
*/
QModelIndex indexForScheme(const QString &name) const;
+#if KCOLORSCHEME_ENABLE_DEPRECATED_SINCE(6, 19)
+
/*!
* Saves the color scheme to config file. The scheme is saved by default
whenever it's changed.
* Use this method when autosaving is turned off, see setAutosaveChanges().
*
* \since 5.89
+ *
+ * \deprecated[6.19]
+ * Use saveSchemeIdToConfigFile() instead which is not locale dependent
*/
+ KCOLORSCHEME_DEPRECATED_VERSION(6, 19, "Use saveSchemeIdToConfigFile()
instead which is not locale dependent")
void saveSchemeToConfigFile(const QString &schemeName) const;
+#endif
+
+ /*!
+ * Saves the color scheme to config file. The scheme is saved by default
whenever it's changed.
+ * Use this method when autosaving is turned off, see
setAutosaveChanges().
+ *
+ * \since 6.19
+ */
+ void saveSchemeIdToConfigFile(const QString &schemeId) const;
/*!
* Sets color scheme autosaving. Default value is \c true.
* If this is set to \c false, the scheme is not going to be remembered
when the
@@ -152,6 +170,19 @@
*/
void activateScheme(const QModelIndex &index);
+ /*!
+ * \brief Activates the KColorScheme identified by the provided \param
schemeId.
+ *
+ * Installs the KColorScheme as the QApplication's QPalette.
+ *
+ * \param schemeId The id for the KColorScheme to activate.
+ * Passing an empty id activates the system scheme.
+ * \sa model()
+ *
+ * \since 6.19
+ */
+ void activateSchemeId(const QString &schemeId);
+
private:
class KCOLORSCHEME_NO_EXPORT GuardApplicationConstructor
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcolorscheme-6.18.0/src/kcolorschememodel.cpp
new/kcolorscheme-6.19.0/src/kcolorschememodel.cpp
--- old/kcolorscheme-6.18.0/src/kcolorschememodel.cpp 2025-09-08
10:11:29.000000000 +0200
+++ new/kcolorscheme-6.19.0/src/kcolorschememodel.cpp 2025-10-05
14:34:48.000000000 +0200
@@ -70,7 +70,7 @@
d->m_data.append(data);
}
- d->m_data.insert(0, {QStringLiteral("Default"), i18n("Default"),
QString(), QIcon::fromTheme(QStringLiteral("edit-undo"))});
+ d->m_data.insert(0, {QString(), i18n("Default"), QString(),
QIcon::fromTheme(QStringLiteral("edit-undo"))});
endResetModel();
}
