diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2008-12-04 23:17:40 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-12-04 23:17:40 +0000 |
| commit | 6c817b7931525b8e00052bca505a7e6133416726 (patch) | |
| tree | be719ef755cbc22692c2fe8f558f1be1968024fa /media-libs/libgphoto2 | |
| parent | Add networkmanager-0.7.0 to package mask. New version can harm kittens :P (diff) | |
| download | gentoo-2-6c817b7931525b8e00052bca505a7e6133416726.tar.gz gentoo-2-6c817b7931525b8e00052bca505a7e6133416726.tar.bz2 gentoo-2-6c817b7931525b8e00052bca505a7e6133416726.zip | |
Fix compilation with gcc 4.3, bug #249677.
(Portage version: 2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)
Diffstat (limited to 'media-libs/libgphoto2')
| -rw-r--r-- | media-libs/libgphoto2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libgphoto2/files/libgphoto2-2.4.3-gcc43.patch | 14 | ||||
| -rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.4.3.ebuild | 5 |
3 files changed, 23 insertions, 2 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index c39f3cb33f23..7d3b63147ab0 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.137 2008/11/29 21:50:48 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.138 2008/12/04 23:17:40 eva Exp $ + + 04 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org> + +files/libgphoto2-2.4.3-gcc43.patch, libgphoto2-2.4.3.ebuild: + Fix compilation with gcc 4.3, bug #249677. *libgphoto2-2.4.3 (29 Nov 2008) diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.3-gcc43.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.3-gcc43.patch new file mode 100644 index 000000000000..cec7b0f1b973 --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.4.3-gcc43.patch @@ -0,0 +1,14 @@ +# +# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=249677 +# +diff -Naur libgphoto2-2.4.3-orig/camlibs/smal/ultrapocket.c libgphoto2-2.4.3/camlibs/smal/ultrapocket.c +--- libgphoto2-2.4.3-orig/camlibs/smal/ultrapocket.c 2008-10-18 11:55:46.000000000 -0600 ++++ libgphoto2-2.4.3/camlibs/smal/ultrapocket.c 2008-12-02 20:41:07.000000000 -0600 +@@ -21,6 +21,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <locale.h> + + #include <gphoto2/gphoto2-port-log.h> + #include <gphoto2/gphoto2-library.h> diff --git a/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild index ca4f224643a4..00a90a5892fe 100644 --- a/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild,v 1.1 2008/11/29 21:50:48 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild,v 1.2 2008/12/04 23:17:40 eva Exp $ # TODO # 1. Track upstream bug --disable-docs does not work. @@ -89,6 +89,9 @@ src_prepare() { # Fix building on alpha, bug #221853 comment #6 epatch "${FILESDIR}/gphoto2-ixany.patch" + # Fix compilation with gcc 4.3, bug #249677 + epatch "${FILESDIR}/${P}-gcc43.patch" + # Fix automagic dependencies, bug #242470 epatch "${FILESDIR}/${P}-automagic.patch" |