From 35653258458e6a05748a81626ef0721e9bba62ee Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 21 Aug 2019 22:02:08 +1000
Subject: [PATCH] Flameshot: add hvif icon for app * fix crash on save

---
 .../flameshot/additional-files/flameshot.png  | Bin 0 -> 3581 bytes
 .../additional-files/flameshot.rdef.in        |  30 +++++++++
 media-gfx/flameshot/flameshot-0.6.0.recipe    |  59 +++++++++++++-----
 .../patches/flameshot-0.6.0.patchset          |  57 +++++------------
 4 files changed, 88 insertions(+), 58 deletions(-)
 create mode 100644 media-gfx/flameshot/additional-files/flameshot.png
 create mode 100644 media-gfx/flameshot/additional-files/flameshot.rdef.in

diff --git a/media-gfx/flameshot/additional-files/flameshot.png b/media-gfx/flameshot/additional-files/flameshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..30efb8d4df49799c518559b0903bcb9ea2e5d609
GIT binary patch
literal 3581
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
DA$Ob<

literal 0
HcmV?d00001

diff --git a/media-gfx/flameshot/additional-files/flameshot.rdef.in b/media-gfx/flameshot/additional-files/flameshot.rdef.in
new file mode 100644
index 000000000..e02461fad
--- /dev/null
+++ b/media-gfx/flameshot/additional-files/flameshot.rdef.in
@@ -0,0 +1,30 @@
+
+resource app_flags B_SINGLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "Flameshot",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon {
+	$"6E63696603020106033D7FD10000000000003E083B4AAA9A4888BD00FFD2679B"
+	$"FFA837FFFF6406050004017202061CFEBEFBAAAAAAEEC22BB468C306BB35C351"
+	$"B97EC2BBBCE4C031BFADC1CEBF06BFB1BFE1BD95BE34BE25BED9BD04BD90BCA1"
+	$"BBC2BC6FBED9BC45BD55BC9AC05EBD3EC3C2BD4BC297BD2FC504BC53C666BB46"
+	$"C3F2BBCBC4EDBAC2C2F6B962C1A3BA1FC4C8BA19C343BA26C64DBA32CDB0B769"
+	$"C983BD03D1E9C13AD16BC241D10ABE51CF1CC365CCA0BE51CA23C365C7A6C879"
+	$"CA23CCE5C7F8CCC6C744C879C529CC37C354CC11C218CB72BD8BC9F2BF97CABC"
+	$"BF0FC96DBFF1C826C011C6B6BA64C773BC55C565B6EC0A05C879CA23C365CCA0"
+	$"C80FCEE8C9E6CE3BCBF5CBD8030A02020001023F99C60000000000003C11E043"
+	$"7D124AA9EA0A01020001123F338C0000000000003F1F17C305DB3F1AE1011785"
+	$"00040A00020001023F338C0000000000003F1F17C305DB3F1AE1"
+};
diff --git a/media-gfx/flameshot/flameshot-0.6.0.recipe b/media-gfx/flameshot/flameshot-0.6.0.recipe
index 9eb424453..63bacf79b 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.recipe
+++ b/media-gfx/flameshot/flameshot-0.6.0.recipe
@@ -9,38 +9,48 @@ DESCRIPTION="Features
 HOMEPAGE="https://github.com/lupoDharkael/flameshot/"
 COPYRIGHT="2019 lupoDharkael"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/lupoDharkael/flameshot/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="61b3a1969d6e17d80d5d90a3fce53ca5ae78fa21f9a45e5a19b0b32ea815a589"
-#ADDITIONAL_FILES="flameshot.rdef"
+PATCHES="flameshot-$portVersion.patchset"
+ADDITIONAL_FILES="
+	flameshot.rdef.in
+	flameshot.png
+	"
 
