mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-27 16:02:55 +02:00
seahorse: update to 47.0.1
This commit is contained in:
chrysos349
Duncan Overbruck
parent
6181f3c855
commit
05a04124dc
3 changed files with 4 additions and 119 deletions
|
|
@ -1,25 +0,0 @@
|
||||||
From 9260c74779be3d7a378db0671af862ffa3573d42 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Xi Ruoyao <xry111@xry111.site>
|
|
||||||
Date: Wed, 21 Dec 2022 20:58:26 +0800
|
|
||||||
Subject: [PATCH] Allow building with GnuPG-2.4.x
|
|
||||||
|
|
||||||
---
|
|
||||||
meson.build | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index e29b5322..23d0b54f 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -26,7 +26,7 @@ endif
|
|
||||||
# Dependencies
|
|
||||||
min_glib_version = '2.66'
|
|
||||||
min_gcr_version = '3.38'
|
|
||||||
-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
|
|
||||||
+accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
|
|
||||||
gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
|
|
||||||
|
|
||||||
glib_deps = [
|
|
||||||
--
|
|
||||||
2.39.1
|
|
||||||
|
|
||||||
|
|
@ -1,90 +0,0 @@
|
||||||
From 6d673637d90066f4756568ce1b2f1f3c89a37c74 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
|
|
||||||
Date: Thu, 20 Oct 2022 18:35:33 +0200
|
|
||||||
Subject: [PATCH] ssh: avoid stdout and stderr variable names
|
|
||||||
|
|
||||||
In Alpine Linux, the compiler:
|
|
||||||
|
|
||||||
C compiler for the host machine: gcc (gcc 12.2.1 "gcc (Alpine 12.2.1_git20220924-r3) 12.2.1 20220924")
|
|
||||||
C linker for the host machine: gcc ld.bfd 2.39
|
|
||||||
Vala compiler for the host machine: valac (valac 0.56.3)
|
|
||||||
|
|
||||||
ended up including stdio.h into the C code generated from Vala.
|
|
||||||
This produced the following (and similar) errors due to
|
|
||||||
stderr and stdout being #define in stdio.h:
|
|
||||||
|
|
||||||
ninja: job failed: gcc -Issh/libseahorse-ssh.a.p -Issh -I../ssh -Icommon -I../common -I. -I.. -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/gio-unix-2.0 -I/usr/include/gcr-3 -I/usr/include/gck-1 -I/usr/include/p11-kit-1 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libdrm -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libhandy-1 -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -w -O0 -DGCR_API_SUBJECT_TO_CHANGE -DGCK_API_SUBJECT_TO_CHANGE -DSECRET_WITH_UNSTABLE -include config.h -Wno-unused-parameter -Wno-missing-field-initializers -Os -fomit-frame-pointer -Os -fomit-frame-pointer -fPIC -pthread -MD -MQ ssh/libseahorse-ssh.a.p/meson-generated_operation.c.o -MF ssh/libseahorse-ssh.a.p/meson-generated_operation.c.o.d -o ssh/libseahorse-ssh.a.p/meson-generated_operation.c.o -c ssh/libseahorse-ssh.a.p/operation.c
|
|
||||||
In file included from /usr/include/fortify/stdio.h:22,
|
|
||||||
from /usr/include/pango-1.0/pango/pango-utils.h:25,
|
|
||||||
from /usr/include/pango-1.0/pango/pango.h:51,
|
|
||||||
from /usr/include/gtk-3.0/gdk/gdktypes.h:35,
|
|
||||||
from /usr/include/gtk-3.0/gdk/gdkapplaunchcontext.h:30,
|
|
||||||
from /usr/include/gtk-3.0/gdk/gdk.h:32,
|
|
||||||
from /usr/include/gtk-3.0/gtk/gtk.h:30,
|
|
||||||
from common/seahorse-common.h:11,
|
|
||||||
from ssh/seahorse-ssh.h:6,
|
|
||||||
from ssh/libseahorse-ssh.a.p/operation.c:25:
|
|
||||||
ssh/libseahorse-ssh.a.p/operation.c: In function 'seahorse_ssh_operation_operation_async_co':
|
|
||||||
ssh/libseahorse-ssh.a.p/operation.c:621:17: error: expected identifier before '(' token
|
|
||||||
621 | _data_->stdout = NULL;
|
|
||||||
| ^~~~~~
|
|
||||||
ssh/libseahorse-ssh.a.p/operation.c:622:17: error: expected identifier before '(' token
|
|
||||||
622 | _data_->stderr = NULL;
|
|
||||||
| ^~~~~~
|
|
||||||
|
|
||||||
Fix the problem by naming the variables std_out and std_err, as it
|
|
||||||
was before commit e60e5fd4b1545053e99758b894e8ef981de08c3e
|
|
||||||
|
|
||||||
Fixes e60e5fd4b1545053e99758b894e8ef981de08c3e
|
|
||||||
|
|
||||||
Coauthored-by: psykose <alice@ayaya.dev>
|
|
||||||
---
|
|
||||||
ssh/operation.vala | 14 +++++++-------
|
|
||||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/ssh/operation.vala b/ssh/operation.vala
|
|
||||||
index afa161ce..4743d0a5 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? std_out = null, std_err = null;
|
|
||||||
try {
|
|
||||||
- yield subprocess.communicate_utf8_async(input, cancellable, out stdout, out stderr);
|
|
||||||
- return stdout;
|
|
||||||
+ yield subprocess.communicate_utf8_async(input, cancellable, out std_out, out std_err);
|
|
||||||
+ return std_out;
|
|
||||||
} catch (GLib.Error e) {
|
|
||||||
- Seahorse.Util.show_error(null, this.prompt_title, stderr);
|
|
||||||
+ Seahorse.Util.show_error(null, this.prompt_title, std_err);
|
|
||||||
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 std_out = 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(std_out);
|
|
||||||
|
|
||||||
// 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(std_out);
|
|
||||||
|
|
||||||
// Add the comment to the output
|
|
||||||
if (data.comment != null) {
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'seahorse'
|
# Template file for 'seahorse'
|
||||||
pkgname=seahorse
|
pkgname=seahorse
|
||||||
version=43.0
|
version=47.0.1
|
||||||
revision=2
|
revision=1
|
||||||
build_style=meson
|
build_style=meson
|
||||||
build_helper=gir
|
build_helper=gir
|
||||||
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
|
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
|
||||||
|
|
@ -14,5 +14,5 @@ short_desc="GNOME application for managing encryption keys"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://gitlab.gnome.org/GNOME/seahorse"
|
homepage="https://gitlab.gnome.org/GNOME/seahorse"
|
||||||
distfiles="${GNOME_SITE}/seahorse/${version%.*}/seahorse-${version}.tar.xz"
|
distfiles="${GNOME_SITE}/seahorse/${version%%.*}/seahorse-${version}.tar.xz"
|
||||||
checksum=5b1d1bfba74f3658227f3c82e296f330dd0fcd1ef4636b6a218228fee5ea832d
|
checksum=9c1917e4a61f7febb787849ce36ce717fce706c346880b991d056d54dadbcacc
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue