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

Update to seahorse-3.6.1.

Browse Source
This commit is contained in:
ajacoutot 2012-10-16 07:09:38 +00:00
parent 4ac1a77471
commit db3fd23e80
7 changed files with 4 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/gnome/seahorse/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.75 2012/10/14 08:16:59 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.76 2012/10/16 07:09:38 ajacoutot Exp $
COMMENT= GNOME encryption interface
GNOME_PROJECT= seahorse
GNOME_VERSION= 3.6.0
REVISION= 0
GNOME_VERSION= 3.6.1
CATEGORIES= security

4
x11/gnome/seahorse/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/seahorse-3.6.0.tar.xz) = iKC8qjru9qmi8qv0x/+/lM70dLRm151FBU0ZF11czug=
SIZE (gnome/seahorse-3.6.0.tar.xz) = 1989472
SHA256 (gnome/seahorse-3.6.1.tar.xz) = 3N2WgaeJahOll88Cqi1nGLXwqztQ7YH40kuNspapIUs=
SIZE (gnome/seahorse-3.6.1.tar.xz) = 1994788

27
x11/gnome/seahorse/patches/patch-gkr_seahorse-gkr-actions_c
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-gkr_seahorse-gkr-actions_c,v 1.2 2012/10/15 06:02:23 ajacoutot Exp $
From 4a297007e5c555ee4efe881cda283bd1c45e8f52 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Sat, 13 Oct 2012 12:59:57 +0000
Subject: gkr: Fix regression for changing keyring password
--- gkr/seahorse-gkr-actions.c.orig Tue Aug 21 12:23:15 2012
+++ gkr/seahorse-gkr-actions.c Sun Oct 14 10:08:51 2012
@@ -240,7 +240,7 @@ on_change_password_prompt (GObject *source,
retval = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
if (error == NULL) {
- g_variant_get (retval, "@s", &prompt_path);
+ g_variant_get (retval, "(&o)", &prompt_path);
secret_service_prompt_at_dbus_path (change->service, prompt_path, NULL,
on_change_password_done, change);
g_variant_unref (retval);
@@ -272,7 +272,7 @@ on_keyring_password (GtkAction *action,
g_dbus_proxy_get_object_path (proxy),
"org.gnome.keyring.InternalUnsupportedGuiltRiddenInterface",
"ChangeWithPrompt",
- g_variant_new ("(o)", g_dbus_proxy_get_object_path (proxy)),
+ g_variant_new ("(o)", g_dbus_proxy_get_object_path (G_DBUS_PROXY (collection))),
G_VARIANT_TYPE ("(o)"),
0, -1, NULL, on_change_password_prompt, change);
}

25
x11/gnome/seahorse/patches/patch-gkr_seahorse-gkr-item-properties_c
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-gkr_seahorse-gkr-item-properties_c,v 1.2 2012/10/15 06:02:23 ajacoutot Exp $
From 60e7f1bc15a554fa05106c2b9f5e25fb827925a4 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Sat, 13 Oct 2012 13:06:54 +0000
Subject: Strip possible dbus errors before displaying
--- gkr/seahorse-gkr-item-properties.c.orig Tue Aug 21 12:23:16 2012
+++ gkr/seahorse-gkr-item-properties.c Sun Oct 14 10:09:01 2012
@@ -211,6 +211,7 @@ on_update_password_ready (GObject *source,
transfer_password (git, swidget);
} else {
+ g_dbus_error_strip_remote_error (error);
seahorse_util_show_error (seahorse_widget_get_toplevel (swidget),
_("Couldn't change password."), error->message);
g_clear_error (&error);
@@ -340,6 +341,7 @@ on_item_description_complete (GObject *source,
gtk_entry_set_text (closure->entry,
secret_item_get_label (SECRET_ITEM (git)));
+ g_dbus_error_strip_remote_error (error);
seahorse_util_show_error (seahorse_widget_get_toplevel (closure->swidget),
_("Couldn't set description."), error->message);
g_clear_error (&error);

14
x11/gnome/seahorse/patches/patch-libseahorse_seahorse-key-manager-store_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-libseahorse_seahorse-key-manager-store_c,v 1.1 2012/10/14 08:16:59 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=684966
--- libseahorse/seahorse-key-manager-store.c.orig Tue Aug 21 12:23:16 2012
+++ libseahorse/seahorse-key-manager-store.c Sun Oct 14 10:09:01 2012
@@ -439,6 +439,7 @@ drag_end (GtkWidget *widget, GdkDragContext *context,
export_to_directory (skstore, skstore->priv->drag_destination);
if (skstore->priv->drag_error) {
+ g_dbus_error_strip_remote_error (skstore->priv->drag_error);
seahorse_util_show_error (widget, _("Couldn't export keys"),
skstore->priv->drag_error->message);
}

14
x11/gnome/seahorse/patches/patch-libseahorse_seahorse-util_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-libseahorse_seahorse-util_c,v 1.1 2012/10/14 08:16:59 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=684966
--- libseahorse/seahorse-util.c.orig Tue Aug 21 12:23:17 2012
+++ libseahorse/seahorse-util.c Sun Oct 14 10:09:01 2012
@@ -140,6 +140,7 @@ seahorse_util_handle_error (GError **error,
else
g_warning ("unsupported 'parent' argument passed to seahorse_util_handle_error() ");
+ g_dbus_error_strip_remote_error (*error);
seahorse_util_show_error (widget, text,
(*error)->message ? (*error)->message : "");
g_free (text);

14
x11/gnome/seahorse/patches/patch-pgp_seahorse-keyserver-results_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-pgp_seahorse-keyserver-results_c,v 1.1 2012/10/14 08:16:59 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=684966
--- pgp/seahorse-keyserver-results.c.orig Tue Aug 21 12:23:17 2012
+++ pgp/seahorse-keyserver-results.c Sun Oct 14 10:09:01 2012
@@ -482,6 +482,7 @@ on_search_completed (GObject *source,
seahorse_pgp_backend_search_remote_finish (NULL, result, &error);
if (error != NULL) {
window = seahorse_catalog_get_window (SEAHORSE_CATALOG (self));
+ g_dbus_error_strip_remote_error (error);
seahorse_util_show_error (window, _("The search for keys failed."), error->message);
g_error_free (error);
}