Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lxqt-build-tools for
openSUSE:Factory checked in at 2022-09-29 18:14:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lxqt-build-tools (Old)
and /work/SRC/openSUSE:Factory/.lxqt-build-tools.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-build-tools"
Thu Sep 29 18:14:27 2022 rev:12 rq:1006924 version:0.11.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/lxqt-build-tools/lxqt-build-tools.changes
2022-08-30 14:50:18.256246618 +0200
+++
/work/SRC/openSUSE:Factory/.lxqt-build-tools.new.2275/lxqt-build-tools.changes
2022-09-29 18:15:14.815477124 +0200
@@ -1,0 +2,6 @@
+Thu Sep 29 09:18:23 UTC 2022 - Guillaume GARDET <[email protected]>
+
+- Add patch to fix libqt5xdg with latest glib-2.0:
+ * 4991811-fix-FindGLIB.cmake.patch
+
+-------------------------------------------------------------------
New:
----
4991811-fix-FindGLIB.cmake.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxqt-build-tools.spec ++++++
--- /var/tmp/diff_new_pack.jPdRbU/_old 2022-09-29 18:15:15.287478050 +0200
+++ /var/tmp/diff_new_pack.jPdRbU/_new 2022-09-29 18:15:15.291478057 +0200
@@ -27,6 +27,8 @@
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 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%cmake -DPULL_TRANSLATIONS=No
++++++ 4991811-fix-FindGLIB.cmake.patch ++++++
>From 4991811d9212ec1176af6d1cbe88aa37efad4836 Mon Sep 17 00:00:00 2001
From: Zamir SUN <[email protected]>
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 <[email protected]>
---
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)
