From 5212afde476bc25621528ca218203a46c4c3ee0a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 14 Mar 2011 16:44:42 +0000 Subject: [PATCH] Minor update to gtk+2-2.24.2. * Bugs fixed: 642905 reference lists 2 links for "Index of new symbols... 643170 gtk_file_chooser_set_filename does not work... 643216 Extraneous emits of GdkScreen::monitors-changed 643416 Composited children of GtkScrolledWindow are drawn... 644353 Missing annotations in Gtk/Gdk Window and gtk_acce... --- x11/gtk+2/Makefile | 4 ++-- x11/gtk+2/distinfo | 10 +++++----- x11/gtk+2/patches/patch-gtk_Makefile_in | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/x11/gtk+2/Makefile b/x11/gtk+2/Makefile index 49492b5ff44..f1e4f3edfba 100644 --- a/x11/gtk+2/Makefile +++ b/x11/gtk+2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.122 2011/03/07 19:19:27 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.123 2011/03/14 16:44:42 ajacoutot Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT-main= multi-platform graphical toolkit COMMENT-docs= gtk+2 documentation COMMENT-cups= gtk+2 CUPS print backend -V= 2.24.1 +V= 2.24.2 DISTNAME= gtk+-${V} PKGNAME-main= gtk+2-${V} diff --git a/x11/gtk+2/distinfo b/x11/gtk+2/distinfo index cf577ad7ea4..90ee8548283 100644 --- a/x11/gtk+2/distinfo +++ b/x11/gtk+2/distinfo @@ -1,5 +1,5 @@ -MD5 (gtk+-2.24.1.tar.bz2) = 5qqObuULRAbuuT53f0xs6A== -RMD160 (gtk+-2.24.1.tar.bz2) = KkFrvgLNjKa1CkPzPHCoXRwSNco= -SHA1 (gtk+-2.24.1.tar.bz2) = Tju3rYAehhM+8u1e07ZyjOotBXQ= -SHA256 (gtk+-2.24.1.tar.bz2) = Di+U3+uC/7c2QOF6QRudYoUdxLLhR9kKJPlMG/wEke0= -SIZE (gtk+-2.24.1.tar.bz2) = 17600141 +MD5 (gtk+-2.24.2.tar.bz2) = JRM31U9zT4A9INtMEHgIOw== +RMD160 (gtk+-2.24.2.tar.bz2) = UPUi24kfYps9FGWbA//aYT0Q3ac= +SHA1 (gtk+-2.24.2.tar.bz2) = h9QDLYocN6kdYYvUOpruJi22Z1c= +SHA256 (gtk+-2.24.2.tar.bz2) = dhNiMXeA6ssJwODf0UFLOjV4+HMXA1gPZc59jQ6WPc8= +SIZE (gtk+-2.24.2.tar.bz2) = 17598198 diff --git a/x11/gtk+2/patches/patch-gtk_Makefile_in b/x11/gtk+2/patches/patch-gtk_Makefile_in index d937191a6ab..b86f13abf8c 100644 --- a/x11/gtk+2/patches/patch-gtk_Makefile_in +++ b/x11/gtk+2/patches/patch-gtk_Makefile_in @@ -1,4 +1,4 @@ -$OpenBSD: patch-gtk_Makefile_in,v 1.27 2011/03/07 19:19:27 ajacoutot Exp $ +$OpenBSD: patch-gtk_Makefile_in,v 1.28 2011/03/14 16:44:42 ajacoutot Exp $ Fix use of grep(1) as we don't support the -o switch. @@ -7,8 +7,8 @@ because some applications are broken. Use this until they get fixed. This is temporary. https://bugzilla.gnome.org/show_bug.cgi?id=629878 ---- gtk/Makefile.in.orig Sun Jan 30 05:39:20 2011 -+++ gtk/Makefile.in Mon Jan 31 09:33:16 2011 +--- gtk/Makefile.in.orig Mon Mar 14 15:36:31 2011 ++++ gtk/Makefile.in Mon Mar 14 17:19:44 2011 @@ -950,7 +950,7 @@ SUBDIRS = theme-bits . tests DIST_SUBDIRS = theme-bits tests @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE@GTK_PRINT_BACKENDS = file,lpr @@ -191,16 +191,16 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629878 @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache -@@ -2755,7 +2919,7 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) g - gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile +@@ -2756,7 +2920,7 @@ gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_ echo '#include ' > xgen-gtfsrc.c && \ ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ + grep '^GType\s*g[td]k_[a-zA-Z0-9_]*_get_type\s*(void)' | \ - grep -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \ + awk '{ print $$2 }' | grep -E "gdk_[a-zA-Z0-9_].*_get_type$$|gtk_[a-zA-Z0-9_].*_get_type$$" | \ - sort | uniq | \ - sed '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \ + sed '{ s/^/*tp++ = /; s/$$/();/; }' | \ + sort > xgen-gtf \ && cp xgen-gtf $@ && rm -f xgen-gtf -@@ -2873,6 +3037,88 @@ stamp-icons: $(STOCK_ICONS) +@@ -2874,6 +3038,88 @@ stamp-icons: $(STOCK_ICONS) && $(LN_S) folder.png user-desktop.png \ && $(RM) text-x-generic.png \ && $(LN_S) document-x-generic.png text-x-generic.png \