[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/22: gnu: kiwix-desktop: Update to 2.3.1.
From: |
guix-commits |
Subject: |
07/22: gnu: kiwix-desktop: Update to 2.3.1. |
Date: |
Mon, 25 Sep 2023 06:32:04 -0400 (EDT) |
cbaines pushed a commit to branch master
in repository guix.
commit d953a1e5d678be58887704df6f10cb19a8fd48bf
Author: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
AuthorDate: Sat Sep 16 11:06:07 2023 +0200
gnu: kiwix-desktop: Update to 2.3.1.
* 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 <GNUtoo@cyberdimension.org>
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/local.mk | 1 +
.../patches/kiwix-desktop-newer-libkiwix.patch | 40 ++++++++++++++++++++++
gnu/packages/web.scm | 5 +--
3 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index ee9a509f1b..bfa816d717 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1477,6 +1477,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 <mgautier@kymeria.fr>
+Date: Thu, 9 Feb 2023 09:47:47 +0100
+Subject: [PATCH] With last version of libkiwix, Downloader now return
+ shared_ptr<Download>.
+
+---
+ 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<kiwix::Download> 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<kiwix::Download> download;
+ try {
+ std::pair<std::string, std::string> downloadDir("dir",
downloadPath.toStdString());
+ const std::vector<std::pair<std::string, std::string>> options = {
downloadDir };
+--
+2.41.0
+
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 0afb12ac49..d8acc13e8a 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8786,7 +8786,7 @@ It contains the code shared by all Kiwix ports.")
(define-public kiwix-desktop
(package
(name "kiwix-desktop")
- (version "2.2.2")
+ (version "2.3.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -8795,7 +8795,8 @@ It contains the code shared by all Kiwix ports.")
".tar.gz"))
(sha256
(base32
- "0ani12d91azcwwys499848ws7rx0m7c23nalcm5fanjak76bg6n6"))))
+ "0hlk05gcb3fmnxhwj6gan51v98rdq3iv2lklwbpmm1bazmz8i7br"))
+ (patches (search-patches "kiwix-desktop-newer-libkiwix.patch"))))
(build-system gnu-build-system)
(arguments
`(#:phases
- branch master updated (94f3831e5b -> a965ff448d), guix-commits, 2023/09/25
- 01/22: gnu: guile-fibers: Remove version from latest package., guix-commits, 2023/09/25
- 03/22: gnu: icewm: Update to 3.4.2., guix-commits, 2023/09/25
- 13/22: gnu: bcachefs-tools: Restyle format., guix-commits, 2023/09/25
- 14/22: gnu: jq: Update to 1.7., guix-commits, 2023/09/25
- 04/22: gnu: libzim: Update to 8.2.1., guix-commits, 2023/09/25
- 07/22: gnu: kiwix-desktop: Update to 2.3.1.,
guix-commits <=
- 05/22: gnu: kiwix-lib: Update to 13.0.0., guix-commits, 2023/09/25
- 09/22: gnu: syncthing: Update to 1.24.0., guix-commits, 2023/09/25
- 10/22: gnu: freerdp: Update to 2.11.1., guix-commits, 2023/09/25
- 11/22: gnu: muchsync: Update to 7., guix-commits, 2023/09/25
- 12/22: gnu: bcachefs-tools: Update to 1.2., guix-commits, 2023/09/25
- 15/22: gnu: bemenu: Update to 0.6.16., guix-commits, 2023/09/25
- 16/22: gnu: sigrok-firmware-fx2lafw: Rely on implicit inputs., guix-commits, 2023/09/25
- 17/22: gnu: sigrok-firmware-fx2lafw: Remove input labels., guix-commits, 2023/09/25
- 19/22: gnu: sigrok-firmware-fx2lafw: Explicitly disable tests., guix-commits, 2023/09/25
- 20/22: gnu: sigrok-firmware-fx2lafw: Update to 0.1.7-1.96b0b47., guix-commits, 2023/09/25