From 3dd94a2f19c5499d785533ac1055a8b3105f0813 Mon Sep 17 00:00:00 2001 From: Pascal Huber Date: Sun, 1 Jan 2023 18:00:04 +0100 Subject: [PATCH] seahorse: update to 43.0 --- srcpkgs/seahorse/patches/stdout.patch | 44 +++++++++++++++++++++++++++ srcpkgs/seahorse/template | 8 ++--- 2 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/seahorse/patches/stdout.patch diff --git a/srcpkgs/seahorse/patches/stdout.patch b/srcpkgs/seahorse/patches/stdout.patch new file mode 100644 index 000000000000..242e25bba48f --- /dev/null +++ b/srcpkgs/seahorse/patches/stdout.patch @@ -0,0 +1,44 @@ +these keywords are reserved in C..? +diff --git a/ssh/operation.vala b/ssh/operation.vala +index afa161c..b6e5926 100644 +--- a/ssh/operation.vala ++++ b/ssh/operation.vala +@@ -84,12 +84,12 @@ public abstract class Operation : GLib.Object { + + // And off we go to run the program + var subprocess = launcher.spawnv(args); +- string? stdout = null, stderr = null; ++ string? stdo = null, stde = null; + try { +- yield subprocess.communicate_utf8_async(input, cancellable, out stdout, out stderr); +- return stdout; ++ yield subprocess.communicate_utf8_async(input, cancellable, out stdo, out stde); ++ return stdo; + } catch (GLib.Error e) { +- Seahorse.Util.show_error(null, this.prompt_title, stderr); ++ Seahorse.Util.show_error(null, this.prompt_title, stde); + throw e; + } + } +@@ -221,10 +221,10 @@ public class PrivateImportOperation : Operation { + + // Start command to generate public key + string cmd = "%s -y -f '%s'".printf(Config.SSH_KEYGEN_PATH, file); +- string stdout = yield operation_async(cmd, null, cancellable); ++ string stdo = yield operation_async(cmd, null, cancellable); + + // We'll build the key string from the output +- var key_str = new StringBuilder(stdout); ++ var key_str = new StringBuilder(stdo); + + // Only use the first line of the output + int pos = int.max(key_str.str.index_of_char('\n'), key_str.str.index_of_char('\r')); +@@ -232,7 +232,7 @@ public class PrivateImportOperation : Operation { + key_str.erase(pos); + + // Parse the data so we can get the fingerprint +- KeyData? keydata = KeyData.parse_line(stdout); ++ KeyData? keydata = KeyData.parse_line(stdo); + + // Add the comment to the output + if (data.comment != null) { diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template index 29ea1021534e..72feb15cdde1 100644 --- a/srcpkgs/seahorse/template +++ b/srcpkgs/seahorse/template @@ -1,18 +1,18 @@ # Template file for 'seahorse' pkgname=seahorse -version=41.0 -revision=2 +version=43.0 +revision=1 build_style=meson build_helper=gir hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel openssh pkg-config vala" makedepends="avahi-glib-libs-devel gcr-devel gpgme-devel gtk+3-devel libgirepository-devel libhandy1-devel libldap-devel libsecret-devel - libsoup-devel libpwquality-devel" + libsoup3-devel libpwquality-devel" depends="hicolor-icon-theme desktop-file-utils gcr>=3.14 gnupg>=2 openssh" short_desc="GNOME application for managing encryption keys" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/seahorse" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e6eec09e810448295f547f18c1d5772b65c3edc1d9e5a2595f10b5dde68929f5 +checksum=5b1d1bfba74f3658227f3c82e296f330dd0fcd1ef4636b6a218228fee5ea832d