Update 4 packages

mingw-w64-i686-libiconv (1.17-4 -> 1.18-1) mingw-w64-x86_64-git (2.47.1.1.2cd22437f6-1 -> 2.48.0.rc0.windows.1-1) mingw-w64-x86_64-git-doc-html (2.47.1.1.2cd22437f6-1 -> 2.48.0.rc0.windows.1-1) mingw-w64-x86_64-libiconv (1.17-4 -> 1.18-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
git-for-windows · Dec 18, 2024 · dd03460 · dd03460
1 parent 9356836
commit dd03460
Show file tree

Hide file tree

Showing 419 changed files with 9,593 additions and 7,629 deletions.
diff --git a/cmd/git-gui.exe b/cmd/git-gui.exe
diff --git a/cmd/git-receive-pack.exe b/cmd/git-receive-pack.exe
diff --git a/cmd/git-upload-pack.exe b/cmd/git-upload-pack.exe
diff --git a/cmd/git.exe b/cmd/git.exe
diff --git a/cmd/gitk.exe b/cmd/gitk.exe
diff --git a/cmd/scalar.exe b/cmd/scalar.exe
diff --git a/cmd/tig.exe b/cmd/tig.exe
diff --git a/git-bash.exe b/git-bash.exe
diff --git a/git-cmd.exe b/git-cmd.exe
diff --git a/mingw32/bin/libcharset-1.dll b/mingw32/bin/libcharset-1.dll
diff --git a/mingw32/bin/libiconv-2.dll b/mingw32/bin/libiconv-2.dll
diff --git a/mingw32/include/iconv.h b/mingw32/include/iconv.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2022 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2024 Free Software Foundation, Inc.
    This file is part of the GNU LIBICONV Library.
 
    The GNU LIBICONV Library is free software; you can redistribute it
@@ -20,25 +20,28 @@
 #ifndef _LIBICONV_H
 #define _LIBICONV_H
 
-#define _LIBICONV_VERSION 0x0111    /* version number: (major<<8) + minor */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define _LIBICONV_VERSION 0x0112    /* version number: (major<<8) + minor */
 extern __declspec (dllimport) int _libiconv_version; /* Likewise */
 
+#ifdef __cplusplus
+}
+#endif
+
 /* We would like to #include any system header file which could define
-   iconv_t, 1. in order to eliminate the risk that the user gets compilation
+   iconv_t, in order to eliminate the risk that the user gets compilation
    errors because some other system header file includes /usr/include/iconv.h
-   which defines iconv_t or declares iconv after this file, 2. when compiling
-   for LIBICONV_PLUG, we need the proper iconv_t type in order to produce
-   binary compatible code.
+   which defines iconv_t or declares iconv after this file.
    But gcc's #include_next is not portable. Thus, once libiconv's iconv.h
    has been installed in /usr/local/include, there is no way any more to
    include the original /usr/include/iconv.h. We simply have to get away
    without it.
-   Ad 1. The risk that a system header file does
+   The risk that a system header file does
    #include "iconv.h"  or  #include_next "iconv.h"
-   is small. They all do #include <iconv.h>.
-   Ad 2. The iconv_t type is a pointer type in all cases I have seen. (It
-   has to be a scalar type because (iconv_t)(-1) is a possible return value
-   from iconv_open().) */
+   is small. They all do #include <iconv.h>. */
 
 /* Define iconv_t ourselves. */
 #undef iconv_t
@@ -66,25 +69,19 @@ extern "C" {
 
 /* Allocates descriptor for code conversion from encoding ‘fromcode’ to
    encoding ‘tocode’. */
-#ifndef LIBICONV_PLUG
 #define iconv_open libiconv_open
-#endif
 extern iconv_t iconv_open (const char* tocode, const char* fromcode);
 
 /* Converts, using conversion descriptor ‘cd’, at most ‘*inbytesleft’ bytes
    starting at ‘*inbuf’, writing at most ‘*outbytesleft’ bytes starting at
    ‘*outbuf’.
    Decrements ‘*inbytesleft’ and increments ‘*inbuf’ by the same amount.
    Decrements ‘*outbytesleft’ and increments ‘*outbuf’ by the same amount. */
-#ifndef LIBICONV_PLUG
 #define iconv libiconv
-#endif
 extern size_t iconv (iconv_t cd,  char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
 
 /* Frees resources allocated for conversion descriptor ‘cd’. */
-#ifndef LIBICONV_PLUG
 #define iconv_close libiconv_close
-#endif
 extern int iconv_close (iconv_t cd);
 
 
@@ -93,8 +90,6 @@ extern int iconv_close (iconv_t cd);
 #endif
 
 
-#ifndef LIBICONV_PLUG
-
 /* Nonstandard extensions. */
 
 #if 1
@@ -165,7 +160,6 @@ typedef void (*iconv_unicode_uc_to_mb_fallback)
                                          void* callback_arg),
               void* callback_arg,
               void* data);
