GPXSee: use haiku-style icons for toolbar

* add native icon for app
* dirty hack for fix crash on exit

sci-geosciences/gpxsee/additional-files/gpxsee.rdef.in

@@ -30,33 +30,30 @@ resource file_types message {
 };
 
 resource vector_icon {
-	$"6E6369660205FF050005040FFCFFBD2FBC28CA7F20CA7F20CB23B38ECC1BB4EE"
-	$"CBB6B42CCC1BB4EECC1BCA90CC1BCA90CBA6CB20CA94CC1BCB23CBA4CA94CC1B"
-	$"B4F2CC1BB4F2CC1BB453CBD2B34BCAEBB3B7CB78B339C8AE20C1FAB313C43620"
-	$"C1FAB9ABB34BBD21B34BBD21B342BB19B326B502B32FB70AB326B502B3B1B3B3"
-	$"B51BB32CB51BB32CB7F5B335C082B351BDA8B348C082B351BC2820001CBF64B4"
-	$"C1BF64B4C1BED3B599C003B71EBF8BB670BF20BA48BD5EC09DBE3EBD72BD29C0"
-	$"AABC8BC0CDBCBFC0C1BBB7BFD8BA12BDEEBAE3BEE5BA3CBD28B9B4BBA1BA71BC"
-	$"30B8C3BA9CB6E5BCC5B6E7BB6FB6CABD80B7CCBE87B770BDFCB723C1A5B5D3C7"
-	$"DDB67AC4C1B5D3C7DDB6AAC7FAB6AAC7FAB753C4D5B8AA3DB7FAC1B1B8D7BE85"
-	$"B95EBE6AB931BE73BA2FBF5DBBD4C140BB00C050BB13C2A1BDF1C3E9BC5AC493"
-	$"BF53C362BE36C0C3BF34C19DBF18BD8AC0E9B71DBFF8BA51C248BBC8C4F5C521"
-	$"C3A0C074C490C5ABC42FC6F9C3F8C63CC461C820C6D4C806C5E6C8CCC79DC784"
-	$"C76DC5B7C78D51C7D8C546C8AFC463C845C4D4C98FC4ABCB1FC3A7CAAEC497CC"
-	$"01C251C8D8C163CA2CC07CC7E9C1D6C81CC3D0C7DB48C775C46FC5CFC507C6DC"
-	$"C566C47BC063C1CDB71DC322BBC0C23EB670C26AB4C6C2F3B59BC1E3B384BF64"
-	$"B4C1BFEFB37EBF64B4C10203B4C4C85BB593C793B3D8C916B521CB1FB414CAA3"
-	$"B65ECBE5B778C90BB811CA5CB721C7F5021BBF64B4C1BED3B599BFEFB37EC26A"
-	$"B4C6C1E3B384C2F3B59BC1CDB71DC23EB670C322BBC0C5CFC507C47BC063C6DC"
-	$"C566C81CC3D0C775C46FC7DB48C8D8C163C7E9C1D6CA2CC07CCB1FC3A7CC01C2"
-	$"51CAAEC497C8AFC463C98FC4ABC845C4D4C76DC5B7C7D8C546C78D51C6D4C806"
-	$"C79DC784C5E6C8CCC42FC6F9C461C820C3F8C63CC4F5C521C490C5ABC3A0C074"
-	$"C0E9B71DC248BBC8BFF8BA51BE36C0C3BF18BD8ABF34C19DBDF1C3E9BF53C362"
-	$"BC5AC493BBD4C140BB13C2A1BB00C050B95EBE6ABA2FBF5DB931BE73B8AA3DB8"
-	$"D7BE85B7FAC1B1B6AAC7FAB753C4D5B6AAC7FAB5D3C7DDB5D3C7DDB67AC4C1B7"
-	$"CCBE87B723C1A5B770BDFCB6E5BCC5B6CABD80B6E7BB6FB9B4BBA1B8C3BA9CBA"
-	$"71BC30BA12BDEEBA3CBD28BAE3BEE5BC8BC0CDBBB7BFD8BCBFC0C1BD5EC09DBD"
-	$"29C0AABE3EBD72C003B71EBF20BA48BF8BB6700203B4C4C85BB3D8C916B593C7"
-	$"93B778C90BB721C7F5B811CA5CB521CB1FB65ECBE5B414CAA3030A0003000102"
-	$"000A010103000A01010400"
+	$"6E6369660A04016005010200060236A1483BD75CBBD75C36A1484CE1B84867D7"
+	$"00D9D4BCFFC2B17802000602BAFB8538FA3DB8FA3DBAFB854C11514DA11400F2"
+	$"EFE6FFD1BB870200060236A1483BD75CBBD75C36A1484DA9B849A7D700D9D4BC"
+	$"FFC2B17804FFAD03FF0000020012033C58CC3C6E8FBC6E8F3C58CC4C9333C750"
+	$"A300FF0082FF81FFFF0002000602B3EA493BEC10BBEC10B3EA494B2956470668"
+	$"00FF9E9EFFFF060603D923050E0609EEAB032E523A583556405C465F4E5E4C5F"
+	$"C581CB57575553585B4F60495D463341254C2949274E060EAFFFEB0F23422440"
+	$"2342284925462B4C2F503B4E435640534659475C475C495A5253505352515B46"
+	$"5A485B4655405743533D5039433C3B363E393934362F362F35322E392E372C39"
+	$"0608EFFE234224402342284925462B4C2E4F3B4339473D43433C3B363E393934"
+	$"362F362F35322E392E372C390606BA0E3B4E2F503B443C463D44433C50394644"
+	$"454244430608FEEF3B4E435640534659475C475C495A5253505352515B465A48"
+	$"5B4655405743533D50394644454244430407BE2C333435393836323C2C45B5F9"
+	$"BFEF314A334C3D484BC195C2534B4F4F540405EE02403A3A403A403644374833"
+	$"41B9A2C114383C3D370404EE415451434C484C484841463B4440463B0804513B"
+	$"4D40554959440409FEEE024B58454FC0F053C211C511C449C2B0C324C3DE4E45"
+	$"4A41C404C06E494045403D473F453B493848304033432D3D264508042E393B44"
+	$"464452530605BA032E4F2F503B443C463D44433C3B433D433947000002044030"
+	$"C34530BC3A30304030BC3A30C3454050BC3A50C34550504050C34550BC3A0E0A"
+	$"00010020201B0A01010130201B01178300040A02010220201B0A03010320201B"
+	$"0A04010420201B0A05040506070830201B01178100040A06010930201B011781"
+	$"00040A07010A30201B01178100040A01010B20201B0A09010D023A69DF39EE05"
+	$"BA17E33A9242471701481DAE0A09010D023AC4CF30013BB8056C3A8DAD4A07BC"
+	$"48D8920A09010D023A094B3952B8B988403A2CA44ACF5A48FA7F0A09010D023A"
+	$"69DF39EE05BA17E33A92424A35C04A2ED70A09010D023AD92FBA161938E6AC39"
+	$"F5F348300E4A2F23"
 };

