diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2009-06-28 17:54:42 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2009-06-28 17:54:42 +0000 |
| commit | bdbbdaac2c15176eb358bdb633df1c2732ef72b6 (patch) | |
| tree | 5ac81f7d25cf06b2b83a3ff726777593f62561bd /app-arch/arj | |
| parent | Backport a patch applied by Typo upstream. (diff) | |
| download | gentoo-2-bdbbdaac2c15176eb358bdb633df1c2732ef72b6.tar.gz gentoo-2-bdbbdaac2c15176eb358bdb633df1c2732ef72b6.tar.bz2 gentoo-2-bdbbdaac2c15176eb358bdb633df1c2732ef72b6.zip | |
Fix for glibc 2.10 compilation. Patch by hirakendu. Solves #271608
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-arch/arj')
| -rw-r--r-- | app-arch/arj/ChangeLog | 8 | ||||
| -rw-r--r-- | app-arch/arj/arj-3.10.22-r2.ebuild | 5 | ||||
| -rw-r--r-- | app-arch/arj/files/arj-3.10.22-glibc2.10.patch | 12 |
3 files changed, 21 insertions, 4 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/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 |