diff options
| author | naddy <naddy@FreeBSD.org> | 2002-02-15 00:59:45 +0800 |
|---|---|---|
| committer | naddy <naddy@FreeBSD.org> | 2002-02-15 00:59:45 +0800 |
| commit | 1d626a969bdc3d5bbfcfecb62d4c72f1aad6b2d1 (patch) | |
| tree | 1f42d1627e1bbff4ee70d4d4e53c28d05de7bfbf | |
| parent | e48946c9a292286bbb1f8b4c3db5c686ce58f9f4 (diff) | |
| download | freebsd-ports-gnome-1d626a969bdc3d5bbfcfecb62d4c72f1aad6b2d1.tar.gz freebsd-ports-gnome-1d626a969bdc3d5bbfcfecb62d4c72f1aad6b2d1.tar.zst freebsd-ports-gnome-1d626a969bdc3d5bbfcfecb62d4c72f1aad6b2d1.zip | |
Disable some asserts() that assume implementation characteristics
of glibc iconv().
| -rw-r--r-- | audio/vorbis-tools/Makefile | 2 | ||||
| -rw-r--r-- | audio/vorbis-tools/files/patch-share::iconvert.c | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index 35428c0f959f..040b291a6d48 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -7,7 +7,7 @@ PORTNAME= vorbis-tools PORTVERSION= 1.0.r3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= audio MASTER_SITES= http://www.xiph.org/ogg/vorbis/download/ \ diff --git a/audio/vorbis-tools/files/patch-share::iconvert.c b/audio/vorbis-tools/files/patch-share::iconvert.c new file mode 100644 index 000000000000..407ea9d47a91 --- /dev/null +++ b/audio/vorbis-tools/files/patch-share::iconvert.c @@ -0,0 +1,29 @@ + +$FreeBSD$ + +--- share/iconvert.c.orig Wed Dec 19 03:57:31 2001 ++++ share/iconvert.c Thu Feb 14 16:52:41 2002 +@@ -105,10 +105,12 @@ + obl = utflen; + for (;;) { + k = iconv(cd1, &ib, &ibl, &ob, &obl); ++#if 0 /* mistaken assumptions */ + assert((!k && !ibl) || + (k == (size_t)(-1) && errno == E2BIG && ibl && obl < 6) || + (k == (size_t)(-1) && + (errno == EILSEQ || errno == EINVAL) && ibl)); ++#endif + if (!ibl) + break; + if (obl < 6) { +@@ -216,8 +218,10 @@ + } + } + k = iconv(cd2, 0, 0, &ob, &obl); ++#if 0 + assert(!k); + assert(!obl); ++#endif + *ob = '\0'; + + free(utfbuf); |