From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1AE5215802C for ; Wed, 18 Dec 2024 17:21:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB6B5E08B1; Wed, 18 Dec 2024 17:21:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C46D3E08B1 for ; Wed, 18 Dec 2024 17:21:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9708342F93 for ; Wed, 18 Dec 2024 17:21:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DC5B2135 for ; Wed, 18 Dec 2024 17:21:26 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1734533643.562ed5fdbfc25ffad343a69748bd8eb9156ebd48.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: www-misc/kiwix-desktop/files/, www-misc/kiwix-desktop/ X-VCS-Repository: repo/proj/guru X-VCS-Files: www-misc/kiwix-desktop/Manifest www-misc/kiwix-desktop/files/kiwix-desktop-2.3.1-shared_ptr.patch www-misc/kiwix-desktop/kiwix-desktop-2.3.1.ebuild X-VCS-Directories: www-misc/kiwix-desktop/files/ www-misc/kiwix-desktop/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 562ed5fdbfc25ffad343a69748bd8eb9156ebd48 X-VCS-Branch: master Date: Wed, 18 Dec 2024 17:21:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d3292736-b112-4371-a01e-5189c377b712 X-Archives-Hash: a7d51cb9da5f401d09ba3ba01e8f9305 commit: 562ed5fdbfc25ffad343a69748bd8eb9156ebd48 Author: Takuya Wakazono gmail com> AuthorDate: Wed Dec 18 14:54:03 2024 +0000 Commit: David Roman gmail com> CommitDate: Wed Dec 18 14:54:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=562ed5fd www-misc/kiwix-desktop: drop 2.3.1 Closes: https://bugs.gentoo.org/934946 (obsolete) Signed-off-by: Takuya Wakazono gmail.com> www-misc/kiwix-desktop/Manifest | 1 - .../files/kiwix-desktop-2.3.1-shared_ptr.patch | 32 ------------------ www-misc/kiwix-desktop/kiwix-desktop-2.3.1.ebuild | 38 ---------------------- 3 files changed, 71 deletions(-) diff --git a/www-misc/kiwix-desktop/Manifest b/www-misc/kiwix-desktop/Manifest index 5df696b8a..b9ce03d55 100644 --- a/www-misc/kiwix-desktop/Manifest +++ b/www-misc/kiwix-desktop/Manifest @@ -1,2 +1 @@ -DIST kiwix-desktop-2.3.1.tar.gz 525090 BLAKE2B 3f2bc6d49f383e754438dfee260b3aa1a09040b9b543b1abc8acc0aa4531e84c350e014f98951409b292ed7e9fa2285733d98237b0ff3b4175de8e8f269cac1f SHA512 09d4c2293fc36ac0b03c815474f5f60881093552fd7d1d0940858254c16d7b6021bd05f4f985b32401328705082f07fbd72e92f79bb1365650f5dd75d455f0b8 DIST kiwix-desktop-2.4.0.tar.gz 671550 BLAKE2B 30374c6836a2144dbeae724ff6a21602529fbeb285b47aeccdc4e2d2950a0048aa5691ce8534502fce80e4fc789743c1c786c0dc57cd06ce9a44f0adf8e0deef SHA512 e59957ba34a2d04c0fb63651ec30c9acc585755859aa53b8f96a84c62172b4dbf52d4ace7690ff2c5e478fc661c7014164985a6767847b8d11bcef00ab025d8f diff --git a/www-misc/kiwix-desktop/files/kiwix-desktop-2.3.1-shared_ptr.patch b/www-misc/kiwix-desktop/files/kiwix-desktop-2.3.1-shared_ptr.patch deleted file mode 100644 index 668e38ca8..000000000 --- a/www-misc/kiwix-desktop/files/kiwix-desktop-2.3.1-shared_ptr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1b322d8f01c787846546a6473f153cf1daa41e65 Mon Sep 17 00:00:00 2001 -From: Matthieu Gautier -Date: Thu, 9 Feb 2023 09:47:47 +0100 -Subject: [PATCH] With last version of libkiwix, Downloader now return - shared_ptr. - ---- - src/contentmanager.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp -index c2f4ff98..d4db50a0 100644 ---- a/src/contentmanager.cpp -+++ b/src/contentmanager.cpp -@@ -173,7 +173,7 @@ QStringList ContentManager::updateDownloadInfos(QString id, const QStringList &k - return values; - } - auto& b = mp_library->getBookById(id); -- kiwix::Download* d; -+ std::shared_ptr d; - try { - d = mp_downloader->getDownload(b.getDownloadId()); - } catch(...) { -@@ -270,7 +270,7 @@ QString ContentManager::downloadBook(const QString &id) - for (auto b : booksList) - if (b.toStdString() == book.getId()) - return ""; -- kiwix::Download *download; -+ std::shared_ptr download; - try { - std::pair downloadDir("dir", downloadPath.toStdString()); - const std::vector> options = { downloadDir }; diff --git a/www-misc/kiwix-desktop/kiwix-desktop-2.3.1.ebuild b/www-misc/kiwix-desktop/kiwix-desktop-2.3.1.ebuild deleted file mode 100644 index b3b4f168e..000000000 --- a/www-misc/kiwix-desktop/kiwix-desktop-2.3.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qmake-utils - -DESCRIPTION="cross-platform viewer/manager for ZIM archives" -HOMEPAGE="https://kiwix.org/" -SRC_URI="https://github.com/kiwix/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtimageformats:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5 - =www-misc/libkiwix-12.1.0*:= - -" -BDEPEND="app-arch/unzip" - -PATCHES=( - "${FILESDIR}/kiwix-desktop-2.3.1-shared_ptr.patch" -) - -src_compile() { - eqmake5 PREFIX=/usr . - emake -} - -src_install() { - emake install INSTALL_ROOT="${ED}" -}