From c0e1737c7ed1246f55b7ab03d578d0d8baf2a7e7 Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Mon, 14 Feb 2022 12:24:24 +0530 Subject: [PATCH 1/5] libzim: update to 7.2.0 --- common/shlibs | 2 +- srcpkgs/libzim/patches/execinfo.patch | 20 --------- .../libzim/patches/remove-debug-asserts.patch | 41 +++++++++++++++++++ srcpkgs/libzim/template | 18 ++++++-- 4 files changed, 56 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/libzim/patches/execinfo.patch create mode 100644 srcpkgs/libzim/patches/remove-debug-asserts.patch diff --git a/common/shlibs b/common/shlibs index 0c60260b4642..46720a76ceba 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3164,7 +3164,7 @@ libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1 libhackrf.so.0 libhackrf-2017.02.1_1 libtecla.so.1 libtecla-1.6.3_1 libtecla_r.so.1 libtecla-1.6.3_1 -libzim.so.6 libzim-6.0.1_1 +libzim.so.7 libzim-7.2.0_1 libkiwix.so.9 kiwix-lib-9.0.1_1 libaria2.so.0 libaria2-1.35.0_3 librpm.so.9 librpm-4.15.0_1 diff --git a/srcpkgs/libzim/patches/execinfo.patch b/srcpkgs/libzim/patches/execinfo.patch deleted file mode 100644 index f3a1234562ea..000000000000 --- a/srcpkgs/libzim/patches/execinfo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/debug.h 2018-03-27 11:19:24.000000000 +0200 -+++ b/src/debug.h 2018-03-27 11:19:24.000000000 +0200 -@@ -24,7 +24,7 @@ - # define ASSERT(left, operator, right) (void(0)) - #else - --#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) -+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && defined(__GLIBC__) - #include - #endif - -@@ -35,7 +35,7 @@ - vara << "[" << a << "] " << op << " " << varb << "[" << b << "]" << - std::endl; - --#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) -+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && defined(__GLIBC__) - void *callstack[64]; - size_t size; - size = backtrace(callstack, 64); diff --git a/srcpkgs/libzim/patches/remove-debug-asserts.patch b/srcpkgs/libzim/patches/remove-debug-asserts.patch new file mode 100644 index 000000000000..72e8dc5773d8 --- /dev/null +++ b/srcpkgs/libzim/patches/remove-debug-asserts.patch @@ -0,0 +1,41 @@ +diff --git a/test/reader.cpp b/test/reader.cpp +index 183d857..bc43da0 100644 +--- a/test/reader.cpp ++++ b/test/reader.cpp +@@ -88,12 +88,6 @@ TEST(FileReader, shouldJustWork) + ASSERT_EQ('z', reader->read(offset_t(25))); + reader->read(out, offset_t(25), zsize_t(1)); + ASSERT_EQ(0, memcmp(out, "zlmn", 4)); +- +- // Fail if we try to read out of the file. +- ASSERT_THROW(reader->read(offset_t(26)), std::runtime_error); +- ASSERT_THROW(reader->read(out, offset_t(25), zsize_t(4)), std::runtime_error); +- ASSERT_THROW(reader->read(out, offset_t(30), zsize_t(4)), std::runtime_error); +- ASSERT_THROW(reader->read(out, offset_t(30), zsize_t(0)), std::runtime_error); + } + } + +@@ -123,12 +117,6 @@ TEST(FileReader, subReader) + ASSERT_EQ('x', subReader->read(offset_t(19))); + subReader->read(out, offset_t(19), zsize_t(1)); + ASSERT_EQ(0, memcmp(out, "xkgh", 4)); +- +- // Fail if we try to read out of the file. +- ASSERT_THROW(subReader->read(offset_t(20)), std::runtime_error); +- ASSERT_THROW(subReader->read(out, offset_t(18), zsize_t(4)), std::runtime_error); +- ASSERT_THROW(subReader->read(out, offset_t(30), zsize_t(4)), std::runtime_error); +- ASSERT_THROW(subReader->read(out, offset_t(30), zsize_t(0)), std::runtime_error); + } + } + +@@ -142,10 +130,7 @@ TEST(FileReader, zeroReader) + ASSERT_EQ(offset_t(baseOffset), reader->offset()); + ASSERT_EQ(zsize_t(0), reader->size()); + +- // Fail if we try to read out of the file. +- ASSERT_THROW(reader->read(offset_t(0)), std::runtime_error); + char out[4] = {0, 0, 0, 0}; +- ASSERT_THROW(reader->read(out, offset_t(0), zsize_t(4)), std::runtime_error); + + // Ok to read 0 byte on a 0 sized reader + reader->read(out, offset_t(0), zsize_t(0)); diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template index 910e099870b8..70d7a8f26400 100644 --- a/srcpkgs/libzim/template +++ b/srcpkgs/libzim/template @@ -1,7 +1,8 @@ # Template file for 'libzim' pkgname=libzim -version=6.3.2 -revision=2 +version=7.2.0 +revision=1 +_testing_suite_version=0.4 build_style=meson hostmakedepends="pkg-config git" makedepends="liblzma-devel $(vopt_if zlib zlib-devel) @@ -12,13 +13,22 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://wiki.openzim.org/wiki/OpenZIM" changelog="https://github.com/openzim/libzim/blob/${version}/ChangeLog" -distfiles="https://github.com/openzim/libzim/archive/${version}.tar.gz" -checksum=648fb5af65dd28a6b221b9294217939bf5abf929d706e7323ebb4196849a923c +distfiles=" + https://github.com/openzim/libzim/archive/${version}.tar.gz + https://github.com/openzim/zim-testing-suite/releases/download/v${_testing_suite_version}/zim-testing-suite-${_testing_suite_version}.tar.gz" +checksum=" + 9dbcff2c0e21472a5ff7ca10c761c5ae07008a35c143df6c6274971bb536072d + c4c8f0c157b21b8e0c81ce016d2a92b528b2972acb76d5a5d9e04d934fa2e742" replaces="libzim-tools>=0" build_options="xapian zlib zstd" build_options_default="xapian zlib zstd" +post_extract() { + mkdir -p "${wrksrc}/build/test" + mv -f "${wrksrc}/../zim-testing-suite-${_testing_suite_version}" "${wrksrc}/build/test/data" +} + libzim-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision} From 048bbd7475a78c0b4e8b0096602ab6d9ea4ce488 Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Mon, 14 Feb 2022 12:36:57 +0530 Subject: [PATCH 2/5] zim-tools: update to 3.1.0 --- srcpkgs/zim-tools/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zim-tools/template b/srcpkgs/zim-tools/template index aeed97a5a7c1..e11183ffc2a9 100644 --- a/srcpkgs/zim-tools/template +++ b/srcpkgs/zim-tools/template @@ -1,14 +1,15 @@ # Template file for 'zim-tools' pkgname=zim-tools -version=2.1.0 +version=3.1.0 revision=1 build_style=meson hostmakedepends="pkg-config" makedepends="libzim-devel xapian-core-devel icu-devel -gumbo-parser-devel docopt.cpp-devel file-devel" +gumbo-parser-devel docopt.cpp-devel file-devel +Mustache" short_desc="Various ZIM command line tools" maintainer="John " license="GPL-3.0-or-later" homepage="http://www.openzim.org" distfiles="https://github.com/openzim/zim-tools/archive/${version}.tar.gz" -checksum=f579c8ccca555a8b25bac799efc361f18a2a9a5152af5fc84eb3dc90c5ed70a2 +checksum=b910e601bcb15f8252b777b144355a2fbf09f3194da48638791c16ea84573268 From 5b5d4db460b526859b19105c12d206ab383cae86 Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Mon, 14 Feb 2022 13:23:32 +0530 Subject: [PATCH 3/5] kiwix-lib: update to 10.0.1 --- common/shlibs | 2 +- srcpkgs/kiwix-lib/template | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 46720a76ceba..9388091e0d60 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3165,7 +3165,7 @@ libhackrf.so.0 libhackrf-2017.02.1_1 libtecla.so.1 libtecla-1.6.3_1 libtecla_r.so.1 libtecla-1.6.3_1 libzim.so.7 libzim-7.2.0_1 -libkiwix.so.9 kiwix-lib-9.0.1_1 +libkiwix.so.10 kiwix-lib-10.0.1_1 libaria2.so.0 libaria2-1.35.0_3 librpm.so.9 librpm-4.15.0_1 librpmsign.so.9 librpmsign-4.15.0_1 diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template index 2daaa6fd404b..6d926bde4249 100644 --- a/srcpkgs/kiwix-lib/template +++ b/srcpkgs/kiwix-lib/template @@ -1,7 +1,8 @@ # Template file for 'kiwix-lib' pkgname=kiwix-lib -version=9.4.1 -revision=3 +version=10.0.1 +revision=1 +wrksrc=libkiwix-${version} build_style=meson hostmakedepends="pkg-config" makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel @@ -11,8 +12,8 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://www.kiwix.org/" changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog" -distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz" -checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202 +distfiles="https://github.com/kiwix/libkiwix/archive/refs/tags/${version}.tar.gz" +checksum=b15931abbced53cea25acb5ef53be6e9b0bb3806e06e146d890de530f7a72237 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then makedepends+=" libatomic-devel" From 21aa1c70c2c2c287974cecee2c8dbb3edf3d9519 Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Mon, 14 Feb 2022 13:25:58 +0530 Subject: [PATCH 4/5] kiwix-tools: update to 3.2.0 --- srcpkgs/kiwix-tools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template index e9f0841b61ae..3a6933c0eb8f 100644 --- a/srcpkgs/kiwix-tools/template +++ b/srcpkgs/kiwix-tools/template @@ -1,7 +1,7 @@ # Template file for 'kiwix-tools' pkgname=kiwix-tools -version=3.1.2 -revision=2 +version=3.2.0 +revision=1 build_style=meson hostmakedepends="pkg-config" makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="https://kiwix.org" changelog="https://github.com/kiwix/kiwix-tools/blob/${version}/Changelog" distfiles="https://github.com/kiwix/kiwix-tools/archive/${version}.tar.gz" -checksum=86325ec31976d40357f08c520806cf223fa1b0a5edb02ad106c2a0d6746ca364 +checksum=ba106c2135514d53154c7e869c5564424f889bc50374f9d2b769a09d804c3cf2 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then makedepends+=" libatomic-devel" From d643f1721105b7346f67fe4efed8acd6044872e5 Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Wed, 16 Feb 2022 13:12:36 +0530 Subject: [PATCH 5/5] zimwriterfs: redirect to zim-tools --- libzim-musl-logs.txt | 403 +++++++++++++++++++++++++++++++++++ srcpkgs/zimwriterfs/template | 11 +- 2 files changed, 406 insertions(+), 8 deletions(-) create mode 100644 libzim-musl-logs.txt diff --git a/libzim-musl-logs.txt b/libzim-musl-logs.txt new file mode 100644 index 000000000000..a123595a93d5 --- /dev/null +++ b/libzim-musl-logs.txt @@ -0,0 +1,403 @@ + void-packages on  kiwix [$⇡] >>> ./xbps-src -a x86_64-musl pkg libzim +=> xbps-src: updating repositories for host (x86_64)... +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/x86_64-repodata' ... +ERROR: [reposync] failed to fetch file `https://alpha.de.repo.voidlinux.org/current/x86_64-repodata': Transient resolver failure +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/nonfree/x86_64-repodata' ... +ERROR: [reposync] failed to fetch file `https://alpha.de.repo.voidlinux.org/current/nonfree/x86_64-repodata': Transient resolver failure +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/debug/x86_64-repodata' ... +ERROR: [reposync] failed to fetch file `https://alpha.de.repo.voidlinux.org/current/debug/x86_64-repodata': Transient resolver failure +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/multilib/x86_64-repodata' ... +ERROR: [reposync] failed to fetch file `https://alpha.de.repo.voidlinux.org/current/multilib/x86_64-repodata': Transient resolver failure +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ... +ERROR: [reposync] failed to fetch file `https://alpha.de.repo.voidlinux.org/current/multilib/nonfree/x86_64-repodata': Transient resolver failure +=> xbps-src: updating repositories for target (x86_64-musl)... +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/musl/x86_64-musl-repodata' ... +ERROR: [reposync] failed to fetch file `https://alpha.de.repo.voidlinux.org/current/musl/x86_64-musl-repodata': Transient resolver failure +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/musl/nonfree/x86_64-musl-repodata' ... +ERROR: [reposync] failed to fetch file `https://alpha.de.repo.voidlinux.org/current/musl/nonfree/x86_64-musl-repodata': Transient resolver failure +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/musl/debug/x86_64-musl-repodata' ... +ERROR: [reposync] failed to fetch file `https://alpha.de.repo.voidlinux.org/current/musl/debug/x86_64-musl-repodata': Transient resolver failure +=> xbps-src: updating software in / masterdir... +=> xbps-src: cleaning up / masterdir... +=> libzim-7.2.0_1: removing autodeps, please wait... +=> libzim-7.2.0_1: removing autocrossdeps, please wait... +=> libzim-7.2.0_1: the following build options are set: + xapian: (ON) + zlib: (ON) + zstd: Enable support for ZSTD compression format (ON) +=> libzim-7.2.0_1: building [meson] for x86_64-musl... + [host] pkg-config-0.29.2_3: found (https://alpha.de.repo.voidlinux.org/current) + [host] git-2.35.1_1: found (https://alpha.de.repo.voidlinux.org/current) + [host] meson-0.60.3_1: found (https://alpha.de.repo.voidlinux.org/current) + [target] liblzma-devel-5.2.5_2: found (https://alpha.de.repo.voidlinux.org/current/musl) + [target] zlib-devel-1.2.11_4: found (https://alpha.de.repo.voidlinux.org/current/musl) + [target] xapian-core-devel-1.4.18_2: found (https://alpha.de.repo.voidlinux.org/current/musl) + [target] icu-devel-70.1_1: found (https://alpha.de.repo.voidlinux.org/current/musl) + [target] libzstd-devel-1.5.2_1: found (https://alpha.de.repo.voidlinux.org/current/musl) + [target] gtest-devel-1.11.0_1: found (https://alpha.de.repo.voidlinux.org/current/musl) + [runtime] libzim-7.2.0_1: not found (self, ignored) + [runtime] libzstd-devel-1.5.2_1: found (https://alpha.de.repo.voidlinux.org/current/musl) + [runtime] zlib-devel-1.2.11_4: found (https://alpha.de.repo.voidlinux.org/current/musl) + [runtime] liblzma-devel-5.2.5_2: found (https://alpha.de.repo.voidlinux.org/current/musl) +=> libzim-7.2.0_1: installing host dependencies: pkg-config-0.29.2_3 git-2.35.1_1 meson-0.60.3_1 ... +=> libzim-7.2.0_1: installing target dependencies: liblzma-devel-5.2.5_2 zlib-devel-1.2.11_4 xapian-core-devel-1.4.18_2 icu-devel-70.1_1 libzstd-devel-1.5.2_1 gtest-devel-1.11.0_1 ... +=> libzim-7.2.0_1: removing autodeps, please wait... +=> libzim-7.2.0_1: removing autocrossdeps, please wait... +=> ERROR: libzim-7.2.0_1: failed to install target dependencies! (error 14) +ERROR: [trans] failed to download `icu-libs-70.1_1' signature from `https://alpha.de.repo.voidlinux.org/current/musl': Transient resolver failure +Transaction failed! see above for errors. +6 packages will be downloaded: + +14 packages will be installed: + + liblzma-5.2.5_2 + liblzma-devel-5.2.5_2 + zlib-1.2.11_4 + zlib-devel-1.2.11_4 + util-linux-common-2.37.2_1 + libuuid-2.37.2_1 + libxapian-1.4.18_2 + xapian-core-devel-1.4.18_2 + icu-libs-70.1_1 + icu-devel-70.1_1 + libzstd-1.5.2_1 + libzstd-devel-1.5.2_1 + gtest-1.11.0_1 + gtest-devel-1.11.0_1 + +Size to download: 16MB +Size required on disk: 65MB +Space available on disk: 336GB + + +[*] Downloading packages +=> ERROR: Please see above for the real error, exiting... + + void-packages on  kiwix [$⇡] took 6s ✗✗✗ ./xbps-src -a x86_64-musl pkg libzim +=> xbps-src: updating repositories for host (x86_64)... +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/x86_64-repodata' ... +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/nonfree/x86_64-repodata' ... +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/debug/x86_64-repodata' ... +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/multilib/x86_64-repodata' ... +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ... +=> xbps-src: updating repositories for target (x86_64-musl)... +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/musl/x86_64-musl-repodata' ... +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/musl/nonfree/x86_64-musl-repodata' ... +[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/musl/debug/x86_64-musl-repodata' ... +x86_64-musl-repodata: 786KB [avg rate: 103KB/s] +=> xbps-src: updating software in / masterdir... +=> xbps-src: cleaning up / masterdir... +=> libzim-7.2.0_1: removing autodeps, please wait... +=> libzim-7.2.0_1: removing autocrossdeps, please wait... +=> libzim-7.2.0_1: the following build options are set: + xapian: (ON) + zlib: (ON) + zstd: Enable support for ZSTD compression format (ON) +=> libzim-7.2.0_1: building [meson] for x86_64-musl... + [host] pkg-config-0.29.2_3: found (https://alpha.de.repo.voidlinux.org/current) + [host] git-2.35.1_1: found (https://alpha.de.repo.voidlinux.org/current) + [host] meson-0.60.3_1: found (https://alpha.de.repo.voidlinux.org/current) + [target] liblzma-devel-5.2.5_2: found (https://alpha.de.repo.voidlinux.org/current/musl) + [target] zlib-devel-1.2.11_4: found (https://alpha.de.repo.voidlinux.org/current/musl) + [target] xapian-core-devel-1.4.18_2: found (https://alpha.de.repo.voidlinux.org/current/musl) + [target] icu-devel-70.1_1: found (https://alpha.de.repo.voidlinux.org/current/musl) + [target] libzstd-devel-1.5.2_1: found (https://alpha.de.repo.voidlinux.org/current/musl) + [target] gtest-devel-1.11.0_1: found (https://alpha.de.repo.voidlinux.org/current/musl) + [runtime] libzim-7.2.0_1: not found (self, ignored) + [runtime] libzstd-devel-1.5.2_1: found (https://alpha.de.repo.voidlinux.org/current/musl) + [runtime] zlib-devel-1.2.11_4: found (https://alpha.de.repo.voidlinux.org/current/musl) + [runtime] liblzma-devel-5.2.5_2: found (https://alpha.de.repo.voidlinux.org/current/musl) +=> libzim-7.2.0_1: installing host dependencies: pkg-config-0.29.2_3 git-2.35.1_1 meson-0.60.3_1 ... +=> libzim-7.2.0_1: installing target dependencies: liblzma-devel-5.2.5_2 zlib-devel-1.2.11_4 xapian-core-devel-1.4.18_2 icu-devel-70.1_1 libzstd-devel-1.5.2_1 gtest-devel-1.11.0_1 ... +=> xbps-src: installing cross compiler: cross-x86_64-linux-musl ... + => libzim-7.2.0_1: running do-fetch hook: 00-distfiles ... +=> libzim-7.2.0_1: running do-extract hook: 00-distfiles ... +=> libzim-7.2.0_1: extracting distfile(s), please wait... +=> libzim-7.2.0_1: running post_extract ... +=> libzim-7.2.0_1: running do_patch ... +=> libzim-7.2.0_1: running do-patch hook: 00-patches ... +=> libzim-7.2.0_1: patching: remove-debug-asserts.patch. +=> libzim-7.2.0_1: running pre-configure hook: 00-gnu-configure-asneeded ... +=> libzim-7.2.0_1: running pre-configure hook: 01-override-config ... +=> libzim-7.2.0_1: running pre-configure hook: 02-script-wrapper ... +=> libzim-7.2.0_1: running do_configure ... +The Meson build system +Version: 0.60.3 +Source dir: /builddir/libzim-7.2.0 +Build dir: /builddir/libzim-7.2.0/build +Build type: cross build +Project name: libzim +Project version: 7.2.0 +C compiler for the host machine: x86_64-linux-musl-gcc (gcc 10.2.1 "x86_64-linux-musl-gcc (GCC) 10.2.1 20201203") +C linker for the host machine: x86_64-linux-musl-gcc ld.bfd 2.35.1 +C++ compiler for the host machine: x86_64-linux-musl-c++ (gcc 10.2.1 "x86_64-linux-musl-g++ (GCC) 10.2.1 20201203") +C++ linker for the host machine: x86_64-linux-musl-c++ ld.bfd 2.35.1 +C compiler for the build machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203") +C linker for the build machine: cc ld.bfd 2.35.1 +C++ compiler for the build machine: g++ (gcc 10.2.1 "g++ (GCC) 10.2.1 20201203") +C++ linker for the build machine: g++ ld.bfd 2.35.1 +Build machine cpu family: x86_64 +Build machine cpu: x86_64 +Host machine cpu family: x86_64 +Host machine cpu: x86_64 +Target machine cpu family: x86_64 +Target machine cpu: x86_64 +Checking for size of "off_t" : 8 +Checking for size of "size_t" : 8 +Found pkg-config: /builddir/.xbps-libzim/wrappers/x86_64-linux-musl-pkg-config (0.29.2) +Run-time dependency liblzma found: YES 5.2.5 +Run-time dependency libzstd found: YES 1.5.2 +Run-time dependency xapian-core found: YES 1.4.18 +Run-time dependency threads found: YES +Run-time dependency icu-i18n found: YES 70.1 +Run-time dependency GTest found: YES 1.11.0 +Configuring zim_config.h using configuration +Program libzim-compile-resources found: YES (/builddir/libzim-7.2.0/scripts/libzim-compile-resources) +Program download_test_data.py found: YES (/builddir/libzim-7.2.0/scripts/download_test_data.py) +Configuring config.h using configuration +Build targets in project: 4 + +libzim 7.2.0 + + User defined options + Cross files : xbps_meson.cross + auto_features : auto + bindir : /usr/bin + buildtype : plain + datadir : /usr/share + includedir : /usr/include + infodir : /usr/share/info + libdir : /usr/lib64 + libexecdir : /usr/libexec + localedir : /usr/share/locale + localstatedir : /var + mandir : /usr/share/man + prefix : /usr + sbindir : /usr/bin + sharedstatedir: /var/lib + sysconfdir : /etc + wrap_mode : nodownload + b_lto : true + b_ndebug : true + b_staticpic : true + +Found ninja-1.10.2 at /usr/bin/ninja +=> libzim-7.2.0_1: running pre-build hook: 02-script-wrapper ... +=> libzim-7.2.0_1: running do_build ... +ninja: Entering directory `build' +[1/46] Generating static/resources with a custom command +stopwords/af ['stopwords', 'af'] +stopwords/ar ['stopwords', 'ar'] +stopwords/bg ['stopwords', 'bg'] +stopwords/bn ['stopwords', 'bn'] +stopwords/br ['stopwords', 'br'] +stopwords/ca ['stopwords', 'ca'] +stopwords/cs ['stopwords', 'cs'] +stopwords/da ['stopwords', 'da'] +stopwords/de ['stopwords', 'de'] +stopwords/el ['stopwords', 'el'] +stopwords/en ['stopwords', 'en'] +stopwords/eo ['stopwords', 'eo'] +stopwords/es ['stopwords', 'es'] +stopwords/et ['stopwords', 'et'] +stopwords/eu ['stopwords', 'eu'] +stopwords/fa ['stopwords', 'fa'] +stopwords/fi ['stopwords', 'fi'] +stopwords/fr ['stopwords', 'fr'] +stopwords/ga ['stopwords', 'ga'] +stopwords/gl ['stopwords', 'gl'] +stopwords/gu ['stopwords', 'gu'] +stopwords/ha ['stopwords', 'ha'] +stopwords/he ['stopwords', 'he'] +stopwords/hi ['stopwords', 'hi'] +stopwords/hr ['stopwords', 'hr'] +stopwords/hu ['stopwords', 'hu'] +stopwords/hy ['stopwords', 'hy'] +stopwords/id ['stopwords', 'id'] +stopwords/it ['stopwords', 'it'] +stopwords/ja ['stopwords', 'ja'] +stopwords/ko ['stopwords', 'ko'] +stopwords/ku ['stopwords', 'ku'] +stopwords/la ['stopwords', 'la'] +stopwords/lt ['stopwords', 'lt'] +stopwords/lv ['stopwords', 'lv'] +stopwords/mr ['stopwords', 'mr'] +stopwords/ms ['stopwords', 'ms'] +stopwords/nl ['stopwords', 'nl'] +stopwords/no ['stopwords', 'no'] +stopwords/pl ['stopwords', 'pl'] +stopwords/pt ['stopwords', 'pt'] +stopwords/ro ['stopwords', 'ro'] +stopwords/ru ['stopwords', 'ru'] +stopwords/sk ['stopwords', 'sk'] +stopwords/sl ['stopwords', 'sl'] +stopwords/so ['stopwords', 'so'] +stopwords/st ['stopwords', 'st'] +stopwords/sv ['stopwords', 'sv'] +stopwords/sw ['stopwords', 'sw'] +stopwords/th ['stopwords', 'th'] +stopwords/tl ['stopwords', 'tl'] +stopwords/tr ['stopwords', 'tr'] +stopwords/uk ['stopwords', 'uk'] +stopwords/ur ['stopwords', 'ur'] +stopwords/vi ['stopwords', 'vi'] +stopwords/yo ['stopwords', 'yo'] +stopwords/zh ['stopwords', 'zh'] +stopwords/zu ['stopwords', 'zu'] +[2/46] Compiling C++ object examples/createZimExample.p/createZimExample.cpp.o +[3/46] Compiling C++ object src/libzim.so.7.2.0.p/buffer_reader.cpp.o +[4/46] Compiling C++ object src/libzim.so.7.2.0.p/dirent.cpp.o +[5/46] Compiling C++ object src/libzim.so.7.2.0.p/meson-generated_.._.._static_libzim-resources.cpp.o +[6/46] Compiling C++ object src/libzim.so.7.2.0.p/cluster.cpp.o +[7/46] Compiling C++ object src/libzim.so.7.2.0.p/dirent_accessor.cpp.o +[8/46] Compiling C++ object src/libzim.so.7.2.0.p/envvalue.cpp.o +[9/46] Compiling C++ object src/libzim.so.7.2.0.p/archive.cpp.o +[10/46] Compiling C++ object src/libzim.so.7.2.0.p/fileheader.cpp.o +[11/46] Compiling C++ object src/libzim.so.7.2.0.p/entry.cpp.o +[12/46] Compiling C++ object src/libzim.so.7.2.0.p/file_compound.cpp.o +[13/46] Compiling C object src/libzim.so.7.2.0.p/md5.c.o +[14/46] Compiling C++ object src/libzim.so.7.2.0.p/buffer.cpp.o +[15/46] Compiling C++ object src/libzim.so.7.2.0.p/blob.cpp.o +[16/46] Compiling C++ object src/libzim.so.7.2.0.p/file_reader.cpp.o +[17/46] Compiling C++ object src/libzim.so.7.2.0.p/template.cpp.o +[18/46] Compiling C++ object src/libzim.so.7.2.0.p/uuid.cpp.o +[19/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_contentProvider.cpp.o +[20/46] Compiling C++ object src/libzim.so.7.2.0.p/item.cpp.o +[21/46] Compiling C++ object src/libzim.so.7.2.0.p/compression.cpp.o +[22/46] Compiling C++ object src/libzim.so.7.2.0.p/istreamreader.cpp.o +[23/46] Compiling C++ object src/libzim.so.7.2.0.p/fileimpl.cpp.o +[24/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_dirent.cpp.o +[25/46] Compiling C++ object src/libzim.so.7.2.0.p/tools.cpp.o +[26/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_workers.cpp.o +[27/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_item.cpp.o +[28/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_cluster.cpp.o +[29/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_clusterWorker.cpp.o +[30/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_creator.cpp.o +[31/46] Compiling C++ object src/libzim.so.7.2.0.p/fs_unix.cpp.o +[32/46] Compiling C++ object src/libzim.so.7.2.0.p/version.cpp.o +[33/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_titleListingHandler.cpp.o +[34/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_counterHandler.cpp.o +[35/46] Compiling C++ object src/libzim.so.7.2.0.p/suggestion_iterator.cpp.o +[36/46] Compiling C++ object src/libzim.so.7.2.0.p/search_iterator.cpp.o +[37/46] Compiling C++ object src/libzim.so.7.2.0.p/xapian_myhtmlparse.cc.o +[38/46] Compiling C++ object src/libzim.so.7.2.0.p/xapian_htmlparse.cc.o +[39/46] Compiling C++ object src/libzim.so.7.2.0.p/search.cpp.o +[40/46] Compiling C++ object src/libzim.so.7.2.0.p/suggestion.cpp.o +[41/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_xapianIndexer.cpp.o +[42/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_xapianWorker.cpp.o +[43/46] Compiling C++ object src/libzim.so.7.2.0.p/writer_xapianHandler.cpp.o +[44/46] Linking target src/libzim.so.7.2.0 +[45/46] Generating symbol file src/libzim.so.7.2.0.p/libzim.so.7.2.0.symbols +[46/46] Linking target examples/createZimExample +=> libzim-7.2.0_1: skipping check (cross build for x86_64-musl) ... +=> libzim-7.2.0_1: running pre-install hook: 00-libdir ... +=> libzim-7.2.0_1: running pre-install hook: 02-script-wrapper ... +=> libzim-7.2.0_1: running pre-install hook: 98-fixup-gir-path ... +=> libzim-7.2.0_1: running do_install ... +ninja: Entering directory `build' +[0/1] Installing files. +Installing src/libzim.so.7.2.0 to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/lib64 +Installing /builddir/libzim-7.2.0/include/zim/archive.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/blob.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/error.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/item.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/entry.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/uuid.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/zim.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/suggestion.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/suggestion_iterator.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/version.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/build/include/zim/zim_config.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/search.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/search_iterator.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim +Installing /builddir/libzim-7.2.0/include/zim/writer/item.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim/writer +Installing /builddir/libzim-7.2.0/include/zim/writer/creator.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim/writer +Installing /builddir/libzim-7.2.0/include/zim/writer/contentProvider.h to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/include/zim/writer +Installing /builddir/libzim-7.2.0/build/meson-private/libzim.pc to /destdir/x86_64-linux-musl/libzim-7.2.0/usr/lib64/pkgconfig +=> libzim-devel-7.2.0_1: running pre-install hook: 00-libdir ... +=> libzim-devel-7.2.0_1: running pre-install hook: 02-script-wrapper ... +=> libzim-devel-7.2.0_1: running pre-install hook: 98-fixup-gir-path ... +=> libzim-devel-7.2.0_1: running pkg_install ... +=> libzim-devel-7.2.0_1: running post-install hook: 00-compress-info-files ... +=> libzim-devel-7.2.0_1: running post-install hook: 00-fixup-gir-path ... +=> libzim-devel-7.2.0_1: running post-install hook: 00-libdir ... +=> libzim-devel-7.2.0_1: running post-install hook: 00-uncompress-manpages ... +=> libzim-devel-7.2.0_1: running post-install hook: 01-remove-misc ... +=> libzim-devel-7.2.0_1: running post-install hook: 02-remove-libtool-archives ... +=> libzim-devel-7.2.0_1: running post-install hook: 02-remove-perl-files ... +=> libzim-devel-7.2.0_1: running post-install hook: 02-remove-python-bytecode-files ... +=> libzim-devel-7.2.0_1: running post-install hook: 03-remove-empty-dirs ... +=> WARNING: libzim-devel-7.2.0_1: removed empty dir: /usr/x86_64-linux-musl +=> libzim-devel-7.2.0_1: running post-install hook: 04-create-xbps-metadata-scripts ... +=> libzim-devel-7.2.0_1: running post-install hook: 05-generate-gitrevs ... +=> libzim-devel-7.2.0_1: running post-install hook: 06-strip-and-debug-pkgs ... +=> libzim-devel-7.2.0_1: running post-install hook: 10-pkglint-devel-paths ... +=> libzim-devel-7.2.0_1: running post-install hook: 11-pkglint-elf-in-usrshare ... +=> libzim-devel-7.2.0_1: running post-install hook: 12-rename-python3-c-bindings ... +=> libzim-devel-7.2.0_1: running post-install hook: 13-pkg-config-clean-xbps-cross-base-ref ... +=> libzim-devel-7.2.0_1: running post-install hook: 14-fix-permissions ... +=> libzim-devel-7.2.0_1: running post-install hook: 99-pkglint-warn-cross-cruft ... +=> libzim-7.2.0_1: running post-install hook: 00-compress-info-files ... +=> libzim-7.2.0_1: running post-install hook: 00-fixup-gir-path ... +=> libzim-7.2.0_1: running post-install hook: 00-libdir ... +=> libzim-7.2.0_1: running post-install hook: 00-uncompress-manpages ... +=> libzim-7.2.0_1: running post-install hook: 01-remove-misc ... +=> libzim-7.2.0_1: running post-install hook: 02-remove-libtool-archives ... +=> libzim-7.2.0_1: running post-install hook: 02-remove-perl-files ... +=> libzim-7.2.0_1: running post-install hook: 02-remove-python-bytecode-files ... +=> libzim-7.2.0_1: running post-install hook: 03-remove-empty-dirs ... +=> WARNING: libzim-7.2.0_1: removed empty dir: /usr/x86_64-linux-musl +=> libzim-7.2.0_1: running post-install hook: 04-create-xbps-metadata-scripts ... +=> libzim-7.2.0_1: running post-install hook: 05-generate-gitrevs ... +=> libzim-7.2.0_1: running post-install hook: 06-strip-and-debug-pkgs ... + Stripped library: /usr/lib/libzim.so.7.2.0 +=> libzim-7.2.0_1: running post-install hook: 10-pkglint-devel-paths ... +=> libzim-7.2.0_1: running post-install hook: 11-pkglint-elf-in-usrshare ... +=> libzim-7.2.0_1: running post-install hook: 12-rename-python3-c-bindings ... +=> libzim-7.2.0_1: running post-install hook: 13-pkg-config-clean-xbps-cross-base-ref ... +=> libzim-7.2.0_1: running post-install hook: 14-fix-permissions ... +=> libzim-7.2.0_1: running post-install hook: 99-pkglint-warn-cross-cruft ... +=> libzim-devel-7.2.0_1: running pre-pkg hook: 03-rewrite-python-shebang ... +=> libzim-devel-7.2.0_1: running pre-pkg hook: 04-generate-runtime-deps ... +=> libzim-devel-7.2.0_1: running pre-pkg hook: 05-prepare-32bit ... +=> libzim-devel-7.2.0_1: running pre-pkg hook: 06-shlib-provides ... +=> libzim-devel-7.2.0_1: running pre-pkg hook: 90-set-timestamps ... +=> libzim-devel-7.2.0_1: setting mtimes to Wed Feb 16 07:42:36 AM UTC 2022 +=> libzim-devel-7.2.0_1: running pre-pkg hook: 99-pkglint-subpkgs ... +=> libzim-devel-7.2.0_1: running pre-pkg hook: 99-pkglint ... +=> libzim-devel-7.2.0_1: running pre-pkg hook: 999-collected-rdeps ... + libzim>=7.2.0_1 libzstd-devel>=0 zlib-devel>=0 liblzma-devel>=0 +=> libzim-7.2.0_1: running pre-pkg hook: 03-rewrite-python-shebang ... +=> libzim-7.2.0_1: running pre-pkg hook: 04-generate-runtime-deps ... + SONAME: liblzma.so.5 <-> liblzma>=5.0.0_1 + SONAME: libzstd.so.1 <-> libzstd>=1.0.0_1 + SONAME: libxapian.so.30 <-> libxapian>=1.4.0_1 + SONAME: libicui18n.so.70 <-> icu-libs>=70.1_1 + SONAME: libicuuc.so.70 <-> icu-libs>=70.1_1 + SONAME: libstdc++.so.6 <-> libstdc++>=4.4.0_1 + SONAME: libgcc_s.so.1 <-> libgcc>=4.4.0_1 + SONAME: libc.so <-> musl>=1.1.24_7 +=> libzim-7.2.0_1: running pre-pkg hook: 05-prepare-32bit ... +=> libzim-7.2.0_1: running pre-pkg hook: 06-shlib-provides ... + SONAME libzim.so.7 from /usr/lib/libzim.so.7.2.0 +=> libzim-7.2.0_1: running pre-pkg hook: 90-set-timestamps ... +=> libzim-7.2.0_1: setting mtimes to Wed Feb 16 07:42:36 AM UTC 2022 +=> libzim-7.2.0_1: running pre-pkg hook: 99-pkglint-subpkgs ... +=> libzim-7.2.0_1: running pre-pkg hook: 99-pkglint ... +=> libzim-7.2.0_1: running pre-pkg hook: 999-collected-rdeps ... + liblzma>=5.0.0_1 libzstd>=1.0.0_1 libxapian>=1.4.0_1 icu-libs>=70.1_1 libstdc++>=4.4.0_1 libgcc>=4.4.0_1 musl>=1.1.24_7 +=> libzim-devel-7.2.0_1: running do-pkg hook: 00-gen-pkg ... +=> Creating libzim-devel-7.2.0_1.x86_64-musl.xbps for repository /host/binpkgs/kiwix ... +=> libzim-devel-7.2.0_1: running post-pkg hook: 00-register-pkg ... +=> libzim-7.2.0_1: running do-pkg hook: 00-gen-pkg ... +=> Creating libzim-7.2.0_1.x86_64-musl.xbps for repository /host/binpkgs/kiwix ... +=> libzim-7.2.0_1: running post-pkg hook: 00-register-pkg ... +=> Registering new packages to /host/binpkgs/kiwix +index: added `libzim-7.2.0_1' (x86_64-musl). +index: added `libzim-devel-7.2.0_1' (x86_64-musl). +index: 2 packages registered. +=> libzim-7.2.0_1: removing autodeps, please wait... +=> libzim-7.2.0_1: removing autocrossdeps, please wait... +=> libzim-7.2.0_1: cleaning build directory... +=> libzim: removing files from destdir... +=> libzim-devel: removing files from destdir... diff --git a/srcpkgs/zimwriterfs/template b/srcpkgs/zimwriterfs/template index bf13bf7e65bc..ca8d7b9d3b56 100644 --- a/srcpkgs/zimwriterfs/template +++ b/srcpkgs/zimwriterfs/template @@ -1,14 +1,9 @@ # Template file for 'zimwriterfs' pkgname=zimwriterfs version=1.3.7 -revision=3 -build_style=meson -hostmakedepends="pkg-config" -makedepends="file-devel gumbo-parser-devel icu-devel libzim-devel - xapian-core-devel" -short_desc="Tool for creating ZIM files based on contents on local filesystem" +revision=4 +build_style=meta +short_desc="Tool for creating ZIM files based on contents on local filesystem (transitional dummy package)" maintainer="Alexander Mamay " license="GPL-3.0-or-later" homepage="https://github.com/openzim/zimwriterfs" -distfiles="https://github.com/openzim/zimwriterfs/archive/${version}.tar.gz" -checksum=d55e13194e29100bf88bb201c5661ab7d2600a9e45c6caeb2a21647cdbf6cb4e