haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 22:48:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

QuiteRSS: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-02-02 21:42:34 +10:00
parent 8628975232
commit c1c2e6ef6c
3 changed files with 46 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
net-news/quiterss/patches/quiterss-0.19.2.patchset
View File

@@ -1,54 +0,0 @@
From 511a4d187403a580dbe2cd46881a51d9d9fcc61c Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
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

44
net-news/quiterss/patches/quiterss-0.19.3.patchset Normal file
View File

@@ -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