From cbe3eb05e2e0c038288218c89c7a39bec345281e Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 21 Oct 2019 20:16:36 +1000 Subject: [PATCH] QuiteRSS: fix resource dir --- .../patches/quiterss-0.18.12.patchset | 27 +++++++++++++++++-- net-news/quiterss/quiterss-0.18.12.recipe | 2 +- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/net-news/quiterss/patches/quiterss-0.18.12.patchset b/net-news/quiterss/patches/quiterss-0.18.12.patchset index d4c5fa07c..2fa834f1a 100644 --- a/net-news/quiterss/patches/quiterss-0.18.12.patchset +++ b/net-news/quiterss/patches/quiterss-0.18.12.patchset @@ -1,4 +1,4 @@ -From 38d78bb149104ad44a0fd70dfd4dd34061d0c96a Mon Sep 17 00:00:00 2001 +From 511a4d187403a580dbe2cd46881a51d9d9fcc61c Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Tue, 2 Oct 2018 15:12:39 +0300 Subject: Workaround for a crash on quit @@ -27,5 +27,28 @@ index 04c9c13..03711b7 100644 void LogFile::msgHandler(QtMsgType type, const char *msg) { -- -2.19.0 +2.23.0 + + +From 388e20b88c3288f315615703a126ac5c5677bcf4 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Mon, 21 Oct 2019 20:13:39 +1000 +Subject: Fix resource dir + + +diff --git a/src/application/mainapplication.cpp b/src/application/mainapplication.cpp +index 20ad98a..033aeed 100644 +--- a/src/application/mainapplication.cpp ++++ b/src/application/mainapplication.cpp +@@ -173,7 +173,7 @@ void MainApplication::checkPortable() + + void MainApplication::checkDir() + { +-#if defined(Q_OS_WIN) || defined(Q_OS_OS2) ++#if defined(Q_OS_WIN) || defined(Q_OS_OS2) || defined(Q_OS_HAIKU) + resourcesDir_ = QCoreApplication::applicationDirPath(); + #else + #if defined(Q_OS_MAC) +-- +2.23.0 diff --git a/net-news/quiterss/quiterss-0.18.12.recipe b/net-news/quiterss/quiterss-0.18.12.recipe index d913fa1b8..e867887c4 100644 --- a/net-news/quiterss/quiterss-0.18.12.recipe +++ b/net-news/quiterss/quiterss-0.18.12.recipe @@ -15,7 +15,7 @@ restart application) HOMEPAGE="https://quiterss.org/" COPYRIGHT="2011-2018 QuiteRSS Team" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/QuiteRSS/quiterss/archive/$portVersion.tar.gz" CHECKSUM_SHA256="120de0d640e2c417d664872b8b8881c85c3e76aec9b76d235f0e12e5ee78f01f" SOURCE_FILENAME="quiterss-$portVersion.tar.gz"