update to gtk2+-2.0.5

this is a bug fix only release with compatibility with previous 2.0.*
releases.  Changes are:


Overview of Changes in GTK+ 2.0.5
=================================

* Fix a wrong assertion that broke gtk_file_selection_set_filename();
  also another fix from testing this function with non-UTF-8 filenames.
* Fix incorrect property notification in GtkTextView. [James M. Cape]

Overview of Changes in GTK+ 2.0.4
=================================

* Fix a number of types which were registered with the
  type system with the wrong names [James Henstridge, Jonathan Blandford]
* Support missing data types in GtkList/TreeStore [Daniel Elstner]
* Misc GtkTreeView bug fixes [Dave Camp, Jonathan, Daniel Elstner,
  Josh Parsons]
* Drag and drop fixes, including a stuck grab. [Dave, Thomas Leonard,
  Owen Taylor]
* Calculate screen size on win32 from the "logical DPI"
  [Joaquin Cuenca Abela, Tor Lillqvist]
* Misc Win32 bug fixes. [Florent Duguet, Torn]
* Fix theme changes for GtkMenu [Soeren Sandmann]
* Fix gdk_pixbuf_from_drawable() for big endian. [Federico Mena Quintero]
* Fix encoding handling for gtk_file_selection_set_filename()
  [Sebastian Ritau, Owen]
* Fix crash with DND, Qt and Metacity [Cha Young-Ho, Havoc, Owen]
* Fixes for DirectColor visuals [Shivaram Upadhyayula]
* Memory leak and UMR fixes [Michael Meeks, Matthias Clasen, Valgrind]
* Misc bug fixes
* Updated translations (ca,cs,da,es,et,fr,ms,nl,pl,pt,pt_BR,ru,sv)

Other contributors: Nicholas Allen, Jacob Berkman, Remus Draica,
  Nano Golveia, Tim Janik, Sergey Kuzminov, George Lebl, Garrett Lesage,
  Robin Lu, Timo Meinen, Michel Selten, Boris Shingarov, Jeff Waugh

Overview of Changes in GTK+ 2.0.3
=================================

* GtkTreeView fixes (Jonathan Blandford, Kristian Rietveld, Daniel Elstner)
* Improve GdkRGB support for low color depths (Tor Lillqvist).
* Tweak F10 behavior to focus GtkMenuBar. (Owen Taylor)
* Include internal children when focusing. (Jonathan)
* Win32 fixes (Tor Lillqvist, David Sterba)
* Allow use of a pixmap as the drawable in gdk_pixmap_new(). (Kristian)
* GdkPixbuf fixes (Matthias Clasen, Michael Natterer, Federico Mena Quintero)
* GtkMenu fixes. (Soeren Sandmann)
* Find gdk-pixbuf-csource when cross-compiling. (Michael Natterer)
* Misc input-method related fixes (Yao Zhang, Federico)
* Fix stuck grab during DND. (Dave Camp, Owen)
* Remove in-bevel from scrolled-offscreen menus. (Ettore Perazzoli)
* Various plug/socket fixes (Owen, Padraig O'Briain, Dave Camp,
  Michael Meeks)
* Handle Xlib internal connections (HideToshi Tajima)
* Many miscellaneous bug fixes.

Other contributors: Jacob Berkman, Abigail Brady, Rich Burridge,
Anders Carlsson, Murray Cumming, Nalin Dahyabhai, James Henstridge,
David Highley, Ben Liblitt, Tim Janik, Bill Jannsen, Lauris Kaplinski,
Sergey Kuzminov, Alex Larsson, Sven Neumann, Havoc Pennington, Gareth Pearce,
Simon Floery, Thomas Leonard, Detlef Reichl, Martin Schulze, Christophe Saout,
Timo Sirainen, Graham Swallow.

9 files changed, 56 insertions, 84 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 3ae75982333..45f51183006 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2002/07/03 01:23:43 dmcmahill Exp $
 #
 
-DISTNAME=		gtk+-2.0.2
+DISTNAME=		gtk+-2.0.5
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 22fa09ac6aa..170cc0a8886 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/07/03 01:23:43 dmcmahill Exp $
 bin/gdk-pixbuf-csource
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
@@ -253,22 +253,22 @@ lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
 lib/libgdk-x11-2.0.so.0
