From 0bacc3fd0e6d32fb173d86f47b54ad1aebc0e614 Mon Sep 17 00:00:00 2001 From: marcus Date: Fri, 30 Jan 2004 22:33:00 +0000 Subject: Update to 2.5.6, and try to fix the nowrite emblem problem on desktop links. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1738 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-fm/nautilus/Makefile | 3 +-- x11-fm/nautilus/distinfo | 2 +- x11-fm/nautilus/files/patch-Makefile.in | 21 +++++++-------- .../nautilus/files/patch-libbackground_Makefile.in | 22 ++++++++-------- ...-libnautilus-private_nautilus-program-chooser.c | 15 ----------- x11-fm/nautilus/files/patch-ltmain.sh | 30 +++++++++++----------- x11-fm/nautilus/pkg-plist | 1 + x11-fm/nautilus2/Makefile | 3 +-- x11-fm/nautilus2/distinfo | 2 +- x11-fm/nautilus2/files/patch-Makefile.in | 21 +++++++-------- .../files/patch-libbackground_Makefile.in | 22 ++++++++-------- ...-libnautilus-private_nautilus-program-chooser.c | 15 ----------- x11-fm/nautilus2/files/patch-ltmain.sh | 30 +++++++++++----------- x11-fm/nautilus2/pkg-plist | 1 + 14 files changed, 80 insertions(+), 108 deletions(-) delete mode 100644 x11-fm/nautilus/files/patch-libnautilus-private_nautilus-program-chooser.c delete mode 100644 x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-program-chooser.c diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index e8d16b1f8..ae699e001 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nautilus2 -PORTVERSION= 2.5.5 -PORTREVISION= 1 +PORTVERSION= 2.5.6 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 86e0343ff..3d3632419 100644 --- a/x11-fm/nautilus/distinfo +++ b/x11-fm/nautilus/distinfo @@ -1 +1 @@ -MD5 (gnome2/nautilus-2.5.5.tar.bz2) = 2e6fde2041fe860faab9008eeafbd0ba +MD5 (gnome2/nautilus-2.5.6.tar.bz2) = 84b2480886c5f791c88d9b9f5d2d2a88 diff --git a/x11-fm/nautilus/files/patch-Makefile.in b/x11-fm/nautilus/files/patch-Makefile.in index 7fe0bcd6e..54984be63 100644 --- a/x11-fm/nautilus/files/patch-Makefile.in +++ b/x11-fm/nautilus/files/patch-Makefile.in @@ -1,10 +1,11 @@ ---- Makefile.in.orig Tue Jan 7 12:28:34 2003 -+++ Makefile.in Tue Jan 7 12:29:48 2003 -@@ -153,7 +153,6 @@ - libnautilus-private \ - libnautilus-adapter \ - src \ -- test \ - components \ - po \ - data \ +--- Makefile.in.orig Fri Jan 30 16:22:10 2004 ++++ Makefile.in Fri Jan 30 16:41:37 2004 +@@ -176,7 +176,7 @@ + DESKTOP_SETTINGS_FILES = nautilus-file-management-properties.desktop + + +-SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src test components po data icons docs $(NULL) ++SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src components po data icons docs $(NULL) + + + EXTRA_DIST = COPYING.LIB COPYING-DOCS HACKING MAINTAINERS nautilus.spec.in nautilus.desktop nautilus.desktop.in ChangeLog-20000414 ChangeLog-20000625 ChangeLog-20000831 ChangeLog-20001018 intltool-extract.in intltool-merge.in intltool-update.in Makefile.shared add-include-prefix $(DESKTOP_IN_FILES) $(DESKTOP_APPLICATIONS_FILES) $(DESKTOP_SETTINGS_FILES) $(NULL) diff --git a/x11-fm/nautilus/files/patch-libbackground_Makefile.in b/x11-fm/nautilus/files/patch-libbackground_Makefile.in index 835db3474..e60d29e99 100644 --- a/x11-fm/nautilus/files/patch-libbackground_Makefile.in +++ b/x11-fm/nautilus/files/patch-libbackground_Makefile.in @@ -1,11 +1,11 @@ ---- libbackground/Makefile.in.orig Tue Jan 7 12:30:18 2003 -+++ libbackground/Makefile.in Tue Jan 7 12:30:58 2003 -@@ -141,7 +141,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@ +--- libbackground/Makefile.in.orig Fri Jan 30 16:42:13 2004 ++++ libbackground/Makefile.in Fri Jan 30 16:43:02 2004 +@@ -168,7 +168,7 @@ + + EXTRA_DIST = ChangeLog + +-INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ + + + noinst_LTLIBRARIES = libbackground.la diff --git a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-program-chooser.c b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-program-chooser.c deleted file mode 100644 index 009fbb5ce..000000000 --- a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-program-chooser.c +++ /dev/null @@ -1,15 +0,0 @@ ---- libnautilus-private/nautilus-program-chooser.c.orig Thu Jan 22 18:01:21 2004 -+++ libnautilus-private/nautilus-program-chooser.c Thu Jan 22 18:01:28 2004 -@@ -1610,11 +1610,11 @@ - _("_Associate Application"), GTK_STOCK_CANCEL, parent_window); - - response = gtk_dialog_run (dialog); -- gtk_object_destroy (GTK_OBJECT (dialog)); - - if (response == GTK_RESPONSE_YES) { - launch_mime_capplet (file, dialog); - } -+ gtk_object_destroy (GTK_OBJECT (dialog)); - - g_free (unavailable_message); - g_free (file_name); diff --git a/x11-fm/nautilus/files/patch-ltmain.sh b/x11-fm/nautilus/files/patch-ltmain.sh index 854b2a10a..3232b8da9 100644 --- a/x11-fm/nautilus/files/patch-ltmain.sh +++ b/x11-fm/nautilus/files/patch-ltmain.sh @@ -1,15 +1,15 @@ ---- ltmain.sh.orig Sat Feb 8 09:47:44 2003 -+++ ltmain.sh Mon Jun 30 18:31:09 2003 -@@ -1075,7 +1075,7 @@ +--- ltmain.sh.orig Sun Jan 11 17:28:53 2004 ++++ ltmain.sh Fri Jan 30 16:45:37 2004 +@@ -1280,7 +1280,7 @@ esac - elif test "X$arg" = "X-lc_r"; then - case $host in + elif test "X$arg" = "X-lc_r"; then + case $host in - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1085,8 +1085,16 @@ + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ continue ;; @@ -26,17 +26,17 @@ continue ;; -@@ -2503,6 +2511,9 @@ - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4330,10 +4341,12 @@ + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist index f182fbb42..61c4b4079 100644 --- a/x11-fm/nautilus/pkg-plist +++ b/x11-fm/nautilus/pkg-plist @@ -81,6 +81,7 @@ share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml share/gnome/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-directory-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-icon-view-ui.xml +share/gnome/gnome-2.0/ui/nautilus-list-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-navigation-window-ui.xml share/gnome/gnome-2.0/ui/nautilus-search-list-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-shell-ui.xml diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index e8d16b1f8..ae699e001 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nautilus2 -PORTVERSION= 2.5.5 -PORTREVISION= 1 +PORTVERSION= 2.5.6 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 86e0343ff..3d3632419 100644 --- a/x11-fm/nautilus2/distinfo +++ b/x11-fm/nautilus2/distinfo @@ -1 +1 @@ -MD5 (gnome2/nautilus-2.5.5.tar.bz2) = 2e6fde2041fe860faab9008eeafbd0ba +MD5 (gnome2/nautilus-2.5.6.tar.bz2) = 84b2480886c5f791c88d9b9f5d2d2a88 diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in index 7fe0bcd6e..54984be63 100644 --- a/x11-fm/nautilus2/files/patch-Makefile.in +++ b/x11-fm/nautilus2/files/patch-Makefile.in @@ -1,10 +1,11 @@ ---- Makefile.in.orig Tue Jan 7 12:28:34 2003 -+++ Makefile.in Tue Jan 7 12:29:48 2003 -@@ -153,7 +153,6 @@ - libnautilus-private \ - libnautilus-adapter \ - src \ -- test \ - components \ - po \ - data \ +--- Makefile.in.orig Fri Jan 30 16:22:10 2004 ++++ Makefile.in Fri Jan 30 16:41:37 2004 +@@ -176,7 +176,7 @@ + DESKTOP_SETTINGS_FILES = nautilus-file-management-properties.desktop + + +-SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src test components po data icons docs $(NULL) ++SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src components po data icons docs $(NULL) + + + EXTRA_DIST = COPYING.LIB COPYING-DOCS HACKING MAINTAINERS nautilus.spec.in nautilus.desktop nautilus.desktop.in ChangeLog-20000414 ChangeLog-20000625 ChangeLog-20000831 ChangeLog-20001018 intltool-extract.in intltool-merge.in intltool-update.in Makefile.shared add-include-prefix $(DESKTOP_IN_FILES) $(DESKTOP_APPLICATIONS_FILES) $(DESKTOP_SETTINGS_FILES) $(NULL) diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in index 835db3474..e60d29e99 100644 --- a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in +++ b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in @@ -1,11 +1,11 @@ ---- libbackground/Makefile.in.orig Tue Jan 7 12:30:18 2003 -+++ libbackground/Makefile.in Tue Jan 7 12:30:58 2003 -@@ -141,7 +141,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@ +--- libbackground/Makefile.in.orig Fri Jan 30 16:42:13 2004 ++++ libbackground/Makefile.in Fri Jan 30 16:43:02 2004 +@@ -168,7 +168,7 @@ + + EXTRA_DIST = ChangeLog + +-INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ + + + noinst_LTLIBRARIES = libbackground.la diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-program-chooser.c b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-program-chooser.c deleted file mode 100644 index 009fbb5ce..000000000 --- a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-program-chooser.c +++ /dev/null @@ -1,15 +0,0 @@ ---- libnautilus-private/nautilus-program-chooser.c.orig Thu Jan 22 18:01:21 2004 -+++ libnautilus-private/nautilus-program-chooser.c Thu Jan 22 18:01:28 2004 -@@ -1610,11 +1610,11 @@ - _("_Associate Application"), GTK_STOCK_CANCEL, parent_window); - - response = gtk_dialog_run (dialog); -- gtk_object_destroy (GTK_OBJECT (dialog)); - - if (response == GTK_RESPONSE_YES) { - launch_mime_capplet (file, dialog); - } -+ gtk_object_destroy (GTK_OBJECT (dialog)); - - g_free (unavailable_message); - g_free (file_name); diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh index 854b2a10a..3232b8da9 100644 --- a/x11-fm/nautilus2/files/patch-ltmain.sh +++ b/x11-fm/nautilus2/files/patch-ltmain.sh @@ -1,15 +1,15 @@ ---- ltmain.sh.orig Sat Feb 8 09:47:44 2003 -+++ ltmain.sh Mon Jun 30 18:31:09 2003 -@@ -1075,7 +1075,7 @@ +--- ltmain.sh.orig Sun Jan 11 17:28:53 2004 ++++ ltmain.sh Fri Jan 30 16:45:37 2004 +@@ -1280,7 +1280,7 @@ esac - elif test "X$arg" = "X-lc_r"; then - case $host in + elif test "X$arg" = "X-lc_r"; then + case $host in - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1085,8 +1085,16 @@ + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ continue ;; @@ -26,17 +26,17 @@ continue ;; -@@ -2503,6 +2511,9 @@ - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4330,10 +4341,12 @@ + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index f182fbb42..61c4b4079 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -81,6 +81,7 @@ share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml share/gnome/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-directory-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-icon-view-ui.xml +share/gnome/gnome-2.0/ui/nautilus-list-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-navigation-window-ui.xml share/gnome/gnome-2.0/ui/nautilus-search-list-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-shell-ui.xml -- cgit v1.2.3