summaryrefslogtreecommitdiff
path: root/devel/gnomevfs2/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gnomevfs2/files')
-rw-r--r--devel/gnomevfs2/files/KDE.directory5
-rw-r--r--devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in282
-rw-r--r--devel/gnomevfs2/files/patch-aa107
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in10
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c13
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c34
-rw-r--r--devel/gnomevfs2/files/patch-ltmain.sh51
-rw-r--r--devel/gnomevfs2/files/patch-modules_cdda-method.c26
-rw-r--r--devel/gnomevfs2/files/patch-modules_pty-open.c13
-rw-r--r--devel/gnomevfs2/files/patch-modules_sftp-method.c26
-rw-r--r--devel/gnomevfs2/files/patch-modules_ssh-method.c10
11 files changed, 446 insertions, 131 deletions
diff --git a/devel/gnomevfs2/files/KDE.directory b/devel/gnomevfs2/files/KDE.directory
new file mode 100644
index 000000000000..032126bb99db
--- /dev/null
+++ b/devel/gnomevfs2/files/KDE.directory
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=KDE
+Comment=Some comment about KDE menu
+Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png
+Type=Directory
diff --git a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
index 13ce7838798d..120a8906411f 100644
--- a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
+++ b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
@@ -1,11 +1,285 @@
---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sat Oct 18 19:04:37 2003
-+++ modules/vfolder/applications-all-users.vfolder-info.in Sat Oct 18 19:05:18 2003
-@@ -19,7 +19,7 @@
+--- modules/vfolder/applications-all-users.vfolder-info.in.orig Fri Oct 17 10:11:22 2003
++++ modules/vfolder/applications-all-users.vfolder-info.in Thu Feb 12 15:15:40 2004
+@@ -19,7 +19,14 @@
<MergeDir>/usr/share/gnome/apps/</MergeDir>
<!-- Merge dirs optional -->
- <MergeDir>/etc/X11/applnk/</MergeDir>
-+ <MergeDir>%%LOCALBASE%%/share/applnk/</MergeDir>
++ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir>
++ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir>
++ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir>
++ <MergeDir>/usr/local/share/applnk/Office/</MergeDir>
++ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir>
++ <MergeDir>/usr/local/share/applnk/Development/</MergeDir>
++ <MergeDir>/usr/local/share/applnk/Games/</MergeDir>
++ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir>
<!-- Root folder -->
<Folder>
+@@ -34,10 +41,12 @@
+ <Query>
+ <And>
+ <Keyword>Core</Keyword>
+- <!-- FIXME: Seth, why would this be wanted? -->
+- <!--<Not>
+- <Keyword>Merged</Keyword>
+- </Not>-->
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ </And>
+ </Query>
+
+@@ -47,6 +56,12 @@
+ <Desktop>Accessories.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Utility</Keyword>
+ <Not>
+@@ -63,6 +78,12 @@
+ <Desktop>Accessibility.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Accessibility</Keyword>
+ <Not>
+@@ -80,6 +101,12 @@
+ <OnlyUnallocated/>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Not>
+ <Keyword>Settings</Keyword>
+@@ -101,6 +128,12 @@
+ <Desktop>Development.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Development</Keyword>
+ </And>
+@@ -114,6 +147,12 @@
+ <Desktop>Games.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Game</Keyword>
+ </And>
+@@ -127,6 +166,12 @@
+ <Desktop>Graphics.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Graphics</Keyword>
+ </And>
+@@ -140,6 +185,12 @@
+ <Desktop>Internet.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Network</Keyword>
+ </And>
+@@ -153,6 +204,12 @@
+ <Desktop>Multimedia.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>AudioVideo</Keyword>
+ </And>
+@@ -170,6 +227,12 @@
+ <Desktop>Office.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Or>
+ <Keyword>Office</Keyword>
+@@ -195,6 +258,12 @@
+ <Desktop>System.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Not>
+ <Keyword>Settings</Keyword>
+@@ -204,6 +273,118 @@
+ </Query>
+ <DontShowIfEmpty/>
+ </Folder>
+-
++
++ <!-- KDE -->
++ <Folder>
++ <Name>KDE</Name>
++ <Desktop>KDE.directory</Desktop>
++
++ <!-- KAccessories -->
++ <Folder>
++ <Name>Accessories</Name>
++ <Desktop>Accessories.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Utility</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KDevelopment Tools -->
++ <Folder>
++ <Name>Programming</Name>
++ <Desktop>Development.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Development</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KGraphics -->
++ <Folder>
++ <Name>Graphics</Name>
++ <Desktop>Graphics.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Graphics</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KInternet -->
++ <Folder>
++ <Name>Internet</Name>
++ <Desktop>Internet.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Network</Keyword>
++ </And>
++ </Query>
++
++ <Include>/usr/local/share/applnk/konqueror.desktop</Include>
++
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KMultimedia -->
++ <Folder>
++ <Name>Multimedia</Name>
++ <Desktop>Multimedia.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>AudioVideo</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KOffice -->
++ <Folder>
++ <Name>Office</Name>
++ <Desktop>Office.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Or>
++ <Keyword>Office</Keyword>
++ <Keyword>Spreadsheet</Keyword>
++ <Keyword>WordProcessor</Keyword>
++ <Keyword>Calendar</Keyword>
++ <Keyword>ProjectManagement</Keyword>
++ </Or>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++ <DontShowIfEmpty/>
++ </Folder> <!-- KDE -->
++
+ </Folder>
+ </VFolderInfo>
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 303b8e8c5b40..8273ab3fee00 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,62 +1,31 @@
---- configure.orig Tue Mar 9 14:55:35 2004
-+++ configure Tue Mar 9 16:41:53 2004
-@@ -19711,6 +19711,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'
-@@ -24792,6 +24793,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24844,6 +24846,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24918,6 +24921,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24970,6 +24974,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -25044,6 +25049,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/param.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
-@@ -25104,6 +25110,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <unistd.h>
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -26099,8 +26106,8 @@
+--- configure.orig Sun Feb 8 16:04:02 2004
++++ configure Sun Feb 8 16:04:36 2004
+@@ -22816,6 +22816,8 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++ ac_check_lib_save_LIBS=$LIBS
++ LIBS="-lintl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22898,6 +22900,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -22905,6 +22908,7 @@
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++ LIBS="-lintl $LIBS"
+ have_ngettext=yes
+ fi
+ done
+@@ -26396,8 +26400,8 @@
done
fi
@@ -67,7 +36,7 @@
if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26119,11 +26126,11 @@
+@@ -26416,11 +26420,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -81,28 +50,16 @@
;
return 0;
}
-@@ -26917,7 +26924,7 @@
+@@ -27547,7 +27551,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
-+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26982,9 +26989,9 @@
-
- msg_openssl="yes"
- if test x$with_openssl_libs != x/usr/lib; then
-- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
-+ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo"
- else
-- OPENSSL_LIBS="-lssl -lcrypto"
-+ OPENSSL_LIBS="-lssl -lcryptofoo"
- fi
-
-
-@@ -29285,6 +29292,7 @@
+@@ -30543,6 +30547,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index 764a5a6f218a..063376961823 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@@ -1,11 +1,11 @@
---- libgnomevfs/Makefile.in.orig Mon Oct 13 10:31:12 2003
-+++ libgnomevfs/Makefile.in Mon Oct 13 10:31:37 2003
-@@ -234,7 +234,7 @@
+--- libgnomevfs/Makefile.in.orig Wed Oct 22 01:11:11 2003
++++ libgnomevfs/Makefile.in Wed Oct 22 01:12:00 2003
+@@ -429,7 +429,7 @@
# CLEANFILES = $(BUILT_SOURCES)
# Platform specific includes
-libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include
- libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h
-
+ libgnomevfsplatforminclude_HEADERS = \
+ gnome-vfs-file-size.h
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
new file mode 100644
index 000000000000..21912f46e0ec
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
@@ -0,0 +1,13 @@
+--- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Mar 8 22:29:57 2004
++++ libgnomevfs/gnome-vfs-unix-mounts.c Mon Mar 8 22:33:35 2004
+@@ -857,8 +857,9 @@
+
+ #ifdef HAVE_SYS_SYSCTL_H
+ if (usermnt != 0) {
++ uid_t uid = getuid ();
+ if (stat (fstab->fs_file, &sb) == 0) {
+- if (sb.st_uid != 0) {
++ if (uid == 0 || sb.st_uid == uid) {
+ mount_entry->is_user_mountable = TRUE;
+ }
+ }
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
index 8f8f15be3918..ab74eb9324fd 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -1,14 +1,26 @@
---- libgnomevfs/gnome-vfs-utils.c.orig Fri Apr 25 06:52:18 2003
-+++ libgnomevfs/gnome-vfs-utils.c Tue May 6 15:44:27 2003
-@@ -42,6 +42,7 @@
- #include <pwd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -840,7 +841,7 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig Sat Mar 13 18:57:02 2004
++++ libgnomevfs/gnome-vfs-utils.c Sat Mar 13 18:51:21 2004
+@@ -797,8 +797,10 @@
+
+ #if HAVE_STATVFS
+ statfs_result = statvfs (unescaped_path, &statfs_buffer);
++#define statfs_bsize f_frsize
+ #else
+ statfs_result = statfs (unescaped_path, &statfs_buffer);
++#define statfs_bsize f_bsize
+ #endif
+
+ if (statfs_result != 0) {
+@@ -831,7 +833,7 @@
+ }
+ }
+
+- block_size = statfs_buffer.f_bsize;
++ block_size = statfs_buffer.statfs_bsize;
+ free_blocks = statfs_buffer.f_bavail;
+
+ *size = block_size * free_blocks;
+@@ -859,7 +861,7 @@
paths = g_strsplit (gnome_var, ":", 0);
for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
diff --git a/devel/gnomevfs2/files/patch-ltmain.sh b/devel/gnomevfs2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..58384ee38d2e
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig Sat Dec 6 14:47:45 2003
++++ ltmain.sh Tue Dec 9 14:09:01 2003
+@@ -1280,7 +1280,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
+ ;;
+@@ -1290,8 +1290,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
+ ;;
+
+@@ -3000,6 +3008,9 @@
+ # problems, so we reset it completely
+ verstring=
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ verstring="0.0"
+ ;;
+@@ -5428,10 +5439,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/devel/gnomevfs2/files/patch-modules_cdda-method.c b/devel/gnomevfs2/files/patch-modules_cdda-method.c
deleted file mode 100644
index 97250842b916..000000000000
--- a/devel/gnomevfs2/files/patch-modules_cdda-method.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- modules/cdda-method.c.orig Tue Jan 27 06:19:01 2004
-+++ modules/cdda-method.c Wed Jan 28 00:21:01 2004
-@@ -623,7 +623,11 @@
- /* Check and see if we already have opened and stashed this drive */
- if (!use_base) {
- if (global_context != NULL) {
-+#ifdef Linux
- if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
-+#elif defined(__FreeBSD__)
-+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) {
-+#endif
- use_cache = TRUE;
- cdda_close (drive);
- gnome_vfs_file_info_copy (file_info, global_context->file_info);
-@@ -709,7 +713,11 @@
- if (!use_base) {
- /* Check for cache */
- if (global_context != NULL) {
-+#ifdef Linux
- if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
-+#elif defined(__FreeBSD__)
-+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) {
-+#endif
- /* Clear old cache */
- cdda_context_free (global_context);
- global_context = cdda_context_new (drive, uri);
diff --git a/devel/gnomevfs2/files/patch-modules_pty-open.c b/devel/gnomevfs2/files/patch-modules_pty-open.c
new file mode 100644
index 000000000000..2ee23b086f16
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_pty-open.c
@@ -0,0 +1,13 @@
+--- modules/pty-open.c.orig Sun Apr 4 12:58:08 2004
++++ modules/pty-open.c Sun Apr 4 12:59:30 2004
+@@ -613,6 +613,10 @@
+ if ((fd == -1) && (errno == ENOENT)) {
+ fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */
+ }
++
++ if ((fd == -1) && (errno == ENOENT)) {
++ fd = posix_openpt(O_RDWR);
++ }
+ #endif
+ /* Set it to blocking. */
+ flags = fcntl(fd, F_GETFL);
diff --git a/devel/gnomevfs2/files/patch-modules_sftp-method.c b/devel/gnomevfs2/files/patch-modules_sftp-method.c
new file mode 100644
index 000000000000..bd08ae0b45f1
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_sftp-method.c
@@ -0,0 +1,26 @@
+--- modules/sftp-method.c.orig Mon Mar 8 13:52:39 2004
++++ modules/sftp-method.c Sun Apr 4 13:50:21 2004
+@@ -175,6 +175,15 @@
+
+ typedef ssize_t (*read_write_fn) (int, void *, size_t);
+
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++ (__extension__ \
++ ({ long int __result; \
++ do __result = (long int) (expression); \
++ while (__result == -1L && errno == EINTR); \
++ __result; }))
++#endif
++
+ static gsize
+ atomic_io (read_write_fn f, gint fd, gpointer buffer_in, gsize size)
+ {
+@@ -1072,6 +1081,7 @@
+ if (io_status == G_IO_STATUS_NORMAL) {
+ buffer[len] = 0;
+ if (g_str_has_suffix (buffer, "password: ") ||
++ g_str_has_suffix (buffer, "Password:") ||
+ g_str_has_prefix (buffer, "Enter passphrase for key")) {
+ if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) {
+ g_io_channel_write_chars (tty_channel, password, -1, &len, NULL);
diff --git a/devel/gnomevfs2/files/patch-modules_ssh-method.c b/devel/gnomevfs2/files/patch-modules_ssh-method.c
deleted file mode 100644
index 14b2cf886863..000000000000
--- a/devel/gnomevfs2/files/patch-modules_ssh-method.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/ssh-method.c.orig Mon Jun 10 13:28:42 2002
-+++ modules/ssh-method.c Mon Jun 10 13:28:51 2002
-@@ -34,6 +34,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <signal.h>
- #include <unistd.h>
-
- typedef struct {
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 09:06:20 +0000