Date: Fri, 7 Jun 2024 15:30:28 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0664d47527c7 - main - converters/iconv-extra: Refresh patches Message-ID: <202406071530.457FUSoY046889@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0664d47527c7262e3fe4bb5f875ae2e4a6a58f80 commit 0664d47527c7262e3fe4bb5f875ae2e4a6a58f80 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-06-07 15:05:51 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-06-07 15:15:35 +0000 converters/iconv-extra: Refresh patches --- converters/iconv-extra/files/patch-ces__Makefile | 8 ++--- .../iconv-extra/files/patch-ces__iso-2022-cn.c | 4 +-- .../iconv-extra/files/patch-ces__iso-2022-jp-2.c | 4 +-- .../iconv-extra/files/patch-ces__iso-2022-jp.c | 4 +-- .../iconv-extra/files/patch-ces__iso-2022-kr.c | 4 +-- .../files/patch-ces__unicode-1-1-utf-7.c | 35 ++++++++++++++++++++-- converters/iconv-extra/files/patch-gcc41 | 34 --------------------- 7 files changed, 45 insertions(+), 48 deletions(-) diff --git a/converters/iconv-extra/files/patch-ces__Makefile b/converters/iconv-extra/files/patch-ces__Makefile index 8c24c8543cdf..3c2c29a25591 100644 --- a/converters/iconv-extra/files/patch-ces__Makefile +++ b/converters/iconv-extra/files/patch-ces__Makefile @@ -1,6 +1,6 @@ ---- ces/Makefile.orig Wed Nov 29 03:42:25 2000 -+++ ces/Makefile Fri Oct 21 11:24:04 2005 -@@ -4,8 +4,8 @@ +--- ces/Makefile.orig 2000-11-28 18:42:25 UTC ++++ ces/Makefile +@@ -4,8 +4,8 @@ all: ${CHARSETS_SO} all: ${CHARSETS_SO} .if !defined(ICONVDIR_LIBC) @@ -11,7 +11,7 @@ .endif INTERNALLIB = -@@ -14,11 +14,11 @@ NOMAN = +@@ -14,11 +14,11 @@ NOOBJ = NOOBJ = diff --git a/converters/iconv-extra/files/patch-ces__iso-2022-cn.c b/converters/iconv-extra/files/patch-ces__iso-2022-cn.c index f7824a4d8af3..df916b5e10e8 100644 --- a/converters/iconv-extra/files/patch-ces__iso-2022-cn.c +++ b/converters/iconv-extra/files/patch-ces__iso-2022-cn.c @@ -1,5 +1,5 @@ ---- ces/iso-2022-cn.c 2002/03/17 11:15:25 1.1 -+++ ces/iso-2022-cn.c 2002/03/17 11:15:46 +--- ces/iso-2022-cn.c.orig 2000-11-20 22:31:58 UTC ++++ ces/iso-2022-cn.c @@ -31,7 +31,7 @@ */ diff --git a/converters/iconv-extra/files/patch-ces__iso-2022-jp-2.c b/converters/iconv-extra/files/patch-ces__iso-2022-jp-2.c index fc5f190288ec..9c8fc90eb562 100644 --- a/converters/iconv-extra/files/patch-ces__iso-2022-jp-2.c +++ b/converters/iconv-extra/files/patch-ces__iso-2022-jp-2.c @@ -1,5 +1,5 @@ ---- ces/iso-2022-jp-2.c 2002/03/17 11:15:25 1.1 -+++ ces/iso-2022-jp-2.c 2002/03/17 11:15:46 +--- ces/iso-2022-jp-2.c.orig 2000-11-20 22:35:03 UTC ++++ ces/iso-2022-jp-2.c @@ -31,7 +31,7 @@ */ diff --git a/converters/iconv-extra/files/patch-ces__iso-2022-jp.c b/converters/iconv-extra/files/patch-ces__iso-2022-jp.c index 121e3b2d28ee..a2e9244d906a 100644 --- a/converters/iconv-extra/files/patch-ces__iso-2022-jp.c +++ b/converters/iconv-extra/files/patch-ces__iso-2022-jp.c @@ -1,5 +1,5 @@ ---- ces/iso-2022-jp.c 2002/03/17 11:15:25 1.1 -+++ ces/iso-2022-jp.c 2002/03/17 11:15:46 +--- ces/iso-2022-jp.c.orig 2000-11-20 22:34:57 UTC ++++ ces/iso-2022-jp.c @@ -31,7 +31,7 @@ */ diff --git a/converters/iconv-extra/files/patch-ces__iso-2022-kr.c b/converters/iconv-extra/files/patch-ces__iso-2022-kr.c index 4b0e5e058d97..b6352c2177c6 100644 --- a/converters/iconv-extra/files/patch-ces__iso-2022-kr.c +++ b/converters/iconv-extra/files/patch-ces__iso-2022-kr.c @@ -1,5 +1,5 @@ ---- ces/iso-2022-kr.c 2002/03/17 11:15:25 1.1 -+++ ces/iso-2022-kr.c 2002/03/17 11:15:46 +--- ces/iso-2022-kr.c.orig 2000-11-20 22:37:35 UTC ++++ ces/iso-2022-kr.c @@ -31,7 +31,7 @@ */ diff --git a/converters/iconv-extra/files/patch-ces__unicode-1-1-utf-7.c b/converters/iconv-extra/files/patch-ces__unicode-1-1-utf-7.c index c138e3a8f614..2491e47710e3 100644 --- a/converters/iconv-extra/files/patch-ces__unicode-1-1-utf-7.c +++ b/converters/iconv-extra/files/patch-ces__unicode-1-1-utf-7.c @@ -1,5 +1,9 @@ ---- ces/unicode-1-1-utf-7.c 2002/03/17 11:20:12 1.1 -+++ ces/unicode-1-1-utf-7.c 2002/03/17 11:20:21 +Index: ces/unicode-1-1-utf-7.c +=================================================================== +RCS file: /home/bbcvs/iconv/ces/unicode-1-1-utf-7.c,v +retrieving revision 1.2 +--- ces/unicode-1-1-utf-7.c.orig 2024-06-07 14:57:13 UTC ++++ ces/unicode-1-1-utf-7.c @@ -33,7 +33,7 @@ #include <stdlib.h> @@ -9,3 +13,30 @@ static inline int lackofbytes(int bytes, size_t *bytesleft) +@@ -230,7 +230,7 @@ static ucs_t convert_to_ucs(struct iconv_ces *module, + if (*inbytesleft < 2) + return UCS_CHAR_NONE; + needbytes = 1; +- ch = char_type(*(++((unsigned char *)*inbuf))); ++ ch = char_type(*(++*inbuf)); + (*inbytesleft) --; + case utf7_printable: + utf7_state[0] = 0; +@@ -246,7 +246,7 @@ static ucs_t convert_to_ucs(struct iconv_ces *module, + (*inbytesleft) += needbytes; + return UCS_CHAR_NONE; + } +- switch (char_type(*(++(unsigned char *)*inbuf))) { ++ switch (char_type(*(++*inbuf))) { + case utf7_shift_out: + (*inbuf) ++; + (*inbytesleft) -= 2; +@@ -264,7 +264,7 @@ static ucs_t convert_to_ucs(struct iconv_ces *module, + return UCS_CHAR_INVALID; + } + (*inbytesleft) --; +- return *((unsigned char *)*inbuf) ++; ++ return *(*inbuf)++; + #undef utf7_state + } + diff --git a/converters/iconv-extra/files/patch-gcc41 b/converters/iconv-extra/files/patch-gcc41 deleted file mode 100644 index dbaaacec85e2..000000000000 --- a/converters/iconv-extra/files/patch-gcc41 +++ /dev/null @@ -1,34 +0,0 @@ -Index: ces/unicode-1-1-utf-7.c -=================================================================== -RCS file: /home/bbcvs/iconv/ces/unicode-1-1-utf-7.c,v -retrieving revision 1.2 -diff -u -r1.2 unicode-1-1-utf-7.c ---- ces/unicode-1-1-utf-7.c 22 Mar 2005 16:41:03 -0000 1.2 -+++ ces/unicode-1-1-utf-7.c 14 Dec 2006 22:47:58 -0000 -@@ -233,7 +233,7 @@ - if (*inbytesleft < 2) - return UCS_CHAR_NONE; - needbytes = 1; -- ch = char_type(*(++((unsigned char *)*inbuf))); -+ ch = char_type(*(++*inbuf)); - (*inbytesleft) --; - case utf7_printable: - utf7_state[0] = 0; -@@ -249,7 +249,7 @@ - (*inbytesleft) += needbytes; - return UCS_CHAR_NONE; - } -- switch (char_type(*(++(unsigned char *)*inbuf))) { -+ switch (char_type(*(++*inbuf))) { - case utf7_shift_out: - (*inbuf) ++; - (*inbytesleft) -= 2; -@@ -267,7 +267,7 @@ - return UCS_CHAR_INVALID; - } - (*inbytesleft) --; -- return *((unsigned char *)*inbuf) ++; -+ return *(*inbuf)++; - #undef utf7_state - } -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406071530.457FUSoY046889>