diff options
| -rw-r--r-- | media-libs/libgphoto2/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libgphoto2/files/libgphoto2-2.2.1-ngettext.patch | 14 | ||||
| -rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild | 5 |
3 files changed, 24 insertions, 2 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index 38d378c5db80..b08459a44799 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.68 2006/07/10 02:03:55 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.69 2006/07/11 10:21:33 dsd Exp $ + + 11 Jul 2006; Daniel Drake <dsd@gentoo.org> + +files/libgphoto2-2.2.1-ngettext.patch, libgphoto2-2.2.1-r1.ebuild: + Fix -nls build breakage thanks to Samuli Suominen in bug #139534. Patch from + Andrew Resch. *libgphoto2-2.2.1-r1 (10 Jul 2006) diff --git a/media-libs/libgphoto2/files/libgphoto2-2.2.1-ngettext.patch b/media-libs/libgphoto2/files/libgphoto2-2.2.1-ngettext.patch new file mode 100644 index 000000000000..213d883de0e9 --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.2.1-ngettext.patch @@ -0,0 +1,14 @@ +Patch from Andrew Resch at https://bugs.gentoo.org/show_bug.cgi?id=139534 +Also present in upstream svn tree + +--- libgphoto2-2.2.1/camlibs/sonix/library.c 2006-04-18 18:54:18.000000000 -0700 ++++ libgphoto2-2.2.1-work/camlibs/sonix/library.c 2006-07-07 23:12:56.012649500 -0700 +@@ -41,7 +41,7 @@ + #else + # define _(String) (String) + # define N_(String) (String) +-# define ngettext(String1,String2,Count) ((Count==1)?String1:String) ++# define ngettext(String1,String2,Count) ((Count==1)?String1:String2) + #endif + + #include <gphoto2-port.h> diff --git a/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild index cddbc9700989..8f90c6726ab8 100644 --- a/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild,v 1.1 2006/07/10 02:03:55 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild,v 1.2 2006/07/11 10:21:33 dsd Exp $ inherit libtool eutils @@ -56,6 +56,9 @@ src_unpack() { epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch epatch ${FILESDIR}/${PN}-2.2.0-includes.patch + # bug #139534: already merged into upstream SVN + epatch ${FILESDIR}/${P}-ngettext.patch + # make default group 'plugdev', not camera sed -e 's:=camera:=plugdev:' -i packaging/linux-hotplug/usbcam.group } |