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 ='id' value='4db85c197b8fb056d549dccbc5ec64739281ac56'/>
path: root/tests/inferior.scm
AgeCommit message (Expand)Author
2022-07-08guix: inferior: Fix the behaviour of open-inferior #:error-port....I'm looking at this as the Guix Data Service uses this behaviour to record and display logs from inferior processes. * guix/inferior.scm (open-bidirectional-pipe): Call dup2 for file descriptor 2, passing either the file number for the current error port, or a file descriptor for /dev/null. * tests/inferior.scm ("#:error-port stderr", "#:error-port pipe"): Add two new tests that cover some of the #:error-port behaviour. Christopher Baines
2022-05-20inferior: Close duplicate socketpair file descriptor....* guix/inferior.scm (open-bidirectional-pipe): Pass SOCK_CLOEXEC to 'socketpair'. * tests/inferior.scm ("close-inferior"): Add test. Ludovic Courtès
2021-05-15inferior: Support querying package replacements....I'm looking at this to help with adding support for looking up package replacements to store in the Guix Data Service. * guix/inferior.scm (inferior-package-replacement): New procedure. * tests/inferior.scm ("inferior-package-replacement"): New test. Christopher Baines
2021-04-29inferior: Make sure test refers to guile@3.0....* tests/inferior.scm ("inferior-package-inputs"): Compare with GUILE-3.0-LATEST since that's what 'lookup-inferior-packages' returns. Ludovic Courtès
2021-01-21repl: Fix exception handling for interpreted code....The 'stack' variable could be #f when code is interpreted, which in practice happens when running in "legacy" mode--i.e., when 'open-inferior' invokes "guile" instead of "guix repl". * guix/repl.scm (send-repl-response)[handle-exception]: Check whether STACK is true before passing it to 'stack->frames'. * tests/inferior.scm ("&inferior-exception, legacy mode"): New test. Ludovic Courtès
2021-01-21inferior: Add 'inferior-eval-with-store' tests....* tests/inferior.scm ("inferior-eval-with-store, exception") ("inferior-eval-with-store, not a procedure"): New tests. Ludovic Courtès