Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package QGnomePlatform for openSUSE:Factory
checked in at 2023-03-03 22:28:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/QGnomePlatform (Old)
and /work/SRC/openSUSE:Factory/.QGnomePlatform.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QGnomePlatform"
Fri Mar 3 22:28:34 2023 rev:11 rq:1069132 version:0.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/QGnomePlatform/QGnomePlatform.changes
2022-09-29 18:12:45.435184934 +0200
+++ /work/SRC/openSUSE:Factory/.QGnomePlatform.new.31432/QGnomePlatform.changes
2023-03-03 22:31:42.124106688 +0100
@@ -1,0 +2,10 @@
+Thu Mar 2 15:56:04 UTC 2023 - Antonio Larrosa <alarr...@suse.com>
+
+- Don't use %elif which is not supported in SLE/Leap
+- Use qt6 macros when building the qt6 flavor so the correct
+ compiler is used to build the package in SLE/Leap
+- Add patch to fix an undefined reference to XSetTransientForHint
+ in SLE/Leap:
+ * fix-XSetTransientForHint.patch
+
+-------------------------------------------------------------------
New:
----
fix-XSetTransientForHint.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ QGnomePlatform.spec ++++++
--- /var/tmp/diff_new_pack.Gtvj0F/_old 2023-03-03 22:31:42.668109008 +0100
+++ /var/tmp/diff_new_pack.Gtvj0F/_new 2023-03-03 22:31:42.672109025 +0100
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2018â2019 Markus S. <kamika...@opensuse.org>
# Copyright (c) 2016 Yuriy Gorodilin <yur...@gmail.com>
#
@@ -32,7 +32,8 @@
%define qt_min_version 5.15.2
%define _qt_plugindir %{_libqt5_plugindir}
%define name_suffix -qt5
-%elif "%{flavor}" == "qt6"
+%endif
+%if "%{flavor}" == "qt6"
#
# Qt6 Flavor
#
@@ -71,6 +72,7 @@
Group: System/GUI/GNOME
URL: https://github.com/FedoraQt/QGnomePlatform/
Source:
%{url}/archive/%{version}.tar.gz#/QGnomePlatform-%{version}.tar.gz
+Patch0: fix-XSetTransientForHint.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -96,7 +98,8 @@
Supplements: (libQt5Gui5 and gnome-session)
Obsoletes: QGnomePlatform =< 0.8.4
Provides: QGnomePlatform = %{version}
-%elif 0%{?qt6}
+%endif
+%if 0%{?qt6}
#
# Qt6 Buildtime Dependencies
#
@@ -125,15 +128,27 @@
%autosetup -p1 -n QGnomePlatform-%{version}
%build
+%if 0%{?qt6}
+%cmake_qt6 \
+%else
%cmake \
+%endif
%{?qt5:-D USE_QT6=OFF} \
%{?qt6:-D USE_QT6=ON} \
%{nil}
+%if 0%{?qt6}
+%qt6_build
+%else
%cmake_build
+%endif
%install
+%if 0%{?qt6}
+%{qt6_install}
+%else
%cmake_install
+%endif
%files
%doc README.md
++++++ fix-XSetTransientForHint.patch ++++++
From: Antonio Larrosa <alarr...@suse.com>
Subject: Fix undefined reference to XSetTransientForHint
Index: QGnomePlatform-0.9.0/CMakeLists.txt
===================================================================
--- QGnomePlatform-0.9.0.orig/CMakeLists.txt
+++ QGnomePlatform-0.9.0/CMakeLists.txt
@@ -94,6 +94,8 @@ if (NOT QT_PLUGINS_DIR)
endif()
endif()
+find_package(X11 REQUIRED)
+
add_subdirectory(src)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES
FATAL_ON_MISSING_REQUIRED_PACKAGES)
Index: QGnomePlatform-0.9.0/src/theme/CMakeLists.txt
===================================================================
--- QGnomePlatform-0.9.0.orig/src/theme/CMakeLists.txt
+++ QGnomePlatform-0.9.0/src/theme/CMakeLists.txt
@@ -18,6 +18,7 @@ target_link_libraries(qgnomeplatformthem
Qt${QT_VERSION_MAJOR}::GuiPrivate
${ADWAITAQT_LIBRARIES}
PkgConfig::GTK+3
+ X11::X11
)
if (NOT USE_QT6)