-lib/libgdk-x11-2.0.so.0.2
+lib/libgdk-x11-2.0.so.0.5
 lib/libgdk_pixbuf-2.0.a
 lib/libgdk_pixbuf-2.0.la
 lib/libgdk_pixbuf-2.0.so
 lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf-2.0.so.0.2
+lib/libgdk_pixbuf-2.0.so.0.5
 lib/libgdk_pixbuf_xlib-2.0.a
 lib/libgdk_pixbuf_xlib-2.0.la
 lib/libgdk_pixbuf_xlib-2.0.so
 lib/libgdk_pixbuf_xlib-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.so.0.2
+lib/libgdk_pixbuf_xlib-2.0.so.0.5
 lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
 lib/libgtk-x11-2.0.so.0
-lib/libgtk-x11-2.0.so.0.2
+lib/libgtk-x11-2.0.so.0.5
 lib/pkgconfig/gdk-2.0.pc
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -305,7 +305,9 @@ share/gtk-2.0/demo/sizegroup.c
 share/gtk-2.0/demo/stock_browser.c
 share/gtk-2.0/demo/textview.c
 share/gtk-2.0/demo/tree_store.c
-share/gtk-doc/html/gdk-pixbuf/a4189.html
+share/gtk-doc/html/gdk-pixbuf/a4093.html
+share/gtk-doc/html/gdk-pixbuf/x4112.html
+share/gtk-doc/html/gdk-pixbuf/x4160.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-animation.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-creating.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-loading.html
@@ -328,8 +330,6 @@ share/gtk-doc/html/gdk-pixbuf/index.html
 share/gtk-doc/html/gdk-pixbuf/index.sgml
 share/gtk-doc/html/gdk-pixbuf/license.html
 share/gtk-doc/html/gdk-pixbuf/r27.html
-share/gtk-doc/html/gdk-pixbuf/x4208.html
-share/gtk-doc/html/gdk-pixbuf/x4256.html
 share/gtk-doc/html/gdk/X_cursor.png
 share/gtk-doc/html/gdk/arrow.png
 share/gtk-doc/html/gdk/based_arrow_down.png
@@ -436,7 +436,7 @@ share/gtk-doc/html/gdk/watch.png
 share/gtk-doc/html/gdk/xterm.png
 share/gtk-doc/html/gtk/abstractobjects.html
 share/gtk-doc/html/gtk/buttonwidgets.html
-share/gtk-doc/html/gtk/c17325.html
+share/gtk-doc/html/gtk/c17377.html
 share/gtk-doc/html/gtk/deprecatedobjects.html
 share/gtk-doc/html/gtk/displaywidgets.html
 share/gtk-doc/html/gtk/gtk-accelerator-maps.html
@@ -674,6 +674,7 @@ share/gtk-doc/html/gtk/textwidgetobjects.html
 share/gtk-doc/html/gtk/treewidget.html
 share/gtk-doc/html/gtk/treewidgetobjects.html
 share/gtk-doc/html/gtk/windowwidgets.html
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtk20.mo
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index fc5124b396f..d78ef15d2a5 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2002/07/03 01:23:43 dmcmahill Exp $
 
-SHA1 (gtk+-2.0.2.tar.gz) = 96bc1c54f67f4a1b22b549f2ea3ce1e8418641eb
-Size (gtk+-2.0.2.tar.gz) = 7846932 bytes
-SHA1 (patch-aa) = 8b89d80140098692f26f45288510e9237a77813a
+SHA1 (gtk+-2.0.5.tar.gz) = 944fc99f43f9d5fac281e2edf51e841ff9349e0c
+Size (gtk+-2.0.5.tar.gz) = 8383905 bytes
+SHA1 (patch-aa) = 8fcc53371822d9672d7ad3de37241448f5927dc8
 SHA1 (patch-ab) = 88ccc48726501c1726ff202095087addd99ba4be
-SHA1 (patch-ac) = b196b6aaee8caed51d42ef8d701f423c2989998f
+SHA1 (patch-ac) = 33aab5703886362a3d412b8d115804b1ef132fb7
 SHA1 (patch-ad) = fd82d510c7d3a761e5218fda9abe61e73ca7299b
