Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package QGnomePlatform for openSUSE:Factory
checked in at 2022-09-29 18:12:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/QGnomePlatform (Old)
and /work/SRC/openSUSE:Factory/.QGnomePlatform.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QGnomePlatform"
Thu Sep 29 18:12:34 2022 rev:10 rq:1006650 version:0.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/QGnomePlatform/QGnomePlatform.changes
2022-02-24 18:24:22.126644175 +0100
+++ /work/SRC/openSUSE:Factory/.QGnomePlatform.new.2275/QGnomePlatform.changes
2022-09-29 18:12:45.435184934 +0200
@@ -1,0 +2,60 @@
+Tue Sep 27 00:51:38 UTC 2022 - Luciano Santos <luc1...@opensuse.org>
+
+- Update to version 0.9.0:
+ + Changes:
+ - QGnomePlatform has been now internally split into two
+ providers for configuration, where only one is used at a time
+ (not mixed together as before). We can even switch between
+ providers on runtime, e.g. when xdg-desktop-portal is started
+ later.
+ - QGnomePlatform can now switch between dark/light themes on
+ runtime (requires Adwaita-qt 1.4.2).
+ - Implements QPlatformTheme::Appearance() for Qt6.
+ - Added support for window menu into client-side decorations.
+ - Added support for native system try icon using QGnomeTheme
+ for Qt6.
+ - Added support for GNOME 42 theme switching (using Settings
+ portal).
+ + Fixes:
+ - FileChooser portal: send window id in hex and only for
+ xwayland apps (backport from Qt).
+ - Ensure gtk uses the same windowing system as Qt (backport
+ from Qt).
+ - Fixes decoration size when QT_SCALE_FACTOR is set.
+
+-------------------------------------------------------------------
+Wed Sep 21 10:51:14 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Add Obsoletes/Provides QGnomePlatform to ease the switch-over.
+
+-------------------------------------------------------------------
+Mon Sep 5 04:52:38 UTC 2022 - Luciano Santos <luc1...@opensuse.org>
+
+- Add multibuild facility to provide both Qt5 and Qt6 flavors. This
+ is needed to hook up the right Qt base from adwaita-qt and apply
+ the configurations needed to change the styling of the window of
+ Qt apps under GNOME (boo#1202526).
+- Add respective Qt6 build requirements and make use of
+ conditionals to produce a multibuild package based on flavors.
+- Replace build requirements to match explicitly what CMakeLists
+ is looking for: libQt5PlatformSupport-private-headers-devel ->
+ cmake(Qt5XkbCommonSupport), and libQt5Core-private-headers-devel
+ -> cmake(Qt5Core).
+- Drop unneeded build requirements that are not used nor looked for
+ by CMake: pkgconfig(Qt5X11Extras), libqt5-qtwayland-devel (CMake
+ only looks for Qt5WaylandClient and WaylandClientPrivate),
+ pkgconfig(x11), and pkgconfig(gtk+-x11-3.0).
+- Add explicit pkgconfig(glib-2.0) build requirement looked for by
+ CMake but undeclared in the spec file. It was already being
+ pulled by another package though.
+- Switch all pkgconfig(*) modules by cmake(*) ones. Leap 15.4 has a
+ hard time finding pkgconfig(*) modules for adwaita-qt6, so switch
+ all qt5-dependecies too to keep them consistent.
+- Update License tag from "GPL-2.0-or-later OR LGPL-3.0-only" to
+ "LGPL-2.1-or-later AND (LGPL-3.0-only OR GPL-2.0-only OR
+ GPL-3.0-only)". Basically all the source code is LGPL-2.1 or any
+ later version, but the qgtk3dialoghelpers cpp/header files can be
+ either LGPL-3.0 or choose between GPL-2.0 and GPL-3.0 and later
+ versions approved by the KDE Free Qt Foundation.
+
+-------------------------------------------------------------------
Old:
----
QGnomePlatform-0.8.4.tar.gz
New:
----
QGnomePlatform-0.9.0.tar.gz
_multibuild
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ QGnomePlatform.spec ++++++
--- /var/tmp/diff_new_pack.xikRcG/_old 2022-09-29 18:12:46.871187740 +0200
+++ /var/tmp/diff_new_pack.xikRcG/_new 2022-09-29 18:12:46.875187747 +0200
@@ -1,9 +1,9 @@
#
-# spec file for package QGnomePlatform
+# spec file
#
# Copyright (c) 2022 SUSE LLC
-# Copyright ?? 2016 Yuriy Gorodilin <yur...@gmail.com>
-# Copyright ?? 2018???2019 Markus S. <kamika...@opensuse.org>
+# Copyright (c) 2018???2019 Markus S. <kamika...@opensuse.org>
+# Copyright (c) 2016 Yuriy Gorodilin <yur...@gmail.com>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,52 +18,118 @@
#
-Name: QGnomePlatform
-Version: 0.8.4
+%global flavor @BUILD_FLAVOR@%{nil}
+%define name_suffix %{nil}
+%if "%{flavor}" == ""
+ExclusiveArch: do_not_build
+%endif
+%if "%{flavor}" == "qt5"
+#
+# Qt5 Flavor
+#
+ %define pkg_name QGnomePlatform-qt5
+ %define qt5 1
+ %define qt_min_version 5.15.2
+ %define _qt_plugindir %{_libqt5_plugindir}
+ %define name_suffix -qt5
+%elif "%{flavor}" == "qt6"
+#
+# Qt6 Flavor
+#
+ %define pkg_name QGnomePlatform-qt6
+ %define qt6 1
+ %define qt_min_version 6.2.0
+ %define _qt_plugindir %{_qt6_pluginsdir}
+ %define name_suffix -qt6
+%endif
+
+%define adwaitaqt_version 1.4.2
+
+Name: QGnomePlatform%{?name_suffix}
+Version: 0.9.0
Release: 0
-Summary: A better Qt application inclusion in GNOME
-# Most code is LGPL-2.1-or-later but qgtk3dialoghelpers files forked from
-# Qt 5 result in this licensing scheme for the combined work:
-License: GPL-2.0-or-later OR LGPL-3.0-only
+Summary: A better Qt application inclusion under GNOME
+#
+# Most code is LGPL-2.1 or any later version but qgtk3dialoghelpers files,
+# forked from Qt 5, let's us choose beteween LGPL-3.0 and GPL-2.0 or even
+# GPL-3.0 or still any later version approved by the KDE Free Qt Foundation.
+# So we're better off using LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only on
+# behalf of qgtk3dialoghelpers' source code rather the using *-or-later and
+# risk getting screwed over by KDE Free Qt Foundation someday.
+#
+# This is what the license tag should look like:
+# LGPL-2.1-or-later AND (LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-only))
+#
+# But since we do not have support for such nested logic let us use:
+# LGPL-2.1-or-later AND (LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only)
+#
+# NOTE: Keep an eye on it so that the bots don't mess up the logic, ordey is
+# important here.
+# You may have to append --noservice to 'osc build'/'osc checkin'.
+#
+License: (GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-only) AND
LGPL-2.1-or-later
Group: System/GUI/GNOME
URL: https://github.com/FedoraQt/QGnomePlatform/
-Source: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source:
%{url}/archive/%{version}.tar.gz#/QGnomePlatform-%{version}.tar.gz
+
BuildRequires: cmake
BuildRequires: gcc-c++
# QGnomePlatform relies on glib's pkgconfig file to find gsettings files
BuildRequires: gsettings-desktop-schemas
-BuildRequires: libQt5Core-private-headers-devel
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gtk+-3.0)
+%if 0%{?qt5}
+#
+# Qt5 Buildtime Dependencies
+#
BuildRequires: libQt5Gui-private-headers-devel
-BuildRequires: libQt5PlatformSupport-private-headers-devel
-BuildRequires: libqt5-qtwayland-devel
BuildRequires: libqt5-qtwayland-private-headers-devel
-BuildRequires: pkgconfig
+BuildRequires: cmake(AdwaitaQt) >= %{adwaitaqt_version}
+BuildRequires: cmake(Qt5Core) >= %{qt_min_version}
+BuildRequires: cmake(Qt5DBus) >= %{qt_min_version}
+BuildRequires: cmake(Qt5Gui) >= %{qt_min_version}
BuildRequires: cmake(Qt5ThemeSupport)
-BuildRequires: pkgconfig(Qt5DBus) >= 5.12.2
-BuildRequires: pkgconfig(Qt5WaylandClient) >= 5.12.2
-BuildRequires: pkgconfig(Qt5Widgets) >= 5.12.2
-BuildRequires: pkgconfig(Qt5X11Extras) >= 5.12.2
-BuildRequires: pkgconfig(adwaita-qt) >= 1.4.1
-BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(gtk+-x11-3.0)
-BuildRequires: pkgconfig(x11)
-Requires: adwaita-qt5
-
+BuildRequires: cmake(Qt5WaylandClient) >= %{qt_min_version}
+BuildRequires: cmake(Qt5Widgets) >= %{qt_min_version}
+BuildRequires: cmake(Qt5XkbCommonSupport)
Supplements: (libQt5Gui5 and gnome-session)
+Obsoletes: QGnomePlatform =< 0.8.4
+Provides: QGnomePlatform = %{version}
+%elif 0%{?qt6}
+#
+# Qt6 Buildtime Dependencies
+#
+BuildRequires: qt6-gui-private-devel
+BuildRequires: qt6-wayland-private-devel
+# Use cmake() instead of pkgconfig() to make Leap 15.4's life easier.
+BuildRequires: cmake(AdwaitaQt6) >= %{adwaitaqt_version}
+BuildRequires: cmake(Qt6Core) >= %{qt_min_version}
+BuildRequires: cmake(Qt6DBus) >= %{qt_min_version}
+BuildRequires: cmake(Qt6Gui) >= %{qt_min_version}
+BuildRequires: cmake(Qt6WaylandClient) >= %{qt_min_version}
+BuildRequires: cmake(Qt6Widgets) >= %{qt_min_version}
+Supplements: (libQt6Gui6 and gnome-session)
+%endif
+#
+# Runtime Dependencies
+#
+Requires: adwaita-%{flavor}
%description
QGnomePlatform is a Qt Platform Theme designed to use as many of the GNOME
settings as possible in unmodified Qt applications. It allows Qt applications
to fit into the environment as well as possible.
-%define libqt5_archdatadir %{_libdir}/qt5
-%define libqt5_plugindir %{libqt5_archdatadir}/plugins
-
%prep
-%autosetup -p1
+%autosetup -p1 -n QGnomePlatform-%{version}
%build
-%cmake
+%cmake \
+ %{?qt5:-D USE_QT6=OFF} \
+ %{?qt6:-D USE_QT6=ON} \
+ %{nil}
+
%cmake_build
%install
@@ -72,10 +138,11 @@
%files
%doc README.md
%license LICENSE
-%{_libdir}/libqgnomeplatform.so
-%dir %{libqt5_plugindir}
-%dir %{libqt5_plugindir}/platformthemes
-%{libqt5_plugindir}/platformthemes/libqgnomeplatformtheme.so
-%{libqt5_plugindir}/wayland-decoration-client/libqgnomeplatformdecoration.so
+# Qt6 SONAME is libqgnomeplatform6.so so expand a "6" when appropriate.
+%{_libdir}/libqgnomeplatform%{?qt6:6}.so
+%dir %{_qt_plugindir}
+%dir %{_qt_plugindir}/platformthemes
+%{_qt_plugindir}/platformthemes/libqgnomeplatformtheme.so
+%{_qt_plugindir}/wayland-decoration-client/libqgnomeplatformdecoration.so
%changelog
++++++ QGnomePlatform-0.8.4.tar.gz -> QGnomePlatform-0.9.0.tar.gz ++++++
++++ 3805 lines of diff (skipped)
++++++ _multibuild ++++++
<multibuild>
<flavor>qt5</flavor>
<flavor>qt6</flavor>
</multibuild>
