Update to 2.18.4:

Overview of Changes from GTK+ 2.18.3 to 2.18.4
==============================================

* Client-side windows:
 - Avoid some unnecessary exposes
 - Avoid unnecessary redraws related to clearing windows

* Bugs fixed:
 563010 Fix clearing the selection in GtkFileChooserButton
 581150 GtkIconView tries to paint items with invalid sizes
 601869 GtkUIManager assumes too much about popup menus
 581145 Wrong positioning for fullscreen gedit toolbar animation
 599118 Translators comment for "Finishing" labels
 599321 gtk_selection_data_get_uris is broken on Windows
 381371 Print margins not correct in WIN32 - not allowing...
 599446 atk_object_set_name () assertion in gtk_tool_button_set_label
 602725 fix setting icon-size on GICON images
 588740 JPEG images open with blur effect?
 602724 gailimage doesn't handle GTK_IMAGE_{GICON,ICON_NAME}...
 561130 get_monitor_geometry segfaults if called with non-existant...
 585383 Segfault in gdk_pixbuf__ico_image_save
 123569 Catch contents being reparented out of socket
 601611 gtk_selection_data_get_targets() reads X Atom data as GdkAtoms
 601959 must release compose key before continuing compose sequence
 603201 gtk_about_dialog_set_url_hook has no effect anymore
 591438 dfb_events_dispatch is not thread safe
 603128 Adding new UI that was recently removed may cause wrong order


* Updated translations:
 Low German
 Romanian
 Russian
 Slovenian

8 files changed, 18 insertions, 80 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index bda2e23a726..277bdf4fee6 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.191 2009/11/27 16:54:29 tnn Exp $
+# $NetBSD: Makefile,v 1.192 2009/12/06 22:40:02 wiz Exp $
 
-DISTNAME=		gtk+-2.18.3
-PKGREVISION=		1
+DISTNAME=		gtk+-2.18.4
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/2.18/ \
@@ -42,6 +41,10 @@ PKGCONFIG_OVERRIDE+=	gdk-pixbuf-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gdk-pixbuf-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
 
+INSTALLATION_DIRS+=	lib/gtk-2.0/immodules
+INSTALLATION_DIRS+=	lib/gtk-2.0/modules
+INSTALLATION_DIRS+=	lib/gtk-2.0/2.10.0/filesystems
+
 REQD_DIRS+=		${PREFIX}/libdata/gtk-2.0
 
 BUILD_DIRS=		. demos/gtk-demo
@@ -78,9 +81,6 @@ DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 post-install:
 	${RM} -f ${DESTDIR}${GTK_IMMODULES_DB}
 	${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB}
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/immodules
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/modules
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/2.10.0/filesystems
 
 EVAL_PREFIX+=		PREFIX.hicolor=hicolor-icon-theme
 FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache"
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 71ad7157abd..04ad08721e6 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.68 2009/11/23 11:47:33 drochner Exp $
+@comment $NetBSD: PLIST,v 1.69 2009/12/06 22:40:02 wiz Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-builder-convert
@@ -1151,6 +1151,8 @@ share/locale/ms/LC_MESSAGES/gtk20-properties.mo
 share/locale/ms/LC_MESSAGES/gtk20.mo
 share/locale/nb/LC_MESSAGES/gtk20-properties.mo
 share/locale/nb/LC_MESSAGES/gtk20.mo
+share/locale/nds/LC_MESSAGES/gtk20-properties.mo
+share/locale/nds/LC_MESSAGES/gtk20.mo
 share/locale/ne/LC_MESSAGES/gtk20-properties.mo
 share/locale/ne/LC_MESSAGES/gtk20.mo
 share/locale/nl/LC_MESSAGES/gtk20-properties.mo
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index e62e78d027c..27151271377 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,15 +1,11 @@
-$NetBSD: distinfo,v 1.118 2009/11/27 16:54:30 tnn Exp $
+$NetBSD: distinfo,v 1.119 2009/12/06 22:40:02 wiz Exp $
 
-SHA1 (gtk+-2.18.3.tar.bz2) = a5432017a3116cb66460150d089e8aedbe756641
-RMD160 (gtk+-2.18.3.tar.bz2) = 44b44501d8ef3490787964200b52965d9d282d5c
-Size (gtk+-2.18.3.tar.bz2) = 19069010 bytes
+SHA1 (gtk+-2.18.4.tar.bz2) = 7a7d6c38c30d2b1234d512ee5184ef4c3956e782
+RMD160 (gtk+-2.18.4.tar.bz2) = 30b780d88fd58d56141addc84e2b21184778741e
+Size (gtk+-2.18.4.tar.bz2) = 18128230 bytes
 SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3
