summaryrefslogtreecommitdiff
path: root/x11/gnome2-control-center
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-04-12 00:51:22 +0000
committerrillig <rillig@pkgsrc.org>2005-04-12 00:51:22 +0000
commitc8074a046332cacff3371083ef770d3a953f8a92 (patch)
treeae1d3e5d17d82d55b6e8c3b0d3c8ad018b27630c /x11/gnome2-control-center
parentdbf74370a093a7e9e19a5fe9b5b60e93809aedbc (diff)
downloadpkgsrc-c8074a046332cacff3371083ef770d3a953f8a92.tar.gz
Added a patch needed for gcc-2.95. Approved by jlam.
Diffstat (limited to 'x11/gnome2-control-center')
-rw-r--r--x11/gnome2-control-center/distinfo3
-rw-r--r--x11/gnome2-control-center/patches/patch-ae34
2 files changed, 36 insertions, 1 deletions
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 66bad7f85a1..f95b7873e83 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2005/03/22 16:17:10 jmmv Exp $
+$NetBSD: distinfo,v 1.19 2005/04/12 00:56:19 rillig Exp $
SHA1 (control-center-2.10.0.tar.bz2) = 586eaac12d2646ea4fbc5286c5d0d23839457e06
RMD160 (control-center-2.10.0.tar.bz2) = 105a409eb7b74a78cb5d1999aa35ce338c1fc749
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 826bd6ef91135a61a86450ff150662156c833ae8
SHA1 (patch-ab) = a522bf7b8d1108b2350bbc35125bc794a1fb0ac7
SHA1 (patch-ac) = 0bec26fa35730ddd706ec8e80855d1bc72b1dd7d
SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d
+SHA1 (patch-ae) = 1c6e2ff7ca214c5cca74d6447a01eed718a79b4a
diff --git a/x11/gnome2-control-center/patches/patch-ae b/x11/gnome2-control-center/patches/patch-ae
new file mode 100644
index 00000000000..8b14b89c75a
--- /dev/null
+++ b/x11/gnome2-control-center/patches/patch-ae
@@ -0,0 +1,34 @@
+$NetBSD: patch-ae,v 1.1 2005/04/12 00:56:19 rillig Exp $
+
+Needed for gcc-2.95.
+
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig Thu Jan 20 00:16:13 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c Sat Apr 9 14:00:39 2005
+@@ -243,20 +243,22 @@ xkb_options_add_group (const XklConfigIt
+ GladeXML * dialog)
+ {
+ GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
++ gchar *utfGroupName, *titlemarkup;
++ GtkWidget *expander, *align, *vbox;
+
+ current1stLevelId = configItem->name;
+
+- gchar *utfGroupName = xci_desc_to_utf8 (configItem);
+- gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
++ utfGroupName = xci_desc_to_utf8 (configItem);
++ titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
+
+- GtkWidget *expander = gtk_expander_new (titlemarkup);
++ expander = gtk_expander_new (titlemarkup);
+ g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
+
+ g_free (titlemarkup);
+ gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
+- GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
++ align = gtk_alignment_new (0, 0, 1, 1);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
+- GtkWidget *vbox = gtk_vbox_new (TRUE, 6);
++ vbox = gtk_vbox_new (TRUE, 6);
+ gtk_container_add (GTK_CONTAINER (align), vbox);
+ gtk_container_add (GTK_CONTAINER (expander), align);
+ currentVbox = vbox;