diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-04-29 18:36:09 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-04-29 18:36:09 +0000 |
| commit | 43de2fc5f661260852fca78960383e32cf326253 (patch) | |
| tree | 9f73052ff0e5d76dd9a625118ae4ffaab0449dd8 /gnome-base | |
| parent | Removed oldest revisions of versions 0.10.2 and 0.11.1. (diff) | |
| download | gentoo-2-43de2fc5f661260852fca78960383e32cf326253.tar.gz gentoo-2-43de2fc5f661260852fca78960383e32cf326253.tar.bz2 gentoo-2-43de2fc5f661260852fca78960383e32cf326253.zip | |
Version bump, remove old.
(Portage version: 2.1.10.57/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gvfs/ChangeLog | 8 | ||||
| -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.2.ebuild (renamed from gnome-base/gvfs/gvfs-1.12.0.ebuild) | 10 |
3 files changed, 9 insertions, 35 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index 02f421a5bce3..1bf28bee7af0 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,12 @@ # 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.175 2012/04/24 03:44:24 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.176 2012/04/29 18:36:09 pacho Exp $ + +*gvfs-1.12.2 (29 Apr 2012) + + 29 Apr 2012; Pacho Ramos <pacho@gentoo.org> +gvfs-1.12.2.ebuild, + -files/gvfs-1.12.0-afp-gcc-4.5.patch, -gvfs-1.12.0.ebuild: + Version bump, remove old. 24 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild, gvfs-1.12.0.ebuild, gvfs-1.12.1.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 deleted file mode 100644 index 575436ab335a..000000000000 --- a/gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch +++ /dev/null @@ -1,26 +0,0 @@ -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.2.ebuild index baf2ce9f5303..f590f4ea5eb7 100644 --- a/gnome-base/gvfs/gvfs-1.12.0.ebuild +++ b/gnome-base/gvfs/gvfs-1.12.2.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.5 2012/04/24 03:44:24 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.2.ebuild,v 1.1 2012/04/29 18:36:09 pacho Exp $ EAPI=4 GCONF_DEBUG=no @@ -106,13 +106,7 @@ src_prepare() { sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die fi - # 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 udev || use ios; then + if use gphoto2 || use archive || ! use udev; then # libgcrypt.m4 needed for eautoreconf, bug #399043 mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die |