diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-03-06 22:05:09 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-03-06 22:05:09 +0000 |
commit | 99f6ddbcad5f915b88bef4217d91964c97db4cba (patch) | |
tree | 5d1c1376a8dee05e0597968b3472223a1e9ffe20 /app-text/wdiff | |
parent | Unbundling speex and zlib. Partially fix bug #255453 (diff) | |
download | historical-99f6ddbcad5f915b88bef4217d91964c97db4cba.tar.gz historical-99f6ddbcad5f915b88bef4217d91964c97db4cba.tar.bz2 historical-99f6ddbcad5f915b88bef4217d91964c97db4cba.zip |
Fix for bug 301171, ignore case patch
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
Diffstat (limited to 'app-text/wdiff')
-rw-r--r-- | app-text/wdiff/ChangeLog | 10 | ||||
-rw-r--r-- | app-text/wdiff/Manifest | 12 | ||||
-rw-r--r-- | app-text/wdiff/files/wdiff-0.5-ignore-case.patch | 11 | ||||
-rw-r--r-- | app-text/wdiff/wdiff-0.5-r3.ebuild | 46 |
4 files changed, 72 insertions, 7 deletions
diff --git a/app-text/wdiff/ChangeLog b/app-text/wdiff/ChangeLog index a4e9540b00d8..2a7e77b7718f 100644 --- a/app-text/wdiff/ChangeLog +++ b/app-text/wdiff/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/wdiff -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.32 2009/09/09 18:42:39 vapier Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.33 2010/03/06 22:05:07 jlec Exp $ + +*wdiff-0.5-r3 (06 Mar 2010) + + 06 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org> +wdiff-0.5-r3.ebuild, + +files/wdiff-0.5-ignore-case.patch: + Fix for bug 301171, ignore case patch 09 Sep 2009; Mike Frysinger <vapier@gentoo.org> wdiff-0.5-r2.ebuild, +files/wdiff-0.5-headers.patch: diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest index 4f481de0603d..f33344333dfb 100644 --- a/app-text/wdiff/Manifest +++ b/app-text/wdiff/Manifest @@ -3,16 +3,18 @@ Hash: SHA1 AUX wdiff-0.5-avoid-wraps.diff 401 RMD160 7e25aa8c44a131d3dd1631ca76142c6ec52ea57a SHA1 a05a777d9d413727fdc96366024f4265195a0958 SHA256 0d601e06b266617b752ab649a983a2b8c4a165917f329e40690397b9a8073372 AUX wdiff-0.5-headers.patch 257 RMD160 8588e8435bd7349422385a4f7148de7313568af5 SHA1 f1cec0e0c0787cb38f1c16ec4848e9dec0867c24 SHA256 7ad877eb9817dc56868e8c531cd624d788376a6b1e914d6315107e347d13b58c +AUX wdiff-0.5-ignore-case.patch 375 RMD160 5b7e588f8919d3fe16b4731dc35574af8b9f57a9 SHA1 bfbd23901d268915a41e191fcf7af3e2fb8d46ea SHA256 eeae6aad2df52d81450ab05fbb11f318ecb51d636892c3b79bbd58b573c6f2d0 AUX wdiff-0.5-segfault-fix.diff 487 RMD160 0462bb29901c439307bc80338b4c2759aa6fa84f SHA1 6a83a6c412b63996d4a6b35cab8a733374fcb1ff SHA256 6ad068f5f0a7c7f8c96cd03b4a5ab24f6065fc09ba9abe3b0e22c2d2f89edcd9 DIST wdiff-0.5-gentoo.diff.bz2 253 RMD160 99cd2ba6fdeda177e380a7cf2cfd95c0df941426 SHA1 1745f579d8144f33dbb177db890b97032940b5ec SHA256 edc00a72975cd680a32bb6afec7b0c4747c1745fd70a033152caf56796de3f0e DIST wdiff-0.5.tar.gz 129267 RMD160 7b313cfaca2ec3759048888bbdba0be1cd88a5e1 SHA1 44e18850e16518633139cf24a83165e62e3baa95 SHA256 ecfda74a17d12c84873a17943b0f3a509ac012cc35708864462a5380a8d2b428 EBUILD wdiff-0.5-r2.ebuild 1176 RMD160 57e84c50fb74623c71b28383fb392932aedf29f0 SHA1 42c21e8c31ae3a7970486997bbcb1bc60a03b488 SHA256 eccc8528dca4bea77797cabdaca5a62242836a259602784275a7f519e8cbfe23 -MISC ChangeLog 3696 RMD160 d8bef2e92948a58712261f4a58ec81b2c467ced9 SHA1 5c937c40225819c62a4c03c197e095ec2c287315 SHA256 8adb93ead8183a5d55df5832a95d7fb184b9b2b20636882045cbe94aa367b275 +EBUILD wdiff-0.5-r3.ebuild 1224 RMD160 e77f95ae9e58536f1cd84eb4ef5893308edbe140 SHA1 c1a8f32e0b670a8d21690fc343de071f1e47940b SHA256 cc38c18518f8abae923b1741690a3f1bc2ef677364b9af7f5d66372cd66addef +MISC ChangeLog 3878 RMD160 f7b57281b190c165ed51d99246fba57f7aa2740b SHA1 dd97b8093a84ce2695f00b1ba0dfc254d6c3a073 SHA256 f70fcb1d253befdc70e1fdb788ef0290b7e93ad0836ab047969c81ee82dbfdc8 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkqn9ysACgkQlPl3HsVfCDqvIQCbBtvLHtBlhAaVQof+pFkYQ0Kb -dREAn0JZ4ocbgrnBuUA0Ws2NoKGRcQjp -=xOsd +iEYEARECAAYFAkuS0ZkACgkQgAnW8HDreRaosQCgqTpatVQXp2L68XxHIQvomHJO +xygAnRLzCMvlnLdvu88wUmuffH32k0MC +=uies -----END PGP SIGNATURE----- diff --git a/app-text/wdiff/files/wdiff-0.5-ignore-case.patch b/app-text/wdiff/files/wdiff-0.5-ignore-case.patch new file mode 100644 index 000000000000..25d2e07d9624 --- /dev/null +++ b/app-text/wdiff/files/wdiff-0.5-ignore-case.patch @@ -0,0 +1,11 @@ +--- wdiff-0.5-orig/wdiff.c ++++ wdiff-0.5/wdiff.c +@@ -895,7 +895,7 @@ + /* Launch the diff program. */ + + if (ignore_case) +- input_file = readpipe (DIFF_PROGRAM, "-c", left_side->temp_name, ++ input_file = readpipe (DIFF_PROGRAM, "-i", left_side->temp_name, + right_side->temp_name, NULL); + else + input_file = readpipe (DIFF_PROGRAM, left_side->temp_name, diff --git a/app-text/wdiff/wdiff-0.5-r3.ebuild b/app-text/wdiff/wdiff-0.5-r3.ebuild new file mode 100644 index 000000000000..d6afdf05c938 --- /dev/null +++ b/app-text/wdiff/wdiff-0.5-r3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-0.5-r3.ebuild,v 1.1 2010/03/06 22:05:07 jlec Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="Create a diff disregarding formatting" +HOMEPAGE="http://www.gnu.org/software/wdiff/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz + mirror://gentoo/${P}-gentoo.diff.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="sys-apps/diffutils + sys-apps/less" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${WORKDIR}"/${P}-gentoo.diff + epatch "${FILESDIR}"/${P}-headers.patch + epatch "${FILESDIR}"/${P}-segfault-fix.diff + epatch "${FILESDIR}"/${P}-avoid-wraps.diff + epatch "${FILESDIR}"/${P}-ignore-case.patch + sed -i 's:-ltermcap:-lncurses:' configure +} + +src_compile() { + # Cannot use econf here because the configure script that + # comes with wdiff is too old to understand the standard + # options. + + tc-export CC + ./configure --prefix=/usr || die + echo '#define HAVE_TPUTS 1' >> config.h + emake || die +} + +src_install() { + einstall || die + dodoc ChangeLog NEWS README + doman wdiff.1 +} |