-ARCHITECTURES="x86_64"
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	flameshot = $portVersion
-	app:Flameshot = $portVersion
+	flameshot$secondaryArchSuffix = $portVersion
+	app:Flameshot$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
-	lib:libGL
-	lib:libQt5Core
-	lib:libQt5DBus
-	lib:libQt5Gui
-	lib:libQt5Network
-	lib:libQt5Svg
-	lib:libQt5Widgets
+	haiku$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5DBus$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
+	lib:libQt5Svg$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:lrelease >= 5
+	cmd:gcc$secondaryArchSuffix
+	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
-	cmd:qmake >= 5
+	cmd:qmake$secondaryArchSuffix >= 5
 	"
 
+PATCH()
+{
+	cp -f $sourceDir/../../additional-files/flameshot.png $sourceDir/img/app/flameshot.png
+}
+
 BUILD()
 {
 	qmake PREFIX=$appsDir/Flameshot
@@ -60,5 +70,20 @@ INSTALL()
 	rm -rf $appsDir/Flameshot/bin
 	rm -rf $appsDir/Flameshot/share
 
+	local APP_SIGNATURE="application/x-vnd.flameshot"
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local LONG_INFO="$SUMMARY"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/flameshot.rdef.in > flameshot.rdef
+
+	addResourcesToBinaries flameshot.rdef $appsDir/Flameshot/Flameshot
+
 	addAppDeskbarSymlink $appsDir/Flameshot/Flameshot
 }
diff --git a/media-gfx/flameshot/patches/flameshot-0.6.0.patchset b/media-gfx/flameshot/patches/flameshot-0.6.0.patchset
index 141eebd8d..7f55e151e 100644
--- a/media-gfx/flameshot/patches/flameshot-0.6.0.patchset
+++ b/media-gfx/flameshot/patches/flameshot-0.6.0.patchset
@@ -1,48 +1,23 @@
-From f8c5ab33bc23c2b6b947f45e939006466d272e8a Mon Sep 17 00:00:00 2001
-From: kikadf <kikadf.01@gmail.com>
-Date: Tue, 20 Aug 2019 17:29:57 +0200
-Subject: Enable hungarian translation
+From 99407a848b8164d7400aa8ff297d8c7d4476b51e Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 21 Aug 2019 21:38:36 +1000
+Subject: Fix crush
 
 
-diff --git a/flameshot.pro b/flameshot.pro
-index 7485ab8..a3d789c 100644
---- a/flameshot.pro
-+++ b/flameshot.pro
-@@ -43,6 +43,7 @@ TRANSLATIONS = translations/Internationalization_es.ts \
-     translations/Internationalization_tr.ts \
-     translations/Internationalization_ka.ts \
-     translations/Internationalization_fr.ts \
-+    translations/Internationalization_hu.ts \
-     translations/Internationalization_pl.ts
+diff --git a/src/utils/filenamehandler.cpp b/src/utils/filenamehandler.cpp
+index d31bcfd..ae1f03e 100644
+--- a/src/utils/filenamehandler.cpp
++++ b/src/utils/filenamehandler.cpp
+@@ -23,7 +23,9 @@
+ #include <QDir>
  
- # Generate translations in build
--- 
-2.23.0
-
-
-From 753f29334f79c63f9b17c8b1d28c3dce91bf38f6 Mon Sep 17 00:00:00 2001
-From: kikadf <kikadf.01@gmail.com>
-Date: Tue, 20 Aug 2019 17:32:30 +0200
-Subject: Fix: LC_ALL not defined on Haiku, cause crash when config menu
- selected
-
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 83fa1c1..edebc8c 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -37,6 +37,11 @@
- #endif
- 
- int main(int argc, char *argv[]) {
-+#if defined(__HAIKU__)
-+	/*LC_ALL not defined on Haiku*/
-+	setenv("LC_ALL","C",1);
+ FileNameHandler::FileNameHandler(QObject *parent) : QObject(parent) {
++#ifndef __HAIKU__
+     std::locale::global(std::locale(""));
 +#endif
-+
-     // required for the button serialization
-     // TODO: change to QVector in v1.0
-     qRegisterMetaTypeStreamOperators<QList<int> >("QList<int>");
+ }
+ 
+ QString FileNameHandler::parsedPattern() {
 -- 
 2.23.0