release v0.5.0

5 files changed, 14 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73fe5883e933..01fefb8a31d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-# Generated by makepkg 5.1.0
-# Thu Jun  7 11:35:00 UTC 2018
+# Generated by makepkg 5.1.1
+# Thu Oct  4 19:46:00 UTC 2018
 pkgbase = gpxlab
 	pkgdesc = Program to show and manipulate GPS tracks
-	pkgver = 0.4.0
+	pkgver = 0.5.0
 	pkgrel = 1
 	url = https://bourgeoislab.wordpress.com/gpxlab/
 	arch = i686
@@ -10,16 +10,10 @@ pkgbase = gpxlab
 	license = GPL3
 	makedepends = qt5-tools
 	depends = qt5-base
-	provides = gpxlab=0.4.0
+	provides = gpxlab=0.5.0
 	conflicts = gpxlab-git
-	source = https://github.com/BourgeoisLab/GPXLab/archive/v0.4.0.tar.gz
-	source = gpxlab.desktop
-	source = gpxlab.diff
-	source = gpxlab.xml
-	sha256sums = 3b97f0b666479e5a24c1a44c756f1df1c90f786bd721ee3e2348b51db9d787e6
-	sha256sums = df674c3baa689b5441c81447fa999f418029c1edc5ac1933cdb26202049d2b58
-	sha256sums = 5cd2c5ecf545e884ff66304b3d572e5156f0d63dd6d985aea11fbb8fc3de354f
-	sha256sums = 5e35029c0cf26cbe82c3fbe1f839688f99406c2e054b1311e7912d0468df7c38
+	source = https://github.com/BourgeoisLab/GPXLab/archive/v0.5.0.tar.gz
+	sha256sums = 430672eaf0c76e1f7f43cf2c117e63d818ac7e444acceefe6a0ef5a2f7b3d7f4
 
 pkgname = gpxlab
 
diff --git a/PKGBUILD b/PKGBUILD
index cd07c1fc772a..b91d9196bffe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 _orgname=BourgeoisLab
 _pkgname=GPXLab
 pkgname=${_pkgname,,}
-pkgver=0.4.0
+pkgver=0.5.0
 pkgrel=1
 pkgdesc='Program to show and manipulate GPS tracks'
 arch=('i686' 'x86_64')
@@ -12,24 +12,13 @@ depends=('qt5-base')
 makedepends=('qt5-tools')
 provides=("${pkgname}=${pkgver}")
 conflicts=(${pkgname}-git)
-source=("https://github.com/${_orgname}/${_pkgname}/archive/v${pkgver}.tar.gz"
-        "gpxlab.desktop"
-        "gpxlab.diff"
-        "gpxlab.xml")
-sha256sums=('3b97f0b666479e5a24c1a44c756f1df1c90f786bd721ee3e2348b51db9d787e6'
-            'df674c3baa689b5441c81447fa999f418029c1edc5ac1933cdb26202049d2b58'
-            '5cd2c5ecf545e884ff66304b3d572e5156f0d63dd6d985aea11fbb8fc3de354f'
-            '5e35029c0cf26cbe82c3fbe1f839688f99406c2e054b1311e7912d0468df7c38')
-
-prepare() {
-  cd ${_pkgname}-${pkgver}
-
-  patch -Np1 < ../gpxlab.diff
-}
+source=("https://github.com/${_orgname}/${_pkgname}/archive/v${pkgver}.tar.gz")
+sha256sums=('430672eaf0c76e1f7f43cf2c117e63d818ac7e444acceefe6a0ef5a2f7b3d7f4')
 
 build() {
   cd ${_pkgname}-${pkgver}
 
+  lrelease GPXLab/GPXLab.pro
   qmake GPXLab.pro
   make
 }
