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

Otter: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2018-08-24 14:57:10 +10:00
parent d8082cd88f
commit 435ba55347
2 changed files with 45 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www-client/otter-browser/otter_browser-0.9.99.recipe → www-client/otter-browser/otter_browser-0.9.99.2.recipe
View File

@@ -6,10 +6,10 @@ COPYRIGHT="2013-2018 Otter Browser Team"
LICENSE="GNU GPL v3" LICENSE="GNU GPL v3"
REVISION="1" REVISION="1"
SOURCE_URI="https://github.com/OtterBrowser/otter-browser/archive/v$portVersion.tar.gz" SOURCE_URI="https://github.com/OtterBrowser/otter-browser/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="b3e38b51fcb8b93e150103634d2e11db767726934732183e658384c2f388c326" CHECKSUM_SHA256="b4dee6cdf9fec46169b973ad8578d32a30805ea9ecdf95851f24920485f6bddb"
SOURCE_FILENAME="otter-browser-$portVersion.tar.gz" SOURCE_FILENAME="otter-browser-$portVersion.tar.gz"
SOURCE_DIR="otter-browser-$portVersion" SOURCE_DIR="otter-browser-$portVersion"
PATCHES="otter_browser-$portVersion.patchset" #PATCHES="otter_browser-$portVersion.patchset"
ADDITIONAL_FILES="otter.rdef.in" ADDITIONAL_FILES="otter.rdef.in"
ARCHITECTURES="!x86_gcc2 x86 x86_64" ARCHITECTURES="!x86_gcc2 x86 x86_64"

155
www-client/otter-browser/patches/otter_browser-0.9.99.patchset → www-client/otter-browser/patches/otter_browser-0.9.99.2.patchset
View File

