diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-10-10 13:15:42 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-10-10 13:15:42 +0800 |
commit | 286b7d8e05f162c741c0afe77fd23d95746f909c (patch) | |
tree | a93a35b3fb3dfb9032c0684ec27902f8d9858458 /x11-fm/nautilus/files | |
parent | 3bc284b6ad878e82fff67bda3c2e391747f7a8d2 (diff) | |
download | marcuscom-ports-286b7d8e05f162c741c0afe77fd23d95746f909c.tar marcuscom-ports-286b7d8e05f162c741c0afe77fd23d95746f909c.tar.gz marcuscom-ports-286b7d8e05f162c741c0afe77fd23d95746f909c.tar.bz2 marcuscom-ports-286b7d8e05f162c741c0afe77fd23d95746f909c.tar.lz marcuscom-ports-286b7d8e05f162c741c0afe77fd23d95746f909c.tar.xz marcuscom-ports-286b7d8e05f162c741c0afe77fd23d95746f909c.tar.zst marcuscom-ports-286b7d8e05f162c741c0afe77fd23d95746f909c.zip |
Add nautilus2.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@43 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-fm/nautilus/files')
10 files changed, 706 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..e09fa7ef2 --- /dev/null +++ b/x11-fm/nautilus/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.orig Sat Sep 14 16:54:42 2002 ++++ Makefile.in Sat Sep 14 16:55:17 2002 +@@ -161,7 +161,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..e3791b933 --- /dev/null +++ b/x11-fm/nautilus/files/patch-aa @@ -0,0 +1,71 @@ +--- configure.orig Tue Jul 23 21:46:17 2002 ++++ configure Tue Jul 23 21:49:20 2002 +@@ -8311,6 +8311,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -13383,7 +13384,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" +@@ -13391,7 +13392,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" +@@ -14291,9 +14292,9 @@ + s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t + s,@ORBIT_IDL@,$ORBIT_IDL,;t t + s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t +-s,@ORBIT_LIBS@,$ORBIT_LIBS,;t t ++s~@ORBIT_LIBS@~$ORBIT_LIBS~;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,@ALLOCA@,$ALLOCA,;t t + s,@USE_NLS@,$USE_NLS,;t t +@@ -14345,24 +14346,24 @@ + s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t + s,@HAVE_JW@,$HAVE_JW,;t t + s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t +-s,@MEDUSA_LIBS@,$MEDUSA_LIBS,;t t ++s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t + s,@LIBJPEG@,$LIBJPEG,;t t + s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t + s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t +-s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t ++s~@LIBNAUTILUS_LIBS@~$LIBNAUTILUS_LIBS~;t t + s,@LIBNAUTILUS_IDL_INCLUDES@,$LIBNAUTILUS_IDL_INCLUDES,;t t + s,@CORE_CFLAGS@,$CORE_CFLAGS,;t t +-s,@CORE_LIBS@,$CORE_LIBS,;t t ++s~@CORE_LIBS@~$CORE_LIBS~;t t + s,@CORE_IDL_INCLUDES@,$CORE_IDL_INCLUDES,;t t + s,@COMPONENT_CFLAGS@,$COMPONENT_CFLAGS,;t t +-s,@COMPONENT_LIBS@,$COMPONENT_LIBS,;t t ++s~@COMPONENT_LIBS@~$COMPONENT_LIBS~;t t + s,@MUSIC_COMPONENT_CFLAGS@,$MUSIC_COMPONENT_CFLAGS,;t t +-s,@MUSIC_COMPONENT_LIBS@,$MUSIC_COMPONENT_LIBS,;t t ++s~@MUSIC_COMPONENT_LIBS@~$MUSIC_COMPONENT_LIBS~;t t + s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t + s,@ENABLE_HARDWARE_VIEW_TRUE@,$ENABLE_HARDWARE_VIEW_TRUE,;t t + s,@ENABLE_HARDWARE_VIEW_FALSE@,$ENABLE_HARDWARE_VIEW_FALSE,;t t + s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t +-s,@CAPPLET_LIBS@,$CAPPLET_LIBS,;t t ++s~@CAPPLET_LIBS@~$CAPPLET_LIBS~;t t + s,@GCONFTOOL@,$GCONFTOOL,;t t + s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t + s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t diff --git a/x11-fm/nautilus/files/patch-aa.orig b/x11-fm/nautilus/files/patch-aa.orig new file mode 100644 index 000000000..1352642e2 --- /dev/null +++ b/x11-fm/nautilus/files/patch-aa.orig @@ -0,0 +1,68 @@ +--- configure.orig Tue May 28 00:57:18 2002 ++++ configure Tue May 28 01:00:25 2002 +@@ -7495,6 +7495,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -12398,14 +12399,14 @@ + + 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" + CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags" + + CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $FAM_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" + COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`" +@@ -13114,9 +13115,9 @@ + s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t + s,@ORBIT_IDL@,$ORBIT_IDL,;t t + s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t +-s,@ORBIT_LIBS@,$ORBIT_LIBS,;t t ++s~@ORBIT_LIBS@~$ORBIT_LIBS~;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,@ALLOCA@,$ALLOCA,;t t + s,@USE_NLS@,$USE_NLS,;t t +@@ -13171,22 +13172,22 @@ + s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t + s,@HAVE_JW@,$HAVE_JW,;t t + s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t +-s,@MEDUSA_LIBS@,$MEDUSA_LIBS,;t t ++s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t + s,@LIBJPEG@,$LIBJPEG,;t t + s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t + s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t +-s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t ++s~@LIBNAUTILUS_LIBS@~$LIBNAUTILUS_LIBS~;t t + s,@LIBNAUTILUS_IDL_INCLUDES@,$LIBNAUTILUS_IDL_INCLUDES,;t t + s,@CORE_CFLAGS@,$CORE_CFLAGS,;t t +-s,@CORE_LIBS@,$CORE_LIBS,;t t ++s~@CORE_LIBS@~$CORE_LIBS~;t t + s,@CORE_IDL_INCLUDES@,$CORE_IDL_INCLUDES,;t t + s,@COMPONENT_CFLAGS@,$COMPONENT_CFLAGS,;t t +-s,@COMPONENT_LIBS@,$COMPONENT_LIBS,;t t ++s~@COMPONENT_LIBS@~$COMPONENT_LIBS~;t t + s,@MUSIC_COMPONENT_CFLAGS@,$MUSIC_COMPONENT_CFLAGS,;t t +-s,@MUSIC_COMPONENT_LIBS@,$MUSIC_COMPONENT_LIBS,;t t ++s~@MUSIC_COMPONENT_LIBS@~$MUSIC_COMPONENT_LIBS~;t t + s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t + s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t +-s,@CAPPLET_LIBS@,$CAPPLET_LIBS,;t t ++s~@CAPPLET_LIBS@~$CAPPLET_LIBS~;t t + s,@GCONFTOOL@,$GCONFTOOL,;t t + s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t + s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;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-libnautilus-extensions::nautilus-medusa-support.c b/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c new file mode 100644 index 000000000..644b148d9 --- /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.3 2002/05/20 18:03:39 sobomax 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::nautilus-monitor.c.orig b/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-monitor.c.orig new file mode 100644 index 000000000..cc13fe51a --- /dev/null +++ b/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-monitor.c.orig @@ -0,0 +1,25 @@ + +$FreeBSD: ports/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-monitor.c,v 1.2 2002/05/20 18:03:39 sobomax Exp $ + +--- libnautilus-private/nautilus-monitor.c 2001/12/07 22:54:34 1.1 ++++ libnautilus-private/nautilus-monitor.c 2001/12/07 23:10:06 +@@ -274,7 +274,8 @@ + } + + monitor = g_new0 (NautilusMonitor, 1); +- FAMMonitorFile (connection, path, &monitor->request, NULL); ++ if (FAMMonitorFile (connection, path, &monitor->request, NULL) == -1) ++ return NULL; + + g_free (path); + +@@ -314,7 +315,8 @@ + } + + monitor = g_new0 (NautilusMonitor, 1); +- FAMMonitorDirectory (connection, path, &monitor->request, NULL); ++ if (FAMMonitorDirectory (connection, path, &monitor->request, NULL) == -1) ++ return NULL; + + g_assert (g_hash_table_lookup (get_request_hash_table (), + GINT_TO_POINTER (FAMREQUEST_GETREQNUM (&monitor->request))) == NULL); diff --git a/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-volume-monitor.c b/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-volume-monitor.c new file mode 100644 index 000000000..6dc60e198 --- /dev/null +++ b/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-volume-monitor.c @@ -0,0 +1,272 @@ + +$FreeBSD: ports/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c,v 1.9 2002/09/11 14:32:13 sobomax Exp $ + +--- libnautilus-private/nautilus-volume-monitor.c.orig Wed Aug 28 16:37:20 2002 ++++ libnautilus-private/nautilus-volume-monitor.c Wed Sep 11 16:39:15 2002 +@@ -59,6 +59,18 @@ + #include <sys/types.h> + #include <unistd.h> + ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#include <sys/ucred.h> ++#include <sys/mount.h> ++ ++#define HAVE_GETMNTINFO ++#define HAVE_SETFSENT ++#define HAVE_FSTAB_H ++#define FREEBSD_MNT ++#define setmntent(f,m) setfsent() ++#endif ++ + #ifdef HAVE_SYS_VFSTAB_H + #include <sys/vfstab.h> + #else +@@ -103,7 +115,7 @@ + #define MNTOPT_RO "ro" + #endif + +-#ifndef HAVE_SETMNTENT ++#if !defined(HAVE_SETMNTENT) && !defined(HAVE_SETFSENT) + #define setmntent(f,m) fopen(f,m) + #endif + +@@ -492,6 +504,9 @@ + static gboolean + has_removable_mntent_options (MountTableEntry *ent) + { ++#ifdef __FreeBSD__ ++ struct fstab *fsent; ++#endif + #ifdef HAVE_HASMNTOPT + /* Use "owner" or "user" or "users" as our way of determining a removable volume */ + if (hasmntopt (ent, "user") != NULL +@@ -501,6 +516,12 @@ + return TRUE; + } + #endif ++#ifdef __FreeBSD__ ++ fsent = getfsspec(ent->f_mntfromname); ++ if (fsent != NULL && strstr (fsent->fs_mntops, "noauto")) { ++ return TRUE; ++ } ++#endif + + #ifdef SOLARIS_MNT + if (eel_str_has_prefix (ent->mnt_special, "/vol/")) { +@@ -522,10 +543,15 @@ + static GList * + get_removable_volumes (NautilusVolumeMonitor *monitor) + { ++#ifndef HAVE_SETFSENT + FILE *file; +- GList *volumes; +- MountTableEntry *ent; +- NautilusVolume *volume; ++#else ++ int file; ++ struct fstab *fsent; ++#endif ++ GList *volumes = NULL; ++ MountTableEntry *ent = NULL; ++ NautilusVolume *volume = NULL; + char * fs_opt; + #ifdef HAVE_SYS_MNTTAB_H + MountTableEntry ent_storage; +@@ -533,26 +559,27 @@ + #ifdef HAVE_GETMNTINFO + int count, index; + #endif +- ent = NULL; +- volume = NULL; +- volumes = NULL; + + #ifdef HAVE_GETMNTINFO + count = getmntinfo (&ent, MNT_WAIT); + /* getmentinfo returns a pointer to static data. Do not free. */ + for (index = 0; index < count; index++) { +- if (has_removable_mntent_options (&ent[index])) { ++ if (has_removable_mntent_options (ent + index)) { + volume = create_volume (ent[index].f_mntfromname, + ent[index].f_mntonname); + volume->is_removable = TRUE; + volumes = finish_creating_volume_and_prepend +- (monitor, volume, ent[index].f_fstypename, volumes); ++ (monitor, volume, ent[index].f_fstypename, volumes); + } + } + #endif + + file = setmntent (MOUNT_TABLE_PATH, "r"); ++#ifndef HAVE_SETFSENT + if (file == NULL) { ++#else ++ if (file == 0) { ++#endif + return NULL; + } + +@@ -587,9 +614,21 @@ + (monitor, volume, ent->mnt_type, volumes); + } + } ++#elif defined (HAVE_SETFSENT) ++ while ((fsent = getfsent ()) != NULL) { ++ if (strstr (fsent->fs_mntops, "noauto") != NULL) { ++ volume = create_volume (fsent->fs_spec, fsent->fs_file); ++ volumes = finish_creating_volume_and_prepend ++ (monitor, volume, fsent->fs_vfstype, volumes); ++ } ++ } + #endif +- ++ ++#ifndef HAVE_SETFSENT + fclose (file); ++#else ++ endfsent(); ++#endif + + #ifdef HAVE_CDDA + volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH); +@@ -619,7 +658,7 @@ + return result; + } + +-#ifndef SOLARIS_MNT ++#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT) + + static gboolean + volume_is_removable (const NautilusVolume *volume) +@@ -885,7 +924,7 @@ + char *command; + + if (path != NULL) { +- command = g_strdup_printf ("eject %s", path); ++ command = g_strdup_printf ("/usr/sbin/cdcontrol -f %s eject", path); + eel_gnome_shell_execute (command); + g_free (command); + } +@@ -963,23 +1002,34 @@ + + + +-#ifdef SOLARIS_MNT ++#if defined(SOLARIS_MNT) || defined(FREEBSD_MNT) + + static GList * + get_mount_list (NautilusVolumeMonitor *monitor) + { +- FILE *fh; + GList *volumes; ++#ifndef HAVE_SETFSENT + MountTableEntry ent; ++ FILE *fh; ++#else ++ MountTableEntry *ent; ++ int fh, index; ++#endif + NautilusVolume *volume; + + volumes = NULL; + ++#ifndef HAVE_SETFSENT + fh = setmntent (MOUNT_TABLE_PATH, "r"); + if (fh == NULL) { ++#else ++ fh = getmntinfo (&ent, MNT_WAIT); ++ if (fh == 0) { ++#endif + return NULL; + } + ++#ifndef HAVE_SETFSENT + while (! getmntent(fh, &ent)) { + volume = create_volume (ent.mnt_special, ent.mnt_mountp); + volume->is_removable = has_removable_mntent_options (&ent); +@@ -988,6 +1038,16 @@ + } + + fclose (fh); ++#else ++ /* getmentinfo returns a pointer to static data. Do not free. */ ++ for (index = 0; index < fh; index++) { ++ volume = create_volume (ent[index].f_mntfromname, ++ ent[index].f_mntonname); ++ volume->is_removable = has_removable_mntent_options (ent + index); ++ volumes = finish_creating_volume_and_prepend ++ (monitor, volume, ent[index].f_fstypename, volumes); ++ } ++#endif + + return volumes; + } +@@ -1214,9 +1274,38 @@ + static int + get_cdrom_type (const char *vol_dev_path, int* fd) + { +-#ifndef SOLARIS_MNT ++#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT) + *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); + return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT); ++#elif defined(FREEBSD_MNT) ++ struct ioc_toc_header header; ++ struct ioc_read_toc_single_entry entry; ++ int type; ++ ++ *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); ++ if (*fd < 0) { ++ return CDS_DATA_1; ++ } ++ ++ if ( ioctl(*fd, CDIOREADTOCHEADER, &header) == 0) { ++ return CDS_DATA_1; ++ } ++ ++ type = CDS_DATA_1; ++ ++ for (entry.track = header.starting_track; ++ entry.track <= header.ending_track; ++ entry.track++) { ++ entry.address_format = CD_LBA_FORMAT; ++ if (ioctl (*fd, CDIOREADTOCENTRY, &entry) == 0) { ++ if (entry.entry.control & CDROM_DATA_TRACK) { ++ type = CDS_AUDIO; ++ break; ++ } ++ } ++ } ++ ++ return type; + #else + GString *new_dev_path; + struct cdrom_tocentry entry; +@@ -1765,7 +1854,7 @@ + for (node = volume_list; node != NULL; node = node->next) { + volume = node->data; + +-#ifndef SOLARIS_MNT ++#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT) + /* These are set up by get_current_mount_list for Solaris. */ + volume->is_removable = volume_is_removable (volume); + #endif +@@ -1794,7 +1883,7 @@ + ok = mount_volume_auto_add (volume); + } else if (strcmp (file_system_type_name, "cdda") == 0) { + ok = mount_volume_cdda_add (volume); +- } else if (strcmp (file_system_type_name, "iso9660") == 0) { ++ } else if (strcmp (file_system_type_name, "cd9660") == 0) { + ok = mount_volume_iso9660_add (volume); + } else if (strcmp (file_system_type_name, "nfs") == 0) { + ok = mount_volume_nfs_add (volume); +@@ -1823,8 +1912,8 @@ + } + + /* Identify device type */ +- if (eel_str_has_prefix (volume->mount_path, "/mnt/")) { +- name = volume->mount_path + strlen ("/mnt/"); ++ if (eel_str_has_prefix (volume->mount_path, "/")) { ++ name = volume->mount_path + strlen ("/"); + + if (eel_str_has_prefix (name, "cdrom") + || eel_str_has_prefix (name, "burn")) { 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-thumbnails.c b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-thumbnails.c new file mode 100644 index 000000000..e84dc83e2 --- /dev/null +++ b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-thumbnails.c @@ -0,0 +1,10 @@ +--- libnautilus-private/nautilus-thumbnails.c.orig Tue Jul 9 19:09:29 2002 ++++ libnautilus-private/nautilus-thumbnails.c Tue Jul 9 19:09:19 2002 +@@ -309,6 +309,7 @@ + pthread_attr_init (&thread_attributes); + pthread_attr_setdetachstate (&thread_attributes, + PTHREAD_CREATE_DETACHED); ++ pthread_attr_setstacksize (&thread_attributes, 128*1024); + #ifdef DEBUG_THUMBNAILS + g_message ("(Main Thread) Creating thumbnails thread\n"); + #endif diff --git a/x11-fm/nautilus/files/patch-temp b/x11-fm/nautilus/files/patch-temp new file mode 100644 index 000000000..35155bcfd --- /dev/null +++ b/x11-fm/nautilus/files/patch-temp @@ -0,0 +1,121 @@ + +Fixes problem with Nautilus not sensing available desktop space and therefore +placing icons under the panel. Reverses rev.179-1.180 of +src/file-manager/fm-desktop-icon-view.c. Will go away when gnomepanel is +teached to set _NET_WORKAREA properly. + +--- src/file-manager/fm-desktop-icon-view.c.orig Mon Jul 22 21:03:46 2002 ++++ src/file-manager/fm-desktop-icon-view.c Wed Jul 24 22:47:32 2002 +@@ -148,39 +148,9 @@ + } + + static void +-icon_container_set_workarea (NautilusIconContainer *icon_container, +- long *workareas, +- int n_items) +-{ +- int left, right, top, bottom; +- int screen_width, screen_height; +- int i; +- +- left = right = top = bottom = 0; +- +- screen_width = gdk_screen_width (); +- screen_height = gdk_screen_height (); +- +- for (i = 0; i < n_items; i += 4) { +- int x = workareas [i]; +- int y = workareas [i + 1]; +- int width = workareas [i + 2]; +- int height = workareas [i + 3]; +- +- left = MAX (left, x); +- right = MAX (right, screen_width - width - x); +- top = MAX (top, y); +- bottom = MAX (bottom, screen_height - height - y); +- } +- +- nautilus_icon_container_set_margins (icon_container, +- left, right, top, bottom); +-} +- +-static void + net_workarea_changed (FMDesktopIconView *icon_view) + { +- long *workareas = NULL; ++ long *borders = NULL; + Atom type_returned; + int format_returned; + unsigned long items_returned; +@@ -194,33 +164,38 @@ + gdk_error_trap_push (); + if (XGetWindowProperty (GDK_DISPLAY (), + GDK_ROOT_WINDOW (), +- gdk_x11_get_xatom_by_name ("_NET_WORKAREA"), +- 0, G_MAXLONG, False, ++ gdk_x11_get_xatom_by_name ("GNOME_PANEL_DESKTOP_AREA"), ++ 0 /* long_offset */, ++ 4 /* long_length */, ++ False /* delete */, + XA_CARDINAL, + &type_returned, + &format_returned, + &items_returned, + &bytes_after_return, +- (unsigned char **)&workareas) != Success) { +- if (workareas != NULL) +- XFree (workareas); +- workareas = NULL; ++ (unsigned char **)&borders) != Success) { ++ if (borders != NULL) ++ XFree (borders); ++ borders = NULL; + } + + if (gdk_error_trap_pop () +- || workareas == NULL ++ || borders == NULL + || type_returned != XA_CARDINAL +- || (items_returned % 4) != 0 ++ || items_returned != 4 + || format_returned != 32) { + nautilus_icon_container_set_margins (icon_container, + 0, 0, 0, 0); + } else { +- icon_container_set_workarea ( +- icon_container, workareas, items_returned); ++ nautilus_icon_container_set_margins (icon_container, ++ borders[0 /* left */], ++ borders[1 /* right */], ++ borders[2 /* top */], ++ borders[3 /* bottom */]); + } + +- if (workareas != NULL) +- XFree (workareas); ++ if (borders != NULL) ++ XFree (borders); + } + + static GdkFilterReturn +@@ -235,8 +210,9 @@ + + switch (xevent->type) { + case PropertyNotify: +- if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name ("_NET_WORKAREA")) ++ if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name ("GNOME_PANEL_DESKTOP_AREA")) { + net_workarea_changed (icon_view); ++ } + break; + default: + break; +@@ -708,7 +684,8 @@ + default_zoom_level_changed (desktop_icon_view); + fm_desktop_icon_view_update_icon_container_fonts (desktop_icon_view); + +- /* Read out the workarea geometry and update the icon container accordingly */ ++ /* Read out the panel desktop area and update the icon container ++ * accordingly */ + net_workarea_changed (desktop_icon_view); + + /* Setup the property filter */ |