packages/lxqt-build-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!10 [sync] PR-9: Replace gunixconnection.h file in gio-unix include dir check

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2022-07-28 15:12:12 +00:00 committed by Gitee
commit e3cf211abb
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Replace-gunixconnection.h-file-in-gio-unix.patch Normal file
View File

@ -0,0 +1,27 @@
From 44b7d6baed8f85cc516fedd6f2f5628efdef5707 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
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

9
lxqt-build-tools.spec
View File

@ -1,12 +1,12 @@
Name: lxqt-build-tools Name: lxqt-build-tools
Version: 0.10.0 Version: 0.10.0
Release: 1 Release: 2
Summary: Packaging tools for LXQt Summary: Packaging tools for LXQt
License: BSD License: BSD
URL: http://lxqt.org/ URL: http://lxqt.org/
Source0: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz 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 BuildArch: noarch
BuildRequires: %{?fedora:cmake}%{!?fedora:cmake3} >= 3.0 BuildRequires: %{?fedora:cmake}%{!?fedora:cmake3} >= 3.0
@ -44,7 +44,10 @@ popd
%changelog %changelog
* Thu Jan 13 2022 pei-jiankang<peijiankang@kylinos.cn> - 0.10.0-1 * Wed Jul 13 2022 peijiankang<peijiankang@kylinos.cn> - 0.10.0-2
- Replace gunixconnection.h file in gio-unix include dir check
* Thu Jan 13 2022 peijiankang<peijiankang@kylinos.cn> - 0.10.0-1
- update to upstream version 0.10.0 - update to upstream version 0.10.0
* Mon Dec 28 2020 Ge Wang <wangge20@huawei.com> - 0.6.0-2 * Mon Dec 28 2020 Ge Wang <wangge20@huawei.com> - 0.6.0-2