From 1cc54aeb8d654141ea48516345b32f8a0bb75ba6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 12 Aug 2022 01:04:16 +0200 Subject: [PATCH] gcr: update to 3.41.1. --- srcpkgs/gcr/patches/meson-0.61.patch | 59 -------------------- srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 -------- srcpkgs/gcr/template | 36 +++++------- 3 files changed, 13 insertions(+), 105 deletions(-) delete mode 100644 srcpkgs/gcr/patches/meson-0.61.patch delete mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch diff --git a/srcpkgs/gcr/patches/meson-0.61.patch b/srcpkgs/gcr/patches/meson-0.61.patch deleted file mode 100644 index 21c1c3610226b2..00000000000000 --- a/srcpkgs/gcr/patches/meson-0.61.patch +++ /dev/null @@ -1,59 +0,0 @@ -From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka -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 756b486..a21a1e9 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 2233a44..c83641b 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 e656ea2..32ee057 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 - diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch deleted file mode 100644 index ca2660244c37e1..00000000000000 --- a/srcpkgs/gcr/patches/unbreak-no-systemd.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Sun, 24 Oct 2021 10:26:03 +0200 -Subject: [PATCH] Unbreak build without systemd. - -This fixes the check for WITH_SYSTEMD and prevents a fatal error: -'systemd/sd-daemon.h' file not found when building with systemd disabled. ---- - gcr/gcr-ssh-agent-service.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c -index 3b5a4ca..b7e8928 100644 ---- a/gcr/gcr-ssh-agent-service.c -+++ b/gcr/gcr-ssh-agent-service.c -@@ -39,7 +39,7 @@ - #include - #include - --#ifdef WITH_SYSTEMD -+#if WITH_SYSTEMD - #include - #endif diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index 5ab7455fb53951..b43ee6b1b423ed 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -1,33 +1,27 @@ # Template file for 'gcr' pkgname=gcr -version=3.41.0 +version=3.41.1 revision=1 build_style=meson build_helper="gir" -hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh - libxslt $(vopt_if vala vala)" -makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel - $(vopt_if vala vala)" -depends="desktop-file-utils hicolor-icon-theme gnupg2" +configure_args="$(vopt_bool gir introspection) $(vopt_bool gir gtk_doc)" +hostmakedepends="gettext glib-devel gnupg gi-docgen gettext pkg-config openssh + libxslt $(vopt_if gir vala)" +makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel" +depends="desktop-file-utils hicolor-icon-theme gnupg" +checkdepends="dbus" short_desc="GNOME crypto package" maintainer="Orphaned " license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gcr" distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz" -checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01 - -if [ "$CROSS_BUILD" ]; then - configure_args="-Dgtk_doc=false" -fi +checksum=bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f +make_check_pre="dbus-run-session" +make_check=no # Gcr:ERROR:../gcr/test-gnupg-collection.c:203:test_load: assertion failed: (record) # Package build options -build_options="gir vala" -build_options_default="gir vala" - -do_check() { - # requires X11 server - : -} +build_options="gir" +build_options_default="gir" post_install() { vinstall ${FILESDIR}/10-gcr-memlock.conf 644 etc/security/limits.d @@ -40,13 +34,9 @@ gcr-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - if [ -z "$CROSS_BUILD" ]; then - vmove usr/share/gtk-doc - fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 - fi - if [ "$build_option_vala" ]; then + vmove usr/share/doc vmove usr/share/vala fi }