From a00f58724f1e9beafc2e1b01b2666199edb127ec Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 25 Feb 2004 08:27:53 +0000 Subject: Update to 2.5.8. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1910 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-fm/nautilus/Makefile | 2 +- x11-fm/nautilus/distinfo | 4 +-- ...h-libnautilus-private_filesystem-attributes.xml | 31 ---------------------- .../patch-src_file-manager_fm-directory-view.c | 19 +++---------- x11-fm/nautilus/pkg-plist | 6 +---- x11-fm/nautilus2/Makefile | 2 +- x11-fm/nautilus2/distinfo | 4 +-- ...h-libnautilus-private_filesystem-attributes.xml | 31 ---------------------- .../patch-src_file-manager_fm-directory-view.c | 19 +++---------- x11-fm/nautilus2/pkg-plist | 6 +---- 10 files changed, 14 insertions(+), 110 deletions(-) delete mode 100644 x11-fm/nautilus/files/patch-libnautilus-private_filesystem-attributes.xml delete mode 100644 x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 3948dcede..81801a0c2 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nautilus2 -PORTVERSION= 2.5.7 +PORTVERSION= 2.5.8 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5 diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo index 85dba1404..78ee86aa7 100644 --- a/x11-fm/nautilus/distinfo +++ b/x11-fm/nautilus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-2.5.7.tar.bz2) = 5eb9fdfae7e8df8e758b71e2b8de58df -SIZE (gnome2/nautilus-2.5.7.tar.bz2) = 5611472 +MD5 (gnome2/nautilus-2.5.8.tar.bz2) = 43da4a678ae7c768bd76d4dbe3a4aa44 +SIZE (gnome2/nautilus-2.5.8.tar.bz2) = 5632320 diff --git a/x11-fm/nautilus/files/patch-libnautilus-private_filesystem-attributes.xml b/x11-fm/nautilus/files/patch-libnautilus-private_filesystem-attributes.xml deleted file mode 100644 index 81e3a2a71..000000000 --- a/x11-fm/nautilus/files/patch-libnautilus-private_filesystem-attributes.xml +++ /dev/null @@ -1,31 +0,0 @@ ---- libnautilus-private/filesystem-attributes.xml.orig Sat Sep 14 16:56:38 2002 -+++ libnautilus-private/filesystem-attributes.xml Sat Sep 14 17:01:31 2002 -@@ -3,10 +3,12 @@ - - - -+ - - - - -+ - - - -@@ -15,10 +17,15 @@ - - - -+ -+ - - - -+ -+ - -+ - - - diff --git a/x11-fm/nautilus/files/patch-src_file-manager_fm-directory-view.c b/x11-fm/nautilus/files/patch-src_file-manager_fm-directory-view.c index 773f7bfea..5246e273c 100644 --- a/x11-fm/nautilus/files/patch-src_file-manager_fm-directory-view.c +++ b/x11-fm/nautilus/files/patch-src_file-manager_fm-directory-view.c @@ -1,6 +1,6 @@ ---- src/file-manager/fm-directory-view.c.orig Thu Oct 2 23:30:40 2003 -+++ src/file-manager/fm-directory-view.c Thu Oct 2 23:52:04 2003 -@@ -4314,19 +4314,25 @@ +--- src/file-manager/fm-directory-view.c.orig Tue Feb 24 08:17:24 2004 ++++ src/file-manager/fm-directory-view.c Wed Feb 25 02:43:55 2004 +@@ -4476,19 +4476,25 @@ nautilus_bonobo_set_hidden (view->details->ui, FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS, @@ -29,16 +29,3 @@ nautilus_bonobo_set_hidden (view->details->ui, FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_SEPARATOR, !any_scripts); -@@ -5149,10 +5149,11 @@ - GList *selection, - gint selection_count) - { -- selection_count = g_list_length (selection); - gboolean can_paste_files_into; - gboolean selection_is_read_only; - gboolean is_read_only; -+ -+ selection_count = g_list_length (selection); - - selection_is_read_only = selection_count == 1 - && !nautilus_file_can_write (NAUTILUS_FILE (selection->data)); diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist index 9e849b39e..b78fda3b1 100644 --- a/x11-fm/nautilus/pkg-plist +++ b/x11-fm/nautilus/pkg-plist @@ -1,6 +1,5 @@ bin/nautilus bin/nautilus-file-management-properties -bin/nautilus-server-connect etc/X11/serverconfig/.directory etc/X11/starthere/.directory etc/X11/starthere/applications.desktop @@ -90,10 +89,8 @@ share/gnome/gnome-2.0/ui/nautilus-text-view-ui.xml share/gnome/idl/nautilus-distributed-undo.idl share/gnome/idl/nautilus-view-component.idl share/gnome/nautilus/browser.xml -share/gnome/nautilus/filesystem-attributes.xml share/gnome/nautilus/glade/nautilus-bookmarks-window.glade share/gnome/nautilus/glade/nautilus-file-management-properties.glade -share/gnome/nautilus/glade/nautilus-server-connect.glade share/gnome/nautilus/nautilus-extras.placeholder share/gnome/nautilus/nautilus-suggested.placeholder share/gnome/nautilus/patterns/.striated.png @@ -131,7 +128,6 @@ share/gnome/nautilus/patterns/wavy_white.png share/gnome/nautilus/starthere-link.desktop share/gnome/nautilus/starthere.desktop share/gnome/nautilus/static_bookmarks.xml -share/gnome/network/nautilus-server-connect.desktop share/gnome/pixmaps/nautilus/Search.png share/gnome/pixmaps/nautilus/audio.png share/gnome/pixmaps/nautilus/backgrounds.png @@ -174,6 +170,7 @@ share/locale/cy/LC_MESSAGES/nautilus.mo share/locale/da/LC_MESSAGES/nautilus.mo share/locale/de/LC_MESSAGES/nautilus.mo share/locale/el/LC_MESSAGES/nautilus.mo +share/locale/en_CA/LC_MESSAGES/nautilus.mo share/locale/en_GB/LC_MESSAGES/nautilus.mo share/locale/es/LC_MESSAGES/nautilus.mo share/locale/et/LC_MESSAGES/nautilus.mo @@ -224,7 +221,6 @@ share/locale/yi/LC_MESSAGES/nautilus.mo share/locale/zh_CN/LC_MESSAGES/nautilus.mo share/locale/zh_TW/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/default -@dirrm share/gnome/network @dirrm share/gnome/nautilus/glade @dirrm include/nautilus/libnautilus-extension @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index 3948dcede..81801a0c2 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nautilus2 -PORTVERSION= 2.5.7 +PORTVERSION= 2.5.8 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5 diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo index 85dba1404..78ee86aa7 100644 --- a/x11-fm/nautilus2/distinfo +++ b/x11-fm/nautilus2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-2.5.7.tar.bz2) = 5eb9fdfae7e8df8e758b71e2b8de58df -SIZE (gnome2/nautilus-2.5.7.tar.bz2) = 5611472 +MD5 (gnome2/nautilus-2.5.8.tar.bz2) = 43da4a678ae7c768bd76d4dbe3a4aa44 +SIZE (gnome2/nautilus-2.5.8.tar.bz2) = 5632320 diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml b/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml deleted file mode 100644 index 81e3a2a71..000000000 --- a/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml +++ /dev/null @@ -1,31 +0,0 @@ ---- libnautilus-private/filesystem-attributes.xml.orig Sat Sep 14 16:56:38 2002 -+++ libnautilus-private/filesystem-attributes.xml Sat Sep 14 17:01:31 2002 -@@ -3,10 +3,12 @@ - - - -+ - - - - -+ - - - -@@ -15,10 +17,15 @@ - - - -+ -+ - - - -+ -+ - -+ - - - diff --git a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c index 773f7bfea..5246e273c 100644 --- a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c +++ b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c @@ -1,6 +1,6 @@ ---- src/file-manager/fm-directory-view.c.orig Thu Oct 2 23:30:40 2003 -+++ src/file-manager/fm-directory-view.c Thu Oct 2 23:52:04 2003 -@@ -4314,19 +4314,25 @@ +--- src/file-manager/fm-directory-view.c.orig Tue Feb 24 08:17:24 2004 ++++ src/file-manager/fm-directory-view.c Wed Feb 25 02:43:55 2004 +@@ -4476,19 +4476,25 @@ nautilus_bonobo_set_hidden (view->details->ui, FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS, @@ -29,16 +29,3 @@ nautilus_bonobo_set_hidden (view->details->ui, FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_SEPARATOR, !any_scripts); -@@ -5149,10 +5149,11 @@ - GList *selection, - gint selection_count) - { -- selection_count = g_list_length (selection); - gboolean can_paste_files_into; - gboolean selection_is_read_only; - gboolean is_read_only; -+ -+ selection_count = g_list_length (selection); - - selection_is_read_only = selection_count == 1 - && !nautilus_file_can_write (NAUTILUS_FILE (selection->data)); diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index 9e849b39e..b78fda3b1 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -1,6 +1,5 @@ bin/nautilus bin/nautilus-file-management-properties -bin/nautilus-server-connect etc/X11/serverconfig/.directory etc/X11/starthere/.directory etc/X11/starthere/applications.desktop @@ -90,10 +89,8 @@ share/gnome/gnome-2.0/ui/nautilus-text-view-ui.xml share/gnome/idl/nautilus-distributed-undo.idl share/gnome/idl/nautilus-view-component.idl share/gnome/nautilus/browser.xml -share/gnome/nautilus/filesystem-attributes.xml share/gnome/nautilus/glade/nautilus-bookmarks-window.glade share/gnome/nautilus/glade/nautilus-file-management-properties.glade -share/gnome/nautilus/glade/nautilus-server-connect.glade share/gnome/nautilus/nautilus-extras.placeholder share/gnome/nautilus/nautilus-suggested.placeholder share/gnome/nautilus/patterns/.striated.png @@ -131,7 +128,6 @@ share/gnome/nautilus/patterns/wavy_white.png share/gnome/nautilus/starthere-link.desktop share/gnome/nautilus/starthere.desktop share/gnome/nautilus/static_bookmarks.xml -share/gnome/network/nautilus-server-connect.desktop share/gnome/pixmaps/nautilus/Search.png share/gnome/pixmaps/nautilus/audio.png share/gnome/pixmaps/nautilus/backgrounds.png @@ -174,6 +170,7 @@ share/locale/cy/LC_MESSAGES/nautilus.mo share/locale/da/LC_MESSAGES/nautilus.mo share/locale/de/LC_MESSAGES/nautilus.mo share/locale/el/LC_MESSAGES/nautilus.mo +share/locale/en_CA/LC_MESSAGES/nautilus.mo share/locale/en_GB/LC_MESSAGES/nautilus.mo share/locale/es/LC_MESSAGES/nautilus.mo share/locale/et/LC_MESSAGES/nautilus.mo @@ -224,7 +221,6 @@ share/locale/yi/LC_MESSAGES/nautilus.mo share/locale/zh_CN/LC_MESSAGES/nautilus.mo share/locale/zh_TW/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/default -@dirrm share/gnome/network @dirrm share/gnome/nautilus/glade @dirrm include/nautilus/libnautilus-extension @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree -- cgit v1.2.3