diff options
author | obache <obache> | 2011-02-06 13:04:04 +0000 |
---|---|---|
committer | obache <obache> | 2011-02-06 13:04:04 +0000 |
commit | 8940974062bfbdee3c5e4b65f132df97d714c95e (patch) | |
tree | 97d07932911a3824c8eab8ce7d85de7be9bd37f3 /devel/gtexinfo | |
parent | c3db3a76fdaa30ffb0459b662cc45f64d6db7d21 (diff) | |
download | pkgsrc-8940974062bfbdee3c5e4b65f132df97d714c95e.tar.gz |
Skip multibyte handling if neither mbsinit nor mbrtowc exists.
Patch taken from upstream bug #24687 and fixes PR#42925.
Diffstat (limited to 'devel/gtexinfo')
-rw-r--r-- | devel/gtexinfo/distinfo | 4 | ||||
-rw-r--r-- | devel/gtexinfo/patches/patch-gnulib_lib_mbiter.h | 33 | ||||
-rw-r--r-- | devel/gtexinfo/patches/patch-gnulib_lib_mbuiter.h | 33 |
3 files changed, 69 insertions, 1 deletions
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo index 13e21ed03db..bcfde288aa3 100644 --- a/devel/gtexinfo/distinfo +++ b/devel/gtexinfo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2009/08/16 13:57:43 wiz Exp $ +$NetBSD: distinfo,v 1.34 2011/02/06 13:04:04 obache Exp $ SHA1 (texinfo-4.13.tar.gz) = a1533cf8e03ea4fa6c443b73f4c85e4da04dead0 RMD160 (texinfo-4.13.tar.gz) = 2473fc7ef3f82f47a990ee48c1d262b1f420eabd @@ -7,3 +7,5 @@ SHA1 (patch-ab) = c2be57386d1dfd610de5fad423be0fa11036ffda SHA1 (patch-ac) = b5b2ecbff959fb435de77fc73c555903ef7ba271 SHA1 (patch-aj) = 8a215583bab47628a350cfb3874eef4930d255e9 SHA1 (patch-ak) = 51a4b155fa6a3bd0c30c9ec2c6007cd4ee69248c +SHA1 (patch-gnulib_lib_mbiter.h) = b031213dfb68ae79bbce0c6dbe180a164c3a12af +SHA1 (patch-gnulib_lib_mbuiter.h) = 3b3cf6867ee064d150fdd7ec847c444b9df8e638 diff --git a/devel/gtexinfo/patches/patch-gnulib_lib_mbiter.h b/devel/gtexinfo/patches/patch-gnulib_lib_mbiter.h new file mode 100644 index 00000000000..2d2f308129f --- /dev/null +++ b/devel/gtexinfo/patches/patch-gnulib_lib_mbiter.h @@ -0,0 +1,33 @@ +$NetBSD: patch-gnulib_lib_mbiter.h,v 1.1 2011/02/06 13:04:04 obache Exp $ + +* http://savannah.gnu.org/bugs/?24687 + +--- gnulib/lib/mbiter.h.orig 2008-05-12 12:38:21.000000000 +0000 ++++ gnulib/lib/mbiter.h +@@ -117,8 +117,10 @@ mbiter_multi_next (struct mbiter_multi * + { + if (iter->next_done) + return; ++#if defined(HAVE_MBSINIT) && defined(HAVE_MBRTOWC) + if (iter->in_shift) + goto with_shift; ++#endif + /* Handle most ASCII characters quickly, without calling mbrtowc(). */ + if (is_basic (*iter->cur.ptr)) + { +@@ -129,6 +131,7 @@ mbiter_multi_next (struct mbiter_multi * + iter->cur.wc = *iter->cur.ptr; + iter->cur.wc_valid = true; + } ++#if defined(HAVE_MBSINIT) && defined(HAVE_MBRTOWC) + else + { + assert (mbsinit (&iter->state)); +@@ -169,6 +172,7 @@ mbiter_multi_next (struct mbiter_multi * + iter->in_shift = false; + } + } ++#endif + iter->next_done = true; + } + diff --git a/devel/gtexinfo/patches/patch-gnulib_lib_mbuiter.h b/devel/gtexinfo/patches/patch-gnulib_lib_mbuiter.h new file mode 100644 index 00000000000..1ed1d5abcee --- /dev/null +++ b/devel/gtexinfo/patches/patch-gnulib_lib_mbuiter.h @@ -0,0 +1,33 @@ +$NetBSD: patch-gnulib_lib_mbuiter.h,v 1.1 2011/02/06 13:04:04 obache Exp $ + +* http://savannah.gnu.org/bugs/?24687 + +--- gnulib/lib/mbuiter.h.orig 2007-12-25 23:57:18.000000000 +0000 ++++ gnulib/lib/mbuiter.h +@@ -125,8 +125,10 @@ mbuiter_multi_next (struct mbuiter_multi + { + if (iter->next_done) + return; ++#if defined(HAVE_MBSINIT) && defined(HAVE_MBRTOWC) + if (iter->in_shift) + goto with_shift; ++#endif + /* Handle most ASCII characters quickly, without calling mbrtowc(). */ + if (is_basic (*iter->cur.ptr)) + { +@@ -137,6 +139,7 @@ mbuiter_multi_next (struct mbuiter_multi + iter->cur.wc = *iter->cur.ptr; + iter->cur.wc_valid = true; + } ++#if defined(HAVE_MBSINIT) && defined(HAVE_MBRTOWC) + else + { + assert (mbsinit (&iter->state)); +@@ -178,6 +181,7 @@ mbuiter_multi_next (struct mbuiter_multi + iter->in_shift = false; + } + } ++#endif + iter->next_done = true; + } + |