From e5e819690d72bb04ab07d6c4fccdca0a1c54ecdc Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 3 Feb 2020 20:59:14 +0300
Subject: [PATCH] GPXLab: bump to 0.7.0 (#4675)

---
 ...pxlab-0.6.0.recipe => gpxlab-0.7.0.recipe} | 16 +++++++-------
 .../gpxlab/patches/gpxlab-0.6.0.patchset      | 22 -------------------
 2 files changed, 8 insertions(+), 30 deletions(-)
 rename sci-geosciences/gpxlab/{gpxlab-0.6.0.recipe => gpxlab-0.7.0.recipe} (82%)
 delete mode 100644 sci-geosciences/gpxlab/patches/gpxlab-0.6.0.patchset

diff --git a/sci-geosciences/gpxlab/gpxlab-0.6.0.recipe b/sci-geosciences/gpxlab/gpxlab-0.7.0.recipe
similarity index 82%
rename from sci-geosciences/gpxlab/gpxlab-0.6.0.recipe
rename to sci-geosciences/gpxlab/gpxlab-0.7.0.recipe
index ec4f44153..c8f57b6cb 100644
--- a/sci-geosciences/gpxlab/gpxlab-0.6.0.recipe
+++ b/sci-geosciences/gpxlab/gpxlab-0.7.0.recipe
@@ -2,14 +2,13 @@ SUMMARY="Program to show and manipulate GPS tracks"
 DESCRIPTION="GPXLab is an application to display and manage GPS tracks \
 previously recorded with a GPS tracker."
 HOMEPAGE="https://bourgeoislab.wordpress.com/gpxlab/"
-COPYRIGHT="2018 Frédéric Bourgeois"
+COPYRIGHT="2014-2020 Frédéric Bourgeois"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://github.com/BourgeoisLab/GPXLab/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="9b563dbdec884405c740bca63c57f275f2962ed0d84c3bc5ad8872141a65f7ff"
+CHECKSUM_SHA256="cb9fbcde4688c388b781c90b7c48a60a76c5d5bed14e5040e55a13a3f810aa0e"
 SOURCE_FILENAME="GPXLab-$portVersion.tar.gz"
 SOURCE_DIR="GPXLab-$portVersion"
-PATCHES="gpxlab-$portVersion.patchset"
 ADDITIONAL_FILES="gpxlab.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -54,9 +53,10 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p $appsDir/GPXLab/translations
-	cp bin/GPXLab $appsDir/GPXLab/
-	cp -r GPXLab/locale/*.qm $appsDir/GPXLab/translations
+	mkdir -p $appsDir
+	mkdir -p $dataDir/GPXLab/translations
+	cp GPXLab/gpxlab $appsDir/GPXLab
+	cp -r GPXLab/locale/*.qm $dataDir/GPXLab/translations
 
 	local APP_SIGNATURE="application/x-vnd.qt5-gpxlab"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -71,6 +71,6 @@ INSTALL()
 		-e "s|@LONG_INFO@|$LONG_INFO|" \
 		$portDir/additional-files/gpxlab.rdef.in > gpxlab.rdef
 
-	addResourcesToBinaries gpxlab.rdef $appsDir/GPXLab/GPXLab
-	addAppDeskbarSymlink $appsDir/GPXLab/GPXLab
+	addResourcesToBinaries gpxlab.rdef $appsDir/GPXLab
+	addAppDeskbarSymlink $appsDir/GPXLab
 }
diff --git a/sci-geosciences/gpxlab/patches/gpxlab-0.6.0.patchset b/sci-geosciences/gpxlab/patches/gpxlab-0.6.0.patchset
deleted file mode 100644
index 9176f2edc..000000000
--- a/sci-geosciences/gpxlab/patches/gpxlab-0.6.0.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From 746daf45e9f22964a16b3156805a14e392483675 Mon Sep 17 00:00:00 2001
-From: Nikolay Korotkiy <sikmir@gmail.com>
-Date: Mon, 29 Oct 2018 11:36:47 +0000
-Subject: Fix TRANSLATIONS_DIR
-
-
-diff --git a/GPXLab/main.cpp b/GPXLab/main.cpp
-index 3401345..17a0da8 100644
---- a/GPXLab/main.cpp
-+++ b/GPXLab/main.cpp
-@@ -24,6 +24,8 @@
- # define TRANSLATIONS_DIR QApplication::applicationDirPath() + QString("/translations")
- #elif defined(Q_OS_MAC)
- # define TRANSLATIONS_DIR QApplication::applicationDirPath() + QString("/../Resources/translations")
-+#elif defined(Q_OS_HAIKU)
-+# define TRANSLATIONS_DIR QApplication::applicationDirPath() + QString("/translations")
- #else
- # define TRANSLATIONS_DIR QString("/usr/share/gpxlab/translations")
- #endif
--- 
-2.19.1
-