Otter: bump (#2337)

* Otter: bump

* Actual recipe

* Icon cleanup

www-client/otter-browser/additional-files/otter.rdef.in

@@ -14,20 +14,17 @@ resource app_version {
 resource app_signature "application/x-vnd.otter-browser";
 
 resource vector_icon {
-	$"6E6369660401582D00340200160039D4F6B836E0BDA9E2BF2B7DBE49504CEA7B"
-	$"030065D802001003000000750000FF0000050008B349BF98B349BF98B349C727"
-	$"BFFFCC31B859CC31C31ACC31C850C912C60FCB18CAE6C6C3CC44BFCECC44C391"
-	$"CC44BBCBC7DFB60BCAB7B863C59DB433BFBDB346C2EBB346BC4DB346B717B65D"
-	$"B96BB44EB494B899B349BF98B349BBB9B349BF980005BFD0B58CBFD0B58CC3D7"
-	$"B58C53BFE953B95853C632BFBDCA07C3CECA07BBC9CA07B831BFAAB831C632B8"
-	$"31B94FBFD0B58CBBB6B58CBFD0B58C0008B349BF98B349BF98B349C727BFFFCC"
-	$"31B859CC31C31ACC31C850C912C60FCB18CAE6C6C3CC44BFCECC44C391CC44BB"
-	$"CBC7DFB60BCAB7B863C59DB433BFBDB346C2EBB346BC4DB346B717B65DB96BB4"
-	$"4EB494B899B349BF98B349BBB9B349BF980005BFD0B58CBFD0B58CC3D7B58C53"
-	$"BFE953B95853C632BFBDCA07C3CECA07BBC9CA07B831BFAAB831C632B831B94F"
-	$"BFD0B58CBBB6B58CBFD0B58C0208BF36B43FC008B43DBB85B44FB5EEB944B7D1"
-	$"B62DB439BC19B4A4C2BAB3F6BF90B54CC5DBBA73CA14B766C8BCBE49CBD4C6A1"
-	$"C928C329CB9DC914C76ECB1AC1D3CAB8C4B7CB9BBE8AC8C1B856CAE7BAFBC70B"
-	$"B633C1A9B45FC471B4BEC0DAB43F040A020102000A010103000A00020001000A"
-	$"02020203100117800004"
+	$"6E63696603030065D803010000020006023F0023BEA5273A2EE23A79FA471ACE"
+	$"4A4D3EFF8AB2DE000065D8040008B349BF98B349BF98B349C727BFFFCC31B859"
+	$"CC31C31ACC31C850C912C60FCB18CAE6C6C3CC44BFCECC44C391CC44BBCBC7DF"
+	$"B60BCAB7B863C59DB433BFBDB346C2EBB346BC4DB346B717B65DB96BB44EB494"
+	$"B899B349BF98B349BBB9B349BF980005BFD0B58CBFD0B58CC3D7B58C53BFE953"
+	$"B95853C632BFBDCA07C3CECA07BBC9CA07B831BFAAB831C632B831B94FBFD0B5"
+	$"8CBBB6B58CBFD0B58C0008B349BF98B349BF98B349C727BFFFCC31B859CC31C3"
+	$"1ACC31C850C912C60FCB18CAE6C6C3CC44BFCECC44C391CC44BBCBC7DFB60BCA"
+	$"B7B863C59DB433BFBDB346C2EBB346BC4DB346B717B65DB96BB44EB494B899B3"
+	$"49BF98B349BBB9B349BF980005BFD0B58CBFD0B58CC3D7B58C53BFE953B95853"
+	$"C632BFBDCA07C3CECA07BBC9CA07B831BFAAB831C632B831B94FBFD0B58CBBB6"
+	$"B58CBFD0B58C020A02020001023FBEE50000000000003FBEE54208A44208410A"
+	$"01020203123FBEE50000000000003FBEE54208A44208410117820004"
 };

www-client/otter-browser/otter_browser-0.9.96.recipe

@@ -0,0 +1,108 @@
+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"
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="https://github.com/OtterBrowser/otter-browser/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="3a3c971508a549579fbe83a94c1892c42296a3bd3e5209a035698ae03205c48d"
+SOURCE_DIR="otter-browser-$portVersion"
+PATCHES="otter_browser-$portVersion.patchset"
+ADDITIONAL_FILES="otter.rdef.in"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	otter_browser$secondaryArchSuffix = $portVersion
+	app:OtterBrowser$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libhunspell_1.6$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5DBus$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Multimedia$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
+	lib:libQt5PrintSupport$secondaryArchSuffix
+	lib:libQt5Qml$secondaryArchSuffix
+	lib:libQt5WebKit$secondaryArchSuffix
+	lib:libQt5WebKitWidgets$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libQt5XmlPatterns$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:g++$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libcrypto$secondaryArchSuffix
+	devel:libhunspell_1.6$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5DBus$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Multimedia$secondaryArchSuffix
+	devel:libQt5Network$secondaryArchSuffix
+	devel:libQt5PrintSupport$secondaryArchSuffix
+	devel:libQt5Qml$secondaryArchSuffix
+	devel:libQt5WebKit$secondaryArchSuffix
+	devel:libQt5WebKitWidgets$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libQt5XmlPatterns$secondaryArchSuffix
+	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
+
+BUILD()
+{
+	mkdir -p build
+	cd build
+
+	cmake .. -DCMAKE_INSTALL_PREFIX:PATH="$appsDir/Otter-Browser"
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build
+	make install
+
+	mv $appsDir/Otter-Browser/bin/otter-browser \
+		$appsDir/Otter-Browser/Otter-Browser
+
+	mkdir -p $manDir
+	mv $appsDir/Otter-Browser/share/man/man1 $manDir
+	rmdir $appsDir/Otter-Browser/bin || true
+	rmdir $appsDir/Otter-Browser/share/man/ || true
+
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	sed \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		$portDir/additional-files/otter.rdef.in > otter.rdef
+
+	addResourcesToBinaries otter.rdef \
+		$appsDir/Otter-Browser/Otter-Browser
+
+	addAppDeskbarSymlink $appsDir/Otter-Browser/Otter-Browser "Otter Browser"
+}

www-client/otter-browser/patches/otter_browser-0.9.96.patchset

@@ -0,0 +1,24 @@
+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
+