update to 2.32.1

This switches to the gnome-2.32 release branch.

4 files changed, 22 insertions, 19 deletions

diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 61dddf4a904..2068780a569 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.111 2010/11/15 22:58:36 abs Exp $
+# $NetBSD: Makefile,v 1.112 2010/11/24 20:29:04 drochner Exp $
 #
 
-DISTNAME=		nautilus-2.30.1
-PKGREVISION=		2
+DISTNAME=		nautilus-2.32.1
 CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.30/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.32/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index e3471b87496..631c1d45e8d 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2010/07/06 15:19:46 drochner Exp $
+@comment $NetBSD: PLIST,v 1.36 2010/11/24 20:29:04 drochner Exp $
 bin/nautilus
 bin/nautilus-autorun-software
 bin/nautilus-connect-server
@@ -29,9 +29,6 @@ share/applications/nautilus-home.desktop
 share/applications/nautilus.desktop
 share/applications/network-scheme.desktop
 share/gconf/schemas/apps_nautilus_preferences.schemas
-share/gtk-doc/html/libnautilus-extension/NautilusColumn.html
-share/gtk-doc/html/libnautilus-extension/NautilusMenuItem.html
-share/gtk-doc/html/libnautilus-extension/NautilusPropertyPage.html
 share/gtk-doc/html/libnautilus-extension/ch01.html
 share/gtk-doc/html/libnautilus-extension/home.png
 share/gtk-doc/html/libnautilus-extension/index.html
@@ -39,12 +36,15 @@ share/gtk-doc/html/libnautilus-extension/index.sgml
 share/gtk-doc/html/libnautilus-extension/ix01.html
 share/gtk-doc/html/libnautilus-extension/left.png
 share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-column-provider.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-column.html
 share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-extension-types.html
 share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-file-info.html
 share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-info-provider.html
 share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-location-widget-provider.html
 share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-menu-provider.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-menu.html
 share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-property-page-provider.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-property-page.html
 share/gtk-doc/html/libnautilus-extension/libnautilus-extension.devhelp
 share/gtk-doc/html/libnautilus-extension/libnautilus-extension.devhelp2
 share/gtk-doc/html/libnautilus-extension/pt01.html
@@ -89,9 +89,11 @@ share/locale/fa/LC_MESSAGES/nautilus.mo
 share/locale/fi/LC_MESSAGES/nautilus.mo
 share/locale/fr/LC_MESSAGES/nautilus.mo
 share/locale/fur/LC_MESSAGES/nautilus.mo
+share/locale/fy/LC_MESSAGES/nautilus.mo
 share/locale/ga/LC_MESSAGES/nautilus.mo
 share/locale/gl/LC_MESSAGES/nautilus.mo
 share/locale/gu/LC_MESSAGES/nautilus.mo
+share/locale/gv/LC_MESSAGES/nautilus.mo
 share/locale/ha/LC_MESSAGES/nautilus.mo
 share/locale/he/LC_MESSAGES/nautilus.mo
 share/locale/hi/LC_MESSAGES/nautilus.mo
@@ -105,6 +107,7 @@ share/locale/is/LC_MESSAGES/nautilus.mo
 share/locale/it/LC_MESSAGES/nautilus.mo
 share/locale/ja/LC_MESSAGES/nautilus.mo
 share/locale/ka/LC_MESSAGES/nautilus.mo
+share/locale/kk/LC_MESSAGES/nautilus.mo
 share/locale/km/LC_MESSAGES/nautilus.mo
 share/locale/kn/LC_MESSAGES/nautilus.mo
 share/locale/ko/LC_MESSAGES/nautilus.mo
@@ -149,6 +152,7 @@ share/locale/te/LC_MESSAGES/nautilus.mo
 share/locale/th/LC_MESSAGES/nautilus.mo
 share/locale/tk/LC_MESSAGES/nautilus.mo
 share/locale/tr/LC_MESSAGES/nautilus.mo
+share/locale/ug/LC_MESSAGES/nautilus.mo
 share/locale/uk/LC_MESSAGES/nautilus.mo
 share/locale/uz/LC_MESSAGES/nautilus.mo
 share/locale/uz@cyrillic/LC_MESSAGES/nautilus.mo
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index 2933ca6b1f1..7f52fbb105b 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.49 2010/07/06 15:19:46 drochner Exp $
+$NetBSD: distinfo,v 1.50 2010/11/24 20:29:04 drochner Exp $
 
-SHA1 (nautilus-2.30.1.tar.bz2) = 232afa5d7d977714667645adff1f952989edc185
-RMD160 (nautilus-2.30.1.tar.bz2) = 285e0b9d000725b11013ed6f8e98db59573b83dc
-Size (nautilus-2.30.1.tar.bz2) = 6156330 bytes
-SHA1 (patch-aa) = feae89e4f25cb1d362c21c68c63b254ca9c0ec55
+SHA1 (nautilus-2.32.1.tar.bz2) = 4091c2d667d391421f1ec6e7ee297175ef95ce05
+RMD160 (nautilus-2.32.1.tar.bz2) = 0c0ad4738486f08f5c4329d2841a88ed485db1e5
+Size (nautilus-2.32.1.tar.bz2) = 6335525 bytes
+SHA1 (patch-aa) = f41d451017a24eacef9b264928d83d446acf6153
diff --git a/sysutils/nautilus/patches/patch-aa b/sysutils/nautilus/patches/patch-aa
index 41480dacf6d..ad9070b3e9a 100644
--- a/sysutils/nautilus/patches/patch-aa
+++ b/sysutils/nautilus/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2010/07/06 15:19:46 drochner Exp $
+$NetBSD: patch-aa,v 1.6 2010/11/24 20:29:05 drochner Exp $
 
---- eel/eel-wrap-table.c.orig	2009-12-15 10:22:12.000000000 +0000
+--- eel/eel-wrap-table.c.orig	2010-11-13 11:59:00.000000000 +0000
 +++ eel/eel-wrap-table.c
-@@ -518,6 +518,10 @@ wrap_table_layout (EelWrapTable *wrap_ta
+@@ -521,6 +521,10 @@ wrap_table_layout (EelWrapTable *wrap_ta
  	pos.x = content_bounds.x0;
  	pos.y = content_bounds.y0;
  
@@ -10,6 +10,6 @@ $NetBSD: patch-aa,v 1.5 2010/07/06 15:19:46 drochner Exp $
 +	if (!max_child_dimensions.width)
 +		max_child_dimensions.width = 1;
 +
- 	num_cols = wrap_table_get_num_fitting (GTK_WIDGET (wrap_table)->allocation.width -
- 					       GTK_CONTAINER (wrap_table)->border_width * 2,
- 					       wrap_table->details->x_spacing,
+ 	gtk_widget_get_allocation (GTK_WIDGET (wrap_table), &allocation);
+ 	num_cols = wrap_table_get_num_fitting (allocation.width -
+ 					       gtk_container_get_border_width (GTK_CONTAINER (wrap_table)) * 2,