From 92b93659a06693f8415f63ad50423558d037ce9d Mon Sep 17 00:00:00 2001 From: jmmv Date: Tue, 21 Sep 2004 16:54:57 +0000 Subject: Update to 2.8.0. This version corresponds to GNOME 2.8.0. Major changes since 2.7.92 are: * Destroy metadata hashtable in right way, fixes crash * Fix crash in list view when changing views * Translation updates Major changes since 2.7.4 are: * Fix crash when transfer rate near zero * Fix crash when renaming in list view and changing directory * Fix double call of eel_preferences_remove_callback on shutdown * Use default folder view from gconf instead of now broken gnome-vfs mime setting * Some fixes to the handling of open with * Faster way to get the group list for a user * Don't make progress dialog on copy to desktop appear on all workspaces * Fix sort by size in computer view Major changes since 2.7.2 are: * Fix remaining time reporting in progress dialog * Nicer connect to server dialog * Various bugfixes and memleak fixes Major changes since 2.7.1 are: * Added spatial/browser pref to the prefs dialog * Use ctrl+q to add all windows * On shift-double-click on a non-folder, close the window after. * Bug fixes * Show estimated time remaining in the progress dialog. * per-window show hidden files setting * Don't warn about mime-type mismatches if the handler is the same for both mime-types. * Date formatting improvements * Killed start-here * Changed to use the new mime spec and UI Major changes since 2.6.2 are: * Desktop file editior property page * Display server name in window title for remote URIs * Add setting to not show volumes on desktop * Prevents read-only emblem from being shown on desktop icons when user is in root group * Fix dnd start coordinates when zoomed * Start apps in the directory they are launched from * Add close all windows to spatial window menu --- sysutils/nautilus/Makefile | 25 ++++--------------------- sysutils/nautilus/PLIST | 19 ++++--------------- sysutils/nautilus/buildlink3.mk | 6 ++++-- sysutils/nautilus/distinfo | 9 ++++----- sysutils/nautilus/patches/patch-ag | 15 --------------- sysutils/nautilus/patches/patch-ai | 10 +++++----- 6 files changed, 21 insertions(+), 63 deletions(-) delete mode 100644 sysutils/nautilus/patches/patch-ag (limited to 'sysutils/nautilus') diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile index a8acc86a3c5..1bb41e02e8a 100644 --- a/sysutils/nautilus/Makefile +++ b/sysutils/nautilus/Makefile @@ -1,17 +1,15 @@ -# $NetBSD: Makefile,v 1.35 2004/06/28 19:23:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.36 2004/09/21 16:54:57 jmmv Exp $ # -DISTNAME= nautilus-2.6.3 +DISTNAME= nautilus-2.8.0 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.6/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.8/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/projects/nautilus/ COMMENT= Nautilus file manager for GNOME2 -DEPENDS+= hicolor-icon-theme>=0.4:../../graphics/hicolor-icon-theme - USE_PKGLOCALEDIR= yes USE_BUILDLINK3= yes USE_DIRS+= gnome2-1.5 @@ -27,22 +25,6 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} GCONF2_SCHEMAS= apps_nautilus_preferences.schemas -OWN_DIRS= ${PKG_SYSCONFDIR}/X11/serverconfig -OWN_DIRS+= ${PKG_SYSCONFDIR}/X11/starthere -OWN_DIRS+= ${PKG_SYSCONFDIR}/X11/sysconfig -EGDIR= ${PREFIX}/share/examples/nautilus -CONF_FILES= -.for conffile in X11/serverconfig/.directory \ - X11/starthere/.directory \ - X11/starthere/applications.desktop \ - X11/starthere/preferences.desktop \ - X11/starthere/serverconfig.desktop \ - X11/starthere/sysconfig.desktop \ - X11/sysconfig/.directory -CONF_FILES+= ${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile} -.endfor -.undef conffile - .include "../../audio/esound/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" .include "../../devel/eel2/buildlink3.mk" @@ -54,6 +36,7 @@ CONF_FILES+= ${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile} .include "../../devel/libgsf/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/librsvg2/buildlink3.mk" diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST index e8181dba6a8..bab1af0c541 100644 --- a/sysutils/nautilus/PLIST +++ b/sysutils/nautilus/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/06/28 19:23:22 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/09/21 16:54:57 jmmv Exp $ bin/nautilus bin/nautilus-file-management-properties include/libnautilus/libnautilus.h @@ -71,13 +71,6 @@ share/applications/nautilus-home.desktop share/applications/nautilus.desktop share/applications/network-scheme.desktop share/control-center-2.0/capplets/nautilus-file-management-properties.desktop -share/examples/nautilus/X11/serverconfig/.directory -share/examples/nautilus/X11/starthere/.directory -share/examples/nautilus/X11/starthere/applications.desktop -share/examples/nautilus/X11/starthere/preferences.desktop -share/examples/nautilus/X11/starthere/serverconfig.desktop -share/examples/nautilus/X11/starthere/sysconfig.desktop -share/examples/nautilus/X11/sysconfig/.directory share/gconf/schemas/apps_nautilus_preferences.schemas share/gnome-2.0/ui/nautilus-clipboard-ui.xml share/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml @@ -98,6 +91,7 @@ ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/nautilus.mo +${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/nautilus.mo @@ -132,6 +126,7 @@ ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/nautilus.mo +${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/nautilus.mo @@ -149,6 +144,7 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/nautilus.mo +${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/nautilus.mo @@ -195,8 +191,6 @@ share/nautilus/patterns/snow_ridge.png share/nautilus/patterns/stucco.jpg share/nautilus/patterns/terracotta.png share/nautilus/patterns/wavy_white.png -share/nautilus/starthere-link.desktop -share/nautilus/starthere.desktop share/nautilus/static_bookmarks.xml share/pixmaps/nautilus/Search.png share/pixmaps/nautilus/audio.png @@ -242,11 +236,6 @@ share/pixmaps/nautilus/thumbnail_frame.png @comment in ORBit2: @dirrm share/idl @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui @comment in GConf2: @dirrm share/gconf/schemas -@dirrm share/examples/nautilus/X11/sysconfig -@dirrm share/examples/nautilus/X11/starthere -@dirrm share/examples/nautilus/X11/serverconfig -@dirrm share/examples/nautilus/X11 -@dirrm share/examples/nautilus @comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets @comment in xdg-dirs: @dirrm share/applications @comment in libbonobo: @dirrm lib/bonobo/servers diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk index 4828091f57f..4684978ef90 100644 --- a/sysutils/nautilus/buildlink3.mk +++ b/sysutils/nautilus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/05/15 16:50:03 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/09/21 16:54:57 jmmv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NAUTILUS_BUILDLINK3_MK:= ${NAUTILUS_BUILDLINK3_MK}+ @@ -11,13 +11,15 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnautilus} BUILDLINK_PACKAGES+= nautilus .if !empty(NAUTILUS_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.nautilus+= nautilus>=2.6.0 +BUILDLINK_DEPENDS.nautilus+= nautilus>=2.8.0 BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus PRINT_PLIST_AWK+= /^@dirrm lib\/nautilus$$/ \ { print "@comment in nautilus: " $$0; next; } PRINT_PLIST_AWK+= /^@dirrm lib\/nautilus\/extensions-1.0$$/ \ { print "@comment in nautilus: " $$0; next; } +PRINT_PLIST_AWK+= /^@dirrm share\/nautilus\/glade$$/ \ + { print "@comment in nautilus: " $$0; next; } .endif # NAUTILUS_BUILDLINK3_MK .include "../../audio/esound/buildlink3.mk" diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo index abea90b6592..5a13b8579bc 100644 --- a/sysutils/nautilus/distinfo +++ b/sysutils/nautilus/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.12 2004/06/28 19:23:22 jmmv Exp $ +$NetBSD: distinfo,v 1.13 2004/09/21 16:54:57 jmmv Exp $ -SHA1 (nautilus-2.6.3.tar.bz2) = a46b34c9bae3e0dd3164fd89483c0ab4437eb4a0 -Size (nautilus-2.6.3.tar.bz2) = 5665374 bytes +SHA1 (nautilus-2.8.0.tar.bz2) = bb659791f9fabc91ed3e71406b14a1dade48533a +Size (nautilus-2.8.0.tar.bz2) = 5773209 bytes SHA1 (patch-ab) = 60dc4cf38abd51d1d6353b07e6f0eabf2a748bf3 SHA1 (patch-ae) = a67d8b7ba3a1b9a71958736ef4946be301e67124 SHA1 (patch-af) = dbdfb1e7e2103a3174fddaccad64868781052057 -SHA1 (patch-ag) = e8d2e55efb32bf0b684ba7a67c177bf849ae9045 SHA1 (patch-ah) = 081da3e950f04573e136b6ed8c1ce0d057e803c5 -SHA1 (patch-ai) = 978519b6c3e3169030fda66d5f8d167af103a582 +SHA1 (patch-ai) = fe69717dce315877966e7c4d394ddfdcfd379bde diff --git a/sysutils/nautilus/patches/patch-ag b/sysutils/nautilus/patches/patch-ag deleted file mode 100644 index 62232ae5b86..00000000000 --- a/sysutils/nautilus/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2004/04/01 18:38:03 jmmv Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=134022 - ---- src/nautilus-application.c.orig 2003-10-21 14:52:52.000000000 +0200 -+++ src/nautilus-application.c -@@ -346,6 +346,8 @@ create_starthere_link_callback (gpointer - g_warning ("Failed to execute command '%s'\n", cmd); - } - -+ chmod(desktop_link_file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); -+ - g_free (desktop_path); - g_free (desktop_link_file); - g_free (cmd); diff --git a/sysutils/nautilus/patches/patch-ai b/sysutils/nautilus/patches/patch-ai index 0879c25d5d3..f72c9bdd337 100644 --- a/sysutils/nautilus/patches/patch-ai +++ b/sysutils/nautilus/patches/patch-ai @@ -1,10 +1,10 @@ -$NetBSD: patch-ai,v 1.1 2004/05/11 12:30:15 danw Exp $ +$NetBSD: patch-ai,v 1.2 2004/09/21 16:54:57 jmmv Exp $ ---- libnautilus-private/nautilus-program-choosing.c.orig Tue Apr 13 20:45:27 2004 +--- libnautilus-private/nautilus-program-choosing.c.orig 2004-07-24 16:47:37.000000000 +0200 +++ libnautilus-private/nautilus-program-choosing.c -@@ -71,6 +71,11 @@ typedef struct { - - static GHashTable *choose_application_hash_table, *choose_component_hash_table; +@@ -62,6 +62,11 @@ + #include + #endif +#if defined(__APPLE__) +#include -- cgit v1.2.3