!45 [sync] PR-44: update glib2 error

From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2023-05-25 05:30:32 +00:00 committed by Gitee
commit c64020572b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1,18 +1,12 @@
#glib2-devel >= 2.74.4 glib2test 1
%global glib2test 0
Name: ukui-screensaver Name: ukui-screensaver
Version: 3.1.1 Version: 3.1.1
Release: 3 Release: 4
Summary: Screensaver for UKUI desktop environment Summary: Screensaver for UKUI desktop environment
License: GPL-3+ and GPL-2+ License: GPL-3+ and GPL-2+
URL: http://www.ukui.org URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch01: 0001-fix-root-can-not-input-passwd-bug.patch Patch01: 0001-fix-root-can-not-input-passwd-bug.patch
#glib2-devel >= 2.74.4 apply pathch02
%if %{?glib2test}
Patch02: 0002-fix-build-compile-error.patch Patch02: 0002-fix-build-compile-error.patch
%endif
BuildRequires: cmake BuildRequires: cmake
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
@ -43,10 +37,10 @@ provided by biometric-auth service.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch01 -p1
%if %{?glib2test} if [ -e "/usr/include/glib-2.0/gio/gunixfdlist.h" ]; then
%patch2 -p1 %patch02 -p1
%endif fi
%build %build
cmake . cmake .
@ -81,6 +75,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||:
%{_prefix}/lib/ukui-screensaver/screensaver-focus-helper %{_prefix}/lib/ukui-screensaver/screensaver-focus-helper
%changelog %changelog
* Thu May 25 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-4
- update glib2 error
* Fri Feb 10 2023 tanyulong <tanyulong@kylinos.cn> - 3.1.1-3 * Fri Feb 10 2023 tanyulong <tanyulong@kylinos.cn> - 3.1.1-3
- fix build compile error - fix build compile error