diff options
author | Baruch Siach <baruch@tkos.co.il> | 2015-10-07 09:58:12 +0300 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2015-10-08 17:13:49 +0200 |
commit | 912538634a778452196c49726bb0770885280adc (patch) | |
tree | 84d274133f611e51bd25be41b4147fe4c9098573 /package/dos2unix/0001-fix-build-without-wchar.patch | |
parent | ee3e913f1befeb3cb174e2ee2498d1d1a4b8716e (diff) | |
download | buildroot-912538634a778452196c49726bb0770885280adc.tar.gz buildroot-912538634a778452196c49726bb0770885280adc.zip |
dos2unix: bump to version 7.3.1
Drop upstream patch.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/dos2unix/0001-fix-build-without-wchar.patch')
-rw-r--r-- | package/dos2unix/0001-fix-build-without-wchar.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/package/dos2unix/0001-fix-build-without-wchar.patch b/package/dos2unix/0001-fix-build-without-wchar.patch deleted file mode 100644 index c3188363ec..0000000000 --- a/package/dos2unix/0001-fix-build-without-wchar.patch +++ /dev/null @@ -1,59 +0,0 @@ -Don't reference wchar_t when D2U_UNICODE is not defined. - -Patch status: upstream (http://sourceforge.net/p/dos2unix/code/736) - -Signed-off-by: Baruch Siach <baruch@tkos.co.il> - -diff -Nuar dos2unix-7.3.orig/common.c dos2unix-7.3/common.c ---- dos2unix-7.3.orig/common.c 2015-08-21 02:02:31.000000000 +0300 -+++ dos2unix-7.3/common.c 2015-09-02 22:13:33.648486366 +0300 -@@ -1615,9 +1615,11 @@ - } else if (pFlag->status & WRONG_CODEPAGE) { - d2u_fprintf(stderr,"%s: ",progname); - d2u_fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); -+#ifdef D2U_UNICODE - } else if (pFlag->status & WCHAR_T_TOO_SMALL) { - d2u_fprintf(stderr,"%s: ",progname); - d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), "stdin", (int)sizeof(wchar_t)); -+#endif - } else if (pFlag->status & UNICODE_CONVERSION_ERROR) { - d2u_fprintf(stderr,"%s: ",progname); - d2u_fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), "stdin", pFlag->line_nr); -@@ -1701,9 +1703,11 @@ - } else if (pFlag->status & WRONG_CODEPAGE) { - d2u_fprintf(stderr,"%s: ",progname); - d2u_fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); -+#ifdef D2U_UNICODE - } else if (pFlag->status & WCHAR_T_TOO_SMALL) { - d2u_fprintf(stderr,"%s: ",progname); - d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t)); -+#endif - } else if (pFlag->status & UNICODE_CONVERSION_ERROR) { - d2u_fprintf(stderr,"%s: ",progname); - d2u_fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), infile, pFlag->line_nr); -@@ -1781,9 +1785,11 @@ - } else if (pFlag->status & WRONG_CODEPAGE) { - d2u_fprintf(stderr,"%s: ",progname); - d2u_fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); -+#ifdef D2U_UNICODE - } else if (pFlag->status & WCHAR_T_TOO_SMALL) { - d2u_fprintf(stderr,"%s: ",progname); - d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t)); -+#endif - } else if (pFlag->status & UNICODE_CONVERSION_ERROR) { - d2u_fprintf(stderr,"%s: ",progname); - d2u_fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), infile, pFlag->line_nr); -@@ -1834,11 +1840,13 @@ - d2u_fprintf(stderr,"%s: ",progname); - d2u_fprintf(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile); - } -+#ifdef D2U_UNICODE - } else if (pFlag->status & WCHAR_T_TOO_SMALL) { - if (pFlag->verbose) { - d2u_fprintf(stderr,"%s: ",progname); - d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t)); - } -+#endif - } - } - |