summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2010-07-06 15:19:46 +0000
committerdrochner <drochner@pkgsrc.org>2010-07-06 15:19:46 +0000
commit117e458eba891679be4132b113ecf1ecdab30db0 (patch)
tree52f84783733e82a1f83a5fd37bf8c8d7ae2cf9a4 /sysutils
parent203c2a15115f0d314fef4e10654c05bd405b54ab (diff)
downloadpkgsrc-117e458eba891679be4132b113ecf1ecdab30db0.tar.gz
update to 2.30.1
This switches to the gnome-2.30 release branch.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/nautilus/Makefile7
-rw-r--r--sysutils/nautilus/PLIST4
-rw-r--r--sysutils/nautilus/distinfo9
-rw-r--r--sysutils/nautilus/patches/patch-aa15
4 files changed, 26 insertions, 9 deletions
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index ac19d304d98..691480c7cc0 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.108 2010/06/13 22:45:24 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2010/07/06 15:19:46 drochner Exp $
#
-DISTNAME= nautilus-2.28.4
-PKGREVISION= 2
+DISTNAME= nautilus-2.30.1
CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.28/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.30/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= rh@NetBSD.org
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index c7c2278f431..e3471b87496 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2010/04/11 16:38:29 tnn Exp $
+@comment $NetBSD: PLIST,v 1.35 2010/07/06 15:19:46 drochner Exp $
bin/nautilus
bin/nautilus-autorun-software
bin/nautilus-connect-server
@@ -78,6 +78,7 @@ share/locale/da/LC_MESSAGES/nautilus.mo
share/locale/de/LC_MESSAGES/nautilus.mo
share/locale/dz/LC_MESSAGES/nautilus.mo
share/locale/el/LC_MESSAGES/nautilus.mo
+share/locale/en@shaw/LC_MESSAGES/nautilus.mo
share/locale/en_CA/LC_MESSAGES/nautilus.mo
share/locale/en_GB/LC_MESSAGES/nautilus.mo
share/locale/eo/LC_MESSAGES/nautilus.mo
@@ -215,3 +216,4 @@ share/pixmaps/nautilus/emblems.png
share/pixmaps/nautilus/erase.png
share/pixmaps/nautilus/knob.png
share/pixmaps/nautilus/thumbnail_frame.png
+@pkgdir lib/nautilus/extensions-2.0
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index c3193369ea1..2933ca6b1f1 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.48 2009/12/16 17:17:04 drochner Exp $
+$NetBSD: distinfo,v 1.49 2010/07/06 15:19:46 drochner Exp $
-SHA1 (nautilus-2.28.4.tar.bz2) = f6db915e725e6f45cd2d3f933eb251499dccf038
-RMD160 (nautilus-2.28.4.tar.bz2) = 8960342fa3a6f976e283f338c060896d67a4c028
-Size (nautilus-2.28.4.tar.bz2) = 6045403 bytes
+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
diff --git a/sysutils/nautilus/patches/patch-aa b/sysutils/nautilus/patches/patch-aa
new file mode 100644
index 00000000000..41480dacf6d
--- /dev/null
+++ b/sysutils/nautilus/patches/patch-aa
@@ -0,0 +1,15 @@
+$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,