!11 Fix unknown kw argument in gnome.generate_gir

From: @wcc_140409 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2022-06-21 08:59:09 +00:00 committed by Gitee
commit 4d2ff1f52f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 64 additions and 1 deletions

View File

@ -0,0 +1,58 @@
From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Wed, 12 Jan 2022 00:24:20 +0100
Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
This argument has been removed in Meson 0.61.0:
gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
Fixes #89
---
gck/meson.build | 1 -
gcr/meson.build | 1 -
ui/meson.build | 1 -
3 files changed, 3 deletions(-)
diff --git a/gck/meson.build b/gck/meson.build
index 756b4866..a21a1e9d 100644
--- a/gck/meson.build
+++ b/gck/meson.build
@@ -131,7 +131,6 @@ if get_option('introspection')
sources: gck_gir_sources,
namespace: 'Gck',
nsversion: '@0@'.format(gck_major_version),
- packages: gck_deps,
export_packages: 'gck-@0@'.format(gck_major_version),
includes: [ 'GObject-2.0', 'Gio-2.0' ],
header: 'gck/gck.h',
diff --git a/gcr/meson.build b/gcr/meson.build
index 2233a445..c83641ba 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -190,7 +190,6 @@ if get_option('introspection')
sources: [ gcr_base_public_sources, gcr_base_headers ],
namespace: 'Gcr',
nsversion: '@0@'.format(gcr_major_version),
- packages: gcr_base_deps,
export_packages: 'gcr-base-@0@'.format(gcr_major_version),
includes: [
'GObject-2.0',
diff --git a/ui/meson.build b/ui/meson.build
index e656ea23..32ee057f 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -152,7 +152,6 @@ if get_option('introspection')
export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
identifier_prefix: 'Gcr',
symbol_prefix: 'gcr',
- packages: gcr_ui_deps,
includes: [
'GObject-2.0',
'Gio-2.0',
--
GitLab

View File

@ -4,7 +4,7 @@
Name: gcr Name: gcr
Version: 3.41.0 Version: 3.41.0
Release: 1 Release: 2
Summary: A library for bits of crypto UI and parsing Summary: A library for bits of crypto UI and parsing
License: LGPLv2+ License: LGPLv2+
URL: https://wiki.gnome.org/Projects/CryptoGlue URL: https://wiki.gnome.org/Projects/CryptoGlue
@ -25,6 +25,8 @@ Requires: %{name}-base%{?_isa} = %{version}-%{release}
Requires: /usr/bin/ssh-add Requires: /usr/bin/ssh-add
Requires: /usr/bin/ssh-agent Requires: /usr/bin/ssh-agent
Patch6000: backport-Fix-unknown-kw-argument-in-gnome-generate_gir.patch
%description %description
gcr is a library for displaying certificates, and crypto UI, accessing key stores. It also provides a viewer for gcr is a library for displaying certificates, and crypto UI, accessing key stores. It also provides a viewer for
crypto files on the GNOME desktop.gck is a library for accessing PKCS#11 modules like smart cards. crypto files on the GNOME desktop.gck is a library for accessing PKCS#11 modules like smart cards.
@ -116,6 +118,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
%{_libdir}/libgcr-base-3.so.1* %{_libdir}/libgcr-base-3.so.1*
%changelog %changelog
* Mon Jun 20 wuchaochao <wuchaochao4@h-partners.com> - 3.41.0-2
- Fix unknown kw argument in gnome.generate_gir
* Mon Dec 6 2021 hanhui <hanhui15@huawei.com> - 3.41.0-1 * Mon Dec 6 2021 hanhui <hanhui15@huawei.com> - 3.41.0-1
- update to gcr-3.41.0 - update to gcr-3.41.0