@@ -1,89 +1,36 @@
From 5b3591f12ef268113cc4e0e35548a90c43c7f75d Mon Sep 17 00:00:00 2001 From 57b7ea48b212e48933ffed4de5ed3a83cb236071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Fri, 16 Mar 2018 20:43:08 +0100
Subject: Haiku warning fix
diff --git a/src/core/Application.cpp b/src/core/Application.cpp
index ee24cf5..1941a9f 100644
--- a/src/core/Application.cpp
+++ b/src/core/Application.cpp
@@ -346,7 +346,9 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act
}
else
{
- message = tr("Your profile directory (%1) is running low on free disk space (%2 remaining).\nThis may lead to malfunctions or even data loss.").arg(QDir::toNativeSeparators(profilePath)).arg(Utils::formatUnit(storageInformation.bytesAvailable()));
+ #ifndef __HAIKU__
+ message = tr("Your profile directory (%1) is running low on free disk space (%2 remaining).\nThis may lead to malfunctions or even data loss.").arg(QDir::toNativeSeparators(profilePath)).arg(Utils::formatUnit(storageInformation.bytesAvailable()));
+ #endif
}
QMessageBox messageBox;
--
2.16.4
From 817d9b7dfab31779f3285d5a8d9be94ca0f55d52 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 5 May 2018 18:06:16 +1000 Date: Fri, 24 Aug 2018 14:40:25 +1000
Subject: Fix crash when exit Subject: Fix for Haiku
diff --git a/src/core/Application.cpp b/src/core/Application.cpp diff --git a/src/core/Application.cpp b/src/core/Application.cpp
index 1941a9f..beb92c3 100644 index b78043f..87060e8 100644
--- a/src/core/Application.cpp --- a/src/core/Application.cpp
+++ b/src/core/Application.cpp +++ b/src/core/Application.cpp
@@ -366,7 +366,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act @@ -327,7 +327,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act
Console::createInstance();
if (messageBox.clickedButton() == quitButton) SettingsManager::createInstance(profilePath);
{ -
- exit(); +#ifndef Q_OS_HAIKU
+ ::exit(0); if (!isReadOnly)
{
return; const QStorageInfo storageInformation(profilePath);
} @@ -383,7 +383,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act
@@ -397,7 +397,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act }
m_localServer->close();
} }
- exit();
+ ::exit(0);
return;
} }
@@ -848,7 +848,7 @@ void Application::close() -
{ +#endif
SessionsManager::saveSession(); SessionsManager::createInstance(profilePath, cachePath, isPrivate, isReadOnly);
- exit();
+ ::exit(0);
}
}
@@ -870,7 +870,7 @@ void Application::removeWindow(MainWindow *mainWindow)
if (m_windows.isEmpty())
{
- exit();
+ ::exit(0);
}
}
--
2.16.4
From 743bceeb79ed9d9981a7ecb24c5cd1bb90573b27 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 9 Jun 2018 04:46:02 +0000
Subject: Tune default settings
if (!isReadOnly && !Migrator::run())
diff --git a/src/core/SettingsManager.cpp b/src/core/SettingsManager.cpp diff --git a/src/core/SettingsManager.cpp b/src/core/SettingsManager.cpp
index c90a3aa..0a143f3 100644 index fdab0f0..1d47710 100644
--- a/src/core/SettingsManager.cpp --- a/src/core/SettingsManager.cpp
+++ b/src/core/SettingsManager.cpp +++ b/src/core/SettingsManager.cpp
@@ -79,7 +79,7 @@ void SettingsManager::createInstance(const QString &path) @@ -80,7 +80,7 @@ void SettingsManager::createInstance(const QString &path)
registerOption(Browser_EnableSingleKeyShortcutsOption, BooleanType, true); registerOption(Browser_EnableSingleKeyShortcutsOption, BooleanType, true);
registerOption(Browser_EnableSpellCheckOption, BooleanType, true); registerOption(Browser_EnableSpellCheckOption, BooleanType, true);
registerOption(Browser_EnableTrayIconOption, BooleanType, true); registerOption(Browser_EnableTrayIconOption, BooleanType, true);
@@ -92,7 +39,7 @@ index c90a3aa..0a143f3 100644
registerOption(Browser_InactiveTabTimeUntilSuspendOption, IntegerType, -1); registerOption(Browser_InactiveTabTimeUntilSuspendOption, IntegerType, -1);
registerOption(Browser_KeyboardShortcutsProfilesOrderOption, ListType, QStringList(QLatin1String("default"))); registerOption(Browser_KeyboardShortcutsProfilesOrderOption, ListType, QStringList(QLatin1String("default")));
registerOption(Browser_LocaleOption, StringType, QLatin1String("system")); registerOption(Browser_LocaleOption, StringType, QLatin1String("system"));
@@ -107,19 +107,19 @@ void SettingsManager::createInstance(const QString &path) @@ -108,19 +108,19 @@ void SettingsManager::createInstance(const QString &path)
registerOption(Choices_WarnQuitOption, EnumerationType, QLatin1String("noWarn"), {QLatin1String("alwaysWarn"), QLatin1String("warnOpenTabs"), QLatin1String("noWarn")}); registerOption(Choices_WarnQuitOption, EnumerationType, QLatin1String("noWarn"), {QLatin1String("alwaysWarn"), QLatin1String("warnOpenTabs"), QLatin1String("noWarn")});
registerOption(Choices_WarnQuitTransfersOption, BooleanType, true); registerOption(Choices_WarnQuitTransfersOption, BooleanType, true);
registerOption(Content_BackgroundColorOption, ColorType, QColor(0xFF, 0xFF, 0xFF)); registerOption(Content_BackgroundColorOption, ColorType, QColor(0xFF, 0xFF, 0xFF));
@@ -118,7 +65,7 @@ index c90a3aa..0a143f3 100644
registerOption(Content_TextColorOption, ColorType, QColor(0, 0, 0)); registerOption(Content_TextColorOption, ColorType, QColor(0, 0, 0));
registerOption(Content_UserStyleSheetOption, PathType, QString()); registerOption(Content_UserStyleSheetOption, PathType, QString());
registerOption(Content_VisitedLinkColorOption, ColorType, QColor(0x55, 0x1A, 0x8B)); registerOption(Content_VisitedLinkColorOption, ColorType, QColor(0x55, 0x1A, 0x8B));
@@ -155,7 +155,7 @@ void SettingsManager::createInstance(const QString &path) @@ -156,7 +156,7 @@ void SettingsManager::createInstance(const QString &path)
registerOption(Interface_TabCrashingActionOption, EnumerationType, QLatin1String("ask"), {QLatin1String("ask"), QLatin1String("close"), QLatin1String("reload")}); registerOption(Interface_TabCrashingActionOption, EnumerationType, QLatin1String("ask"), {QLatin1String("ask"), QLatin1String("close"), QLatin1String("reload")});
registerOption(Interface_UseFancyDateTimeFormatOption, BooleanType, true); registerOption(Interface_UseFancyDateTimeFormatOption, BooleanType, true);
registerOption(Interface_UseNativeNotificationsOption, BooleanType, true); registerOption(Interface_UseNativeNotificationsOption, BooleanType, true);
@@ -127,47 +74,31 @@ index c90a3aa..0a143f3 100644
registerOption(Interface_WidgetStyleOption, StringType, QString()); registerOption(Interface_WidgetStyleOption, StringType, QString());
registerOption(Network_AcceptLanguageOption, StringType, QLatin1String("system,*;q=0.9")); registerOption(Network_AcceptLanguageOption, StringType, QLatin1String("system,*;q=0.9"));
registerOption(Network_CookiesKeepModeOption, EnumerationType, QLatin1String("keepUntilExpires"), {QLatin1String("keepUntilExpires"), QLatin1String("keepUntilExit"), QLatin1String("ask")}); registerOption(Network_CookiesKeepModeOption, EnumerationType, QLatin1String("keepUntilExpires"), {QLatin1String("keepUntilExpires"), QLatin1String("keepUntilExit"), QLatin1String("ask")});
-- diff --git a/src/main.cpp b/src/main.cpp
2.16.4 index 9d4bd1a..e10ee88 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -37,6 +37,10 @@
#include <QtCore/QUrl>
#include <QtWidgets/QMessageBox>
+#include <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
+
using namespace Otter;
From 5f4bbb00733cd311b5f6c45b7cd7d827022de342 Mon Sep 17 00:00:00 2001 #if !defined(Q_OS_WIN32)
From: Gerasim Troeglazov <3dEyes@gmail.com> @@ -214,5 +218,8 @@ int main(int argc, char *argv[])
Date: Sat, 9 Jun 2018 04:46:09 +0000 Application::createWindow(parameters);
Subject: Disable freespace detection
diff --git a/src/core/Application.cpp b/src/core/Application.cpp
index beb92c3..ff54be0 100644
--- a/src/core/Application.cpp
+++ b/src/core/Application.cpp
@@ -328,6 +328,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act
SettingsManager::createInstance(profilePath);
+#ifndef Q_OS_HAIKU
if (!isReadOnly)
{
const QStorageInfo storageInformation(profilePath);
@@ -346,9 +347,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act
}
else
{
- #ifndef __HAIKU__
- message = tr("Your profile directory (%1) is running low on free disk space (%2 remaining).\nThis may lead to malfunctions or even data loss.").arg(QDir::toNativeSeparators(profilePath)).arg(Utils::formatUnit(storageInformation.bytesAvailable()));
- #endif
+ message = tr("Your profile directory (%1) is running low on free disk space (%2 remaining).\nThis may lead to malfunctions or even data loss.").arg(QDir::toNativeSeparators(profilePath)).arg(Utils::formatUnit(storageInformation.bytesAvailable()));
}
QMessageBox messageBox;
@@ -385,6 +384,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act
}
}
} }
+#endif
SessionsManager::createInstance(profilePath, cachePath, isPrivate, isReadOnly);
- return application.exec();
+ application.exec();
+ kill(::getpid(), SIGKILL);
+
+ return 0;
}
-- --
2.16.4 2.16.4