diff options
Diffstat (limited to 'app-crypt/gcr/files')
3 files changed, 30 insertions, 74 deletions
diff --git a/app-crypt/gcr/files/3.41.1-implicit-func-decl.patch b/app-crypt/gcr/files/3.41.1-implicit-func-decl.patch new file mode 100644 index 000000000000..f1f1ddc0b5d9 --- /dev/null +++ b/app-crypt/gcr/files/3.41.1-implicit-func-decl.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/900152 + +It doesn't make sense to default XOPEN_SOURCE and subsequently DEFAULT_SOURCE +as DEFAULT_SOURCE is asking for no extensions. Anyway, just ask for GNU_SOURCE +as it'll placate both musl and glibc for all of strptime/timegm/getpass and +gcr-3 is obsolete anyway. +--- a/gck/meson.build ++++ b/gck/meson.build +@@ -77,8 +77,7 @@ gck_cflags = [ + '-DGCK_API_SUBJECT_TO_CHANGE', + '-DP11_KIT_API_SUBJECT_TO_CHANGE', + '-DPKCS11_REGISTRY_DIR="@0@"'.format(get_option('prefix') / get_option('libdir') / 'pkcs11'), +- '-D_XOPEN_SOURCE', # Needed for strptime() +- '-D_DEFAULT_SOURCE', # Needed for timegm ++ '-D_GNU_SOURCE', # Needed for strptime(), timegm, getpass + ] + + gck_symbolmap = meson.current_source_dir() / 'libgck.map' +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -146,7 +146,7 @@ gcr_base_cflags = [ + '-DGCR_API_SUBJECT_TO_CHANGE', + '-DGCK_API_SUBJECT_TO_CHANGE', + '-DP11_KIT_API_SUBJECT_TO_CHANGE', +- '-D_XOPEN_SOURCE', # Needed for strptime() ++ '-D_GNU_SOURCE', # Needed for strptime(), timegm, getpass + ] + + gcr_base_symbolmap = meson.current_source_dir() / 'libgcr-base.map' + diff --git a/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch b/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch deleted file mode 100644 index 4bf8efbb1d73..000000000000 --- a/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch -https://bugs.gentoo.org/831428 - -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 ---- 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', ---- 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', ---- 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/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch b/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch deleted file mode 100644 index eac12c0a34a2..000000000000 --- a/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot <ajacoutot@gnome.org> -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 <glib/gstdio.h> - #include <gcr/gcr-base.h> - --#ifdef WITH_SYSTEMD -+#if WITH_SYSTEMD - #include <systemd/sd-daemon.h> - #endif - --- -2.35.1 - |