From patchwork Fri Jan 3 15:49:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 36408 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 4104D27BBEA; Fri, 3 Jan 2025 15:52:37 +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 95FCA27BBE2 for ; Fri, 3 Jan 2025 15:52:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTjy1-0001Hq-3H; Fri, 03 Jan 2025 10:52:05 -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 1tTjy0-0001HB-06 for guix-patches@gnu.org; Fri, 03 Jan 2025 10:52: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 1tTjxz-0001jX-GF for guix-patches@gnu.org; Fri, 03 Jan 2025 10:52: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=roT3h7wK/SHFT/i6cy/HjGPbas6HTGv7MeXeDCg168k=; b=PhT34hUztTZaqlSI03zzuR+TytEdjqAHns4ui4ZxFqN7XM2N57E+rRiNSfVCgQeNEWlKZWy2bwM22xwKA2jV5Zja3keEjV3JZaJea3pKD/K1KGze5mZ4a8bP4OHgF3zwejE5Rnb1eGXxl4IojnKMz0EI2cYZtUIrwmAKdLZlEo6WsFrYhzqO+grlhHbF3yanJDpSckXhaVsIDZ75h3KT2yjTFvJicImppl/WHLzUe4+sEei7p9oiivlp+df9iczItP5gACeeFlB5iIfZeJllcsiJdMECsg0pIvNL1ikAsZV/d6QpRWBWoUtfJbLxnlXy6jOCBs7WgeOcE0cBpozqNw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tTjxz-0007Fr-AB for guix-patches@gnu.org; Fri, 03 Jan 2025 10:52:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75319] [PATCH 3/5] gnu: kiwix-desktop: Update to 2.4.1. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Jan 2025 15:52: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.173591947727786 (code B ref 75319); Fri, 03 Jan 2025 15:52:03 +0000 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== Date: Fri, 3 Jan 2025 21:19:20 +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-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