mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
Otter-Browser: bump version
* disable freespace checking * tune default settings
This commit is contained in:
Gerasim Troeglazov
@@ -6,7 +6,7 @@ COPYRIGHT="2013-2018 Otter Browser Team"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/OtterBrowser/otter-browser/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="3bd0fddc09de0c94264976095d6abca51e5e6d2d8f07aceca2076639e38a2045"
|
||||
CHECKSUM_SHA256="b3e38b51fcb8b93e150103634d2e11db767726934732183e658384c2f388c326"
|
||||
SOURCE_FILENAME="otter-browser-$portVersion.tar.gz"
|
||||
SOURCE_DIR="otter-browser-$portVersion"
|
||||
PATCHES="otter_browser-$portVersion.patchset"
|
||||
@@ -62,12 +62,6 @@ BUILD_REQUIRES="
|
||||
devel:libssl$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
sed --in-place '/install(FILES resources/d' CMakeLists.txt
|
||||
sed --in-place '/install(FILES otter-browser.desktop/d' CMakeLists.txt
|
||||
}
|
||||
|
||||
defineDebugInfoPackage otter_browser$secondaryArchSuffix \
|
||||
"$appsDir"/Otter-Browser/Otter-Browser
|
||||
|
||||
@@ -90,9 +84,11 @@ INSTALL()
|
||||
|
||||
mkdir -p $manDir
|
||||
mv $appsDir/Otter-Browser/share/man/man1 $manDir
|
||||
mv $appsDir/Otter-Browser/share/otter-browser/locale \
|
||||
$appsDir/Otter-Browser
|
||||
|
||||
rm -rf $appsDir/Otter-Browser/bin
|
||||
rm -rf $appsDir/Otter-Browser/share/man
|
||||
rm -rf $appsDir/Otter-Browser/share
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.otter-browser"
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
@@ -1,74 +0,0 @@
|
||||
From 236793f86c7e4dadd9c135fcde7aa2e645b8284f 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 66146b6..ee55e1a 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.2
|
||||
|
||||
|
||||
From ead59941352dcfe9869577c539a9d46cd1caa6a1 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 5 May 2018 18:06:16 +1000
|
||||
Subject: Fix crash when exit
|
||||
|
||||
|
||||
diff --git a/src/core/Application.cpp b/src/core/Application.cpp
|
||||
index ee55e1a..d284666 100644
|
||||
--- a/src/core/Application.cpp
|
||||
+++ b/src/core/Application.cpp
|
||||
@@ -366,7 +366,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act
|
||||
|
||||
if (messageBox.clickedButton() == quitButton)
|
||||
{
|
||||
- exit();
|
||||
+ ::exit(0);
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -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()
|
||||
{
|
||||
SessionsManager::saveSession();
|
||||
|
||||
- exit();
|
||||
+ ::exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -870,7 +870,7 @@ void Application::removeWindow(MainWindow *mainWindow)
|
||||
|
||||
if (m_windows.isEmpty())
|
||||
{
|
||||
- exit();
|
||||
+ ::exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.16.2
|
||||
|
||||
173
www-client/otter-browser/patches/otter_browser-0.9.99.patchset
Normal file
173
www-client/otter-browser/patches/otter_browser-0.9.99.patchset
Normal file
@@ -0,0 +1,173 @@
|
||||
From 5b3591f12ef268113cc4e0e35548a90c43c7f75d 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>
|
||||
Date: Sat, 5 May 2018 18:06:16 +1000
|
||||
Subject: Fix crash when exit
|
||||
|
||||
|
||||
diff --git a/src/core/Application.cpp b/src/core/Application.cpp
|
||||
index 1941a9f..beb92c3 100644
|
||||
--- a/src/core/Application.cpp
|
||||
+++ b/src/core/Application.cpp
|
||||
@@ -366,7 +366,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act
|
||||
|
||||
if (messageBox.clickedButton() == quitButton)
|
||||
{
|
||||
- exit();
|
||||
+ ::exit(0);
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -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()
|
||||
{
|
||||
SessionsManager::saveSession();
|
||||
|
||||
- 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
|
||||
|
||||
|
||||
diff --git a/src/core/SettingsManager.cpp b/src/core/SettingsManager.cpp
|
||||
index c90a3aa..0a143f3 100644
|
||||
--- a/src/core/SettingsManager.cpp
|
||||
+++ b/src/core/SettingsManager.cpp
|
||||
@@ -79,7 +79,7 @@ void SettingsManager::createInstance(const QString &path)
|
||||
registerOption(Browser_EnableSingleKeyShortcutsOption, BooleanType, true);
|
||||
registerOption(Browser_EnableSpellCheckOption, BooleanType, true);
|
||||
registerOption(Browser_EnableTrayIconOption, BooleanType, true);
|
||||
- registerOption(Browser_HomePageOption, StringType, QString());
|
||||
+ registerOption(Browser_HomePageOption, StringType, QLatin1String("https://haiku-os.org"));
|
||||
registerOption(Browser_InactiveTabTimeUntilSuspendOption, IntegerType, -1);
|
||||
registerOption(Browser_KeyboardShortcutsProfilesOrderOption, ListType, QStringList(QLatin1String("default")));
|
||||
registerOption(Browser_LocaleOption, StringType, QLatin1String("system"));
|
||||
@@ -107,19 +107,19 @@ void SettingsManager::createInstance(const QString &path)
|
||||
registerOption(Choices_WarnQuitOption, EnumerationType, QLatin1String("noWarn"), {QLatin1String("alwaysWarn"), QLatin1String("warnOpenTabs"), QLatin1String("noWarn")});
|
||||
registerOption(Choices_WarnQuitTransfersOption, BooleanType, true);
|
||||
registerOption(Content_BackgroundColorOption, ColorType, QColor(0xFF, 0xFF, 0xFF));
|
||||
- registerOption(Content_CursiveFontOption, FontType, QLatin1String("Comic Sans MS"));
|
||||
+ registerOption(Content_CursiveFontOption, FontType, QLatin1String("Noto Serif"));
|
||||
registerOption(Content_DefaultCharacterEncodingOption, StringType, QLatin1String("auto"));
|
||||
registerOption(Content_DefaultFixedFontSizeOption, IntegerType, 16);
|
||||
registerOption(Content_DefaultFontSizeOption, IntegerType, 16);
|
||||
registerOption(Content_DefaultZoomOption, IntegerType, 100);
|
||||
- registerOption(Content_FantasyFontOption, FontType, QLatin1String("Impact"));
|
||||
- registerOption(Content_FixedFontOption, FontType, QLatin1String("DejaVu Sans Mono"));
|
||||
+ registerOption(Content_FantasyFontOption, FontType, QLatin1String("Noto Serif"));
|
||||
+ registerOption(Content_FixedFontOption, FontType, QLatin1String("Noto Mono"));
|
||||
registerOption(Content_LinkColorOption, ColorType, QColor(0, 0, 0xEE));
|
||||
registerOption(Content_MinimumFontSizeOption, IntegerType, -1);
|
||||
registerOption(Content_PageReloadTimeOption, IntegerType, -1);
|
||||
- registerOption(Content_SansSerifFontOption, FontType, QLatin1String("DejaVu Sans"));
|
||||
- registerOption(Content_SerifFontOption, FontType, QLatin1String("DejaVu Serif"));
|
||||
- registerOption(Content_StandardFontOption, FontType, QLatin1String("DejaVu Serif"));
|
||||
+ registerOption(Content_SansSerifFontOption, FontType, QLatin1String("Noto Sans"));
|
||||
+ registerOption(Content_SerifFontOption, FontType, QLatin1String("Noto Serif"));
|
||||
+ registerOption(Content_StandardFontOption, FontType, QLatin1String("Noto Serif"));
|
||||
registerOption(Content_TextColorOption, ColorType, QColor(0, 0, 0));
|
||||
registerOption(Content_UserStyleSheetOption, PathType, QString());
|
||||
registerOption(Content_VisitedLinkColorOption, ColorType, QColor(0x55, 0x1A, 0x8B));
|
||||
@@ -155,7 +155,7 @@ void SettingsManager::createInstance(const QString &path)
|
||||
registerOption(Interface_TabCrashingActionOption, EnumerationType, QLatin1String("ask"), {QLatin1String("ask"), QLatin1String("close"), QLatin1String("reload")});
|
||||
registerOption(Interface_UseFancyDateTimeFormatOption, BooleanType, true);
|
||||
registerOption(Interface_UseNativeNotificationsOption, BooleanType, true);
|
||||
- registerOption(Interface_UseSystemIconThemeOption, BooleanType, false);
|
||||
+ registerOption(Interface_UseSystemIconThemeOption, BooleanType, true);
|
||||
registerOption(Interface_WidgetStyleOption, StringType, QString());
|
||||
registerOption(Network_AcceptLanguageOption, StringType, QLatin1String("system,*;q=0.9"));
|
||||
registerOption(Network_CookiesKeepModeOption, EnumerationType, QLatin1String("keepUntilExpires"), {QLatin1String("keepUntilExpires"), QLatin1String("keepUntilExit"), QLatin1String("ask")});
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From 5f4bbb00733cd311b5f6c45b7cd7d827022de342 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 9 Jun 2018 04:46:09 +0000
|
||||
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);
|
||||
|
||||
--
|
||||
2.16.4
|
||||
|
||||
Reference in New Issue
Block a user