diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-06-22 01:18:08 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-06-22 01:18:08 +0000 |
| commit | 6fab32816ef0e05f048ed130b7f95bba1e180704 (patch) | |
| tree | 39ecd32fce169000beb5ace6016de6e32530dcc6 /app-arch/lzma-utils | |
| parent | arm/s390/sh stable (diff) | |
| download | gentoo-2-6fab32816ef0e05f048ed130b7f95bba1e180704.tar.gz gentoo-2-6fab32816ef0e05f048ed130b7f95bba1e180704.tar.bz2 gentoo-2-6fab32816ef0e05f048ed130b7f95bba1e180704.zip | |
Add fix from upstream for building with -pedantic #228725 by Nico R.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25 x86_64)
Diffstat (limited to 'app-arch/lzma-utils')
| -rw-r--r-- | app-arch/lzma-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/lzma-utils/files/lzma-utils-4.32.6-semicolon.patch | 19 | ||||
| -rw-r--r-- | app-arch/lzma-utils/lzma-utils-4.32.6.ebuild | 3 |
3 files changed, 26 insertions, 2 deletions
diff --git a/app-arch/lzma-utils/ChangeLog b/app-arch/lzma-utils/ChangeLog index 85f9188a4cc1..c260491c39ff 100644 --- a/app-arch/lzma-utils/ChangeLog +++ b/app-arch/lzma-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/lzma-utils # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/ChangeLog,v 1.40 2008/06/21 20:25:21 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/ChangeLog,v 1.41 2008/06/22 01:18:08 vapier Exp $ + + 22 Jun 2008; Mike Frysinger <vapier@gentoo.org> + +files/lzma-utils-4.32.6-semicolon.patch, lzma-utils-4.32.6.ebuild: + Add fix from upstream for building with -pedantic #228725 by Nico R. 21 Jun 2008; Markus Rothe <corsair@gentoo.org> lzma-utils-4.32.6.ebuild: Stable on ppc64; bug #228671 diff --git a/app-arch/lzma-utils/files/lzma-utils-4.32.6-semicolon.patch b/app-arch/lzma-utils/files/lzma-utils-4.32.6-semicolon.patch new file mode 100644 index 000000000000..600e1b9b530c --- /dev/null +++ b/app-arch/lzma-utils/files/lzma-utils-4.32.6-semicolon.patch @@ -0,0 +1,19 @@ +commit 6bd98aeca2c27900c4b8101d6a29db84bb9db372 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Sat Jun 21 15:18:05 2008 +0300 + + Remove invalid semicolon. Thanks to Steffi Wassermann. + +diff --git a/src/sdk/7zip/Compress/LZMA/LZMAEncoder.cpp b/src/sdk/7zip/Compress/LZMA/LZMAEncoder.cpp +index a88020f..5770504 100644 +--- a/src/sdk/7zip/Compress/LZMA/LZMAEncoder.cpp ++++ b/src/sdk/7zip/Compress/LZMA/LZMAEncoder.cpp +@@ -182,7 +182,7 @@ UInt32 CLiteralEncoder2::GetPrice(bool matchMode, Byte matchByte, Byte symbol) c + context = (context << 1) | bit; + } + return price; +-}; ++} + + + namespace NLength { diff --git a/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild b/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild index 419243dd4ee2..4230d4b73f3f 100644 --- a/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild +++ b/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild,v 1.8 2008/06/22 01:14:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild,v 1.9 2008/06/22 01:18:08 vapier Exp $ # Remember: we cannot leverage autotools in this ebuild in order # to avoid circular deps with autotools @@ -26,6 +26,7 @@ S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/${P}-semicolon.patch #228725 if use nocxx ; then epatch "${WORKDIR}"/${P}-nocxx.patch find -type f -print0 | xargs -0 touch -r configure |