hashworks pushed to branch main at Arch Linux / Packaging / Packages / zim-tools
Commits:
0b4ffc61 by Justin Kromlinger at 2025-02-11T18:29:12+01:00
upgpkg: 3.3.0-4
- - - - -
3 changed files:
- .SRCINFO
- + 0001-Fix-build-with-ICU-76.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,10 +1,10 @@
pkgbase = zim-tools
pkgdesc = Various ZIM command line tools
pkgver = 3.3.0
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/openzim/zim-tools
arch = x86_64
- license = GPL3
+ license = GPL-3.0-or-later
makedepends = meson
makedepends = mustache
depends = file
@@ -15,6 +15,8 @@ pkgbase = zim-tools
conflicts = zimwriterfs
replaces = zimwriterfs
source =
zim-tools-3.3.0.tar.gz::https://github.com/openzim/zim-tools/archive/3.3.0.tar.gz
+ source = 0001-Fix-build-with-ICU-76.patch
sha256sums =
306bec256418d6e2caac1955076627440c40144f2552957412108c7883b50576
+ sha256sums =
b742b75e14f551f2d7c45957eee7d96ab1c8a32c23005534fafd0bd20c1da904
pkgname = zim-tools
=====================================
0001-Fix-build-with-ICU-76.patch
=====================================
@@ -0,0 +1,38 @@
+From a3c0e9e455277babffd64dc87c5d8f18a0e1dc65 Mon Sep 17 00:00:00 2001
+From: hashworks <m...@hashworks.net>
+Date: Tue, 11 Feb 2025 18:26:22 +0100
+Subject: [PATCH] Fix build with ICU 76
+
+Due to unicode-org/icu@199bc82, ICU 76 no longer adds `icu-uc` by
+default. This causes linker errors for undefined symbols like
+`icu_76::UnicodeString::doReplace(...)`, referenced from:
+`zim::removeAccents(...)` in tools.cpp.o.
+
+Meson will automatically flatten the dependencies list as documented
+at https://mesonbuild.com/Reference-manual_functions.html#build_target
+
+Original commit from https://github.com/openzim/libzim/pull/936
+---
+ meson.build | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1f4b595..080f27d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -19,7 +19,11 @@ if static_linkage
+ endif
+ endif
+
+-libzim_dep = dependency('libzim', version : '>=8.0.0', static:static_linkage)
++libzim_dep = [
++ dependency('libzim', version : '>=8.0.0', static:static_linkage),
++ dependency('icu-i18n', static:static_linkage),
++ dependency('icu-uc', static:static_linkage)
++]
+ with_xapian_support = compiler.has_header_symbol('zim/zim.h',
'LIBZIM_WITH_XAPIAN')
+
+ find_library_in_compiler = meson.version().version_compare('>=0.31.0')
+--
+2.48.1
+
=====================================
PKGBUILD
=====================================
@@ -1,9 +1,9 @@
# Maintainer: Justin Kromlinger <hashwo...@archlinux.org>
pkgname=zim-tools
pkgver=3.3.0
-pkgrel=3
+pkgrel=4
pkgdesc="Various ZIM command line tools"
-license=('GPL3')
+license=('GPL-3.0-or-later')
arch=('x86_64')
provides=('zimwriterfs')
conflicts=('zimwriterfs')
@@ -11,8 +11,15 @@ replaces=('zimwriterfs')
depends=('file' 'libzim>=9.0.0' 'docopt' 'gumbo-parser')
makedepends=('meson' 'mustache')
url='https://github.com/openzim/zim-tools'
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
-sha256sums=('306bec256418d6e2caac1955076627440c40144f2552957412108c7883b50576')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
+ # https://github.com/openzim/libzim/pull/936
+ "0001-Fix-build-with-ICU-76.patch")
+sha256sums=('306bec256418d6e2caac1955076627440c40144f2552957412108c7883b50576'
+ 'b742b75e14f551f2d7c45957eee7d96ab1c8a32c23005534fafd0bd20c1da904')
+
+prepare() {
+ patch -Np1 -d "${pkgname}-${pkgver}" -i
../0001-Fix-build-with-ICU-76.patch
+}
build() {
cd "${pkgname}-${pkgver}"
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/zim-tools/-/commit/0b4ffc61be76f1cfc61500f8157f99e28bb3c7b1
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/zim-tools/-/commit/0b4ffc61be76f1cfc61500f8157f99e28bb3c7b1
You're receiving this email because of your account on gitlab.archlinux.org.
