From patchwork Sat Sep 16 09:06:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 53950 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 0F66A27BBEA; Sat, 16 Sep 2023 10:07:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 D1BDB27BBE2 for ; Sat, 16 Sep 2023 10:07:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhRGU-0001WL-O7; Sat, 16 Sep 2023 05:06:58 -0400 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 1qhRGS-0001Ve-Nj for guix-patches@gnu.org; Sat, 16 Sep 2023 05:06:56 -0400 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 1qhRGS-0002DU-BC for guix-patches@gnu.org; Sat, 16 Sep 2023 05:06:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhRGZ-0007Yr-7z for guix-patches@gnu.org; Sat, 16 Sep 2023 05:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66024] [PATCH v1 4/4] gnu: kiwix-desktop: Update to 2.3.1. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 09:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66024 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66024@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 66024-submit@debbugs.gnu.org id=B66024.169485519429004 (code B ref 66024); Sat, 16 Sep 2023 09:07:03 +0000 Received: (at 66024) by debbugs.gnu.org; 16 Sep 2023 09:06:34 +0000 Received: from localhost ([127.0.0.1]:45338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhRG6-0007Xe-Bu for submit@debbugs.gnu.org; Sat, 16 Sep 2023 05:06:34 -0400 Received: from cyberdimension.org ([80.67.179.20]:45446 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhRG2-0007Wq-77 for 66024@debbugs.gnu.org; Sat, 16 Sep 2023 05:06:31 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id a7887354; Sat, 16 Sep 2023 09:06:16 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id d3b02419; Sat, 16 Sep 2023 09:06:16 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Sat, 16 Sep 2023 11:06:07 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 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: , 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.3.1. * gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Denis 'GNUtoo' Carikli --- gnu/local.mk | 1 + .../kiwix-desktop-newer-libkiwix.patch | 40 +++++++++++++++++++ gnu/packages/web.scm | 5 ++- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8862fbfbb9..e5dcdb4f4b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1472,6 +1472,7 @@ 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/kobodeluxe-paths.patch \ diff --git a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch b/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch new file mode 100644 index 0000000000..a5bee60ac2 --- /dev/null +++ b/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch @@ -0,0 +1,40 @@ +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 221ee03728..fe2976d58e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8692,7 +8692,7 @@ (define-public kiwix-lib (define-public kiwix-desktop (package (name "kiwix-desktop") - (version "2.2.2") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append @@ -8701,7 +8701,8 @@ (define-public kiwix-desktop ".tar.gz")) (sha256 (base32 - "0ani12d91azcwwys499848ws7rx0m7c23nalcm5fanjak76bg6n6")))) + "0hlk05gcb3fmnxhwj6gan51v98rdq3iv2lklwbpmm1bazmz8i7br")) + (patches (search-patches "kiwix-desktop-newer-libkiwix.patch")))) (build-system gnu-build-system) (arguments `(#:phases