Accepting request 1006924 from X11:LXQt

OBS-URL: https://build.opensuse.org/request/show/1006924
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-build-tools?expand=0&rev=12

4991811-fix-FindGLIB.cmake.patch

@@ -0,0 +1,35 @@
+From 4991811d9212ec1176af6d1cbe88aa37efad4836 Mon Sep 17 00:00:00 2001
+From: Zamir SUN <zsun@fedoraproject.org>
+Date: Fri, 15 Jul 2022 18:06:03 +0800
+Subject: [PATCH] FindGLIB.cmake: Use gdesktopappinfo.h to find gio-unix-2.0
+ (#79)
+
+In glib2 2.73.1 gunixfdlist have been moved into glib-2.0
+
+<mock-chroot> sh-5.1# rpm -ql glib2-devel | grep gio/gunixfdlist.h
+/usr/include/glib-2.0/gio/gunixfdlist.h
+<mock-chroot> sh-5.1# rpm -q glib2-devel
+glib2-devel-2.73.1-2.fc37.x86_64
+
+So using gdesktopappinfo.h for gio-unix-2.0.
+
+Fixes: https://github.com/lxqt/lxqt-build-tools/issues/78
+
+Signed-off-by: Zamir SUN <sztsian@gmail.com>
+---
+ cmake/find-modules/FindGLIB.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/find-modules/FindGLIB.cmake b/cmake/find-modules/FindGLIB.cmake
+index bb2336a..c6a06f7 100644
+--- a/cmake/find-modules/FindGLIB.cmake
++++ b/cmake/find-modules/FindGLIB.cmake
+@@ -101,7 +101,7 @@ foreach (_component ${GLIB_FIND_COMPONENTS})
+     elseif (${_component} STREQUAL "gio-unix")
+         pkg_check_modules(GIO_UNIX gio-unix-2.0)
+         find_path(GLIB_GIO_UNIX_INCLUDE_DIR
+-                  NAMES gio/gunixfdlist.h
++                  NAMES gio/gdesktopappinfo.h
+                   HINTS ${GIO_UNIX_INCLUDEDIR}
+                   PATH_SUFFIXES gio-unix-2.0)
+ 

lxqt-build-tools.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 29 09:18:23 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add patch to fix libqt5xdg with latest glib-2.0:
+  * 4991811-fix-FindGLIB.cmake.patch
+
 -------------------------------------------------------------------
 Mon Aug 29 14:23:55 UTC 2022 - Michael Vetter <mvetter@suse.com>
 

lxqt-build-tools.spec

@@ -27,6 +27,8 @@ Source:         https://github.com/lxqt/%{name}/releases/download/%{version}/%{n
 Source1:        https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
 # PATCH-FIX-UPSTREAM lxqt-build-tools-symbolic.patch [bsc#1195421]
 Patch0:         lxqt-build-tools-symbolic.patch
+# PATCH-FIX-UPSTREAM 4991811-fix-FindGLIB.cmake.patch
+Patch1:         4991811-fix-FindGLIB.cmake.patch
 BuildRequires:  cmake >= 3.1.0
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(Qt5Core) >= 5.15
@@ -50,6 +52,7 @@ These tools used to be spread over the repositories of various other components
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %cmake -DPULL_TRANSLATIONS=No