diff options
Diffstat (limited to 'gnome-base/gnome-vfs')
15 files changed, 0 insertions, 716 deletions
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest deleted file mode 100644 index f4a6703a8e8a..000000000000 --- a/gnome-base/gnome-vfs/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX gnome-vfs-2.12.0-afs.patch 663 BLAKE2B 790fc4d85bebee9d3be52a0d6704030c71458477142169879e37c999f31c22866194080956f9fcca33165671df9a5277ccea2209eb9044e6f3bad96e6fcff1ec SHA512 38b1268e774ba2e7726295ee019f939b9dfc5d1a67f8e45d9bc30a2ae20f647acd9570740ad06cb17d83d9299f863aa14dd77a2ca2f9f4910b9c328111ae5ca1 -AUX gnome-vfs-2.15.2-headers-define.patch 569 BLAKE2B eb8b7b640e97e19a157f701d1cd721f39fefb2d2a39727a75bae145c5c0d0fd05419abec4aae0bc62ec3ae42361ebbe13d78dc3d932e4eca58c06bd2db45a523 SHA512 fc4c512ffe74368e83026b24d32c2c77a41f0430d24e782586938dde6061cbc023adcbe2bc21a19d2b584b6c22078ae6d3df7c839576270055aa6832337df60a -AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 BLAKE2B f73c2ffc1480ad1e0b94bc476965a1da989635bdcc34aeb65670e6548403bd32abc644b8eed1da0e8d5498484c855b10efe721b04f08b188198002fc49997434 SHA512 527c24b8902c9a1049b08f6479d32674c8f382a9ae4d7c6f3de772c09347555fda680a3dbfe70fcc312db8aa939ccbc4a42d1a84fd6a9f4a51180943766f5261 -AUX gnome-vfs-2.20.0-automagic-deps.patch 2008 BLAKE2B ff25a966da246a795cab5f76db474041eacd245ae17496ef1328f9d7c2db10708cead3feaf45ff6da52c69752cf20596f7411f4261ea98e68ce45c0a3ba21b64 SHA512 32cd2438a7b8d08a827ad8fc6118f67f14e4a67a176adfe3d6e5cc5a97934733c337d6bee41f06ab47920032fed0fd4cd5e761f9ad4ddc0617a2005f21bbf2ec -AUX gnome-vfs-2.20.1-automagic-deps.patch 643 BLAKE2B 7f9c6d06be805ecc325a235b6705945bb488a6565e93a1b8939faf09c754f463e4f23568644ed1b6956d2f8130a493a560783c88c2877697bd426b98c73f4cb0 SHA512 95ffa05d5212fd6156611e021a2dcd9ec940b6aa74c85d3c8a3ba01d840578af1f1af459ab724559b5a6331a757a74f1fa284455fce2c311c39e1855556bd745 -AUX gnome-vfs-2.24.0-uuid-mount.patch 2452 BLAKE2B 9607e8f7641799dbb46e29bfd7623815fa4066685b10d2cb232e556998f76970097d1bda65554c8c85961e729c269b8a7a6210f2532605cbf7cd16c501444574 SHA512 f66dbba17937b2b1b00aed3804d0b927cd65a2f462853069e62d7973d3f3d88c2a0a2d153e1c95c27ecdf363ff0530f0e8d9849e7b168815ca3f1ad0baf98b96 -AUX gnome-vfs-2.24.4-automake-1.13.patch 840 BLAKE2B fcdd3d1728f95b5b30246fa7471819d00ac2f689d957b665dbd16f2c84ec2e4afb4e2bfac9ca3d3eda4cd42be84c58402aacab1a7e2a503cf9802b5fce5001d7 SHA512 88e9ef1ff7cb513d576fa8d6441ff10c5072f277aef65f107c4f742690db9a4ebee0c986c3773d2055538c771672de84c3d08435cb1f8329dae633db395ae639 -AUX gnome-vfs-2.24.4-build-tests-asneeded.patch 632 BLAKE2B 21ff1b1b0d077f43e15989944c337f94b0ddaf5d69cc966d248404fd19afe2dd3a24eb589fff040a4993ed9f4da3692fda81851c0da4342ba89cee0bded387a3 SHA512 e9afd45ccbe6552daedc20403a0ea892a3dbf039439acc1bcabbecdcac57e808828a83076a6a29492ac74fa81b3f47a02b9d9d2a2387e445b03c8bf4f96e3bab -AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 BLAKE2B e09b96510144b96385e55ef2d47dfbbcaacd662d327a57f2c04636cfa13971c12cc20c00a681a206515c098464c5956cd736331f0ae10cb0677b06b69ad341ae SHA512 434a3491b55cfdd581bf3f542d464844941af72daa6933d957a85120d17ee72fff59e9d98e303bd17a3fd9f1694506186a52309d2ec3077680f7d45759e4ae77 -AUX gnome-vfs-2.24.4-gnutls27.patch 3235 BLAKE2B f6874c9edf48200bcfb7028ef64235fd902a94490995638add7118c1e34b88e197daeca96083cbb21725bb265f62612622b1f24039028baf61ab2dc0158d3ec4 SHA512 a17ea282f22e22c2390c3a53efab2c99a3fbb2ee370c0c1a19a477ff76bdeae483bf1886f09680681b824254c14a8a411470c95319c4f3d5a7775f4369935b25 -AUX gnome-vfs-2.24.4-gnutls34.patch 1624 BLAKE2B 9b29ee3e95ad79f31a9d4adc494aa6b0587a85c308769238607be5a7284a2dfdf13cf33ae14a35624596414af1383a5fa9c647076c016fc6e86942ed8352bc8e SHA512 adbbe966be3f7193c838794fc8a8949433377c6730c55ed152c345858b4da3f97f5c372d6b4555814ea10f5c65b52cb8a625563a0329604a9d61ce57b08de620 -AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 BLAKE2B 9883ef67221c053df5ad2d3f70e3f7c3f1916660cb35dd82a0dc52008ffd1a780f685a7af82a2dda1ec25aae5d1f024322b3a8c20bd8d48227405d0c1c357b48 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f -DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581 -EBUILD gnome-vfs-2.24.4-r5.ebuild 4161 BLAKE2B 60cffdf3f01bbe0f1cdfbde6a1775485fd13bae61bdbc62e9f83ee1fff4824b7fb51545c4225d736f35e8800886f27f00b00e3395fed6bb68b2afd1249c9349c SHA512 cedf37cdabd94bdcbd3d30b228d3f789f8b221c60b01993f869c64eb28d440f7f0177844b366c6dd602d759a53cb5a1a07b80b40f633e0080a4e28ad9c27fd83 -MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch deleted file mode 100644 index cdc88c24b6a3..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c ---- gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c 2005-08-23 01:34:36.000000000 +0800 -+++ gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c 2005-09-18 20:30:47.000000000 +0800 -@@ -35,7 +35,7 @@ - - static struct FSInfo fs_data[] = { - { "affs" , N_("AFFS Volume"), 0}, -- { "afs" , N_("AFS Network Volume"), 0 }, -+ { "afs" , N_("AFS Network Volume"), 1 }, - { "auto" , N_("Auto-detected Volume"), 0 }, - { "cd9660" , N_("CD-ROM Drive"), 0 }, - { "cdda" , N_("CD Digital Audio"), 0 }, diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch deleted file mode 100644 index f74db8edb1cd..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- configure.in 2006-06-13 00:36:14.000000000 -0500 -+++ configure.in 2006-06-13 00:54:15.000000000 -0500 -@@ -191,6 +191,16 @@ - - AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h) - -+AC_CHECK_HEADERS([pwd.h]) -+if test "$ac_cv_header_pwd_h" = "yes"; then -+ AC_DEFINE(HAVE_PWD_H, [1], [pwd.h present]) -+fi -+ -+AC_CHECK_HEADERS([grp.h]) -+if test "$ac_cv_header_grp_h" = "yes"; then -+ AC_DEFINE(HAVE_GRP_H, [1], [grp.h present]) -+fi -+ - dnl - dnl file system type member in statfs struct - dnl diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch deleted file mode 100644 index 6905060a4f71..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c ---- gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c 2006-07-07 04:46:39.000000000 -0400 -+++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c 2006-09-21 11:22:49.000000000 -0400 -@@ -236,6 +236,8 @@ - gnome_vfs_volume_monitor_client_init (GnomeVFSVolumeMonitorClient *volume_monitor_client) - { - setup_dbus_connection (volume_monitor_client); -+ if (!volume_monitor_client->dbus_conn) -+ return; - read_drives_from_daemon (volume_monitor_client); - read_volumes_from_daemon (volume_monitor_client); - } diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch deleted file mode 100644 index 876148b891f4..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch +++ /dev/null @@ -1,68 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (révision 5413) -+++ configure.in (copie de travail) -@@ -448,9 +448,13 @@ - dnl GSSAPI - dnl Check for Kerberos installation - have_gssapi=no -+ -+AC_ARG_ENABLE(krb5, -+ AS_HELP_STRING([--enable-krb5],[Enable Kerberos 5 support]), -+ [],[enable_krb5=yes]) - AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin) -- --if test "x$KRB5_CONFIG" != "xnone"; then -+ -+if test "x$KRB5_CONFIG" != "xnone" -a "x$enable_krb5" = "xyes"; then - GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" - GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" - -@@ -481,8 +485,12 @@ - break - ]) - LIBS="$saved_LIBS" -- CPPFLAGS="$saved_CPPFLAGS" --fi -+ CPPFLAGS="$saved_CPPFLAGS" -+fi -+ -+if test "x$KRB5_CONFIG" = "xnone" -a "x$enable_krb5" = "xyes"; then -+ AC_MSG_ERROR([*** kerberos 5 support enabled but krb5-config not found ***]) -+fi - AC_SUBST(GSSAPI_LIBS) - AC_SUBST(GSSAPI_CFLAGS) - -@@ -1077,9 +1085,13 @@ - dnl ===================== - dnl ACL checks - dnl ===================== --acl_backends="" -+acl_backends="none" - ACL_LIBS="" - -+AC_ARG_ENABLE(acl, -+ AS_HELP_STRING([--disable-acl],[Don't use libacl support]), -+ [],[enable_acl=yes]) -+ - AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"]) - AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"]) - AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"]) -@@ -1102,7 +1114,7 @@ - gvfs_cv_HAVE_POSIX_ACLS=yes, gvfs_cv_HAVE_POSIX_ACLS=no) - LIBS=$acl_LIBS]) - --if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" ; then -+if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then - have_solaris_acl_support=yes - acl_backends="solaris" - -@@ -1110,7 +1122,7 @@ - AC_CHECK_HEADERS([pwd.h grp.h]) - fi - --if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" ; then -+if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then - have_posix_acl_support=yes - acl_backends="posix" - diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch deleted file mode 100644 index 11ac34c07214..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- configure.in. 2007-11-30 04:15:01.000000000 +0100 -+++ configure.in 2007-11-30 04:16:21.000000000 +0100 -@@ -1102,6 +1102,7 @@ - AS_HELP_STRING([--disable-acl],[Don't use libacl support]), - [],[enable_acl=yes]) - -+if test "x$enable_acl" = "xyes"; then - AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"]) - AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"]) - AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"]) -@@ -1189,6 +1190,8 @@ - fi - -+fi - AC_SUBST(ACL_LIBS) -+ - AM_CONDITIONAL(HAVE_POSIX_ACL, test x"$have_posix_acl_support" = x"yes") - AM_CONDITIONAL(HAVE_SOLARIS_ACL, test x"$have_solaris_acl_support" = x"yes") - diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch deleted file mode 100644 index e76a9837136a..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 8427c2daf543353f42b932b5137b6ec590f6589b Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Sat, 2 Oct 2010 00:42:31 +0200 -Subject: [PATCH 7/9] Prevent duplicated volumes, bug #193083 - ---- - libgnomevfs/gnome-vfs-unix-mounts.c | 39 +++++++++++++++++++++++++++++++++- - 1 files changed, 37 insertions(+), 2 deletions(-) - -diff --git a/libgnomevfs/gnome-vfs-unix-mounts.c b/libgnomevfs/gnome-vfs-unix-mounts.c -index 51a009b..3eee305 100644 ---- a/libgnomevfs/gnome-vfs-unix-mounts.c -+++ b/libgnomevfs/gnome-vfs-unix-mounts.c -@@ -40,6 +40,10 @@ - #ifdef HAVE_POLL_H - #include <poll.h> - #endif -+ -+#include <limits.h> -+#include <stdlib.h> -+ - #include <stdio.h> - #include <unistd.h> - #include <sys/time.h> -@@ -290,6 +294,15 @@ _gnome_vfs_get_current_unix_mounts (GList **return_list) - - mount_entry->mount_path = g_strdup (mntent->mnt_dir); - mount_entry->device_path = g_strdup (mntent->mnt_fsname); -+ -+ if (g_file_test (mntent->mnt_fsname, G_FILE_TEST_IS_SYMLINK)) { -+ char rpath[PATH_MAX]; -+ if (realpath (mntent->mnt_fsname, rpath)) { -+ g_free (mount_entry->device_path); -+ mount_entry->device_path = g_strdup (rpath); -+ } -+ } -+ - mount_entry->filesystem_type = g_strdup (mntent->mnt_type); - - g_hash_table_insert (mounts_hash, -@@ -571,9 +584,31 @@ _gnome_vfs_get_unix_mount_table (GList **return_list) - } - - mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1); -- -+ -+ if(strlen(mntent->mnt_fsname) >= 5 && !strncmp (mntent->mnt_fsname, "UUID=", 5)) { -+ mount_entry->device_path = g_strdup_printf ("/dev/disk/by-uuid/%s", mntent->mnt_fsname+5); -+ } -+ else if(strlen(mntent->mnt_fsname) >= 6 && !strncmp (mntent->mnt_fsname, "LABEL=", 6)) { -+ mount_entry->device_path = g_strdup_printf ("/dev/disk/by-label/%s", mntent->mnt_fsname+6); -+ } -+ else { -+ mount_entry->device_path = g_strdup (mntent->mnt_fsname); -+ } -+ -+ if (g_file_test (mount_entry->device_path, G_FILE_TEST_IS_SYMLINK)) { -+ char rpath[PATH_MAX]; -+ if (realpath (mount_entry->device_path, rpath)) { -+ g_free (mount_entry->device_path); -+ mount_entry->device_path = g_strdup (rpath); -+ } -+ else { -+ g_free (mount_entry->device_path); -+ g_free (mount_entry); -+ continue; -+ } -+ } -+ - mount_entry->mount_path = g_strdup (mntent->mnt_dir); -- mount_entry->device_path = g_strdup (mntent->mnt_fsname); - mount_entry->filesystem_type = g_strdup (mntent->mnt_type); - - #ifdef HAVE_HASMNTOPT --- -1.7.3 - diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch deleted file mode 100644 index 69f470a396a9..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch +++ /dev/null @@ -1,30 +0,0 @@ - configure.in | 2 +- - test/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index 7335451..7817998 100644 ---- a/configure.in -+++ b/configure.in -@@ -33,7 +33,7 @@ AC_SUBST(LIBGNOMEVFS_REVISION) - AC_SUBST(LIBGNOMEVFS_AGE) - AC_SUBST(LIBGNOMEVFS_VERSION) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE(gnome-vfs, $LIBGNOMEVFS_VERSION) - - dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work -diff --git a/test/Makefile.am b/test/Makefile.am -index 5b0992e..626bdec 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -65,7 +65,7 @@ TESTS = test-acl \ - test-async-cancel \ - test-escape \ - test-uri \ -- $(srcdir)/auto-test -+ auto-test - - libraries = \ - $(top_builddir)/libgnomevfs/libgnomevfs-2.la \ diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch deleted file mode 100644 index 45ca015573f0..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b7dabab33e00bdbd8b566ca058a1bce7dec2b77d Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Sat, 2 Oct 2010 01:45:21 +0200 -Subject: [PATCH 8/9] Do not build tests unless required - ---- - test/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/test/Makefile.am b/test/Makefile.am -index 5b0992e..a1aefa0 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -14,7 +14,7 @@ else - platform_only_programs = test-dns-sd test-symlinks test-parse-ls-lga - endif - --noinst_PROGRAMS = \ -+check_PROGRAMS = \ - test-acl \ - test-address \ - test-async \ --- -1.7.3 - diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch deleted file mode 100644 index 2684c92ec098..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 390c1f6c06917f54cfacd5f85834d02c231cc2ea Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Sat, 2 Oct 2010 01:46:31 +0200 -Subject: [PATCH 9/9] Disable broken test, bug #285706, upstream #618089 - ---- - test/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/test/Makefile.am b/test/Makefile.am -index a1aefa0..c18f2e4 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -62,7 +62,6 @@ TESTS_ENVIRONMENT = GNOME_VFS_MODULE_PATH=$(top_builddir)/modules/.libs \ - SRCDIR=$(srcdir) - TESTS = test-acl \ - test-address \ -- test-async-cancel \ - test-escape \ - test-uri \ - $(srcdir)/auto-test --- -1.7.3 - diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch deleted file mode 100644 index 93ebd17c7eff..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch +++ /dev/null @@ -1,68 +0,0 @@ -Debian #529827 -GNOME #574589 -Gentoo #253729 -Patch by Gilles Dartiguelongue, fixed for correctly setting have_ssl - -Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0 -Use pkg-config in place of gnutls own macro since it's not present anymore. - -As gnome-vfs-ssl.c also directly uses libgcrypt, we need to make sure that -configure checks for it. Use AM_PATH_LIBGCRYPT macro for that. - - -Index: gnome-vfs-2.24.4/configure.in -=================================================================== ---- gnome-vfs-2.24.4.orig/configure.in 2011-03-16 14:07:18.901009688 +0100 -+++ gnome-vfs-2.24.4/configure.in 2011-03-16 14:16:19.317009687 +0100 -@@ -667,15 +667,14 @@ - if test "x${OPENSSL_LIBS}" != "x"; then - AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***]) - else -- AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***])) -- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -- have_ssl=true]) -- -+ AM_PATH_LIBGCRYPT -+ if test "x${LIBGCRYPT_LIBS}" = "x"; then -+ AC_MSG_ERROR([Unable to find LIBGRYPT]) -+ fi -+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -+ have_ssl=true]) - if test "x${LIBGNUTLS_LIBS}" = "x"; then -- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) -- have_ssl=true], -- AC_MSG_ERROR([Unable to find GNUTLS])) -+ AC_MSG_ERROR([Unable to find GNUTLS]) - fi - fi - fi -@@ -1045,8 +1044,8 @@ - dnl ============================================================================== - - PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) --LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS" --LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS" -+LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $LIBGCRYPT_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS" -+LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $LIBGCRYPT_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS" - AC_SUBST(LIBGNOMEVFS_CFLAGS) - AC_SUBST(LIBGNOMEVFS_LIBS) - -Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c -=================================================================== ---- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c 2011-03-16 14:07:18.861009688 +0100 -+++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c 2011-03-16 14:09:17.517009687 +0100 -@@ -61,13 +61,6 @@ - #endif - #endif - --#if defined GNUTLS_COMPAT --#define gnutls_certificate_credentials GNUTLS_CERTIFICATE_CREDENTIALS --#define gnutls_session GNUTLS_STATE --#define gnutls_certificate_free_credentials gnutls_certificate_free_sc --#define gnutls_certificate_allocate_credentials gnutls_certificate_allocate_sc --#endif -- - typedef struct { - #ifdef HAVE_OPENSSL - int sockfd; diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch deleted file mode 100644 index 78942f06ea11..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c ---- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c 2010-02-09 14:16:14.000000000 +0200 -+++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c 2015-04-14 00:01:51.272451668 +0300 -@@ -314,21 +314,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand - #endif - } - --#ifdef HAVE_GNUTLS --static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0}; --static const int cipher_priority[] = -- {GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC, -- GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0}; --static const int comp_priority[] = -- {GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0}; --static const int kx_priority[] = -- {GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0}; --static const int mac_priority[] = -- {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0}; -- --#endif -- -- - /** - * gnome_vfs_ssl_create_from_fd: - * @handle_return: pointer to a #GnomeVFSSSL struct, which will -@@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS - gnutls_transport_set_ptr (ssl->private->tlsstate, - GINT_TO_POINTER (fd)); - -- gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority); -- gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority); -- gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority); -- gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority); -- gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority); -+ gnutls_set_default_priority (ssl->private->tlsstate); - - gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE, - ssl->private->xcred); diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch deleted file mode 100644 index 991286aa4de6..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 01dba45f0d15b7e23f21d19776d64f69879cd27a Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Sat, 2 Oct 2010 00:41:01 +0200 -Subject: [PATCH 5/9] Fix to identify ${HOME} (#200897) - -Thanks to debian folks. ---- - libgnomevfs/gnome-vfs-application-registry.c | 2 +- - libgnomevfs/gnome-vfs-init.c | 3 +- - libgnomevfs/gnome-vfs-private-utils.c | 52 ++++++++++++++++++++++++++ - libgnomevfs/gnome-vfs-private-utils.h | 2 + - modules/file-method.c | 6 +- - 5 files changed, 60 insertions(+), 5 deletions(-) - -diff --git a/libgnomevfs/gnome-vfs-application-registry.c b/libgnomevfs/gnome-vfs-application-registry.c -index 0b11cc5..051ea44 100644 ---- a/libgnomevfs/gnome-vfs-application-registry.c -+++ b/libgnomevfs/gnome-vfs-application-registry.c -@@ -965,7 +965,7 @@ gnome_vfs_application_registry_init (void) - NULL); - gnome_registry_dir.system_dir = TRUE; - -- user_registry_dir.dirname = g_build_filename (g_get_home_dir(), -+ user_registry_dir.dirname = g_build_filename (gnome_vfs_get_home_dir(), - ".gnome", - "application-info", - NULL); -diff --git a/libgnomevfs/gnome-vfs-init.c b/libgnomevfs/gnome-vfs-init.c -index e3fd5d9..c07cf06 100644 ---- a/libgnomevfs/gnome-vfs-init.c -+++ b/libgnomevfs/gnome-vfs-init.c -@@ -118,7 +118,8 @@ gnome_vfs_init (void) - char *bogus_argv[2] = { "dummy", NULL }; - */ - -- if (!ensure_dot_gnome_exists ()) { -+ /* The first call also checks that ~/.gnome2 is writable. */ -+ if (!gnome_vfs_get_home_dir ()) { - return FALSE; - } - -diff --git a/libgnomevfs/gnome-vfs-private-utils.c b/libgnomevfs/gnome-vfs-private-utils.c -index 7fafde3..7ad8fbc 100644 ---- a/libgnomevfs/gnome-vfs-private-utils.c -+++ b/libgnomevfs/gnome-vfs-private-utils.c -@@ -34,6 +34,7 @@ - #include "gnome-vfs-uri.h" - #include <errno.h> - #include <glib.h> -+#include <glib/gstdio.h> - #include <gconf/gconf-client.h> - #include <stdlib.h> - #include <string.h> -@@ -1085,3 +1086,54 @@ _gnome_vfs_winsock_strerror (int error) - } - #endif - -+static gboolean -+ensure_dot_gnome_exists (gchar *home_dir) -+{ -+ gboolean retval = TRUE; -+ gchar *dirname; -+ -+ dirname = g_build_filename (home_dir, ".gnome2", NULL); -+ -+ if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) { -+ if (g_mkdir (dirname, S_IRWXU) != 0) { -+ g_warning ("Unable to create ~/.gnome2 directory: %s", -+ g_strerror (errno)); -+ retval = FALSE; -+ } -+ } else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) { -+ g_warning ("Error: ~/.gnome2 must be a directory."); -+ retval = FALSE; -+ } -+ -+ g_free (dirname); -+ return retval; -+} -+ -+/** -+ * gnome_vfs_get_home_dir: -+ * -+ * If ~/.gnome2 is writable, return the home directory -+ * Otherwise, return the contents of the HOME environment variable -+ * -+ * Return value: home directory if successful, NULL otherwise. -+ * Do not free the value returned. -+ */ -+const gchar * -+gnome_vfs_get_home_dir (void) -+{ -+ static gchar *home = NULL; -+ -+ if (home == NULL) { -+ gchar *tmp = g_get_home_dir (); -+ if (ensure_dot_gnome_exists (tmp)) { -+ home = g_strdup (tmp); -+ } else { -+ gchar *tmp2 = g_getenv ("HOME"); -+ if (!g_str_equal (tmp, tmp2) && ensure_dot_gnome_exists (tmp2)) { -+ home = g_strdup (tmp2); -+ } -+ } -+ } -+ -+ return home; -+} -diff --git a/libgnomevfs/gnome-vfs-private-utils.h b/libgnomevfs/gnome-vfs-private-utils.h -index 981c6d9..fe282a2 100644 ---- a/libgnomevfs/gnome-vfs-private-utils.h -+++ b/libgnomevfs/gnome-vfs-private-utils.h -@@ -124,6 +124,8 @@ const char *_gnome_vfs_winsock_strerror (int error); - - #endif - -+const gchar *gnome_vfs_get_home_dir (void); -+ - G_END_DECLS - - #endif /* _GNOME_VFS_PRIVATE_UTILS_H */ -diff --git a/modules/file-method.c b/modules/file-method.c -index 37e4853..7265e58 100644 ---- a/modules/file-method.c -+++ b/modules/file-method.c -@@ -1531,7 +1531,7 @@ save_trash_entry_cache (void) - GList *p; - char *buffer, *escaped_path, *escaped_mount_point; - -- cache_file_parent = append_to_path (g_get_home_dir (), TRASH_ENTRY_CACHE_PARENT); -+ cache_file_parent = append_to_path (gnome_vfs_get_home_dir (), TRASH_ENTRY_CACHE_PARENT); - cache_file_path = append_to_path (cache_file_parent, TRASH_ENTRY_CACHE_NAME); - - if (mkdir_recursive (cache_file_parent, 0777) != 0) { -@@ -1670,7 +1670,7 @@ read_saved_cached_trash_entries (void) - cached_trash_directories = NULL; - - /* read in the entries from disk */ -- cache_file_path = g_build_filename (g_get_home_dir (), -+ cache_file_path = g_build_filename (gnome_vfs_get_home_dir (), - TRASH_ENTRY_CACHE_PARENT, - TRASH_ENTRY_CACHE_NAME, - NULL); -@@ -1942,7 +1942,7 @@ do_find_directory (GnomeVFSMethod *method, - return GNOME_VFS_ERROR_INVALID_URI; - - /* We will need the URI and the stat structure for the home directory. */ -- home_directory = g_get_home_dir (); -+ home_directory = gnome_vfs_get_home_dir (); - - if (gnome_vfs_context_check_cancellation (context)) { - g_free (full_name_near); --- -1.7.3 - diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild deleted file mode 100644 index 7b788c1a09d7..000000000000 --- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="no" -GNOME_TARBALL_SUFFIX="bz2" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 multilib-minimal virtualx - -DESCRIPTION="Gnome Virtual Filesystem" -HOMEPAGE="https://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf" - -RDEPEND=" - >=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] - >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] - gnome-base/gnome-mime-data - >=x11-misc/shared-mime-info-0.14 - >=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}] - acl? ( - >=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}] - >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] - !gnome-extra/gnome-vfs-sftp ) - !gnutls? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - !gnome-extra/gnome-vfs-sftp ) ) - zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - sys-devel/gettext - gnome-base/gnome-common - >=dev-util/intltool-0.40 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - >=dev-util/gtk-doc-am-1.13 -" - -src_prepare() { - # Allow the Trash on afs filesystems (#106118) - epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch - - # Fix compiling with headers missing - epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch - - # Fix for crashes running programs via sudo - epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch - - # Fix automagic dependencies, upstream bug #493475 - epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch - epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch - - # Fix to identify ${HOME} (#200897) - # thanks to debian folks - epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch - - # Configure with gnutls-2.7, bug #253729 - # Fix building with gnutls-2.12, bug #388895 - epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch - - # Prevent duplicated volumes, bug #193083 - epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch - - # Do not build tests with FEATURES="-test", bug #226221 - epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch - - # Disable broken test, bug #285706 - epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch - - # Fix for automake-1.13 compatibility, #466944 - epatch "${FILESDIR}"/${P}-automake-1.13.patch - - # Fix gnutls-3.4+ compatibility, #560084 - # always use system defaults (patch from Arch Linux) - epatch "${FILESDIR}"/${P}-gnutls34.patch - - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die - - eautoreconf - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=( - --disable-schemas-install - --disable-static - --disable-cdda - --disable-fam - --disable-hal - --disable-howl - $(use_enable acl) - $(use_enable gnutls) - $(use_enable ipv6) - $(use_enable kerberos krb5) - $(use_enable samba) - $(use_enable ssl openssl) - $(use_enable zeroconf avahi) - # Useless ? --enable-http-neon - - # fix path to krb5-config - KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config - ) - - # this works because of the order of configure parsing - # so should always be behind the use_enable options - # foser <foser@gentoo.org 19 Apr 2004 - use gnutls && use ssl && myconf+=( --disable-openssl ) - - #bug #519060 - #configure script is so messed up on res_init on Darwin - [[ ${CHOST} == *-darwin* ]] && export LIBS="${LIBS} -lresolv" - - ECONF_SOURCE=${S} \ - gnome2_src_configure "${myconf[@]}" - - if multilib_is_native_abi; then - ln -s "${S}"/doc/html doc/html || die - fi -} - -multilib_src_test() { - unset DISPLAY - # Fix bug #285706 - unset XAUTHORITY - Xemake check -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" - einstalldocs -} diff --git a/gnome-base/gnome-vfs/metadata.xml b/gnome-base/gnome-vfs/metadata.xml deleted file mode 100644 index 39980802b1da..000000000000 --- a/gnome-base/gnome-vfs/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> |