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 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 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 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 }; -- 2.41.0 '>
AgeCommit message (Expand)Author
2021-05-22etc: Add more SELinux permissions for the daemon....* etc/guix-daemon.cil.in (guix_daemon): Add more permissions, necessary for garbage collection. Marius Bakke
2020-12-10etc: Add more SELinux permissions for the daemon....* etc/guix-daemon.cil.in (guix_daemon): Permit file write, getattr, link and unlink for the guix_daemon_exec_t type. Marius Bakke
2020-11-27etc: Add more SELinux permissions for the daemon....* etc/guix-daemon.cil.in (guix_daemon): Permit more operations required for various build jobs. Marius Bakke
2020-11-26etc: Add more SELinux permissions for the daemon....* etc/guix-daemon.cil.in (guix_daemon): Permit file appending, setattr, read/write UDP sockets, access to tmpfs and hugetlbfs, and connecting to PostgreSQL. Marius Bakke
2020-11-25etc: Add more SELinux permissions for the daemon....This is needed for some package test suites. * etc/guix-daemon.cil.in (guix_daemon): Permit unix_dgram_socket operations. Marius Bakke
2020-11-15etc: Updates for the guix-daemon SELinux policy....* etc/guix-daemon.cil.in (guix_daemon): Specify more permissions for guix-daemon to account for daemon updates and newer SELinux. I can't promise that this is a complete list of everything that guix-daemon needs, but it's probably most of them. It can search for, install, upgrade, and remove packages, create virtual machines and containers, update itself, and so on. Signed-off-by: Marius Bakke <marius@gnu.org> Daniel Brooks