From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 03 10:44:58 2025 Received: (at submit) by debbugs.gnu.org; 3 Jan 2025 15:44:58 +0000 Received: from localhost ([127.0.0.1]:51725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTjr7-0006h6-Ry for submit@debbugs.gnu.org; Fri, 03 Jan 2025 10:44:58 -0500 Received: from lists.gnu.org ([2001:470:142::17]:39898) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tTjr1-0006g5-H3 for submit@debbugs.gnu.org; Fri, 03 Jan 2025 10:44:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tTjqu-0000fH-L7 for guix-patches@gnu.org; Fri, 03 Jan 2025 10:44:44 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tTjqs-0007kI-Bc for guix-patches@gnu.org; Fri, 03 Jan 2025 10:44:44 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D7782254DC; Fri, 3 Jan 2025 16:44:38 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Ft7mehSCk-q7; Fri, 3 Jan 2025 16:44:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735919078; bh=dQe1J0FKVUxJeIkziV5UdIL+fpDuXR7gzC6yAxgznYQ=; h=From:To:Cc:Subject:Date; b=mYUkhAmVKfu1z3D5SfymQmmrLgpHdblJOpPnGybWMZw78naIv+7CjLPUIjaoOcOMr Vl2+1LgZQngjh8X0KVxm/BYBIn3jic/C15vsRw6y/7Q4pCU01ZSjsKZsUMBYeXm2HP BeMeXHmexwrcfaOCivp0ctgKN9pz7Zw8K1+Qu7DDKAa7HJ/xiUYCTLg6uc7I3s+hIQ ve1Rq5LrbCa+cKHHLp3/4Pnme3fQh2VWQBgFZU7SlJ7pU6SB9NWrGgG1jNzUyYYPi6 zhtTFhIVICAtYMgK4wSdZA6zyevz7RDl0FBLU4Rv5PT3dQDtt3SIBIzKdE0lErAqDU dJYM0pUBWCaMw== From: Sughosha To: guix-patches@gnu.org Subject: [PATCH 0/5] Update kiwix-desktop to 2.4.1 and kiwix-tools to 3.7.0. Date: Fri, 3 Jan 2025 21:11:51 +0530 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=sughosha@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) This patch series updates kiwix-desktop to 2.4.1 and kiwix-tools to 3.7.0. Sughosha (5): gnu: libzim: Update to 9.2.3. gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. gnu: kiwix-desktop: Update to 2.4.1. gnu: Add libkiwix-13. gnu: kiwix-tools: Update to 3.7.0. gnu/local.mk | 1 - .../kiwix-desktop-newer-libkiwix.patch | 40 ---------- gnu/packages/web.scm | 76 ++++++++++--------- 3 files changed, 41 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch base-commit: 3ea95d7736be1f807d578d17c174b0976543b333 -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 03 10:51:12 2025 Received: (at 75319) by debbugs.gnu.org; 3 Jan 2025 15:51:12 +0000 Received: from localhost ([127.0.0.1]:51747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTjx9-0007DF-0U for submit@debbugs.gnu.org; Fri, 03 Jan 2025 10:51:12 -0500 Received: from layka.disroot.org ([178.21.23.139]:56102) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tTjx0-0007Bg-Ms for 75319@debbugs.gnu.org; Fri, 03 Jan 2025 10:51:05 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2A99825C4D; Fri, 3 Jan 2025 16:51:01 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 8FZgnIydIq01; Fri, 3 Jan 2025 16:51:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735919460; bh=KpwKDFAXcCTbnoJq+fmH46t67/S+u48zzLAauxvWyT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GSmRXbMDC7oMcPBm5n47wnibmg1QsjEs6yR3V9f35Wmp0IrA3jyOiiq6OuJeOs5jd 502wiBxKkXib/GJHX0TM694vh3jxcSG3EFmS8/ZUSHVKaNb6XAU8FqR5cqFFwcwcta ZfN5ih7smy/6NUL368pwKTG6rGxqy+UbJ7UT73bSt1abKp9Oc+Co51fTMAO79Gu1Xv WqbWlPvxo7fgU6u/GYfuEGrEGYW2Alaz0EMhMjmzeWcqY+tzzyBq/48SG2AzLlJ8E0 4Ce3orIOy0gR9jHwod5YqaUu4S0fRLK/bYlN41No9MVZYvFcPM07keEfVAYxi7rgcd QUx+Fv/2zTBHw== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH 1/5] gnu: libzim: Update to 9.2.3. Date: Fri, 3 Jan 2025 21:19:18 +0530 Message-ID: <69b0b829836874b9e87010a11223fa4732fac863.1735897389.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (libzim): Update to 9.2.3. Change-Id: I8ce4b065368f1400b25d4ebe469d83551094da28 --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8f816acfd9..dc9fc8ad06 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9309,7 +9309,7 @@ (define-public kineto (define-public libzim (package (name "libzim") - (version "8.2.1") + (version "9.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -9317,7 +9317,7 @@ (define-public libzim (commit version))) (sha256 (base32 - "1g735aqw0vlxqgyjv02lvq24dr5shydp4y8mqianf8720s5fs73f")) + "1rz8pjrd06qncvg732sg40bhdfzldnrznyaq5k6d4hj575qbwvfg")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 03 10:51:16 2025 Received: (at 75319) by debbugs.gnu.org; 3 Jan 2025 15:51:16 +0000 Received: from localhost ([127.0.0.1]:51751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTjxD-0007Dw-G2 for submit@debbugs.gnu.org; Fri, 03 Jan 2025 10:51:15 -0500 Received: from layka.disroot.org ([178.21.23.139]:41350) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tTjx5-0007Cd-Tm for 75319@debbugs.gnu.org; Fri, 03 Jan 2025 10:51:10 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A4F8F25B58; Fri, 3 Jan 2025 16:51:06 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ilZC3ok3VELO; Fri, 3 Jan 2025 16:51:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735919462; bh=jHwnZmqILmqOQYrG5uCh4Crsfams/847jsKjOs+rzTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hbaUudO9vOvmaTHICsaAvUk/CAbaflrbKwfg+oVK4mIIAXzu+vy/xoZd4YMZL2KMz u7MqIRVPw6WJhRwIUwmSl+hiTh5qi1dQp6n+MiB/QGQ3ZejOVnXzbHvmRml73Db0T0 EsDgAFLTmgUuDBTyoy3yoOPWuV3DmXqQtL5mvmzCSAvRkEBQI8mOv91p+J0e8pgJ3y u6h00V5pKHvM4deV97wVgSXG0+J2VrkPQPugQXjh/yvSBnG5omfmdY+CKDcIBC8tSm KlkQKO+//fHTaXckRUYXF/q6OqsiAIaNqnL4iRlMyysHZLV5IT0qPPmMx5a1+bW84X pxslKLoQUpEoA== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH 2/5] gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. Date: Fri, 3 Jan 2025 21:19:19 +0530 Message-ID: <1ad9fc024e273276701b48802d64e3bf09fa1801.1735897389.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (kiwix-lib): Update to 14.0.0 and rename with libkiwix. [source]: Switch to url-fetch. (kiwix-desktop,kiwix-tools)[inputs]: Replace kiwix-lib with libkiwix. Change-Id: I0f61a7e699b9d90357707446691cbd0106ad8404 --- gnu/packages/web.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index dc9fc8ad06..60a9f5681f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9340,20 +9340,20 @@ (define-public libzim for ZIM files.") (license license:gpl2))) -(define-public kiwix-lib +(define-public libkiwix (package - (name "kiwix-lib") - (version "13.0.0") + (name "libkiwix") + (version "14.0.0") (home-page "https://github.com/kiwix/kiwix-lib/") (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit version))) + (method url-fetch) + (uri (string-append + "https://download.kiwix.org/release/libkiwix/libkiwix-" + version + ".tar.xz")) (sha256 (base32 - "0mvlppbj0mqn4ka3cfaaj1pvn062cxbgz01c0nq04x0mzq1xwh5w")) - (file-name (git-file-name name version)))) + "1p0hj94rz22gvhan9y3sg40sz2lw4fsl2m3jjpqz65zxgv9n9p7v")))) (build-system meson-build-system) (arguments `(#:phases @@ -9420,7 +9420,7 @@ (define-public kiwix-desktop (list bash-minimal curl icu4c - kiwix-lib + libkiwix libmicrohttpd libzim pugixml @@ -9455,7 +9455,7 @@ (define-public kiwix-tools (inputs (list curl icu4c - kiwix-lib + libkiwix libmicrohttpd libzim pugixml -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 03 10:51:17 2025 Received: (at 75319) by debbugs.gnu.org; 3 Jan 2025 15:51:17 +0000 Received: from localhost ([127.0.0.1]:51753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTjxE-0007E0-4Q for submit@debbugs.gnu.org; Fri, 03 Jan 2025 10:51:16 -0500 Received: from layka.disroot.org ([178.21.23.139]:41366) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tTjx7-0007Cu-Ig for 75319@debbugs.gnu.org; Fri, 03 Jan 2025 10:51:12 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8731125B84; Fri, 3 Jan 2025 16:51:08 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 0RlE9IW8qo4q; Fri, 3 Jan 2025 16:51:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735919464; bh=PxgYiMZ6ruZYLYp2F4c8QYVsIBGZq70XJWQMZI7qmws=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=g6lxMAXr7AVa12toLHU58d4vwiCNTObC7KBGc81yogzWqNM9nEiUjxAOC3DOYTlRB lGAZwI4JZXvHcduXeEKvwkdbIUQ/fBEsEXrn3/Uj/sN/XU5EygqsqkuCc93PwZrg6S Ij37TfoKcYyD8Ea0YytEFjSfdMZHU9RHhxehaWqjLdy+L8T4tIVvxgJsURoUK+i/oi LPZOevxIIS5Zkvurk3mAArvrVwXKrbF2DgT6U+oQe7Ni+IoUKxC+x8Knt2qTzOBzZd JDTDjFti13nptDr5UYZUcXq4fDQQvzfjRPlfrF9XyX/sy8HLeC3PhgjpaRZmxEz5Ie 0Hl8ye9gRsACQ== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH 3/5] gnu: kiwix-desktop: Update to 2.4.1. Date: Fri, 3 Jan 2025 21:19:20 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (kiwix-desktop): Update to 2.4.1. [source]: Remove patches. [build-system]: Switch to qt-build-system. [arguments]<#:qtbase>: Use qtbase. <#:test-target>: Use "check". <#:phases>: Remove wrap-qt-process-patch phase. [inputs]: Remove qtbase-5; replace qtdeclarative-5 with qtdeclarative, qtwebchannel-5 with qtwebchannel, qtwebengine-5 with qtwebengine. [native-inputs]: Remove qtbase-5. * gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch: Delete file. * gnu/local.mk: Deregister the patch file. Change-Id: I42b7561bb2139a3aa0d1130fa200e1d72fe85fd5 --- gnu/local.mk | 1 - .../kiwix-desktop-newer-libkiwix.patch | 40 ------------------- gnu/packages/web.scm | 32 ++++++--------- 3 files changed, 12 insertions(+), 61 deletions(-) delete mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 838c2a06b3..e51311d116 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1666,7 +1666,6 @@ dist_patch_DATA = \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kismet-unbundle-boost.patch \ %D%/packages/patches/kitty-fix-wayland-protocols.patch \ - %D%/packages/patches/kiwix-desktop-newer-libkiwix.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ %D%/packages/patches/knot-remove-runtime-deps.patch \ diff --git a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch b/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch deleted file mode 100644 index a5bee60ac2..0000000000 --- a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: Fix building kiwix-desktop with libkiwix-12.1.0 -Bug: https://github.com/kiwix/kiwix-desktop/issues/964 -Origin: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 -Applied-Upstream: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 ---- -From 1b322d8f01c787846546a6473f153cf1daa41e65 Mon Sep 17 00:00:00 2001 -From: Matthieu Gautier -Date: Thu, 9 Feb 2023 09:47:47 +0100 -Subject: [PATCH] With last version of libkiwix, Downloader now return - shared_ptr. - ---- - src/contentmanager.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp -index c2f4ff9..d4db50a 100644 ---- a/src/contentmanager.cpp -+++ b/src/contentmanager.cpp -@@ -173,7 +173,7 @@ QStringList ContentManager::updateDownloadInfos(QString id, const QStringList &k - return values; - } - auto& b = mp_library->getBookById(id); -- kiwix::Download* d; -+ std::shared_ptr d; - try { - d = mp_downloader->getDownload(b.getDownloadId()); - } catch(...) { -@@ -270,7 +270,7 @@ QString ContentManager::downloadBook(const QString &id) - for (auto b : booksList) - if (b.toStdString() == book.getId()) - return ""; -- kiwix::Download *download; -+ std::shared_ptr download; - try { - std::pair downloadDir("dir", downloadPath.toStdString()); - const std::vector> options = { downloadDir }; --- -2.41.0 - diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 60a9f5681f..1d109d4315 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -105,6 +105,7 @@ (define-module (gnu packages web) #:use-module (guix build-system perl) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system scons) #:use-module (guix build-system trivial) #:use-module (gnu packages) @@ -9388,7 +9389,7 @@ (define-public libkiwix (define-public kiwix-desktop (package (name "kiwix-desktop") - (version "2.3.1") + (version "2.4.1") (source (origin (method url-fetch) (uri (string-append @@ -9397,25 +9398,18 @@ (define-public kiwix-desktop ".tar.gz")) (sha256 (base32 - "0hlk05gcb3fmnxhwj6gan51v98rdq3iv2lklwbpmm1bazmz8i7br")) - (patches (search-patches "kiwix-desktop-newer-libkiwix.patch")))) - (build-system gnu-build-system) + "1vkmk9j2jii7ri4lcayr0dr5b2w3dc24lyqmm3g4234834b1f4wl")))) + (build-system qt-build-system) (arguments - `(#:phases + `(#:qtbase ,qtbase + #:test-target "check" + #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (invoke "qmake" (string-append "PREFIX=" - (assoc-ref outputs "out"))))) - (add-after 'install 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/kiwix-desktop")) - (qt-process-path (search-input-file - inputs "/lib/qt5/libexec/QtWebEngineProcess"))) - (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (assoc-ref outputs "out")))))))) (inputs (list bash-minimal curl @@ -9424,16 +9418,14 @@ (define-public kiwix-desktop libmicrohttpd libzim pugixml - qtbase-5 - qtdeclarative-5 - qtwebchannel-5 - qtwebengine-5 + qtdeclarative + qtwebchannel + qtwebengine xapian zlib `(,zstd "lib"))) (native-inputs - (list pkg-config - qtbase-5)) + (list pkg-config)) (home-page "https://wiki.kiwix.org/wiki/Software") (synopsis "Viewer and manager of ZIM files") (description "Kiwix Desktop allows you to enjoy a lot of different content -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 03 10:51:21 2025 Received: (at 75319) by debbugs.gnu.org; 3 Jan 2025 15:51:21 +0000 Received: from localhost ([127.0.0.1]:51755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTjxI-0007EJ-KZ for submit@debbugs.gnu.org; Fri, 03 Jan 2025 10:51:21 -0500 Received: from layka.disroot.org ([178.21.23.139]:41378) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tTjxA-0007DT-No for 75319@debbugs.gnu.org; Fri, 03 Jan 2025 10:51:13 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D80EE25A96; Fri, 3 Jan 2025 16:51:11 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 0idJ67M3_Mmb; Fri, 3 Jan 2025 16:51:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735919467; bh=flozurRi1otXhcQ5XJJrzin6f65w0q/aMKL4YNXul3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JrwhAm0ASG9tzpeL3DMUN4gRcau4QsZjtPrej45/9WRAT0/WeUouYPV4+oBdMlgSh +zo0OEiRXQsXaF5AqiLdH5WjSUbPxiGmyvp92MavG5WOheX77xjlyYVWtc2MD/9dfu 9Tm6WTOB4OxWKtaUbxzpK21C2eMvgQFbYJsBFtecWJfTg90wZ5L821ApL4KG9/mEXr Og0xhgaeKtrbL1sx3ml9S8fGAawwaVlQXlm15lH5Ry84zCuIeRA8ojCIWXGzatH/CI 2oZJqsesXlztPIVVAxmGOSx1K0MyQ30tE20giwB1dOzRlJ63lqFcX8uiOYzoLT3rSe jKpjRdGQ9D6hg== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH 5/5] gnu: kiwix-tools: Update to 3.7.0. Date: Fri, 3 Jan 2025 21:19:22 +0530 Message-ID: <582746f2efd2b54bbb9a6c1c32c7058d3ce6150e.1735897389.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (kiwix-tools): Update to 3.7.0. [inputs]: Replace libkiwix with libkiwix-13. Change-Id: I55ea1f594998ac1720b462c9c86e5989a07cf019 --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3d67498a68..8bfdc8818a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9449,19 +9449,19 @@ (define-public kiwix-desktop (define-public kiwix-tools (package (name "kiwix-tools") - (version "3.5.0") + (version "3.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.kiwix.org/release/" "kiwix-tools/kiwix-tools-" version ".tar.xz")) (sha256 (base32 - "0q6b7viy1jr212q0glqid2hqxnsd2mxsx5gzcalkc4gb0bzgj32d")))) + "032lzzgn3hicai4lx701cs6h731cs29x1h59j9gggcgrp1n4wxks")))) (build-system meson-build-system) (inputs (list curl icu4c - libkiwix + libkiwix-13 libmicrohttpd libzim pugixml -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 03 10:51:21 2025 Received: (at 75319) by debbugs.gnu.org; 3 Jan 2025 15:51:21 +0000 Received: from localhost ([127.0.0.1]:51757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTjxJ-0007EL-4z for submit@debbugs.gnu.org; Fri, 03 Jan 2025 10:51:21 -0500 Received: from layka.disroot.org ([178.21.23.139]:41368) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tTjx9-0007DD-4K for 75319@debbugs.gnu.org; Fri, 03 Jan 2025 10:51:13 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 33EF925B7F; Fri, 3 Jan 2025 16:51:10 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 7jmklRvPuTZh; Fri, 3 Jan 2025 16:51:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735919465; bh=WpYNiroLIkvUlcMfFJH4HXZf6scNlM89OBlsdkpCnno=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LqVeGoLJMsyQ4Fkq/SWLXRFaGFLrHpR99s2QOeyhynT/Xnj8jkySeSW4mhtCJmUO2 7nmvz9gryptumc5WytX2o5qQNEhEr8nQxpq0rYvZfLi7XDxAlfL9K8qsh19yMabSvE i3YZ5cyjncwEkmQjMLJqaKiFx4FCwj78AhQtwBBFSJ5wNDPbQm4za11t7T+Od8l6We lV2TIUS0BtEtL2saptxDw3vQYxdcQYpr+38cruCfIw+Uu2YiV3WZiFi6XmB41bTFry ZjmXA7fnHjne/29dmbYYcry5AfpkkyIEA9u5WAfwGJXa0Z3yshUDPq4nUCOIk7xVk6 HVvm0bJa+7PXA== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH 4/5] gnu: Add libkiwix-13. Date: Fri, 3 Jan 2025 21:19:21 +0530 Message-ID: <16ecc4f8d92af2697058dac583bace43343b4921.1735897389.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (libkiwix-13): New variable. Change-Id: I792513ebe0721c3d0b399b2320c82328e40e3eb4 --- gnu/packages/web.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1d109d4315..3d67498a68 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9386,6 +9386,20 @@ (define-public libkiwix It contains the code shared by all Kiwix ports.") (license license:gpl3))) +(define-public libkiwix-13 + ;; TODO: After updating kiwix-tools, delete this variable when not needed. + (package/inherit libkiwix + (version "13.1.0") + (source (origin + (inherit (package-source libkiwix)) + (uri (string-append + "https://download.kiwix.org/release/libkiwix/libkiwix-" + version + ".tar.xz")) + (sha256 + (base32 + "1dfb3178vjg2db0gwgfqy4c91039x9n3kzzlszgaj191f39dwn8m")))))) + (define-public kiwix-desktop (package (name "kiwix-desktop") -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 22 02:01:51 2025 Received: (at 75319) by debbugs.gnu.org; 22 Jan 2025 07:01:51 +0000 Received: from localhost ([127.0.0.1]:59356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taUkJ-0005gW-Cb for submit@debbugs.gnu.org; Wed, 22 Jan 2025 02:01:51 -0500 Received: from 10.mo582.mail-out.ovh.net ([87.98.157.236]:45987) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1taUkF-0005gK-UZ for 75319@debbugs.gnu.org; Wed, 22 Jan 2025 02:01:49 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.140.215]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4YdFP60cGFz1Rsd for <75319@debbugs.gnu.org>; Wed, 22 Jan 2025 07:01:45 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-mjqls (unknown [10.110.178.103]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 8D68B1FE96; Wed, 22 Jan 2025 07:01:45 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-5b5ff79f4f-mjqls with ESMTPSA id CLjqFtmXkGfLjRwAr1gRlA (envelope-from ); Wed, 22 Jan 2025 07:01:45 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G0024c4b163d-65bf-4e5e-b08a-6e5005de4bbd, 8AA3B0E3754C1A78EF5A7F16F5CAFA84C3D2551E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves To: Sughosha via Guix-patches via , 75319@debbugs.gnu.org Subject: Re: [bug#75319] [PATCH 2/5] gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. In-Reply-To: <1ad9fc024e273276701b48802d64e3bf09fa1801.1735897389.git.sughosha@disroot.org> References: <1ad9fc024e273276701b48802d64e3bf09fa1801.1735897389.git.sughosha@disroot.org> Date: Wed, 22 Jan 2025 08:01:45 +0100 Message-ID: <87plkf72na.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 10941776770556355279 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejfedguddttdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefhgedtjeevtedvgeelieeugfetvedtleeigeeuhfdvjeetjeejffeuvdeiffdtffenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeehfeduleesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=kMdlJhpd6V/U+IC4xmRYbv16bhwGhDOrtnEobMzKvdU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737529306; v=1; b=AfEzWw8C+6uCFSeF32V/SshZBOI12k5G9U4WvrdaD6P4e2ID/SqhRMsOmYPFb3MsZpZnZEfT dTW/ZyIe1Y75/Kv8feSyvYLfHaC4kNzWm5fZuNHoanSca0wAZlsBKyv+vja9KqU5gmmYMdWVdsk VeSgUCuaRnbKoHNAgWrRrAPCe1MqXiJ+Hx2O+GaB/KlDg64DtWllGnxbv/EX1ZmlayNY9PDgwFP 1VoUa79pwCckj8Rj2uK5WpnQfd6GhIQdh4rWWIoqmz+Dlnjd/sMrv7fZ+r6RNxUSBInErZ3MCij QLfOncx+xnNvcdzpJxRaq+pYi6h7mhoGKqi3YYo5HGn2g== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2025-01-03 21:19, Sughosha via Guix-patches via wrote: > * gnu/packages/web.scm (kiwix-lib): Update to 14.0.0 and rename with libkiwix. > [source]: Switch to url-fetch. > (kiwix-desktop,kiwix-tools)[inputs]: Replace kiwix-lib with libkiwix. > > Change-Id: I0f61a7e699b9d90357707446691cbd0106ad8404 > --- > gnu/packages/web.scm | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm > index dc9fc8ad06..60a9f5681f 100644 > --- a/gnu/packages/web.scm > +++ b/gnu/packages/web.scm > @@ -9340,20 +9340,20 @@ (define-public libzim > for ZIM files.") > (license license:gpl2))) > > -(define-public kiwix-lib > +(define-public libkiwix > (package > - (name "kiwix-lib") > - (version "13.0.0") > + (name "libkiwix") > + (version "14.0.0") > (home-page "https://github.com/kiwix/kiwix-lib/") Hi! Thanks for the patch series :) Here guix lint complains: gnu/packages/web.scm:9381:15: libkiwix@14.0.0: permanent redirect from https://github.com/kiwix/kiwix-lib/ to https://github.com/kiwix/libkiwix Also if it's possible that someone uses libkiwix in another channel or in personnal usage, we should probably use (define-deprecated/alias kiwix-lib libkiwix) (export kiwix-lib) so that they are warned to change. -- Best regards, Nicolas Graves From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 22 02:10:27 2025 Received: (at submit) by debbugs.gnu.org; 22 Jan 2025 07:10:27 +0000 Received: from localhost ([127.0.0.1]:59400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taUsc-00069u-TT for submit@debbugs.gnu.org; Wed, 22 Jan 2025 02:10:27 -0500 Received: from lists.gnu.org ([2001:470:142::17]:46546) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1taUsQ-00063i-HJ for submit@debbugs.gnu.org; Wed, 22 Jan 2025 02:10:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1taUsG-0005RM-My for guix-patches@gnu.org; Wed, 22 Jan 2025 02:10:06 -0500 Received: from 2.mo576.mail-out.ovh.net ([178.33.251.80]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1taUsD-0008SI-12 for guix-patches@gnu.org; Wed, 22 Jan 2025 02:10:03 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.2.21]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4YdFZY22fbz1x5F for ; Wed, 22 Jan 2025 07:09:57 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-mjqls (unknown [10.110.178.126]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 5B2D41FE5A; Wed, 22 Jan 2025 07:09:56 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-5b5ff79f4f-mjqls with ESMTPSA id OWqfCMSZkGftkRwAr1gRlA (envelope-from ); Wed, 22 Jan 2025 07:09:56 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G00164a71fbd-a0ee-47b8-8dc3-c4ff013fb393, 8AA3B0E3754C1A78EF5A7F16F5CAFA84C3D2551E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves To: Sughosha via Guix-patches via , 75319@debbugs.gnu.org Subject: Re: [bug#75319] [PATCH 0/5] Update kiwix-desktop to 2.4.1 and kiwix-tools to 3.7.0. In-Reply-To: References: Date: Wed, 22 Jan 2025 08:09:55 +0100 Message-ID: <87ldv3729o.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Ovh-Tracer-Id: 11080262462032831183 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejfedguddtfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhffkfggtgesmhdtreertddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefftdevtdegvdfgudegfeeuueduuefhgedtlefgvdeivdetueffjeetieehuedtgfenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=AKo5higOiNgp7f3g121E6YkNpAWGhH3HvO08ggZ78Oc=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737529797; v=1; b=N+8NQlhGXBn67+5Txi/2EDesgF6wPPC0kT/WRdoOkk+9RFheEzzXYo1jI+kEbwUHBStjxxc1 5+OhI8a7DXPtEPoHs2XEGRg6tZTUbjyAS+UR1iMdkL1uQIiyjZW4KsNAxQRfPOEvj1Q67XAtZdy 19mmEKkhyfTvRhQYutLTNXz9UaYpXlHQJoK6GotkxoRzwHaQI0gtztG7tGVDbAdqehjTAHc2PbM KFaUUCL3goo/MGlcPo0DDi9Jv2/7tZ2cehigfPMy87r+uIAQn9vZE6FN3LMjd+UCP2z98Gp/Ghk 4WvOfytUdjCTZ0zSRDA6dUpYRnF0hKYB+fq7J9ysbrKJA== Received-SPF: pass client-ip=178.33.251.80; envelope-from=ngraves@ngraves.fr; helo=2.mo576.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --=-=-= Content-Type: text/plain On 2025-01-03 21:11, Sughosha via Guix-patches via wrote: > This patch series updates kiwix-desktop to 2.4.1 and kiwix-tools to 3.7.0. > > Sughosha (5): > gnu: libzim: Update to 9.2.3. > gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. > gnu: kiwix-desktop: Update to 2.4.1. > gnu: Add libkiwix-13. > gnu: kiwix-tools: Update to 3.7.0. > > gnu/local.mk | 1 - > .../kiwix-desktop-newer-libkiwix.patch | 40 ---------- > gnu/packages/web.scm | 76 ++++++++++--------- > 3 files changed, 41 insertions(+), 76 deletions(-) > delete mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch > > > base-commit: 3ea95d7736be1f807d578d17c174b0976543b333 Hi! You can find attached a patch to enable tests for libzim, can you include it in a v2 if QA catches up? Thanks! Made a comment on a patch, otherwise LGTM (build and lint). --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-libzim-Enable-tests.patch >From a7f496f3de76cd1896ef30678325ea8e116636be Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Wed, 22 Jan 2025 07:54:30 +0100 Subject: [PATCH] gnu: libzim: Enable tests. * gnu/packages/web.scm (libzim-testing-suite): New variable. (libzim)[arguments]<#:phases>: Add phase 'inject-test-data. <#:configure-flags>: Set test_data_dir. --- gnu/packages/web.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f966556ed9..2acad4b447 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9322,6 +9322,16 @@ (define-public kineto of Geminispace, but it defaults to a specific domain.") (license license:gpl3+))) +(define libzim-testing-suite + (origin + (method url-fetch) + (uri (format #f "https://github.com/openzim/\ +zim-testing-suite/releases/download/~a/zim-testing-suite-~a.tar.gz" + "0.6.0" + "0.6.0")) + (sha256 + (base32 "14pas22zvxd1bw6z2iy0dqa8k1gh0b8dvlml2wi8c73rl94i7aas")))) + (define-public libzim (package (name "libzim") @@ -9337,8 +9347,16 @@ (define-public libzim (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments - ;; TODO: Find out why tests fail. - '(#:tests? #f)) + (list #:configure-flags ''("-Dtest_data_dir=test_data") + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'inject-test-data + (lambda _ + (with-directory-excursion (dirname (getcwd)) + (mkdir-p "build/test_data") + (invoke "tar" "--strip-components=1" + "-xf" #+libzim-testing-suite + "-C" "build/test_data"))))))) (inputs (list icu4c python-wrapper ; for libzim-compile-resources -- 2.47.1 --=-=-= Content-Type: text/plain -- Best regards, Nicolas Graves --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 23 07:46:20 2025 Received: (at 75319) by debbugs.gnu.org; 23 Feb 2025 12:46:20 +0000 Received: from localhost ([127.0.0.1]:59749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmBNE-0007Kl-Be for submit@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:20 -0500 Received: from layka.disroot.org ([178.21.23.139]:37184) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmBN8-0007KS-Fe for 75319@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:18 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id AD32F25DB5; Sun, 23 Feb 2025 13:46:12 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id fQcNK93ZyuxD; Sun, 23 Feb 2025 13:46:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740314768; bh=rT2BuBjjO8/8DmbB3Yg2xB1TpRCdRg8Sw+/W/nnRkOc=; h=From:To:Cc:Subject:Date; b=bj7pKOi6AaLXW0fQriZ5ELGNXBnwUyEpR2/WDwVfLthCn6pA4YrJQ9WyyU4OB7pYe HGKAab+Ebpej3GHnzoYhR0x/NLKBIY+Ap89vAQ+DA3JyEKLHCkKxVB2lay/wMdbZcI fFu5NtANLGdGKXfbJ7Qwc3y4DThjv52OxCRLIdFsL+gxFe2BP8Y5/yVRt0yfVue7Hv rvtZXBkOsxbvz1xNHj99gy7A2p99vkDfFNG7DJ3yZCk3tuvMv2LIUq7YFHw/xvm4hb ZD+saKw3C9hn+x5LF+ue3gacjS8+q+J+9i/b0gWPOb2oR+GLLz2f/Xl67BZ7DMUPuY McdEW4MQBTS+Q== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v2 0/6] Update kiwix-desktop to 2.4.1 and kiwix-tools to 3.7.0. Date: Sun, 23 Feb 2025 18:12:52 +0530 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) In this v2 series, changes have been made as per the review of Nicolas but with a small modification to his patch. Nicolas Graves (1): gnu: libzim: Enable tests. Sughosha (5): gnu: libzim: Update to 9.2.3. gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. gnu: kiwix-desktop: Update to 2.4.1. gnu: Add libkiwix-13. gnu: kiwix-tools: Update to 3.7.0. gnu/local.mk | 1 - .../kiwix-desktop-newer-libkiwix.patch | 40 ------- gnu/packages/web.scm | 103 +++++++++++------- 3 files changed, 65 insertions(+), 79 deletions(-) delete mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch base-commit: 4317534b9a93b32ffd13bbe69fed57ffe00b5536 -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 23 07:46:27 2025 Received: (at 75319) by debbugs.gnu.org; 23 Feb 2025 12:46:27 +0000 Received: from localhost ([127.0.0.1]:59753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmBNK-0007L7-SX for submit@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:27 -0500 Received: from layka.disroot.org ([178.21.23.139]:48694) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmBND-0007Ke-IE for 75319@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:19 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8BD5B25DB5; Sun, 23 Feb 2025 13:46:18 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 1asdlF_VewOj; Sun, 23 Feb 2025 13:46:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740314778; bh=tPsT6Gt7zZC72TBqW3r9u5GCoWNkpmriL3ucHr/bUdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=X3z5421WGgSCo9WMlgS3iPQ05a6KN04JiCZmHtCi4zQM+/LXT1IOWsVp5MrI47Wbw GriSbDXc3FQHEgbaFjKqyjqTexErcvHfZImaRE6yYK3piqiC8ZAKIztEyCctwN4Qjq MOQV09EiE8o6b2XbXcKn2vUWuV2Zf/w7DC+lo9U6LPwSfFFrXBqsKISv9iqpCOHsvZ XSKImXTD8dFicAnP7vY/WklptzKgraKHa/lDikps4mWjMTXB6uEoW38Twv3LjOWNUz skCGnzaUOlYW986sKs08+IeO/C/bxVbqZFnzqmLCvO1IZeNt8wq34LfLJc78lpRiG7 2jqA3A37VvcOw== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v2 1/6] gnu: libzim: Update to 9.2.3. Date: Sun, 23 Feb 2025 18:12:53 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (libzim): Update to 9.2.3. Change-Id: I8ce4b065368f1400b25d4ebe469d83551094da28 --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0030e152b4..90cd02313c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9369,7 +9369,7 @@ (define-public kineto (define-public libzim (package (name "libzim") - (version "8.2.1") + (version "9.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -9377,7 +9377,7 @@ (define-public libzim (commit version))) (sha256 (base32 - "1g735aqw0vlxqgyjv02lvq24dr5shydp4y8mqianf8720s5fs73f")) + "1rz8pjrd06qncvg732sg40bhdfzldnrznyaq5k6d4hj575qbwvfg")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 23 07:46:27 2025 Received: (at 75319) by debbugs.gnu.org; 23 Feb 2025 12:46:27 +0000 Received: from localhost ([127.0.0.1]:59755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmBNL-0007LF-AT for submit@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:27 -0500 Received: from layka.disroot.org ([178.21.23.139]:48700) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmBNF-0007Kn-7T for 75319@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:25 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4B355252D9; Sun, 23 Feb 2025 13:46:20 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id v0svPnOkXnVJ; Sun, 23 Feb 2025 13:46:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740314779; bh=nnrE1l/u/UpMDG8RySOFnuRSD2P9gP4EZf+RtfiH130=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aOP3MlHaP1KoQ1fYIwhtWBLPpeGvqY2tXevO66LruHbRtV9KQf6sFsi72saiOsIiP i0AkQRz/1/Zew/UV7uSxan+S7+vPF70EAeFMM4dP46+lWwqlfhqoIJlxH+REXEaXSd va9VE8QCk7INu7aXLzuvlQdj9N9x29E4trdqY85NAmb88k1x4nb+GbJCQ5UiSAjYox sSuu0BGzVHn/d/5O5D5uj9fUemizwB69NYFRu62UYrRwbRtkSOgpm0pmsS7E43RohO spEawz4joOOcVvoLgrKT5WQ2Y1BKLeiRb/hwpwdKvFqERoJj76H8qNAtIYjFI/yzgi BvMurb3f0OgIA== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v2 2/6] gnu: libzim: Enable tests. Date: Sun, 23 Feb 2025 18:12:54 +0530 Message-ID: <41c42b5cc7f3516421dc35c2a0e8f45fb2f30ad6.1740314578.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Nicolas Graves X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Nicolas Graves * gnu/packages/web.scm (libzim-testing-suite): New variable. (libzim)[arguments]<#:phases>: Add phase 'inject-test-data. <#:configure-flags>: Set test_data_dir. Change-Id: I9dc05ccad8b6b4cfd31bea8eaa9b9a03271240f6 --- gnu/packages/web.scm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 90cd02313c..767f814c2d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9366,6 +9366,17 @@ (define-public kineto of Geminispace, but it defaults to a specific domain.") (license license:gpl3+))) +(define zim-testing-suite + (let ((version "0.7.0")) + (origin + (method url-fetch) + (uri + (string-append "https://github.com/openzim/zim-testing-suite/releases/" + "download/" version "/zim-testing-suite-" version + ".tar.gz")) + (sha256 + (base32 "1r5cibid3p5x3f463scy309ji9am0ys50s7ray4gv79wjyb1vnmj"))))) + (define-public libzim (package (name "libzim") @@ -9381,8 +9392,16 @@ (define-public libzim (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments - ;; TODO: Find out why tests fail. - '(#:tests? #f)) + (list #:configure-flags ''("-Dtest_data_dir=test_data") + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'inject-test-data + (lambda _ + (with-directory-excursion (dirname (getcwd)) + (mkdir-p "build/test_data") + (invoke "tar" "--strip-components=1" + "-xf" #+zim-testing-suite + "-C" "build/test_data"))))))) (inputs (list icu4c python-wrapper ; for libzim-compile-resources -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 23 07:46:38 2025 Received: (at 75319) by debbugs.gnu.org; 23 Feb 2025 12:46:38 +0000 Received: from localhost ([127.0.0.1]:59760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmBNV-0007M8-Sw for submit@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:38 -0500 Received: from layka.disroot.org ([178.21.23.139]:57316) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmBNK-0007L5-IZ for 75319@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:27 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id AE6D925CBB; Sun, 23 Feb 2025 13:46:25 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Wjg7AInTCSSU; Sun, 23 Feb 2025 13:46:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740314781; bh=qPB8SVNvS8+f1C9V3fR11icergavihqJeO21LINlKqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SkTmdf41UW5KgW0lG7SRzuHEru/8qunCzMCVZlYLZM/CSTQejkKKzrTrt71RRqujs 8K+mc+nf40yJppeQSUbJ2TQEy1J+P/8QgsoD1DdcGdsLCo8Q1Zw0RLzPT6m3l5DHVH F8V4J2P5bm1t5WvSiqFitYClYIzD9of0CvxFRVJYc17frWIVS3dnrJOjAlG0cE06hK 0hVidrCsEY5vUg+S3EfAErZZlBIW/Jdz5lOUQ1w7KgiU5J8A9WGVPq+9Zv6W6T07Xz zLqxumzhQj/2fu38VYSAot5909u4XxhqYJGt6kDA2nqIzQY8JC56i6v2vtN4l+vDEI GdSOpJKIVrNNg== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v2 3/6] gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. Date: Sun, 23 Feb 2025 18:12:55 +0530 Message-ID: <3a303c18c694f59b383c10415b146acc3ff9545f.1740314578.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (kiwix-lib): Update to 14.0.0, rename with libkiwix and deprecate kiwix-lib. [home-page]: Update. [source]: Switch to url-fetch. (kiwix-desktop,kiwix-tools)[inputs]: Replace kiwix-lib with libkiwix. Change-Id: Icaf0d28168078e92f7cfcd54ba0f4e10fb3c477f --- gnu/packages/web.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 767f814c2d..14914eaa3e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -90,6 +90,7 @@ (define-module (gnu packages web) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix deprecation) #:use-module (guix gexp) #:use-module (guix cvs-download) #:use-module (guix hg-download) @@ -9419,20 +9420,20 @@ (define-public libzim for ZIM files.") (license license:gpl2))) -(define-public kiwix-lib +(define-public libkiwix (package - (name "kiwix-lib") - (version "13.0.0") - (home-page "https://github.com/kiwix/kiwix-lib/") + (name "libkiwix") + (version "14.0.0") + (home-page "https://github.com/kiwix/libkiwix") (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit version))) + (method url-fetch) + (uri (string-append + "https://download.kiwix.org/release/libkiwix/libkiwix-" + version + ".tar.xz")) (sha256 (base32 - "0mvlppbj0mqn4ka3cfaaj1pvn062cxbgz01c0nq04x0mzq1xwh5w")) - (file-name (git-file-name name version)))) + "1p0hj94rz22gvhan9y3sg40sz2lw4fsl2m3jjpqz65zxgv9n9p7v")))) (build-system meson-build-system) (arguments `(#:phases @@ -9464,6 +9465,8 @@ (define-public kiwix-lib It contains the code shared by all Kiwix ports.") (license license:gpl3))) +(define-deprecated/public-alias kiwix-lib libkiwix) + (define-public kiwix-desktop (package (name "kiwix-desktop") @@ -9500,7 +9503,7 @@ (define-public kiwix-desktop (list bash-minimal curl icu4c - kiwix-lib + libkiwix libmicrohttpd libzim pugixml @@ -9536,7 +9539,7 @@ (define-public kiwix-tools (inputs (list curl icu4c - kiwix-lib + libkiwix libmicrohttpd libzim pugixml -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 23 07:46:38 2025 Received: (at 75319) by debbugs.gnu.org; 23 Feb 2025 12:46:38 +0000 Received: from localhost ([127.0.0.1]:59762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmBNW-0007MB-FP for submit@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:38 -0500 Received: from layka.disroot.org ([178.21.23.139]:57336) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmBNN-0007LV-LP for 75319@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:30 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id CC4BC25CBB; Sun, 23 Feb 2025 13:46:28 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ieiZTIQzOdgt; Sun, 23 Feb 2025 13:46:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740314784; bh=8o2RpDgm2+oOdCob6nFU799mUnuAxvjQ0Mux7YO5sYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZGv6MqFCCwnAIgMebgdrhlnA7k+zC/lN05QCWxI7TYkzFAeBvLEAcGI2KbPwJTf93 x7DysU6tJo3k3p3fcM1lcpU2i0PZLQO4d53EiQ8Snz7pLOENR0lMF4BcdaAx8BNswg vG+FY4iWer8Yq7EmOHCdMwbOHSoQJVkyZzfa24uEeC1OQ2tGvSxhg8aJaV5SNZ++4D bmXTo6WvUBKf6oqEcG5G+7wyrlmFr3NSNI4YpAl0X94ASp/zaSA6KbfobiPWHt5jtz cwoDrvWKi1ogPCpAeKwFykFQT8lg+xvKfK16/oGYu+YPoO8YQuDMUa21USjZSpDfmZ sGA3Xk880p7VQ== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v2 5/6] gnu: Add libkiwix-13. Date: Sun, 23 Feb 2025 18:12:57 +0530 Message-ID: <72637408996e2911deac89d3b2a9c908ed2e44e9.1740314578.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (libkiwix-13): New variable. Change-Id: I4ce766b5dce4b377b3106cb4ecdcf2d718aa7675 --- gnu/packages/web.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 574caa182c..a65a9390ad 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9467,6 +9467,20 @@ (define-public libkiwix (define-deprecated/public-alias kiwix-lib libkiwix) +(define-public libkiwix-13 + ;; TODO: After updating kiwix-tools, delete this variable when not needed. + (package/inherit libkiwix + (version "13.1.0") + (source (origin + (inherit (package-source libkiwix)) + (uri (string-append + "https://download.kiwix.org/release/libkiwix/libkiwix-" + version + ".tar.xz")) + (sha256 + (base32 + "1dfb3178vjg2db0gwgfqy4c91039x9n3kzzlszgaj191f39dwn8m")))))) + (define-public kiwix-desktop (package (name "kiwix-desktop") -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 23 07:46:39 2025 Received: (at 75319) by debbugs.gnu.org; 23 Feb 2025 12:46:39 +0000 Received: from localhost ([127.0.0.1]:59764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmBNW-0007MJ-RD for submit@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:39 -0500 Received: from layka.disroot.org ([178.21.23.139]:57330) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmBNM-0007LK-4q for 75319@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:30 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1D697252D9; Sun, 23 Feb 2025 13:46:27 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id dlL7sFTrc51T; Sun, 23 Feb 2025 13:46:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740314782; bh=jxI+RWyw7QZoEH+J7tMbe1hWxC0aij8XvIeVI6/3ADI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dfRojSWHaeH6/7TCA/aYxwAQBzz5eLK8MuuGmJAzyYTjeB1/RkxAs7o7RHcjlN0XJ IMWiEPON6U6jn6RDWq2uuTZRrbwJ0KKrun83Z6r3QWxaD++ieP2r23H0PoC3Arf3UX R4gBPGS7P7fSGQxL9MnMgu1cHP3cAlD1Vwfm0D+DGyxMNkl1QWrUYssn2tLfJ49GLb nV5mDx+F5yD+YPJem+BkhkOXbovdTK5MQoZYSzrSdXaZTXWsSliKqhiQDYrfn5BOih plJrYBPdD7urCLzRSyNC2l4kn0BXIhtWBVjakDomwiXJO1yz528OQuO/+NUCr+NyrN F2v2ilEpzDDMw== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v2 4/6] gnu: kiwix-desktop: Update to 2.4.1. Date: Sun, 23 Feb 2025 18:12:56 +0530 Message-ID: <3a064b4ea5907ab05bf36c9d41f7e74ad6e3bfa9.1740314578.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (kiwix-desktop): Update to 2.4.1. [source]: Remove patches. [arguments]<#:qtbase>: Use qtbase. <#:phases>: Remove wrap-qt-process-patch phase. [inputs]: Remove qtbase-5; replace qtdeclarative-5 with qtdeclarative, qtwebchannel-5 with qtwebchannel, qtwebengine-5 with qtwebengine and qtwayland-5 with qtwayland. [native-inputs]: Remove qtbase-5. * gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch: Delete file. * gnu/local.mk: Deregister the patch file. Change-Id: Id6eb8e2e86d46263bd7d04258dea31b792ef6e08 --- gnu/local.mk | 1 - .../kiwix-desktop-newer-libkiwix.patch | 40 ------------------- gnu/packages/web.scm | 31 +++++--------- 3 files changed, 11 insertions(+), 61 deletions(-) delete mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73116fdc1b..c68a9e294b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1683,7 +1683,6 @@ dist_patch_DATA = \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kismet-unbundle-boost.patch \ %D%/packages/patches/kitty-fix-wayland-protocols.patch \ - %D%/packages/patches/kiwix-desktop-newer-libkiwix.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ %D%/packages/patches/knot-remove-runtime-deps.patch \ diff --git a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch b/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch deleted file mode 100644 index a5bee60ac2..0000000000 --- a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: Fix building kiwix-desktop with libkiwix-12.1.0 -Bug: https://github.com/kiwix/kiwix-desktop/issues/964 -Origin: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 -Applied-Upstream: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 ---- -From 1b322d8f01c787846546a6473f153cf1daa41e65 Mon Sep 17 00:00:00 2001 -From: Matthieu Gautier -Date: Thu, 9 Feb 2023 09:47:47 +0100 -Subject: [PATCH] With last version of libkiwix, Downloader now return - shared_ptr. - ---- - src/contentmanager.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp -index c2f4ff9..d4db50a 100644 ---- a/src/contentmanager.cpp -+++ b/src/contentmanager.cpp -@@ -173,7 +173,7 @@ QStringList ContentManager::updateDownloadInfos(QString id, const QStringList &k - return values; - } - auto& b = mp_library->getBookById(id); -- kiwix::Download* d; -+ std::shared_ptr d; - try { - d = mp_downloader->getDownload(b.getDownloadId()); - } catch(...) { -@@ -270,7 +270,7 @@ QString ContentManager::downloadBook(const QString &id) - for (auto b : booksList) - if (b.toStdString() == book.getId()) - return ""; -- kiwix::Download *download; -+ std::shared_ptr download; - try { - std::pair downloadDir("dir", downloadPath.toStdString()); - const std::vector> options = { downloadDir }; --- -2.41.0 - diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 14914eaa3e..574caa182c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9470,7 +9470,7 @@ (define-deprecated/public-alias kiwix-lib libkiwix) (define-public kiwix-desktop (package (name "kiwix-desktop") - (version "2.3.1") + (version "2.4.1") (source (origin (method url-fetch) (uri (string-append @@ -9479,26 +9479,19 @@ (define-public kiwix-desktop ".tar.gz")) (sha256 (base32 - "0hlk05gcb3fmnxhwj6gan51v98rdq3iv2lklwbpmm1bazmz8i7br")) - (patches (search-patches "kiwix-desktop-newer-libkiwix.patch")))) + "1vkmk9j2jii7ri4lcayr0dr5b2w3dc24lyqmm3g4234834b1f4wl")))) (build-system qt-build-system) (arguments - `(#:test-target "check" + `(#:qtbase ,qtbase + #:test-target "check" #:phases (modify-phases %standard-phases + ;; Configure using qmake. (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (invoke "qmake" (string-append "PREFIX=" - (assoc-ref outputs "out"))))) - (add-after 'install 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/kiwix-desktop")) - (qt-process-path (search-input-file - inputs "/lib/qt5/libexec/QtWebEngineProcess"))) - (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (assoc-ref outputs "out")))))))) (inputs (list bash-minimal curl @@ -9507,17 +9500,15 @@ (define-public kiwix-desktop libmicrohttpd libzim pugixml - qtbase-5 - qtdeclarative-5 - qtwebchannel-5 - qtwebengine-5 - qtwayland-5 + qtdeclarative + qtwebchannel + qtwebengine + qtwayland xapian zlib `(,zstd "lib"))) (native-inputs - (list pkg-config - qtbase-5)) + (list pkg-config)) (home-page "https://wiki.kiwix.org/wiki/Software") (synopsis "Viewer and manager of ZIM files") (description "Kiwix Desktop allows you to enjoy a lot of different content -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 23 07:46:39 2025 Received: (at 75319) by debbugs.gnu.org; 23 Feb 2025 12:46:39 +0000 Received: from localhost ([127.0.0.1]:59766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmBNX-0007MP-Df for submit@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:39 -0500 Received: from layka.disroot.org ([178.21.23.139]:57346) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmBNQ-0007Lj-BW for 75319@debbugs.gnu.org; Sun, 23 Feb 2025 07:46:32 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 651A0252D9; Sun, 23 Feb 2025 13:46:31 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id wdZhOAfqPgMY; Sun, 23 Feb 2025 13:46:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740314787; bh=LEEEYmE/5XmS6vI4oLBPvyS8xpmjixB7LBUnVI4EZWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GCMEh1EFQfQHjRMBPoST+wUOECjWBQIFGSGrt8rvTcsm08b63lSqiPxbcugLYkUkR GuK4YW7quzj1KHhUBOGW3j14Y/BpkbajU9Orx9H9DNDDsYzTzhUep8GRFomWppwqMQ ZwZatXBZM7P+zKQJIZq33F5c8+v9bwISAp9DWyY1uDW/KDfy9+uDHXOp/ttzuiNJJY tgRJvf2f5SxBGy2kBvdVRciXb2uQzJBGhqUdHMe4BASpJ8/xic/TBEkoVeQA744z8f V5KC8j+yuIlVqBcK8qjzcDpjsH7E1vaC37RY5QDHF+unVRHzDxiDlWMVHZkZKAl0Rs 1+1Ol7ZL8SOyQ== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v2 6/6] gnu: kiwix-tools: Update to 3.7.0. Date: Sun, 23 Feb 2025 18:12:58 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (kiwix-tools): Update to 3.7.0. [inputs]: Replace libkiwix with libkiwix-13. Change-Id: I55ea1f594998ac1720b462c9c86e5989a07cf019 --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a65a9390ad..f977aa6d65 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9532,19 +9532,19 @@ (define-public kiwix-desktop (define-public kiwix-tools (package (name "kiwix-tools") - (version "3.5.0") + (version "3.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.kiwix.org/release/" "kiwix-tools/kiwix-tools-" version ".tar.xz")) (sha256 (base32 - "0q6b7viy1jr212q0glqid2hqxnsd2mxsx5gzcalkc4gb0bzgj32d")))) + "032lzzgn3hicai4lx701cs6h731cs29x1h59j9gggcgrp1n4wxks")))) (build-system meson-build-system) (inputs (list curl icu4c - libkiwix + libkiwix-13 libmicrohttpd libzim pugixml -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 24 00:29:48 2025 Received: (at 75319) by debbugs.gnu.org; 24 Feb 2025 05:29:48 +0000 Received: from localhost ([127.0.0.1]:37944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmR2K-00080z-87 for submit@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:48 -0500 Received: from layka.disroot.org ([178.21.23.139]:38790) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmR2H-00080f-7d for 75319@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:45 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5854325F99; Mon, 24 Feb 2025 06:29:44 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id dlLqybMOg8Be; Mon, 24 Feb 2025 06:29:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740374980; bh=1bSvyHzxE5WyBs9UDrqSdIoySWTqs1xbpflmXbFXp8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UBhfqW+ferTlhwGzV2BmSqUlpieEQ3cGiz0gimGVGmfdEaZS+jRB1Jpzait0okSj8 C9c5K9wwaE5+iZ+Rfgn2RtABDMR1iO7rOl4XSQ5pYvwLis35qA+ZAqood4lUWpzrHY g+LqEQjE3pkfhmFvIe/vYSJ8XGQ7dcY2wBAXfF+InLEaWX01y7ykLtzn3L3ff1BusJ mXG8MIJlazBmjXjgxfIvcKEO016aww1Oylyd7iBvOkCuIgCTVDyJPD5+we7k73TY3G BZPdHRRAHUlY2U7Q0DFumbvwBCDo2fCeRWRnE58llvn2LOcieng4CYKmTMiCsc/Otg OtP9Pkwr/Dnlg== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v3 2/6] gnu: libzim: Enable tests. Date: Mon, 24 Feb 2025 10:58:58 +0530 Message-ID: <6df5f1d1c304952e75ef5b7bb57c94f6fea04e31.1740374942.git.sughosha@disroot.org> In-Reply-To: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> References: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (zim-testing-suite): New variable. (libzim)[arguments]<#:phases>: Add phase 'inject-test-data. <#:configure-flags>: Set test_data_dir. Change-Id: I9dc05ccad8b6b4cfd31bea8eaa9b9a03271240f6 --- gnu/packages/web.scm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 90cd02313c..767f814c2d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9366,6 +9366,17 @@ (define-public kineto of Geminispace, but it defaults to a specific domain.") (license license:gpl3+))) +(define zim-testing-suite + (let ((version "0.7.0")) + (origin + (method url-fetch) + (uri + (string-append "https://github.com/openzim/zim-testing-suite/releases/" + "download/" version "/zim-testing-suite-" version + ".tar.gz")) + (sha256 + (base32 "1r5cibid3p5x3f463scy309ji9am0ys50s7ray4gv79wjyb1vnmj"))))) + (define-public libzim (package (name "libzim") @@ -9381,8 +9392,16 @@ (define-public libzim (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments - ;; TODO: Find out why tests fail. - '(#:tests? #f)) + (list #:configure-flags ''("-Dtest_data_dir=test_data") + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'inject-test-data + (lambda _ + (with-directory-excursion (dirname (getcwd)) + (mkdir-p "build/test_data") + (invoke "tar" "--strip-components=1" + "-xf" #+zim-testing-suite + "-C" "build/test_data"))))))) (inputs (list icu4c python-wrapper ; for libzim-compile-resources -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 24 00:29:57 2025 Received: (at 75319) by debbugs.gnu.org; 24 Feb 2025 05:29:57 +0000 Received: from localhost ([127.0.0.1]:37949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmR2S-00081Y-PX for submit@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:57 -0500 Received: from layka.disroot.org ([178.21.23.139]:38786) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmR2G-00080b-BI for 75319@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:47 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8968A25F1A; Mon, 24 Feb 2025 06:29:42 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id zXZKUi0Sz8tI; Mon, 24 Feb 2025 06:29:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740374978; bh=ScF9kvy/UhS7BPY4kO9lln3y+r6qv8+spz5m9QZGuvg=; h=From:To:Cc:Subject:Date; b=B+MnTO+RF8osqUEx+BGsBmnkVL6MSYEAS3diCN8Wu9jk7dyDgx9+d7o/Drk4hJlhZ LbZETOUnv7IAZwRXXv5PBwR/OhHAmfc+GwmIeAAz14SjezSpEXPLyQjuclbTTdbKCf 9bVXM4ZZyWydmwk1U3Tm8iZN4MLOjyz36waaQ4VNV+fmr1A3afx6O50bNd7o35jWp8 w3not23qJmea8OkAU2EwsXxAbea+ndyOy+DELWTEhh29zCq3LIir9wngPIGnNfx3Vl KqUQW8zbQHcL0XUxgsvTC4BCvVJf8jcOvNNFozyEzX7zaDowNLzik4BGOlZ5Y/XqXx mqYRQ1GJ2vAwQ== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v3 1/6] gnu: libzim: Update to 9.2.3. Date: Mon, 24 Feb 2025 10:58:57 +0530 Message-ID: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (libzim): Update to 9.2.3. Change-Id: I8ce4b065368f1400b25d4ebe469d83551094da28 --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0030e152b4..90cd02313c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9369,7 +9369,7 @@ (define-public kineto (define-public libzim (package (name "libzim") - (version "8.2.1") + (version "9.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -9377,7 +9377,7 @@ (define-public libzim (commit version))) (sha256 (base32 - "1g735aqw0vlxqgyjv02lvq24dr5shydp4y8mqianf8720s5fs73f")) + "1rz8pjrd06qncvg732sg40bhdfzldnrznyaq5k6d4hj575qbwvfg")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments base-commit: 4317534b9a93b32ffd13bbe69fed57ffe00b5536 -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 24 00:29:57 2025 Received: (at 75319) by debbugs.gnu.org; 24 Feb 2025 05:29:57 +0000 Received: from localhost ([127.0.0.1]:37951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmR2T-00081a-25 for submit@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:57 -0500 Received: from layka.disroot.org ([178.21.23.139]:54104) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmR2J-00080n-E4 for 75319@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:47 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8D88C25F99; Mon, 24 Feb 2025 06:29:46 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id uaVvuXOnwsPV; Mon, 24 Feb 2025 06:29:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740374982; bh=qPB8SVNvS8+f1C9V3fR11icergavihqJeO21LINlKqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HYSID5OPUipFBy9Ji3KHRH/zNf0M0rZBJM03zyAqVBmab3TUQ5bf0VInnZXESIbq4 Bv0YXIlnnEW2al+ISTKvrzpkP6wKYRrkQl59jFNemobqVGcktnMPYAfGf5uEsgGFat ILMowlExmcyOblerfidqsXPA7fAT77taD1BjxXu9a2mzrTNj0fgi5cUKXjYzHGIg5A WhcIkv3qrvCDEbCfG1D26IwndSGnDq28SLVajDaBVyGRanqNCeKh36QKlqDqIEDLJv hk2x8fJ/0grY+xdgDisUS7hYTWJe7uCP/TWN7wq4zr81rIJdcHO++S8u6rEMD7K1D6 yUJx/oGB6VQgw== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v3 3/6] gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. Date: Mon, 24 Feb 2025 10:58:59 +0530 Message-ID: <375b411937ec9d74b4fb75da3320f6f3d495e27d.1740374942.git.sughosha@disroot.org> In-Reply-To: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> References: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (kiwix-lib): Update to 14.0.0, rename with libkiwix and deprecate kiwix-lib. [home-page]: Update. [source]: Switch to url-fetch. (kiwix-desktop,kiwix-tools)[inputs]: Replace kiwix-lib with libkiwix. Change-Id: Icaf0d28168078e92f7cfcd54ba0f4e10fb3c477f --- gnu/packages/web.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 767f814c2d..14914eaa3e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -90,6 +90,7 @@ (define-module (gnu packages web) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix deprecation) #:use-module (guix gexp) #:use-module (guix cvs-download) #:use-module (guix hg-download) @@ -9419,20 +9420,20 @@ (define-public libzim for ZIM files.") (license license:gpl2))) -(define-public kiwix-lib +(define-public libkiwix (package - (name "kiwix-lib") - (version "13.0.0") - (home-page "https://github.com/kiwix/kiwix-lib/") + (name "libkiwix") + (version "14.0.0") + (home-page "https://github.com/kiwix/libkiwix") (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit version))) + (method url-fetch) + (uri (string-append + "https://download.kiwix.org/release/libkiwix/libkiwix-" + version + ".tar.xz")) (sha256 (base32 - "0mvlppbj0mqn4ka3cfaaj1pvn062cxbgz01c0nq04x0mzq1xwh5w")) - (file-name (git-file-name name version)))) + "1p0hj94rz22gvhan9y3sg40sz2lw4fsl2m3jjpqz65zxgv9n9p7v")))) (build-system meson-build-system) (arguments `(#:phases @@ -9464,6 +9465,8 @@ (define-public kiwix-lib It contains the code shared by all Kiwix ports.") (license license:gpl3))) +(define-deprecated/public-alias kiwix-lib libkiwix) + (define-public kiwix-desktop (package (name "kiwix-desktop") @@ -9500,7 +9503,7 @@ (define-public kiwix-desktop (list bash-minimal curl icu4c - kiwix-lib + libkiwix libmicrohttpd libzim pugixml @@ -9536,7 +9539,7 @@ (define-public kiwix-tools (inputs (list curl icu4c - kiwix-lib + libkiwix libmicrohttpd libzim pugixml -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 24 00:29:58 2025 Received: (at 75319) by debbugs.gnu.org; 24 Feb 2025 05:29:58 +0000 Received: from localhost ([127.0.0.1]:37953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmR2T-00081m-Jw for submit@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:58 -0500 Received: from layka.disroot.org ([178.21.23.139]:54106) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmR2N-000819-R2 for 75319@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:52 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DF33825FFC; Mon, 24 Feb 2025 06:29:50 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id nvWZaP5eMvsK; Mon, 24 Feb 2025 06:29:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740374986; bh=jxI+RWyw7QZoEH+J7tMbe1hWxC0aij8XvIeVI6/3ADI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IP9xCJ7sDchh/dXEWFLdgW93S17Wm4bhhd3eTNFelSc5qB7TL+mB7YcrUJFGustMg 4Jf5RvonLFGTp8dj6tMMjzEM2WKwdZRq37MNyk0kzu7IOvUgNzkPwp45MKoJ0uoQjg AZszNeYxof0mfoZB1RFFQxSGpC7S6uS3+1/uZCpd5/3tzHuAtBzpZJOuo3f7+wrdsE DkPI2vRGrSvb4oOieqiTAFFc1m+vWIvtU8HNHS7yo4kqgkDc11RaHboB8FQIKIHBoh 2RuYeqrYD1Ocg4kOu/brOJq0t5A5ANkMIhplaIlkJpQXyzM5j7UIis5j1PZtHvsivB SjNzKgojN7fwg== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v3 4/6] gnu: kiwix-desktop: Update to 2.4.1. Date: Mon, 24 Feb 2025 10:59:00 +0530 Message-ID: In-Reply-To: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> References: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (kiwix-desktop): Update to 2.4.1. [source]: Remove patches. [arguments]<#:qtbase>: Use qtbase. <#:phases>: Remove wrap-qt-process-patch phase. [inputs]: Remove qtbase-5; replace qtdeclarative-5 with qtdeclarative, qtwebchannel-5 with qtwebchannel, qtwebengine-5 with qtwebengine and qtwayland-5 with qtwayland. [native-inputs]: Remove qtbase-5. * gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch: Delete file. * gnu/local.mk: Deregister the patch file. Change-Id: Id6eb8e2e86d46263bd7d04258dea31b792ef6e08 --- gnu/local.mk | 1 - .../kiwix-desktop-newer-libkiwix.patch | 40 ------------------- gnu/packages/web.scm | 31 +++++--------- 3 files changed, 11 insertions(+), 61 deletions(-) delete mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73116fdc1b..c68a9e294b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1683,7 +1683,6 @@ dist_patch_DATA = \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kismet-unbundle-boost.patch \ %D%/packages/patches/kitty-fix-wayland-protocols.patch \ - %D%/packages/patches/kiwix-desktop-newer-libkiwix.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ %D%/packages/patches/knot-remove-runtime-deps.patch \ diff --git a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch b/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch deleted file mode 100644 index a5bee60ac2..0000000000 --- a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: Fix building kiwix-desktop with libkiwix-12.1.0 -Bug: https://github.com/kiwix/kiwix-desktop/issues/964 -Origin: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 -Applied-Upstream: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 ---- -From 1b322d8f01c787846546a6473f153cf1daa41e65 Mon Sep 17 00:00:00 2001 -From: Matthieu Gautier -Date: Thu, 9 Feb 2023 09:47:47 +0100 -Subject: [PATCH] With last version of libkiwix, Downloader now return - shared_ptr. - ---- - src/contentmanager.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp -index c2f4ff9..d4db50a 100644 ---- a/src/contentmanager.cpp -+++ b/src/contentmanager.cpp -@@ -173,7 +173,7 @@ QStringList ContentManager::updateDownloadInfos(QString id, const QStringList &k - return values; - } - auto& b = mp_library->getBookById(id); -- kiwix::Download* d; -+ std::shared_ptr d; - try { - d = mp_downloader->getDownload(b.getDownloadId()); - } catch(...) { -@@ -270,7 +270,7 @@ QString ContentManager::downloadBook(const QString &id) - for (auto b : booksList) - if (b.toStdString() == book.getId()) - return ""; -- kiwix::Download *download; -+ std::shared_ptr download; - try { - std::pair downloadDir("dir", downloadPath.toStdString()); - const std::vector> options = { downloadDir }; --- -2.41.0 - diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 14914eaa3e..574caa182c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9470,7 +9470,7 @@ (define-deprecated/public-alias kiwix-lib libkiwix) (define-public kiwix-desktop (package (name "kiwix-desktop") - (version "2.3.1") + (version "2.4.1") (source (origin (method url-fetch) (uri (string-append @@ -9479,26 +9479,19 @@ (define-public kiwix-desktop ".tar.gz")) (sha256 (base32 - "0hlk05gcb3fmnxhwj6gan51v98rdq3iv2lklwbpmm1bazmz8i7br")) - (patches (search-patches "kiwix-desktop-newer-libkiwix.patch")))) + "1vkmk9j2jii7ri4lcayr0dr5b2w3dc24lyqmm3g4234834b1f4wl")))) (build-system qt-build-system) (arguments - `(#:test-target "check" + `(#:qtbase ,qtbase + #:test-target "check" #:phases (modify-phases %standard-phases + ;; Configure using qmake. (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (invoke "qmake" (string-append "PREFIX=" - (assoc-ref outputs "out"))))) - (add-after 'install 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/kiwix-desktop")) - (qt-process-path (search-input-file - inputs "/lib/qt5/libexec/QtWebEngineProcess"))) - (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (assoc-ref outputs "out")))))))) (inputs (list bash-minimal curl @@ -9507,17 +9500,15 @@ (define-public kiwix-desktop libmicrohttpd libzim pugixml - qtbase-5 - qtdeclarative-5 - qtwebchannel-5 - qtwebengine-5 - qtwayland-5 + qtdeclarative + qtwebchannel + qtwebengine + qtwayland xapian zlib `(,zstd "lib"))) (native-inputs - (list pkg-config - qtbase-5)) + (list pkg-config)) (home-page "https://wiki.kiwix.org/wiki/Software") (synopsis "Viewer and manager of ZIM files") (description "Kiwix Desktop allows you to enjoy a lot of different content -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 24 00:29:58 2025 Received: (at 75319) by debbugs.gnu.org; 24 Feb 2025 05:29:58 +0000 Received: from localhost ([127.0.0.1]:37955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmR2U-00081q-5P for submit@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:58 -0500 Received: from layka.disroot.org ([178.21.23.139]:54110) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmR2O-00081C-Rm for 75319@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:53 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E2DEE25F8F; Mon, 24 Feb 2025 06:29:51 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Nzrrce8X1lci; Mon, 24 Feb 2025 06:29:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740374991; bh=LEEEYmE/5XmS6vI4oLBPvyS8xpmjixB7LBUnVI4EZWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LEyKpOfQprtxCJ7ebAtAGZcb5DPigqh1dUKhev01RNTem+V2MglAMeXDv/whSROZf aw3oZyFmd4ktqPKxsjViGNGNrAQ8GIZ/CYDwGsU/4gT4g4hwANDl1q1yYl7c+OmbD/ 776t2f605uV/uaMVlU0u1QUd0UjbHpCqZMgaflh6Wi1f+81KLI/DwyUPnoPE3zWYOA N1rONot3RmvjmykR5G5vACKQ63nDtTIwDhbg4nlUw4m91ZIJv2kS9MaUzB4pU69eyv RK+/EW5DJYazd0teGkptvDfq3kyypTXPBLq2TKbO/lDmpD9EMlmrYKhRSEYBX5Xstn 0JiYNijDsT66g== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v3 6/6] gnu: kiwix-tools: Update to 3.7.0. Date: Mon, 24 Feb 2025 10:59:02 +0530 Message-ID: In-Reply-To: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> References: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (kiwix-tools): Update to 3.7.0. [inputs]: Replace libkiwix with libkiwix-13. Change-Id: I55ea1f594998ac1720b462c9c86e5989a07cf019 --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a65a9390ad..f977aa6d65 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9532,19 +9532,19 @@ (define-public kiwix-desktop (define-public kiwix-tools (package (name "kiwix-tools") - (version "3.5.0") + (version "3.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.kiwix.org/release/" "kiwix-tools/kiwix-tools-" version ".tar.xz")) (sha256 (base32 - "0q6b7viy1jr212q0glqid2hqxnsd2mxsx5gzcalkc4gb0bzgj32d")))) + "032lzzgn3hicai4lx701cs6h731cs29x1h59j9gggcgrp1n4wxks")))) (build-system meson-build-system) (inputs (list curl icu4c - libkiwix + libkiwix-13 libmicrohttpd libzim pugixml -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 24 00:29:58 2025 Received: (at 75319) by debbugs.gnu.org; 24 Feb 2025 05:29:59 +0000 Received: from localhost ([127.0.0.1]:37957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmR2U-000820-KV for submit@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:58 -0500 Received: from layka.disroot.org ([178.21.23.139]:54126) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmR2R-00081P-5F for 75319@debbugs.gnu.org; Mon, 24 Feb 2025 00:29:55 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3A89125F1A; Mon, 24 Feb 2025 06:29:54 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id evGEPd-tDRLQ; Mon, 24 Feb 2025 06:29:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740374989; bh=8o2RpDgm2+oOdCob6nFU799mUnuAxvjQ0Mux7YO5sYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YzpEE/9YX1IQIZnacopuTrGZsw1vT4R+3GuJIBWADcEejpwTSd8w7t3sjtfxpB/9q kMfUlOM7q3PFrePJe48UvcLTS/aQyJXOHZZtmhT/rk7RT87wwVGwJPccQE73slGblQ D93LS83k2Di8KCupqJ0fVzbbkdlmWfjvPEeAvBtUs0Im++rKGCIEKPwN0M+eVx6Wb9 5wcz3ILg3OP7UP7bmfL78Fns3cXPNRg28ATx9ic4CqzjHv4mDZr9xtywOLqJv1kDyI duqFxUYxN3jyvNgmsFdjuNIKUSm3fWHeFim436COp8pxWEEVNsqnQVGkycaaSAz7JT /QVejrBNWtAdQ== From: Sughosha To: 75319@debbugs.gnu.org Subject: [PATCH v3 5/6] gnu: Add libkiwix-13. Date: Mon, 24 Feb 2025 10:59:01 +0530 Message-ID: <0262df0bdffb8eaab7e9ccf9f56c27af40c448e9.1740374942.git.sughosha@disroot.org> In-Reply-To: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> References: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75319 Cc: Sughosha X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm (libkiwix-13): New variable. Change-Id: I4ce766b5dce4b377b3106cb4ecdcf2d718aa7675 --- gnu/packages/web.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 574caa182c..a65a9390ad 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9467,6 +9467,20 @@ (define-public libkiwix (define-deprecated/public-alias kiwix-lib libkiwix) +(define-public libkiwix-13 + ;; TODO: After updating kiwix-tools, delete this variable when not needed. + (package/inherit libkiwix + (version "13.1.0") + (source (origin + (inherit (package-source libkiwix)) + (uri (string-append + "https://download.kiwix.org/release/libkiwix/libkiwix-" + version + ".tar.xz")) + (sha256 + (base32 + "1dfb3178vjg2db0gwgfqy4c91039x9n3kzzlszgaj191f39dwn8m")))))) + (define-public kiwix-desktop (package (name "kiwix-desktop") -- 2.47.1