From owner-freebsd-ports Fri Oct 26 6:22: 2 2001 Delivered-To: freebsd-ports@freebsd.org Received: from ipcard.iptcom.net (ipcard.iptcom.net [212.9.224.5]) by hub.freebsd.org (Postfix) with ESMTP id 7F8D937B405; Fri, 26 Oct 2001 06:21:17 -0700 (PDT) Received: from vega.vega.com (root@h202.229.dialup.iptcom.net [212.9.229.202]) by ipcard.iptcom.net (8.9.3/8.9.3) with ESMTP id QAA52617; Fri, 26 Oct 2001 16:21:09 +0300 (EEST) (envelope-from max@vega.com) Received: (from max@localhost) by vega.vega.com (8.11.6/8.11.3) id f9QDL8Q26638; Fri, 26 Oct 2001 16:21:08 +0300 (EEST) (envelope-from sobomax@FreeBSD.org) From: Maxim Sobolev Message-Id: <200110261321.f9QDL8Q26638@vega.vega.com> Subject: Re: [HEADS-UP] Nautilus now works on FreeBSD! To: sobomax@FreeBSD.ORG (Maxim Sobolev) Date: Fri, 26 Oct 2001 16:21:07 +0300 (EEST) Cc: gnome@FreeBSD.ORG, ports@FreeBSD.ORG In-Reply-To: from "Maxim Sobolev" at Oct 26, 2001 04:16:32 PM X-Mailer: ELM [version 2.5 PL5] MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="%--multipart-mixed-boundary-1.26515.1004102467--%" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --%--multipart-mixed-boundary-1.26515.1004102467--% Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit > > Hi boys and girls, > > I'm glad to announce that the long awaited event had finally happened. > I just tracked down and nailed the last bug prevented Nautilus from > starting up properly on FreeBSD. I was able to get 1.0.5 working on > my 5-CURRENT system (1.0.4 should work as well, though I have not > verified it). Those who want to try it out should update their ORBit > ports to the version 0.5.10_2 or later, as well as ensure that all > other GNOME components are up to date. Attached please find patch that > updates port to the version 1.0.5, please note, though, that it will > compile only on 5-CURRENT because one of the files uses langinfo.h, > which is not present on the 4-STABLE yet. I'm currently investigating > this problem, though if anyone want to beat me on that please do and > send me a patch. :) Grrr, as usually forgot to attach the patch. -Maxim --%--multipart-mixed-boundary-1.26515.1004102467--% Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Description: ASCII C program text Content-Disposition: attachment; filename="nautilus.diff" ? pkg-plist,v Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fm/nautilus/Makefile,v retrieving revision 1.28 diff -d -u -r1.28 Makefile --- Makefile 2001/08/28 08:43:52 1.28 +++ Makefile 2001/10/26 13:09:54 @@ -6,7 +6,7 @@ # PORTNAME= nautilus -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/nautilus @@ -31,10 +31,10 @@ USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= yes -USE_LIBTOOL= yes INSTALLS_SHLIB= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \ - LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ + LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -lgiconv" \ LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \ MSGFMT=${LOCALBASE}/bin/msgfmt-new \ XGETTEXT=${LOCALBASE}/bin/xgettext-new Index: distinfo =================================================================== RCS file: /home/ncvs/ports/x11-fm/nautilus/distinfo,v retrieving revision 1.6 diff -d -u -r1.6 distinfo --- distinfo 2001/07/06 12:51:33 1.6 +++ distinfo 2001/10/26 13:09:54 @@ -1 +1 @@ -MD5 (nautilus-1.0.4.tar.gz) = e024b3d994838c4469ddbd8c1fbb4e28 +MD5 (nautilus-1.0.5.tar.gz) = 91363a618f48b55d2fd15fe511ddf419 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11-fm/nautilus/pkg-plist,v retrieving revision 1.7 diff -d -u -r1.7 pkg-plist --- pkg-plist 2001/07/06 12:51:33 1.7 +++ pkg-plist 2001/10/26 13:09:54 @@ -28,6 +28,14 @@ bin/run-nautilus etc/CORBA/servers/nautilus-launcher-applet.gnorba etc/CORBA/servers/nautilus-preferences-applet.gnorba +etc/X11/serverconfig/.directory +etc/X11/starthere/.directory +etc/X11/starthere/favorites.desktop +etc/X11/starthere/preferences.desktop +etc/X11/starthere/programs.desktop +etc/X11/starthere/serverconfig.desktop +etc/X11/starthere/sysconfig.desktop +etc/X11/sysconfig/.directory etc/vfs/modules/help-methods.conf include/libnautilus/libnautilus.h include/libnautilus/nautilus-bonobo-ui.h @@ -50,7 +58,9 @@ lib/libnautilus.so.0 lib/nautilusConf.sh lib/vfs/modules/libvfs-help.so +share/gnome/apps/Applications/nautilus-help.desktop share/gnome/apps/Applications/nautilus.desktop +share/gnome/apps/nautilus-help.desktop share/gnome/help/gnufdl/C/gnufdl.sgml share/gnome/help/gnugpl/C/gnugpl.sgml share/gnome/help/nautilus-quick-reference/C/figures/backgrounds_nqr.png @@ -264,6 +274,7 @@ share/gnome/nautilus/emblems/personal.png share/gnome/nautilus/emblems/special.png share/gnome/nautilus/emblems/urgent.png +share/gnome/nautilus/filesystem-attributes.xml share/gnome/nautilus/linksets/apps.xml share/gnome/nautilus/linksets/desktop.xml share/gnome/nautilus/linksets/home.xml @@ -306,6 +317,8 @@ share/gnome/nautilus/patterns/wavy_white.png share/gnome/nautilus/services/text/google.xml share/gnome/nautilus/services/text/webster.xml +share/gnome/nautilus/starthere-link.desktop +share/gnome/nautilus/starthere.desktop share/gnome/nautilus/static_bookmarks.xml share/gnome/oaf/Nautilus_ComponentAdapterFactory_std.oaf share/gnome/oaf/Nautilus_Control_throbber.oaf @@ -332,6 +345,8 @@ share/gnome/omf/nautilus/nautilus-user-manual-C.omf share/gnome/omf/nautilus/nautilus-user-manual-es.omf share/gnome/omf/nautilus/nautilus-user-manual-ko.omf +share/gnome/pixmaps/gnome-starthere-96.png +share/gnome/pixmaps/gnome-starthere.png share/gnome/pixmaps/nautilus-launch-icon.png share/gnome/pixmaps/nautilus/About_Image.png share/gnome/pixmaps/nautilus/Back.png @@ -556,28 +571,6 @@ share/gnome/pixmaps/nautilus/druid_header.png share/gnome/pixmaps/nautilus/druid_header_stretch.png share/gnome/pixmaps/nautilus/druid_sidebar.png -share/gnome/pixmaps/nautilus/eazel-logos/About_Image.png -share/gnome/pixmaps/nautilus/eazel-logos/LICENSE -share/gnome/pixmaps/nautilus/eazel-logos/about_background.png -share/gnome/pixmaps/nautilus/eazel-logos/default.xml -share/gnome/pixmaps/nautilus/eazel-logos/druid_header.png -share/gnome/pixmaps/nautilus/eazel-logos/eazel-logo-right-side-logo.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/001.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/002.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/003.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/004.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/005.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/006.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/007.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/008.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/009.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/010.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/011.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/012.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/013.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/014.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/015.png -share/gnome/pixmaps/nautilus/eazel-logos/throbber/rest.png share/gnome/pixmaps/nautilus/emblem-OK.svg share/gnome/pixmaps/nautilus/emblem-broken-link.png share/gnome/pixmaps/nautilus/emblem-certified.svg @@ -1064,7 +1057,6 @@ %%MOZILLA:%%share/gnome/ui/nautilus-mozilla-ui.xml share/gnome/ui/nautilus-sample-content-view-ui.xml share/gnome/ui/nautilus-search-list-view-ui.xml -share/gnome/ui/nautilus-service-ui.xml share/gnome/ui/nautilus-shell-ui.xml share/gnome/ui/nautilus-sidebar-loser-ui.xml share/gnome/ui/nautilus-text-view-ui.xml @@ -1085,10 +1077,12 @@ share/locale/ja/LC_MESSAGES/nautilus.mo share/locale/ko/LC_MESSAGES/nautilus.mo share/locale/lt/LC_MESSAGES/nautilus.mo +share/locale/lv/LC_MESSAGES/nautilus.mo share/locale/nl/LC_MESSAGES/nautilus.mo share/locale/nn/LC_MESSAGES/nautilus.mo share/locale/no/LC_MESSAGES/nautilus.mo share/locale/pl/LC_MESSAGES/nautilus.mo +share/locale/pt/LC_MESSAGES/nautilus.mo share/locale/pt_BR/LC_MESSAGES/nautilus.mo share/locale/ro/LC_MESSAGES/nautilus.mo share/locale/ru/LC_MESSAGES/nautilus.mo @@ -1098,7 +1092,14 @@ share/locale/ta/LC_MESSAGES/nautilus.mo share/locale/tr/LC_MESSAGES/nautilus.mo share/locale/uk/LC_MESSAGES/nautilus.mo -share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo +share/locale/zh_TW/LC_MESSAGES/nautilus.mo +@dirrm share/gnome/sgml/docbook/xsl-stylesheets-1.29/lib +@dirrm share/gnome/sgml/docbook/xsl-stylesheets-1.29/html +@dirrm share/gnome/sgml/docbook/xsl-stylesheets-1.29/common +@dirrm share/gnome/sgml/docbook/xsl-stylesheets-1.29 +@dirrm share/gnome/sgml/docbook/gnome-customization-0.1 +@dirrm share/gnome/sgml/docbook +@dirrm share/gnome/sgml @dirrm share/gnome/pixmaps/nautilus/throbber @dirrm share/gnome/pixmaps/nautilus/tahoe @dirrm share/gnome/pixmaps/nautilus/sierra @@ -1106,8 +1107,6 @@ @dirrm share/gnome/pixmaps/nautilus/gnome/throbber @dirrm share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/gnome -@dirrm share/gnome/pixmaps/nautilus/eazel-logos/throbber -@dirrm share/gnome/pixmaps/nautilus/eazel-logos @dirrm share/gnome/pixmaps/nautilus/crux_teal/throbber @dirrm share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/crux_teal/backgrounds @@ -1161,3 +1160,7 @@ @dirrm share/gnome/help/gnufdl/C @dirrm share/gnome/help/gnufdl @dirrm include/libnautilus +@dirrm etc/X11/sysconfig +@dirrm etc/X11/starthere +@dirrm etc/X11/serverconfig +@dirrm etc/X11 Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/x11-fm/nautilus/files/patch-aa,v retrieving revision 1.6 diff -d -u -r1.6 patch-aa --- files/patch-aa 2001/05/22 13:41:10 1.6 +++ files/patch-aa 2001/10/26 13:09:54 @@ -1,36 +1,36 @@ $FreeBSD$ ---- configure.orig Tue May 22 15:47:27 2001 -+++ configure Tue May 22 15:55:11 2001 -@@ -3433,7 +3433,7 @@ +--- configure.orig Thu Oct 25 18:17:31 2001 ++++ configure Thu Oct 25 18:18:56 2001 +@@ -7003,7 +7003,7 @@ CC="$_save_cc" -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin" +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin" + _mozilla_gtk_super_win_libs= echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6 - echo "configure:3439: checking for gdk_superwin_get_type in -lgtksuperwin" >&5 - ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'` -@@ -3475,7 +3475,7 @@ + echo "configure:7010: checking for gdk_superwin_get_type in -lgtksuperwin" >&5 +@@ -7046,7 +7046,7 @@ fi -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs" -+LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz -lgtksuperwin $_mozilla_xpcom_libs" ++LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtkembedmoz $_mozilla_xpcom_libs" + _mozilla_gtk_moz_embed_libs= echo $ac_n "checking for gtk_moz_embed_get_type in -lgtkembedmoz""... $ac_c" 1>&6 - echo "configure:3481: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5 - ac_lib_var=`echo gtkembedmoz'_'gtk_moz_embed_get_type | sed 'y%./+-%__p_%'` -@@ -3483,7 +3483,7 @@ + echo "configure:7053: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5 +@@ -7055,7 +7055,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgtkembedmoz $LIBS" +LIBS="-lgtkembedmoz -lgtksuperwin $LIBS" cat > conftest.$ac_ext < + #include + #include +-#include ++#include + #include + + typedef struct NautilusDesktopFileSection NautilusDesktopFileSection; Index: files/patch-libnautilus-private::nautilus-volume-monitor.c =================================================================== RCS file: patch-libnautilus-private::nautilus-volume-monitor.c diff -N patch-libnautilus-private::nautilus-volume-monitor.c --- /dev/null Fri Oct 26 06:06:25 2001 +++ patch-libnautilus-private::nautilus-volume-monitor.c Fri Oct 26 06:09:54 2001 @@ -0,0 +1,190 @@ + +$FreeBSD$ + +--- libnautilus-private/nautilus-volume-monitor.c 2001/10/26 06:06:21 1.1 ++++ libnautilus-private/nautilus-volume-monitor.c 2001/10/26 07:39:01 +@@ -60,6 +60,18 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#include ++#include ++#include ++ ++#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 + #else +@@ -104,7 +116,7 @@ + #define MNTOPT_RO "ro" + #endif + +-#ifndef HAVE_SETMNTENT ++#if !defined(HAVE_SETMNTENT) && !defined(HAVE_SETFSENT) + #define setmntent(f,m) fopen(f,m) + #endif + +@@ -495,6 +507,11 @@ + return TRUE; + } + #endif ++#ifdef __FreeBSD__ ++ if (eel_str_has_prefix (ent->f_mntonname, "/.amd_mnt/")) { ++ return TRUE; ++ } ++#endif + + return FALSE; + } +@@ -510,16 +527,18 @@ + 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; + #ifdef HAVE_SYS_MNTTAB_H + MountTableEntry ent_storage; + #endif +- ent = NULL; +- volume = NULL; +- volumes = NULL; + + #ifdef HAVE_GETMNTINFO + int count, index; +@@ -529,16 +548,20 @@ + for (index = 0; index < count; index++) { + if (has_removable_mntent_options (ent + 1)) { + volume = create_volume (ent[index].f_mntfromname, +- ent[index].f_mntoname); ++ ent[index].f_mntonname); + volume->is_removable = TRUE; + volumes = finish_creating_volume_and_prepend +- (monitor, volume, ent[index].f_fstyename, 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; + } + +@@ -560,9 +583,21 @@ + (monitor, volume, ent->mnt_type, volumes); + } + } ++#elif defined (HAVE_SETFSENT) ++ while ((fsent = getfsent ()) != NULL) { ++ if (strstr (fsent->fs_mntops, "noauto") == 0) { ++ 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); +@@ -575,7 +610,7 @@ + return g_list_sort (g_list_reverse (volumes), (GCompareFunc) floppy_sort); + } + +-#ifndef SOLARIS_MNT ++#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT) + + static gboolean + volume_is_removable (const NautilusVolume *volume) +@@ -907,23 +942,33 @@ + + + +-#ifdef SOLARIS_MNT ++#if defined(SOLARIS_MNT) || defined(FREEBSD_MNT) + + static GList * + get_mount_list (NautilusVolumeMonitor *monitor) + { +- FILE *fh; + GList *volumes; ++#ifndef HAVE_SETFSENT ++ FILE *fh; + MountTableEntry ent; ++#else ++ int fh; ++ struct fstab *ent; ++#endif + NautilusVolume *volume; + + volumes = NULL; + + fh = setmntent (MOUNT_TABLE_PATH, "r"); ++#ifndef HAVE_SETFSENT + if (fh == NULL) { ++#else ++ 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); +@@ -932,6 +977,20 @@ + } + + fclose (fh); ++#else ++ while ((ent = getfsent ()) != NULL) { ++ volume = create_volume (ent->fs_spec, ent->fs_file); ++ if (strstr (ent->fs_mntops, "noauto") == 0) ++ volume->is_removable = TRUE; ++ else ++ volume->is_removable = FALSE; ++ volumes = finish_creating_volume_and_prepend ++ (monitor, volume, ent->fs_vfstype, volumes); ++ } ++ ++ endfsent(); ++#endif ++ + + return volumes; + } +@@ -1668,7 +1727,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 Index: files/patch-ltmain.sh =================================================================== RCS file: patch-ltmain.sh diff -N patch-ltmain.sh --- /dev/null Fri Oct 26 06:06:25 2001 +++ patch-ltmain.sh Fri Oct 26 06:09:54 2001 @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- ltmain.sh 2001/08/27 09:51:26 1.1 ++++ ltmain.sh 2001/08/27 09:51:42 +@@ -4175,10 +4175,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" --%--multipart-mixed-boundary-1.26515.1004102467--%-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message