summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/gtk2/Makefile3
-rw-r--r--x11/gtk2/distinfo3
-rw-r--r--x11/gtk2/patches/patch-ab20
3 files changed, 24 insertions, 2 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 6387d4bcfb3..5138dbc3ef8 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.199 2010/03/17 22:43:00 wiz Exp $
+# $NetBSD: Makefile,v 1.200 2010/04/15 01:09:55 wiz Exp $
DISTNAME= gtk+-2.18.9
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.18/ \
${MASTER_SITE_GNOME:=sources/gtk+/2.18/}
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 2e3e1b879b1..2c0ee794e23 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.125 2010/03/17 22:43:00 wiz Exp $
+$NetBSD: distinfo,v 1.126 2010/04/15 01:09:55 wiz Exp $
SHA1 (gtk+-2.18.9.tar.bz2) = 1f50dbc0de230e1b3df7d461bdfaeceedcc5f65b
RMD160 (gtk+-2.18.9.tar.bz2) = 4499af3cef1c53cddda989f35aaf2e030aab5bcf
Size (gtk+-2.18.9.tar.bz2) = 18194639 bytes
SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3
+SHA1 (patch-ab) = 60b23f3b5691e9ffa689b9c32d49d5944a056bf0
SHA1 (patch-af) = 54408034519f752de662567ea9d65056f2d27d95
SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133
SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
new file mode 100644
index 00000000000..ca5dfe965fb
--- /dev/null
+++ b/x11/gtk2/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.22 2010/04/15 01:09:55 wiz Exp $
+
+http://mail.gnome.org/archives/gtk-devel-list/2010-March/msg00113.html
+
+--- gtk/gtkentry.c.orig 2010-03-17 13:45:47.000000000 +0000
++++ gtk/gtkentry.c
+@@ -6661,8 +6661,11 @@ gtk_entry_set_buffer (GtkEntry *en
+ g_object_notify (obj, "invisible-char-set");
+ g_object_thaw_notify (obj);
+
+- gtk_editable_set_position (GTK_EDITABLE (entry), 0);
+- gtk_entry_recompute (entry);
++ if (priv->buffer)
++ {
++ gtk_editable_set_position (GTK_EDITABLE (entry), 0);
++ gtk_entry_recompute (entry);
++ }
+ }
+
+