From 2e724585a63cc0de8e5374aff48f593c07f54f5e Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 3 Jan 2019 17:11:02 +1000 Subject: [PATCH] Otter-Browser: bump version --- ...9.3.recipe => otter_browser-1.0.01.recipe} | 7 ++++--- ...patchset => otter_browser-1.0.01.patchset} | 20 +++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) rename www-client/otter-browser/{otter_browser-0.9.99.3.recipe => otter_browser-1.0.01.recipe} (93%) rename www-client/otter-browser/patches/{otter_browser-0.9.99.3.patchset => otter_browser-1.0.01.patchset} (89%) diff --git a/www-client/otter-browser/otter_browser-0.9.99.3.recipe b/www-client/otter-browser/otter_browser-1.0.01.recipe similarity index 93% rename from www-client/otter-browser/otter_browser-0.9.99.3.recipe rename to www-client/otter-browser/otter_browser-1.0.01.recipe index 044abe971..60ee01571 100644 --- a/www-client/otter-browser/otter_browser-0.9.99.3.recipe +++ b/www-client/otter-browser/otter_browser-1.0.01.recipe @@ -2,14 +2,14 @@ SUMMARY="A lightweight QtWebKit browser" DESCRIPTION="Project aiming to recreate the best aspects of the \ classic Opera (12.x) UI using Qt5." HOMEPAGE="https://otter-browser.org/" -COPYRIGHT="2013-2018 Otter Browser Team" +COPYRIGHT="2013-2019 Otter Browser Team" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/OtterBrowser/otter-browser/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="6eeae3ce065f3030a6262defc2f8b9a478c7974283a94d52e5f53fa8400869fa" +CHECKSUM_SHA256="85aef7c74277cf94de237e516c3c2d507b3d19b9ad16853de938540b8bf2f16b" SOURCE_FILENAME="otter-browser-$portVersion.tar.gz" SOURCE_DIR="otter-browser-$portVersion" -PATCHES="otter_browser-$portVersion.patchset" +#PATCHES="otter_browser-$portVersion.patchset" ADDITIONAL_FILES="otter.rdef.in" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -59,6 +59,7 @@ BUILD_PREREQUIRES=" cmd:g++$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix + cmd:qdbuscpp2xml$secondaryArchSuffix cmd:sed " diff --git a/www-client/otter-browser/patches/otter_browser-0.9.99.3.patchset b/www-client/otter-browser/patches/otter_browser-1.0.01.patchset similarity index 89% rename from www-client/otter-browser/patches/otter_browser-0.9.99.3.patchset rename to www-client/otter-browser/patches/otter_browser-1.0.01.patchset index f3ffc89ca..546235793 100644 --- a/www-client/otter-browser/patches/otter_browser-0.9.99.3.patchset +++ b/www-client/otter-browser/patches/otter_browser-1.0.01.patchset @@ -1,23 +1,23 @@ -From 57b7ea48b212e48933ffed4de5ed3a83cb236071 Mon Sep 17 00:00:00 2001 +From 4849bcff3a3182b335b1b6ad0e32b1b6bd2c0a58 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 24 Aug 2018 14:40:25 +1000 +Date: Thu, 3 Jan 2019 17:08:40 +1000 Subject: Fix for Haiku diff --git a/src/core/Application.cpp b/src/core/Application.cpp -index b78043f..87060e8 100644 +index 13f34bc..64b6cc6 100644 --- a/src/core/Application.cpp +++ b/src/core/Application.cpp -@@ -327,7 +327,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act +@@ -318,7 +318,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act Console::createInstance(); SettingsManager::createInstance(profilePath); - +#ifndef Q_OS_HAIKU - if (!isReadOnly) + if (!isReadOnly && !m_isFirstRun && !QFileInfo(profilePath).isWritable()) { - const QStorageInfo storageInformation(profilePath); -@@ -383,7 +383,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act + QMessageBox::warning(nullptr, tr("Warning"), tr("Profile directory (%1) is not writable, application will be running in read-only mode.").arg(profilePath), QMessageBox::Close); +@@ -386,7 +386,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act } } } @@ -27,7 +27,7 @@ index b78043f..87060e8 100644 if (!isReadOnly && !Migrator::run()) diff --git a/src/core/SettingsManager.cpp b/src/core/SettingsManager.cpp -index fdab0f0..1d47710 100644 +index 43aa107..490a905 100644 --- a/src/core/SettingsManager.cpp +++ b/src/core/SettingsManager.cpp @@ -80,7 +80,7 @@ void SettingsManager::createInstance(const QString &path) @@ -75,7 +75,7 @@ index fdab0f0..1d47710 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 9d4bd1a..e10ee88 100644 +index bec0f9c..d2d6581 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -37,6 +37,10 @@ @@ -100,5 +100,5 @@ index 9d4bd1a..e10ee88 100644 + return 0; } -- -2.16.4 +2.19.1