From 918cc8a65601308af6dc6b874f41037636b5403f Mon Sep 17 00:00:00 2001 From: peijiankang Date: Wed, 13 Jul 2022 10:33:19 +0800 Subject: [PATCH] Replace gunixconnection.h file in gio-unix include dir check (cherry picked from commit 8cb47968bf11f4e8e46cdca55c2acaab31785f58) --- ...e-gunixconnection.h-file-in-gio-unix.patch | 27 +++++++++++++++++++ lxqt-build-tools.spec | 9 ++++--- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 0001-Replace-gunixconnection.h-file-in-gio-unix.patch diff --git a/0001-Replace-gunixconnection.h-file-in-gio-unix.patch b/0001-Replace-gunixconnection.h-file-in-gio-unix.patch new file mode 100644 index 0000000..7b00f0f --- /dev/null +++ b/0001-Replace-gunixconnection.h-file-in-gio-unix.patch @@ -0,0 +1,27 @@ +From 44b7d6baed8f85cc516fedd6f2f5628efdef5707 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Wed, 13 Jul 2022 10:29:39 +0800 +Subject: [PATCH] Replace gunixconnection.h file in gio-unix include dir check + +--- + cmake/find-modules/FindGLIB.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/find-modules/FindGLIB.cmake b/cmake/find-modules/FindGLIB.cmake +index 0564b8d..014ef1c 100644 +--- a/cmake/find-modules/FindGLIB.cmake ++++ b/cmake/find-modules/FindGLIB.cmake +@@ -101,8 +101,8 @@ 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/gunixconnection.h +- HINTS ${GIO_UNIX_INCLUDEDIR} ++ NAMES gio/gunixfdlist.h ++ HINTS ${GIO_UNIX_INCLUDEDIR} + PATH_SUFFIXES gio-unix-2.0) + + set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GIO_UNIX_INCLUDE_DIR) +-- +2.33.0 + diff --git a/lxqt-build-tools.spec b/lxqt-build-tools.spec index d3f48a2..a82e9b7 100644 --- a/lxqt-build-tools.spec +++ b/lxqt-build-tools.spec @@ -1,12 +1,12 @@ Name: lxqt-build-tools Version: 0.10.0 -Release: 1 +Release: 2 Summary: Packaging tools for LXQt License: BSD URL: http://lxqt.org/ Source0: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz - +Patch01: 0001-Replace-gunixconnection.h-file-in-gio-unix.patch BuildArch: noarch BuildRequires: %{?fedora:cmake}%{!?fedora:cmake3} >= 3.0 @@ -44,7 +44,10 @@ popd %changelog -* Thu Jan 13 2022 pei-jiankang - 0.10.0-1 +* Wed Jul 13 2022 peijiankang - 0.10.0-2 +- Replace gunixconnection.h file in gio-unix include dir check + +* Thu Jan 13 2022 peijiankang - 0.10.0-1 - update to upstream version 0.10.0 * Mon Dec 28 2020 Ge Wang - 0.6.0-2