Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtstyleplugins for
openSUSE:Factory checked in at 2021-02-18 20:40:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtstyleplugins (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtstyleplugins.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtstyleplugins"
Thu Feb 18 20:40:46 2021 rev:13 rq:873211 version:5.0.0+git20170311
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtstyleplugins/libqt5-qtstyleplugins.changes
2020-06-10 00:50:32.991279899 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtstyleplugins.new.28504/libqt5-qtstyleplugins.changes
2021-02-18 20:52:44.627458142 +0100
@@ -1,0 +2,9 @@
+Sat Feb 6 14:27:59 UTC 2021 - Alexei Sorokin <[email protected]>
+
+- Add qtstyleplugins-gtksettings.patch: Align Qt with GTK settings
+ a bit better.
+- Add qtstyleplugins-fix-deprecations.patch: Fix various Qt deprecations.
+- Remove fix-build-qt5.15.patch: merge into
+ qtstyleplugins-fix-deprecations.patch (not distinct enough).
+
+-------------------------------------------------------------------
Old:
----
fix-build-qt5.15.patch
New:
----
qtstyleplugins-fix-deprecations.patch
qtstyleplugins-gtksettings.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtstyleplugins.spec ++++++
--- /var/tmp/diff_new_pack.PGwoQE/_old 2021-02-18 20:52:45.647459099 +0100
+++ /var/tmp/diff_new_pack.PGwoQE/_new 2021-02-18 20:52:45.651459103 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtstyleplugins
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -24,12 +24,13 @@
Version: 5.0.0+git20170311
Release: 0
Summary: Qt 5 Style Plugins
-License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
-Group: Development/Libraries/X11
-Url: https://qt.io/
+License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only
+URL: https://qt.io/
Source: %{_name}-opensource-src-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE (for now)
-Patch1: fix-build-qt5.15.patch
+# PATCH-FIX-OPENSUSE qtstyleplugins-gtksettings.patch [email protected] --
Align Qt with GTK settings a bit better.
+Patch0: qtstyleplugins-gtksettings.patch
+# PATCH-FIX-OPENSUSE qtstyleplugins-fix-deprecations.patch -- Fix various Qt
deprecations.
+Patch1: qtstyleplugins-fix-deprecations.patch
BuildRequires: fdupes
BuildRequires: libQt5Core-private-headers-devel >= %{qt_version}
BuildRequires: libQt5Gui-private-headers-devel >= %{qt_version}
@@ -52,9 +53,8 @@
%if %{with gtk2}
%package platformtheme-gtk2
Summary: Qt 5 gtk2 plugin
-Group: Development/Libraries/C and C++
%requires_eq libQt5Gui5
-Supplements: packageand(libQt5Gui5:libgtk-2_0-0)
+Supplements: (libQt5Gui5 and libgtk-2_0-0)
%description platformtheme-gtk2
Qt 5 plugin for better integration with gtk-based desktop enviroments.
@@ -62,7 +62,6 @@
%package devel
Summary: Qt 5 Style Plugins Development Files
-Group: Development/Libraries/X11
Requires: %{name} = %{version}
%if %{with gtk2}
Requires: %{name}-platformtheme-gtk2 = %{version}
@@ -76,7 +75,7 @@
%build
%qmake5
-make %{?_smp_mflags} V=1
+%make_build
%install
%qmake5_install
@@ -92,7 +91,6 @@
%postun platformtheme-gtk2 -p /sbin/ldconfig
%files
-%defattr(-,root,root)
%dir %{_libqt5_libdir}/qt5/plugins/styles/
%{_libqt5_libdir}/qt5/plugins/styles/*.so
%if %{with gtk2}
@@ -101,7 +99,6 @@
%if %{with gtk2}
%files platformtheme-gtk2
-%defattr(-,root,root)
%dir %{_libqt5_libdir}/qt5/plugins/platformthemes/
%{_libqt5_libdir}/qt5/plugins/platformthemes/libqgtk2.so
%dir %{_libqt5_libdir}/qt5/plugins/styles/
@@ -109,7 +106,6 @@
%endif
%files devel
-%defattr(-,root,root)
%{_libqt5_libdir}/cmake/Qt5Widgets/Qt5Widgets_*StylePlugin.cmake
%if %{with gtk2}
%{_libqt5_libdir}/cmake/Qt5Gui/Qt5Gui_*ThemePlugin.cmake
++++++ qtstyleplugins-fix-deprecations.patch ++++++
++++ 1817 lines (skipped)
++++++ qtstyleplugins-gtksettings.patch ++++++
--- a/src/plugins/platformthemes/gtk2/qgtk2theme.cpp
+++ b/src/plugins/platformthemes/gtk2/qgtk2theme.cpp
@@ -44,14 +44,28 @@ QT_BEGIN_NAMESPACE
const char *QGtk2Theme::name = "gtk2";
-static QString gtkSetting(const gchar *propertyName)
+static QVariant gtkSetting(const gchar *propertyName)
{
GtkSettings *settings = gtk_settings_get_default();
- gchararray value;
- g_object_get(settings, propertyName, &value, NULL);
- QString str = QString::fromUtf8(value);
- g_free(value);
- return str;
+ GValue value = G_VALUE_INIT;
+ QVariant ret;
+
+ g_object_get_property(G_OBJECT(settings), propertyName, &value);
+ if (G_VALUE_HOLDS_INT(&value)) {
+ ret = QVariant(g_value_get_int(&value));
+ } else if (G_VALUE_HOLDS_UINT(&value)) {
+ ret = QVariant(g_value_get_uint(&value));
+ } else if (G_VALUE_HOLDS_FLOAT(&value)) {
+ ret = QVariant(g_value_get_float(&value));
+ } else if (G_VALUE_HOLDS_STRING(&value)) {
+ ret = QVariant(QString::fromUtf8(g_value_get_string(&value)));
+ } else if (G_VALUE_HOLDS_BOOLEAN(&value)) {
+ ret = QVariant(g_value_get_boolean(&value));
+ } else {
+ ret = QVariant();
+ }
+ g_value_unset(&value);
+ return ret;
}
QGtk2Theme::QGtk2Theme()
@@ -68,12 +82,27 @@ QGtk2Theme::QGtk2Theme()
QVariant QGtk2Theme::themeHint(QPlatformTheme::ThemeHint hint) const
{
switch (hint) {
+ case QPlatformTheme::CursorFlashTime:
+ // As close to GTK as possible.
+ if (gtkSetting("gtk-cursor-blink").toBool() &&
gtkSetting("gtk-cursor-blink-timeout").toInt() != 0) {
+ return gtkSetting("gtk-cursor-blink-time");
+ } else {
+ return QVariant((int) 0);
+ }
+ case QPlatformTheme::PasswordMaskDelay:
+ return gtkSetting("gtk-entry-password-hint-timeout");
+ case QPlatformTheme::DialogButtonBoxButtonsHaveIcons:
+ return gtkSetting("gtk-button-images");
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+ case QPlatformTheme::ShowShortcutsInContextMenus:
+ return gtkSetting("gtk-enable-accels");
+#endif
case QPlatformTheme::SystemIconThemeName:
- return QVariant(gtkSetting("gtk-icon-theme-name"));
+ return gtkSetting("gtk-icon-theme-name");
case QPlatformTheme::SystemIconFallbackThemeName:
- return QVariant(gtkSetting("gtk-fallback-icon-theme"));
+ return gtkSetting("gtk-fallback-icon-theme");
case QPlatformTheme::StyleNames:
- return QVariant(QStringList(QStringLiteral("gtk2")));
+ return QStringList(QStringLiteral("gtk2"));
default:
return QGnomeTheme::themeHint(hint);
}
@@ -81,7 +110,7 @@ QVariant QGtk2Theme::themeHint(QPlatform
QString QGtk2Theme::gtkFontName() const
{
- QString cfgFontName = gtkSetting("gtk-font-name");
+ QString cfgFontName = gtkSetting("gtk-font-name").toString();
if (!cfgFontName.isEmpty())
return cfgFontName;
return QGnomeTheme::gtkFontName();
