diff --git a/net-news/quiterss/patches/quiterss-0.19.2.patchset b/net-news/quiterss/patches/quiterss-0.19.2.patchset deleted file mode 100644 index 2fa834f1a..000000000 --- a/net-news/quiterss/patches/quiterss-0.19.2.patchset +++ /dev/null @@ -1,54 +0,0 @@ -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 - - -diff --git a/src/application/logfile.cpp b/src/application/logfile.cpp -index 04c9c13..03711b7 100644 ---- a/src/application/logfile.cpp -+++ b/src/application/logfile.cpp -@@ -36,7 +36,8 @@ void LogFile::msgHandler(QtMsgType type, const QMessageLogContext &, const QStri - if (!mainApp->dataDirInitialized()) - return; - -- QFile file; -+} -+/* QFile file; - file.setFileName(mainApp->dataDir() + "/debug.log"); - QIODevice::OpenMode openMode = QIODevice::WriteOnly | QIODevice::Text; - -@@ -74,6 +75,7 @@ void LogFile::msgHandler(QtMsgType type, const QMessageLogContext &, const QStri - file.close(); - } - } -+*/ - #else - void LogFile::msgHandler(QtMsgType type, const char *msg) - { --- -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/patches/quiterss-0.19.3.patchset b/net-news/quiterss/patches/quiterss-0.19.3.patchset new file mode 100644 index 000000000..40bdf873d --- /dev/null +++ b/net-news/quiterss/patches/quiterss-0.19.3.patchset @@ -0,0 +1,44 @@ +From ecd51e6384186d39ceb01ebd6ccda25d89f0a5b5 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 2 Feb 2020 20:32:49 +1000 +Subject: Fix build for Haiku + + +diff --git a/src/application/logfile.cpp b/src/application/logfile.cpp +index 4687da1..f84d087 100644 +--- a/src/application/logfile.cpp ++++ b/src/application/logfile.cpp +@@ -34,7 +34,8 @@ LogFile::LogFile() + #ifdef HAVE_QT5 + void LogFile::msgHandler(QtMsgType type, const QMessageLogContext &, const QString &msg) + { +- if (!globals.isInit_) ++} ++/* if (!globals.isInit_) + return; + if (msg.startsWith("libpng warning: iCCP")) + return; +@@ -82,6 +83,7 @@ void LogFile::msgHandler(QtMsgType type, const QMessageLogContext &, const QStri + file.close(); + } + } ++*/ + #else + void LogFile::msgHandler(QtMsgType type, const char *msg) + { +diff --git a/src/main/globals.cpp b/src/main/globals.cpp +index c3dd738..9f98cae 100644 +--- a/src/main/globals.cpp ++++ b/src/main/globals.cpp +@@ -57,7 +57,7 @@ void Globals::init() + #endif + + // Check Dir ... +-#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.24.1 + diff --git a/net-news/quiterss/quiterss-0.19.2.recipe b/net-news/quiterss/quiterss-0.19.3.recipe similarity index 96% rename from net-news/quiterss/quiterss-0.19.2.recipe rename to net-news/quiterss/quiterss-0.19.3.recipe index 2301859ca..87427eb75 100644 --- a/net-news/quiterss/quiterss-0.19.2.recipe +++ b/net-news/quiterss/quiterss-0.19.3.recipe @@ -13,11 +13,11 @@ restart application) ... and much more" HOMEPAGE="https://quiterss.org/" -COPYRIGHT="2011-2019 QuiteRSS Team" +COPYRIGHT="2011-2020 QuiteRSS Team" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/QuiteRSS/quiterss/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="65f97573a0ddbe6d25c3c1e1a95d8594347cc18949221e5f69e3788fe138b625" +CHECKSUM_SHA256="5177a15d5799536e6554022d7765eeb19f66976ab88844457cbe2df66a6d784e" SOURCE_FILENAME="quiterss-$portVersion.tar.gz" PATCHES="quiterss-$portVersion.patchset" ADDITIONAL_FILES="