From ab81ef5fb8c51a2e7366a9308d6b3f7d60cc5f8e Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sat, 9 Mar 2024 20:02:39 +0100 Subject: [PATCH] kiwix: update to v3.5.0 - update kiwix and dependencies to latest versions that build with c++11 compatible compilers - kiwix 3.6.0 is already released but requires c++17 (i.e. DSM 7+) --- cross/kiwix-tools/Makefile | 2 +- cross/kiwix-tools/digests | 6 +++--- cross/libkiwix/Makefile | 2 +- cross/libkiwix/PLIST | 2 +- cross/libkiwix/digests | 6 +++--- cross/libxapian/Makefile | 2 +- cross/libxapian/PLIST | 2 +- cross/libxapian/digests | 6 +++--- cross/libzim/Makefile | 2 +- cross/libzim/PLIST | 2 +- cross/libzim/digests | 6 +++--- cross/pugixml/Makefile | 2 +- cross/pugixml/PLIST | 2 +- cross/pugixml/digests | 6 +++--- spk/kiwix/Makefile | 8 ++++---- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cross/kiwix-tools/Makefile b/cross/kiwix-tools/Makefile index 5d4b1e684c5..ad777cee6dd 100644 --- a/cross/kiwix-tools/Makefile +++ b/cross/kiwix-tools/Makefile @@ -1,5 +1,5 @@ PKG_NAME = kiwix-tools -PKG_VERS = 3.4.0 +PKG_VERS = 3.5.0 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/kiwix/kiwix-tools/archive diff --git a/cross/kiwix-tools/digests b/cross/kiwix-tools/digests index 581f89a4809..3dc67e2873e 100644 --- a/cross/kiwix-tools/digests +++ b/cross/kiwix-tools/digests @@ -1,3 +1,3 @@ -kiwix-tools-3.4.0.tar.gz SHA1 83e84f5becd94a028a665894601358277719a4f2 -kiwix-tools-3.4.0.tar.gz SHA256 e44d2b07bff5093784f12547ae1f32b2ceb9da49b10a48c7378bd2e1f7c13507 -kiwix-tools-3.4.0.tar.gz MD5 459cbd3dd123e64a72d4ddd4cb8bfe25 +kiwix-tools-3.5.0.tar.gz SHA1 3f2781addb0dcf1462675cef9873b2c673da544d +kiwix-tools-3.5.0.tar.gz SHA256 b15e69dd0ae690cb7a000ad815e5037db5276d92310e0b44832b960a51bfaeac +kiwix-tools-3.5.0.tar.gz MD5 917a0667a657bc31e2a7b486b9c54f34 diff --git a/cross/libkiwix/Makefile b/cross/libkiwix/Makefile index f21a801dcb7..737de3a5f6e 100644 --- a/cross/libkiwix/Makefile +++ b/cross/libkiwix/Makefile @@ -1,5 +1,5 @@ PKG_NAME = libkiwix -PKG_VERS = 12.0.0 +PKG_VERS = 12.1.1 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/kiwix/libkiwix/archive diff --git a/cross/libkiwix/PLIST b/cross/libkiwix/PLIST index 54e07b118b3..ea55b012048 100644 --- a/cross/libkiwix/PLIST +++ b/cross/libkiwix/PLIST @@ -1,3 +1,3 @@ lnk:lib/libkiwix.so lnk:lib/libkiwix.so.12 -lib:lib/libkiwix.so.12.0.0 +lib:lib/libkiwix.so.12.1.1 diff --git a/cross/libkiwix/digests b/cross/libkiwix/digests index 4b25e67bc4a..56130df6be7 100644 --- a/cross/libkiwix/digests +++ b/cross/libkiwix/digests @@ -1,3 +1,3 @@ -libkiwix-12.0.0.tar.gz SHA1 d597d15209361c9537b5d6f8f919f0e65d608488 -libkiwix-12.0.0.tar.gz SHA256 8608ef73fdaa34c28144eb5ad732a74ca94dd99710d08d7a1ddb1277d1985b02 -libkiwix-12.0.0.tar.gz MD5 79f5fa6ca0339d95e5c5bf8ac4808f30 +libkiwix-12.1.1.tar.gz SHA1 ef7e415afe6c179855e6c0a38639b55bda75ce25 +libkiwix-12.1.1.tar.gz SHA256 8db344952d91c7b6d1b0fb4893f50bb6fa78c0e88506a5b507c7e179611d6cb1 +libkiwix-12.1.1.tar.gz MD5 a143c7bbea8fc53aaf266b5ea13e9a23 diff --git a/cross/libxapian/Makefile b/cross/libxapian/Makefile index ec09e9c3c1c..b5ece3dc27a 100644 --- a/cross/libxapian/Makefile +++ b/cross/libxapian/Makefile @@ -1,5 +1,5 @@ PKG_NAME = xapian-core -PKG_VERS = 1.4.21 +PKG_VERS = 1.4.25 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://oligarchy.co.uk/xapian/$(PKG_VERS) diff --git a/cross/libxapian/PLIST b/cross/libxapian/PLIST index 9326c6d0305..7422de3f5b2 100644 --- a/cross/libxapian/PLIST +++ b/cross/libxapian/PLIST @@ -1,3 +1,3 @@ lnk:lib/libxapian.so lnk:lib/libxapian.so.30 -lib:lib/libxapian.so.30.12.2 +lib:lib/libxapian.so.30.12.6 diff --git a/cross/libxapian/digests b/cross/libxapian/digests index 20f3f4d4721..80c8e8cea3f 100644 --- a/cross/libxapian/digests +++ b/cross/libxapian/digests @@ -1,3 +1,3 @@ -xapian-core-1.4.21.tar.xz SHA1 054a61320c810dc7397744f742137819f1167eac -xapian-core-1.4.21.tar.xz SHA256 80f86034d2fb55900795481dfae681bfaa10efbe818abad3622cdc0c55e06f88 -xapian-core-1.4.21.tar.xz MD5 636cca52a2a69bf3c1adb278bd9abf50 +xapian-core-1.4.25.tar.xz SHA1 e2b4b4cf6076873ec9402cab7b9a3b71dcf95e20 +xapian-core-1.4.25.tar.xz SHA256 0c99dfdd817571cb5689bc412a7e021407938313f38ea3a70fa3bf86410608ee +xapian-core-1.4.25.tar.xz MD5 b570c2e47f157bee29584994657aafbb diff --git a/cross/libzim/Makefile b/cross/libzim/Makefile index b3f53e60233..9caae879156 100644 --- a/cross/libzim/Makefile +++ b/cross/libzim/Makefile @@ -1,5 +1,5 @@ PKG_NAME = libzim -PKG_VERS = 8.1.0 +PKG_VERS = 8.2.1 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/openzim/libzim/archive diff --git a/cross/libzim/PLIST b/cross/libzim/PLIST index fd31d2f71ec..10d61830185 100644 --- a/cross/libzim/PLIST +++ b/cross/libzim/PLIST @@ -1,3 +1,3 @@ lnk:lib/libzim.so lnk:lib/libzim.so.8 -lib:lib/libzim.so.8.1.0 +lib:lib/libzim.so.8.2.1 diff --git a/cross/libzim/digests b/cross/libzim/digests index cee77bbcd0f..46b9ab74898 100644 --- a/cross/libzim/digests +++ b/cross/libzim/digests @@ -1,3 +1,3 @@ -libzim-8.1.0.tar.gz SHA1 b9ed76316fe376b75ad338382f2e22c9f39021d2 -libzim-8.1.0.tar.gz SHA256 16ed7f2e6f39a5c15a70609b776657b3152a6f4f91ac1a95f331d4ca79cb89f0 -libzim-8.1.0.tar.gz MD5 878ff292feb68c9a4f914886bb036867 +libzim-8.2.1.tar.gz SHA1 952730c6e36dc0678d0aafc549891e5f3aada0af +libzim-8.2.1.tar.gz SHA256 b8296644b04b02c04d2ff1458fed829df39b54e8fd1bcd23c10440e160819f13 +libzim-8.2.1.tar.gz MD5 f75b5e4804cf4fc5293e69dabc3e11e1 diff --git a/cross/pugixml/Makefile b/cross/pugixml/Makefile index c3747c26e53..1b83b60d81a 100644 --- a/cross/pugixml/Makefile +++ b/cross/pugixml/Makefile @@ -1,5 +1,5 @@ PKG_NAME = pugixml -PKG_VERS = 1.13 +PKG_VERS = 1.14 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/zeux/pugixml/releases/download/v$(PKG_VERS) diff --git a/cross/pugixml/PLIST b/cross/pugixml/PLIST index 0c19e8308e6..2d2bb997b15 100644 --- a/cross/pugixml/PLIST +++ b/cross/pugixml/PLIST @@ -1,3 +1,3 @@ lnk:lib/libpugixml.so lnk:lib/libpugixml.so.1 -lib:lib/libpugixml.so.1.13 +lib:lib/libpugixml.so.1.14 diff --git a/cross/pugixml/digests b/cross/pugixml/digests index 036cf941d3e..7ba9c6a2021 100644 --- a/cross/pugixml/digests +++ b/cross/pugixml/digests @@ -1,3 +1,3 @@ -pugixml-1.13.tar.gz SHA1 a09879cf44e81b64cf0564f40d062209473f09e1 -pugixml-1.13.tar.gz SHA256 40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe -pugixml-1.13.tar.gz MD5 3e4c588e03bdca140844f3c47c1a995e +pugixml-1.14.tar.gz SHA1 f10f1a1449f91b87b925839eb0c1544325855d9c +pugixml-1.14.tar.gz SHA256 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015 +pugixml-1.14.tar.gz MD5 06e4242ee2352ee63c2b6627c6e3addb diff --git a/spk/kiwix/Makefile b/spk/kiwix/Makefile index d34eeddd68a..6be8c278ef9 100644 --- a/spk/kiwix/Makefile +++ b/spk/kiwix/Makefile @@ -1,6 +1,6 @@ SPK_NAME = kiwix -SPK_VERS = 3.4.0 -SPK_REV = 4 +SPK_VERS = 3.5.0 +SPK_REV = 5 SPK_ICON = src/kiwix.png DEPENDS = cross/kiwix-tools @@ -14,13 +14,13 @@ LICENSE = GPLv3 MAINTAINER = hgy59 DISPLAY_NAME = Kiwix -CHANGELOG = "Update kiwix to v3.4.0.
Fix initialization of empty library file on DSM 7." +CHANGELOG = "Update kiwix to v3.5.0.
This is the latest version that will be available for DSM 6." SERVICE_USER = auto STARTABLE = yes SERVICE_SETUP = src/service-setup.sh SERVICE_PORT = 8092 -SERVICE_PORT_TITLE = $(DISPLAY_NAME) +SERVICE_PORT_TITLE = Kiwix (http) ADMIN_PORT = $(SERVICE_PORT) WIZARDS_DIR = src/wizard