Fix for glibc 2.10 compilation. Patch by hirakendu. Solves #271608

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 24 insertions, 6 deletions

diff --git a/app-arch/arj/ChangeLog b/app-arch/arj/ChangeLog
index 687e4cd88f05..aa03083ef272 100644
--- a/app-arch/arj/ChangeLog
+++ b/app-arch/arj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/arj
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.36 2008/11/26 15:26:49 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.37 2009/06/28 17:54:42 patrick Exp $
+
+  28 Jun 2009; Patrick Lauer <patrick@gentoo.org> arj-3.10.22-r2.ebuild,
+  +files/arj-3.10.22-glibc2.10.patch:
+  Fix for glibc 2.10 compilation. Patch by hirakendu. Solves #271608
 
   26 Nov 2008; Brent Baude <ranger@gentoo.org> arj-3.10.22-r2.ebuild:
   Marking arj-3.10.22-r2 ~ppc64 for bug 247529
diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest
index 43e70e73bf4a..2dc29bb3a78f 100644
--- a/app-arch/arj/Manifest
+++ b/app-arch/arj/Manifest
@@ -1,11 +1,12 @@
 AUX 001_arches_align.patch 1424 RMD160 582ad74d357523ca99f833b02c4db30fcd6a8aa0 SHA1 7f8904f8c89bacbbeec8c431d627efbb8da2f259 SHA256 63a1f369fd7d23c1132293a75419fa00324b2da0578ab436483f156d43687792
 AUX 002_no_remove_static_const.patch 530 RMD160 f796238452c903213684060adfce196a5910c6b2 SHA1 919a3c02a1e039803502c21175d69f7703d13026 SHA256 4a48bec5bfac3efd9ebeb463a4ce3fdeeac2fd0ebf11eb4b64a6cfc96e25e306
 AUX 003_64_bit_clean.patch 5948 RMD160 755dd1ee9822cbaef43aa29b4c8215d8a97220af SHA1 d506338e34b40ef5cac6ec14c858fd651a354aaf SHA256 6253fdb216a9f617648ee3977f8ab38c376cc029ae55a8414203df3275484db1
+AUX arj-3.10.22-glibc2.10.patch 515 RMD160 12a15b266dac3eb33dbd122a19285972be472e53 SHA1 d31bdbb61c96809fae5e0c09411c39c3f80de0fb SHA256 b4b4b4a774620cd9ec79dd26201f4b64cfe7c8f2f117221c0f8091bd35c55508
 AUX arj-3.10.22-implicit-declarations.patch 833 RMD160 df4cc1eb6d5a0d7fd097cd65fdea4f7686c2c3d2 SHA1 86dc2094017698f6a248e31dc828e1c91bc51e0b SHA256 016de0f1ab252081a13bfcc3d73161e2fea87812d7fa3411b3a8fb5608ddf860
 DIST arj-3.10.22.tar.gz 431467 RMD160 80f8a1a8cd203f73def8e957d96563a4dba80153 SHA1 e8470f480e9eee14906e5485a8898e5c24738c8b SHA256 589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db
 DIST arj_3.10.22-4.diff.gz 31492 RMD160 9acfb9a3e3a400aedcb27508975d48d1fb02c15c SHA1 b1fa204d904aafca018a8ad18c01af657697e3d5 SHA256 0807ad8d0404fc17e9cf6566d16a92eb2b06afd2cef71e79629e027cab9aec2b
 DIST arj_3.10.22.orig.tar.gz 431467 RMD160 80f8a1a8cd203f73def8e957d96563a4dba80153 SHA1 e8470f480e9eee14906e5485a8898e5c24738c8b SHA256 589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db
 EBUILD arj-3.10.22-r1.ebuild 1883 RMD160 47fa9dbb5fc9af45e4754b132078ec63f5a7f78a SHA1 08f6485d9fa592ed58e3dc11c06dbe5d3d9456bb SHA256 3eb127fedd8241b672eb55af13a272903c9a69cf65c01bdc74ff3bf66185a03e
-EBUILD arj-3.10.22-r2.ebuild 1227 RMD160 a47d7b18f703c27cf0ea7c0615b37c26e43a51d6 SHA1 b9c5e916052809d9916f44ad228bc6bc87e21e8c SHA256 fe3090a9e59a2f3d15d13ff590b09725fc6c128019952606902fe6bed2313a3d
-MISC ChangeLog 4812 RMD160 ec21d7c295656a5dd741cb51c9ead59c8dc2df95 SHA1 9c7d3ef7c891ea0db8b90c5bf96364cc3780cda6 SHA256 381b8496eacff3d99ad99ca822a2fb0ac7ca74d18a7cdd39a29db228e84223ba
+EBUILD arj-3.10.22-r2.ebuild 1271 RMD160 62451822a08e13b6750f4a9499e71317252c4de5 SHA1 2f184ac49c7da7c2079aa70b06384b30e364cc94 SHA256 4386897b6a0e5fe4e9f83c16d222952014a0f1086e127227312bd029da9c5b27
+MISC ChangeLog 4994 RMD160 e549d7ae4ee5abcf5be6198c629bdfccc0986eea SHA1 ad0a86451c34cd1705a3f9fb49f2755316d7fd36 SHA256 d01a0d6510831f442c9ff39a95f50cdd26de7dddf98194b86608769e4d905b3d
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
diff --git a/app-arch/arj/arj-3.10.22-r2.ebuild b/app-arch/arj/arj-3.10.22-r2.ebuild
index 63801019d592..449e9b2525d8 100644
--- a/app-arch/arj/arj-3.10.22-r2.ebuild
+++ b/app-arch/arj/arj-3.10.22-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.22-r2.ebuild,v 1.7 2008/11/26 15:26:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.22-r2.ebuild,v 1.8 2009/06/28 17:54:42 patrick Exp $
 
 inherit autotools eutils toolchain-funcs
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${WORKDIR}"/${P/-/_}-${PATCH_LEVEL}.diff \
 		"${FILESDIR}"/${P}-implicit-declarations.patch
+	epatch "${FILESDIR}/${P}-glibc2.10.patch"
 
 	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
 		epatch debian/patches
diff --git a/app-arch/arj/files/arj-3.10.22-glibc2.10.patch b/app-arch/arj/files/arj-3.10.22-glibc2.10.patch
new file mode 100644
index 000000000000..4de45e1ea568
--- /dev/null
+++ b/app-arch/arj/files/arj-3.10.22-glibc2.10.patch
@@ -0,0 +1,12 @@
+diff -ruN arj-3.10.22.orig/fardata.c arj-3.10.22/fardata.c
+--- arj-3.10.22.orig/fardata.c	2004-04-17 04:39:42.000000000 -0700
++++ arj-3.10.22/fardata.c	2009-05-27 19:21:42.000000000 -0700
+@@ -13,7 +13,7 @@
+ /* ASR fix 02/05/2003: need that regardless of COLOR_OUTPUT to support -jp
+    correctly */
+ #if SFX_LEVEL>=ARJ
+- #define CUSTOM_PRINTF
++/* #define CUSTOM_PRINTF */
+  #define CHUNK_SIZE               512    /* Size of the output block */
+  #define CHUNK_THRESHOLD (CHUNK_SIZE-256) /* Safety bound */
+ #endif