summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-03-16 12:04:12 +0000
committerrillig <rillig@pkgsrc.org>2005-03-16 12:04:12 +0000
commitb2b26b7830aa37b3bb58ee4e204510e271d7ac0c (patch)
tree39fe22d403bdf8ce65eb2a828779d38cb11c2b5a /security
parentf6ce795bd8bcc7f93d3b8ab4c4a87b9b5d22287f (diff)
downloadpkgsrc-b2b26b7830aa37b3bb58ee4e204510e271d7ac0c.tar.gz
Added patches for gcc-2.95.3 that properly order declarations and code.
Approved by wiz.
Diffstat (limited to 'security')
-rw-r--r--security/seahorse/distinfo4
-rw-r--r--security/seahorse/patches/patch-ac26
-rw-r--r--security/seahorse/patches/patch-ad17
3 files changed, 46 insertions, 1 deletions
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 270f4bb2dd0..e55f31fa662 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 13:10:13 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/03/16 12:04:12 rillig Exp $
SHA1 (seahorse-0.7.5.tar.bz2) = e7535125c524d264594f7d82943d27e4472ae6d3
RMD160 (seahorse-0.7.5.tar.bz2) = 0d6cb29fdd5771f0acab5de40c78fd8f5a5aa475
Size (seahorse-0.7.5.tar.bz2) = 937238 bytes
SHA1 (patch-aa) = 5e1448b0de81f36b135d4952ea4d9141d5ff4326
SHA1 (patch-ab) = 43d6b53d07e970a817d58cda70428b44c0236356
+SHA1 (patch-ac) = a17c31e312b10d7ba781289b70060ed34a1c006b
+SHA1 (patch-ad) = a7abc7a29a422ec229545f626f37ae173ba56db7
diff --git a/security/seahorse/patches/patch-ac b/security/seahorse/patches/patch-ac
new file mode 100644
index 00000000000..885da37f89b
--- /dev/null
+++ b/security/seahorse/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.1 2005/03/16 12:04:12 rillig Exp $
+
+gcc-2.95.3 does not like code intermixed with declarations.
+
+--- libseahorse/seahorse-key-store.c.orig Fri Oct 29 23:56:12 2004
++++ libseahorse/seahorse-key-store.c Wed Mar 16 10:54:37 2005
+@@ -184,6 +184,8 @@ seahorse_key_store_constructor (GType ty
+ {
+ 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 @@ seahorse_key_store_constructor (GType ty
+ 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/patches/patch-ad b/security/seahorse/patches/patch-ad
new file mode 100644
index 00000000000..c2aeb5ff313
--- /dev/null
+++ b/security/seahorse/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1 2005/03/16 12:04:12 rillig Exp $
+
+gcc-2.95.3 does not like code intermixed with declarations.
+
+--- src/seahorse-generate-druid.c.orig Thu Oct 28 18:15:26 2004
++++ src/seahorse-generate-druid.c Wed Mar 16 11:07:16 2005
+@@ -173,8 +173,9 @@ on_druid_finish (GnomeDruidPage *gnomedr
+ 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);