-#if 1
 /* Fallback function.  Invoked when a number of bytes could not be converted to
    a wide character.  This function should process all bytes from inbuf and may
    produce replacement wide characters by calling the write_replacement
@@ -186,12 +180,6 @@ typedef void (*iconv_wchar_wc_to_mb_fallback)
                                          void* callback_arg),
               void* callback_arg,
               void* data);
-#else
-/* If the wchar_t type does not exist, these two fallback functions are never
-   invoked.  Their argument list therefore does not matter.  */
-typedef void (*iconv_wchar_mb_to_wc_fallback) ();
-typedef void (*iconv_wchar_wc_to_mb_fallback) ();
-#endif
 /* Set of fallbacks. */
 struct iconv_fallbacks {
   iconv_unicode_mb_to_uc_fallback mb_to_uc_fallback;
@@ -201,14 +189,30 @@ struct iconv_fallbacks {
   void* data;
 };
 
+/* Surfaces.
+   The concept of surfaces is described in the 'recode' manual.  */
+#define ICONV_SURFACE_NONE             0
+/* In EBCDIC encodings, 0x15 (which encodes the "newline function", see the
+   Unicode standard, chapter 5) maps to U+000A instead of U+0085.  This is
+   for interoperability with C programs and Unix environments on z/OS.  */
+#define ICONV_SURFACE_EBCDIC_ZOS_UNIX  1
+
 /* Requests for iconvctl. */
-#define ICONV_TRIVIALP            0  /* int *argument */
-#define ICONV_GET_TRANSLITERATE   1  /* int *argument */
-#define ICONV_SET_TRANSLITERATE   2  /* const int *argument */
-#define ICONV_GET_DISCARD_ILSEQ   3  /* int *argument */
-#define ICONV_SET_DISCARD_ILSEQ   4  /* const int *argument */
-#define ICONV_SET_HOOKS           5  /* const struct iconv_hooks *argument */
-#define ICONV_SET_FALLBACKS       6  /* const struct iconv_fallbacks *argument */
+#define ICONV_TRIVIALP                    0  /* int *argument */
+#define ICONV_GET_TRANSLITERATE           1  /* int *argument */
+#define ICONV_SET_TRANSLITERATE           2  /* const int *argument */
+#define ICONV_GET_DISCARD_ILSEQ           3  /* int *argument */
+#define ICONV_SET_DISCARD_ILSEQ           4  /* const int *argument */
+#define ICONV_SET_HOOKS                   5  /* const struct iconv_hooks *argument */
+#define ICONV_SET_FALLBACKS               6  /* const struct iconv_fallbacks *argument */
+#define ICONV_GET_FROM_SURFACE            7  /* unsigned int *argument */
+#define ICONV_SET_FROM_SURFACE            8  /* const unsigned int *argument */
+#define ICONV_GET_TO_SURFACE              9  /* unsigned int *argument */
+#define ICONV_SET_TO_SURFACE             10  /* const unsigned int *argument */
+#define ICONV_GET_DISCARD_INVALID        11  /* int *argument */
+#define ICONV_SET_DISCARD_INVALID        12  /* const int *argument */
+#define ICONV_GET_DISCARD_NON_IDENTICAL  13  /* int *argument */
+#define ICONV_SET_DISCARD_NON_IDENTICAL  14  /* const int *argument */
 
 /* Listing of locale independent encodings. */
 #define iconvlist libiconvlist
@@ -235,7 +239,5 @@ extern void libiconv_set_relocation_prefix (const char *orig_prefix,
 }
 #endif
 
-#endif
-
 
 #endif /* _LIBICONV_H */
diff --git a/mingw32/lib/libcharset.a b/mingw32/lib/libcharset.a
diff --git a/mingw32/lib/libcharset.dll.a b/mingw32/lib/libcharset.dll.a
diff --git a/mingw32/lib/libiconv.a b/mingw32/lib/libiconv.a
diff --git a/mingw32/lib/libiconv.dll.a b/mingw32/lib/libiconv.dll.a
diff --git a/mingw32/lib/pkgconfig/iconv.pc b/mingw32/lib/pkgconfig/iconv.pc
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: iconv
 Description: libiconv
 URL: https://www.gnu.org/software/libiconv/
-Version: 1.17
+Version: 1.18
 Libs: -L${libdir} -liconv
 Cflags: -I${includedir}
diff --git a/mingw32/share/doc/libiconv/iconv.3.html b/mingw32/share/doc/libiconv/iconv.3.html
diff --git a/mingw32/share/doc/libiconv/iconv_close.3.html b/mingw32/share/doc/libiconv/iconv_close.3.html
diff --git a/mingw32/share/doc/libiconv/iconv_open.3.html b/mingw32/share/doc/libiconv/iconv_open.3.html