head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.24 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.22 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.20 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.18 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.16 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.14 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.12 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.10 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.8 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.6 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.4 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.2 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.1.0.12 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.10 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.8 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.6 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.4 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.2 pkgsrc-2004Q4-base:1.1; locks; strict; comment @# @; 1.4 date 2007.09.19.23.35.03; author wiz; state dead; branches; next 1.3; 1.3 date 2006.04.27.18.37.24; author rillig; state Exp; branches; next 1.2; 1.2 date 2006.03.30.21.07.48; author jmmv; state Exp; branches; next 1.1; 1.1 date 2004.10.24.18.03.24; author recht; state Exp; branches; next ; desc @@ 1.4 log @Finish rename of gnome-vfs2 to gnome-vfs. @ text @$NetBSD: patch-ar,v 1.3 2006/04/27 18:37:24 rillig Exp $ --- libgnomevfs/gnome-vfs-pty.c.orig Tue Nov 22 15:10:17 2005 +++ libgnomevfs/gnome-vfs-pty.c Wed Apr 26 23:15:08 2006 @@@@ -306,7 +306,7 @@@@ _gnome_vfs_pty_run_on_pty(int fd, gboole chdir(directory); } -#ifdef HAVE_UTMP_H +#ifdef HAVE_LOGIN_TTY /* This sets stdin, stdout, stderr to the socket */ if (login && login_tty (fd) == -1) { g_printerr ("mount child process login_tty failed: %s\n", strerror (errno)); @@@@ -629,6 +629,7 @@@@ _gnome_vfs_pty_set_size(int master, int static char * _gnome_vfs_pty_ptsname(int master) { +#ifndef __APPLE__ #if defined(HAVE_PTSNAME_R) gsize len = 1024; char *buf = NULL; @@@@ -674,6 +675,7 @@@@ _gnome_vfs_pty_ptsname(int master) return g_strdup_printf("/dev/pts/%d", pty); } #endif +#endif /* __APPLE__ */ return NULL; } @@@@ -681,10 +683,10 @@@@ static int _gnome_vfs_pty_getpt(void) { int fd, flags; -#ifdef HAVE_GETPT +#if defined(HAVE_GETPT) && !defined(__APPLE__) /* Call the system's function for allocating a pty. */ fd = getpt(); -#elif defined(HAVE_POSIX_OPENPT) +#elif defined(HAVE_POSIX_OPENPT) && !defined(__APPLE__) fd = posix_openpt(O_RDWR | O_NOCTTY); #else /* Try to allocate a pty by accessing the pty master multiplex. */ @@@@ -703,7 +705,7 @@@@ _gnome_vfs_pty_getpt(void) static int _gnome_vfs_pty_grantpt(int master) { -#ifdef HAVE_GRANTPT +#if defined(HAVE_GRANTPT) && !defined(__APPLE__) return grantpt(master); #else return 0; @@@@ -713,6 +715,9 @@@@ _gnome_vfs_pty_grantpt(int master) static int _gnome_vfs_pty_unlockpt(int fd) { +#ifdef __APPLE__ + return -1; +#else #ifdef HAVE_UNLOCKPT return unlockpt(fd); #elif defined(TIOCSPTLCK) @@@@ -720,6 +725,7 @@@@ _gnome_vfs_pty_unlockpt(int fd) return ioctl(fd, TIOCSPTLCK, &zero); #else return -1; +#endif #endif } @ 1.3 log @Fixed a build error on Solaris, where the function login_tty does not exist. The code only checked for HAVE_UTMP_H, not for HAVE_LOGIN_TTY. @ text @d1 1 a1 1 $NetBSD: patch-ar,v 1.2 2006/03/30 21:07:48 jmmv Exp $ @ 1.2 log @Update gnome-vfs2, gnome-vfs2-cdda and gnome-vfs2-smb to 2.14.0: gnome-vfs 2.14.0 * Fix circular dependency on gnome-mount * Fix some details in gnome_vfs_xfer callbacks * Avoid crash with symlinks that has ':' in them * Update hal volume manager policies * Fix leaks * Better smb authentication code * Fix permission reading bug introduced in 2.13.92 gnome-vfs 2.13.92 * Build fixes * Fix memory leaks * Some optimizations * New readdir option GNOME_VFS_FILE_INFO_NAME_ONLY that only returns filenames (not stat info). * use pmount in /media if not using gnome-mount or hal-mount * Fixes for encrypted drives/volumes in hal backend * Mime detection fix for multiple magic matches of same prio * HAL volume operation fixes * More robust gnome_vfs_make_uri_from_input_internal * Fix Avahi resolving of non-local hostnames gnome-vfs 2.13.91 * Eject fixes for volume manager * Windows 2000 portability fixes * Revert overwrite error dialog change that caused problems * ssh fixes for newer BSD and OSX releases gnome-vfs 2.13.4 * Add support for gnome-mount * Re-add thread prioritizing * Add gnome_vfs_get_mime_type_for_name_and_data () and gnome_vfs_get_mime_type_for_name () * Deprecate gnome_vfs_mime_type_from_name () * Skip attempts to overwrite a file onto itself in gnome_vfs_xfer and friends. * Retrun GNOME_VFS_ERROR_INTERRUPTED when aborting transfers * inotify: Fix various crashers and bugs * ftp-method: Basic support for proxies * http-method: Fix SSL support * http-mehtod: Fix bugs introduced during the neon upgrade * Various hal related volume fixes * Hide some more private functions * Some documentation updates * Translation updates gnome-vfs 2.13.3 * load modules with BIND_LOCAL * inotify fix gnome-vfs 2.13.2 * Support Avahi 0.6 * Support passwords in mount * Inotify support * Update neon import to 0.25 * Leak fixes * Win32 fixes * Add GNOME_VFS_FILE_INFO_FIELDS_IDS to see if uid/gid are valid * Update to lates xdgmime * Use the glib GThreadPool code instead of our own threadpool gnome-vfs 2.13.1 * Support for recent samba * Fix bug when resolving nested symlinks * Sync to upstream xdg-mime code * Various fixes to gnomevfs-* apps * New functions gnome_vfs_exists, gnome_vfs_get_slow_mime * Better ls parsing for ftp * Return GNOME_VFS_ERROR_CANCELLED when authentication is cancelled * Add avahi support * Fix problem when mounting cd multiple times * Hide private symbols * Better docs * Fix metadata removal issue with deletion in Nautilus @ text @d1 1 a1 1 $NetBSD: patch-ar,v 1.1 2004/10/24 18:03:24 recht Exp $ d3 11 a13 2 --- libgnomevfs/gnome-vfs-pty.c.orig 2005-11-22 15:10:17.000000000 +0100 +++ libgnomevfs/gnome-vfs-pty.c d62 2 a63 1 @@@@ -721,6 +726,7 @@@@ _gnome_vfs_pty_unlockpt(int fd) d66 1 a67 1 +#endif a69 1 static int @ 1.1 log @Adopt patches from darwinports to make gnome-vfs2 build on OS X. While at it also combine patch-a[fk] since they've patched the same file. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- modules/pty-open.c.orig Sun Oct 24 19:06:16 2004 +++ modules/pty-open.c Sun Oct 24 19:17:26 2004 @@@@ -554,6 +554,7 @@@@ d13 1 a13 1 @@@@ -599,6 +600,7 @@@@ d21 1 a21 1 @@@@ -606,10 +608,10 @@@@ d34 1 a34 1 @@@@ -628,7 +630,7 @@@@ d43 1 a43 1 @@@@ -638,6 +640,9 @@@@ d53 1 a53 2 @@@@ -645,6 +650,7 @@@@ return ioctl(fd, TIOCSPTLCK, &zero); d56 1 a57 1 #endif d60 1 @