hashworks pushed to branch main at Arch Linux / Packaging / Packages / libkiwix
Commits:
43512b09 by Justin Kromlinger at 2025-02-11T18:12:45+01:00
Revert "upgpkg: 13.1.0-1"
This reverts commit 62edd2b809258195d2e81339f036b0446f3124a8.
- - - - -
091f1709 by Justin Kromlinger at 2025-02-11T18:12:49+01:00
Revert "upgpkg: 14.0.0-1"
This reverts commit 4874352400bf7336720fe3668f7fb27a6368e36d.
- - - - -
fd9b8e00 by Justin Kromlinger at 2025-02-11T18:17:27+01:00
upgpkg: 12.1.1-4: Rebuild for icu 76 with patch
- - - - -
3 changed files:
- .SRCINFO
- + 0001-Fix-build-with-ICU-76.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,10 +1,10 @@
pkgbase = libkiwix
pkgdesc = Library providing the Kiwix software core
- pkgver = 13.1.0
- pkgrel = 1
+ pkgver = 12.1.1
+ pkgrel = 4
url = https://github.com/kiwix/libkiwix
arch = x86_64
- license = GPL3
+ license = GPL-3.0-or-later
makedepends = meson
makedepends = gtest
makedepends = mustache
@@ -18,7 +18,9 @@ pkgbase = libkiwix
provides = kiwix-lib
conflicts = kiwix-lib
replaces = kiwix-lib
- source =
libkiwix-13.1.0.tar.gz::https://github.com/kiwix/libkiwix/archive/13.1.0.tar.gz
- sha256sums =
04d93f66b939f937df2c941af517966128d4c9872b707f9ed192177fe51364d3
+ source =
libkiwix-12.1.1.tar.gz::https://github.com/kiwix/libkiwix/archive/12.1.1.tar.gz
+ source = 0001-Fix-build-with-ICU-76.patch
+ sha256sums =
8db344952d91c7b6d1b0fb4893f50bb6fa78c0e88506a5b507c7e179611d6cb1
+ sha256sums =
f1a303dfca42480052f428ca2f747e3a24deb6523b77c31204069e121a36df7c
pkgname = libkiwix
=====================================
0001-Fix-build-with-ICU-76.patch
=====================================
@@ -0,0 +1,37 @@
+From 0c39857fc325e50a77cb89feb215e62ae0aa8518 Mon Sep 17 00:00:00 2001
+From: hashworks <[email protected]>
+Date: Tue, 11 Feb 2025 18:07:18 +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 | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 51052335..cff81217 100644
+--- a/meson.build
++++ b/meson.build
+@@ -48,7 +48,10 @@ if (host_machine.system() == 'linux' and compiler.get_id()
== 'gcc') or \
+ else
+ thread_dep = dependency('', required:false)
+ endif
+-libicu_dep = dependency('icu-i18n', static:static_deps)
++libicu_dep = [
++ dependency('icu-i18n', static:static_deps),
++ dependency('icu-uc', static:static_deps)
++]
+ pugixml_dep = dependency('pugixml', static:static_deps)
+ libcurl_dep = dependency('libcurl', static:static_deps)
+ microhttpd_dep = dependency('libmicrohttpd', static:static_deps)
+--
+2.48.1
+
=====================================
PKGBUILD
=====================================
@@ -1,9 +1,9 @@
# Maintainer: Justin Kromlinger <[email protected]>
pkgname=libkiwix
-pkgver=13.1.0
-pkgrel=1
+pkgver=12.1.1
+pkgrel=4
pkgdesc="Library providing the Kiwix software core"
-license=('GPL3')
+license=('GPL-3.0-or-later')
arch=('x86_64')
provides=('kiwix-lib')
conflicts=('kiwix-lib')
@@ -11,8 +11,15 @@ replaces=('kiwix-lib')
depends=('libzim>=9.0.0' 'pugixml' 'xapian-core' 'aria2' 'libmicrohttpd'
'python' 'curl')
makedepends=('meson' 'gtest' 'mustache')
url='https://github.com/kiwix/libkiwix'
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
-sha256sums=('04d93f66b939f937df2c941af517966128d4c9872b707f9ed192177fe51364d3')
+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=('8db344952d91c7b6d1b0fb4893f50bb6fa78c0e88506a5b507c7e179611d6cb1'
+ 'f1a303dfca42480052f428ca2f747e3a24deb6523b77c31204069e121a36df7c')
+
+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/libkiwix/-/compare/62edd2b809258195d2e81339f036b0446f3124a8...fd9b8e00bbc4a00b6d7d8ba9ba6e031c6575b165
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/libkiwix/-/compare/62edd2b809258195d2e81339f036b0446f3124a8...fd9b8e00bbc4a00b6d7d8ba9ba6e031c6575b165
You're receiving this email because of your account on gitlab.archlinux.org.
