summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2009-07-04 20:31:01 +0000
committerMarkus Meier <maekke@gentoo.org>2009-07-04 20:31:01 +0000
commitd465554f2501030224c449dfe204f5ce6660d574 (patch)
tree82310451255de624ddbf7e68c993036c7623aba1 /media-libs
parenttweak ffmpeg dep once again (diff)
downloadgentoo-2-d465554f2501030224c449dfe204f5ce6660d574.tar.gz
gentoo-2-d465554f2501030224c449dfe204f5ce6660d574.tar.bz2
gentoo-2-d465554f2501030224c449dfe204f5ce6660d574.zip
fix building with glibc-2.10, bug #276175
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/lensfun/ChangeLog6
-rw-r--r--media-libs/lensfun/files/lensfun-0.2.3-glibc-2.10.patch11
-rw-r--r--media-libs/lensfun/lensfun-0.2.3.ebuild3
3 files changed, 18 insertions, 2 deletions
diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog
index c8e9adfaf7dc..7a94b0bfc241 100644
--- a/media-libs/lensfun/ChangeLog
+++ b/media-libs/lensfun/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/lensfun
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.4 2009/07/04 12:27:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.5 2009/07/04 20:31:00 maekke Exp $
+
+ 04 Jul 2009; Markus Meier <maekke@gentoo.org> lensfun-0.2.3.ebuild,
+ +files/lensfun-0.2.3-glibc-2.10.patch:
+ fix building with glibc-2.10, bug #276175
04 Jul 2009; Brent Baude <ranger@gentoo.org> lensfun-0.2.3.ebuild:
Marking lensfun-0.2.3 ~ppc64 for bug 272088
diff --git a/media-libs/lensfun/files/lensfun-0.2.3-glibc-2.10.patch b/media-libs/lensfun/files/lensfun-0.2.3-glibc-2.10.patch
new file mode 100644
index 000000000000..41a29563a0b6
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.3-glibc-2.10.patch
@@ -0,0 +1,11 @@
+--- lensfun-0.2.3.orig/tools/makedep/cppsetup.cpp 2009-07-04 21:20:49.000000000 +0200
++++ lensfun-0.2.3/tools/makedep/cppsetup.cpp 2009-07-04 22:19:18.000000000 +0200
+@@ -195,7 +195,7 @@
+ }
+ while (s);
+
+- eol = strchr (var, 0);
++ eol = (char *)strchr (var, 0);
+
+ // Skip parentheses which Microsoft likes so much
+ if (*var == '(')
diff --git a/media-libs/lensfun/lensfun-0.2.3.ebuild b/media-libs/lensfun/lensfun-0.2.3.ebuild
index d490b156451d..2f88953b2118 100644
--- a/media-libs/lensfun/lensfun-0.2.3.ebuild
+++ b/media-libs/lensfun/lensfun-0.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.3.ebuild,v 1.4 2009/07/04 12:27:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.3.ebuild,v 1.5 2009/07/04 20:31:00 maekke Exp $
inherit eutils
@@ -24,6 +24,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-as-needed.patch
+ epatch "${FILESDIR}"/${P}-glibc-2.10.patch
# disable stripping
sed -i -e 's:GCC.LDFLAGS.release = -s:GCC.LDFLAGS.release =:g' \