diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-13 04:08:52 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-13 04:08:52 +0000 |
| commit | 61e738d2a3ea243ae0415629fb18739ee2197fb1 (patch) | |
| tree | 01531b75054d320110696a91fb08284434187710 /gnome-base/gvfs | |
| parent | Remove stray comment. (diff) | |
| download | gentoo-2-61e738d2a3ea243ae0415629fb18739ee2197fb1.tar.gz gentoo-2-61e738d2a3ea243ae0415629fb18739ee2197fb1.tar.bz2 gentoo-2-61e738d2a3ea243ae0415629fb18739ee2197fb1.zip | |
Fix building with gcc-4.5 and USE="afp", thanks to Travis Glenn Hansen for reporting.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gvfs')
| -rw-r--r-- | gnome-base/gvfs/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch | 26 | ||||
| -rw-r--r-- | gnome-base/gvfs/gvfs-1.12.0.ebuild | 5 |
3 files changed, 36 insertions, 2 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index c8f415f6557c..c893f0496b76 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gvfs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.172 2012/04/12 09:24:58 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.173 2012/04/13 04:08:52 tetromino Exp $ + + 13 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.12.0.ebuild, + +files/gvfs-1.12.0-afp-gcc-4.5.patch: + Fix building with gcc-4.5 and USE="afp", thanks to Travis Glenn Hansen for + reporting. 12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild, gvfs-1.12.0.ebuild: diff --git a/gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch b/gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch new file mode 100644 index 000000000000..575436ab335a --- /dev/null +++ b/gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch @@ -0,0 +1,26 @@ +From 384e7b838570fce794cea368fcbaa97b9ad72df2 Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot <ajacoutot@gnome.org> +Date: Fri, 23 Mar 2012 18:33:40 +0100 +Subject: [PATCH] gvfsafp: Prevent redefinition of GVfsAfpServer. + +GVfsAfpServer is already included in gvfsafpvolume.h which gvfsafpserver.h +includes; so no need to declare GVfsAfpServer here. +--- + daemon/gvfsafpserver.h | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/daemon/gvfsafpserver.h b/daemon/gvfsafpserver.h +index 25753ca..5cf6fc4 100644 +--- a/daemon/gvfsafpserver.h ++++ b/daemon/gvfsafpserver.h +@@ -48,7 +48,6 @@ typedef enum + #define G_VFS_AFP_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G_VFS_TYPE_AFP_SERVER, GVfsAfpServerClass)) + + typedef struct _GVfsAfpServerClass GVfsAfpServerClass; +-typedef struct _GVfsAfpServer GVfsAfpServer; + + struct _GVfsAfpServerClass + { +-- +1.7.6 + diff --git a/gnome-base/gvfs/gvfs-1.12.0.ebuild b/gnome-base/gvfs/gvfs-1.12.0.ebuild index 460eeb00068c..7b634fcded28 100644 --- a/gnome-base/gvfs/gvfs-1.12.0.ebuild +++ b/gnome-base/gvfs/gvfs-1.12.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild,v 1.3 2012/04/12 09:24:58 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild,v 1.4 2012/04/13 04:08:52 tetromino Exp $ EAPI=4 GCONF_DEBUG=no @@ -110,6 +110,9 @@ src_prepare() { # bug #410411, https://bugzilla.gnome.org/show_bug.cgi?id=672693 use ios && epatch "${FILESDIR}/${PN}-1.10.1-libimobiledevice-1.1.2.patch" + # For gcc-4.5 and USE=afp, https://bugzilla.gnome.org/show_bug.cgi?id=672708 + epatch "${FILESDIR}/${PN}-1.12.0-afp-gcc-4.5.patch" + if use gphoto2 || use archive || use prefix || use ios; then # libgcrypt.m4 needed for eautoreconf, bug #399043 mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die |