@@ -38,14 +27,14 @@ package() {
   cd ${_pkgname}-${pkgver}
 
   install -d 755 ${pkgdir}/usr/bin
-  install -d 755 ${pkgdir}/usr/lib
   install -d 755 ${pkgdir}/usr/share/applications
   install -d 755 ${pkgdir}/usr/share/pixmaps
   install -d 755 ${pkgdir}/usr/share/mime/packages
+  install -d 755 ${pkgdir}/usr/share/${pkgname}/translations
 
   install -m 755 bin/GPXLab ${pkgdir}/usr/bin/${pkgname}
-  cp -a bin/libqmapcontrol.* ${pkgdir}/usr/lib
+  install -m 644 GPXLab/locale/*.qm ${pkgdir}/usr/share/${pkgname}/translations
   install -m 644 doc/gpxlab.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
-  install -m 644 ../gpxlab.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
-  install -m 644 ../gpxlab.xml ${pkgdir}/usr/share/mime/packages/${pkgname}.xml
+  install -m 644 pkg/gpxlab.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -m 644 pkg/gpxlab.xml ${pkgdir}/usr/share/mime/packages/${pkgname}.xml
 }
diff --git a/gpxlab.desktop b/gpxlab.desktop
deleted file mode 100644
index b5275c93892a..000000000000
--- a/gpxlab.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=GPXLab
-Comment=Program to show and manipulate GPS tracks
-Exec=gpxlab %F
-Icon=gpxlab
-Terminal=false
-Type=Application
-Categories=Graphics;Viewer;Maps;Qt;
-MimeType=application/gpx+xml;application/vnd.nmea.nmea;
diff --git a/gpxlab.diff b/gpxlab.diff
deleted file mode 100644
index ac59f09f7366..000000000000
--- a/gpxlab.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur GPXLab-0.4.0.orig/GPXLab/gpx_model/actfile.cpp GPXLab-0.4.0/GPXLab/gpx_model/actfile.cpp
---- GPXLab-0.4.0.orig/GPXLab/gpx_model/actfile.cpp	2018-06-07 13:24:00.888629018 +0300
-+++ GPXLab-0.4.0/GPXLab/gpx_model/actfile.cpp	2018-06-07 13:35:40.088174856 +0300
-@@ -25,6 +25,8 @@
- #include "uxmlpars.h"
- }
- 
-+#define stricmp strcasecmp
-+
- #define BUFFER_SIZE     1024
- #define MAX_SEGMENTS    1024
- 
-diff -Naur GPXLab-0.4.0.orig/GPXLab/gpx_model/gpxfile.cpp GPXLab-0.4.0/GPXLab/gpx_model/gpxfile.cpp
---- GPXLab-0.4.0.orig/GPXLab/gpx_model/gpxfile.cpp	2018-06-07 13:24:00.888629018 +0300
-+++ GPXLab-0.4.0/GPXLab/gpx_model/gpxfile.cpp	2018-06-07 13:35:40.088174856 +0300
-@@ -25,6 +25,8 @@
- #include "uxmlpars.h"
- }
- 
-+#define stricmp strcasecmp
-+
- #define BUFFER_SIZE                     1024
- #define DEPTH_INDENT                    2
- 
-diff -Naur GPXLab-0.4.0.orig/GPXLab/widgets/qtablewidgetpoints.cpp GPXLab-0.4.0/GPXLab/widgets/qtablewidgetpoints.cpp
---- GPXLab-0.4.0.orig/GPXLab/widgets/qtablewidgetpoints.cpp	2018-06-07 13:24:00.888629018 +0300
-+++ GPXLab-0.4.0/GPXLab/widgets/qtablewidgetpoints.cpp	2018-06-07 13:35:59.331680054 +0300
-@@ -20,7 +20,7 @@
- #include <QHeaderView>
- #include <QDateTime>
- #include "qtablewidgetpoints.h"
--#include "QUtils.h"
-+#include "qutils.h"
- #include "pointeditcommand.h"
- 
- ////////////////////////////////////////////////////////////////////////////////
diff --git a/gpxlab.xml b/gpxlab.xml
deleted file mode 100644
index fe0b278002b2..000000000000
--- a/gpxlab.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-	<mime-type type="application/gpx+xml">
-		<comment>GPS Exchange Format</comment>
-		<sub-class-of type="application/xml"/>
-		<generic-icon name="application-xml"/>
-		<glob pattern="*.gpx"/>
-	</mime-type>
-	<mime-type type="application/vnd.nmea.nmea">
-		<comment>NMEA 0183 data</comment>
-		<sub-class-of type="text/plain"/>
-		<generic-icon name="text-plain"/>
-		<glob pattern="*.nmea"/>
-	</mime-type>
-</mime-info>