diff options
author | jmmv <jmmv@pkgsrc.org> | 2005-03-22 16:14:16 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2005-03-22 16:14:16 +0000 |
commit | b4e9b654c5e77f6c5a3b8698f8a6d3bd82580b82 (patch) | |
tree | b858850c5b4b82038474753cedd856e3fcfc7b11 /sysutils/nautilus | |
parent | bc301ce848a181db40659e1f8b179493933845e6 (diff) | |
download | pkgsrc-b4e9b654c5e77f6c5a3b8698f8a6d3bd82580b82.tar.gz |
Update to 2.10.0:
Major changes in 2.10.0 are:
* Some fixes for startup notification to avoid focus-stealing
* Center the file management prefs dialog
Major changes in 2.9.92 are:
* Avoid doing i/o to tree root nodes before they are used.
This means we don't get authentication callbacks.
* Correct handling of startup notification
* Fix crashers in desktop icon context menus when unmounting volumes
* Make property page for home icon on desktop show the right size
* Prevent the progress dialog from displaying strange ETAs
* Make backspace key open parent folder in list view
Major changes in 2.9.91 are:
* Fix some crashes
* Don't pop up mozilla dnd ask dialog under windows
* Change the look of the path button to make it easier to find
* Some changes to the look/text of the progress dialog
* Fix panel size detection on 64bit machines
* Allow open with menu on folders
Major changes in 2.9.90 are:
* Better window titles for browser windows
* Better icons for burn: & computer: in the ui
* Allow eject of unmounted devices
* Better handling of DnD from mozilla
* Make connect to server dialog availible as separate app
* Use GtkAboutDialog
Major changes in 2.9.2 are:
* Use the new mime API
* Fixed bug in finding empty spots on the desktop
* Handle drags to special desktop icons (trash...)
* Fix crash in clipboard code
* Fix crash with non-unique volume filenames
* Better handling of sizes for image-file-as-icon
* Fill in ctrl-l dialog correctly for desktop
* Fix crash in bookmark dialog if parent window goes away
Diffstat (limited to 'sysutils/nautilus')
-rw-r--r-- | sysutils/nautilus/Makefile | 17 | ||||
-rw-r--r-- | sysutils/nautilus/PLIST | 64 | ||||
-rw-r--r-- | sysutils/nautilus/buildlink3.mk | 7 | ||||
-rw-r--r-- | sysutils/nautilus/distinfo | 13 | ||||
-rw-r--r-- | sysutils/nautilus/patches/patch-ab | 41 | ||||
-rw-r--r-- | sysutils/nautilus/patches/patch-ae | 13 | ||||
-rw-r--r-- | sysutils/nautilus/patches/patch-af | 10 | ||||
-rw-r--r-- | sysutils/nautilus/patches/patch-aj | 21 |
8 files changed, 39 insertions, 147 deletions
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile index 305fde3356b..0590e784b0f 100644 --- a/sysutils/nautilus/Makefile +++ b/sysutils/nautilus/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.42 2004/12/28 21:45:59 jmmv Exp $ +# $NetBSD: Makefile,v 1.43 2005/03/22 16:14:16 jmmv Exp $ # -DISTNAME= nautilus-2.8.2 +DISTNAME= nautilus-2.10.0 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.8/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.10/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= rh@NetBSD.org @@ -12,20 +12,20 @@ COMMENT= Nautilus file manager for GNOME2 USE_PKGLOCALEDIR= yes USE_BUILDLINK3= yes -USE_DIRS+= gnome2-1.5 +USE_DIRS+= xdg-1.1 USE_X11= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE= libnautilus/libnautilus.pc.in -PKGCONFIG_OVERRIDE+= libnautilus-extension/libnautilus-extension.pc.in +PKGCONFIG_OVERRIDE= libnautilus-extension/libnautilus-extension.pc.in CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} GCONF2_SCHEMAS= apps_nautilus_preferences.schemas -BUILDLINK_DEPENDS.eel2+= eel2>=2.8.2 +BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 +BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0 .include "../../audio/esound/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" @@ -50,4 +50,7 @@ BUILDLINK_DEPENDS.eel2+= eel2>=2.8.2 .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/lib/nautilus/extensions-1.0 + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST index 8e271164ba8..f12dc52968f 100644 --- a/sysutils/nautilus/PLIST +++ b/sysutils/nautilus/PLIST @@ -1,17 +1,7 @@ -@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:54 jlam Exp $ +@comment $NetBSD: PLIST,v 1.10 2005/03/22 16:14:16 jmmv Exp $ bin/nautilus +bin/nautilus-connect-server bin/nautilus-file-management-properties -include/libnautilus/libnautilus.h -include/libnautilus/nautilus-bonobo-ui.h -include/libnautilus/nautilus-clipboard.h -include/libnautilus/nautilus-distributed-undo.h -include/libnautilus/nautilus-idle-queue.h -include/libnautilus/nautilus-scroll-positionable.h -include/libnautilus/nautilus-undo-private.h -include/libnautilus/nautilus-undo.h -include/libnautilus/nautilus-view-component.h -include/libnautilus/nautilus-view-standard-main.h -include/libnautilus/nautilus-view.h include/nautilus/libnautilus-extension/nautilus-column-provider.h include/nautilus/libnautilus-extension/nautilus-column.h include/nautilus/libnautilus-extension/nautilus-extension-types.h @@ -21,45 +11,17 @@ include/nautilus/libnautilus-extension/nautilus-menu-item.h include/nautilus/libnautilus-extension/nautilus-menu-provider.h include/nautilus/libnautilus-extension/nautilus-property-page-provider.h include/nautilus/libnautilus-extension/nautilus-property-page.h -lib/bonobo/libnautilus-emblem-view.la -lib/bonobo/libnautilus-history-view.la -lib/bonobo/libnautilus-image-properties-view.la -lib/bonobo/libnautilus-notes-view.la -lib/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server -lib/bonobo/servers/Nautilus_Control_throbber.server -lib/bonobo/servers/Nautilus_View_emblem.server -lib/bonobo/servers/Nautilus_View_history.server -lib/bonobo/servers/Nautilus_View_image_properties.server -lib/bonobo/servers/Nautilus_View_notes.server -lib/bonobo/servers/Nautilus_View_text.server lib/bonobo/servers/Nautilus_shell.server -lib/libnautilus-adapter.la lib/libnautilus-extension.la lib/libnautilus-private.la -lib/libnautilus.la lib/pkgconfig/libnautilus-extension.pc -lib/pkgconfig/libnautilus.pc -libexec/nautilus-adapter -libexec/nautilus-text-view -libexec/nautilus-throbber share/applications/nautilus-computer.desktop +share/applications/nautilus-file-management-properties.desktop +share/applications/nautilus-folder-handler.desktop 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/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 -share/gnome-2.0/ui/nautilus-directory-view-ui.xml -share/gnome-2.0/ui/nautilus-icon-view-ui.xml -share/gnome-2.0/ui/nautilus-list-view-ui.xml -share/gnome-2.0/ui/nautilus-navigation-window-ui.xml -share/gnome-2.0/ui/nautilus-search-list-view-ui.xml -share/gnome-2.0/ui/nautilus-shell-ui.xml -share/gnome-2.0/ui/nautilus-spatial-window-ui.xml -share/gnome-2.0/ui/nautilus-text-view-ui.xml -share/idl/nautilus-distributed-undo.idl -share/idl/nautilus-view-component.idl ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/nautilus.mo @@ -107,6 +69,7 @@ ${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/nautilus.mo +${PKGLOCALEDIR}/locale/nso/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/nautilus.mo @@ -130,6 +93,7 @@ ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/nautilus.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/nautilus.mo +${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/nautilus.mo share/nautilus/browser.xml share/nautilus/glade/nautilus-bookmarks-window.glade share/nautilus/glade/nautilus-file-management-properties.glade @@ -167,7 +131,13 @@ share/nautilus/patterns/snow_ridge.png share/nautilus/patterns/stucco.jpg share/nautilus/patterns/terracotta.png share/nautilus/patterns/wavy_white.png -share/nautilus/static_bookmarks.xml +share/nautilus/ui/nautilus-desktop-icon-view-ui.xml +share/nautilus/ui/nautilus-directory-view-ui.xml +share/nautilus/ui/nautilus-icon-view-ui.xml +share/nautilus/ui/nautilus-list-view-ui.xml +share/nautilus/ui/nautilus-navigation-window-ui.xml +share/nautilus/ui/nautilus-shell-ui.xml +share/nautilus/ui/nautilus-spatial-window-ui.xml share/pixmaps/nautilus/Search.png share/pixmaps/nautilus/audio.png share/pixmaps/nautilus/backgrounds.png @@ -206,15 +176,15 @@ share/pixmaps/nautilus/thumbnail_frame.png @dirrm share/pixmaps/nautilus/crux_eggplant @dirrm share/pixmaps/nautilus @comment in xdg-dirs: @dirrm share/pixmaps +@dirrm share/nautilus/ui @dirrm share/nautilus/patterns @dirrm share/nautilus/glade @dirrm share/nautilus -@comment in ORBit2: @dirrm share/idl -@comment in gnome2-dirs: @dirrm share/gnome-2.0/ui @comment in GConf2: @dirrm share/gconf/schemas -@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets @comment in xdg-dirs: @dirrm share/applications +@exec ${MKDIR} %D/lib/nautilus/extensions-1.0 +@dirrm lib/nautilus/extensions-1.0 +@dirrm lib/nautilus @comment in libbonobo: @dirrm lib/bonobo/servers @dirrm include/nautilus/libnautilus-extension @dirrm include/nautilus -@dirrm include/libnautilus diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk index 4e632a33bb9..82908dd0935 100644 --- a/sysutils/nautilus/buildlink3.mk +++ b/sysutils/nautilus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/10/03 00:18:16 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2005/03/22 16:14:16 jmmv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NAUTILUS_BUILDLINK3_MK:= ${NAUTILUS_BUILDLINK3_MK}+ @@ -11,16 +11,13 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnautilus} BUILDLINK_PACKAGES+= nautilus .if !empty(NAUTILUS_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.nautilus+= nautilus>=2.8.0 -BUILDLINK_RECOMMENDED.nautilus+= nautilus>=2.8.0nb1 +BUILDLINK_DEPENDS.nautilus+= nautilus>=2.10.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 21b73630884..a115df7195e 100644 --- a/sysutils/nautilus/distinfo +++ b/sysutils/nautilus/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.18 2005/02/24 13:40:55 agc Exp $ +$NetBSD: distinfo,v 1.19 2005/03/22 16:14:16 jmmv Exp $ -SHA1 (nautilus-2.8.2.tar.bz2) = cf85656656550d1e8c4be405434cd3e81c7ad7bb -RMD160 (nautilus-2.8.2.tar.bz2) = 71d0d48d5f0f266bc3234b0b450b4e420c28be6e -Size (nautilus-2.8.2.tar.bz2) = 5808170 bytes -SHA1 (patch-ab) = 60dc4cf38abd51d1d6353b07e6f0eabf2a748bf3 -SHA1 (patch-ae) = a67d8b7ba3a1b9a71958736ef4946be301e67124 -SHA1 (patch-af) = dbdfb1e7e2103a3174fddaccad64868781052057 +SHA1 (nautilus-2.10.0.tar.bz2) = 6ca9cf0e7a741a22174f47d5930c1b4e4de92188 +RMD160 (nautilus-2.10.0.tar.bz2) = e9bb2f90e2facabb307991853fd796e74b29846e +Size (nautilus-2.10.0.tar.bz2) = 5899170 bytes +SHA1 (patch-af) = 928ce8395e33d4459ac83c2d992e251e223ddfeb SHA1 (patch-ah) = 081da3e950f04573e136b6ed8c1ce0d057e803c5 SHA1 (patch-ai) = fe69717dce315877966e7c4d394ddfdcfd379bde -SHA1 (patch-aj) = 7e4ed40cb7acbf363a4722d2a033e92db93483ed diff --git a/sysutils/nautilus/patches/patch-ab b/sysutils/nautilus/patches/patch-ab deleted file mode 100644 index 266a874b432..00000000000 --- a/sysutils/nautilus/patches/patch-ab +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2004/04/01 18:38:03 jmmv Exp $ - -http://bugzilla.gnome.org/showattachment.cgi?attach_id=24286 - ---- libnautilus-private/nautilus-medusa-support.c 28 Oct 2001 20:21:46 -0000 1.11 -+++ libnautilus-private/nautilus-medusa-support.c 10 Feb 2004 19:11:58 -0000 -@@ -32,6 +32,7 @@ - #include <eel/eel-string.h> - #include <dirent.h> - #include <stdio.h> -+#include <unistd.h> - #include <sys/types.h> - - #ifdef HAVE_MEDUSA -@@ -52,6 +53,18 @@ - NautilusCronStatus - nautilus_medusa_check_cron_is_enabled (void) - { -+#if defined(__NetBSD__) -+ /* In NetBSD, cron(8) is part of the base system and is configured -+ to store a pid file in /var/run/cron.pid while running. Instead -+ of walking the process table (which has its implications, since -+ proc is not mounted by default and has very strict permissions), -+ we can simply check for its existence. */ -+ -+ if (access("/var/run/cron.pid", F_OK) == -1) -+ return NAUTILUS_CRON_STATUS_OFF; -+ -+ return NAUTILUS_CRON_STATUS_ON; -+#else - DIR *proc_directory; - struct dirent *file; - char *stat_file_name; -@@ -106,6 +119,7 @@ - - closedir (proc_directory); - return status; -+#endif - } - - #ifdef HAVE_MEDUSA diff --git a/sysutils/nautilus/patches/patch-ae b/sysutils/nautilus/patches/patch-ae deleted file mode 100644 index d7592e6904b..00000000000 --- a/sysutils/nautilus/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2003/04/27 16:05:04 jmmv Exp $ - ---- data/Makefile.in.orig 2003-04-01 06:21:33.000000000 +0200 -+++ data/Makefile.in -@@ -25,7 +25,7 @@ bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ --sysconfdir = @sysconfdir@ -+sysconfdir = @datadir@/examples/@PACKAGE@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ diff --git a/sysutils/nautilus/patches/patch-af b/sysutils/nautilus/patches/patch-af index 531e8b5de63..17d848db5e8 100644 --- a/sysutils/nautilus/patches/patch-af +++ b/sysutils/nautilus/patches/patch-af @@ -1,9 +1,9 @@ -$NetBSD: patch-af,v 1.1 2003/05/04 01:10:58 rh Exp $ +$NetBSD: patch-af,v 1.2 2005/03/22 16:14:16 jmmv Exp $ ---- src/nautilus-main.c.orig Sat Mar 15 01:34:55 2003 +--- src/nautilus-main.c.orig 2005-03-07 10:00:15.000000000 +0100 +++ src/nautilus-main.c -@@ -56,6 +56,24 @@ - #include <stdlib.h> +@@ -57,6 +57,24 @@ + #include <string.h> #include <unistd.h> +#ifdef __NetBSD__ @@ -27,7 +27,7 @@ $NetBSD: patch-af,v 1.1 2003/05/04 01:10:58 rh Exp $ /* Keeps track of everyone who wants the main event loop kept active */ static GSList *event_loop_registrants; -@@ -259,6 +277,10 @@ main (int argc, char *argv[]) +@@ -420,6 +438,10 @@ main (int argc, char *argv[]) } else { /* Run the nautilus application. */ application = nautilus_application_new (); diff --git a/sysutils/nautilus/patches/patch-aj b/sysutils/nautilus/patches/patch-aj deleted file mode 100644 index f07a4582b16..00000000000 --- a/sysutils/nautilus/patches/patch-aj +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2004/11/03 12:40:53 jmmv Exp $ - ---- components/image_properties/nautilus-image-properties-view.c.orig 2004-03-09 12:23:37.000000000 +0100 -+++ components/image_properties/nautilus-image-properties-view.c -@@ -123,6 +123,7 @@ exif_string_to_utf8 (const char *exif_st - static void - exif_content_callback (ExifContent *content, gpointer data) - { -+ char value[1024]; - struct ExifAttribute *attribute; - - attribute = (struct ExifAttribute *)data; -@@ -130,7 +131,7 @@ exif_content_callback (ExifContent *cont - 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; - } |