summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2009-08-08 08:31:15 +0000
committerMarkus Meier <maekke@gentoo.org>2009-08-08 08:31:15 +0000
commit064d176de1fc1592b0bc74b6917d42f000d5db88 (patch)
tree14854b422790f6c1564aaf9c68ddbb01932b0f4a /media-gfx/rawstudio
parentVersion bump (diff)
downloadgentoo-2-064d176de1fc1592b0bc74b6917d42f000d5db88.tar.gz
gentoo-2-064d176de1fc1592b0bc74b6917d42f000d5db88.tar.bz2
gentoo-2-064d176de1fc1592b0bc74b6917d42f000d5db88.zip
fix building with glibc-2.10 wrt bug #277837
(Portage version: 2.2_rc36/cvs/Linux i686)
Diffstat (limited to 'media-gfx/rawstudio')
-rw-r--r--media-gfx/rawstudio/ChangeLog6
-rw-r--r--media-gfx/rawstudio/files/rawstudio-1.2-glibc-2.10.patch27
-rw-r--r--media-gfx/rawstudio/rawstudio-1.2.ebuild10
3 files changed, 39 insertions, 4 deletions
diff --git a/media-gfx/rawstudio/ChangeLog b/media-gfx/rawstudio/ChangeLog
index 23431a89a405..d2ddfeccb563 100644
--- a/media-gfx/rawstudio/ChangeLog
+++ b/media-gfx/rawstudio/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/rawstudio
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.16 2009/05/24 20:16:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.17 2009/08/08 08:31:15 maekke Exp $
+
+ 08 Aug 2009; Markus Meier <maekke@gentoo.org> rawstudio-1.2.ebuild,
+ +files/rawstudio-1.2-glibc-2.10.patch:
+ fix building with glibc-2.10 wrt bug #277837
24 May 2009; Markus Meier <maekke@gentoo.org> -rawstudio-1.1.1.ebuild:
old
diff --git a/media-gfx/rawstudio/files/rawstudio-1.2-glibc-2.10.patch b/media-gfx/rawstudio/files/rawstudio-1.2-glibc-2.10.patch
new file mode 100644
index 000000000000..a9f19a85f2a2
--- /dev/null
+++ b/media-gfx/rawstudio/files/rawstudio-1.2-glibc-2.10.patch
@@ -0,0 +1,27 @@
+backported from upstream revision 2534
+http://bugzilla.rawstudio.org/show_bug.cgi?id=259
+
+diff -ru rawstudio-1.2.orig/src/dcraw.cc rawstudio-1.2/src/dcraw.cc
+--- rawstudio-1.2.orig/src/dcraw.cc 2009-08-08 09:09:30.000000000 +0200
++++ rawstudio-1.2/src/dcraw.cc 2009-08-08 09:11:07.000000000 +0200
+@@ -8446,7 +8446,7 @@
+ static int user_qual=-1, user_black=-1, user_sat=-1, user_flip=-1;
+ static int use_fuji_rotate=1, write_to_stdout=0, quality, i, c;
+ static char opm, opt, *ofname, *cp, *bpfile=0;
+- static const char *sp, *dark_frame=0, *write_ext;
++ static const char *dark_frame=0, *write_ext;
+ static struct utimbuf ut;
+ static FILE *ofp;
+ #ifndef NO_LCMS
+@@ -8510,8 +8510,9 @@
+ argv[argc] = "";
+ for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) {
+ opt = argv[arg++][1];
+- if ((cp = strchr (sp="nbrkStqmHACg", opt)))
+- for (i=0; i < "114111111422"[cp-sp]-'0'; i++)
++ /* creates warning on newer gcc's - doesn't matter, we'll never call main() */
++// if ((cp = strchr (sp="nbrkStqmHACg", opt)))
++// for (i=0; i < "114111111422"[cp-sp]-'0'; i++)
+ if (!isdigit(argv[arg+i][0])) {
+ dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"), opt);
+ return 1;
diff --git a/media-gfx/rawstudio/rawstudio-1.2.ebuild b/media-gfx/rawstudio/rawstudio-1.2.ebuild
index efc7b5b66a5e..426771100a1c 100644
--- a/media-gfx/rawstudio/rawstudio-1.2.ebuild
+++ b/media-gfx/rawstudio/rawstudio-1.2.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-1.2.ebuild,v 1.1 2009/04/27 19:15:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-1.2.ebuild,v 1.2 2009/08/08 08:31:15 maekke Exp $
+EAPI=2
inherit eutils
DESCRIPTION="a program to read and manipulate raw images from digital cameras."
@@ -25,9 +26,12 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig
sys-devel/gettext"
-src_compile() {
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
+
+src_configure() {
econf --disable-dependency-tracking
- emake || die "emake failed."
}
src_install() {