diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-13 16:48:23 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-13 16:48:23 +0800 |
commit | bcd1808193a8a889c2442b8347c5405ac0d979b4 (patch) | |
tree | 4b5e018180193d7b379448a3077a91404c6bf2f3 /x11-fm/nautilus/files | |
parent | 620b4e799fb91ce614549ebe911baeb602983755 (diff) | |
download | marcuscom-ports-bcd1808193a8a889c2442b8347c5405ac0d979b4.tar marcuscom-ports-bcd1808193a8a889c2442b8347c5405ac0d979b4.tar.gz marcuscom-ports-bcd1808193a8a889c2442b8347c5405ac0d979b4.tar.bz2 marcuscom-ports-bcd1808193a8a889c2442b8347c5405ac0d979b4.tar.lz marcuscom-ports-bcd1808193a8a889c2442b8347c5405ac0d979b4.tar.xz marcuscom-ports-bcd1808193a8a889c2442b8347c5405ac0d979b4.tar.zst marcuscom-ports-bcd1808193a8a889c2442b8347c5405ac0d979b4.zip |
Update to 2.5.1.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1319 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-fm/nautilus/files')
9 files changed, 271 insertions, 0 deletions
diff --git a/x11-fm/nautilus/files/patch-Makefile.in b/x11-fm/nautilus/files/patch-Makefile.in new file mode 100644 index 000000000..7fe0bcd6e --- /dev/null +++ b/x11-fm/nautilus/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- 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 \ diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa new file mode 100644 index 000000000..d4741108d --- /dev/null +++ b/x11-fm/nautilus/files/patch-aa @@ -0,0 +1,29 @@ +--- configure.orig Mon Nov 10 22:08:05 2003 ++++ configure Mon Nov 10 22:08:05 2003 +@@ -12971,7 +12971,7 @@ + + LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" + +-LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`" ++LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`" + + + CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES" +@@ -12979,7 +12979,7 @@ + + CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" + +-CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`" ++CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`" + + + COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0" +@@ -13959,7 +13959,7 @@ + s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;t t + s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t +-s,@ALL_LIBS@,$ALL_LIBS,;t t ++s~@ALL_LIBS@~$ALL_LIBS~;t t + s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t + s,@USE_NLS@,$USE_NLS,;t t + s,@MSGFMT@,$MSGFMT,;t t diff --git a/x11-fm/nautilus/files/patch-data_static_bookmarks.xml b/x11-fm/nautilus/files/patch-data_static_bookmarks.xml new file mode 100644 index 000000000..54ea8ae37 --- /dev/null +++ b/x11-fm/nautilus/files/patch-data_static_bookmarks.xml @@ -0,0 +1,84 @@ +--- 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 @@ + <?xml version="1.0"?> + <bookmarks> + <folder _name="Software"> +- <bookmark _name="Allaire" icon_name="i-web" uri="http://www.allaire.com/Products/index.cfm"/> +- <bookmark _name="Borland" icon_name="i-web" uri="http://www.borland.com/kylix/"/> +- <bookmark _name="MandrakeSoft" icon_name="i-web" uri="http://mandrakesoft.com/"/> +- <bookmark _name="Netraverse" icon_name="i-web" uri="http://www.netraverse.com"/> +- <bookmark _name="Red Hat" icon_name="i-web" uri="http://www.redhat.com"/> +- <bookmark _name="SuSE" icon_name="i-web" uri="http://www.suse.com"/> ++ <bookmark _name="4Front Technologies" icon_name="i-web" uri="http://www.4front-tech.com"/> ++ <bookmark _name="BSD Mall" icon_name="i-web" uri="http://www.bsdmall.com/freebsd1.html"/> ++ <bookmark _name="FreeBSD" icon_name="i-web" uri="http://www.freebsd.org"/> ++ <bookmark _name="GNOME" icon_name="i-web" uri="http://www.gnome.org/"/> + <bookmark _name="Sun StarOffice" icon_name="i-web" uri="http://www.sun.com/products/staroffice/"/> + <bookmark _name="Ximian" icon_name="i-web" uri="http://www.ximian.com"/> +- <bookmark _name="Zero-Knowledge" icon_name="i-web" uri="http://www.zeroknowledge.com"/> + </folder> + <folder _name="Hardware"> +- <bookmark _name="Compaq" icon_name="i-web" uri="http://www.compaq.com/products/software/linux/"/> +- <bookmark _name="CNET Computers.com" icon_name="i-web" uri="http://computers.cnet.com/hardware/0-1016.html"/> +- <bookmark _name="Dell" icon_name="i-web" uri="http://www.dell.com/linux/"/> +- <bookmark _name="Penguin Computing" icon_name="i-web" uri="http://www.penguincomputing.com"/> +- <bookmark _name="ZDNet Linux Hardware Database" icon_name="i-web" uri="http://lhd.zdnet.com"/> ++ <bookmark _name="Adaptec" icon_name="i-web" uri="http://www.adaptec.com"/> ++ <bookmark _name="BSD Mall" icon_name="i-web" uri="http://www.bsdmall.com/hardware.html"/> ++ <bookmark _name="Cisco Systems, Inc" icon_name="i-web" uri="http://www.cisco.com"/> ++ <bookmark _name="Compaq" icon_name="i-web" uri="http://www.compaq.com"/> ++ <bookmark _name="Data Net Solutions" icon_name="i-web" uri="http://www.eclipse.com"/> ++ <bookmark _name="Dell" icon_name="i-web" uri="http://www.dell.com"/> + </folder> + <folder _name="News and Media"> +- <bookmark _name="Binary Freedom" icon_name="i-web" uri="http://www.binaryfreedom.com/"/> +- <bookmark _name="CNET Linux Center" icon_name="i-web" uri="http://linux.cnet.com/linux/0-1518529-7-3378110.html"/> +- <bookmark _name="LinuxOrbit.com" icon_name="i-web" uri="http://www.linuxorbit.com"/> +- <bookmark _name="Linux Weekly News" icon_name="i-web" uri="http://www.lwn.net"/> ++ <bookmark _name="BSD Today" icon_name="i-web" uri="http://www.bsdtoday.com"/> ++ <bookmark _name="Daily Daemon News" icon_name="i-web" uri="http://daily.daemonnews.org"/> ++ <bookmark _name="Daemon News" icon_name="i-web" uri="http://www.daemonnews.org"/> + <bookmark _name="O'Reilly" icon_name="i-web" uri="http://www.oreillynet.com"/> +- <bookmark _name="OSDN" icon_name="i-web" uri="http://www.osdn.com"/> +- <bookmark _name="ZDNet Linux Resource Center" icon_name="i-web" uri="http://linux.zdnet.com"/> + </folder> + <folder _name="Web Services"> +- <bookmark _name="CollabNet" icon_name="i-web" uri="http://www.collab.net/community/"/> +- <bookmark _name="Covalent" icon_name="i-web" uri="http://www.covalent.com"/> +- <bookmark _name="Rackspace" icon_name="i-web" uri="http://www.rackspace.com"/> +- <bookmark _name="Red Hat Network" icon_name="i-web" uri="http://www.redhat.com/network/"/> ++ <bookmark _name="FreeBSD Services, Ltd." icon_name="i-web" uri="http://www.freebsd-services.com"/> ++ <bookmark _name="JohnsCompanies Collocation Services" icon_name="i-web" uri="http://www.johncompanies.com/collocation"/> + <bookmark _name="SourceForge" icon_name="i-web" uri="http://www.sourceforge.net"/> + </folder> +- <folder _name="International"> +- <bookmark _name="Conectiva" icon_name="i-web" uri="http://en.conectiva.com/"/> +- <bookmark _name="Linux One" icon_name="i-web" uri="http://www.linuxone.co.kr/english2/eng/main.htm"/> +- <bookmark _name="Open Source Asia" icon_name="i-web" uri="http://www.opensourceasia.com"/> +- <bookmark _name="RedFlag Linux" icon_name="i-web" uri="http://www.redflag-linux.com/english/index.html"/> +- <bookmark _name="Sun Wah Linux" icon_name="i-web" uri="http://www.sw-linux.com/nonflash_front.htm"/> +- </folder> +- <folder _name="Linux Resources"> +- <bookmark _name="Debian.org" icon_name="i-web" uri="http://www.debian.org"/> +- <bookmark _name="Freshmeat.net" icon_name="i-web" uri="http://www.freshmeat.net"/> +- <bookmark _name="GNOME.org" icon_name="i-web" uri="http://www.gnome.org"/> +- <bookmark _name="GNU.org" icon_name="i-web" uri="http://www.gnu.org"/> +- <bookmark _name="Linux Online" icon_name="i-web" uri="http://www.linux.org"/> +- <bookmark _name="Linux Documentation Project" icon_name="i-web" uri="http://www.linuxdoc.org"/> +- <bookmark _name="LinuxNewbie.org" icon_name="i-web" uri="http://www.linuxnewbie.org"/> ++ <folder _name="FreeBSD Resources"> ++ <bookmark _name="BSD Apps" icon_name="i-web" uri="http://www.bsdapps.com"/> ++ <bookmark _name="BSD At Work" icon_name="i-web" uri="http://www.bsdatwork.com"/> ++ <bookmark _name="BSD Central" icon_name="i-web" uri="http://bsdcentral.com"/> ++ <bookmark _name="BSD Dev Center" icon_name="i-web" uri="http://www.onlamp.com/bsd/"/> ++ <bookmark _name="FreeBSD Diary" icon_name="i-web" uri="http://www.freebsddiary.org"/> ++ <bookmark _name="FreeBSD Forums" icon_name="i-web" uri="http://www.freebsdforums.org"/> ++ <bookmark _name="FreeBSD GNOME Project" icon_name="i-web" uri="http://www.freebsd.org/gnome"/> ++ <bookmark _name="FreeBSD Handbook" icon_name="i-web" uri="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/index.html"/> ++ <bookmark _name="FreeBSD Security Information" icon_name="i-web" uri="http://www.freebsd.org/security/security.html"/> ++ <bookmark _name="Freshports" icon_name="i-web" uri="http://www.freshports.org"/> ++ <bookmark _name="Google's BSD Search Engine" icon_name="i-web" uri="http://www.google.com/bsd"/> + <bookmark _name="OpenOffice" icon_name="i-web" uri="http://www.openoffice.org"/> + </folder> + </bookmarks> diff --git a/x11-fm/nautilus/files/patch-libbackground_Makefile.in b/x11-fm/nautilus/files/patch-libbackground_Makefile.in new file mode 100644 index 000000000..835db3474 --- /dev/null +++ b/x11-fm/nautilus/files/patch-libbackground_Makefile.in @@ -0,0 +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@ diff --git a/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c b/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c new file mode 100644 index 000000000..b0fb5eb6e --- /dev/null +++ b/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c @@ -0,0 +1,14 @@ + +$FreeBSD: ports/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c,v 1.5 2003/09/18 06:49:35 marcus Exp $ + +--- libnautilus-private/nautilus-medusa-support.c.orig Wed Apr 11 21:36:16 2001 ++++ libnautilus-private/nautilus-medusa-support.c Mon May 14 17:45:24 2001 +@@ -84,7 +84,7 @@ + */ + status = NAUTILUS_CRON_STATUS_OFF; + +- stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number); ++ stat_file_name = g_strdup_printf ("/proc/%d/status", process_number); + stat_file = fopen (stat_file_name, "r"); + g_free (stat_file_name); + diff --git a/x11-fm/nautilus/files/patch-libnautilus-private_filesystem-attributes.xml b/x11-fm/nautilus/files/patch-libnautilus-private_filesystem-attributes.xml new file mode 100644 index 000000000..81e3a2a71 --- /dev/null +++ b/x11-fm/nautilus/files/patch-libnautilus-private_filesystem-attributes.xml @@ -0,0 +1,31 @@ +--- 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 @@ + <filesystem name="affs" _default_volume_name="AFFS Volume"/> + <filesystem name="afs" _default_volume_name="AFS Network Volume"/> + <filesystem name="auto" _default_volume_name="Auto-detected Volume"/> ++ <filesystem name="cd9660" _default_volume_name="CDROM Volume"/> + <filesystem name="cdda" _default_volume_name="CD Digital Audio"/> + <filesystem name="cdrom" _default_volume_name="CD-ROM Drive"/> + <filesystem name="devfs" _default_volume_name="Hardware Device Volume"/> + <filesystem name="ext2" _default_volume_name="Ext2 Linux Volume" trash="yes"/> ++ <filesystem name="ext2fs" _default_volume_name="Ext2 Linux Volume" trash="yes"/> + <filesystem name="ext3" _default_volume_name="Ext3 Linux Volume" trash="yes"/> + <filesystem name="fat" _default_volume_name="MSDOS Volume" trash="yes"/> + <filesystem name="hfs" _default_volume_name="MacOS Volume" trash="yes"/> +@@ -15,10 +17,15 @@ + <filesystem name="hsfs" _default_volume_name="Hsfs CDROM Volume"/> + <filesystem name="jfs" _default_volume_name="JFS Volume" trash="yes"/> + <filesystem name="hpfs" _default_volume_name="Windows NT Volume"/> ++ <filesystem name="linprocfs" _default_volume_name="System Volume"/> ++ <filesystem name="mfs" _default_volume_name="Memory Volume" trash="yes"/> + <filesystem name="minix" _default_volume_name="Minix Volume"/> + <filesystem name="msdos" _default_volume_name="MSDOS Volume"/> + <filesystem name="nfs" _default_volume_name="NFS Network Volume" trash="yes"/> ++ <filesystem name="ntfs" _default_volume_name="Windows NT Volume"/> ++ <filesystem name="nwfs" _default_volume_name="Netware Volume"/> + <filesystem name="proc" _default_volume_name="System Volume"/> ++ <filesystem name="procfs" _default_volume_name="System Volume"/> + <filesystem name="reiserfs" _default_volume_name="ReiserFS Linux Volume" trash="yes"/> + <filesystem name="smbfs" _default_volume_name="Windows Shared Volume" trash="yes"/> + <filesystem name="supermount" _default_volume_name="SuperMount Volume" /> diff --git a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c new file mode 100644 index 000000000..2d67d65e7 --- /dev/null +++ b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c @@ -0,0 +1,10 @@ +--- libnautilus-private/nautilus-emblem-utils.c.orig Mon Oct 14 22:20:28 2002 ++++ libnautilus-private/nautilus-emblem-utils.c Mon Oct 14 22:20:56 2002 +@@ -24,6 +24,7 @@ + + #include <config.h> + ++#include <sys/types.h> + #include <utime.h> + #include <stdio.h> + #include <time.h> diff --git a/x11-fm/nautilus/files/patch-ltmain.sh b/x11-fm/nautilus/files/patch-ltmain.sh new file mode 100644 index 000000000..854b2a10a --- /dev/null +++ b/x11-fm/nautilus/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Sat Feb 8 09:47:44 2003 ++++ ltmain.sh Mon Jun 30 18:31:09 2003 +@@ -1075,7 +1075,7 @@ + esac + 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 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2503,6 +2511,9 @@ + *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + ;; ++ *-*-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 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" 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 new file mode 100644 index 000000000..5f84cfbe5 --- /dev/null +++ b/x11-fm/nautilus/files/patch-src_file-manager_fm-directory-view.c @@ -0,0 +1,31 @@ +--- 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 @@ + + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS, +- !any_scripts); ++ FALSE); + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS, ++ FALSE); ++ nautilus_bonobo_set_hidden (view->details->ui, ++ FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_PLACEHOLDER, ++ !any_scripts); ++ nautilus_bonobo_set_hidden (view->details->ui, ++ FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_PLACEHOLDER, + !any_scripts); + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS, +- !any_scripts); ++ FALSE); + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_SEPARATOR, + !any_scripts); + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS_SEPARATOR, +- !any_scripts); ++ FALSE); + nautilus_bonobo_set_hidden (view->details->ui, + FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_SEPARATOR, + !any_scripts); |