Attachment #197877 for bug #228896





PORTNAME=	gnome-vfs
PORTVERSION=	2.24.4
PORTREVISION?=	10
CATEGORIES=	devel gnome
MASTER_SITES=	GNOME
DIST_SUBDIR=	gnome2

LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LIB
LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LIB

BROKEN_SSL=	openssl-devel
BROKEN_SSL_REASON_openssl-devel=	incomplete definition of type 'struct ssl_st'

USES=		tar:bzip2

.if !defined(REFERENCE_PORT)

LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
		libdbus-1.so:devel/dbus

USES+=		gettext gmake gnome libtool:keepla pathfix pkgconfig ssl
USE_GNOME=	gconf2 gnomemimedata intlhack referencehack
INSTALL_TARGET=	install-strip
USE_LDCONFIG=	yes

Lines 1-6 Link Here

(-)devel/gnome-vfs/files/patch-Makefile.in (-3 / +3 lines)
1	--- Makefile.in.orig Tue Jul 11 09:30:02 2006	1	--- Makefile.in.orig 2018-10-07 15:46:20 UTC
2	+++ Makefile.in Tue Jul 11 09:30:32 2006	2	+++ Makefile.in
3	@@ -352,7 +352,6 @@	3	@@ -371,7 +371,6 @@ SUBDIRS = \
4	devel-docs \	4	devel-docs \
5	doc \	5	doc \
6	programs \	6	programs \

Lines 1-6 Link Here

(-)devel/gnome-vfs/files/patch-config.h.in (-3 / +3 lines)
1	--- config.h.in.orig Sun May 7 00:54:09 2006	1	--- config.h.in.orig 2010-09-28 09:35:21 UTC
2	+++ config.h.in Sun May 7 00:54:46 2006	2	+++ config.h.in
3	@@ -121,6 +121,9 @@	3	@@ -133,6 +133,9 @@
4	/* Define to 1 if you have the <fnmatch.h> header file. */	4	/* Define to 1 if you have the <fnmatch.h> header file. */
5	#undef HAVE_FNMATCH_H	5	#undef HAVE_FNMATCH_H
6		6




--- configure.orig	2018-10-07 15:46:20 UTC
+++ configure
@@ -8424,7 +8424,7 @@ fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
@@ -14465,6 +14465,7 @@ if test "x$ac_cv_func_ngettext" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NGETTEXT 1
 _ACEOF

  have_ngettext=yes
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
@@ -17694,7 +17695,7 @@ if test "${openssl_libs+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 

 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17824,7 +17825,7 @@ if test "${openssl_libs+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 

 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -19684,13 +19685,13 @@ if test "x$ac_cv_lib_attr_getxattr" = x""yes; then :
   ACL_LIBS="$ACL_LIBS -lattr"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5
-$as_echo_n "checking for acl_get_file in -lacl... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in " >&5
+$as_echo_n "checking for acl_get_file in ... " >&6; }
 if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lacl  $LIBS"
+LIBS="  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -19721,7 +19722,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5
 $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
 if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then :
-  ACL_LIBS="$ACL_LIBS -lacl"
+  ACL_LIBS="$ACL_LIBS "
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl in -lsec" >&5
@@ -19804,7 +19805,7 @@ if test "${gvfs_cv_HAVE_POSIX_ACLS+set}" = set; then :
 else
 
 		acl_LIBS=$LIBS
-		LIBS="$LIBS -lacl"
+		LIBS="$LIBS "
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
@@ -20043,7 +20044,7 @@ if test "x$ac_cv_header_sys_inotify_h" = x""yes; then 
 #define HAVE_SYS_INOTIFY_H 1
 _ACEOF
 
-		 inotify_support=yes
+		 inotify_support=no
 
 fi
 

Lines 1-6 Link Here

