[libzim] update to 9.4.1 (#49229)

This commit is contained in:
toge
2026-01-06 04:13:23 +09:00
committed by GitHub
parent 6eedb5a994
commit 8271066c9b
6 changed files with 12 additions and 21 deletions

View File

@@ -1,10 +1,10 @@
diff --git a/meson.build b/meson.build
index 71300d3..25bbf9f 100644
index 92bb537..7183df3 100644
--- a/meson.build
+++ b/meson.build
@@ -1,9 +1,9 @@
project('libzim', ['c', 'cpp'],
version : '9.4.0',
version : '9.4.1',
license : 'GPL2',
- default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true'])
+ default_options : ['c_std=c11', 'cpp_std=c++17'])
@@ -14,7 +14,7 @@ index 71300d3..25bbf9f 100644
add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp')
endif
@@ -69,7 +69,7 @@ else
@@ -68,7 +68,7 @@ else
endif
compiler = meson.get_compiler('cpp')

View File

@@ -2,13 +2,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO openzim/libzim
REF "${VERSION}"
SHA512 de1588addec8b2398912a99cc5b46c1fa156d1ce01d2db1544b40c966bf305d859a52b51b8532d74cdba3c4e3392a3f4be68f4e8ac93392c56c3a24fa6b135c8
SHA512 acf11e4fe980adc1c0be760dab4d0f5a8d3da20579d918f627d439acc3266f12bae3f033c2f3f98009f6e1a20fc35190ca625b46fc581cb801594a8943e83d9d
HEAD_REF main
PATCHES
cross-builds.diff
dllexport.diff
subdirs.diff
remove-sortpp-pass.diff # https://github.com/openzim/libzim/pull/1017
)
set(EXTRA_OPTIONS "")

View File

@@ -1,12 +0,0 @@
diff --git a/meson.build b/meson.build
index adca804..1b2970b 100644
--- a/meson.build
+++ b/meson.build
@@ -61,7 +61,6 @@ public_conf.set('LIBZIM_WITH_XAPIAN', xapian_dep.found())
if build_machine.system() == 'windows'
win_deps = declare_dependency(
- compile_args: ['-DSORTPP_PASS'],
link_args: ['-lRpcrt4', '-lWs2_32', '-lwinmm', '-lshlwapi']
)
else

View File

@@ -1,7 +1,6 @@
{
"name": "libzim",
"version": "9.4.0",
"port-version": 1,
"version": "9.4.1",
"description": "The Libzim is the reference implementation for the ZIM file format. It's a software library to read and write ZIM files on many systems and architectures. More information about the ZIM format and the openZIM project at https://openzim.org/.",
"homepage": "https://github.com/openzim/libzim",
"license": "GPL-2.0-or-later",

View File

@@ -5865,8 +5865,8 @@
"port-version": 0
},
"libzim": {
"baseline": "9.4.0",
"port-version": 1
"baseline": "9.4.1",
"port-version": 0
},
"libzip": {
"baseline": "1.11.4",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bc1131eee13cfb535a800694a48b234ae0f0ca8b",
"version": "9.4.1",
"port-version": 0
},
{
"git-tree": "d335c691779ee94ea8c9e7e145a4eb4439304c16",
"version": "9.4.0",