cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to seahorse-43.0.

Browse Source
This commit is contained in:
ajacoutot 2022-11-07 22:09:43 +00:00
parent c03c4acf56
commit d6c82065e1
4 changed files with 64 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
x11/gnome/seahorse/Makefile
View File

@ -1,17 +1,20 @@
COMMENT= GNOME encryption interface
GNOME_PROJECT= seahorse
GNOME_VERSION= 42.0
REVISION= 0
GNOME_VERSION= 43.0
CATEGORIES= security
# override gnome MODULE
MASTER_SITES= https://gitlab.gnome.org/GNOME/${GNOME_PROJECT}/-/archive/${GNOME_VERSION}/
EXTRACT_SUFX= .tar.gz
# GPLv2/GFDLv1.1
PERMIT_PACKAGE= Yes
WANTLIB += avahi-client avahi-common avahi-glib c gck-1 gcr-base-3
WANTLIB += gcr-ui-3 gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB += gpgme gtk-3 handy-1 intl ldap pwquality secret-1 soup-2.4
WANTLIB += c gck-1 gcr-base-3 gcr-ui-3 gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gobject-2.0 gpgme gtk-3 handy-1 intl ldap
WANTLIB += pwquality secret-1 soup-3.0
MODULES= devel/dconf \
devel/meson \
@ -32,8 +35,7 @@ CONFIGURE_ARGS += -Db_asneeded=false
.endif
LIB_DEPENDS= databases/openldap \
devel/libsoup \
net/avahi,-glib \
devel/libsoup3 \
security/gpgme \
security/libpwquality \
x11/gnome/gcr \
@ -43,4 +45,8 @@ LIB_DEPENDS= databases/openldap \
BUILD_DEPENDS += security/gnupg
RUN_DEPENDS += security/gnupg
# XXX ssh/libseahorse-ssh.a.p/key.c:903:2: error: non-void function
# 'seahorse_ssh_key_parse_co' should return a value
CFLAGS += -Wno-return-type
.include <bsd.port.mk>

4
x11/gnome/seahorse/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/seahorse-42.0.tar.xz) = xQys6/jeen4uXx2uC5gjIRR0Epar6NVD45I9YqFT1jA=
SIZE (gnome/seahorse-42.0.tar.xz) = 1395040
SHA256 (gnome/seahorse-43.0.tar.gz) = CiUS6ej9PicRd99/HgH4xue86IZ7TSWBSDYBBXIa8Qg=
SIZE (gnome/seahorse-43.0.tar.gz) = 2750973

47
x11/gnome/seahorse/patches/patch-ssh_operation_vala Normal file
View File

@ -0,0 +1,47 @@
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
Index: ssh/operation.vala
--- ssh/operation.vala.orig
+++ 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) {

2
x11/gnome/seahorse/pkg/PLIST
View File

@ -812,6 +812,7 @@ share/help/uk/seahorse/subkeys-examine.page
share/help/uk/seahorse/subkeys-revoke.page
share/icons/hicolor/scalable/apps/org.gnome.seahorse.Application.svg
share/icons/hicolor/symbolic/apps/org.gnome.seahorse.Application-symbolic.svg
share/locale/ab/LC_MESSAGES/seahorse.mo
share/locale/ar/LC_MESSAGES/seahorse.mo
share/locale/as/LC_MESSAGES/seahorse.mo
share/locale/ast/LC_MESSAGES/seahorse.mo
@ -854,6 +855,7 @@ share/locale/id/LC_MESSAGES/seahorse.mo
share/locale/is/LC_MESSAGES/seahorse.mo
share/locale/it/LC_MESSAGES/seahorse.mo
share/locale/ja/LC_MESSAGES/seahorse.mo
share/locale/ka/LC_MESSAGES/seahorse.mo
share/locale/kk/LC_MESSAGES/seahorse.mo
share/locale/kn/LC_MESSAGES/seahorse.mo
share/locale/ko/LC_MESSAGES/seahorse.mo