diff --git a/ports/libzim/cross-builds.diff b/ports/libzim/cross-builds.diff index f5f0626561..19a0340e82 100644 --- a/ports/libzim/cross-builds.diff +++ b/ports/libzim/cross-builds.diff @@ -1,10 +1,10 @@ diff --git a/meson.build b/meson.build -index c75d103..ad5e856 100644 +index add8aa0..1f085d5 100644 --- a/meson.build +++ b/meson.build @@ -1,9 +1,9 @@ project('libzim', ['c', 'cpp'], - version : '9.7.0', + version : '9.8.0', 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 c75d103..ad5e856 100644 add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp') endif -@@ -67,7 +67,7 @@ else +@@ -73,7 +73,7 @@ else endif compiler = meson.get_compiler('cpp') diff --git a/ports/libzim/dllexport.diff b/ports/libzim/dllexport.diff index 212eb9e541..0fd515946b 100644 --- a/ports/libzim/dllexport.diff +++ b/ports/libzim/dllexport.diff @@ -1,8 +1,8 @@ diff --git a/include/zim/zim.h b/include/zim/zim.h -index 80e8596..631cfab 100644 +index d68d4e3..1238029 100644 --- a/include/zim/zim.h +++ b/include/zim/zim.h -@@ -35,8 +35,10 @@ +@@ -36,8 +36,10 @@ #include diff --git a/ports/libzim/portfile.cmake b/ports/libzim/portfile.cmake index a2700f8d32..383fd39bb4 100644 --- a/ports/libzim/portfile.cmake +++ b/ports/libzim/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openzim/libzim REF "${VERSION}" - SHA512 3f635eaf4363bf12b92f12a4d089883f10bb8cfe4c572876ab410d88273f8a44455ce93ef74bcb0836051ea3dd51d39f25f703d6c01d6599cce0a8801bc09fba + SHA512 dbddee0a7beadc041df416e3ecc2c0dba4afacfb4a5245dd02b4466d582979d9eeb8e027e095bf719f856c95563653e6d6d3b2fae59315d997f3740eac4b392c HEAD_REF main PATCHES cross-builds.diff diff --git a/ports/libzim/subdirs.diff b/ports/libzim/subdirs.diff index a30a1444fa..70f4a82dd0 100644 --- a/ports/libzim/subdirs.diff +++ b/ports/libzim/subdirs.diff @@ -1,16 +1,16 @@ diff --git a/meson.build b/meson.build -index d946c49..eded01d 100644 +index 1f085d5..f360501 100644 --- a/meson.build +++ b/meson.build -@@ -90,6 +90,7 @@ subdir('include') - subdir('scripts') - subdir('static') +@@ -102,6 +102,7 @@ subdir('static') subdir('src') + # The example project demonstrates writer usage + # so only include it if the writer is also present +if false - if get_option('examples') + if get_option('examples') and not get_option('without_writer') subdir('examples') endif -@@ -97,6 +98,7 @@ subdir('test') +@@ -111,6 +112,7 @@ endif if get_option('doc') subdir('docs') endif diff --git a/ports/libzim/vcpkg.json b/ports/libzim/vcpkg.json index ce987efaa0..a1f4d092fc 100644 --- a/ports/libzim/vcpkg.json +++ b/ports/libzim/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libzim", - "version": "9.7.0", + "version": "9.8.0", "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", diff --git a/versions/baseline.json b/versions/baseline.json index 9357035141..70bbabc849 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6089,7 +6089,7 @@ "port-version": 0 }, "libzim": { - "baseline": "9.7.0", + "baseline": "9.8.0", "port-version": 0 }, "libzip": { diff --git a/versions/l-/libzim.json b/versions/l-/libzim.json index 045769be0d..2987d67ad4 100644 --- a/versions/l-/libzim.json +++ b/versions/l-/libzim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e92226ca26dc4a480d7adb958ae003be8eb440e", + "version": "9.8.0", + "port-version": 0 + }, { "git-tree": "28d90812c3709d2a019e23316cf4d55b92494701", "version": "9.7.0",