(-)devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in (-3 / +3 lines)
1	--- gnome-vfs-2.0.pc.in.orig Tue Jul 11 07:31:58 2006	1	--- gnome-vfs-2.0.pc.in.orig 2010-02-09 12:16:14 UTC
2	+++ gnome-vfs-2.0.pc.in Tue Jul 11 09:33:47 2006	2	+++ gnome-vfs-2.0.pc.in
3	@@ -8,5 +8,5 @@	3	@@ -9,5 +9,5 @@ Name: gnome-vfs
4	Description: The GNOME virtual file-system libraries	4	Description: The GNOME virtual file-system libraries
5	Version: @VERSION@	5	Version: @VERSION@
6	Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0	6	Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0

Lines 1-6 Link Here

(-)devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in (-3 / +3 lines)
1	--- gnome-vfs-module-2.0.pc.in.orig Tue Jul 11 07:31:58 2006	1	--- gnome-vfs-module-2.0.pc.in.orig 2010-02-09 12:16:14 UTC
2	+++ gnome-vfs-module-2.0.pc.in Tue Jul 11 09:34:36 2006	2	+++ gnome-vfs-module-2.0.pc.in
3	@@ -8,5 +8,5 @@	3	@@ -9,5 +9,5 @@ Name: gnome-vfs-module
4	Description: The GNOME virtual file-system module include info	4	Description: The GNOME virtual file-system module include info
5	Version: @VERSION@	5	Version: @VERSION@
6	Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0	6	Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0




--- libgnomevfs/Makefile.in.orig	2018-10-07 15:46:20 UTC
+++ libgnomevfs/Makefile.in
@@ -430,7 +430,7 @@ INCLUDES = \
 	-D_LARGEFILE64_SOURCE                   \
 	-D_POSIX_PTHREAD_SEMANTICS		\
 	-D_REENTRANT				\
-	-DG_DISABLE_DEPRECATED			\
+				\
 	-DGNOME_VFS_PREFIX=\"$(prefix)\"	\
 	-DGNOME_VFS_BINDIR=\"$(bindir)\"	\
 	-DGNOME_VFS_DATADIR=\"$(datadir)\"	\
@@ -703,7 +703,7 @@ libgnomevfsdaemon_2_la_SOURCES = \
 
 
 # Platform specific includes
-libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include

Lines 1-6 Link Here

