Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kde-gtk-config5 for openSUSE:Factory
checked in at 2022-02-07 23:36:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kde-gtk-config5 (Old)
and /work/SRC/openSUSE:Factory/.kde-gtk-config5.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde-gtk-config5"
Mon Feb 7 23:36:55 2022 rev:127 rq:951871 version:5.24.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kde-gtk-config5/kde-gtk-config5.changes
2022-01-11 21:14:02.616738276 +0100
+++
/work/SRC/openSUSE:Factory/.kde-gtk-config5.new.1898/kde-gtk-config5.changes
2022-02-07 23:37:04.170857947 +0100
@@ -1,0 +2,22 @@
+Sat Feb 5 19:50:56 UTC 2022 - Fabian Vogt <[email protected]>
+
+- Update to 5.24.0
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.24.0
+- No code changes since 5.23.90
+
+-------------------------------------------------------------------
+Thu Jan 13 20:30:10 UTC 2022 - Fabian Vogt <[email protected]>
+
+- Update to 5.23.90
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.23.90
+- Changes since 5.23.5:
+ * Do not set the options that are removed in Gtk4.
+ * Add GitLab CI
+ * Add .kde-ci.yml
+ * kwin_bridge: Load DecorationButton without the "button" keyword
(kde#442659)
+
+-------------------------------------------------------------------
Old:
----
kde-gtk-config-5.23.5.tar.xz
kde-gtk-config-5.23.5.tar.xz.sig
New:
----
kde-gtk-config-5.24.0.tar.xz
kde-gtk-config-5.24.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde-gtk-config5.spec ++++++
--- /var/tmp/diff_new_pack.Mhfqhv/_old 2022-02-07 23:37:04.870853235 +0100
+++ /var/tmp/diff_new_pack.Mhfqhv/_new 2022-02-07 23:37:04.874853208 +0100
@@ -16,17 +16,17 @@
#
-%bcond_without lang
+%bcond_without released
Name: kde-gtk-config5
-Version: 5.23.5
+Version: 5.24.0
Release: 0
Summary: Daemon for GTK2 and GTK3 Applications Appearance Under KDE
License: GPL-3.0-or-later AND LGPL-3.0-or-later
Group: System/GUI/KDE
URL: http://projects.kde.org/kde-gtk-config
-Source:
https://download.kde.org/stable/plasma/%{version}/kde-gtk-config-%{version}.tar.xz
-%if %{with lang}
-Source1:
https://download.kde.org/stable/plasma/%{version}/kde-gtk-config-%{version}.tar.xz.sig
+Source: kde-gtk-config-%{version}.tar.xz
+%if %{with released}
+Source1: kde-gtk-config-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
BuildRequires: extra-cmake-modules >= 0.0.9
@@ -102,6 +102,7 @@
%{_kf5_sharedir}/kcm-gtk-module/
%dir %{_kf5_libdir}/kconf_update_bin/
%{_kf5_libdir}/kconf_update_bin/gtk_theme
+%{_kf5_libdir}/kconf_update_bin/remove_deprecated_gtk4_option
%files gtk3
%license LICENSES/*
++++++ kde-gtk-config-5.23.5.tar.xz -> kde-gtk-config-5.24.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.23.5/.gitlab-ci.yml
new/kde-gtk-config-5.24.0/.gitlab-ci.yml
--- old/kde-gtk-config-5.23.5/.gitlab-ci.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/kde-gtk-config-5.24.0/.gitlab-ci.yml 2022-02-03 15:27:56.000000000
+0100
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+include:
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.23.5/.kde-ci.yml
new/kde-gtk-config-5.24.0/.kde-ci.yml
--- old/kde-gtk-config-5.23.5/.kde-ci.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/kde-gtk-config-5.24.0/.kde-ci.yml 2022-02-03 15:27:56.000000000
+0100
@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+Dependencies:
+- 'on': ['@all']
+ 'require':
+ 'frameworks/extra-cmake-modules': '@latest'
+ 'frameworks/kauth': '@latest'
+ 'frameworks/kcodecs': '@latest'
+ 'frameworks/kconfig': '@latest'
+ 'frameworks/kconfigwidgets': '@latest'
+ 'frameworks/kcoreaddons': '@latest'
+ 'frameworks/kdbusaddons': '@latest'
+ 'frameworks/kguiaddons': '@latest'
+ 'frameworks/kwidgetsaddons': '@latest'
+ 'plasma/kdecoration': '@same'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.23.5/CMakeLists.txt
new/kde-gtk-config-5.24.0/CMakeLists.txt
--- old/kde-gtk-config-5.23.5/CMakeLists.txt 2022-01-04 09:52:09.000000000
+0100
+++ new/kde-gtk-config-5.24.0/CMakeLists.txt 2022-02-03 15:27:56.000000000
+0100
@@ -1,5 +1,5 @@
project(kde-gtk-config)
-set(PROJECT_VERSION "5.23.5")
+set(PROJECT_VERSION "5.24.0")
cmake_minimum_required(VERSION 3.16)
set(QT_MIN_VERSION "5.15.0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.23.5/kconf_update/CMakeLists.txt
new/kde-gtk-config-5.24.0/kconf_update/CMakeLists.txt
--- old/kde-gtk-config-5.23.5/kconf_update/CMakeLists.txt 2022-01-04
09:52:09.000000000 +0100
+++ new/kde-gtk-config-5.24.0/kconf_update/CMakeLists.txt 2022-02-03
15:27:56.000000000 +0100
@@ -26,6 +26,36 @@
DESTINATION
${KDE_INSTALL_LIBDIR}/kconf_update_bin/
)
+
+add_executable(remove_deprecated_gtk4_option remove_deprecated_gtk4_option
../kded/configeditor.cpp)
+
+target_link_libraries(remove_deprecated_gtk4_option
+ PRIVATE
+ Qt::Core
+ KF5::ConfigCore
+ KF5::ConfigWidgets
+ KF5::GuiAddons
+ PkgConfig::GIO
+ PkgConfig::GObject
+)
+
+target_include_directories(remove_deprecated_gtk4_option
+ PRIVATE
+ ../kded/
+)
+
+target_compile_definitions(remove_deprecated_gtk4_option
+ PRIVATE
+ QT_NO_SIGNALS_SLOTS_KEYWORDS
+)
+
+install(
+ TARGETS
+ remove_deprecated_gtk4_option
+ DESTINATION
+ ${KDE_INSTALL_LIBDIR}/kconf_update_bin/
+)
+
install(
FILES
gtkconfig.upd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.23.5/kconf_update/gtkconfig.upd
new/kde-gtk-config-5.24.0/kconf_update/gtkconfig.upd
--- old/kde-gtk-config-5.23.5/kconf_update/gtkconfig.upd 2022-01-04
09:52:09.000000000 +0100
+++ new/kde-gtk-config-5.24.0/kconf_update/gtkconfig.upd 2022-02-03
15:27:56.000000000 +0100
@@ -5,3 +5,6 @@
Id=dont_use_gtk_css_for_window_decorations
Script=remove_window_decorations_from_gtk_css.sh,sh
+
+Id=remove_deprecated_gtk4_option
+Script=remove_deprecated_gtk4_option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-5.23.5/kconf_update/remove_deprecated_gtk4_option.cpp
new/kde-gtk-config-5.24.0/kconf_update/remove_deprecated_gtk4_option.cpp
--- old/kde-gtk-config-5.23.5/kconf_update/remove_deprecated_gtk4_option.cpp
1970-01-01 01:00:00.000000000 +0100
+++ new/kde-gtk-config-5.24.0/kconf_update/remove_deprecated_gtk4_option.cpp
2022-02-03 15:27:56.000000000 +0100
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Weng Xuetian <[email protected]>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR
LicenseRef-KDE-Accepted-GPL
+ */
+
+#include "configeditor.h"
+
+int main()
+{
+
ConfigEditor::unsetGtk4ConfigValueSettingsIni(QStringLiteral("gtk-button-images"));
+
ConfigEditor::unsetGtk4ConfigValueSettingsIni(QStringLiteral("gtk-menu-images"));
+
ConfigEditor::unsetGtk4ConfigValueSettingsIni(QStringLiteral("gtk-toolbar-style"));
+ return 0;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.23.5/kded/configeditor.cpp
new/kde-gtk-config-5.24.0/kded/configeditor.cpp
--- old/kde-gtk-config-5.23.5/kded/configeditor.cpp 2022-01-04
09:52:09.000000000 +0100
+++ new/kde-gtk-config-5.24.0/kded/configeditor.cpp 2022-02-03
15:27:56.000000000 +0100
@@ -27,6 +27,20 @@
#include "configeditor.h"
+namespace
+{
+
+KConfigGroup gtkConfigGroup(const QString &versionString)
+{
+ QString configLocation =
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
+ QString gtk3ConfigPath = configLocation + QStringLiteral("/") +
versionString + QStringLiteral("/settings.ini");
+
+ KSharedConfig::Ptr gtk3Config = KSharedConfig::openConfig(gtk3ConfigPath,
KConfig::NoGlobals);
+ return gtk3Config->group(QStringLiteral("Settings"));
+}
+
+}
+
void ConfigEditor::setGtkConfigValueGSettings(const QString ¶mName, const
QVariant ¶mValue, const QString &category)
{
g_autoptr(GSettings) gsettings =
g_settings_new(category.toUtf8().constData());
@@ -51,24 +65,21 @@
void ConfigEditor::setGtkConfigValueSettingsIni(const QString &versionString,
const QString ¶mName, const QVariant ¶mValue)
{
- QString configLocation =
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
- QString gtk3ConfigPath = configLocation + QStringLiteral("/") +
versionString + QStringLiteral("/settings.ini");
-
- KSharedConfig::Ptr gtk3Config = KSharedConfig::openConfig(gtk3ConfigPath,
KConfig::NoGlobals);
- KConfigGroup group = gtk3Config->group(QStringLiteral("Settings"));
-
+ auto group = gtkConfigGroup(versionString);
group.writeEntry(paramName, paramValue);
group.sync();
}
-QString ConfigEditor::gtkConfigValueSettingsIni(const QString &versionString,
const QString ¶mName)
+void ConfigEditor::unsetGtkConfigValueSettingsIni(const QString
&versionString, const QString ¶mName)
{
- QString configLocation =
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
- QString gtk3ConfigPath = configLocation + QStringLiteral("/") +
versionString + QStringLiteral("/settings.ini");
-
- KSharedConfig::Ptr gtk3Config = KSharedConfig::openConfig(gtk3ConfigPath,
KConfig::NoGlobals);
- KConfigGroup group = gtk3Config->group(QStringLiteral("Settings"));
+ auto group = gtkConfigGroup(versionString);
+ group.deleteEntry(paramName);
+ group.sync();
+}
+QString ConfigEditor::gtkConfigValueSettingsIni(const QString &versionString,
const QString ¶mName)
+{
+ auto group = gtkConfigGroup(versionString);
return group.readEntry(paramName);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.23.5/kded/configeditor.h
new/kde-gtk-config-5.24.0/kded/configeditor.h
--- old/kde-gtk-config-5.23.5/kded/configeditor.h 2022-01-04
09:52:09.000000000 +0100
+++ new/kde-gtk-config-5.24.0/kded/configeditor.h 2022-02-03
15:27:56.000000000 +0100
@@ -27,6 +27,9 @@
static auto setGtk4ConfigValueSettingsIni =
std::bind(setGtkConfigValueSettingsIni, QStringLiteral("gtk-4.0"), _1, _2);
static auto setGtk3ConfigValueSettingsIni =
std::bind(setGtkConfigValueSettingsIni, QStringLiteral("gtk-3.0"), _1, _2);
+void unsetGtkConfigValueSettingsIni(const QString &versionString, const
QString ¶mName);
+static auto unsetGtk4ConfigValueSettingsIni =
std::bind(unsetGtkConfigValueSettingsIni, QStringLiteral("gtk-4.0"), _1);
+
QString gtkConfigValueSettingsIni(const QString &versionString, const QString
¶mName);
static auto gtk4ConfigValueSettingsIni = std::bind(gtkConfigValueSettingsIni,
QStringLiteral("gtk-4.0"), _1);
static auto gtk3ConfigValueSettingsIni = std::bind(gtkConfigValueSettingsIni,
QStringLiteral("gtk-3.0"), _1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.23.5/kded/gtkconfig.cpp
new/kde-gtk-config-5.24.0/kded/gtkconfig.cpp
--- old/kde-gtk-config-5.23.5/kded/gtkconfig.cpp 2022-01-04
09:52:09.000000000 +0100
+++ new/kde-gtk-config-5.24.0/kded/gtkconfig.cpp 2022-02-03
15:27:56.000000000 +0100
@@ -113,7 +113,7 @@
const bool iconsOnButtonsConfigValue =
configValueProvider->iconsOnButtons();
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-button-images"),
iconsOnButtonsConfigValue);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-button-images"),
iconsOnButtonsConfigValue);
-
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-button-images"),
iconsOnButtonsConfigValue);
+ // Deprecated in Gtk4
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/ButtonImages"),
iconsOnButtonsConfigValue);
}
@@ -122,7 +122,7 @@
const bool iconsInMenusConfigValue = configValueProvider->iconsInMenus();
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-menu-images"),
iconsInMenusConfigValue);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-menu-images"),
iconsInMenusConfigValue);
-
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-menu-images"),
iconsInMenusConfigValue);
+ // Deprecated in Gtk4
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/MenuImages"),
iconsInMenusConfigValue);
}
@@ -132,7 +132,7 @@
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-toolbar-style"),
toolbarStyle);
ConfigEditor::setGtkConfigValueGSettingsAsEnum(QStringLiteral("toolbar-style"),
toolbarStyle);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-toolbar-style"),
toolbarStyle);
-
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-toolbar-style"),
toolbarStyle);
+ // Deprecated in Gtk4
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/ToolbarStyle"),
toolbarStyle);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.23.5/kded/gtkconfig.json
new/kde-gtk-config-5.24.0/kded/gtkconfig.json
--- old/kde-gtk-config-5.23.5/kded/gtkconfig.json 2022-01-04
09:52:09.000000000 +0100
+++ new/kde-gtk-config-5.24.0/kded/gtkconfig.json 2022-02-03
15:27:56.000000000 +0100
@@ -16,6 +16,7 @@
"Description[fi]": "Ottaa asetukset automaattisesti k??ytt????n
Gnome/Gtk-sovelluksissa",
"Description[fr]": "Applique automatiquement les param??tres aux
applications GNOME/GTK",
"Description[hi]": "????????????/??????????????????
????????????????????????????????? ????????? ?????????????????????
???????????????????????? ???????????? ???????????? ??????",
+ "Description[hu]": "Be??ll??t??sok automatikus alkalmaz??sa GNOME/GTK
alkalmaz??sokra",
"Description[id]": "Secara otomatis menerapkan pengaturan ke
aplikasi-aplikasi GNOME/GTK",
"Description[it]": "Applica automaticamente le impostazioni alle
applicazioni GNOME/GTK",
"Description[ko]": "???????????? ??????/GTK ??????????????? ??????
??????",
@@ -33,6 +34,7 @@
"Description[sv]": "Verkst??ller automatiskt inst??llningar f??r
GNOME/GTK-program",
"Description[tr]": "Ayarlar?? GNOME/TK uygulamalar??na otomatik olarak
uygular",
"Description[uk]": "?????????????????????? ????????????????????
?????????????????? ???? ?????????????? GNOME/GTK",
+ "Description[vi]": "T??? ?????ng ??p d???ng c??c thi???t l???p cho
c??c ???ng d???ng GNOME/GTK",
"Description[x-test]": "xxAutomatically applies settings to GNOME/GTK
applicationsxx",
"Description[zh_CN]": "???????????????????????? GNOME/GTK ??????",
"Description[zh_TW]": "????????????????????? GNOME/GTK ????????????",
@@ -53,6 +55,7 @@
"Name[fi]": "Gnome/Gtk-asetussynkronointipalvelu",
"Name[fr]": "Service de synchronisation des param??tres GNOME/GTK",
"Name[hi]": "????????????/?????????????????? ????????????????????????
?????? ????????? ??????????????????????????? ??????????????????",
+ "Name[hu]": "GNOME/GTK be??ll??t??s-szinkroniz??ci??s szolg??ltat??s",
"Name[id]": "Layanan Sinkronisasi Pengaturan GNOME/GTK",
"Name[it]": "Servizio di sincronizzazione delle impostazioni
GNOME/GTK",
"Name[ko]": "??????/GTK ?????? ????????? ?????????",
@@ -70,6 +73,7 @@
"Name[sv]": "Synkroniseringstj??nst av GNOME/GTK inst??llningar",
"Name[tr]": "GNOME/GTK Ayarlar?? E??itleme Hizmeti",
"Name[uk]": "???????????? ??????????????????????????
???????????????????? GNOME/GTK",
+ "Name[vi]": "D???ch v??? ?????ng b??? ho?? thi???t l???p GNOME/GTK",
"Name[x-test]": "xxGNOME/GTK Settings Synchronization Servicexx",
"Name[zh_CN]": "GNOME/GTK ??????????????????",
"Name[zh_TW]": "GNOME/GTK ??????????????????",
