diff --git a/sci-geosciences/gpxsee/additional-files/gpxsee.rdef.in b/sci-geosciences/gpxsee/additional-files/gpxsee.rdef.in index 2a28f8bb6..170cd1209 100644 --- a/sci-geosciences/gpxsee/additional-files/gpxsee.rdef.in +++ b/sci-geosciences/gpxsee/additional-files/gpxsee.rdef.in @@ -30,23 +30,33 @@ resource file_types message { }; resource vector_icon { - $"6E63696601050005020320B3A020B34620B42DB396B3C8B31EB42DB455B328B3" - $"961FB4551FB3461F0204CB2AB346CAF8B31ECB5CB378CBCBB3FBCBA3B3BECBF3" - $"B437CC1BB3AACC1BB40FCC1BB350CB701FCBD51FCB161F0220BFCAB469C01AB4" - $"0FBF0BB51EBF97B669BF01B5D3BFF2B6C4BECEBB8340B805BE1ABE10BD1FC088" - $"BD5BC04CBC7EC129BA0FBCCEBA0FBE38BA0FBBE7B914BB65B9DDBB97B764BAF6" - $"B764BDE7B637BCBAB823BEA6B51EC81BB641C6F7B405C92AB4CDCAB2B3F1C9DF" - $"B596CB7AB714CAB2B64BCB7AB7D3C9F3B728C8C5B7DD59B6BAC825B797C384B6" - $"C4C766B823C101B8E2BE9CB8BABECEB95ABE24BBB5C1FCBBDDC11FBB83C301BD" - $"6FC3DEBC56C3DEBEA6C3DEBEBAC165BF51C2A7BE60C09CBF8DBBDDBE88BF97C0" - $"42B95AC0EDB764C0E3B750C101B778C30BBE60C1F2BA9CC475C351C493C5B6C4" - $"E3C55CC457C5FCC46BC734C44CC6A7C4A7C811C5F2C81BC4D9C839C701C7FD53" - $"C6CFC734C7D4C784C552C952C489C86BC44CCA1BC4BBCB52C2E3CB52C3B6CB52" - $"C22EC98EC11FCA39C11FC8E4C11FC807C329C7C0C2B1C84DC3A2C661C50BC70C" - $"C50BC610C50BC515C26AC584C3E8C1D4B750C242B67DC1CAB732C27FB60FC2B1" - $"26C2B1B596C2B1B4D8C0EDB3C8C18DB3C8C0A6B3C8020320CB8420CAC620CBD5" - $"B364CC1BB328CC1BB396CC1BB38CCB84B3AACBD5B33CCAC60204CB84CBB7CBA3" - $"CB7ACB66CBE9CBADCC1BCB7ACC1BCBE9CC1BCC1BCBB7CC1BCBE9CC1BCB7ACBF3" - $"CB52CC07CB52CBD5CB52050A000100000A000101000A000102000A000103000A" - $"00010400" + $"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" }; diff --git a/sci-geosciences/gpxsee/gpxsee-6.3.recipe b/sci-geosciences/gpxsee/gpxsee-7.1.recipe similarity index 81% rename from sci-geosciences/gpxsee/gpxsee-6.3.recipe rename to sci-geosciences/gpxsee/gpxsee-7.1.recipe index 28183f1bf..5e29641f4 100644 --- a/sci-geosciences/gpxsee/gpxsee-6.3.recipe +++ b/sci-geosciences/gpxsee/gpxsee-7.1.recipe @@ -2,11 +2,11 @@ SUMMARY="GPS log file viewer and analyzer" DESCRIPTION="GPXSee is a Qt-based GPS log file viewer and analyzer that supports \ GPX, TCX, KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files." HOMEPAGE="https://www.gpxsee.org/" -COPYRIGHT="2018 Martin Tůma" +COPYRIGHT="2015-2019 Martin Tůma" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/tumic0/gpxsee/archive/$portVersion/GPXSee-$portVersion.tar.gz" -CHECKSUM_SHA256="0650ac670b8beeba14e05c7b04dc60d4aa9f610dd6d4dd0a5507632a07602990" +CHECKSUM_SHA256="4f06fbed10629c0c32e2240cc6b8f34ff3c2f4063f0bdd23e084b74c5fe01ca0" SOURCE_DIR="GPXSee-$portVersion" PATCHES="gpxsee-$portVersion.patchset" ADDITIONAL_FILES="gpxsee.rdef.in" @@ -55,11 +55,12 @@ BUILD() INSTALL() { - mkdir -p $appsDir/GPXSee/{maps,csv,translations} - cp GPXSee $appsDir/GPXSee/ - cp -r pkg/maps/* $appsDir/GPXSee/maps - cp -r pkg/csv/* $appsDir/GPXSee/csv - cp -r lang/*.qm $appsDir/GPXSee/translations + mkdir -p $appsDir + mkdir -p $dataDir/GPXSee/{maps,csv,translations} + cp GPXSee $appsDir/ + cp -r pkg/maps/* $dataDir/GPXSee/maps + cp -r pkg/csv/* $dataDir/GPXSee/csv + cp -r lang/*.qm $dataDir/GPXSee/translations local APP_SIGNATURE="application/x-vnd.qt5-gpxsee" local MAJOR="`echo "$portVersion" | cut -d. -f1`" @@ -74,6 +75,6 @@ INSTALL() -e "s|@LONG_INFO@|$LONG_INFO|" \ $portDir/additional-files/gpxsee.rdef.in > gpxsee.rdef - addResourcesToBinaries gpxsee.rdef $appsDir/GPXSee/GPXSee - addAppDeskbarSymlink $appsDir/GPXSee/GPXSee + addResourcesToBinaries gpxsee.rdef $appsDir/GPXSee + addAppDeskbarSymlink $appsDir/GPXSee } diff --git a/sci-geosciences/gpxsee/patches/gpxsee-6.3.patchset b/sci-geosciences/gpxsee/patches/gpxsee-6.3.patchset deleted file mode 100644 index 29b9d929a..000000000 --- a/sci-geosciences/gpxsee/patches/gpxsee-6.3.patchset +++ /dev/null @@ -1,23 +0,0 @@ -From a507a1a8c50b7e8704505d44d12ab04ddffbbd48 Mon Sep 17 00:00:00 2001 -From: Nikolay Korotkiy -Date: Wed, 10 Oct 2018 13:07:48 +0300 -Subject: Fix GLOBAL_DIR/USER_DIR - - -diff --git a/src/config.h b/src/config.h -index 3f078f4..1393401 100644 ---- a/src/config.h -+++ b/src/config.h -@@ -26,6 +26,9 @@ - #define USER_DIR QDir::homePath() + QString("/.gpxsee") - #define GLOBAL_DIR QApplication::applicationDirPath() \ - + QString("/../Resources") -+#elif defined(Q_OS_HAIKU) -+#define USER_DIR QDir::homePath() + QString("/config/settings/GPXSee") -+#define GLOBAL_DIR QApplication::applicationDirPath() - #else - #define USER_DIR QDir::homePath() + QString("/.gpxsee") - #define GLOBAL_DIR QString("/usr/share/gpxsee") --- -2.19.0 - diff --git a/sci-geosciences/gpxsee/patches/gpxsee-7.1.patchset b/sci-geosciences/gpxsee/patches/gpxsee-7.1.patchset new file mode 100644 index 000000000..807c56668 --- /dev/null +++ b/sci-geosciences/gpxsee/patches/gpxsee-7.1.patchset @@ -0,0 +1,22 @@ +From b2dbcadd0651669834685679a20ccad452e4f6e2 Mon Sep 17 00:00:00 2001 +From: Nikolay Korotkiy +Date: Mon, 7 Jan 2019 22:29:26 +0300 +Subject: Fix APP_NAME + + +diff --git a/src/GUI/app.cpp b/src/GUI/app.cpp +index d9573da..f4c29ff 100644 +--- a/src/GUI/app.cpp ++++ b/src/GUI/app.cpp +@@ -21,7 +21,7 @@ + App::App(int &argc, char **argv) : QApplication(argc, argv), + _argc(argc), _argv(argv) + { +-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) ++#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) || defined(Q_OS_HAIKU) + setApplicationName(APP_NAME); + #else + setApplicationName(QString(APP_NAME).toLower()); +-- +2.19.1 +