Hello community,
here is the log from the commit of package kde-gtk-config5 for openSUSE:Factory
checked in at 2019-11-15 22:34:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kde-gtk-config5 (Old)
and /work/SRC/openSUSE:Factory/.kde-gtk-config5.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde-gtk-config5"
Fri Nov 15 22:34:19 2019 rev:85 rq:747834 version:5.17.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/kde-gtk-config5/kde-gtk-config5.changes
2019-10-31 18:10:34.773717045 +0100
+++
/work/SRC/openSUSE:Factory/.kde-gtk-config5.new.26869/kde-gtk-config5.changes
2019-11-15 22:34:23.888017445 +0100
@@ -1,0 +2,10 @@
+Tue Nov 12 11:01:06 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Update to 5.17.3
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/plasma-5.17.3.php
+- Changes since 5.17.2:
+ * Remove gtkrc-2.0 legacy settings (kde#413678,kde#413107)
+
+-------------------------------------------------------------------
Old:
----
kde-gtk-config-5.17.2.tar.xz
kde-gtk-config-5.17.2.tar.xz.sig
New:
----
kde-gtk-config-5.17.3.tar.xz
kde-gtk-config-5.17.3.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde-gtk-config5.spec ++++++
--- /var/tmp/diff_new_pack.HlA6HL/_old 2019-11-15 22:34:24.576017143 +0100
+++ /var/tmp/diff_new_pack.HlA6HL/_new 2019-11-15 22:34:24.592017136 +0100
@@ -18,7 +18,7 @@
%bcond_without lang
Name: kde-gtk-config5
-Version: 5.17.2
+Version: 5.17.3
Release: 0
Summary: KCM Module to Configure GTK2 and GTK3 Applications Appearance
Under KDE
License: LGPL-3.0-or-later AND GPL-3.0-or-later
++++++ kde-gtk-config-5.17.2.tar.xz -> kde-gtk-config-5.17.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.17.2/CMakeLists.txt
new/kde-gtk-config-5.17.3/CMakeLists.txt
--- old/kde-gtk-config-5.17.2/CMakeLists.txt 2019-10-29 19:10:41.000000000
+0100
+++ new/kde-gtk-config-5.17.3/CMakeLists.txt 2019-11-12 11:13:35.000000000
+0100
@@ -1,5 +1,5 @@
project(kde-gtk-config)
-set(PROJECT_VERSION "5.17.2")
+set(PROJECT_VERSION "5.17.3")
cmake_minimum_required(VERSION 2.8.12)
find_package(ECM 0.0.9 REQUIRED NO_MODULE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.17.2/src/appearancegtk2.cpp
new/kde-gtk-config-5.17.3/src/appearancegtk2.cpp
--- old/kde-gtk-config-5.17.2/src/appearancegtk2.cpp 2019-10-29
19:10:16.000000000 +0100
+++ new/kde-gtk-config-5.17.3/src/appearancegtk2.cpp 2019-11-12
11:13:21.000000000 +0100
@@ -118,6 +118,7 @@
modifyGtkrcProperty("gtk-menu-images", m_settings["show_icons_menus"],
fileContents);
modifyGtkrcProperty("gtk-button-images", m_settings["show_icons_buttons"],
fileContents);
modifyGtkrcProperty("gtk-primary-button-warps-slider",
m_settings["primary_button_warps_slider"], fileContents);
+ removeGtkrcLegacyContents(fileContents);
}
void AppearanceGTK2::modifyGtkrcProperty(const QString& propertyName, const
QString& newValue, QString& fileContents) const
@@ -145,6 +146,27 @@
}
}
+void AppearanceGTK2::removeGtkrcLegacyContents(QString &fileContents) const
+{
+ // Remove "include" lines
+ // Example:
+ // include "/usr/share/themes/Adwaita-dark/gtk-2.0/gtkrc"
+
+ static const QRegularExpression includeRegExp(QStringLiteral("include
.*\n"));
+ fileContents.remove(includeRegExp);
+
+ // Remove redundant font config lines
+ // Example:
+ // style "user-font"
+ // {
+ // font_name="Noto Sans Regular"
+ // }
+ // widget_class "*" style "user-font"
+
+ static const QRegularExpression
userFontStyleRegexp(QStringLiteral("style(.|\n)*{(.|\n)*}\nwidget_class.*\"user-font\""));
+ fileContents.remove(userFontStyleRegexp);
+}
+
void AppearanceGTK2::reset()
{
m_settings = QMap<QString, QString> {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.17.2/src/appearancegtk2.h
new/kde-gtk-config-5.17.3/src/appearancegtk2.h
--- old/kde-gtk-config-5.17.2/src/appearancegtk2.h 2019-10-29
19:10:16.000000000 +0100
+++ new/kde-gtk-config-5.17.3/src/appearancegtk2.h 2019-11-12
11:13:21.000000000 +0100
@@ -42,6 +42,7 @@
bool saveSettingsPrivate(const QString& path) const;
void modifyGtkrcContents(QString& fileContents) const;
void modifyGtkrcProperty(const QString& propertyName, const QString&
newValue, QString& fileContents) const;
+ void removeGtkrcLegacyContents(QString& fileContents) const;
};
#endif // APPEARANCEGTK2_H
