Received: (at 75319) by debbugs.gnu.org; 3 Jan 2025 15:51:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 03 10:51:21 2025
Received: from localhost ([127.0.0.1]:51757 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tTjxJ-0007EL-4z
for submit <at> debbugs.gnu.org; Fri, 03 Jan 2025 10:51:21 -0500
Received: from layka.disroot.org ([178.21.23.139]:41368)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <sughosha@HIDDEN>)
id 1tTjx9-0007DD-4K
for 75319 <at> debbugs.gnu.org; Fri, 03 Jan 2025 10:51:13 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 33EF925B7F;
Fri, 3 Jan 2025 16:51:10 +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 7jmklRvPuTZh; Fri, 3 Jan 2025 16:51:06 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1735919465; bh=WpYNiroLIkvUlcMfFJH4HXZf6scNlM89OBlsdkpCnno=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=LqVeGoLJMsyQ4Fkq/SWLXRFaGFLrHpR99s2QOeyhynT/Xnj8jkySeSW4mhtCJmUO2
7nmvz9gryptumc5WytX2o5qQNEhEr8nQxpq0rYvZfLi7XDxAlfL9K8qsh19yMabSvE
i3YZ5cyjncwEkmQjMLJqaKiFx4FCwj78AhQtwBBFSJ5wNDPbQm4za11t7T+Od8l6We
lV2TIUS0BtEtL2saptxDw3vQYxdcQYpr+38cruCfIw+Uu2YiV3WZiFi6XmB41bTFry
ZjmXA7fnHjne/29dmbYYcry5AfpkkyIEA9u5WAfwGJXa0Z3yshUDPq4nUCOIk7xVk6
HVvm0bJa+7PXA==
From: Sughosha <sughosha@HIDDEN>
To: 75319 <at> debbugs.gnu.org
Subject: [PATCH 4/5] gnu: Add libkiwix-13.
Date: Fri, 3 Jan 2025 21:19:21 +0530
Message-ID: <16ecc4f8d92af2697058dac583bace43343b4921.1735897389.git.sughosha@HIDDEN>
In-Reply-To: <cover.1735897389.git.sughosha@HIDDEN>
References: <cover.1735897389.git.sughosha@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 75319
Cc: Sughosha <sughosha@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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@HIDDEN:bug#75319; Package guix-patches.
Full text available.
Received: (at 75319) by debbugs.gnu.org; 3 Jan 2025 15:51:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 03 10:51:21 2025
Received: from localhost ([127.0.0.1]:51755 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tTjxI-0007EJ-KZ
for submit <at> debbugs.gnu.org; Fri, 03 Jan 2025 10:51:21 -0500
Received: from layka.disroot.org ([178.21.23.139]:41378)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <sughosha@HIDDEN>)
id 1tTjxA-0007DT-No
for 75319 <at> debbugs.gnu.org; Fri, 03 Jan 2025 10:51:13 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id D80EE25A96;
Fri, 3 Jan 2025 16:51:11 +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 0idJ67M3_Mmb; Fri, 3 Jan 2025 16:51:07 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1735919467; bh=flozurRi1otXhcQ5XJJrzin6f65w0q/aMKL4YNXul3g=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=JrwhAm0ASG9tzpeL3DMUN4gRcau4QsZjtPrej45/9WRAT0/WeUouYPV4+oBdMlgSh
+zo0OEiRXQsXaF5AqiLdH5WjSUbPxiGmyvp92MavG5WOheX77xjlyYVWtc2MD/9dfu
9Tm6WTOB4OxWKtaUbxzpK21C2eMvgQFbYJsBFtecWJfTg90wZ5L821ApL4KG9/mEXr
Og0xhgaeKtrbL1sx3ml9S8fGAawwaVlQXlm15lH5Ry84zCuIeRA8ojCIWXGzatH/CI
2oZJqsesXlztPIVVAxmGOSx1K0MyQ30tE20giwB1dOzRlJ63lqFcX8uiOYzoLT3rSe
jKpjRdGQ9D6hg==
From: Sughosha <sughosha@HIDDEN>
To: 75319 <at> debbugs.gnu.org
Subject: [PATCH 5/5] gnu: kiwix-tools: Update to 3.7.0.
Date: Fri, 3 Jan 2025 21:19:22 +0530
Message-ID: <582746f2efd2b54bbb9a6c1c32c7058d3ce6150e.1735897389.git.sughosha@HIDDEN>
In-Reply-To: <cover.1735897389.git.sughosha@HIDDEN>
References: <cover.1735897389.git.sughosha@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 75319
Cc: Sughosha <sughosha@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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@HIDDEN:bug#75319; Package guix-patches.
Full text available.
Received: (at 75319) by debbugs.gnu.org; 3 Jan 2025 15:51:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 03 10:51:17 2025
Received: from localhost ([127.0.0.1]:51753 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tTjxE-0007E0-4Q
for submit <at> 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 <sughosha@HIDDEN>)
id 1tTjx7-0007Cu-Ig
for 75319 <at> 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==
From: Sughosha <sughosha@HIDDEN>
To: 75319 <at> debbugs.gnu.org
Subject: [PATCH 3/5] gnu: kiwix-desktop: Update to 2.4.1.
Date: Fri, 3 Jan 2025 21:19:20 +0530
Message-ID: <c21289215ac85e9aa471b00387de1d0971bd162b.1735897389.git.sughosha@HIDDEN>
In-Reply-To: <cover.1735897389.git.sughosha@HIDDEN>
References: <cover.1735897389.git.sughosha@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 75319
Cc: Sughosha <sughosha@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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@HIDDEN>
-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@HIDDEN:bug#75319; Package guix-patches.
Full text available.
Received: (at 75319) by debbugs.gnu.org; 3 Jan 2025 15:51:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 03 10:51:16 2025
Received: from localhost ([127.0.0.1]:51751 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tTjxD-0007Dw-G2
for submit <at> debbugs.gnu.org; Fri, 03 Jan 2025 10:51:15 -0500
Received: from layka.disroot.org ([178.21.23.139]:41350)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <sughosha@HIDDEN>)
id 1tTjx5-0007Cd-Tm
for 75319 <at> debbugs.gnu.org; Fri, 03 Jan 2025 10:51:10 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id A4F8F25B58;
Fri, 3 Jan 2025 16:51:06 +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 ilZC3ok3VELO; Fri, 3 Jan 2025 16:51:02 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1735919462; bh=jHwnZmqILmqOQYrG5uCh4Crsfams/847jsKjOs+rzTc=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=hbaUudO9vOvmaTHICsaAvUk/CAbaflrbKwfg+oVK4mIIAXzu+vy/xoZd4YMZL2KMz
u7MqIRVPw6WJhRwIUwmSl+hiTh5qi1dQp6n+MiB/QGQ3ZejOVnXzbHvmRml73Db0T0
EsDgAFLTmgUuDBTyoy3yoOPWuV3DmXqQtL5mvmzCSAvRkEBQI8mOv91p+J0e8pgJ3y
u6h00V5pKHvM4deV97wVgSXG0+J2VrkPQPugQXjh/yvSBnG5omfmdY+CKDcIBC8tSm
KlkQKO+//fHTaXckRUYXF/q6OqsiAIaNqnL4iRlMyysHZLV5IT0qPPmMx5a1+bW84X
pxslKLoQUpEoA==
From: Sughosha <sughosha@HIDDEN>
To: 75319 <at> debbugs.gnu.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
Message-ID: <1ad9fc024e273276701b48802d64e3bf09fa1801.1735897389.git.sughosha@HIDDEN>
In-Reply-To: <cover.1735897389.git.sughosha@HIDDEN>
References: <cover.1735897389.git.sughosha@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 75319
Cc: Sughosha <sughosha@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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@HIDDEN:bug#75319; Package guix-patches.
Full text available.
Received: (at 75319) by debbugs.gnu.org; 3 Jan 2025 15:51:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 03 10:51:12 2025
Received: from localhost ([127.0.0.1]:51747 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tTjx9-0007DF-0U
for submit <at> debbugs.gnu.org; Fri, 03 Jan 2025 10:51:12 -0500
Received: from layka.disroot.org ([178.21.23.139]:56102)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <sughosha@HIDDEN>)
id 1tTjx0-0007Bg-Ms
for 75319 <at> debbugs.gnu.org; Fri, 03 Jan 2025 10:51:05 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 2A99825C4D;
Fri, 3 Jan 2025 16:51:01 +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 8FZgnIydIq01; Fri, 3 Jan 2025 16:51:00 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1735919460; bh=KpwKDFAXcCTbnoJq+fmH46t67/S+u48zzLAauxvWyT8=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=GSmRXbMDC7oMcPBm5n47wnibmg1QsjEs6yR3V9f35Wmp0IrA3jyOiiq6OuJeOs5jd
502wiBxKkXib/GJHX0TM694vh3jxcSG3EFmS8/ZUSHVKaNb6XAU8FqR5cqFFwcwcta
ZfN5ih7smy/6NUL368pwKTG6rGxqy+UbJ7UT73bSt1abKp9Oc+Co51fTMAO79Gu1Xv
WqbWlPvxo7fgU6u/GYfuEGrEGYW2Alaz0EMhMjmzeWcqY+tzzyBq/48SG2AzLlJ8E0
4Ce3orIOy0gR9jHwod5YqaUu4S0fRLK/bYlN41No9MVZYvFcPM07keEfVAYxi7rgcd
QUx+Fv/2zTBHw==
From: Sughosha <sughosha@HIDDEN>
To: 75319 <at> debbugs.gnu.org
Subject: [PATCH 1/5] gnu: libzim: Update to 9.2.3.
Date: Fri, 3 Jan 2025 21:19:18 +0530
Message-ID: <69b0b829836874b9e87010a11223fa4732fac863.1735897389.git.sughosha@HIDDEN>
In-Reply-To: <cover.1735897389.git.sughosha@HIDDEN>
References: <cover.1735897389.git.sughosha@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 75319
Cc: Sughosha <sughosha@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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@HIDDEN:bug#75319; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 3 Jan 2025 15:44:58 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 03 10:44:58 2025 Received: from localhost ([127.0.0.1]:51725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tTjr7-0006h6-Ry for submit <at> debbugs.gnu.org; Fri, 03 Jan 2025 10:44:58 -0500 Received: from lists.gnu.org ([2001:470:142::17]:39898) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <sughosha@HIDDEN>) id 1tTjr1-0006g5-H3 for submit <at> debbugs.gnu.org; Fri, 03 Jan 2025 10:44:55 -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 <sughosha@HIDDEN>) id 1tTjqu-0000fH-L7 for guix-patches@HIDDEN; Fri, 03 Jan 2025 10:44:44 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <sughosha@HIDDEN>) id 1tTjqs-0007kI-Bc for guix-patches@HIDDEN; Fri, 03 Jan 2025 10:44:44 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D7782254DC; Fri, 3 Jan 2025 16:44:38 +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 Ft7mehSCk-q7; Fri, 3 Jan 2025 16:44:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735919078; bh=dQe1J0FKVUxJeIkziV5UdIL+fpDuXR7gzC6yAxgznYQ=; h=From:To:Cc:Subject:Date; b=mYUkhAmVKfu1z3D5SfymQmmrLgpHdblJOpPnGybWMZw78naIv+7CjLPUIjaoOcOMr Vl2+1LgZQngjh8X0KVxm/BYBIn3jic/C15vsRw6y/7Q4pCU01ZSjsKZsUMBYeXm2HP BeMeXHmexwrcfaOCivp0ctgKN9pz7Zw8K1+Qu7DDKAa7HJ/xiUYCTLg6uc7I3s+hIQ ve1Rq5LrbCa+cKHHLp3/4Pnme3fQh2VWQBgFZU7SlJ7pU6SB9NWrGgG1jNzUyYYPi6 zhtTFhIVICAtYMgK4wSdZA6zyevz7RDl0FBLU4Rv5PT3dQDtt3SIBIzKdE0lErAqDU dJYM0pUBWCaMw== From: Sughosha <sughosha@HIDDEN> To: guix-patches@HIDDEN 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 Message-ID: <cover.1735897389.git.sughosha@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=sughosha@HIDDEN; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Sughosha <sughosha@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.1 (/) 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
Sughosha <sughosha@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#75319; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.