From a4b9edd1ba3f59b1e86485480beeaa374c5cf21e Mon Sep 17 00:00:00 2001
From: kikadf <kikadf.01@gmail.com>
Date: Tue, 20 Aug 2019 23:32:46 +0200
Subject: [PATCH] flameshot: version bump (#4111)

---
 ...ot-0.5.0.recipe => flameshot-0.6.0.recipe} | 23 ++++++---
 .../patches/flameshot-0.6.0.patchset          | 48 +++++++++++++++++++
 2 files changed, 65 insertions(+), 6 deletions(-)
 rename media-gfx/flameshot/{flameshot-0.5.0.recipe => flameshot-0.6.0.recipe} (61%)
 create mode 100644 media-gfx/flameshot/patches/flameshot-0.6.0.patchset

diff --git a/media-gfx/flameshot/flameshot-0.5.0.recipe b/media-gfx/flameshot/flameshot-0.6.0.recipe
similarity index 61%
rename from media-gfx/flameshot/flameshot-0.5.0.recipe
rename to media-gfx/flameshot/flameshot-0.6.0.recipe
index 0d696023e..9eb424453 100644
--- a/media-gfx/flameshot/flameshot-0.5.0.recipe
+++ b/media-gfx/flameshot/flameshot-0.6.0.recipe
@@ -7,11 +7,11 @@ DESCRIPTION="Features
 * DBus interface.
 * Upload to Imgur."
 HOMEPAGE="https://github.com/lupoDharkael/flameshot/"
-COPYRIGHT="2017 lupoDharkael"
+COPYRIGHT="2019 lupoDharkael"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://github.com/lupoDharkael/flameshot/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="32d593c14c37286d9f64873c4ef9a07eb084723c92b2280d5c22152547c1e3f0"
+CHECKSUM_SHA256="61b3a1969d6e17d80d5d90a3fce53ca5ae78fa21f9a45e5a19b0b32ea815a589"
 #ADDITIONAL_FILES="flameshot.rdef"
 
 ARCHITECTURES="x86_64"
@@ -27,6 +27,7 @@ REQUIRES="
 	lib:libQt5DBus
 	lib:libQt5Gui
 	lib:libQt5Network
+	lib:libQt5Svg
 	lib:libQt5Widgets
 	"
 
@@ -35,19 +36,29 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
+	cmd:lrelease >= 5
 	cmd:make
 	cmd:qmake >= 5
 	"
 
 BUILD()
 {
-	qmake
+	qmake PREFIX=$appsDir/Flameshot
 	make $jobArgs
 }
 
 INSTALL()
 {
-	mkdir -p $appsDir
-	cp flameshot $appsDir/Flameshot
-	addAppDeskbarSymlink $appsDir/Flameshot
+	make install
+
+	mv $appsDir/Flameshot/bin/flameshot \
+		$appsDir/Flameshot/Flameshot
+
+	mv $appsDir/Flameshot/share/flameshot/translations \
+		$appsDir/Flameshot
+
+	rm -rf $appsDir/Flameshot/bin
+	rm -rf $appsDir/Flameshot/share
+
+	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
new file mode 100644
index 000000000..141eebd8d
--- /dev/null
+++ b/media-gfx/flameshot/patches/flameshot-0.6.0.patchset
@@ -0,0 +1,48 @@
+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
+
+
+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
+ 
+ # 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);
++#endif
++
+     // required for the button serialization
+     // TODO: change to QVector in v1.0
+     qRegisterMetaTypeStreamOperators<QList<int> >("QList<int>");
+-- 
+2.23.0
+