From nobody Fri Jan 10 13:48:17 2025 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YV2zk2L7kz5kMFF; Fri, 10 Jan 2025 13:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YV2zj6TfFz4m81; Fri, 10 Jan 2025 13:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736516897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qQoYyH12tyIt+uOqMT1e5VvBKGrtkBRXLzSG6xfxzLw=; b=lsNemUeNZRtcl8eCj29gKKJc8FNCXJ1jfI4L36nzXK3iVEsJ6gN21vCJ8LFCs8P2DaESk4 yRdhE/7Ny6GuezVILlsNNbOn+czO581esQxn0ITX2OD32o/FYC073oA5vaUE/Gonga8lJ4 TuTK83zrHle0TLMVKzxbQhQfHTVg933Qjv9PYVlk++iDpy4KIYziOO4hZC2io+fggoDKTS msnnF9w42fJxa7QWE256cgz6EFW/62qt89PjjKd32Zt34mIv3SFXc5zJeFyt/WUqsfJR4Q 6GkzwOZDDUre2Qs/mvzDMquJnC6dYceqY0ooP81Pj10OzmgnR6WsucQgzAoZlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736516897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qQoYyH12tyIt+uOqMT1e5VvBKGrtkBRXLzSG6xfxzLw=; b=XvnOSshiLsW42VJfhJxpKpPMZ0le/Et/WRizhK9DT9FNywVlmQ18RmptyIgAkZpCa+vchb 63dGov1vfTB6r5tXjHPshvkjaz/IA5HqPbsqcEpJsYJamPXW+nAIege75jfwBVLxksqtxR bkAVi5hghx98ND8M6uDi2VS5/8H2RIFOtY4OTwrctYw8W3kf9uPeB4f9GH1DTJPn+jKi4y zBEcsoCkqT0WEXtB6pLamvayTK+PAreJbs2EsqzkdWmYTPmzYgm5G+XSFODWcuU3ZwvIy8 3Btyy7io93x1+SvC9UAtksZ4oCu2oVYxoahDftz4oGpwu8HyGQU3DMcFuymclA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736516897; a=rsa-sha256; cv=none; b=Namchn6pkF30gMB4fZMUkpRJgIplOzdVqXKne4Zm1DRk0MyW9v96tLnNG7ZWm4bONe70s7 /D15u+H6fbqOd/r8I/hXSAdUUGKjAj0Ymf8W5zvxRkl5dIpIyTvNcVWSKcEVjb7DqMdJ/m lZnc5qPvwHxCIx1MDuON23h2IcfS7U2Us4ln4zRhvcA0MV1ipJllZ09r94HyU8M8wSn4dZ bkOvM13BC2sF1qvYXlFXlIMtHhanSLeukXXknvsa28/7DK7CKi1+oQZiH/dx3+Lhlbll2M +LUmWiQ1aqmH4gDGrLF5olU1+7uWKeoNJlk3KqocdecBUBKIQvmVd4FyBmsGiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YV2zj5QzJzFC; Fri, 10 Jan 2025 13:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50ADmHxD008012; Fri, 10 Jan 2025 13:48:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50ADmHbk008009; Fri, 10 Jan 2025 13:48:17 GMT (envelope-from git) Date: Fri, 10 Jan 2025 13:48:17 GMT Message-Id: <202501101348.50ADmHbk008009@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Olivier Certner Subject: git: e91d0af479f6 - 2025Q1 - devel/kiwix-tools: Depend on devel/libkiwix13 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: e91d0af479f609e44d80e742c9ba576ca1356919 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by olce: URL: https://cgit.FreeBSD.org/ports/commit/?id=e91d0af479f609e44d80e742c9ba576ca1356919 commit e91d0af479f609e44d80e742c9ba576ca1356919 Author: Olivier Certner AuthorDate: 2025-01-09 15:40:39 +0000 Commit: Olivier Certner 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