Accepting request 1266184 from KDE:Qt5

- Add patch:
  * 0001-Fix-build-with-CMake-4.patch

OBS-URL: https://build.opensuse.org/request/show/1266184
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdbusmenu-qt5?expand=0&rev=11

0001-Fix-build-with-CMake-4.patch

@@ -0,0 +1,40 @@
+From 446bbefcb9a9a50112598e9f2c341a404de001ca Mon Sep 17 00:00:00 2001
+From: Christophe Marin <christophe@krop.fr>
+Date: Tue, 1 Apr 2025 15:36:52 +0200
+Subject: [PATCH] Fix build with CMake 4
+
+---
+ CMakeLists.txt | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 72cbc45..85df937 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,9 +1,4 @@
+-project(dbusmenu-qt)
+-cmake_minimum_required(VERSION 2.8.11)
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
+-
+-# Build options
+-option(WITH_DOC "Build documentation (requires Doxygen)" ON)
++cmake_minimum_required(VERSION 3.16)
+ 
+ # Versions
+ ## Package version
+@@ -12,6 +7,12 @@ set(dbusmenu_qt_VERSION_MINOR 9)
+ set(dbusmenu_qt_VERSION_PATCH 2)
+ set(dbusmenu_qt_VERSION ${dbusmenu_qt_VERSION_MAJOR}.${dbusmenu_qt_VERSION_MINOR}.${dbusmenu_qt_VERSION_PATCH})
+ 
++project(dbusmenu-qt VERSION ${dbusmenu_qt_VERSION})
++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
++
++# Build options
++option(WITH_DOC "Build documentation (requires Doxygen)" ON)
++
+ ## Lib version
+ ### Bump this one when a binary-incompatible change is introduced
+ set(dbusmenu_qt_lib_SOVERSION 2)
+-- 
+2.49.0
+

libdbusmenu-qt5.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr  1 13:37:20 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Add patch:
+  * 0001-Fix-build-with-CMake-4.patch
+
 -------------------------------------------------------------------
 Tue Feb 20 17:48:28 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

libdbusmenu-qt5.spec

@@ -25,12 +25,13 @@ Release:        0
 URL:            https://launchpad.net/libdbusmenu-qt/
 Summary:        A Qt implementation of the DBusMenu protocol
 License:        LGPL-2.0-or-later
-Group:          System/Libraries
-Source:         https://github.com/unity8-team/%{rname}/archive/%{version}-0ubuntu1.tar.gz
+Source0:        https://github.com/unity8-team/%{rname}/archive/%{version}-0ubuntu1.tar.gz
 Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM noqDebug-qWarnings.patch -- libdbusmenu uses it's own qDebug's and qWarnings,
 # which are useless, and annoy users, so this patch just disables them in release mode
 Patch0:         noqDebug-qWarnings.patch
+# PATCH-FIX-UPSTREAM
+Patch1:         0001-Fix-build-with-CMake-4.patch
 #Needed for DISABLE_FIND_PACKAGE
 BuildRequires:  cmake
 BuildRequires:  doxygen
@@ -40,7 +41,6 @@ BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This library provides a Qt implementation of the DBusMenu protocol.
@@ -50,7 +50,6 @@ their menus over DBus. Qt5 library
 
 %package -n libdbusmenu-qt5-2
 Summary:        Development package for dbusmenu-qt5
-Group:          System/Libraries
 
 %description -n libdbusmenu-qt5-2
 This library provides a Qt implementation of the DBusMenu protocol.
@@ -60,7 +59,6 @@ their menus over DBus. Qt5 library
 
 %package -n libdbusmenu-qt5-devel
 Summary:        Development package for libdbusmenu-qt5
-Group:          Development/Libraries/Other
 Requires:       libdbusmenu-qt5-2 = %{version}
 Requires:       pkgconfig(Qt5Core)
 
@@ -74,22 +72,16 @@ This package contains development files for libdbusmenu-qt5.
 sed -i "s/HTML_TIMESTAMP         = YES/HTML_TIMESTAMP         = NO/" Doxyfile.in
 
 %build
-mkdir build
-pushd build
-export CFLAGS="%{optflags} -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT"
-export CXXFLAGS="%{optflags} -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT"
-export LDFLAGS="-Wl,-Bsymbolic-functions $LDFLAGS"
 _libsuffix=$(echo %{_lib} | cut -b4-)
-cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-      -DLIB_SUFFIX="$_libsuffix" \
-      -DUSE_QT5=ON \
-      -DCMAKE_DISABLE_FIND_PACKAGE_QJSON=TRUE \
-      -DCMAKE_BUILD_TYPE=release ..
-make %{?_smp_mflags} VERBOSE=1
-popd
+%cmake \
+  -DLIB_SUFFIX="$_libsuffix" \
+  -DUSE_QT5=ON \
+  -DCMAKE_DISABLE_FIND_PACKAGE_QJSON=TRUE \
+  -DCMAKE_BUILD_TYPE=release
+%cmake_build
 
 %install
-%makeinstall -C build
+%cmake_install
 
 # Install the documentation in the correct location
 mkdir -p %{buildroot}%{_docdir}/libdbusmenu-qt5-devel
@@ -97,11 +89,10 @@ mv %{buildroot}%{_datadir}/doc/libdbusmenu-qt5-doc/ %{buildroot}%{_docdir}/libdb
 # Install additional documentation
 install -pm 0644 COPYING NEWS README %{buildroot}%{_docdir}/libdbusmenu-qt5-devel/
 
-%fdupes -s %{buildroot}%{_docdir}/libdbusmenu-qt5-devel/
+%fdupes %{buildroot}%{_docdir}/libdbusmenu-qt5-devel/
 
 %ldconfig_scriptlets -n libdbusmenu-qt5-2
 
-
 %files -n libdbusmenu-qt5-2
 %defattr(-,root,root,-)
 %{_libdir}/libdbusmenu-qt5.so.2*