From 5beea24117021c22a45536d228fb1b708b58d30f Mon Sep 17 00:00:00 2001 From: Ivan Ukhov Date: Sat, 23 Aug 2025 06:24:07 +0200 Subject: [PATCH 1/3] Make it compile on GCC 15 --- .gitmodules | 2 +- vendor/woff2/source | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index dcab5ca..62a88ac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,4 @@ url = https://github.com/kseo/sfnt2woff.git [submodule "vendor/woff2/source"] path = vendor/woff2/source - url = https://github.com/google/woff2.git + url = https://github.com/copies/woff2.git diff --git a/vendor/woff2/source b/vendor/woff2/source index 0f4d304..8ae687e 160000 --- a/vendor/woff2/source +++ b/vendor/woff2/source @@ -1 +1 @@ -Subproject commit 0f4d304faa1c62994536dc73510305c7357da8d4 +Subproject commit 8ae687ef2aafce19082cccf356070e146d2fe666 From 0dca51011867e07a4ff4f8a0a9bfa6034e5e3d8b Mon Sep 17 00:00:00 2001 From: Ivan Ukhov Date: Sat, 23 Aug 2025 06:27:14 +0200 Subject: [PATCH 2/3] Bump the version number --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 47a1f88..670b2b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "woff" -version = "0.6.1" +version = "0.6.2" edition = "2021" license = "Apache-2.0 OR MIT" authors = ["Ivan Ukhov "] From 67406622a60a632b6feb266ea2dc763f766e9a85 Mon Sep 17 00:00:00 2001 From: Ivan Ukhov Date: Sat, 23 Aug 2025 06:28:13 +0200 Subject: [PATCH 3/3] Switch to the 2024 edition --- Cargo.toml | 2 +- src/version1/ffi.rs | 2 +- src/version2/ffi.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 670b2b3..fdad77b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "woff" version = "0.6.2" -edition = "2021" +edition = "2024" license = "Apache-2.0 OR MIT" authors = ["Ivan Ukhov "] description = "The package provides a converter for Web Open Font Format." diff --git a/src/version1/ffi.rs b/src/version1/ffi.rs index b2cad5a..57b4047 100644 --- a/src/version1/ffi.rs +++ b/src/version1/ffi.rs @@ -1,4 +1,4 @@ -extern "C" { +unsafe extern "C" { pub fn woffEncode( sfntData: *const u8, sfntLen: u32, diff --git a/src/version2/ffi.rs b/src/version2/ffi.rs index 33f2176..1926163 100644 --- a/src/version2/ffi.rs +++ b/src/version2/ffi.rs @@ -1,4 +1,4 @@ -extern "C" { +unsafe extern "C" { pub fn ComputeTTFToWOFF2Size( data: *const u8, length: libc::size_t,