GNU bug report logs - #66024
[PATCH v1 0/4] Kiwix updates

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 66024 in the body.
You can then email your comments to 66024 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: guix-patches <at> gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v1 0/4] Kiwix updates
Date: Sat, 16 Sep 2023 10:42:41 +0200

Hi,

Here's is a patch set to update some Kiwix related packages and dependencies.

Denis.

Denis 'GNUtoo' Carikli (4):
  gnu: libzim: Update to 8.2.1.
  gnu: kiwix-lib: Update to 13.0.0.
  gnu: kiwix-tools: Update to 3.5.0.
  gnu: kiwix-desktop: Update to 2.3.1.

 gnu/local.mk                                  |  1 +
 .../kiwix-desktop-newer-libkiwix.patch        | 40 +++++++++++++++++++
 gnu/packages/web.scm                          | 19 ++++-----
 3 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch


base-commit: b696fb41bc0dfcb7130a5aa6d69aff2ae191c283
-- 
2.41.0

Message #8 received at 66024 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: 66024 <at> debbugs.gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v1 1/4] gnu: libzim: Update to 8.2.1.
Date: Sat, 16 Sep 2023 11:06:04 +0200

* gnu/packages/web.scm  (libzim): Update to 8.2.1.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
---
 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 1b4eafeab8..aea0bdc0c3 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -53,7 +53,7 @@
 ;;; Copyright © 2021 Sarah Morgensen <iskarian <at> mgsn.dev>
 ;;; Copyright © 2021 Jack Hill <jackhill <at> jackhill.us>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv <at> posteo.net>
-;;; Copyright © 2021 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
+;;; Copyright © 2021, 2023 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
 ;;; Copyright © 2021 Vinicius Monego <monego <at> posteo.net>
 ;;; Copyright © 2022 cage <cage-dev <at> twistfold.it>
 ;;; Copyright © 2022 Pradana Aumars <paumars <at> courrier.dev>
@@ -8613,7 +8613,7 @@ (define-public kineto
 (define-public libzim
   (package
     (name "libzim")
-    (version "8.0.0")
+    (version "8.2.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -8621,7 +8621,7 @@ (define-public libzim
                     (commit version)))
               (sha256
                (base32
-                "1a7wj8kmpx5aqx0wsfcnaqlfsf1gr66iqxyn24cgjnk4d1rjsahm"))
+                "1g735aqw0vlxqgyjv02lvq24dr5shydp4y8mqianf8720s5fs73f"))
               (file-name (git-file-name name version))))
     (build-system meson-build-system)
     (arguments
-- 
2.41.0

Message #11 received at 66024 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: 66024 <at> debbugs.gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v1 2/4] gnu: kiwix-lib: Update to 13.0.0.
Date: Sat, 16 Sep 2023 11:06:05 +0200

* gnu/packages/web.scm (kiwix-lib): Update to 13.0.0.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
---
 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 aea0bdc0c3..21bb80f70f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8647,7 +8647,7 @@ (define-public libzim
 (define-public kiwix-lib
   (package
     (name "kiwix-lib")
-    (version "11.0.0")
+    (version "13.0.0")
     (home-page "https://github.com/kiwix/kiwix-lib/")
     (source (origin
               (method git-fetch)
@@ -8656,7 +8656,7 @@ (define-public kiwix-lib
                     (commit version)))
               (sha256
                (base32
-                "1w5dabzvd3cnhw064qf9166476fszkkxjcml21x35av0dcd1vlk6"))
+                "0mvlppbj0mqn4ka3cfaaj1pvn062cxbgz01c0nq04x0mzq1xwh5w"))
               (file-name (git-file-name name version))))
     (build-system meson-build-system)
     (arguments
-- 
2.41.0

Message #14 received at 66024 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: 66024 <at> debbugs.gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v1 3/4] gnu: kiwix-tools: Update to 3.5.0.
Date: Sat, 16 Sep 2023 11:06:06 +0200

* gnu/packages/web.scm (kiwix-tools): Update to 3.5.0.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
---
 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 21bb80f70f..221ee03728 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8746,14 +8746,14 @@ (define-public kiwix-desktop
 (define-public kiwix-tools
   (package
     (name "kiwix-tools")
-    (version "3.3.0")
+    (version "3.5.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://download.kiwix.org/release/"
                                   "kiwix-tools/kiwix-tools-" version ".tar.xz"))
               (sha256
                (base32
-                "07mj0lrznydhdbirybdyxswypr7hy290mjdv7lkjr6gxgdp29d37"))))
+                "0q6b7viy1jr212q0glqid2hqxnsd2mxsx5gzcalkc4gb0bzgj32d"))))
     (build-system meson-build-system)
     (inputs
      (list curl
-- 
2.41.0

Message #17 received at 66024 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: 66024 <at> debbugs.gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v1 4/4] gnu: kiwix-desktop: Update to 2.3.1.
Date: Sat, 16 Sep 2023 11:06:07 +0200

* 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 <at> cyberdimension.org>
---
 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 <mgautier <at> 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 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
-- 
2.41.0

Message #20 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Cc: 66024-done <at> debbugs.gnu.org, guix-patches <at> gnu.org
Subject: Re: [bug#66024] [PATCH v1 0/4] Kiwix updates
Date: Mon, 25 Sep 2023 11:46:29 +0100

[Message part 1 (text/plain, inline)]

Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org> writes:

> Hi,
>
> Here's is a patch set to update some Kiwix related packages and dependencies.
>
> Denis.
>
> Denis 'GNUtoo' Carikli (4):
>   gnu: libzim: Update to 8.2.1.
>   gnu: kiwix-lib: Update to 13.0.0.
>   gnu: kiwix-tools: Update to 3.5.0.
>   gnu: kiwix-desktop: Update to 2.3.1.

Thanks Denis, these look good to me :) I've pushed them to master as
d953a1e5d678be58887704df6f10cb19a8fd48bf.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.