From 752f4b944bd66f712562b05b58dd5724e89183c5 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Mon, 24 Aug 2026 16:19:30 +0200 Subject: [PATCH] build(deps): bump unibilium to v2.1.4 Build system adaptations to upstream changes: * added `build.zig` * `CMakeLists.txt` with (opt-out) support for docs, tests, tools (disabled) --- build.zig.zon | 5 ++++- cmake.deps/cmake/BuildUnibilium.cmake | 7 +++++- cmake.deps/deps.txt | 4 ++-- deps/unibilium/build.zig | 32 --------------------------- deps/unibilium/build.zig.zon | 14 ------------ scripts/bump_deps.lua | 1 - 6 files changed, 12 insertions(+), 51 deletions(-) delete mode 100644 deps/unibilium/build.zig delete mode 100644 deps/unibilium/build.zig.zon diff --git a/build.zig.zon b/build.zig.zon index d466fb7d5fc..5bf61b2375d 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -35,7 +35,10 @@ .lazy = true, }, .utf8proc = .{ .path = "./deps/utf8proc/", .lazy = true }, - .unibilium = .{ .path = "./deps/unibilium/", .lazy = true }, + .unibilium = .{ + .url = "git+https://github.com/neovim/unibilium?ref=v2.1.4#b0567db6a30898d8b25d206223960a8be2795fa8", + .hash = "unibilium-2.1.4-INdqiXdRAQAKcGtWWj0Pb85VOTw07W3TDjMv6jrwUXgx", + }, .uncrustify = .{ .url = "git+https://codeberg.org/allyourcodebase/uncrustify#2cdf880e4ffbe438a7946368cd45fca2df9f0f7a", .hash = "uncrustify-0.83.0-qkVd7cVCAADAg1kS3ctVBhY2gkxEIs-W8wgurLadbgC-", diff --git a/cmake.deps/cmake/BuildUnibilium.cmake b/cmake.deps/cmake/BuildUnibilium.cmake index 7ce4b5fbf2e..53835136358 100644 --- a/cmake.deps/cmake/BuildUnibilium.cmake +++ b/cmake.deps/cmake/BuildUnibilium.cmake @@ -1,5 +1,10 @@ +set(UNIBILIUM_CMAKE_ARGS + -D BUILD_MAN_PAGES=OFF + -D BUILD_TESTS=OFF + -D BUILD_TOOLS=OFF) + get_externalproject_options(unibilium ${DEPS_IGNORE_SHA}) ExternalProject_Add(unibilium DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/unibilium - CMAKE_ARGS ${DEPS_CMAKE_ARGS} + CMAKE_ARGS ${DEPS_CMAKE_ARGS} ${UNIBILIUM_CMAKE_ARGS} ${EXTERNALPROJECT_OPTIONS}) diff --git a/cmake.deps/deps.txt b/cmake.deps/deps.txt index 9326095eb83..ea1a19f200f 100644 --- a/cmake.deps/deps.txt +++ b/cmake.deps/deps.txt @@ -8,8 +8,8 @@ LUAJIT_SHA256 512cdb23dafa39c6247763ae15f29341734b1596067b067db0c0387bbebc7c55 LUA_URL https://www.lua.org/ftp/lua-5.1.5.tar.gz LUA_SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 -UNIBILIUM_URL https://github.com/neovim/unibilium/archive/v2.1.2.tar.gz -UNIBILIUM_SHA256 370ecb07fbbc20d91d1b350c55f1c806b06bf86797e164081ccc977fc9b3af7a +UNIBILIUM_URL https://github.com/neovim/unibilium/archive/v2.1.4.tar.gz +UNIBILIUM_SHA256 7360907bcf79ba49f6fc4a504767ff86e93ab9018477026fcc70d5ab77e1f2c1 LUV_URL https://github.com/luvit/luv/archive/1.52.1-0.tar.gz LUV_SHA256 e8b8774b31d24be4fcf2b021b90599ecccc8e476c61efcc59c3c10cab813a885 diff --git a/deps/unibilium/build.zig b/deps/unibilium/build.zig deleted file mode 100644 index d3707d2ae5a..00000000000 --- a/deps/unibilium/build.zig +++ /dev/null @@ -1,32 +0,0 @@ -const std = @import("std"); - -pub fn build(b: *std.Build) !void { - const target = b.standardTargetOptions(.{}); - const optimize = b.standardOptimizeOption(.{}); - - const lib = b.addLibrary(.{ - .name = "unibilium", - .linkage = .static, - .root_module = b.createModule(.{ - .target = target, - .optimize = optimize, - }), - }); - - if (b.lazyDependency("unibilium", .{})) |upstream| { - var root_module = lib.root_module; - root_module.addIncludePath(upstream.path("")); - - lib.installHeader(upstream.path("unibilium.h"), "unibilium.h"); - - root_module.link_libc = true; - - root_module.addCSourceFiles(.{ .root = upstream.path(""), .files = &.{ - "unibilium.c", - "uninames.c", - "uniutil.c", - }, .flags = &.{"-DTERMINFO_DIRS=\"/etc/terminfo:/usr/share/terminfo\""} }); - } - - b.installArtifact(lib); -} diff --git a/deps/unibilium/build.zig.zon b/deps/unibilium/build.zig.zon deleted file mode 100644 index fddea8e6967..00000000000 --- a/deps/unibilium/build.zig.zon +++ /dev/null @@ -1,14 +0,0 @@ -.{ - .name = .unibilium, - .fingerprint = 0x1d1baa4896ad720, - .version = "2.1.2", - .paths = .{""}, - - .dependencies = .{ - .unibilium = .{ - .url = "git+https://github.com/neovim/unibilium?ref=v2.1.2#bfcb0350129dd76893bc90399cf37c45812268a2", - .hash = "N-V-__8AADO1CgCggvx73yptnBlXbEm7TjOSO6VGIqc0CvYR", - .lazy = true, - }, - }, -} diff --git a/scripts/bump_deps.lua b/scripts/bump_deps.lua index e702c53f9c1..dfad66f6548 100755 --- a/scripts/bump_deps.lua +++ b/scripts/bump_deps.lua @@ -32,7 +32,6 @@ local zig_mode = { uncrustify = false, wasmtime = false, libuv = false, - unibilium = 'nested', utf8proc = 'nested', }