From 36349c63fed81b6ec50f9a411666b158649c407a Mon Sep 17 00:00:00 2001 From: adamw Date: Thu, 10 Feb 2005 23:02:10 +0000 Subject: Update to 2.9.91. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3625 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-fm/nautilus/Makefile | 2 +- x11-fm/nautilus/distinfo | 4 +- .../nautilus/files/patch-data_static_bookmarks.xml | 84 ---------------------- .../nautilus/files/patch-libbackground_Makefile.in | 11 --- .../patch-src_nautilus-image-properties-page.c | 18 ----- x11-fm/nautilus/pkg-plist | 2 +- x11-fm/nautilus2/Makefile | 2 +- x11-fm/nautilus2/distinfo | 4 +- .../files/patch-data_static_bookmarks.xml | 84 ---------------------- .../files/patch-libbackground_Makefile.in | 11 --- .../patch-src_nautilus-image-properties-page.c | 18 ----- x11-fm/nautilus2/pkg-plist | 2 +- 12 files changed, 8 insertions(+), 234 deletions(-) delete mode 100644 x11-fm/nautilus/files/patch-data_static_bookmarks.xml delete mode 100644 x11-fm/nautilus/files/patch-libbackground_Makefile.in delete mode 100644 x11-fm/nautilus/files/patch-src_nautilus-image-properties-page.c delete mode 100644 x11-fm/nautilus2/files/patch-data_static_bookmarks.xml delete mode 100644 x11-fm/nautilus2/files/patch-libbackground_Makefile.in delete mode 100644 x11-fm/nautilus2/files/patch-src_nautilus-image-properties-page.c (limited to 'x11-fm') diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index c9db0e194..5dc80ab97 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nautilus2 -PORTVERSION= 2.9.90 +PORTVERSION= 2.9.91 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9 diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo index 0be5601ce..21534e9a0 100644 --- a/x11-fm/nautilus/distinfo +++ b/x11-fm/nautilus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-2.9.90.tar.bz2) = 1895a2d95dfd5f6f13cc3d2e18898d17 -SIZE (gnome2/nautilus-2.9.90.tar.bz2) = 5994731 +MD5 (gnome2/nautilus-2.9.91.tar.bz2) = 430e3615efe75ff07d5cc3c109987675 +SIZE (gnome2/nautilus-2.9.91.tar.bz2) = 5909884 diff --git a/x11-fm/nautilus/files/patch-data_static_bookmarks.xml b/x11-fm/nautilus/files/patch-data_static_bookmarks.xml deleted file mode 100644 index 54ea8ae37..000000000 --- a/x11-fm/nautilus/files/patch-data_static_bookmarks.xml +++ /dev/null @@ -1,84 +0,0 @@ ---- data/static_bookmarks.xml.orig Wed Jun 5 22:58:43 2002 -+++ data/static_bookmarks.xml Wed Jun 5 23:30:11 2002 -@@ -1,54 +1,44 @@ - - - -- -- -- -- -- -- -+ -+ -+ -+ - - -- - - -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - -- -- -- -- -+ -+ -+ - -- -- - - -- -- -- -- -+ -+ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/x11-fm/nautilus/files/patch-libbackground_Makefile.in b/x11-fm/nautilus/files/patch-libbackground_Makefile.in deleted file mode 100644 index c5dd046fb..000000000 --- a/x11-fm/nautilus/files/patch-libbackground_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libbackground/Makefile.in.orig Wed Nov 24 13:17:35 2004 -+++ libbackground/Makefile.in Wed Nov 24 13:18:06 2004 -@@ -169,7 +169,7 @@ - - INCLUDES = \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ - -DG_LOG_DOMAIN=\"capplet-common\" \ - -I$(top_srcdir)/ \ - @CAPPLET_CFLAGS@ diff --git a/x11-fm/nautilus/files/patch-src_nautilus-image-properties-page.c b/x11-fm/nautilus/files/patch-src_nautilus-image-properties-page.c deleted file mode 100644 index a6d710d75..000000000 --- a/x11-fm/nautilus/files/patch-src_nautilus-image-properties-page.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/nautilus-image-properties-page.c.orig Wed Nov 24 13:25:51 2004 -+++ src/nautilus-image-properties-page.c Wed Nov 24 13:26:28 2004 -@@ -144,13 +144,14 @@ - exif_content_callback (ExifContent *content, gpointer data) - { - struct ExifAttribute *attribute; -+ char value[1024]; - - attribute = (struct ExifAttribute *)data; - if (attribute->found) { - return; - } - -- attribute->value = g_strdup (exif_content_get_value (content, attribute->tag)); -+ attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, value, sizeof(value))); - if (attribute->value != NULL) { - attribute->found = TRUE; - } diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist index ab5db6929..647e539ba 100644 --- a/x11-fm/nautilus/pkg-plist +++ b/x11-fm/nautilus/pkg-plist @@ -20,6 +20,7 @@ libdata/bonobo/servers/Nautilus_shell.server libdata/pkgconfig/libnautilus-extension.pc share/gnome/applications/nautilus-computer.desktop share/gnome/applications/nautilus-file-management-properties.desktop +share/gnome/applications/nautilus-folder-handler.desktop share/gnome/applications/nautilus-home.desktop share/gnome/applications/nautilus.desktop share/gnome/applications/network-scheme.desktop @@ -60,7 +61,6 @@ share/gnome/nautilus/patterns/snow_ridge.png share/gnome/nautilus/patterns/stucco.jpg share/gnome/nautilus/patterns/terracotta.png share/gnome/nautilus/patterns/wavy_white.png -share/gnome/nautilus/static_bookmarks.xml share/gnome/nautilus/ui/nautilus-desktop-icon-view-ui.xml share/gnome/nautilus/ui/nautilus-directory-view-ui.xml share/gnome/nautilus/ui/nautilus-icon-view-ui.xml diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index c9db0e194..5dc80ab97 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nautilus2 -PORTVERSION= 2.9.90 +PORTVERSION= 2.9.91 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9 diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo index 0be5601ce..21534e9a0 100644 --- a/x11-fm/nautilus2/distinfo +++ b/x11-fm/nautilus2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-2.9.90.tar.bz2) = 1895a2d95dfd5f6f13cc3d2e18898d17 -SIZE (gnome2/nautilus-2.9.90.tar.bz2) = 5994731 +MD5 (gnome2/nautilus-2.9.91.tar.bz2) = 430e3615efe75ff07d5cc3c109987675 +SIZE (gnome2/nautilus-2.9.91.tar.bz2) = 5909884 diff --git a/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml b/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml deleted file mode 100644 index 54ea8ae37..000000000 --- a/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml +++ /dev/null @@ -1,84 +0,0 @@ ---- data/static_bookmarks.xml.orig Wed Jun 5 22:58:43 2002 -+++ data/static_bookmarks.xml Wed Jun 5 23:30:11 2002 -@@ -1,54 +1,44 @@ - - - -- -- -- -- -- -- -+ -+ -+ -+ - - -- - - -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - -- -- -- -- -+ -+ -+ - -- -- - - -- -- -- -- -+ -+ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in deleted file mode 100644 index c5dd046fb..000000000 --- a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libbackground/Makefile.in.orig Wed Nov 24 13:17:35 2004 -+++ libbackground/Makefile.in Wed Nov 24 13:18:06 2004 -@@ -169,7 +169,7 @@ - - INCLUDES = \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ - -DG_LOG_DOMAIN=\"capplet-common\" \ - -I$(top_srcdir)/ \ - @CAPPLET_CFLAGS@ diff --git a/x11-fm/nautilus2/files/patch-src_nautilus-image-properties-page.c b/x11-fm/nautilus2/files/patch-src_nautilus-image-properties-page.c deleted file mode 100644 index a6d710d75..000000000 --- a/x11-fm/nautilus2/files/patch-src_nautilus-image-properties-page.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/nautilus-image-properties-page.c.orig Wed Nov 24 13:25:51 2004 -+++ src/nautilus-image-properties-page.c Wed Nov 24 13:26:28 2004 -@@ -144,13 +144,14 @@ - exif_content_callback (ExifContent *content, gpointer data) - { - struct ExifAttribute *attribute; -+ char value[1024]; - - attribute = (struct ExifAttribute *)data; - if (attribute->found) { - return; - } - -- attribute->value = g_strdup (exif_content_get_value (content, attribute->tag)); -+ attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, value, sizeof(value))); - if (attribute->value != NULL) { - attribute->found = TRUE; - } diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index ab5db6929..647e539ba 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -20,6 +20,7 @@ libdata/bonobo/servers/Nautilus_shell.server libdata/pkgconfig/libnautilus-extension.pc share/gnome/applications/nautilus-computer.desktop share/gnome/applications/nautilus-file-management-properties.desktop +share/gnome/applications/nautilus-folder-handler.desktop share/gnome/applications/nautilus-home.desktop share/gnome/applications/nautilus.desktop share/gnome/applications/network-scheme.desktop @@ -60,7 +61,6 @@ share/gnome/nautilus/patterns/snow_ridge.png share/gnome/nautilus/patterns/stucco.jpg share/gnome/nautilus/patterns/terracotta.png share/gnome/nautilus/patterns/wavy_white.png -share/gnome/nautilus/static_bookmarks.xml share/gnome/nautilus/ui/nautilus-desktop-icon-view-ui.xml share/gnome/nautilus/ui/nautilus-directory-view-ui.xml share/gnome/nautilus/ui/nautilus-icon-view-ui.xml -- cgit v1.2.3