diff options
| author |   Michael Cummings <mcummings@gentoo.org> | 2006-08-25 13:25:18 +0000 |
|---|---|---|
| committer | Michael Cummings <mcummings@gentoo.org> | 2006-08-25 13:25:18 +0000 |
| commit | 984ab9b595a9483e8b4aa0c5b14baec044f602f2 (patch) | |
| tree | 8f00ce2d0027c7047819a6aeaafac895a080bb1d | |
| parent | Stable on sparc wrt #144925 (diff) | |
| download | gentoo-2-984ab9b595a9483e8b4aa0c5b14baec044f602f2.tar.gz gentoo-2-984ab9b595a9483e8b4aa0c5b14baec044f602f2.tar.bz2 gentoo-2-984ab9b595a9483e8b4aa0c5b14baec044f602f2.zip | |
Patch from novas0x2a - sizeof(size_t) != sizeof(int) after all. Tested on x86, sparc, amd64.
(Portage version: 2.1.1_pre3-r1)
| -rw-r--r-- | dev-perl/Text-Unaccent/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-perl/Text-Unaccent/Text-Unaccent-1.08.ebuild | 12 | ||||
| -rw-r--r-- | dev-perl/Text-Unaccent/files/text-unaccent_size_t.diff | 27 |
3 files changed, 41 insertions, 5 deletions
diff --git a/dev-perl/Text-Unaccent/ChangeLog b/dev-perl/Text-Unaccent/ChangeLog index 7ef1af792557..849442944ff4 100644 --- a/dev-perl/Text-Unaccent/ChangeLog +++ b/dev-perl/Text-Unaccent/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-perl/Text-Unaccent # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Unaccent/ChangeLog,v 1.12 2006/08/06 00:31:04 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Unaccent/ChangeLog,v 1.13 2006/08/25 13:25:18 mcummings Exp $ + + 25 Aug 2006; Michael Cummings <mcummings@gentoo.org> + +files/text-unaccent_size_t.diff, Text-Unaccent-1.08.ebuild: + Patch from novas0x2a - sizeof(size_t) != sizeof(int) after all. Tested on + x86, sparc, amd64. 06 Aug 2006; Michael Cummings <mcummings@gentoo.org> Text-Unaccent-1.08.ebuild: diff --git a/dev-perl/Text-Unaccent/Text-Unaccent-1.08.ebuild b/dev-perl/Text-Unaccent/Text-Unaccent-1.08.ebuild index f38484a4fb99..39cf77b58771 100644 --- a/dev-perl/Text-Unaccent/Text-Unaccent-1.08.ebuild +++ b/dev-perl/Text-Unaccent/Text-Unaccent-1.08.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Unaccent/Text-Unaccent-1.08.ebuild,v 1.12 2006/08/06 00:31:04 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Unaccent/Text-Unaccent-1.08.ebuild,v 1.13 2006/08/25 13:25:18 mcummings Exp $ -inherit perl-module +inherit perl-module eutils DESCRIPTION="Removes accents from a string" HOMEPAGE="http://search.cpan.org/~ldachary/${P}/" @@ -10,7 +10,6 @@ SRC_URI="mirror://cpan/authors/id/L/LD/LDACHARY/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -#KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64" KEYWORDS="alpha ~amd64 hppa ia64 ppc sparc x86" IUSE="" @@ -18,4 +17,9 @@ SRC_TEST="do" DEPEND="dev-lang/perl" -RDEPEND="${DEPEND}" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/text-unaccent_size_t.diff +} diff --git a/dev-perl/Text-Unaccent/files/text-unaccent_size_t.diff b/dev-perl/Text-Unaccent/files/text-unaccent_size_t.diff new file mode 100644 index 000000000000..5bd45f6f2ad6 --- /dev/null +++ b/dev-perl/Text-Unaccent/files/text-unaccent_size_t.diff @@ -0,0 +1,27 @@ +diff -ur Text-Unaccent-1.08/unac.c Text-Unaccent-1.08-mod/unac.c +--- Text-Unaccent-1.08/unac.c 2004-10-17 12:00:36.000000000 -0700 ++++ Text-Unaccent-1.08-mod/unac.c 2006-08-24 22:37:35.000000000 -0700 +@@ -13881,9 +13881,9 @@ + *out_lengthp = 0; + } else { + char* utf16 = 0; +- int utf16_length = 0; ++ size_t utf16_length = 0; + char* utf16_unaccented = 0; +- int utf16_unaccented_length = 0; ++ size_t utf16_unaccented_length = 0; + + if(convert(charset, utf16be(), in, in_length, &utf16, &utf16_length) < 0) { + return -1; +diff -ur Text-Unaccent-1.08/Unaccent.xs Text-Unaccent-1.08-mod/Unaccent.xs +--- Text-Unaccent-1.08/Unaccent.xs 2004-12-29 03:45:18.000000000 -0800 ++++ Text-Unaccent-1.08-mod/Unaccent.xs 2006-08-24 22:35:57.000000000 -0700 +@@ -35,7 +35,7 @@ + #include "unac.h" + + static char* buffer; +-static int buffer_length; ++static size_t buffer_length; + + static void unac_debug_print(const char* message, void* data) + { |