[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/, gnome-base/gnome-vfs/files/, profiles/
commit: ba6b3b6ee55d9f205df88e33b637dfa946dd4029
Author: Matt Turner gentoo org>
AuthorDate: Sun May 29 01:37:44 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Sun May 29 01:37:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6b3b6e
gnome-base/gnome-vfs: Remove
Signed-off-by: Matt Turner gentoo.org>
gnome-base/gnome-vfs/Manifest | 1 -
.../gnome-vfs/files/gnome-vfs-2.12.0-afs.patch | 12 --
.../files/gnome-vfs-2.15.2-headers-define.patch| 19 ---
.../files/gnome-vfs-2.16.0-no-dbus-crash.patch | 12 --
.../files/gnome-vfs-2.20.0-automagic-deps.patch| 68 -
.../files/gnome-vfs-2.20.1-automagic-deps.patch| 19 ---
.../files/gnome-vfs-2.24.0-uuid-mount.patch| 77 --
.../files/gnome-vfs-2.24.4-automake-1.13.patch | 30
.../gnome-vfs-2.24.4-build-tests-asneeded.patch| 25
...nome-vfs-2.24.4-disable-test-async-cancel.patch | 24
.../files/gnome-vfs-2.24.4-gnutls27.patch | 68 -
.../files/gnome-vfs-2.24.4-gnutls34.patch | 38 -
.../files/gnome-vfs-2.24.4-home_dir_fakeroot.patch | 155 -
.../files/gnome-vfs-2.24.4-openssl-1.1.patch | 26
gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild| 141 ---
gnome-base/gnome-vfs/metadata.xml | 8 --
profiles/package.mask | 5 -
17 files changed, 728 deletions(-)
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
deleted file mode 100644
index 66d8544c7d33..
--- a/gnome-base/gnome-vfs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B
696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b6f3c56839add737b802aba0e7ac
SHA512
db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
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..
--- 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.0 +0800
-+++ gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c
2005-09-18 20:30:47.0 +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 9d6e9978242f..
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
+++ /dev/null
@@ -1,19 +0,0 @@
a/configure.in
-+++ b/configure.in
-@@ -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..
--- 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.0 -0400
-+++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c
2006-09-21 11:22:49.0 -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
[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/, gnome-base/gnome-vfs/files/
commit: ac43ef9f87e64583606d6654b1ede19a16d3abdd
Author: Lars Wendler gentoo org>
AuthorDate: Wed Oct 24 13:07:38 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Oct 24 13:08:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac43ef9f
gnome-base/gnome-vfs: Fixed build with openssl-1.1
Closes: https://bugs.gentoo.org/592540
Signed-off-by: Lars Wendler gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../files/gnome-vfs-2.24.4-openssl-1.1.patch | 26
gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild| 35 +-
2 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
new file mode 100644
index 000..14207f28d19
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
@@ -0,0 +1,26 @@
+$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $
+
+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).
+
+--- libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.0 +
libgnomevfs/gnome-vfs-ssl.c
+@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
+ }
+ }
+
+-if (ssl->private->ssl->ctx)
+-SSL_CTX_free (ssl->private->ssl->ctx);
+-
+ SSL_free (ssl->private->ssl);
+ g_free (ssl->private);
+ g_free (ssl);
+@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
+ }
+ }
+
+- SSL_CTX_free (ssl->private->ssl->ctx);
+ SSL_free (ssl->private->ssl);
+ close (ssl->private->sockfd);
+ if (ssl->private->timeout)
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
index 7b788c1a09d..ad3dca34e33 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -47,43 +47,50 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.13
"
-src_prepare() {
+PATCHES=(
# Allow the Trash on afs filesystems (#106118)
- epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+ "${FILESDIR}"/${PN}-2.12.0-afs.patch
# Fix compiling with headers missing
- epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
+ "${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
+ "${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
+ "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
+ "${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
+ "${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
+ "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
# Prevent duplicated volumes, bug #193083
- epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
+ "${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
+ "${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
+ "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
# Fix for automake-1.13 compatibility, #466944
- epatch "${FILESDIR}"/${P}-automake-1.13.patch
+ "${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
+ "${FILESDIR}"/${P}-gnutls34.patch
+
+ # Fix build with openssl-1.1 #592540
+ "${FILESDIR}"/${PN}-2.24.4-openssl-1.1.patch
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
