summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2009-06-01 13:14:52 +0000
committerMarkus Meier <maekke@gentoo.org>2009-06-01 13:14:52 +0000
commitaaaf00fffce0a6ec8e937904d94b58f141bb48a1 (patch)
tree9d34acf90c3a85dd3a0cc2d4dfdd95605ae24274 /media-gfx/ufraw
parentAdd sparc for testing, part of Bug #272046. (diff)
downloadhistorical-aaaf00fffce0a6ec8e937904d94b58f141bb48a1.tar.gz
historical-aaaf00fffce0a6ec8e937904d94b58f141bb48a1.tar.bz2
historical-aaaf00fffce0a6ec8e937904d94b58f141bb48a1.zip
fix building with glibc-2.10 by Andrew John Hughes, bug #271566
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'media-gfx/ufraw')
-rw-r--r--media-gfx/ufraw/ChangeLog6
-rw-r--r--media-gfx/ufraw/Manifest11
-rw-r--r--media-gfx/ufraw/files/ufraw-0.15-glibc-2.10.patch12
-rw-r--r--media-gfx/ufraw/ufraw-0.15-r1.ebuild3
4 files changed, 25 insertions, 7 deletions
diff --git a/media-gfx/ufraw/ChangeLog b/media-gfx/ufraw/ChangeLog
index 907b4133c490..aa6bb190eb7c 100644
--- a/media-gfx/ufraw/ChangeLog
+++ b/media-gfx/ufraw/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/ufraw
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.56 2009/03/23 21:00:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.57 2009/06/01 13:14:51 maekke Exp $
+
+ 01 Jun 2009; Markus Meier <maekke@gentoo.org> ufraw-0.15-r1.ebuild,
+ +files/ufraw-0.15-glibc-2.10.patch:
+ fix building with glibc-2.10 by Andrew John Hughes, bug #271566
23 Mar 2009; Markus Meier <maekke@gentoo.org> -ufraw-0.15.ebuild:
old
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index c75cf4c0412f..866fe0d4e7d2 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -2,14 +2,15 @@
Hash: SHA1
AUX ufraw-0.15-configure.patch 5639 RMD160 a9defb4d42f0ed477d28d6957e6037bc870a892a SHA1 d8559bc7014a259af026e85f1179a9ecdcf03a48 SHA256 0add4c3ec73ab10f89f53a90dccbc191d288c3542ecb64a20a9e426ae8a34c61
+AUX ufraw-0.15-glibc-2.10.patch 521 RMD160 26d0ae42996d5c556926e16404719bb1281ef224 SHA1 764ccc57a7995be5d55c0229ead66bf8b48792d3 SHA256 0aba174ca46435d442429b6ab5f97ff9189724ab49370ad6b514785b2bd88bcf
DIST ufraw-0.15.tar.gz 976297 RMD160 d24e9076114c909e3b2bbf87a128c70f62885299 SHA1 e8c7fa95bfb84e18ee538495861e52516ca8b3b8 SHA256 136916d39c7bb76e8e1620066baa258186c13639d64ad87f48d44fa9a766c331
-EBUILD ufraw-0.15-r1.ebuild 1420 RMD160 c82e4db412f61db107cad43dd82a60e1989ebef1 SHA1 c4fa4031a8d18ca41bc46c4e6aab063cc8b47bfd SHA256 a605743a3e7f159c7f7d5dbf20c9d81e0f54089f45ee8fe9b0555855b6f1edb5
-MISC ChangeLog 7868 RMD160 fd628e53bc0d3172a989a1f547fe8ad1907b79d8 SHA1 7f57bc712133e987190ab964aa984d54c983594c SHA256 17b589699321f3a529a7ca17fe9adb93396a3ec4268e4318a02de4a8e3da7b8d
+EBUILD ufraw-0.15-r1.ebuild 1467 RMD160 00f1b4f73dad86ff8213b8ae587604613f98d931 SHA1 78b3fa072f360282122cbc15631add20814fb1cd SHA256 77707b148ccd5916e498549475acd94f4c8470f2eac3faeb3b69231adc0b529a
+MISC ChangeLog 8043 RMD160 c9b5dd19ddd4f09883e49c8eb6d0529586c13868 SHA1 ecc63870b6325462a7d7c25da1f3bcd7522f7b37 SHA256 d8a3d888e7ce1f308c8058cee892ae5c852ee742466d110c4ec7b81e2ec41343
MISC metadata.xml 343 RMD160 354197e4cfd76654d365da993d2f08318831a5e0 SHA1 ef9ecaba65d89a0425581c9dced569aa504403c1 SHA256 3a530bd78a6494591efafbaf5d9ed6cd5b5875d920cf96e19f7da2ee968bc149
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAknH+LkACgkQkKaRLQcq0GJ0VgCdHje56L9R4a95vz15h2b+Wc1X
-ISwAn3n7f0Tz6ucU77hAp8tUPuB5bc81
-=AiTS
+iEYEARECAAYFAkoj1KkACgkQkKaRLQcq0GL8xQCaAw6eHOiK8emnTAGCCsAtCexr
+TnEAnRRwBJkVwrOvf2zl4NEEEJFyy86H
+=C+EV
-----END PGP SIGNATURE-----
diff --git a/media-gfx/ufraw/files/ufraw-0.15-glibc-2.10.patch b/media-gfx/ufraw/files/ufraw-0.15-glibc-2.10.patch
new file mode 100644
index 000000000000..5c29b31599ca
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.15-glibc-2.10.patch
@@ -0,0 +1,12 @@
+--- ufraw-0.15.old/dcraw.cc 2008-12-23 07:19:41.000000000 +0000
++++ ufraw-0.15/dcraw.cc 2009-05-28 15:25:51.000000000 +0100
+@@ -8401,7 +8401,7 @@
+ argv[argc] = "";
+ for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) {
+ opt = argv[arg++][1];
+- if ((cp = strchr (sp="nbrkStqmHAC", opt)))
++ if ((cp = (char*) strchr (sp="nbrkStqmHAC", opt)))
+ for (i=0; i < "11411111142"[cp-sp]-'0'; i++)
+ if (!isdigit(argv[arg+i][0])) {
+ dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"), opt);
+
diff --git a/media-gfx/ufraw/ufraw-0.15-r1.ebuild b/media-gfx/ufraw/ufraw-0.15-r1.ebuild
index 19004237d4e5..7f71f7b45126 100644
--- a/media-gfx/ufraw/ufraw-0.15-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.15-r1.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-gfx/ufraw/ufraw-0.15-r1.ebuild,v 1.7 2009/03/23 17:21:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.15-r1.ebuild,v 1.8 2009/06/01 13:14:51 maekke Exp $
inherit fdo-mime gnome2-utils autotools
@@ -28,6 +28,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-configure.patch
+ epatch "${FILESDIR}"/${P}-glibc-2.10.patch
eautoreconf
}