head 1.3; access; symbols pkgsrc-2023Q3:1.2.0.46 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.44 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.42 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.40 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.38 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.36 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.34 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.32 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.30 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.28 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.26 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.24 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.22 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.20 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.16 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.18 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.14 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.12 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.10 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.8 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.6 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.4 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.2 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.1.0.90 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.88 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.84 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.82 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.80 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.78 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.76 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.74 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.72 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.70 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.68 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.66 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.64 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.62 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.60 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.58 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.56 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.54 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.52 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.50 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.48 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.46 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.44 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.42 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.40 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.38 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.36 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.34 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.32 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.30 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.28 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.26 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.24 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.22 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.20 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.18 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.16 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.14 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.12 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.10 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.8 pkgsrc-2008Q1:1.1.0.6 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.4 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.2 pkgsrc-2007Q3-base:1.1; locks; strict; comment @# @; 1.3 date 2023.11.13.20.04.50; author wiz; state dead; branches; next 1.2; commitid 2vcQHv1YWdqXguME; 1.2 date 2018.02.16.13.18.26; author wiz; state Exp; branches; next 1.1; commitid 4l6TqGllbctwo5rA; 1.1 date 2007.09.19.22.22.40; author wiz; state Exp; branches; next ; desc @@ 1.3 log @gnome-vfs*: remove Old Gnome 2 support package, now unused in pkgsrc. @ text @$NetBSD: patch-ar,v 1.2 2018/02/16 13:18:26 wiz Exp $ --- libgnomevfs/gnome-vfs-pty.c.orig 2010-02-09 12:16:14.000000000 +0000 +++ libgnomevfs/gnome-vfs-pty.c @@@@ -330,7 +330,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)); @@@@ -654,6 +654,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; @@@@ -699,6 +700,7 @@@@ _gnome_vfs_pty_ptsname(int master) return g_strdup_printf("/dev/pts/%d", pty); } #endif +#endif /* __APPLE__ */ return NULL; } @@@@ -706,10 +708,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. */ @@@@ -728,7 +730,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; @@@@ -738,6 +740,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) @@@@ -746,6 +751,7 @@@@ _gnome_vfs_pty_unlockpt(int fd) #else return -1; #endif +#endif } static int @ 1.2 log @gnome-vfs: fix build with openssl-1.1. struct SSL is opaque in openssl-1.1; and the SSL_free() man page says that one should not free members of it manually (in both the openssl-1.0 and openssl-1.1 man pages). Regen two other patches (NFC for these). Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ar,v 1.1 2007/09/19 22:22:40 wiz Exp $ @ 1.1 log @Readd gnome-vfs2 as gnome-vfs, to match its upstream name. ok jmmv, drochner @ text @d1 1 a1 1 $NetBSD: patch-ar,v 1.3 2006/04/27 18:37:24 rillig Exp $ d3 3 a5 3 --- 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 d14 1 a14 1 @@@@ -629,6 +629,7 @@@@ _gnome_vfs_pty_set_size(int master, int d22 1 a22 1 @@@@ -674,6 +675,7 @@@@ _gnome_vfs_pty_ptsname(int master) d30 1 a30 1 @@@@ -681,10 +683,10 @@@@ static int d43 1 a43 1 @@@@ -703,7 +705,7 @@@@ _gnome_vfs_pty_getpt(void) d52 1 a52 1 @@@@ -713,6 +715,9 @@@@ _gnome_vfs_pty_grantpt(int master) d62 1 a62 2 @@@@ -720,6 +725,7 @@@@ _gnome_vfs_pty_unlockpt(int fd) return ioctl(fd, TIOCSPTLCK, &zero); d65 1 a66 1 #endif d69 1 @