Bump utf8proc to 2.9.0

benoit-pierre · Oct 26, 2023 · 1526a40 · 1526a40
1 parent 1c58f08
commit 1526a40
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/Makefile.defs b/Makefile.defs
@@ -811,7 +811,7 @@ LIBUNIBREAK_BUILD_DIR=$(THIRDPARTY_DIR)/libunibreak/build/$(MACHINE)
 LIBUNIBREAK_DIR=$(CURDIR)/$(LIBUNIBREAK_BUILD_DIR)/libunibreak-prefix/src/libunibreak-build
 LIBUNIBREAK_LIB_LINK_FLAG=$(if $(WIN32),-l:libunibreak-5.dll,$(if $(DARWIN),$(LIBUNIBREAK_LIB),-l:libunibreak.so.5))
 
-UTF8PROC_LIB_EXT=$(if $(WIN32),-2.dll,$(if $(DARWIN),.2.dylib,.so.2))
+UTF8PROC_LIB_EXT=$(if $(WIN32),-3.dll,$(if $(DARWIN),.3.dylib,.so.3))
 UTF8PROC_LIB=$(OUTPUT_DIR)/libs/libutf8proc$(UTF8PROC_LIB_EXT)
 UTF8PROC_BUILD_DIR=$(THIRDPARTY_DIR)/utf8proc/build/$(MACHINE)
 UTF8PROC_DIR=$(CURDIR)/$(UTF8PROC_BUILD_DIR)/utf8proc-prefix/src/utf8proc

diff --git a/ffi/utf8proc.lua b/ffi/utf8proc.lua
@@ -14,11 +14,11 @@ require("ffi/utf8proc_h")
 
 local libutf8proc
 if ffi.os == "Windows" then
-    libutf8proc = ffi.load("libs/libutf8proc-2.dll")
+    libutf8proc = ffi.load("libs/libutf8proc-3.dll")
 elseif ffi.os == "OSX" then
-    libutf8proc = ffi.load("libs/libutf8proc.2.dylib")
+    libutf8proc = ffi.load("libs/libutf8proc.3.dylib")
 else
-    libutf8proc = ffi.load("libs/libutf8proc.so.2")
+    libutf8proc = ffi.load("libs/libutf8proc.so.3")
 end
 
 local Utf8Proc = {}

diff --git a/ffi/utf8proc_h.lua b/ffi/utf8proc_h.lua
@@ -51,7 +51,8 @@ struct utf8proc_property_struct {
   unsigned int control_boundary : 1;
   unsigned int charwidth : 2;
   unsigned int pad : 2;
-  unsigned char boundclass;
+  unsigned int boundclass : 6;
+  unsigned int indic_conjunct_break : 2;
 };
 typedef struct utf8proc_property_struct utf8proc_property_t;
 typedef enum {

diff --git a/thirdparty/kpvcrlib/CMakeLists.txt b/thirdparty/kpvcrlib/CMakeLists.txt
@@ -108,7 +108,7 @@ if(DEFINED ENV{WIN32})
     find_library(HARFBUZZ_LIB NAMES "harfbuzz-0" PATHS $ENV{LIBS_DIR})
     find_library(FRIBIDI_LIB NAMES "fribidi-0" PATHS $ENV{LIBS_DIR})
     find_library(LIBUNIBREAK_LIB NAMES "libunibreak-5" PATHS $ENV{LIBS_DIR})
-    find_library(UTF8PROC_LIB NAMES "utf8proc-2" PATHS $ENV{LIBS_DIR})
+    find_library(UTF8PROC_LIB NAMES "utf8proc-3" PATHS $ENV{LIBS_DIR})
     find_library(JPEG_LIB NAMES "jpeg-8" PATHS $ENV{LIBS_DIR})
     find_library(LUNASVG_LIB NAMES "lunasvg" PATHS $ENV{LIBS_DIR})
     find_library(LIBWEBP_LIB NAMES "webp-7" PATHS $ENV{LIBS_DIR})

diff --git a/thirdparty/utf8proc/CMakeLists.txt b/thirdparty/utf8proc/CMakeLists.txt
@@ -16,7 +16,7 @@ ep_get_binary_dir(BINARY_DIR)
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME
     https://github.com/JuliaStrings/utf8proc.git
-    v2.8.0
+    v2.9.0
     ${SOURCE_DIR}
 )