Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Jan 2025 13:48:17 GMT
From:      Olivier Certner <olce@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: e91d0af479f6 - 2025Q1 - devel/kiwix-tools: Depend on devel/libkiwix13
Message-ID:  <202501101348.50ADmHbk008009@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by olce:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e91d0af479f609e44d80e742c9ba576ca1356919

commit e91d0af479f609e44d80e742c9ba576ca1356919
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2025-01-09 15:40:39 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
CommitDate: 2025-01-10 13:47:12 +0000

    devel/kiwix-tools: Depend on devel/libkiwix13
    
    This will allow updating devel/libkiwix to 14.0.0 again without breaking
    the build of devel/kiwix-tools, whose latest released version at time of
    this writing requires libkiwix 13.
    
    This is a maintainer update (olce.freebsd.ports@certner.fr).
    
    Reviewed by:    jrm
    Fixes:          dafb538b3fd6 ("devel/libkiwix: Update to 14.0.0")
    MFH:            2025Q1
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D48396
    
    (cherry picked from commit adeaae60540e4a81967f02e9abae1e1051ea655f)
---
 UPDATING                 | 20 ++++++++++++++++++++
 www/kiwix-tools/Makefile |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index 3e1d0850ddea..7c86848c4d8d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,26 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20250109:
+  AFFECTS: users of www/kiwix-tools and devel/libkiwix
+  AUTHOR: olce@FreeBSD.org
+
+  Upstream released a new version (14.0.0) of kiwix-tools' dependency libkiwix
+  that the latest release of kiwix-tools (unchanged at 3.7.0) does not
+  support, and the devel/libkiwix port was updated to it by mistake.
+
+  In order to fix the situation without reverting devel/libkiwix to 13.1.0 and
+  bumping its PORTEPOCH, the new port devel/libkiwix13 has been created and
+  www/kiwix-tools has been updated to depend on it rather than devel/libkiwix.
+  This is expected to be temporary.
+
+  As devel/libkiwix13 and devel/libkiwix conflict with each other, which
+  apparently can confuse pkg (which proposes to delete www/kiwix-tools), users
+  having www/kiwix-tools installed are advised to upgrade it first separately,
+  e.g., by running:
+
+  # pkg upgrade www/kiwix-tools
+
 20241230:
   AFFECTS: users of net/xrdp-devel
   AUTHOR: meta@FreeBSD.org
diff --git a/www/kiwix-tools/Makefile b/www/kiwix-tools/Makefile
index 1806294fb12a..3becb04a3e5e 100644
--- a/www/kiwix-tools/Makefile
+++ b/www/kiwix-tools/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kiwix-tools
 DISTVERSION=	3.7.0
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
@@ -9,7 +10,7 @@ WWW=		https://www.kiwix.org/
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libkiwix.so:devel/libkiwix \
+LIB_DEPENDS=	libkiwix.so.13:devel/libkiwix13 \
 		libzim.so:devel/libzim
 
 USES=		compiler:c++17-lang meson pkgconfig



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501101348.50ADmHbk008009>