sci-geosciences/gpxsee/gpxsee-7.1.recipe

@@ -4,12 +4,15 @@ GPX, TCX, KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files."
 HOMEPAGE="https://www.gpxsee.org/"
 COPYRIGHT="2015-2019 Martin Tůma"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/tumic0/gpxsee/archive/$portVersion/GPXSee-$portVersion.tar.gz"
 CHECKSUM_SHA256="4f06fbed10629c0c32e2240cc6b8f34ff3c2f4063f0bdd23e084b74c5fe01ca0"
 SOURCE_DIR="GPXSee-$portVersion"
 PATCHES="gpxsee-$portVersion.patchset"
-ADDITIONAL_FILES="gpxsee.rdef.in"
+ADDITIONAL_FILES="
+	gpxsee.rdef.in
+	icons.zip
+	"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -44,8 +47,14 @@ BUILD_PREREQUIRES="
 	cmd:lrelease$secondaryArchSuffix
 	cmd:make
 	cmd:qmake$secondaryArchSuffix
+	cmd:unzip
 	"
 
+PATCH()
+{
+	unzip -o $sourceDir/../../additional-files/icons.zip -d $sourceDir/icons
+}
+
 BUILD()
 {
 	lrelease gpxsee.pro

sci-geosciences/gpxsee/patches/gpxsee-7.1.patchset

@@ -1,4 +1,4 @@
-From b2dbcadd0651669834685679a20ccad452e4f6e2 Mon Sep 17 00:00:00 2001
+From f7cf312a742231ce97d2042def45760b84fb4a1a Mon Sep 17 00:00:00 2001
 From: Nikolay Korotkiy <sikmir@gmail.com>
 Date: Mon, 7 Jan 2019 22:29:26 +0300
 Subject: Fix APP_NAME
@@ -20,3 +20,39 @@ index d9573da..f4c29ff 100644
 -- 
 2.19.1
 
+
+From 19b8fd90adea3d3d0a7bbcf6da031ffe011da7b2 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Tue, 29 Jan 2019 18:04:38 +1000
+Subject: Dirty hack for fix crash on exit
+
+
+diff --git a/src/GUI/app.cpp b/src/GUI/app.cpp
+index f4c29ff..e396d8b 100644
+--- a/src/GUI/app.cpp
++++ b/src/GUI/app.cpp
+@@ -17,6 +17,9 @@
+ #include "settings.h"
+ #include "app.h"
+ 
++#include <unistd.h>
++#include <sys/types.h>
++#include <signal.h>
+ 
+ App::App(int &argc, char **argv) : QApplication(argc, argv),
+   _argc(argc), _argv(argv)
+@@ -81,8 +84,9 @@ int App::run()
+ 	QStringList args(arguments());
+ 	for (int i = 1; i < args.count(); i++)
+ 		_gui->openFile(args.at(i));
+-
+-	return exec();
++	exec();
++	kill(::getpid(), SIGKILL);
++	return 0;
+ }
+ 
+ bool App::event(QEvent *event)
+-- 
+2.19.1
+