!14 update to 3.41.1
From: @zhang__3125 Reviewed-by: @dwl301 Signed-off-by: @dwl301
This commit is contained in:
commit
e5258773bc
@ -1,58 +0,0 @@
|
|||||||
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
|
|
||||||
Binary file not shown.
BIN
gcr-3.41.1.tar.xz
Normal file
BIN
gcr-3.41.1.tar.xz
Normal file
Binary file not shown.
26
gcr.spec
26
gcr.spec
@ -3,8 +3,8 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: gcr
|
Name: gcr
|
||||||
Version: 3.41.0
|
Version: 3.41.1
|
||||||
Release: 2
|
Release: 1
|
||||||
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
|
||||||
@ -12,20 +12,18 @@ Source0: https://download-fallback.gnome.org/sources/%{name}/3.41/%{name}
|
|||||||
|
|
||||||
BuildRequires: pkgconfig(gio-unix-2.0) pkgconfig(gobject-introspection-1.0) pkgconfig(gtk+-3.0) pkgconfig(p11-kit-1)
|
BuildRequires: pkgconfig(gio-unix-2.0) pkgconfig(gobject-introspection-1.0) pkgconfig(gtk+-3.0) pkgconfig(p11-kit-1)
|
||||||
BuildRequires: chrpath docbook-style-xsl libgcrypt-devel desktop-file-utils intltool vala gnupg2 libxslt meson
|
BuildRequires: chrpath docbook-style-xsl libgcrypt-devel desktop-file-utils intltool vala gnupg2 libxslt meson
|
||||||
BuildRequires: gtk-doc gettext cmake pkgconfig(libsecret-1) pkgconfig(libsystemd)
|
BuildRequires: gi-docgen gettext cmake pkgconfig(libsecret-1) pkgconfig(libsystemd)
|
||||||
%if 0%{?has_valgrind}
|
%if 0%{?has_valgrind}
|
||||||
BuildRequires: valgrind-devel
|
BuildRequires: valgrind-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: /usr/bin/gpg2
|
BuildRequires: /usr/bin/gpg2
|
||||||
BuildRequires: /usr/bin/ssh-add
|
BuildRequires: openssh-clients
|
||||||
BuildRequires: /usr/bin/ssh-agent
|
BuildRequires: openssh-clients
|
||||||
BuildRequires: /usr/bin/xsltproc
|
BuildRequires: libxslt
|
||||||
|
|
||||||
Requires: %{name}-base%{?_isa} = %{version}-%{release}
|
Requires: %{name}-base%{?_isa} = %{version}-%{release}
|
||||||
Requires: /usr/bin/ssh-add
|
Requires: openssh-clients
|
||||||
Requires: /usr/bin/ssh-agent
|
Requires: openssh-clients
|
||||||
|
|
||||||
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
|
||||||
@ -107,10 +105,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
|
|||||||
%{_libdir}/pkgconfig/gcr-base-3.pc
|
%{_libdir}/pkgconfig/gcr-base-3.pc
|
||||||
%{_libdir}/pkgconfig/gcr-ui-3.pc
|
%{_libdir}/pkgconfig/gcr-ui-3.pc
|
||||||
%{_datadir}/gir-1.0
|
%{_datadir}/gir-1.0
|
||||||
%dir %{_datadir}/gtk-doc
|
%{_datadir}/doc
|
||||||
%dir %{_datadir}/gtk-doc/html
|
|
||||||
%{_datadir}/gtk-doc/html/gck
|
|
||||||
%{_datadir}/gtk-doc/html/gcr
|
|
||||||
%{_datadir}/vala/
|
%{_datadir}/vala/
|
||||||
|
|
||||||
%files base
|
%files base
|
||||||
@ -118,6 +113,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
|
||||||
|
* Fri Nov 11 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.41.1-1
|
||||||
|
- update to gcr-3.41.1
|
||||||
|
|
||||||
* Mon Jun 20 wuchaochao <wuchaochao4@h-partners.com> - 3.41.0-2
|
* Mon Jun 20 wuchaochao <wuchaochao4@h-partners.com> - 3.41.0-2
|
||||||
- Fix unknown kw argument in gnome.generate_gir
|
- Fix unknown kw argument in gnome.generate_gir
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user