deps src: Automatic update

marvim · marvim · commit 5ceec5530021 · 2025-11-25T05:30:24.000Z
diff --git a/src/utf8proc-stamp/download-utf8proc.cmake b/src/utf8proc-stamp/download-utf8proc.cmake
@@ -22,16 +22,16 @@ function(check_file_hash has_hash hash_is_good)
   set("${has_hash}" TRUE PARENT_SCOPE)
 
   message(VERBOSE "verifying file...
-       file='/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz'")
+       file='/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz'")
 
-  file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz" actual_value)
+  file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz" actual_value)
 
-  if(NOT "${actual_value}" STREQUAL "dc146fd279eacbbf399d3f70932ce66f516aac2d13f8ec2d26a30f8ed70aa5b4")
+  if(NOT "${actual_value}" STREQUAL "a9b8d8fd57fb3aeca2aede62fd58958036d3bd29871afc1b871e3916c48420a7")
     set("${hash_is_good}" FALSE PARENT_SCOPE)
     message(VERBOSE "SHA256 hash of
-    /home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz
+    /home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz
   does not match expected value
-    expected: 'dc146fd279eacbbf399d3f70932ce66f516aac2d13f8ec2d26a30f8ed70aa5b4'
+    expected: 'a9b8d8fd57fb3aeca2aede62fd58958036d3bd29871afc1b871e3916c48420a7'
       actual: '${actual_value}'")
   else()
     set("${hash_is_good}" TRUE PARENT_SCOPE)
@@ -71,32 +71,32 @@ function(sleep_before_download attempt)
   execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep "${sleep_seconds}")
 endfunction()
 
-if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz")
+if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz")
   check_file_hash(has_hash hash_is_good)
   if(has_hash)
     if(hash_is_good)
       message(VERBOSE "File already exists and hash match (skip download):
-  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz'
-  SHA256='dc146fd279eacbbf399d3f70932ce66f516aac2d13f8ec2d26a30f8ed70aa5b4'"
+  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz'
+  SHA256='a9b8d8fd57fb3aeca2aede62fd58958036d3bd29871afc1b871e3916c48420a7'"
       )
       return()
     else()
       message(VERBOSE "File already exists but hash mismatch. Removing...")
-      file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz")
+      file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz")
     endif()
   else()
     message(VERBOSE "File already exists but no hash specified (use URL_HASH):
-  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz'
+  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz'
 Old file will be removed and new file downloaded from URL."
     )
-    file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz")
+    file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz")
   endif()
 endif()
 
 set(retry_number 5)
 
 message(VERBOSE "Downloading...
-   dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz'
+   dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz'
    timeout='none'
    inactivity timeout='none'"
 )
@@ -107,7 +107,7 @@ foreach(i RANGE ${retry_number})
   if(status_code IN_LIST download_retry_codes)
     sleep_before_download(${i})
   endif()
-  foreach(url IN ITEMS [====[https://github.com/juliastrings/utf8proc/archive/v2.11.1.tar.gz]====])
+  foreach(url IN ITEMS [====[https://github.com/juliastrings/utf8proc/archive/v2.11.2.tar.gz]====])
     if(NOT url IN_LIST skip_url_list)
       message(VERBOSE "Using src='${url}'")
 
@@ -119,7 +119,7 @@ foreach(i RANGE ${retry_number})
 
       file(
         DOWNLOAD
-        "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz"
+        "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz"
         
         # no TIMEOUT
         # no INACTIVITY_TIMEOUT
@@ -136,7 +136,7 @@ foreach(i RANGE ${retry_number})
         check_file_hash(has_hash hash_is_good)
         if(has_hash AND NOT hash_is_good)
           message(VERBOSE "Hash mismatch, removing...")
-          file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz")
+          file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz")
         else()
           message(VERBOSE "Downloading... done")
           return()
diff --git a/src/utf8proc-stamp/extract-utf8proc.cmake b/src/utf8proc-stamp/extract-utf8proc.cmake
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION ${CMAKE_VERSION}) # this file comes with cmake
 
 # Make file names absolute:
 #
-get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz" ABSOLUTE)
+get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz" ABSOLUTE)
 get_filename_component(directory "/home/runner/work/deps/deps/neovim/deps/build/src/utf8proc" ABSOLUTE)
 
 message(VERBOSE "extracting...
diff --git a/src/utf8proc-stamp/utf8proc-urlinfo.txt b/src/utf8proc-stamp/utf8proc-urlinfo.txt
@@ -6,7 +6,7 @@ method=url
 command=/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/utf8proc-stamp/download-utf8proc.cmake;COMMAND;/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/utf8proc-stamp/verify-utf8proc.cmake;COMMAND;/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/utf8proc-stamp/extract-utf8proc.cmake
 source_dir=/home/runner/work/deps/deps/neovim/deps/build/src/utf8proc
 work_dir=/home/runner/work/deps/deps/neovim/deps/build/src
-url(s)=https://github.com/juliastrings/utf8proc/archive/v2.11.1.tar.gz
-hash=SHA256=dc146fd279eacbbf399d3f70932ce66f516aac2d13f8ec2d26a30f8ed70aa5b4
+url(s)=https://github.com/juliastrings/utf8proc/archive/v2.11.2.tar.gz
+hash=SHA256=a9b8d8fd57fb3aeca2aede62fd58958036d3bd29871afc1b871e3916c48420a7
       no_extract=
 
diff --git a/src/utf8proc/.github/workflows/cmake.yml b/src/utf8proc/.github/workflows/cmake.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} - shared=${{ matrix.shared }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Build
       run: |
         mkdir build
@@ -60,7 +60,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: msys2/setup-msys2@v2
       with:
         install: gcc make mingw-w64-x86_64-cmake
diff --git a/src/utf8proc/.github/workflows/make.yml b/src/utf8proc/.github/workflows/make.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     # TODO: update makefile to check MANIFEST
     - name: Install dependencies (MacOS)
       if: runner.os == 'macOS'
diff --git a/src/utf8proc/CMakeLists.txt b/src/utf8proc/CMakeLists.txt
@@ -5,14 +5,14 @@ include (utils.cmake)
 disallow_intree_builds()
 
 # API version - be sure to update utf8proc.h and Makefile, too!
-project (utf8proc VERSION 2.11.1 LANGUAGES C)
+project (utf8proc VERSION 2.11.2 LANGUAGES C)
 
 # This is the ABI version number, which may differ from the
 # API version number (defined in utf8proc.h and above).
 # Be sure to also update these in Makefile and MANIFEST!
 set(SO_MAJOR 3)
 set(SO_MINOR 2)
-set(SO_PATCH 1)
+set(SO_PATCH 2)
 
 option(UTF8PROC_INSTALL "Enable installation of utf8proc" On)
 option(UTF8PROC_ENABLE_TESTING "Enable testing of utf8proc" Off)
diff --git a/src/utf8proc/MANIFEST b/src/utf8proc/MANIFEST
@@ -2,8 +2,8 @@ include/
 include/utf8proc.h
 lib/
 lib/libutf8proc.a
-lib/libutf8proc.so -> libutf8proc.so.3.2.1
-lib/libutf8proc.so.2 -> libutf8proc.so.3.2.1
-lib/libutf8proc.so.3.2.1
+lib/libutf8proc.so -> libutf8proc.so.3.2.2
+lib/libutf8proc.so.2 -> libutf8proc.so.3.2.2
+lib/libutf8proc.so.3.2.2
 lib/pkgconfig/
 lib/pkgconfig/libutf8proc.pc
diff --git a/src/utf8proc/Makefile b/src/utf8proc/Makefile
@@ -24,10 +24,10 @@ SOFLAG = -Wl,-soname
 # Be sure to also update these ABI versions in MANIFEST and CMakeLists.txt!
 MAJOR=3
 MINOR=2
-PATCH=1
+PATCH=2
 
 # api version (also in utf8proc.h and CMakeLists.txt)
-VERSION=2.11.1
+VERSION=2.11.2
 
 OS := $(shell uname)
 ifeq ($(OS),Darwin) # MacOS X
diff --git a/src/utf8proc/NEWS.md b/src/utf8proc/NEWS.md
@@ -1,5 +1,11 @@
 # utf8proc release history #
 
+## Version 2.11.2 ##
+
+2025-11-22
+
+- Fix composition for Hangul character U+11a7 ([#317]).
+
 ## Version 2.11.1 ##
 
 2025-11-13
@@ -477,3 +483,4 @@ Release of version 1.0.1
 [#294]: https://github.com/JuliaStrings/utf8proc/issues/294
 [#295]: https://github.com/JuliaStrings/utf8proc/issues/295
 [#311]: https://github.com/JuliaStrings/utf8proc/issues/311
+[#317]: https://github.com/JuliaStrings/utf8proc/issues/317
diff --git a/src/utf8proc/test/custom.c b/src/utf8proc/test/custom.c
@@ -19,10 +19,7 @@ int main(void)
     utf8proc_uint8_t *output;
     utf8proc_map_custom(input, 0, &output, UTF8PROC_CASEFOLD | UTF8PROC_COMPOSE | UTF8PROC_COMPAT | UTF8PROC_NULLTERM,
                         custom, &thunk_test);
-    printf("mapped \"%s\" -> \"%s\"\n", (char*)input, (char*)output);
-    check(strlen((char*) output) == 6, "incorrect output length");
-    check(!memcmp(correct, output, 7), "incorrect output data");
-    free(output);
+    check_compare("map_custom", input, correct, output, 1);
     printf("map_custom tests SUCCEEDED.\n");
     return 0;
 }
diff --git a/src/utf8proc/test/misc.c b/src/utf8proc/test/misc.c
@@ -7,41 +7,48 @@ static void issue128(void) /* #128 */
     utf8proc_uint8_t input[] = {0x72, 0xcc, 0x87, 0xcc, 0xa3, 0x00}; /* "r\u0307\u0323" */
     utf8proc_uint8_t nfc[] = {0xe1, 0xb9, 0x9b, 0xcc, 0x87, 0x00}; /* "\u1E5B\u0307" */
     utf8proc_uint8_t nfd[] = {0x72, 0xcc, 0xa3, 0xcc, 0x87, 0x00}; /* "r\u0323\u0307" */
-    utf8proc_uint8_t *nfc_out, *nfd_out;
-    nfc_out = utf8proc_NFC(input);
-    printf("NFC \"%s\" -> \"%s\" vs. \"%s\"\n", (char*)input, (char*)nfc_out, (char*)nfc);
-    check(strlen((char*) nfc_out) == 5, "incorrect nfc length");
-    check(!memcmp(nfc, nfc_out, 6), "incorrect nfc data");
-    nfd_out = utf8proc_NFD(input);
-    printf("NFD \"%s\" -> \"%s\" vs. \"%s\"\n", (char*)input, (char*)nfd_out, (char*)nfd);
-    check(strlen((char*) nfd_out) == 5, "incorrect nfd length");
-    check(!memcmp(nfd, nfd_out, 6), "incorrect nfd data");
-    free(nfd_out); free(nfc_out);
+
+    check_compare("NFC", input, nfc, utf8proc_NFC(input), 1);
+    check_compare("NFD", input, nfd, utf8proc_NFD(input), 1);
 }
 
-static void issue102(void) /* #128 */
+static void issue102(void) /* #102 */
 {
     utf8proc_uint8_t input[] = {0x58, 0xe2, 0x81, 0xa5, 0x45, 0xcc, 0x80, 0xc2, 0xad, 0xe1, 0xb4, 0xac, 0x00}; /* "X\u2065E\u0300\u00ad\u1d2c" */
     utf8proc_uint8_t stripna[] = {0x78, 0xc3, 0xa8, 0x61, 0x00}; /* "x\u00e8a" */
     utf8proc_uint8_t correct[] = {0x78, 0xe2, 0x81, 0xa5, 0xc3, 0xa8, 0x61, 0x00}; /* "x\u2065\u00e8a" */
     utf8proc_uint8_t *output;
+
     utf8proc_map(input, 0, &output, UTF8PROC_NULLTERM | UTF8PROC_STABLE |
         UTF8PROC_COMPOSE | UTF8PROC_COMPAT | UTF8PROC_CASEFOLD | UTF8PROC_IGNORE | UTF8PROC_STRIPNA);
-    printf("NFKC_Casefold \"%s\" -> \"%s\" vs. \"%s\"\n", (char*)input, (char*)output, (char*)stripna);
-    check(strlen((char*) output) == 4, "incorrect NFKC_Casefold+stripna length");
-    check(!memcmp(stripna, output, 5), "incorrect NFKC_Casefold+stripna data");
-    free(output);
-    output = utf8proc_NFKC_Casefold(input);
-    printf("NFKC_Casefold \"%s\" -> \"%s\" vs. \"%s\"\n", (char*)input, (char*)output, (char*)correct);
-    check(strlen((char*) output) == 7, "incorrect NFKC_Casefold length");
-    check(!memcmp(correct, output, 8), "incorrect NFKC_Casefold data");
-    free(output);
+    check_compare("NFKC_Casefold+stripna", input, stripna, output, 1);
+    check_compare("NFKC_Casefold", input, correct, utf8proc_NFKC_Casefold(input), 1);
+}
+
+static void issue317(void) /* #317 */
+{
+    utf8proc_uint8_t input[] = {0xec, 0xa3, 0xa0, 0xe1, 0x86, 0xa7, 0x00}; /* "\uc8e0\u11a7" */
+    utf8proc_uint8_t combined[] = {0xec, 0xa3, 0xa, 0x00}; /* "\uc8e1" */
+    utf8proc_int32_t codepoint;
+
+    /* inputs that should *not* be combined* */
+    check_compare("NFC", input, input, utf8proc_NFC(input), 1);
+    utf8proc_encode_char(0x11c3, input+3);
+    check_compare("NFC", input, input, utf8proc_NFC(input), 1);
+
+    /* inputs that *should* be combined (TCOUNT-1 chars starting at TBASE+1) */
+    for (codepoint = 0x11a8; codepoint < 0x11c3; ++codepoint) {
+        utf8proc_encode_char(codepoint, input+3);
+        utf8proc_encode_char(0xc8e0 + (codepoint - 0x11a7), combined);
+        check_compare("NFC", input, combined, utf8proc_NFC(input), 1);
+    }
 }
 
 int main(void)
 {
     issue128();
     issue102();
+    issue317();
 #ifdef UNICODE_VERSION
     printf("Unicode version: Makefile has %s, has API %s\n", UNICODE_VERSION, utf8proc_unicode_version());
     check(!strcmp(UNICODE_VERSION, utf8proc_unicode_version()), "utf8proc_unicode_version mismatch");
diff --git a/src/utf8proc/test/tests.c b/src/utf8proc/test/tests.c
@@ -8,7 +8,10 @@ void check(int cond, const char *format, ...)
 {
      if (!cond) {
           va_list args;
-          fprintf(stderr, "line %zd: ", lineno);
+          if (lineno)
+               fprintf(stderr, "FAILED at line %zd: ", lineno);
+          else
+               fprintf(stderr, "FAILED: ");
           va_start(args, format);
           vfprintf(stderr, format, args);
           va_end(args);
@@ -58,3 +61,40 @@ size_t simple_getline(unsigned char buf[8192], FILE *f) {
     buf[i] = 0;
     return i;
 }
+
+void print_escaped(FILE* f, const utf8proc_uint8_t *utf8) {
+     fprintf(f, "\"");
+     while (*utf8) {
+          utf8proc_int32_t codepoint;
+          utf8 += utf8proc_iterate(utf8, -1, &codepoint);
+          if (codepoint < 0x10000)
+               fprintf(f, "\\u%04x", codepoint);
+          else
+               fprintf(f, "\\U%06x", codepoint);
+     }
+     fprintf(f, "\"");
+}
+
+void print_string_and_escaped(FILE* f, const utf8proc_uint8_t *utf8) {
+     fprintf(f, "\"%s\" (", (const char *) utf8);
+     print_escaped(f, utf8);
+     fprintf(f, ")");
+}
+
+void check_compare(const char *transformation,
+                   const utf8proc_uint8_t *input, const utf8proc_uint8_t *expected,
+                   utf8proc_uint8_t *received, int free_received) {
+     int passed = !strcmp((const char *) received, (const char *) expected);
+     FILE *f = passed ? stdout : stderr;
+     fprintf(f, "%s: %s ", passed ? "PASSED" : "FAILED", transformation);
+     print_string_and_escaped(f, input);
+     fprintf(f, " -> ");
+     print_string_and_escaped(f, received);
+     if (!passed) {
+          fprintf(f, " != expected ");
+          print_string_and_escaped(f, expected);
+     }
+     fprintf(f, "\n");
+     if (free_received) free(received);
+     if (!passed) exit(1);
+}
diff --git a/src/utf8proc/test/tests.h b/src/utf8proc/test/tests.h
@@ -25,3 +25,8 @@ void check(int cond, const char *format, ...);
 size_t skipspaces(const unsigned char *buf, size_t i);
 size_t encode(unsigned char *dest, size_t *dest_len, const unsigned char *buf);
 size_t simple_getline(unsigned char buf[8192], FILE *f);
+void print_escaped(FILE* f, const utf8proc_uint8_t *utf8);
+void print_string_and_escaped(FILE* f, const utf8proc_uint8_t *utf8);
+void check_compare(const char *transformation,
+                   const utf8proc_uint8_t *input, const utf8proc_uint8_t *expected,
+                   utf8proc_uint8_t *received, int free_received);
diff --git a/src/utf8proc/utf8proc.c b/src/utf8proc/utf8proc.c
@@ -684,7 +684,7 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalize_utf32(utf8proc_int32_t *b
             (hangul_sindex % UTF8PROC_HANGUL_TCOUNT) == 0) {
           utf8proc_int32_t hangul_tindex;
           hangul_tindex = current_char - UTF8PROC_HANGUL_TBASE;
-          if (hangul_tindex >= 0 && hangul_tindex < UTF8PROC_HANGUL_TCOUNT) {
+          if (hangul_tindex > 0 && hangul_tindex < UTF8PROC_HANGUL_TCOUNT) {
             *starter += hangul_tindex;
             starter_property = NULL;
             continue;
diff --git a/src/utf8proc/utf8proc.h b/src/utf8proc/utf8proc.h
@@ -73,7 +73,7 @@
 /** The MINOR version number (increased when new functionality is added in a backwards-compatible manner). */
 #define UTF8PROC_VERSION_MINOR 11
 /** The PATCH version (increased for fixes that do not change the API). */
-#define UTF8PROC_VERSION_PATCH 1
+#define UTF8PROC_VERSION_PATCH 2
 /** @} */
 
 #include <stdlib.h>
@@ -121,7 +121,9 @@ typedef bool utf8proc_bool;
 #include <limits.h>
 
 #ifdef UTF8PROC_STATIC
-#  define UTF8PROC_DLLEXPORT
+#  ifndef UTF8PROC_DLLEXPORT
+#    define UTF8PROC_DLLEXPORT
+#  endif
 #else
 #  ifdef _WIN32
 #    ifdef UTF8PROC_EXPORTS
@@ -748,6 +750,10 @@ UTF8PROC_DLLEXPORT const char *utf8proc_category_string(utf8proc_int32_t codepoi
  *
  * @note The memory of the new UTF-8 string will have been allocated
  * with `malloc`, and should therefore be deallocated with `free`.
+ *
+ * @note `utf8proc_map` simply calls `utf8proc_decompose` followed by `utf8proc_reencode`,
+ * and applications requiring greater control over memory allocation should instead call
+ * those two functions directly.
  */
 UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_map(
   const utf8proc_uint8_t *str, utf8proc_ssize_t strlen, utf8proc_uint8_t **dstptr, utf8proc_option_t options

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION ${CMAKE_VERSION}) # this file comes with cmake`
`5`	`5`
`6`	`6`	`# Make file names absolute:`
`7`	`7`	`#`
`8`		`-get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.1.tar.gz" ABSOLUTE)`
	`8`	`+get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/utf8proc/v2.11.2.tar.gz" ABSOLUTE)`
`9`	`9`	`get_filename_component(directory "/home/runner/work/deps/deps/neovim/deps/build/src/utf8proc" ABSOLUTE)`
`10`	`10`
`11`	`11`	`message(VERBOSE "extracting...`