mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
Otter-Browser: bump version
* fix crush on exit app * add new hvif icon
This commit is contained in:
Gerasim Troeglazov
@@ -1,5 +1,5 @@
|
||||
|
||||
resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
|
||||
resource app_flags B_SINGLE_LAUNCH;
|
||||
|
||||
resource app_version {
|
||||
major = @MAJOR@,
|
||||
@@ -11,20 +11,39 @@ resource app_version {
|
||||
long_info = "A lightweight QtWebKit browser"
|
||||
};
|
||||
|
||||
resource app_signature "application/x-vnd.otter-browser";
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource file_types message {
|
||||
"types" = "text/html",
|
||||
"types" = "multipart/related",
|
||||
"types" = "image/gif",
|
||||
"types" = "image/jpeg",
|
||||
"types" = "image/png",
|
||||
"types" = "image/svg+xml",
|
||||
"types" = "application/xhtml+xml",
|
||||
"types" = "application/x-vnd.Be.URL.file",
|
||||
"types" = "application/x-vnd.Be.URL.http",
|
||||
"types" = "application/x-vnd.Be.URL.https"
|
||||
};
|
||||
|
||||
resource vector_icon {
|
||||
$"6E63696603030065D803010000020006023F0023BEA5273A2EE23A79FA471ACE"
|
||||
$"4A4D3EFF8AB2DE000065D8040008B349BF98B349BF98B349C727BFFFCC31B859"
|
||||
$"CC31C31ACC31C850C912C60FCB18CAE6C6C3CC44BFCECC44C391CC44BBCBC7DF"
|
||||
$"B60BCAB7B863C59DB433BFBDB346C2EBB346BC4DB346B717B65DB96BB44EB494"
|
||||
$"B899B349BF98B349BBB9B349BF980005BFD0B58CBFD0B58CC3D7B58C53BFE953"
|
||||
$"B95853C632BFBDCA07C3CECA07BBC9CA07B831BFAAB831C632B831B94FBFD0B5"
|
||||
$"8CBBB6B58CBFD0B58C0008B349BF98B349BF98B349C727BFFFCC31B859CC31C3"
|
||||
$"1ACC31C850C912C60FCB18CAE6C6C3CC44BFCECC44C391CC44BBCBC7DFB60BCA"
|
||||
$"B7B863C59DB433BFBDB346C2EBB346BC4DB346B717B65DB96BB44EB494B899B3"
|
||||
$"49BF98B349BBB9B349BF980005BFD0B58CBFD0B58CC3D7B58C53BFE953B95853"
|
||||
$"C632BFBDCA07C3CECA07BBC9CA07B831BFAAB831C632B831B94FBFD0B58CBBB6"
|
||||
$"B58CBFD0B58C020A02020001023FBEE50000000000003FBEE54208A44208410A"
|
||||
$"01020203123FBEE50000000000003FBEE54208A44208410117820004"
|
||||
$"6E636966080500040071020006043DC6D93DC6D9BF06483F06484AFFB4C750F4"
|
||||
$"411942E78597C3FFE1032288FF203BAC02000604BD6FD1BEA0943DD275BC7FF8"
|
||||
$"46BCC14C1D30401942E76D97C3FFD6032288FF203BAC020006033BDF263BDF26"
|
||||
$"BBDF263BDF2646EBB44A1F4F0097C3FF3FE3ECFFFF3369FF020006023C65143C"
|
||||
$"F9DBBF55163EAE7E4B1CAB461C2F3A33A2FFD43369FF050005FF070604EB5E51"
|
||||
$"65555E51C68BC3FA3B605160516058600209514B514F514B5140514051354024"
|
||||
$"4A293A212F2433222B26262B262B242D2235223122352245224522482752B4AA"
|
||||
$"C5A3B8C5CA543C5E365EC48C5E0613FFFFFFEA3F22352231223522C1D922C1D9"
|
||||
$"22C320B5EDC6F6B4CEC5ADB8E8CA5E3C5E365EC28B5E4848484F48C27B3E453E"
|
||||
$"453E483E50BF36C57A3C5536543955BB60C7962C4BB874C57A2A472B34B632BC"
|
||||
$"F1B7E6BA1B36342E31BC2DBB1F3A38BC8CBB7ABE2BBDA53D3F3E464848484848"
|
||||
$"48483C352A3F2F352A352A352A2F27262B2829242D0208514B514F514B514051"
|
||||
$"40513540244A293A212F2433222B26262B262B292737283125412D4848483C48"
|
||||
$"483C5E495E4C5E02044848483C483C3728412D3125262B29272829352A2F273F"
|
||||
$"2F0608F6F62A41383333292FBBF8BB213B3ABC88BB97BEFBBF203E424F38543D"
|
||||
$"5434542C4C2E50B6BEC274060DBAD3DB0233323237334631403449374B3B4DBC"
|
||||
$"C9C4CA424E3E503A54BEF8C76535552B4A2E51B6E2C2932A42362C332ABB5D2E"
|
||||
$"312E32080A010100000A0001011001178400040A020103000A040104000A0001"
|
||||
$"061001158400040A030106000A050102000A000105100117820004"
|
||||
};
|
||||
|
||||
@@ -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="29ed9b6545c0646ff4369db54093de92a49b0ab9f83815eee3233909a44a0185"
|
||||
CHECKSUM_SHA256="3bd0fddc09de0c94264976095d6abca51e5e6d2d8f07aceca2076639e38a2045"
|
||||
SOURCE_FILENAME="otter-browser-$portVersion.tar.gz"
|
||||
SOURCE_DIR="otter-browser-$portVersion"
|
||||
PATCHES="otter_browser-$portVersion.patchset"
|
||||
@@ -90,13 +90,16 @@ INSTALL()
|
||||
|
||||
mkdir -p $manDir
|
||||
mv $appsDir/Otter-Browser/share/man/man1 $manDir
|
||||
rmdir $appsDir/Otter-Browser/bin || true
|
||||
rmdir $appsDir/Otter-Browser/share/man/ || true
|
||||
|
||||
rm -rf $appsDir/Otter-Browser/bin
|
||||
rm -rf $appsDir/Otter-Browser/share/man
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.otter-browser"
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
local MINOR="`echo "$portVersion" | cut -d. -f3`"
|
||||
sed \
|
||||
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
|
||||
-e "s|@MAJOR@|$MAJOR|" \
|
||||
-e "s|@MIDDLE@|$MIDDLE|" \
|
||||
-e "s|@MINOR@|$MINOR|" \
|
||||
@@ -1,24 +0,0 @@
|
||||
From eadf309b14693810d62e6113d310afa8adb3a386 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 8e14f4b..941060d 100644
|
||||
--- a/src/core/Application.cpp
|
||||
+++ b/src/core/Application.cpp
|
||||
@@ -344,7 +344,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
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user