-SHA1 (patch-ab) = 075dcdceeeea06d93802643b9bd2c23f0ee32a64
-SHA1 (patch-ac) = 81765fc056a25c5b53a7223ea62f6f98a6da6104
-SHA1 (patch-ad) = b28feb33311f4b42bdeeae257a470edd677d5c15
-SHA1 (patch-ae) = 33e5411076362295329f82e2106e1cd7f0529863
 SHA1 (patch-af) = 372a21cdb884e7c62852680d0029ded12c706efd
 SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133
 SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79
-SHA1 (patch-iojpeg) = 0042e773df5ed24abea22fa4b15469db0457d88d
+SHA1 (patch-iojpeg) = 459db178ba8d44bd32cd089fc33689de5a57556b
 SHA1 (patch-ob) = 51cbaa82d534ca4ea5253e3a938daa3a5d1e05fb
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
deleted file mode 100644
index 105a1254927..00000000000
--- a/x11/gtk2/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.20 2009/01/19 23:23:54 sketch Exp $
-
---- docs/reference/gdk/Makefile.in.orig	Mon Jan 19 22:47:18 2009
-+++ docs/reference/gdk/Makefile.in	Mon Jan 19 22:48:45 2009
-@@ -925,8 +925,9 @@
- 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
- 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- 	  fi; \
--	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+	  if type gtkdoc-rebase >/dev/null 2>&1; then \
- 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
-+	  fi; \
- 	fi
- 
- uninstall-local:
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
deleted file mode 100644
index 3a7a714ddaf..00000000000
--- a/x11/gtk2/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.17 2009/01/19 23:23:54 sketch Exp $
-
---- docs/reference/gtk/Makefile.in.orig	Mon Jan 19 22:51:09 2009
-+++ docs/reference/gtk/Makefile.in	Mon Jan 19 22:51:34 2009
-@@ -1179,8 +1179,9 @@
- 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
- 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- 	  fi; \
--	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+	  if type gtkdoc-rebase >/dev/null 2>&1; then \
- 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
-+	  fi; \
- 	fi
- 
- uninstall-local:
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
deleted file mode 100644
index 1e1d57b721c..00000000000
--- a/x11/gtk2/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.16 2009/01/19 23:23:54 sketch Exp $
-
---- docs/reference/gdk-pixbuf/Makefile.in.orig	Mon Jan 19 22:52:18 2009
-+++ docs/reference/gdk-pixbuf/Makefile.in	Mon Jan 19 22:52:48 2009
-@@ -909,8 +909,9 @@
- 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
- 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- 	  fi; \
--	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+	  if type gtkdoc-rebase >/dev/null 2>&1; then \
- 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
-+	  fi; \
- 	fi
- 
- uninstall-local:
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
deleted file mode 100644
index 5d3b77baae7..00000000000
--- a/x11/gtk2/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.17 2009/01/19 23:23:54 sketch Exp $
-
---- docs/reference/libgail-util/Makefile.in.orig	Mon Jan 19 22:53:27 2009
-+++ docs/reference/libgail-util/Makefile.in	Mon Jan 19 22:53:41 2009
-@@ -801,8 +801,9 @@
- 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
- 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- 	  fi; \
--	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+	  if type gtkdoc-rebase >/dev/null 2>&1; then \
- 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
-+	  fi; \
- 	fi
- 
- uninstall-local:
diff --git a/x11/gtk2/patches/patch-iojpeg b/x11/gtk2/patches/patch-iojpeg
index cb77a237357..2b605c592a9 100644
--- a/x11/gtk2/patches/patch-iojpeg
+++ b/x11/gtk2/patches/patch-iojpeg
@@ -1,15 +1,15 @@
-$NetBSD: patch-iojpeg,v 1.1 2009/08/29 05:47:41 dogcow Exp $
+$NetBSD: patch-iojpeg,v 1.2 2009/12/06 22:40:02 wiz Exp $
 
 Fix a scaling issue with jpeg7; see
 http://bugzilla.gnome.org/show_bug.cgi?id=588740 and 
 http://bbs.archlinux.org/viewtopic.php?pid=589488#p589488
 
---- gdk-pixbuf/io-jpeg.c.orig	2009-08-29 13:46:13.000000000 +0900
-+++ gdk-pixbuf/io-jpeg.c	2009-08-29 13:49:10.000000000 +0900
+--- gdk-pixbuf/io-jpeg.c.orig	2009-12-01 03:21:23.000000000 +0000
++++ gdk-pixbuf/io-jpeg.c
 @@ -922,13 +922,13 @@ gdk_pixbuf__jpeg_image_load_increment (g
- 				}
  			}
  			
+ 			cinfo->scale_num = 1;
 -			for (cinfo->scale_denom = 2; cinfo->scale_denom <= 8; cinfo->scale_denom *= 2) {
 +			for (cinfo->scale_denom = 2; cinfo->scale_denom <= 16; cinfo->scale_denom++) {
  				jpeg_calc_output_dimensions (cinfo);