From patchwork Sun Feb 23 12:42:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 38998 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 4A07127BBEA; Sun, 23 Feb 2025 12:47:55 +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 1322D27BBE2 for ; Sun, 23 Feb 2025 12:47:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmBO2-0004aY-LM; Sun, 23 Feb 2025 07:47:10 -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 1tmBNv-0004ZZ-Bb for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:03 -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 1tmBNu-0004D0-ET for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:02 -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=ZQIqookTRCk5F7Z4sx5sPJv0BTTgR1n3Ygnzyd06hQ8=; b=QdJzIf2qild/v6yADv0WndiUmMonflq52jQkYzspQAwpnl8z2HJ3cjyiSwzmR6lkdUzoEY2PeLBqbp3ePciTbG5LYJtH25hvV9JHBdgHs/KFuhu0XzcA26gKhesNlFUDv6L3uU6+RMlv8XpKl8KF2uN3SADqEHR4zDYn+Jvb3QAvC58pH8nQu66UMAT85lW7Au576A3phP4EiY1ftB0dgfg8olrOl5kcOpcW8SKd1ly15dpD945yL00Kjs1QWfXTaFCSfKHDN/bYj/7BAQhI10I1xqG8lG+PIRig4ZLMBnkuqEoVPYkGFFjczfhLSj5n5q/RMQPLlDq5X8XulT3T1A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmBNu-0007NN-9l for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v2 1/6] gnu: libzim: Update to 9.2.3. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Feb 2025 12:47: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.174031478728228 (code B ref 75319); Sun, 23 Feb 2025 12:47:02 +0000 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== Date: Sun, 23 Feb 2025 18:12:53 +0530 Message-ID: In-Reply-To: References: 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(-) 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 Sun Feb 23 12:42:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 38996 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 580A427BBEB; Sun, 23 Feb 2025 12:47:51 +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 3354427BBE9 for ; Sun, 23 Feb 2025 12:47:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmBO2-0004aZ-Lf; Sun, 23 Feb 2025 07:47:10 -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 1tmBNv-0004Zl-Kw for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47: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 1tmBNv-0004D1-AS for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:03 -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=mEeMKIS+d/eKNyIurxIfryibyPxYjGXOfrQ4GAnhhmA=; b=El03YmcnB7cvnt4efzIs9sPYUsPxgWXP1S+QHrAvXxnvibUS5jCOeq/FqggDi5x7pyw3eR9dzaEFRisbBJWceooZsBPfg9pJNSBXlINCR5cccPbtvYwtOj0xkzN1Gwtjg2UXopPT9+vJ04d0Ak++HtA20tnfPjNw9ba+93Awf0NwU7uRI14qCfrc1mrf5B9SpRPTUH0siCvT8R4+7SzzyI8FlCrLj7lNKcIXQIRuQE1OjLvTGlizcEC3j2Ur1gN8md3MK/jeSHKVIOY4wE5uV+yI6VrHMqBoSxgg7qanB9YWT6lNSxwXa4f3rNI21y0l3mD7nc2LtW3zxEOFxKEvQQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmBNu-0007NU-Qs for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v2 2/6] gnu: libzim: Enable tests. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Feb 2025 12:47: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: Nicolas Graves Received: via spool by 75319-submit@debbugs.gnu.org id=B75319.174031478728235 (code B ref 75319); Sun, 23 Feb 2025 12:47:02 +0000 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== 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 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 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 From patchwork Sun Feb 23 12:42:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 39240 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 570BB27BBEB; Sun, 23 Feb 2025 12:47:50 +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 D35AC27BBEA for ; Sun, 23 Feb 2025 12:47:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmBO9-0004b6-CM; Sun, 23 Feb 2025 07:47:17 -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 1tmBNv-0004Zp-Rf for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47: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 1tmBNv-0004DE-I7 for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:03 -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=ueYStLy7QY7btrY2z40xnWKlE4xRJ9fMdJ7KQXMIkpY1MlV5UfJdVFKmMCbnUmxVWKleGkAfL/6YJvGBDYvGkFa7x1SWcZ6YmTlsFC5J/1iMBrKoGGUMY3/cGHuvNcb68/lm2qWNtbXbmj7XKAIZs7ukjCDxvhCF4133YDcUgRLsHZKWTKyCWjsgd+sj5riYsXhFGXGkSYYVOPAmu78VgYTlJ/Lx7W0xTQttyWcHgGUvYCgPk8qcN1Zw4rcDohuYF0RDakbFVbhrQeor79kJ5jFbrxdWHjDZPSWbE9CtUtOLiy4/YPUvJfNQQx06FHJ72N/Bmhk9M7sQfQjwtwsjoQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmBNv-0007Nc-Cb for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v2 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: Sun, 23 Feb 2025 12:47: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.174031479828286 (code B ref 75319); Sun, 23 Feb 2025 12:47:03 +0000 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== 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 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 Sun Feb 23 12:42:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 38999 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 AE24227BBEA; Sun, 23 Feb 2025 12:47:59 +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 4341627BBE2 for ; Sun, 23 Feb 2025 12:47:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmBOH-0004cF-EK; Sun, 23 Feb 2025 07:47:25 -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 1tmBNx-0004a9-2Q for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47: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 1tmBNw-0004DM-Dq for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47: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=n7VcJZJO80VYUndn5QscqdhU6ZJ0Cs9tiywRql1Qk5E=; b=GKWxE9mfBz4d8UEH9JYFxofBcZSY5QNq8WnCHYEUeZjO+BTZnwq55lYg3iQiabwYWzjlIYljvZ56/8Q7mhjPqoun1lRRV/XPzxseUFUXrK5Dxr12KV/ADIF0SPfBF3xKS7XGMwWHDhJHQ/2XFufg3lFCOzHClVxOei4Bl3nu0D179Kxx/hcE3SfDiwX4vRLh+uEN1tdtaI+9EywiE2xUbyOBc6RNJr3XhEpLg93Ivbj2jw0nJ7sbPiGBEs3JdNqjIa9EhhY1GE18qBGntTS+FCIRlRmA6Pur4Evtwn+k0RGJeoaKmxVAzCKnBJ2POXelMhzvmcxzAsJlEPEMQ3Cscw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmBNw-0007Nr-9a for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v2 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: Sun, 23 Feb 2025 12:47: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.174031479928300 (code B ref 75319); Sun, 23 Feb 2025 12:47:04 +0000 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== 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 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 Sun Feb 23 12:42:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 38997 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 D1F3327BBE2; Sun, 23 Feb 2025 12:47:51 +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 D524127BBEE for ; Sun, 23 Feb 2025 12:47:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmBO3-0004ap-LX; Sun, 23 Feb 2025 07:47:11 -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 1tmBNx-0004a8-26 for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47: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 1tmBNw-0004DL-0t for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47: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=sSZaCUUsWRK3f05SdQErJrPdLRBGcNVcVQwk4E0KFJs=; b=XwgYANQmsB1yqyPIgi7un0Rff7y3Q8sJqBfUMbf0jRleHIL1EHynd2lPXwfCXJ6k7p2FP5uu8gkhws/weSdwpCDDXsV+hYLOd5hXzXxtssVoErJBhm4GG+3OSfzdz5+oLBvNLTEWbwO2Oz4vQSfG87sSd3JdjGC/rV0rtIdGoXvI13ovSvrmg07oBSGD8mpCavM/q/GsuAy1nSgETR9nkXU9L/+L0TP2T7y86MLum7liQixC7Wcx4hr10NVv+RLBauGmGC5lPzXOcesSXkw5ExfcoQmBnteMdhOYXNyuUBzuU0ssAqI83BDWxg/VWcSVAnNsUWkd805dxhwbre238A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmBNv-0007Nj-Qd for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v2 5/6] gnu: Add libkiwix-13. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Feb 2025 12:47: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.174031479828293 (code B ref 75319); Sun, 23 Feb 2025 12:47:03 +0000 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== 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 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 Sun Feb 23 12:42:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 38995 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 2FFA827BBE9; Sun, 23 Feb 2025 12:47:50 +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 D3BA427BBEB for ; Sun, 23 Feb 2025 12:47:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmBO9-0004bI-FQ; Sun, 23 Feb 2025 07:47:17 -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 1tmBNx-0004aB-Ed for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:06 -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 1tmBNw-0004DV-Vr for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:05 -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=IkCDcGqFucvIrhi0m8mC0eDPHzJdxlWDdoUWcA3bdo1QTfCJpjHbAtna8GYpCPBxKNJgEBKkxoDjuMmtceHGGOj15UVjZf8/qC+aNjFIFw8x5mawxASSi+UuYnsbtmUN8pLZUNyKR9UFfkKWkR+7DbZV0it49eXqxIc+IpNKXsDAFZjwefeEjp0hUvaUasOGt8NggipB10liScj7YmrrBIvwHLoGtCUC7Ka/KexkYqU0Ki14/+Db8+un7f+Jjx+b+/GC6d9H+eSncG6S90prqow3rCCrY2ZlYC71OPN2LnLZYGUOWO6lE9NToiYi/5OtKB9UB2mU+XJ3l5dl0UljwA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmBNw-0007Ny-Qg for guix-patches@gnu.org; Sun, 23 Feb 2025 07:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH v2 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: Sun, 23 Feb 2025 12:47: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.174031479928307 (code B ref 75319); Sun, 23 Feb 2025 12:47:04 +0000 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== Date: Sun, 23 Feb 2025 18:12:58 +0530 Message-ID: In-Reply-To: References: 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