!5 fix build error,update GLib target version

From: @blublue
Reviewed-by: @weidongkl
Signed-off-by: @weidongkl
This commit is contained in:
openeuler-ci-bot 2021-10-18 13:38:02 +00:00 committed by Gitee
commit d40754dee2
2 changed files with 34 additions and 2 deletions

View File

@ -4,12 +4,13 @@
Name: dconf-editor
Version: 3.30.2
Release: 2
Release: 3
Summary: Graphical editor for dconf
License: GPLv3+ and CC0
URL: https://wiki.gnome.org/Projects/dconf
Source0: https://download.gnome.org/sources/dconf-editor/3.30/dconf-editor-%{version}.tar.xz
Patch0: update_glib_target_version.patch
BuildRequires: /usr/bin/appstream-util desktop-file-utils gettext meson vala
BuildRequires: pkgconfig(dconf) >= %{dconf_version} pkgconfig(glib-2.0) >= %{glib2_version}
@ -23,7 +24,7 @@ This package provides a graphical tool for editing the dconf database.
%package_help
%prep
%autosetup -p1
%autosetup -p1 -S git
%build
%meson
@ -53,5 +54,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/ca.desrt.dconf-editor
%{_mandir}/man1/dconf-editor.1*
%changelog
* Mon Oct 18 2021 guoqinglan <guoqinglan@uniontech.com> - 3.30.2-3
- fix build error, update GLib target version
* Tue Nov 19 2019 mengxian <mengxian@huawei.com> - 3.30.2-2
- Package init

View File

@ -0,0 +1,28 @@
From fb5f6ab81253f96f6fca534bf1437261b3fb6250 Mon Sep 17 00:00:00 2001
From: guoqinglan <guoqinglan@uniontech.com>
Date: Mon, 18 Oct 2021 17:30:53 +0800
Subject: [PATCH] fix(Build System): update GLib target version
fix: "error: Only a stable version of GLib can be targeted, use
MAJOR.MINOR format with MINOR as an even number"
Signed-off-by: guoqinglan <guoqinglan@uniontech.com>
---
editor/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/editor/meson.build b/editor/meson.build
index 64031bf..14934b3 100644
--- a/editor/meson.build
+++ b/editor/meson.build
@@ -121,7 +121,7 @@ sources += gnome.compile_resources(
deps = [
dependency('dconf', version: '>= 0.26.1'),
- dependency('glib-2.0', version: '>= 2.55.1'),
+ dependency('glib-2.0', version: '>= 2.56.1'),
dependency('gmodule-2.0'),
dependency('gtk+-3.0', version: '>= 3.22.27'),
valac.find_library('config', dirs: meson.current_source_dir()),
--
2.20.1