(-)devel/gnome-vfs/files/patch-libgnomevfs__gnome-vfs-application-registry.c (-4 / +4 lines)
1	--- libgnomevfs/gnome-vfs-application-registry.c.orig Sun May 22 23:09:39 2005	1	--- libgnomevfs/gnome-vfs-application-registry.c.orig 2010-02-09 12:16:14 UTC
2	+++ libgnomevfs/gnome-vfs-application-registry.c Sun May 22 23:14:22 2005	2	+++ libgnomevfs/gnome-vfs-application-registry.c
3	@@ -943,6 +943,8 @@ load_application_info (void)	3	@@ -944,6 +944,8 @@ load_application_info (void)
4	static void	4	static void
5	gnome_vfs_application_registry_init (void)	5	gnome_vfs_application_registry_init (void)
6	{	6	{
Lines 9-15 Link Here
9	if (gnome_vfs_application_registry_initialized)	9	if (gnome_vfs_application_registry_initialized)
10	return;	10	return;
11		11
12	@@ -963,6 +965,14 @@ gnome_vfs_application_registry_init (voi	12	@@ -964,6 +966,14 @@ gnome_vfs_application_registry_init (void)
13	"application-registry",	13	"application-registry",
14	NULL);	14	NULL);
15	gnome_registry_dir.system_dir = TRUE;	15	gnome_registry_dir.system_dir = TRUE;

Lines 1-5 Link Here

(-)devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c (-2 / +2 lines)
1	--- libgnomevfs/gnome-vfs-filesystem-type.c.orig 2009-10-08 10:03:36.000000000 -0400	1	--- libgnomevfs/gnome-vfs-filesystem-type.c.orig 2010-02-09 12:16:14 UTC
2	+++ libgnomevfs/gnome-vfs-filesystem-type.c 2009-10-10 11:57:06.000000000 -0400	2	+++ libgnomevfs/gnome-vfs-filesystem-type.c
3	@@ -70,6 +70,7 @@ static struct FSInfo fs_data[] = {	3	@@ -70,6 +70,7 @@ static struct FSInfo fs_data[] = {
4	{ "nfs" , N_("NFS Network Volume"), 1 },	4	{ "nfs" , N_("NFS Network Volume"), 1 },
5	{ "ntfs" , N_("Windows NT Volume"), 0 },	5	{ "ntfs" , N_("Windows NT Volume"), 0 },

Lines 1-6 Link Here

(-)devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c (-3 / +3 lines)
1	--- libgnomevfs/gnome-vfs-hal-mounts.c.orig Mon Aug 7 04:16:27 2006	1	--- libgnomevfs/gnome-vfs-hal-mounts.c.orig 2010-02-09 12:16:14 UTC
2	+++ libgnomevfs/gnome-vfs-hal-mounts.c Sun Sep 17 17:39:48 2006	2	+++ libgnomevfs/gnome-vfs-hal-mounts.c
3	@@ -627,20 +629,30 @@ _hal_volume_policy_check (GnomeVFSVolume	3	@@ -629,20 +629,30 @@ _hal_volume_policy_check (GnomeVFSVolumeMonitorDaemon
4	"/",	4	"/",
5	"/bin",	5	"/bin",
6	"/boot",	6	"/boot",




--- libgnomevfs/gnome-vfs-ssl.c.orig	2018-10-07 15:47:44 UTC
+++ libgnomevfs/gnome-vfs-ssl.c
@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSSL **handle_ret
 			}
 		}
 
-                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)

Lines 1-11 Link Here

(-)devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c (-4 / +4 lines)
1	--- libgnomevfs/xdgmime.c.orig Wed Aug 24 16:52:03 2005	1	--- libgnomevfs/xdgmime.c.orig 2010-02-09 12:16:14 UTC
2	+++ libgnomevfs/xdgmime.c Wed Aug 24 16:52:47 2005	2	+++ libgnomevfs/xdgmime.c
3	@@ -234,7 +234,7 @@	3	@@ -254,7 +254,7 @@ xdg_run_command_on_dirs (XdgDirectoryFunc func,
4		4
5	xdg_data_dirs = getenv ("XDG_DATA_DIRS");	5	xdg_data_dirs = getenv ("XDG_DATA_DIRS");
6	if (xdg_data_dirs == NULL)	6	if (xdg_data_dirs == NULL)
7	- xdg_data_dirs = "/usr/local/share/:/usr/share/";	7	- xdg_data_dirs = "/usr/local/share/:/usr/share/";
8	+ xdg_data_dirs = "%%LOCALBASE%%/share/";	8	+ xdg_data_dirs = "/usr/local/share/";
9		9
10	ptr = xdg_data_dirs;	10	ptr = xdg_data_dirs;
11		11

Lines 1-6 Link Here

(-)devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h (-3 / +3 lines)
1	--- libgnomevfs/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400	1	--- libgnomevfs/xdgmimecache.h.orig 2010-02-09 12:16:14 UTC
2	+++ libgnomevfs/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400	2	+++ libgnomevfs/xdgmimecache.h
3	@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach	3	@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCache;
4	#define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon)	4	#define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon)
5	#define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon)	5	#define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon)
6	#define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump)	6	#define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump)

Lines 1-6 Link Here

(-)devel/gnome-vfs/files/patch-modules_file-method-acl.c (-3 / +3 lines)
1	--- modules/file-method-acl.c.orig Mon Jul 24 18:47:12 2006	1	--- modules/file-method-acl.c.orig 2010-02-09 12:16:14 UTC
2	+++ modules/file-method-acl.c Mon Jul 24 22:01:34 2006	2	+++ modules/file-method-acl.c
3	@@ -45,7 +45,7 @@	3	@@ -47,7 +47,7 @@
4	#endif	4	#endif
5		5
6	#ifdef HAVE_POSIX_ACL	6	#ifdef HAVE_POSIX_ACL

Lines 1-5 Link Here

(-)devel/gnome-vfs/files/patch-modules_gzip-method.c (-2 / +2 lines)
1	--- modules/gzip-method.c.orig 2010-03-25 16:05:12.000000000 -0400	1	--- modules/gzip-method.c.orig 2010-02-09 12:16:14 UTC
2	+++ modules/gzip-method.c 2010-03-25 16:06:56.000000000 -0400	2	+++ modules/gzip-method.c
3	@@ -30,6 +30,7 @@	3	@@ -30,6 +30,7 @@
4	#include <stdio.h>	4	#include <stdio.h>
5	#include <string.h>	5	#include <string.h>

Return to bug 228896

Lines 3-9 Link Here

(-)devel/gnome-vfs/Makefile (-5 / +2 lines)
3		3
4	PORTNAME= gnome-vfs	4	PORTNAME= gnome-vfs
5	PORTVERSION= 2.24.4	5	PORTVERSION= 2.24.4
6	PORTREVISION?= 9	6	PORTREVISION?= 10
7	CATEGORIES= devel gnome	7	CATEGORIES= devel gnome
8	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
9	DIST_SUBDIR= gnome2	9	DIST_SUBDIR= gnome2
Lines 16-24 Link Here
16	LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB	16	LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB
17	LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB	17	LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB
18		18
19	BROKEN_SSL= openssl-devel
20	BROKEN_SSL_REASON_openssl-devel= incomplete definition of type 'struct ssl_st'
21
22	USES= tar:bzip2	19	USES= tar:bzip2
23		20
24	.if !defined(REFERENCE_PORT)	21	.if !defined(REFERENCE_PORT)
Lines 27-33 Link Here
27	LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \	24	LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
28	libdbus-1.so:devel/dbus	25	libdbus-1.so:devel/dbus
29		26
30	USES+= gettext gmake libtool:keepla pathfix pkgconfig ssl	27	USES+= gettext gmake gnome libtool:keepla pathfix pkgconfig ssl
31	USE_GNOME= gconf2 gnomemimedata intlhack referencehack	28	USE_GNOME= gconf2 gnomemimedata intlhack referencehack
32	INSTALL_TARGET= install-strip	29	INSTALL_TARGET= install-strip
33	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes

Lines 1-6 Link Here

(-)devel/gnome-vfs/files/patch-configure (-6 / +50 lines)
1	--- configure.orig 2010-09-29 07:03:15.000000000 +0000	1	--- configure.orig 2018-10-07 15:46:20 UTC
2	+++ configure 2010-09-29 07:09:42.000000000 +0000	2	+++ configure
3	@@ -8424,7 +8424,7 @@	3	@@ -8424,7 +8424,7 @@ fi
4		4
5	# On IRIX 5.3, sys/types and inttypes.h are conflicting.	5	# On IRIX 5.3, sys/types and inttypes.h are conflicting.
6	for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \	6	for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
Lines 9-15 Link Here
9	do :	9	do :
10	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	10	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
11	ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default	11	ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
12	@@ -14465,6 +14465,7 @@	12	@@ -14465,6 +14465,7 @@ if test "x$ac_cv_func_ngettext" = x""yes; then :
13	cat >>confdefs.h <<_ACEOF	13	cat >>confdefs.h <<_ACEOF
14	#define HAVE_NGETTEXT 1	14	#define HAVE_NGETTEXT 1
15	_ACEOF	15	_ACEOF
Lines 17-23 Link Here
17	have_ngettext=yes	17	have_ngettext=yes
18	else	18	else
19	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5	19	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
20	@@ -17694,7 +17695,7 @@	20	@@ -17694,7 +17695,7 @@ if test "${openssl_libs+set}" = set; then :
21	$as_echo_n "(cached) " >&6	21	$as_echo_n "(cached) " >&6
22	else	22	else
23		23
Lines 26-32 Link Here
26	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	26	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
27	/* end confdefs.h. */	27	/* end confdefs.h. */
28		28
29	@@ -17824,7 +17825,7 @@	29	@@ -17824,7 +17825,7 @@ if test "${openssl_libs+set}" = set; then :
30	$as_echo_n "(cached) " >&6	30	$as_echo_n "(cached) " >&6
31	else	31	else
32		32
Lines 35-37 Link Here
35	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	35	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
36	/* end confdefs.h. */	36	/* end confdefs.h. */
37		37
		38	@@ -19684,13 +19685,13 @@ if test "x$ac_cv_lib_attr_getxattr" = x""yes; then :
		39	ACL_LIBS="$ACL_LIBS -lattr"
		40	fi
		41
		42	-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5
		43	-$as_echo_n "checking for acl_get_file in -lacl... " >&6; }
		44	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in " >&5
		45	+$as_echo_n "checking for acl_get_file in ... " >&6; }
		46	if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then :
		47	$as_echo_n "(cached) " >&6
		48	else
		49	ac_check_lib_save_LIBS=$LIBS
		50	-LIBS="-lacl $LIBS"
		51	+LIBS=" $LIBS"
		52	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		53	/* end confdefs.h. */
		54
		55	@@ -19721,7 +19722,7 @@ fi
		56	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5
		57	$as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
		58	if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then :
		59	- ACL_LIBS="$ACL_LIBS -lacl"
		60	+ ACL_LIBS="$ACL_LIBS "
		61	fi
		62
		63	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl in -lsec" >&5
		64	@@ -19804,7 +19805,7 @@ if test "${gvfs_cv_HAVE_POSIX_ACLS+set}" = set; then :
		65	else
		66
		67	acl_LIBS=$LIBS
		68	- LIBS="$LIBS -lacl"
		69	+ LIBS="$LIBS "
		70	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		71	/* end confdefs.h. */
		72	#include <sys/types.h>
		73	@@ -20043,7 +20044,7 @@ if test "x$ac_cv_header_sys_inotify_h" = x""yes; then
		74	#define HAVE_SYS_INOTIFY_H 1
		75	_ACEOF
		76
		77	- inotify_support=yes
		78	+ inotify_support=no
		79
		80	fi
		81

Lines 1-8 Link Here

(-)devel/gnome-vfs/files/patch-libgnomevfs__Makefile.in (-4 / +13 lines)
1	--- libgnomevfs/Makefile.in.orig Wed Oct 22 01:11:11 2003	1	--- libgnomevfs/Makefile.in.orig 2018-10-07 15:46:20 UTC
2	+++ libgnomevfs/Makefile.in Wed Oct 22 01:12:00 2003	2	+++ libgnomevfs/Makefile.in
3	@@ -429,7 +429,7 @@	3	@@ -430,7 +430,7 @@ INCLUDES = \
4	# CLEANFILES = $(BUILT_SOURCES)	4	-D_LARGEFILE64_SOURCE \
		5	-D_POSIX_PTHREAD_SEMANTICS \
		6	-D_REENTRANT \
		7	- -DG_DISABLE_DEPRECATED \
		8	+ \
		9	-DGNOME_VFS_PREFIX=\"$(prefix)\" \
		10	-DGNOME_VFS_BINDIR=\"$(bindir)\" \
		11	-DGNOME_VFS_DATADIR=\"$(datadir)\" \
		12	@@ -703,7 +703,7 @@ libgnomevfsdaemon_2_la_SOURCES = \
5		13
		14
6	# Platform specific includes	15	# Platform specific includes
7	-libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include	16	-libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
8	+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include	17	+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include

Line 0 Link Here

(-)devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-ssl.c (+20 lines)
	1	--- libgnomevfs/gnome-vfs-ssl.c.orig 2018-10-07 15:47:44 UTC
	2	+++ libgnomevfs/gnome-vfs-ssl.c
	3	@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSSL **handle_ret
	4	}
	5	}
	6
	7	- if (ssl->private->ssl->ctx)
	8	- SSL_CTX_free (ssl->private->ssl->ctx);
	9	-
	10	SSL_free (ssl->private->ssl);
	11	g_free (ssl->private);
	12	g_free (ssl);
	13	@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
	14	}
	15	}
	16
	17	- SSL_CTX_free (ssl->private->ssl->ctx);
	18	SSL_free (ssl->private->ssl);
	19	close (ssl->private->sockfd);
	20	if (ssl->private->timeout)