Tue Jul 6 15:19:46 2010 UTC ()
update to 2.30.1
This switches to the gnome-2.30 release branch.


(drochner)
diff -r1.108 -r1.109 pkgsrc/sysutils/nautilus/Makefile
diff -r1.34 -r1.35 pkgsrc/sysutils/nautilus/PLIST
diff -r1.48 -r1.49 pkgsrc/sysutils/nautilus/distinfo
diff -r0 -r1.5 pkgsrc/sysutils/nautilus/patches/patch-aa
cvs diff -r1.108 -r1.109 pkgsrc/sysutils/nautilus/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/nautilus/Makefile 2010/06/13 22:45:24 1.108
+++ pkgsrc/sysutils/nautilus/Makefile 2010/07/06 15:19:46 1.109
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.108 2010/06/13 22:45:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.109 2010/07/06 15:19:46 drochner Exp $
2# 2#
3 3
4DISTNAME= nautilus-2.28.4 4DISTNAME= nautilus-2.30.1
5PKGREVISION= 2 
6CATEGORIES= sysutils gnome 5CATEGORIES= sysutils gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.28/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.30/}
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= rh@NetBSD.org 9MAINTAINER= rh@NetBSD.org
11HOMEPAGE= http://www.gnome.org/projects/nautilus/ 10HOMEPAGE= http://www.gnome.org/projects/nautilus/
12COMMENT= Nautilus file manager for GNOME2 11COMMENT= Nautilus file manager for GNOME2
13#LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.1 AND gnu-lgpl-v2 AND TRADEMARK_NOTICE 12#LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.1 AND gnu-lgpl-v2 AND TRADEMARK_NOTICE
14 13
15PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
16 15
17USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
18USE_TOOLS+= gmake intltool msgfmt pkg-config 17USE_TOOLS+= gmake intltool msgfmt pkg-config
19USE_LIBTOOL= yes 18USE_LIBTOOL= yes
20GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
cvs diff -r1.34 -r1.35 pkgsrc/sysutils/nautilus/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/nautilus/PLIST 2010/04/11 16:38:29 1.34
+++ pkgsrc/sysutils/nautilus/PLIST 2010/07/06 15:19:46 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.34 2010/04/11 16:38:29 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.35 2010/07/06 15:19:46 drochner Exp $
2bin/nautilus 2bin/nautilus
3bin/nautilus-autorun-software 3bin/nautilus-autorun-software
4bin/nautilus-connect-server 4bin/nautilus-connect-server
5bin/nautilus-file-management-properties 5bin/nautilus-file-management-properties
6include/nautilus/libnautilus-extension/nautilus-column-provider.h 6include/nautilus/libnautilus-extension/nautilus-column-provider.h
7include/nautilus/libnautilus-extension/nautilus-column.h 7include/nautilus/libnautilus-extension/nautilus-column.h
8include/nautilus/libnautilus-extension/nautilus-extension-types.h 8include/nautilus/libnautilus-extension/nautilus-extension-types.h
9include/nautilus/libnautilus-extension/nautilus-file-info.h 9include/nautilus/libnautilus-extension/nautilus-file-info.h
10include/nautilus/libnautilus-extension/nautilus-info-provider.h 10include/nautilus/libnautilus-extension/nautilus-info-provider.h
11include/nautilus/libnautilus-extension/nautilus-location-widget-provider.h 11include/nautilus/libnautilus-extension/nautilus-location-widget-provider.h
12include/nautilus/libnautilus-extension/nautilus-menu-item.h 12include/nautilus/libnautilus-extension/nautilus-menu-item.h
13include/nautilus/libnautilus-extension/nautilus-menu-provider.h 13include/nautilus/libnautilus-extension/nautilus-menu-provider.h
14include/nautilus/libnautilus-extension/nautilus-menu.h 14include/nautilus/libnautilus-extension/nautilus-menu.h
@@ -68,26 +68,27 @@ share/locale/bg/LC_MESSAGES/nautilus.mo @@ -68,26 +68,27 @@ share/locale/bg/LC_MESSAGES/nautilus.mo
68share/locale/bn/LC_MESSAGES/nautilus.mo 68share/locale/bn/LC_MESSAGES/nautilus.mo
69share/locale/bn_IN/LC_MESSAGES/nautilus.mo 69share/locale/bn_IN/LC_MESSAGES/nautilus.mo
70share/locale/br/LC_MESSAGES/nautilus.mo 70share/locale/br/LC_MESSAGES/nautilus.mo
71share/locale/bs/LC_MESSAGES/nautilus.mo 71share/locale/bs/LC_MESSAGES/nautilus.mo
72share/locale/ca/LC_MESSAGES/nautilus.mo 72share/locale/ca/LC_MESSAGES/nautilus.mo
73share/locale/ca@valencia/LC_MESSAGES/nautilus.mo 73share/locale/ca@valencia/LC_MESSAGES/nautilus.mo
74share/locale/crh/LC_MESSAGES/nautilus.mo 74share/locale/crh/LC_MESSAGES/nautilus.mo
75share/locale/cs/LC_MESSAGES/nautilus.mo 75share/locale/cs/LC_MESSAGES/nautilus.mo
76share/locale/cy/LC_MESSAGES/nautilus.mo 76share/locale/cy/LC_MESSAGES/nautilus.mo
77share/locale/da/LC_MESSAGES/nautilus.mo 77share/locale/da/LC_MESSAGES/nautilus.mo
78share/locale/de/LC_MESSAGES/nautilus.mo 78share/locale/de/LC_MESSAGES/nautilus.mo
79share/locale/dz/LC_MESSAGES/nautilus.mo 79share/locale/dz/LC_MESSAGES/nautilus.mo
80share/locale/el/LC_MESSAGES/nautilus.mo 80share/locale/el/LC_MESSAGES/nautilus.mo
 81share/locale/en@shaw/LC_MESSAGES/nautilus.mo
