From 329a7c959faf73a873b75db9993c76d9bf75f94d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 30 Dec 2020 22:36:49 +1000 Subject: [PATCH] OtterBrowser: bump version --- ...333.recipe => otter_browser-1.0.02.recipe} | 8 +-- ...patchset => otter_browser-1.0.02.patchset} | 70 +++++++++++++++---- 2 files changed, 60 insertions(+), 18 deletions(-) rename www-client/otter-browser/{otter_browser-1.0.81.333.recipe => otter_browser-1.0.02.recipe} (89%) rename www-client/otter-browser/patches/{otter_browser-1.0.81.333.patchset => otter_browser-1.0.02.patchset} (89%) diff --git a/www-client/otter-browser/otter_browser-1.0.81.333.recipe b/www-client/otter-browser/otter_browser-1.0.02.recipe similarity index 89% rename from www-client/otter-browser/otter_browser-1.0.81.333.recipe rename to www-client/otter-browser/otter_browser-1.0.02.recipe index 9461d117e..f13c61c63 100644 --- a/www-client/otter-browser/otter_browser-1.0.81.333.recipe +++ b/www-client/otter-browser/otter_browser-1.0.02.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://otter-browser.org/" COPYRIGHT="2013-2020 Otter Browser Team" LICENSE="GNU GPL v3" REVISION="1" -SOURCE_URI="https://sourceforge.net/projects/otter-browser/files/otter-browser-weekly333/otter-browser-${portVersion%.*}-dev${portVersion##*.}.tar.bz2" -CHECKSUM_SHA256="4b8a39c1b9a39134ea8364d3be92ede9092d8153d58ea954ba4993036bfb2d12" -SOURCE_FILENAME="otter-browser-$portVersion.tar.bz2" -SOURCE_DIR="otter-browser-${portVersion%.*}-dev${portVersion##*.}" +SOURCE_URI="https://github.com/OtterBrowser/otter-browser/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="d1e090a80fa736cd128f594184817078a08cac31614e85e7838ff1b64511d62d" +SOURCE_FILENAME="otter-browser-$portVersion.tar.gz" +SOURCE_DIR="otter-browser-$portVersion" PATCHES="otter_browser-$portVersion.patchset" ADDITIONAL_FILES=" otter.rdef.in diff --git a/www-client/otter-browser/patches/otter_browser-1.0.81.333.patchset b/www-client/otter-browser/patches/otter_browser-1.0.02.patchset similarity index 89% rename from www-client/otter-browser/patches/otter_browser-1.0.81.333.patchset rename to www-client/otter-browser/patches/otter_browser-1.0.02.patchset index 543022b9d..1a45f2cab 100644 --- a/www-client/otter-browser/patches/otter_browser-1.0.81.333.patchset +++ b/www-client/otter-browser/patches/otter_browser-1.0.02.patchset @@ -1,4 +1,4 @@ -From d6af1f344eb937ccb82f5bd13b4789a763c77f9e Mon Sep 17 00:00:00 2001 +From 453443d2dcdb1f7b86c8c8312a50e8399ca2b877 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 28 Sep 2020 20:27:45 +1000 Subject: Fix for Haiku @@ -18,10 +18,10 @@ index e9767a9..78694a9 100644 directories << QLatin1String("/usr/share/hunspell/") << QLatin1String("/usr/local/share/hunspell/") << QLatin1String("/usr/share/myspell/") << QLatin1String("/usr/share/myspell/dicts/") << QLatin1String("/usr/local/share/mozilla-dicts/"); #endif diff --git a/CMakeLists.txt b/CMakeLists.txt -index ce1247b..5a7e896 100644 +index b686d38..b3be740 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -517,6 +517,16 @@ elseif (APPLE) +@@ -504,6 +504,16 @@ elseif (APPLE) ) set_source_files_properties(resources/icons/otter-browser.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) @@ -38,7 +38,7 @@ index ce1247b..5a7e896 100644 elseif (UNIX) find_package(Qt5DBus 5.6.0 QUIET) -@@ -567,6 +577,10 @@ elseif (UNIX) +@@ -554,6 +564,10 @@ elseif (UNIX) target_link_libraries(otter-browser Qt5::DBus) endif () @@ -50,10 +50,10 @@ index ce1247b..5a7e896 100644 target_link_libraries(otter-browser -lpthread) endif () diff --git a/src/core/Application.cpp b/src/core/Application.cpp -index d56f579..9a72c18 100644 +index 13f34bc..1b041e2 100644 --- a/src/core/Application.cpp +++ b/src/core/Application.cpp -@@ -47,6 +47,8 @@ +@@ -46,6 +46,8 @@ #include "../modules/platforms/windows/WindowsPlatformIntegration.h" #elif defined(Q_OS_MAC) #include "../modules/platforms/mac/MacPlatformIntegration.h" @@ -62,7 +62,7 @@ index d56f579..9a72c18 100644 #elif defined(Q_OS_UNIX) #include "../modules/platforms/freedesktoporg/FreeDesktopOrgPlatformIntegration.h" #endif -@@ -320,7 +322,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), +@@ -318,7 +320,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act Console::createInstance(); SettingsManager::createInstance(profilePath); @@ -71,7 +71,7 @@ index d56f579..9a72c18 100644 if (!isReadOnly && !m_isFirstRun && !QFileInfo(profilePath).isWritable()) { QMessageBox::warning(nullptr, tr("Warning"), tr("Profile directory (%1) is not writable, application will be running in read-only mode.").arg(profilePath), QMessageBox::Close); -@@ -388,7 +390,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), +@@ -386,7 +388,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act } } } @@ -80,7 +80,7 @@ index d56f579..9a72c18 100644 SessionsManager::createInstance(profilePath, cachePath, isPrivate, isReadOnly); if (!isReadOnly && !Migrator::run()) -@@ -458,6 +460,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), +@@ -454,6 +456,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act m_platformIntegration = new WindowsPlatformIntegration(this); #elif defined(Q_OS_MAC) m_platformIntegration = new MacPlatformIntegration(this); @@ -90,10 +90,10 @@ index d56f579..9a72c18 100644 m_platformIntegration = new FreeDesktopOrgPlatformIntegration(this); #endif diff --git a/src/core/SettingsManager.cpp b/src/core/SettingsManager.cpp -index e4bba41..f328f16 100644 +index 43aa107..490a905 100644 --- a/src/core/SettingsManager.cpp +++ b/src/core/SettingsManager.cpp -@@ -81,7 +81,7 @@ void SettingsManager::createInstance(const QString &path) +@@ -80,7 +80,7 @@ void SettingsManager::createInstance(const QString &path) registerOption(Browser_EnableSingleKeyShortcutsOption, BooleanType, true); registerOption(Browser_EnableSpellCheckOption, BooleanType, true); registerOption(Browser_EnableTrayIconOption, BooleanType, true); @@ -102,7 +102,7 @@ index e4bba41..f328f16 100644 registerOption(Browser_InactiveTabTimeUntilSuspendOption, IntegerType, -1); registerOption(Browser_KeyboardShortcutsProfilesOrderOption, ListType, QStringList(QLatin1String("default"))); registerOption(Browser_LocaleOption, StringType, QLatin1String("system")); -@@ -110,19 +110,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_WarnQuitTransfersOption, BooleanType, true); registerOption(Content_BackgroundColorOption, ColorType, QColor(0xFF, 0xFF, 0xFF)); @@ -128,7 +128,7 @@ index e4bba41..f328f16 100644 registerOption(Content_TextColorOption, ColorType, QColor(0, 0, 0)); registerOption(Content_UserStyleSheetOption, PathType, QString()); registerOption(Content_VisitedLinkColorOption, ColorType, QColor(0x55, 0x1A, 0x8B)); -@@ -157,7 +157,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_UseFancyDateTimeFormatOption, BooleanType, true); registerOption(Interface_UseNativeNotificationsOption, BooleanType, true); @@ -138,7 +138,7 @@ index e4bba41..f328f16 100644 registerOption(Network_AcceptLanguageOption, StringType, QLatin1String("system,*;q=0.9")); registerOption(Network_CookiesKeepModeOption, EnumerationType, QLatin1String("keepUntilExpires"), {QLatin1String("keepUntilExpires"), QLatin1String("keepUntilExit"), QLatin1String("ask")}); diff --git a/src/main.cpp b/src/main.cpp -index 888e6cf..663eea4 100644 +index bec0f9c..885b439 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -37,6 +37,10 @@ @@ -491,3 +491,45 @@ index 0000000..8b50d01 -- 2.28.0 + +From 1a7d99ff0bad3b901764c9f8f122d4402d1d1622 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Wed, 30 Dec 2020 22:34:52 +1000 +Subject: Fix notification api + + +diff --git a/src/modules/platforms/haiku/HaikuPlatformIntegration.cpp b/src/modules/platforms/haiku/HaikuPlatformIntegration.cpp +index 40e0c3b..898ac7b 100644 +--- a/src/modules/platforms/haiku/HaikuPlatformIntegration.cpp ++++ b/src/modules/platforms/haiku/HaikuPlatformIntegration.cpp +@@ -77,11 +77,24 @@ void HaikuPlatformIntegration::runApplication(const QString &command, const QUrl + + void HaikuPlatformIntegration::showNotification(Notification *notification) + { +- const Notification::Message message(notification->getMessage()); ++ QString title; ++ ++ switch (notification->getLevel()) ++ { ++ case Notification::ErrorLevel: ++ title = "Error"; ++ break; ++ case Notification::WarningLevel: ++ title = "Warning"; ++ break; ++ default: ++ title = "Information"; ++ break; ++ } + + QFileInfo appFileInfo(QCoreApplication::applicationFilePath()); +- BString stitle((const char *)(message.getTitle().toUtf8())); +- BString smessage((const char *)(message.message.toUtf8())); ++ BString stitle((const char *)(title.toUtf8())); ++ BString smessage((const char *)(notification->getMessage().toUtf8())); + BString smessageId((const char *)(appFileInfo.fileName().toUtf8())); + BString group((const char*)(appFileInfo.baseName().toUtf8())); + +-- +2.28.0 +