Package: guix-patches;
Reported by: Sughosha <sughosha <at> disroot.org>
Date: Fri, 3 Jan 2025 15:45:02 UTC
Severity: normal
Tags: patch
To reply to this bug, email your comments to 75319 AT debbugs.gnu.org.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Fri, 03 Jan 2025 15:45:02 GMT) Full text and rfc822 format available.Sughosha <sughosha <at> disroot.org>:guix-patches <at> gnu.org.
(Fri, 03 Jan 2025 15:45:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: guix-patches <at> gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH 0/5] Update kiwix-desktop to 2.4.1 and kiwix-tools to 3.7.0. Date: Fri, 3 Jan 2025 21:11:51 +0530
This patch series updates kiwix-desktop to 2.4.1 and kiwix-tools to 3.7.0. Sughosha (5): gnu: libzim: Update to 9.2.3. gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. gnu: kiwix-desktop: Update to 2.4.1. gnu: Add libkiwix-13. gnu: kiwix-tools: Update to 3.7.0. gnu/local.mk | 1 - .../kiwix-desktop-newer-libkiwix.patch | 40 ---------- gnu/packages/web.scm | 76 ++++++++++--------- 3 files changed, 41 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch base-commit: 3ea95d7736be1f807d578d17c174b0976543b333 -- 2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Fri, 03 Jan 2025 15:52:02 GMT) Full text and rfc822 format available.Message #8 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH 1/5] gnu: libzim: Update to 9.2.3. Date: Fri, 3 Jan 2025 21:19:18 +0530
* 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 8f816acfd9..dc9fc8ad06 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -9309,7 +9309,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
@@ -9317,7 +9317,7 @@ (define-public libzim
(commit version)))
(sha256
(base32
- "1g735aqw0vlxqgyjv02lvq24dr5shydp4y8mqianf8720s5fs73f"))
+ "1rz8pjrd06qncvg732sg40bhdfzldnrznyaq5k6d4hj575qbwvfg"))
(file-name (git-file-name name version))))
(build-system meson-build-system)
(arguments
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Fri, 03 Jan 2025 15:52:02 GMT) Full text and rfc822 format available.Message #11 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH 2/5] gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. Date: Fri, 3 Jan 2025 21:19:19 +0530
* gnu/packages/web.scm (kiwix-lib): Update to 14.0.0 and rename with libkiwix.
[source]: Switch to url-fetch.
(kiwix-desktop,kiwix-tools)[inputs]: Replace kiwix-lib with libkiwix.
Change-Id: I0f61a7e699b9d90357707446691cbd0106ad8404
---
gnu/packages/web.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index dc9fc8ad06..60a9f5681f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -9340,20 +9340,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")
+ (name "libkiwix")
+ (version "14.0.0")
(home-page "https://github.com/kiwix/kiwix-lib/")
(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
@@ -9420,7 +9420,7 @@ (define-public kiwix-desktop
(list bash-minimal
curl
icu4c
- kiwix-lib
+ libkiwix
libmicrohttpd
libzim
pugixml
@@ -9455,7 +9455,7 @@ (define-public kiwix-tools
(inputs
(list curl
icu4c
- kiwix-lib
+ libkiwix
libmicrohttpd
libzim
pugixml
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Fri, 03 Jan 2025 15:52:03 GMT) Full text and rfc822 format available.Message #14 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH 3/5] gnu: kiwix-desktop: Update to 2.4.1. Date: Fri, 3 Jan 2025 21:19:20 +0530
* 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 <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 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
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Fri, 03 Jan 2025 15:52:03 GMT) Full text and rfc822 format available.Message #17 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH 5/5] gnu: kiwix-tools: Update to 3.7.0. Date: Fri, 3 Jan 2025 21:19:22 +0530
* 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 3d67498a68..8bfdc8818a 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -9449,19 +9449,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
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Fri, 03 Jan 2025 15:52:04 GMT) Full text and rfc822 format available.Message #20 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH 4/5] gnu: Add libkiwix-13. Date: Fri, 3 Jan 2025 21:19:21 +0530
* gnu/packages/web.scm (libkiwix-13): New variable.
Change-Id: I792513ebe0721c3d0b399b2320c82328e40e3eb4
---
gnu/packages/web.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 1d109d4315..3d67498a68 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -9386,6 +9386,20 @@ (define-public libkiwix
It contains the code shared by all Kiwix ports.")
(license license:gpl3)))
+(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")
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Wed, 22 Jan 2025 07:02:02 GMT) Full text and rfc822 format available.Message #23 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: Sughosha via Guix-patches via <guix-patches <at> gnu.org>, 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: Re: [bug#75319] [PATCH 2/5] gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. Date: Wed, 22 Jan 2025 08:01:45 +0100
On 2025-01-03 21:19, Sughosha via Guix-patches via wrote: > * gnu/packages/web.scm (kiwix-lib): Update to 14.0.0 and rename with libkiwix. > [source]: Switch to url-fetch. > (kiwix-desktop,kiwix-tools)[inputs]: Replace kiwix-lib with libkiwix. > > Change-Id: I0f61a7e699b9d90357707446691cbd0106ad8404 > --- > gnu/packages/web.scm | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm > index dc9fc8ad06..60a9f5681f 100644 > --- a/gnu/packages/web.scm > +++ b/gnu/packages/web.scm > @@ -9340,20 +9340,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") > + (name "libkiwix") > + (version "14.0.0") > (home-page "https://github.com/kiwix/kiwix-lib/") Hi! Thanks for the patch series :) Here guix lint complains: gnu/packages/web.scm:9381:15: libkiwix <at> 14.0.0: permanent redirect from https://github.com/kiwix/kiwix-lib/ to https://github.com/kiwix/libkiwix Also if it's possible that someone uses libkiwix in another channel or in personnal usage, we should probably use (define-deprecated/alias kiwix-lib libkiwix) (export kiwix-lib) so that they are warned to change. -- Best regards, Nicolas Graves
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Wed, 22 Jan 2025 07:03:01 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Wed, 22 Jan 2025 07:11:01 GMT) Full text and rfc822 format available.Message #29 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: Sughosha via Guix-patches via <guix-patches <at> gnu.org>, 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: Re: [bug#75319] [PATCH 0/5] Update kiwix-desktop to 2.4.1 and kiwix-tools to 3.7.0. Date: Wed, 22 Jan 2025 08:09:55 +0100
[Message part 1 (text/plain, inline)]
On 2025-01-03 21:11, Sughosha via Guix-patches via wrote: > This patch series updates kiwix-desktop to 2.4.1 and kiwix-tools to 3.7.0. > > Sughosha (5): > gnu: libzim: Update to 9.2.3. > gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. > gnu: kiwix-desktop: Update to 2.4.1. > gnu: Add libkiwix-13. > gnu: kiwix-tools: Update to 3.7.0. > > gnu/local.mk | 1 - > .../kiwix-desktop-newer-libkiwix.patch | 40 ---------- > gnu/packages/web.scm | 76 ++++++++++--------- > 3 files changed, 41 insertions(+), 76 deletions(-) > delete mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch > > > base-commit: 3ea95d7736be1f807d578d17c174b0976543b333 Hi! You can find attached a patch to enable tests for libzim, can you include it in a v2 if QA catches up? Thanks! Made a comment on a patch, otherwise LGTM (build and lint).
[0001-gnu-libzim-Enable-tests.patch (text/x-patch, inline)]
From a7f496f3de76cd1896ef30678325ea8e116636be Mon Sep 17 00:00:00 2001
From: Nicolas Graves <ngraves <at> ngraves.fr>
Date: Wed, 22 Jan 2025 07:54:30 +0100
Subject: [PATCH] gnu: libzim: Enable tests.
* gnu/packages/web.scm (libzim-testing-suite): New variable.
(libzim)[arguments]<#:phases>: Add phase 'inject-test-data.
<#:configure-flags>: Set test_data_dir.
---
gnu/packages/web.scm | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index f966556ed9..2acad4b447 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -9322,6 +9322,16 @@ (define-public kineto
of Geminispace, but it defaults to a specific domain.")
(license license:gpl3+)))
+(define libzim-testing-suite
+ (origin
+ (method url-fetch)
+ (uri (format #f "https://github.com/openzim/\
+zim-testing-suite/releases/download/~a/zim-testing-suite-~a.tar.gz"
+ "0.6.0"
+ "0.6.0"))
+ (sha256
+ (base32 "14pas22zvxd1bw6z2iy0dqa8k1gh0b8dvlml2wi8c73rl94i7aas"))))
+
(define-public libzim
(package
(name "libzim")
@@ -9337,8 +9347,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" #+libzim-testing-suite
+ "-C" "build/test_data")))))))
(inputs
(list icu4c
python-wrapper ; for libzim-compile-resources
--
2.47.1
[Message part 3 (text/plain, inline)]
-- Best regards, Nicolas Graves
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Wed, 22 Jan 2025 07:11:02 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Sun, 23 Feb 2025 12:47:01 GMT) Full text and rfc822 format available.Message #35 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v2 0/6] Update kiwix-desktop to 2.4.1 and kiwix-tools to 3.7.0. Date: Sun, 23 Feb 2025 18:12:52 +0530
In this v2 series, changes have been made as per the review of Nicolas but with a small modification to his patch. Nicolas Graves (1): gnu: libzim: Enable tests. Sughosha (5): gnu: libzim: Update to 9.2.3. gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. gnu: kiwix-desktop: Update to 2.4.1. gnu: Add libkiwix-13. gnu: kiwix-tools: Update to 3.7.0. gnu/local.mk | 1 - .../kiwix-desktop-newer-libkiwix.patch | 40 ------- gnu/packages/web.scm | 103 +++++++++++------- 3 files changed, 65 insertions(+), 79 deletions(-) delete mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch base-commit: 4317534b9a93b32ffd13bbe69fed57ffe00b5536 -- 2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Sun, 23 Feb 2025 12:47:02 GMT) Full text and rfc822 format available.Message #38 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v2 1/6] gnu: libzim: Update to 9.2.3. Date: Sun, 23 Feb 2025 18:12:53 +0530
* 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
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Sun, 23 Feb 2025 12:47:02 GMT) Full text and rfc822 format available.Message #41 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 2/6] gnu: libzim: Enable tests. Date: Sun, 23 Feb 2025 18:12:54 +0530
From: Nicolas Graves <ngraves <at> ngraves.fr>
* 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
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Sun, 23 Feb 2025 12:47:03 GMT) Full text and rfc822 format available.Message #44 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v2 3/6] gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. Date: Sun, 23 Feb 2025 18:12:55 +0530
* 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
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Sun, 23 Feb 2025 12:47:03 GMT) Full text and rfc822 format available.Message #47 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v2 5/6] gnu: Add libkiwix-13. Date: Sun, 23 Feb 2025 18:12:57 +0530
* 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")
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Sun, 23 Feb 2025 12:47:04 GMT) Full text and rfc822 format available.Message #50 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v2 4/6] gnu: kiwix-desktop: Update to 2.4.1. Date: Sun, 23 Feb 2025 18:12:56 +0530
* 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 <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 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
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Sun, 23 Feb 2025 12:47:04 GMT) Full text and rfc822 format available.Message #53 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v2 6/6] gnu: kiwix-tools: Update to 3.7.0. Date: Sun, 23 Feb 2025 18:12:58 +0530
* 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
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Mon, 24 Feb 2025 05:30:02 GMT) Full text and rfc822 format available.Message #56 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v3 2/6] gnu: libzim: Enable tests. Date: Mon, 24 Feb 2025 10:58:58 +0530
* gnu/packages/web.scm (zim-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
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Mon, 24 Feb 2025 05:30:03 GMT) Full text and rfc822 format available.Message #59 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v3 1/6] gnu: libzim: Update to 9.2.3. Date: Mon, 24 Feb 2025 10:58:57 +0530
* 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
base-commit: 4317534b9a93b32ffd13bbe69fed57ffe00b5536
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Mon, 24 Feb 2025 05:30:04 GMT) Full text and rfc822 format available.Message #62 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v3 3/6] gnu: kiwix-lib: Update to 14.0.0 and rename with libkiwix. Date: Mon, 24 Feb 2025 10:58:59 +0530
* 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
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Mon, 24 Feb 2025 05:30:05 GMT) Full text and rfc822 format available.Message #65 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v3 4/6] gnu: kiwix-desktop: Update to 2.4.1. Date: Mon, 24 Feb 2025 10:59:00 +0530
* 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 <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 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
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Mon, 24 Feb 2025 05:30:06 GMT) Full text and rfc822 format available.Message #68 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v3 6/6] gnu: kiwix-tools: Update to 3.7.0. Date: Mon, 24 Feb 2025 10:59:02 +0530
* 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
--
2.47.1
guix-patches <at> gnu.org:bug#75319; Package guix-patches.
(Mon, 24 Feb 2025 05:30:07 GMT) Full text and rfc822 format available.Message #71 received at 75319 <at> debbugs.gnu.org (full text, mbox):
From: Sughosha <sughosha <at> disroot.org> To: 75319 <at> debbugs.gnu.org Cc: Sughosha <sughosha <at> disroot.org> Subject: [PATCH v3 5/6] gnu: Add libkiwix-13. Date: Mon, 24 Feb 2025 10:59:01 +0530
* 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")
--
2.47.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.