81share/locale/en_CA/LC_MESSAGES/nautilus.mo 82share/locale/en_CA/LC_MESSAGES/nautilus.mo
82share/locale/en_GB/LC_MESSAGES/nautilus.mo 83share/locale/en_GB/LC_MESSAGES/nautilus.mo
83share/locale/eo/LC_MESSAGES/nautilus.mo 84share/locale/eo/LC_MESSAGES/nautilus.mo
84share/locale/es/LC_MESSAGES/nautilus.mo 85share/locale/es/LC_MESSAGES/nautilus.mo
85share/locale/et/LC_MESSAGES/nautilus.mo 86share/locale/et/LC_MESSAGES/nautilus.mo
86share/locale/eu/LC_MESSAGES/nautilus.mo 87share/locale/eu/LC_MESSAGES/nautilus.mo
87share/locale/fa/LC_MESSAGES/nautilus.mo 88share/locale/fa/LC_MESSAGES/nautilus.mo
88share/locale/fi/LC_MESSAGES/nautilus.mo 89share/locale/fi/LC_MESSAGES/nautilus.mo
89share/locale/fr/LC_MESSAGES/nautilus.mo 90share/locale/fr/LC_MESSAGES/nautilus.mo
90share/locale/fur/LC_MESSAGES/nautilus.mo 91share/locale/fur/LC_MESSAGES/nautilus.mo
91share/locale/ga/LC_MESSAGES/nautilus.mo 92share/locale/ga/LC_MESSAGES/nautilus.mo
92share/locale/gl/LC_MESSAGES/nautilus.mo 93share/locale/gl/LC_MESSAGES/nautilus.mo
93share/locale/gu/LC_MESSAGES/nautilus.mo 94share/locale/gu/LC_MESSAGES/nautilus.mo
@@ -205,13 +206,14 @@ share/nautilus/ui/nautilus-file-manageme @@ -205,13 +206,14 @@ share/nautilus/ui/nautilus-file-manageme
205share/nautilus/ui/nautilus-icon-view-ui.xml 206share/nautilus/ui/nautilus-icon-view-ui.xml
206share/nautilus/ui/nautilus-list-view-ui.xml 207share/nautilus/ui/nautilus-list-view-ui.xml
207share/nautilus/ui/nautilus-navigation-window-ui.xml 208share/nautilus/ui/nautilus-navigation-window-ui.xml
208share/nautilus/ui/nautilus-shell-ui.xml 209share/nautilus/ui/nautilus-shell-ui.xml
209share/nautilus/ui/nautilus-spatial-window-ui.xml 210share/nautilus/ui/nautilus-spatial-window-ui.xml
210share/pixmaps/nautilus/audio.svg 211share/pixmaps/nautilus/audio.svg
211share/pixmaps/nautilus/backgrounds.png 212share/pixmaps/nautilus/backgrounds.png
212share/pixmaps/nautilus/chit_frame.png 213share/pixmaps/nautilus/chit_frame.png
213share/pixmaps/nautilus/colors.png 214share/pixmaps/nautilus/colors.png
214share/pixmaps/nautilus/emblems.png 215share/pixmaps/nautilus/emblems.png
215share/pixmaps/nautilus/erase.png 216share/pixmaps/nautilus/erase.png
216share/pixmaps/nautilus/knob.png 217share/pixmaps/nautilus/knob.png
217share/pixmaps/nautilus/thumbnail_frame.png 218share/pixmaps/nautilus/thumbnail_frame.png
 219@pkgdir lib/nautilus/extensions-2.0
cvs diff -r1.48 -r1.49 pkgsrc/sysutils/nautilus/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/nautilus/distinfo 2009/12/16 17:17:04 1.48
+++ pkgsrc/sysutils/nautilus/distinfo 2010/07/06 15:19:46 1.49
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.48 2009/12/16 17:17:04 drochner Exp $ 1$NetBSD: distinfo,v 1.49 2010/07/06 15:19:46 drochner Exp $
2 2
3SHA1 (nautilus-2.28.4.tar.bz2) = f6db915e725e6f45cd2d3f933eb251499dccf038 3SHA1 (nautilus-2.30.1.tar.bz2) = 232afa5d7d977714667645adff1f952989edc185
4RMD160 (nautilus-2.28.4.tar.bz2) = 8960342fa3a6f976e283f338c060896d67a4c028 4RMD160 (nautilus-2.30.1.tar.bz2) = 285e0b9d000725b11013ed6f8e98db59573b83dc
5Size (nautilus-2.28.4.tar.bz2) = 6045403 bytes 5Size (nautilus-2.30.1.tar.bz2) = 6156330 bytes
 6SHA1 (patch-aa) = feae89e4f25cb1d362c21c68c63b254ca9c0ec55
File Added: pkgsrc/sysutils/nautilus/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.5 2010/07/06 15:19:46 drochner Exp $

--- eel/eel-wrap-table.c.orig	2009-12-15 10:22:12.000000000 +0000
+++ eel/eel-wrap-table.c
@@ -518,6 +518,10 @@ wrap_table_layout (EelWrapTable *wrap_ta
 	pos.x = content_bounds.x0;
 	pos.y = content_bounds.y0;
 
+	/* XXX hack: avoid crash if no icons are found */
+	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,