From fae5c40540ab2ebf93e2291bfec510022df02bdc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 25 Aug 2022 08:49:31 +0100 Subject: gentoo auto-resync : 25:08:2022 - 08:49:31 --- sci-geosciences/Manifest.gz | Bin 11079 -> 11086 bytes sci-geosciences/gpsbabel/Manifest | 11 -- .../files/gpsbabel-1.4.3-fix_binary_name.patch | 12 --- ...psbabel-1.5.4-disable_statistic_uploading.patch | 11 -- .../gpsbabel-1.5.4-disable_update_check.patch | 108 ------------------- .../gpsbabel-1.5.4-disable_version_check.patch | 45 -------- .../gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch | 105 ------------------ .../gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch | 70 ------------ .../files/gpsbabel-1.5.4-use_system_shapelib.patch | 68 ------------ .../files/gpsbabel-1.5.4-use_system_zlib.patch | 80 -------------- .../gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch | 13 --- sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 120 --------------------- sci-geosciences/gpxsee/Manifest | 4 +- sci-geosciences/gpxsee/gpxsee-11.1-r1.ebuild | 56 ---------- sci-geosciences/gpxsee/gpxsee-11.3.ebuild | 56 ++++++++++ 15 files changed, 58 insertions(+), 701 deletions(-) delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch delete mode 100644 sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch delete mode 100644 sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild delete mode 100644 sci-geosciences/gpxsee/gpxsee-11.1-r1.ebuild create mode 100644 sci-geosciences/gpxsee/gpxsee-11.3.ebuild (limited to 'sci-geosciences') diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz index fc15f4ca2bfc..c660f837b865 100644 Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest index 1908895fa1fe..356f12170d1a 100644 --- a/sci-geosciences/gpsbabel/Manifest +++ b/sci-geosciences/gpsbabel/Manifest @@ -1,18 +1,7 @@ -AUX gpsbabel-1.4.3-fix_binary_name.patch 270 BLAKE2B 5eaab7f4fc2b10c3ca914466768818d80547b128ede7eacfded1082cd1a18a11d7a1a9c6f490e17937b9cf1429aba84dae53e238f71a8f10b3ea776135eeb31d SHA512 3098a4d5900c70569e8991a531b447bef24fd19e7ebb8f5a3e484854d2d48f41384a40a8b2fb717b696eab106ad9801bff925d0f984ddaec27f300832fa87eff -AUX gpsbabel-1.5.4-disable_statistic_uploading.patch 373 BLAKE2B fbb2a7dabc2c1b04ac90c8241649e9fc9f6893bac6506afaa7fd47442ccccc0062a66a5802338663314b8a9351e181b79cc680fe53242d09f7e6e4ab74c4e94e SHA512 239488c5a8b9d1fefa98afe94614c600109fa1e1fdf815942d3912c5a1061131bd1c6c81bd8d0cc5e4de088babf80357ef2cb2b8f11b7e0f33f6ec14125c9e91 -AUX gpsbabel-1.5.4-disable_update_check.patch 4139 BLAKE2B 548f9c1e65d823ecfb25d06b315d2ff6a612d06634f68eff43162e971fbab47695c27c30868f4016ca3d1506f3866f353e3a2fc2f52fdad2ff45396ff15fb5c3 SHA512 a746f6e8d23cada6facf67da70a92629af205811441e6973cd7d4e5414c038a81c984d5ced5f351a5669fe6a8a69e608377ea1d4396ce448d5d5657315dcb8cc -AUX gpsbabel-1.5.4-disable_version_check.patch 1600 BLAKE2B a2f05ecdea695aa8108bb9955e8edf11e4c5ba4adb7ef9f0facc5f52a5f789c9db54e9a323835289ec0280995cd91e1706cde8eecff423b037caa25c43092b48 SHA512 b49746dbd9059693dafde408ef7389515644e569c73da89dd40e6efcef2f9888e6866d26d0672838be18ba0cb37a0a5cb95a8be3085ce009de1129de59583cc3 -AUX gpsbabel-1.5.4-qt-5.9-1.patch 4501 BLAKE2B 35b267a173dce1e0d1738a10befcc99ab891aed7c8876e1f4c57a84d01d3e0e7290edbbafa2a173a14febc5b2f913e6e4278c75abb0475b61fa6fb81c4602557 SHA512 28e766203f7dd31be70ddf5bba0337ab7ae7c3969a8723ef27ec09872e67cf27fdea9cc7e5d12a473fac91f1fad48267dacebe786cf30152eaba801567d646ab -AUX gpsbabel-1.5.4-qt-5.9-2.patch 3488 BLAKE2B 98160e59145b84957948dda2dc00338fb708a934ac9e7988d3c3e8d9ccd438c58f4ca253d406d5574820c37332d8e542ca6c0cc0cbc4fcc1d04acabf08ff5fd9 SHA512 59ac09846bd2bb15e65ff09a477ff5192621e15a8931cdfdd9ede43a87de539ed5ed72323b981a26027b98a6eac55de2aa69ebaef83c44ca7b8115d033da0f58 -AUX gpsbabel-1.5.4-use_system_shapelib.patch 2868 BLAKE2B c21666bc49b5ec6f433ca4c7a11b7ff3523117f0155b053fac9a88aa91fa0e8bdbeb18efdb87f2360cb39df7e50b144f2d7839d4bd007751bfc67d966139fe54 SHA512 437a15bea31b6b6e45571ce14540d337a0d46afdae4a1c72f3dbfcdbe9314b1368f734e009d9039200814a419390d51ccce03fd30c8857ad7208230be092da10 -AUX gpsbabel-1.5.4-use_system_zlib.patch 2814 BLAKE2B 58fb1dd0dc25897613125e45495bb9a9253aa9c6ac944b6f41a234295633e7740e497fb90aeb250b871c434d2298ed5cbf3c1cd3203053644ebd7007fb64ab56 SHA512 dbda711da83232e4ad38bda19ab2be28a4aded357d037443e9b2f34edbb1ae36afbbff33f3a36326154d9942a29f5a8458cfe459d7c1085f7044da0a231bcf15 -AUX gpsbabel-1.5.4-xmldoc.patch 497 BLAKE2B 5843fb604ec984324258e6cd00aa5bddf37b6012b4f2fc957cca46f9d767955b7902671ce07d869d8290efb96a2636621cecbede623cbfe6b6e7dd7b849fae73 SHA512 d3e1d7f02a54ab5f8d3c552e8849f9450da6469f4ba0d2741c00b30a0b07896dba55d68485f519962d6886626583872c7f0c3603deb6bd69e386f29a2bf48899 AUX gpsbabel-1.7.0-use_system_shapelib.patch 5998 BLAKE2B 7e1228aae03a7ceab05754ff5f1f5c7f346001a7f0533c9d66744b11d8a748de57783a01ec970e246823f97342283f429a0707939e7ddfd4de429ead6b212de0 SHA512 e73e28becd2c9953501f552a30540511422265647a6d9798499d6558927a5b4d36d019f6c4fd1901d2338ea897ea5fc831e827af4c8a18ffdc7bb38d161b50ad AUX gpsbabel-1.7.0-xmldoc.patch 498 BLAKE2B a080771489891b16edb2888a6925b3a37b609fb960cd6a2fbff64707eca040199aae36c93272d27d9b955815d47aa190d4481fc96b4d9d80e0b2b3469f8c136b SHA512 5a8bbaecd5975db4e1be8a1df50ff37937cd537e5fe51d4269a16d8cb8b6a390c05d5ff81925ab4ac7d7055b3822d328287d717a141adbc3534954b75e5f6965 -DIST gpsbabel-1.5.4.tar.gz 9099765 BLAKE2B 339cc78f94fed883b73c9f74cc6e27dd214438ba86917079b27459f543a9cb360bd8ec12408af1f23b9114d774a3b8eeccfb6b9f4fa9e7dc73b63e11bac20d43 SHA512 5fdc3bc07ad52d6c1e3532b287dcb506aba612ae9bc8db393b4837d79d773d6e22ad31f8f8e65770ec52b1afbda556e452af20dada1e411de93ca6e18054225b DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83 DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911 -EBUILD gpsbabel-1.5.4-r1.ebuild 2547 BLAKE2B c1a046ccf5fc308176ccc880bc33bbe1c345b1bd8ee2f49e2d87e64775e8cb7ee69bce3a71241fef85f65e28a5698210457f82c8acf16cfa1aefa67de2627c40 SHA512 e98bafe27f2793784270526bba6994e5aff39c3f8589edee4720524cba5b6695873471b439617a3808f5ddcbf27cbe989eb496c7ef2d50638fc4bef12c9d834c EBUILD gpsbabel-1.7.0-r1.ebuild 1769 BLAKE2B 9807d1fedb74f998b87b71b9fef86e8e2b32fa3d517aa9ae0935e2ef5813e326039cc1f662c5d6645306f25e0c0e834225489d658e9e94b1ba66ae1e91654c12 SHA512 60a3988906575b57e7992a086f421de995e32849eb1f457c537ba8a17c9de4c6fbb7ac66b64ea1d4443010a5ecbe201bf44f30665765ebadcbde6e2c419fab04 EBUILD gpsbabel-9999.ebuild 1771 BLAKE2B 320ef893e9dd23777a2473f1bd62939c62d1fb5992e07512139081ccd5dfee8fb68a240772f080ef4cc4082d2a948cbba9a48c3c37356dfcf8bdd9dcd48dc9dd SHA512 4ec6cc28126be0cd7acfe2ccca8fca10d083afb24b1e97e2c8dd46c6db9ea93389e7bcfa3378e027bb1e12a52759b2a1265b473fd9abca683a838d938b144980 MISC metadata.xml 352 BLAKE2B 1b6ee2c488060cad27a6e3c0e6a0c767f0fd29664ae4d09cf3e373194e5b102e234f2d2b6fc80f6385f1d49bf581b8ae8bb591be9fea966e3f75a771cb0a6c12 SHA512 b7558f62d902eeff8165c7d4eb9b9dccdc1a8740b51de5a7283f83378974a6b375b04e3d01b48344eabce23b8b6a127a8c92c87ac49956225d15418ed0fdcfdc diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch deleted file mode 100644 index 2ab8d5e10c69..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch +++ /dev/null @@ -1,12 +0,0 @@ -Rename gpsbabelfe binary. ---- gpsbabel-1.4.3/gui/app.pro -+++ gpsbabel-1.4.3/gui/app.pro -@@ -30,7 +30,7 @@ - TARGET=GPSBabelFE - QMAKE_LFLAGS_RELEASE += -static-libgcc - } --unix:TARGET=gpsbabelfe-bin -+unix:TARGET=gpsbabelfe - mac:TARGET=GPSBabelFE - - FORMS += aboutui.ui diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch deleted file mode 100644 index b65413c3d7c5..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gui/babeldata.h 2017-01-02 06:05:19.000000000 +0100 -+++ b/gui/babeldata.h 2017-01-21 00:33:30.858046004 +0100 -@@ -64,7 +64,7 @@ - upgradeOffers_(0), - runCount_(0), - startupVersionCheck_(true), -- reportStatistics_(true), -+ reportStatistics_(false), - allowBetaUpgrades_(false), - ignoreVersionMismatch_(false), - disableDonateDialog_(false), diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch deleted file mode 100644 index b618106df3f0..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch +++ /dev/null @@ -1,108 +0,0 @@ -Disable check for newer versions on start. - ---- a/gui/preferences.ui 2017-01-02 06:05:19.000000000 +0100 -+++ b/gui/preferences.ui 2017-01-21 00:38:44.929972188 +0100 -@@ -40,13 +40,6 @@ - - - -- -- -- Check for newer version on start. -- -- -- -- - - - Anonymously report usage data. ---- a/gui/preferences.cc 2017-01-02 06:05:19.000000000 +0100 -+++ b/gui/preferences.cc 2017-01-21 00:39:20.648418701 +0100 -@@ -39,7 +39,6 @@ - { - ui_.setupUi(this); - -- ui_.startupCheck->setChecked(babelData_.startupVersionCheck_); - ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); - ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_); - // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. -@@ -82,7 +81,6 @@ - formatList_[i].setHidden(item->checkState() == Qt::Unchecked); - } - -- babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked(); - babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked(); - babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked(); - accept(); ---- a/gui/babeldata.h 2017-01-21 00:33:30.858046004 +0100 -+++ b/gui/babeldata.h 2017-01-21 00:40:03.888959247 +0100 -@@ -63,7 +63,7 @@ - upgradeErrors_(0), - upgradeOffers_(0), - runCount_(0), -- startupVersionCheck_(true), -+ startupVersionCheck_(false), - reportStatistics_(false), - allowBetaUpgrades_(false), - ignoreVersionMismatch_(false), ---- a/gui/mainwinui.ui 2017-01-02 06:05:19.000000000 +0100 -+++ b/gui/mainwinui.ui 2017-01-21 00:40:40.453416335 +0100 -@@ -637,7 +637,6 @@ - - - -- - - - -@@ -666,11 +665,6 @@ - Preferences... - - -- -- -- Check for Upgrade -- -- - - - Visit Website... ---- a/gui/mainwindow.cc 2017-01-02 06:05:19.000000000 +0100 -+++ b/gui/mainwindow.cc 2017-01-21 00:42:02.939447485 +0100 -@@ -147,7 +147,6 @@ - connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX())); - connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX())); - connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX())); -- connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX())); - connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX())); - - connect(ui_.inputFormatCombo, SIGNAL(currentIndexChanged(int)), -@@ -208,17 +208,6 @@ - restoreSettings(); - - upgrade = new UpgradeCheck(parent, formatList_, babelData_); -- if (babelData_.startupVersionCheck_) { -- upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_, -- allowBetaUpgrades()); -- } -- -- if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) { -- VersionMismatch vm(0, babelVersion_, QString(VERSION)); -- -- vm.exec(); -- babelData_.ignoreVersionMismatch_ = vm.neverAgain(); -- } - } - - //------------------------------------------------------------------------ -@@ -1021,10 +1010,6 @@ - //------------------------------------------------------------------------ - void MainWindow::closeActionX() - { -- QDateTime wt= upgrade->getUpgradeWarningTime(); -- if (wt.isValid()) { -- babelData_.upgradeCheckTime_ = wt; -- } - babelData_.runCount_++; - - QDateTime now = QDateTime::currentDateTime(); diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch deleted file mode 100644 index e9d56d0a460b..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/gui/preferences.ui 2017-01-21 00:38:44.929972188 +0100 -+++ b/gui/preferences.ui 2017-01-21 00:50:05.314477610 +0100 -@@ -46,13 +46,6 @@ - - - -- -- -- -- Ignore mismatch between command line and GUI version. -- -- -- - - - ---- a/gui/preferences.cc 2017-01-21 00:39:20.648418701 +0100 -+++ b/gui/preferences.cc 2017-01-21 00:50:33.451829352 +0100 -@@ -40,7 +40,6 @@ - ui_.setupUi(this); - - ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); -- ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_); - // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. - if (VERSION == QString("1.4.1")) - babelData_.ignoreVersionMismatch_ = false; -@@ -82,7 +81,6 @@ - } - - babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked(); -- babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked(); - accept(); - } - ---- a/gui/babeldata.h 2017-01-21 00:40:03.888959247 +0100 -+++ b/gui/babeldata.h 2017-01-21 00:51:05.753233149 +0100 -@@ -66,7 +66,7 @@ - startupVersionCheck_(false), - reportStatistics_(false), - allowBetaUpgrades_(false), -- ignoreVersionMismatch_(false), -+ ignoreVersionMismatch_(true), - disableDonateDialog_(false), - donateSplashed_(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0))) - { diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch deleted file mode 100644 index 36db615f9dec..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 30a345577a644125502f6e4f8b58ea3077ec8dad Mon Sep 17 00:00:00 2001 -From: Robert Lipe -Date: Mon, 4 Sep 2017 23:20:00 -0500 -Subject: [PATCH] Prefer QStringLiteral over implicit conversion from Latin1 - for Q5 5.9. Based on work by Bernd Zeimetz. - ---- - gpx.cc | 14 +++++++------- - magproto.cc | 6 +++--- - unicsv.cc | 8 ++++---- - 3 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/gpx.cc b/gpx.cc -index 3b3b963c..36701e52 100644 ---- a/gpx.cc -+++ b/gpx.cc -@@ -494,7 +494,7 @@ tag_cache_desc(const QXmlStreamAttributes& attr) - { - cache_descr_is_html = 0; - if (attr.hasAttribute("html")) { -- if (attr.value("html").toString().compare("True") == 0) { -+ if (attr.value("html").toString() == QStringLiteral("True")) { - cache_descr_is_html = 1; - } - } -@@ -509,16 +509,16 @@ tag_gs_cache(const QXmlStreamAttributes& attr) - gc_data->id = attr.value("id").toString().toInt(); - } - if (attr.hasAttribute("available")) { -- if (attr.value("available").toString().compare("True", Qt::CaseInsensitive) == 0) { -+ if (attr.value("available").toString().compare(QStringLiteral("True"), Qt::CaseInsensitive) == 0) { - gc_data->is_available = status_true; -- } else if (attr.value("available").toString().compare("False", Qt::CaseInsensitive) == 0) { -+ } else if (attr.value("available").toString().compare(QStringLiteral("False"), Qt::CaseInsensitive) == 0) { - gc_data->is_available = status_false; - } - } - if (attr.hasAttribute("archived")) { -- if (attr.value("archived").toString().compare("True", Qt::CaseInsensitive) == 0) { -+ if (attr.value("archived").toString().compare(QStringLiteral("True"), Qt::CaseInsensitive) == 0) { - gc_data->is_archived = status_true; -- } else if (attr.value("archived").toString().compare("False", Qt::CaseInsensitive) == 0) { -+ } else if (attr.value("archived").toString().compare(QStringLiteral("False"), Qt::CaseInsensitive) == 0) { - gc_data->is_archived = status_false; - } - } -@@ -972,7 +972,7 @@ gpx_end(const QString& el) - * last date we saw in this log. - */ - case tt_cache_log_type: -- if ((cdatastr.compare("Found it") == 0) && -+ if ((cdatastr.compare(QStringLiteral("Found it")) == 0) && - (0 == wpt_tmp->gc_data->last_found.toTime_t())) { - wpt_tmp->AllocGCData()->last_found = gc_log_date; - } -@@ -1423,7 +1423,7 @@ fprint_xml_chain(xml_tag* tag, const Waypoint* wpt) - fprint_xml_chain(tag->child, wpt); - } - if (wpt && wpt->gc_data->exported.isValid() && -- tag->tagname.compare("groundspeak:cache") == 0) { -+ tag->tagname.compare(QStringLiteral("groundspeak:cache")) == 0) { - writer->writeTextElement("time", - wpt->gc_data->exported.toPrettyString()); - } -diff --git a/magproto.cc b/magproto.cc -index 7c82e9fb..0deb7f33 100644 ---- a/magproto.cc -+++ b/magproto.cc -@@ -819,11 +819,11 @@ mag_rd_init_common(const QString& portname) - */ - QString exten = QFileInfo(curfname).suffix(); - if (exten.length() > 0) { -- if (0 == exten.compare("upt", Qt::CaseInsensitive)) { -+ if (0 == exten.compare(QStringLiteral("upt"), Qt::CaseInsensitive)) { - extension_hint = WPTDATAMASK; -- } else if (0 == exten.compare("log", Qt::CaseInsensitive)) { -+ } else if (0 == exten.compare(QStringLiteral("log"), Qt::CaseInsensitive)) { - extension_hint = TRKDATAMASK; -- } else if (0 == exten.compare("rte", Qt::CaseInsensitive)) { -+ } else if (0 == exten.compare(QStringLiteral("rte"), Qt::CaseInsensitive)) { - extension_hint = RTEDATAMASK; - } - } -diff --git a/unicsv.cc b/unicsv.cc -index 4a7d78ed..6312e9d2 100644 ---- a/unicsv.cc -+++ b/unicsv.cc -@@ -430,13 +430,13 @@ unicsv_parse_time(const QString& str, int* msec, time_t* date) - static status_type - unicsv_parse_status(const QString& str) - { -- if (str.compare("true", Qt::CaseInsensitive) == 0 || -- str.compare("yes", Qt::CaseInsensitive) == 0 || -+ if (str.compare(QStringLiteral("true"), Qt::CaseInsensitive) == 0 || -+ str.compare(QStringLiteral("yes"), Qt::CaseInsensitive) == 0 || - str == "1") { - return status_true; - } -- if (str.compare("false", Qt::CaseInsensitive) == 0 || -- str.compare("no", Qt::CaseInsensitive) == 0 || -+ if (str.compare(QStringLiteral("false"), Qt::CaseInsensitive) == 0 || -+ str.compare(QStringLiteral("no"), Qt::CaseInsensitive) == 0 || - str == "0") { - return status_false; - } diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch deleted file mode 100644 index ce1b0489146f..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 604178aa8ad4d3c3ad218df24c1e9a6a1f683bb3 Mon Sep 17 00:00:00 2001 -From: Harel Mazor -Date: Tue, 24 Jan 2017 00:35:04 +0200 -Subject: [PATCH] Added geojson read capablity, moved magic strings to - constants, fixed windows compilation issues. - ---- - tef_xml.cc | 24 +++---- - -* Removed any unrelated changes except for s/windows/Qt-5.9/ compilation issues. - -diff --git a/tef_xml.cc b/tef_xml.cc -index b32d69b3..37dd85ba 100644 ---- a/tef_xml.cc -+++ b/tef_xml.cc -@@ -72,11 +72,11 @@ tef_start(xg_string args, const QXmlStreamAttributes* attrv) - bool valid = false; - - foreach(QXmlStreamAttribute attr, *attrv) { -- if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) { -- if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) { -+ if (attr.name().compare(QString("Comment"), Qt::CaseInsensitive) == 0) { -+ if (attr.value().compare(QString("TourExchangeFormat"), Qt::CaseInsensitive) == 0) { - valid = true; - } -- } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Version"), Qt::CaseInsensitive) == 0) { - version = attr.value().toString().toDouble(); - } - } -@@ -95,9 +95,9 @@ tef_header(xg_string args, const QXmlStreamAttributes* attrv) - { - route = route_head_alloc(); - foreach(QXmlStreamAttribute attr, *attrv) { -- if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) { -+ if (attr.name().compare(QString("Name"), Qt::CaseInsensitive) == 0) { - route->rte_name = attr.value().toString().trimmed(); -- } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Software"), Qt::CaseInsensitive) == 0) { - route->rte_desc = attr.value().toString().trimmed(); - } - } -@@ -248,20 +248,20 @@ tef_item_start(xg_string args, const QXmlStreamAttributes* attrv) - QString attrstr = attr.value().toString(); - QByteArray attrtext = attrstr.toUtf8(); - -- if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) { -+ if (attr.name().compare(QString("SegDescription"), Qt::CaseInsensitive) == 0) { - wpt_tmp->shortname = attrstr.trimmed(); -- } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("PointDescription"), Qt::CaseInsensitive) == 0) { - wpt_tmp->description = attrstr.trimmed(); -- } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 && -- attr.value().compare("true", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("ViaStation"), Qt::CaseInsensitive) == 0 && -+ attr.value().compare(QString("true"), Qt::CaseInsensitive) == 0) { - wpt_tmp->wpt_flags.fmt_use = 1; /* only a flag */ - - /* new in TEF V2 */ -- } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Instruction"), Qt::CaseInsensitive) == 0) { - wpt_tmp->description = attrstr.trimmed(); -- } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Altitude"), Qt::CaseInsensitive) == 0) { - wpt_tmp->altitude = attrstr.toDouble(); -- } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("TimeStamp"), Qt::CaseInsensitive) == 0) { - /* nothing for the moment */ - } - } diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch deleted file mode 100644 index d3a4fa0c16a3..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/configure.in 2017-01-02 06:05:19.000000000 +0100 -+++ b/configure.in 2017-01-21 00:26:02.239786037 +0100 -@@ -402,7 +402,7 @@ - AC_SUBST(QT_SYSINC_OPT) - AC_SUBST(QT_LIBS) - --AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty]) -+AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty]) - AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh]) - AC_OUTPUT - ---- a/Makefile.in 2017-01-02 06:05:19.000000000 +0100 -+++ b/Makefile.in 2017-01-21 00:29:05.715731486 +0100 -@@ -100,7 +100,7 @@ - # Extra modules in Jeeps that we don't use - # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o - --SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o -+SHAPE=-lshp - - MINIZIP=zlib/contrib/minizip/zip.o \ - zlib/contrib/minizip/ioapi.o -@@ -119,7 +119,7 @@ - src/core/xmlstreamwriter.o \ - src/core/usasciicodec.o\ - src/core/ziparchive.o \ -- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) -+ $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) - OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ - - DEPFILES = $(OBJS:.o=.d) -@@ -148,10 +148,10 @@ - all: gpsbabel$(EXEEXT) - - gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - gpsbabel-debug: $(OBJS) -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ - gbversion.h.in gui/setup.iss.in -@@ -894,11 +894,7 @@ - session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ - gbfile.h cet.h inifile.h session.h src/core/datetime.h - shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ -- gbfile.h cet.h inifile.h session.h src/core/datetime.h \ -- shapelib/shapefil.h --shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h --shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h --shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h -+ gbfile.h cet.h inifile.h session.h src/core/datetime.h - skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ - gbfile.h cet.h inifile.h session.h src/core/datetime.h - skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ ---- a/shape.cc 2017-01-02 06:05:19.000000000 +0100 -+++ b/shape.cc 2017-01-21 00:29:58.514391517 +0100 -@@ -20,7 +20,7 @@ - - */ - #include "defs.h" --#include "shapelib/shapefil.h" -+#include - #include - - #if SHAPELIB_ENABLED diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch deleted file mode 100644 index ce3591715492..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- a/configure.in 2017-01-21 03:17:05.480317203 +0100 -+++ b/configure.in 2017-01-21 03:26:53.743671224 +0100 -@@ -402,7 +402,7 @@ - AC_SUBST(QT_SYSINC_OPT) - AC_SUBST(QT_LIBS) - --AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty]) -+AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile]) - AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh]) - AC_OUTPUT - ---- a/Makefile.in 2017-01-21 03:17:05.530317828 +0100 -+++ b/Makefile.in 2017-01-21 03:32:19.447032690 +0100 -@@ -102,14 +102,7 @@ - - SHAPE=-lshp - --MINIZIP=zlib/contrib/minizip/zip.o \ -- zlib/contrib/minizip/ioapi.o -- --ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \ -- zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \ -- zlib/uncompr.o zlib/gzlib.o zlib/gzclose.o zlib/gzread.o \ -- zlib/gzwrite.o zlib/zutil.o $(MINIZIP) -- -+ZLIB=-lz -lminizip - - LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ - csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \ -@@ -119,7 +112,7 @@ - src/core/xmlstreamwriter.o \ - src/core/usasciicodec.o\ - src/core/ziparchive.o \ -- $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) -+ $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) - OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ - - DEPFILES = $(OBJS:.o=.d) -@@ -148,10 +141,10 @@ - all: gpsbabel$(EXEEXT) - - gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) $(ZLIB) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - gpsbabel-debug: $(OBJS) -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) $(ZLIB) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ - gbversion.h.in gui/setup.iss.in ---- a/src/core/ziparchive.cc 2017-01-02 06:05:19.000000000 +0100 -+++ b/src/core/ziparchive.cc 2017-01-21 03:51:30.402421165 +0100 -@@ -23,7 +23,7 @@ - - #include "defs.h" - #include "src/core/logging.h" --#include "zlib/contrib/minizip/zip.h" -+#include - - #include - #include -@@ -89,4 +89,4 @@ - return true; - } - return false; --} -\ No newline at end of file -+} ---- a/src/core/ziparchive.h 2017-01-02 06:05:19.000000000 +0100 -+++ b/src/core/ziparchive.h 2017-01-21 03:51:05.931115241 +0100 -@@ -21,7 +21,7 @@ - - #include - #include --#include "zlib/contrib/minizip/zip.h" -+#include - - class ZipArchive - { diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch deleted file mode 100644 index 3fdd274927eb..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.in 2017-01-21 00:32:50.921546762 +0100 -+++ b/Makefile.in 2017-01-21 00:55:45.362728521 +0100 -@@ -278,8 +278,8 @@ - --stringparam html.cleanup "1" \ - --stringparam make.clean.html "1" \ - --stringparam html.valid.html "1" \ -- --stringparam html.stylesheet \ -- "http://www.gpsbabel.org/style3.css" \ -+ --nonet \ -+ --stringparam html.stylesheet "gpsbabel.org-style3.css" \ - http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \ - xmldoc/readme.xml - diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild deleted file mode 100644 index 3b07666bdf59..000000000000 --- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop qmake-utils - -DESCRIPTION="GPS waypoints, tracks and routes converter" -HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" -SRC_URI=" - https://dev.gentoo.org/~asturm/${P}.tar.gz - doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="doc +gui" - -BDEPEND=" - doc? ( - app-text/docbook-xml-dtd:4.1.2 - dev-lang/perl - dev-libs/libxslt - ) - gui? ( dev-qt/linguist-tools:5 ) -" -RDEPEND=" - dev-libs/expat - dev-qt/qtcore:5 - sci-libs/shapelib:= - sys-libs/zlib[minizip] - virtual/libusb:0 - gui? ( - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) -" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.3-fix_binary_name.patch - "${FILESDIR}"/${P}-disable_statistic_uploading.patch - "${FILESDIR}"/${P}-disable_update_check.patch - "${FILESDIR}"/${P}-disable_version_check.patch - "${FILESDIR}"/${P}-use_system_shapelib.patch - "${FILESDIR}"/${P}-use_system_zlib.patch - "${FILESDIR}"/${P}-xmldoc.patch - "${FILESDIR}"/${P}-qt-5.9-{1,2}.patch -) - -RESTRICT="test" # bug 421699 - -src_prepare() { - default - - # remove bundled libs and cleanup - rm -r shapelib zlib || die - sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die - - mv configure.in configure.ac || die - sed -i -e "/^configure:/s/configure.in/configure.ac/" Makefile.in || die - - if use doc; then - cp "${DISTDIR}/gpsbabel.org-style3.css" . || die - fi - - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_with doc doc doc/manual) - LRELEASE=$(qt5_get_bindir)/lrelease - LUPDATE=$(qt5_get_bindir)/lupdate - QMAKE=$(qt5_get_bindir)/qmake - --with-zlib=system - ) - econf "${myeconfargs[@]}" - - if use gui; then - pushd gui > /dev/null || die - $(qt5_get_bindir)/lrelease *.ts || die - eqmake5 - popd > /dev/null - fi -} - -src_compile() { - default - if use gui; then - pushd gui > /dev/null || die - emake - popd > /dev/null - fi - - if use doc; then - perl xmldoc/makedoc || die - emake gpsbabel.html - fi -} - -src_install() { - use doc && local HTML_DOCS=( ${PN}.html ${PN}.org-style3.css ) - - default - - if use gui; then - dobin gui/objects/gpsbabelfe - insinto /usr/share/${PN}/translations/ - doins gui/gpsbabel*_*.qm - newicon gui/images/appicon.png ${PN}.png - make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience" - fi -} diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest index 0c23af8edc8c..2740b4c25619 100644 --- a/sci-geosciences/gpxsee/Manifest +++ b/sci-geosciences/gpxsee/Manifest @@ -1,8 +1,8 @@ AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc DIST gpxsee-10.7.tar.gz 5122383 BLAKE2B 5625f40b799e67ac7b4801e358021657b2ef4f2279e8ac94f8c85724b9e27dad2d0e244f931b6c2f7204abfb45a8dde1a07dcbbbfba780c8a07aa541ba944473 SHA512 0cb4a3e71c8141d8b0a039cd51ddbfb159c28dc9d6f724dc8605f52aaf90379b9fa3d21741993fbf754bd329d835118b3b67c87673ee97fdc29f61440c3e8624 -DIST gpxsee-11.1.tar.gz 5168310 BLAKE2B f8a5de5f3907f09ae8cf860aa14a8a8d98c739a6b4b605cfa3f31bf7493f2cf6ff1a7aaf89687ab4dbe3e829460fc54cd52d0ae344c9c833c0b9ef13837931a2 SHA512 90efa8291c2a5671d1d5e54fead094ede6d93710751edf6c71babda5d3e432ceb70159695d1fb2b6589a75deec18f3e26003b042aa8f2060d80d8dbbbf5e4c96 DIST gpxsee-11.2.tar.gz 5318176 BLAKE2B 3ecf8fdc70e073d440e15367eda880c1d59d452ac042175c582a512a805a8a25ed7ef838b817b08564bd57ad91b3577af8cfe6c28cc3891093de14b7f0e486b6 SHA512 3236e3ea0db5442f5c879ae4e13648f4c4365085f1013cb55f625bd5313c02fef9a279996ed68e17a475765bf66f09e419f83995f39242cf7003aa06aa9cf08f +DIST gpxsee-11.3.tar.gz 5321969 BLAKE2B 472503f01c480ca93337c2a372eaea5e63aa025fce9237594b9a4bb990f520ea680d0fecf1c56692cbafb473765dcab19e55e1153d35d0f1472718a904bae8ed SHA512 8f4328193f71bd065b8fb4b5619e1a12bba9a034150f77606315fb385dabc3fb9263f33063d50fed222d72c292e3f67f84bc907626406661e88bd421c3041a96 EBUILD gpxsee-10.7.ebuild 1160 BLAKE2B fd51e2104bcc34cf1f450e0fecb1703e6dc15b45afc7ff07b16a5f841d82fc3f25c195aeef53d7cd611a337652fb75adc2a5f44b5ccde3119eb8f1c30e7873c6 SHA512 08988262203c5e2819206f61e38f6264562dd36d1193d8dd3d0bd4cce3eb77ae64905aa26cdbf149ee2ce47f70798f1821e9c34014402003f3495a615a17f4e1 -EBUILD gpxsee-11.1-r1.ebuild 1181 BLAKE2B 82ed3481200f47e8a1a561c1900feec424c53c21305392b6272c035d52373bc656b0614d4c27bad2ae4037bccb8a706c228894736423b4eb66f60c778350f2ae SHA512 b96b703698da9b123f32248074c4ecfd709c70617ae55461f923738fa6f7a54e9d3107122cd59caec375ae7a897abd0ab94582a34c95b947a1950f06a7ffc1e0 EBUILD gpxsee-11.2.ebuild 1181 BLAKE2B 82ed3481200f47e8a1a561c1900feec424c53c21305392b6272c035d52373bc656b0614d4c27bad2ae4037bccb8a706c228894736423b4eb66f60c778350f2ae SHA512 b96b703698da9b123f32248074c4ecfd709c70617ae55461f923738fa6f7a54e9d3107122cd59caec375ae7a897abd0ab94582a34c95b947a1950f06a7ffc1e0 +EBUILD gpxsee-11.3.ebuild 1181 BLAKE2B 82ed3481200f47e8a1a561c1900feec424c53c21305392b6272c035d52373bc656b0614d4c27bad2ae4037bccb8a706c228894736423b4eb66f60c778350f2ae SHA512 b96b703698da9b123f32248074c4ecfd709c70617ae55461f923738fa6f7a54e9d3107122cd59caec375ae7a897abd0ab94582a34c95b947a1950f06a7ffc1e0 MISC metadata.xml 508 BLAKE2B da581bc3330fcebff61893ddcc75762fa4987f959cf6eaddb49a2f67a3071caf5e1aa5e1f9722fc493c13091146a70bbf5f7051d2961e4456c1aaf025182a77a SHA512 e895fdb3e558a75c1506206c5b0cf797f4ee14aa83c4e0853bec71c48298301cd7cc052853df64fc62c253543882cf878e03be864a93643456f5f117816faaa3 diff --git a/sci-geosciences/gpxsee/gpxsee-11.1-r1.ebuild b/sci-geosciences/gpxsee/gpxsee-11.1-r1.ebuild deleted file mode 100644 index ca4a7a75cd2b..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-11.1-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PLOCALES="cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh" -inherit plocale qmake-utils xdg - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="https://www.gpxsee.org/" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtconcurrent:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtpositioning:5 - dev-qt/qtsvg:5" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) - -src_prepare() { - default - - plocale_find_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - plocale_for_each_disabled_locale rm_ts -} - -src_compile() { - $(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" - eqmake5 gpxsee.pro - emake -} - -src_install() { - emake INSTALL_ROOT="${D}" install - dodoc README.md -} diff --git a/sci-geosciences/gpxsee/gpxsee-11.3.ebuild b/sci-geosciences/gpxsee/gpxsee-11.3.ebuild new file mode 100644 index 000000000000..ca4a7a75cd2b --- /dev/null +++ b/sci-geosciences/gpxsee/gpxsee-11.3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh" +inherit plocale qmake-utils xdg + +MY_PN="GPXSee" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" +HOMEPAGE="https://www.gpxsee.org/" +SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtconcurrent:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtpositioning:5 + dev-qt/qtsvg:5" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) + +src_prepare() { + default + + plocale_find_changes lang "${PN}_" '.ts' + + rm_ts() { + sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro + } + + plocale_for_each_disabled_locale rm_ts +} + +src_compile() { + $(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" + eqmake5 gpxsee.pro + emake +} + +src_install() { + emake INSTALL_ROOT="${D}" install + dodoc README.md +} -- cgit v1.2.3