Add seahorse with a REINPLACE to look for the correct

gedit pkgconfig thinger.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3600 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 108 insertions, 0 deletions

diff --git a/security/seahorse/files/patch-agent_seahorse-agent-io.c b/security/seahorse/files/patch-agent_seahorse-agent-io.c
new file mode 100644
index 000000000..73f68960e
--- /dev/null
+++ b/security/seahorse/files/patch-agent_seahorse-agent-io.c
@@ -0,0 +1,32 @@
+--- agent/seahorse-agent-io.c.orig	Fri Jan 28 15:52:18 2005
++++ agent/seahorse-agent-io.c	Fri Jan 28 15:54:19 2005
+@@ -377,12 +377,18 @@
+     gsize length;
+     GError *err = NULL;
+     gboolean ret = TRUE;
++    GIOStatus status;
+ 
+     if (condition & G_IO_IN) {
+         /* Read 1 line from the io channel, including newline character */
+-        g_io_channel_read_line (source, &string, &length, NULL, &err);
++        status = g_io_channel_read_line (source, &string, &length, NULL, &err);
+ 
+-        if (err != NULL) {
++	if (status == G_IO_STATUS_EOF) {
++	    free_conn (cn);
++	    ret = FALSE;
++	}
++
++	else if (err != NULL) {
+             g_critical ("couldn't read from socket: %s", err->message);
+             g_clear_error (&err);
+             free_conn (cn);
+@@ -398,7 +404,7 @@
+             g_free (string);
+     }
+ 
+-    if (condition & G_IO_HUP) {
++    else if (condition & G_IO_HUP) {
+         free_conn (cn);
+         ret = FALSE;            /* removes watch */
+     }
diff --git a/security/seahorse/files/patch-agent_seahorse-agent.c b/security/seahorse/files/patch-agent_seahorse-agent.c
new file mode 100644
index 000000000..577649bbf
--- /dev/null
+++ b/security/seahorse/files/patch-agent_seahorse-agent.c
@@ -0,0 +1,19 @@
+--- agent/seahorse-agent.c.orig	Mon Jan 31 11:14:02 2005
++++ agent/seahorse-agent.c	Mon Jan 31 11:14:48 2005
+@@ -309,7 +309,6 @@
+      * All functions after this point have to print messages 
+      * nicely and not just called exit() 
+      */
+-    daemonize (sockname);
+ 
+     /* Handle some signals */
+     signal (SIGINT, on_quit);
+@@ -322,6 +321,8 @@
+     /* Initialize our sub systems */
+     seahorse_agent_actions_init ();
+     seahorse_agent_cache_init ();
++
++    daemonize (sockname);
+ 
+     if (seahorse_agent_io_init () == -1)
+         return 1;               /* message already printed */
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-gpg-options.c b/security/seahorse/files/patch-libseahorse_seahorse-gpg-options.c
new file mode 100644
index 000000000..2eca53c2d
--- /dev/null
+++ b/security/seahorse/files/patch-libseahorse_seahorse-gpg-options.c
@@ -0,0 +1,11 @@
+--- libseahorse/seahorse-gpg-options.c.orig	Wed Jan 26 12:11:42 2005
++++ libseahorse/seahorse-gpg-options.c	Wed Jan 26 12:11:57 2005
+@@ -31,7 +31,7 @@
+ #include "seahorse-gpg-options.h"
+ 
+ #define  GPG_CONF_HEADER    "# FILE CREATED BY SEAHORSE\n\n"
+-#define  GPG_VERSION_PREFIX   "1.2."
++#define  GPG_VERSION_PREFIX   "1.4."
+ 
+ static gchar gpg_homedir[MAXPATHLEN];
+ static gboolean gpg_options_inited = FALSE;
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-key-store.c b/security/seahorse/files/patch-libseahorse_seahorse-key-store.c
new file mode 100644
index 000000000..fc8b7af60
--- /dev/null
+++ b/security/seahorse/files/patch-libseahorse_seahorse-key-store.c
@@ -0,0 +1,22 @@
+--- libseahorse/seahorse-key-store.c.orig	Wed Dec 22 15:18:27 2004
++++ libseahorse/seahorse-key-store.c	Wed Dec 22 15:19:48 2004
+@@ -184,6 +184,8 @@
+ {
+     GObject* obj = G_OBJECT_CLASS (parent_class)->constructor (type, n_props, props);
+     SeahorseKeyStore* skstore = SEAHORSE_KEY_STORE (obj);
++    guint cols;
++    GType* types;
+ 
+     /* init private vars */
+     skstore->priv = g_new0 (SeahorseKeyStorePriv, 1);
+@@ -191,8 +193,8 @@
+                                        NULL, (GDestroyNotify)seahorse_key_row_free);
+  
+     /* Setup the store */
+-    guint cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns;
+-    GType* types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types;
++    cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns;
++    types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types;
+     gtk_tree_store_set_column_types (GTK_TREE_STORE (obj), cols, types);
+     
+     /* Setup the sort and filter */
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-widget.c b/security/seahorse/files/patch-libseahorse_seahorse-widget.c
new file mode 100644
index 000000000..ee8063fb0
--- /dev/null
+++ b/security/seahorse/files/patch-libseahorse_seahorse-widget.c
@@ -0,0 +1,11 @@
+--- libseahorse/seahorse-widget.c.orig	Mon Dec 13 23:49:49 2004
++++ libseahorse/seahorse-widget.c	Mon Dec 13 23:49:57 2004
+@@ -197,7 +197,7 @@
+ {
+ 	//error check help
+ 	if (g_str_equal (swidget->name, "key-manager"))
+-		gnome_help_display (PACKAGE, "toc", NULL);
++		gnome_help_display (PACKAGE, NULL, NULL);
+ 	else
+ 		gnome_help_display (PACKAGE, swidget->name, NULL);
+ }
diff --git a/security/seahorse/files/patch-src_seahorse-generate-druid.c b/security/seahorse/files/patch-src_seahorse-generate-druid.c
new file mode 100644
index 000000000..9e356ed1a
--- /dev/null
+++ b/security/seahorse/files/patch-src_seahorse-generate-druid.c
@@ -0,0 +1,13 @@
+--- src/seahorse-generate-druid.c.orig	Wed Dec 22 15:22:02 2004
++++ src/seahorse-generate-druid.c	Wed Dec 22 15:22:22 2004
+@@ -173,8 +173,9 @@
+ gboolean
+ on_druidpagestandard4_next (GnomeDruidPage *gnomedruidpage, GtkWidget *widget, SeahorseWidget *swidget)
+ {
++	GtkWidget *druidpage;
+ 	g_print("go to finish\n");
+-	GtkWidget *druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1");
++	druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1");
+ 		
+ 	gnome_druid_page_prepare (GNOME_DRUID_PAGE(druidpage));
+ 	gtk_widget_show (druidpage);