From patchwork Mon Feb 24 05:28:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 39096 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6FDF327BBEA; Mon, 24 Feb 2025 05:35:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 364E027BBE2 for ; Mon, 24 Feb 2025 05:35:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmR7n-0002xn-C8; Mon, 24 Feb 2025 00:35:27 -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 1tmR2a-0001bM-Ev for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmR2a-000824-5w for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=CxxVygEnTDvIg4U8lzd4romVP2XYI50s5keBKpe69g4=; b=uZb4xLU8wdGPbSxMVMw+aq+bnZBQ17PV7G7dxCff13s8o304diIfq+8aBRdffCKR8cTv6TkxeFmrp5/uLaD3y7qlw7f18z1LL+HBqeeE7tmM7I3ubiIc1E91piLInU/ZXbQ/i7UcOc4pzOSNQI9klfMeVMmEmS3zNM1fJ7UkgwIBiStuzwztxvs1rWltKhApD3p5pKGWTwbfymbuI/nhKjFIjI/l6F7I3N9OocBqqC/5jLEiy8ztSnv2pbR9HWBtVN/fOl0YNlU1ZLqcB1kcMpGkPCuYpiSdegsW0TnnnfjlDWJoNKZzDy+3u+t9omiul6Ho6Nt82AVxKwWpGYXrsw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmR2Z-00082y-NJ for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v3 1/6] gnu: libzim: Update to 9.2.3. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Feb 2025 05:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75319@debbugs.gnu.org Cc: Sughosha Received: via spool by 75319-submit@debbugs.gnu.org id=B75319.174037499730853 (code B ref 75319); Mon, 24 Feb 2025 05:30:03 +0000 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== Date: Mon, 24 Feb 2025 10:58:57 +0530 Message-ID: <896b67ae37ae728a779bcfa17667b648e4fe37fc.1740374942.git.sughosha@disroot.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: 4317534b9a93b32ffd13bbe69fed57ffe00b5536 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 From patchwork Mon Feb 24 05:28:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 39091 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B40DE27BBEA; Mon, 24 Feb 2025 05:33:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F28A127BBE2 for ; Mon, 24 Feb 2025 05:33:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmR5v-0001ud-Ed; Mon, 24 Feb 2025 00:33:32 -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 1tmR2a-0001bN-Fd for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmR2a-0007x8-4X for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=4V+wrejooYE8/Yv5nmDcWxyT0YUrKZBDmPfByTd9bGs=; b=WGeGrAqKz2FvOhg+/ZghsrWyRSH7OdWg4ixKcMkuzkEFnFgXlNZEAkPfr5fAucUxCRLnGT5c6peR0gTUWRuSF7GiGSzExg7l2WPcntQQ3XwjS8zOuSswY7bEa0jOPi4N71fZZ5nD70UBLCHOlDiO+amWS/+WSAO+y1fKJJHOHC6xaL/BBfuYJrtfUQdZMGfXoVYeeZw8F3wp9dPmBivvCkW0fhL+AifEapCjcP0CCFuafW5o2JWc9m1N9U+v3TS1sBDaP9UiFWURTUmVRcpKj+ylRjY8mGnVxvKnevPLjxi+C08OPC3Amhui99qkp6wkDpyi7h63TLrsMHyttK9IeQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmR2Y-00082q-V3 for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v3 2/6] gnu: libzim: Enable tests. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Feb 2025 05:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75319@debbugs.gnu.org Cc: Sughosha Received: via spool by 75319-submit@debbugs.gnu.org id=B75319.174037498830817 (code B ref 75319); Mon, 24 Feb 2025 05:30:02 +0000 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== 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Mon Feb 24 05:28:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 39093 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9C83427BBE9; Mon, 24 Feb 2025 05:34:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 689AC27BBE2 for ; Mon, 24 Feb 2025 05:34:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmR69-0001zm-Aj; Mon, 24 Feb 2025 00:33:45 -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 1tmR2b-0001bW-4x for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmR2a-00088N-Px for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=8ezjA0GT8HGH0p7NKGUQyDKyyySkxJJtX3UlS8k++VI=; b=s5ucBRO3YN/AxbtKSLzMVmHtiYoaRfHwaM5wY1XYgEJ88UFg7QuQSlqt4i0Sml6/0ipL5aGbItD3SvVn+8FIBzzgtzfbMQ9uKJArxSzpZY+Ok6DE4DKllVfb5vUhxj6SQAQ5L0YjaJq1AiHWVPrQDYy95RXVe9G5TrKBqSBEVAtd2YVXxd6l4E5j+L3p/lADHCaeYdna8RefPcqZxo1XG351D+uIzyWexmmX2IgkVbkdeBqtUfTCUYtSdmHljWiMdVeBP5FxwdsDjfHwOEqlK742wOE2FV0xc9pWTb8P1NRzQV+jexxPhelJiSrku3qXXtyo/jz5aNLkIKdPeMMOHQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmR2a-000838-KD for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v3 3/6] gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Feb 2025 05:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75319@debbugs.gnu.org Cc: Sughosha Received: via spool by 75319-submit@debbugs.gnu.org id=B75319.174037499730859 (code B ref 75319); Mon, 24 Feb 2025 05:30:04 +0000 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== 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Mon Feb 24 05:29:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 39094 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CBAC027BBEA; Mon, 24 Feb 2025 05:34:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3922527BBE9 for ; Mon, 24 Feb 2025 05:34:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmR6B-000215-8Y; Mon, 24 Feb 2025 00:33:47 -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 1tmR2c-0001c0-A5 for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmR2b-00088f-R7 for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=n7VcJZJO80VYUndn5QscqdhU6ZJ0Cs9tiywRql1Qk5E=; b=LXZwG67XC/y+bwrz3qxpU8MGdrtNJcl0agNW0g4bX0oxqKO/RZ/rYnSmMpYAJXg7AQTEJIBpySHyt7WQIiFK0rpkTBLC91hwuYsyUpaNg1QuDaeVUxN0QxMfYIh3QO6+rlzmKWOWW7fUltXkSF0eXuTcCFoCaGKR5dQpYEqyWXrEAF2RNa81zr09CJymM3NIPglIQRygsH5IfV9rIOsRRL1a/HuhDZy0ob0VANbn/A4/nlair12wo5H8QJvZYBXldI4Hy1d9VK8tRBjuZwBhQWAVTe5ZsB2lA5AiXuRApECs25TQbnhxs3cK/1zaa4ztJFAnNLSNnKTTfvwvNVuc1g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmR2b-00083G-JM for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v3 4/6] gnu: kiwix-desktop: Update to 2.4.1. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Feb 2025 05:30:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75319@debbugs.gnu.org Cc: Sughosha Received: via spool by 75319-submit@debbugs.gnu.org id=B75319.174037499830868 (code B ref 75319); Mon, 24 Feb 2025 05:30:05 +0000 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== 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Mon Feb 24 05:29:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 39095 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 17B8227BBE9; Mon, 24 Feb 2025 05:34:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 66B2A27BBE2 for ; Mon, 24 Feb 2025 05:34:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmR67-0001y3-O3; Mon, 24 Feb 2025 00:33:44 -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 1tmR2d-0001c6-Q8 for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmR2d-00088w-87 for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=sSZaCUUsWRK3f05SdQErJrPdLRBGcNVcVQwk4E0KFJs=; b=N7SxDhtw0Mi6XAj+odMX6e3pNSObFoNRvK4hViMzd7hk8cChe7l1ojczBCnHVw76Q+YFgIpEHHpE2UvZJXJen8ZRogogwQI+emnsbT6KYTY2+biGI8NJCAuM0KfqlvrItCAtXA39mYAdfZjIUrmH88oVHYimdlrMPjCAbCynR8NhhZXRxSs3166JL+6i0h9abooQ16ni96eCMw8LGazb6xZL4cVMk3ygxp0i7+FDCivd3d4PjwoGZ6KrWH1hrENUsXrMzXAjnU07Ys4cUi3Pndh85KjzJ5Quhy6H8+deYBl/sVHRRS43ssaIz5HoYvNE5Q+kqLJNBvkYMsNKN4TA/Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmR2d-00083V-3p for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v3 5/6] gnu: Add libkiwix-13. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Feb 2025 05:30:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75319@debbugs.gnu.org Cc: Sughosha Received: via spool by 75319-submit@debbugs.gnu.org id=B75319.174037499930882 (code B ref 75319); Mon, 24 Feb 2025 05:30:07 +0000 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== 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Mon Feb 24 05:29:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 39092 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C7AF227BBEA; Mon, 24 Feb 2025 05:34:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4732427BBE2 for ; Mon, 24 Feb 2025 05:34:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmR6B-00021U-Fo; Mon, 24 Feb 2025 00:33:47 -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 1tmR2d-0001c5-Pc for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmR2c-00088q-Kp for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=+N0d/+8n+kbJEXOTljd4AdEfBx4L1BmeEa1aYVOyR/w=; b=kd7IWqvEMhRdLycW+eW+q7r5nncvbZlPzE+469ESCcYw81hRDwmHVlRzXWzBAmMkuSZEWIa0f4m9dzAbXbxnHmCHTaW7m9ww8uCXdw8ewtITK1AlekU/fVCIGohJ10iWxDUm5WUTsYgxjW9JOlRTFSInPd0z00LH9qV19l3TM0qM9OCCsK9C3gQSxQFmtNfTpoqq9bBy8O+tnJO5a/yaPxde2YD6F0SpWa9jGxSddDhpvGBT6ws5mD3M65mm/fVlKiAKNuSmnXJbtH2rZTcTimu6ZizFHT6r3oHw6JrQVU9lAcz197wn/iBi7/bnA7OsstvBtgLf8+dzL1X3FVJy1A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmR2c-00083N-EQ for guix-patches@gnu.org; Mon, 24 Feb 2025 00:30:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v3 6/6] gnu: kiwix-tools: Update to 3.7.0. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Feb 2025 05:30:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75319@debbugs.gnu.org Cc: Sughosha Received: via spool by 75319-submit@debbugs.gnu.org id=B75319.174037499830874 (code B ref 75319); Mon, 24 Feb 2025 05:30:06 +0000 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== 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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