-SHA1 (patch-ae) = 6e5d2307e97e0578d7991f95ed132cf108bdf127
-SHA1 (patch-af) = cc2cf357905c4d23e58176866a9093cd04024570
+SHA1 (patch-ae) = bb68fd2552b080f98c90c562de94780ff14bf4f2
 SHA1 (patch-ag) = 55165f8a8d8f0aa1324dcc1c2fbce567e8380c07
 SHA1 (patch-ah) = 144e4931bdb6c28f38191b201227249f125512fb
 SHA1 (patch-ai) = 49d6bf894b88cfd976ba58403ae2291a853f7779
-SHA1 (patch-aj) = d0f60a37037b8b4c50ebfaddc7a02f42f955db8c
+SHA1 (patch-aj) = 3ef780efe0016fbd38d495df3f640853fd0f10df
 SHA1 (patch-ak) = 382c23406a869acda4e220081a56f99b9014bafa
-SHA1 (patch-al) = 5fc7ac07cb3066b0df9cf5b2fcc2dc2dc867c0ee
+SHA1 (patch-al) = f9cda85fa0ec0e36bbb6b4f8246fd6911786ec05
 SHA1 (patch-am) = 80bcc1a0eff0b4be3e3f9375a5541954cea48266
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index c7c788ef1ac..5a06fa4fd7c 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
 
---- configure.orig	Tue Apr  2 06:45:37 2002
+--- configure.orig	Sun Jun 16 00:58:22 2002
 +++ configure
-@@ -8016,7 +8016,7 @@
+@@ -10391,7 +10391,7 @@
  
  # AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
 +gtklocaledir='${prefix}/${PKGLOCALEDIR}/locale'
  
  
- echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
+ echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
index bbd1bbf95ac..871cdda7afa 100644
--- a/x11/gtk2/patches/patch-ac
+++ b/x11/gtk2/patches/patch-ac
@@ -1,15 +1,12 @@
-$NetBSD: patch-ac,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.5 2002/07/03 01:23:44 dmcmahill Exp $
 
---- demos/Makefile.in.orig	Tue Apr  2 06:50:48 2002
+--- demos/Makefile.in.orig	Sun Jun 16 01:16:31 2002
 +++ demos/Makefile.in
-@@ -180,7 +180,9 @@
- DEPS =  	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@ 					$(top_builddir)/gtk/@gtktargetlib@
+@@ -195,6 +195,7 @@
  
  
--LDADDS = @STRIP_BEGIN@ 								$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@        				$(top_builddir)/gtk/@gtktargetlib@ 				@STRIP_END@
-+LDADDS = @STRIP_BEGIN@ \
-+	@LDFLAGS@ \
-+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@        				$(top_builddir)/gtk/@gtktargetlib@ 				@STRIP_END@
- 
- 
- noinst_PROGRAMS =  	testpixbuf 			testpixbuf-drawable 		testanimation 			testpixbuf-save			testpixbuf-scale 		pixbuf-demo
+ LDADDS = @STRIP_BEGIN@ 							\
++	@LDFLAGS@ 							\
+ 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+ 	$(top_builddir)/gdk/@gdktargetlib@        			\
+ 	$(top_builddir)/gtk/@gtktargetlib@ 				\
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
index d32f32a0ff2..c1bd3f61a10 100644
--- a/x11/gtk2/patches/patch-ae
+++ b/x11/gtk2/patches/patch-ae
@@ -1,13 +1,12 @@
-$NetBSD: patch-ae,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
 
---- demos/gtk-demo/Makefile.in.orig	Tue Apr  2 06:50:50 2002
+--- demos/gtk-demo/Makefile.in.orig	Sun Jun 16 01:16:32 2002
 +++ demos/gtk-demo/Makefile.in
-@@ -183,7 +183,7 @@
- DEPS =  	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@ 					$(top_builddir)/gtk/@gtktargetlib@
+@@ -216,6 +216,7 @@
  
  
--LDADDS = @STRIP_BEGIN@ 								$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@        				$(top_builddir)/gtk/@gtktargetlib@ 				@STRIP_END@
-+LDADDS = @STRIP_BEGIN@ @LDFLAGS@								$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@        				$(top_builddir)/gtk/@gtktargetlib@ 				@STRIP_END@
- 
- 
- bin_PROGRAMS = gtk-demo
+ LDADDS = @STRIP_BEGIN@ 							\
++	@LDFLAGS@							\
+ 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+ 	$(top_builddir)/gdk/@gdktargetlib@        			\
+ 	$(top_builddir)/gtk/@gtktargetlib@ 				\
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
deleted file mode 100644
index c40b202a33c..00000000000
--- a/x11/gtk2/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
-
---- demos/gtk-demo/main.c.orig	Sun Mar  3 00:25:09 2002
-+++ demos/gtk-demo/main.c
-@@ -87,7 +87,7 @@
-   int n_read = 0;
-   
- #ifndef G_OS_WIN32
--  flockfile (stream);
-+  /* flockfile (stream); */
- #endif
- 
-   g_string_truncate (str, 0);
-@@ -133,7 +133,7 @@
-  done:
- 
- #ifndef G_OS_WIN32
--  funlockfile (stream);
-+  /* funlockfile (stream); */
- #endif
- 
-   return n_read > 0;
diff --git a/x11/gtk2/patches/patch-aj b/x11/gtk2/patches/patch-aj
index 8bcc9c7cff0..21d5ee2d580 100644
--- a/x11/gtk2/patches/patch-aj
+++ b/x11/gtk2/patches/patch-aj
@@ -1,13 +1,12 @@
-$NetBSD: patch-aj,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
 
---- gdk/Makefile.in.orig	Tue Apr  2 06:50:31 2002
+--- gdk/Makefile.in.orig	Sun Jun 16 01:16:19 2002
 +++ gdk/Makefile.in
-@@ -197,7 +197,7 @@
- # libtool stuff: set version and export symbols for resolving
+@@ -214,6 +214,7 @@
  # since automake doesn't support conditionalized libsomething_la_LDFLAGS
  # we use the general approach here
--LDFLAGS = @STRIP_BEGIN@ 							-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 			-export-dynamic 							-rpath $(libdir) 							$(no_undefined)								@LIBTOOL_EXPORT_OPTIONS@						$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(gdk_win32_symbols)							@GDK_DEP_LIBS@							@STRIP_END@
-+LDFLAGS = @STRIP_BEGIN@ @LDFLAGS@  							-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 			-export-dynamic 							-rpath $(libdir) 							$(no_undefined)								@LIBTOOL_EXPORT_OPTIONS@						$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(gdk_win32_symbols)							@GDK_DEP_LIBS@							@STRIP_END@
- 
- 
- #
+ LDFLAGS = @STRIP_BEGIN@ 						\
++	@LDFLAGS@							\
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 		\
+ 	-export-dynamic 						\
+ 	-rpath $(libdir) 						\
diff --git a/x11/gtk2/patches/patch-al b/x11/gtk2/patches/patch-al
index 118281603c4..6eb51eebe71 100644
--- a/x11/gtk2/patches/patch-al
+++ b/x11/gtk2/patches/patch-al
@@ -1,13 +1,12 @@
-$NetBSD: patch-al,v 1.3 2002/04/06 15:48:56 dmcmahill Exp $
+$NetBSD: patch-al,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
 
---- gtk/Makefile.in.orig	Tue Apr  2 06:50:40 2002
+--- gtk/Makefile.in.orig	Sun Jun 16 01:16:26 2002
 +++ gtk/Makefile.in
-@@ -194,7 +194,7 @@
- # since automake doesn't support conditionalized libsomething_la_LDFLAGS
+@@ -213,6 +213,7 @@
  # we use the general approach here
  libgtkincludedir = $(includedir)/gtk-2.0/gtk
--LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				-export-dynamic									-rpath $(libdir)								$(no_undefined)									@LIBTOOL_EXPORT_OPTIONS@							$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la			$(top_builddir)/gdk/@gdktargetlib@						$(libgtk_target_ldflags)							@GTK_DEP_LIBS@								@STRIP_END@
-+LDFLAGS = @STRIP_BEGIN@ @LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				-export-dynamic									-rpath $(libdir)								$(no_undefined)									@LIBTOOL_EXPORT_OPTIONS@							$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la			$(top_builddir)/gdk/@gdktargetlib@						$(libgtk_target_ldflags)							@GTK_DEP_LIBS@								@STRIP_END@
- 
- 
- #
+ LDFLAGS = @STRIP_BEGIN@ \
++	@LDFLAGS@								\
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)			\
+ 	-export-dynamic								\
+ 	-rpath $(libdir)							\