summaryrefslogtreecommitdiff
path: root/sci-geosciences
diff options
context:
space:
mode:
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/Manifest.gzbin10918 -> 10922 bytes
-rw-r--r--sci-geosciences/gpxsee/Manifest2
-rw-r--r--sci-geosciences/gpxsee/gpxsee-7.30.ebuild66
-rw-r--r--sci-geosciences/liblas/Manifest3
-rw-r--r--sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch55
-rw-r--r--sci-geosciences/liblas/liblas-1.8.1-r3.ebuild1
-rw-r--r--sci-geosciences/merkaartor/Manifest3
-rw-r--r--sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch29
-rw-r--r--sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild5
9 files changed, 161 insertions, 3 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 5a3f13bc35fa..ec2a15a2b2e5 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
Binary files differ
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index a45509db74f7..fbd1ede96f8d 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,3 +1,5 @@
DIST gpxsee-7.29.tar.gz 5363181 BLAKE2B 4d3a5693a7b5939847c2dc32bff205649264766975c6313220e305770e40602f40e03c74db22e043860f1a2953a43e7ec0a58624f4882de93f3320a32dc6292e SHA512 e4133ad7a9b5e25f3c0bdd2397e02b6219e81f8632385e6423244e7c400ff72a5be85720f1ec123428ae3aeca79cac81e03b7f40de83d309e55ee69ee7cc933f
+DIST gpxsee-7.30.tar.gz 5371435 BLAKE2B 49f257dc50201b2fd5a621d51fba67fd8511399c2fb97bd30087e0daedb3db78b678d658bfc6e5c3faedeea84940a8fb1ebe7df16cf3002e40d934c3798ce44a SHA512 b1771cc63df538e6ed5b9c7f47a0aaf4f31969a03a1727870372a249c36f3504adfbb31fdc321cc0da3547f02be7f33639f6e5569a83c98092f2d9a998690c00
EBUILD gpxsee-7.29.ebuild 1330 BLAKE2B 0d730eeb63edd9346d61c39e7837eed78de1fcd84c7d14dcf115d6d673cd6905bace2ebe4b6c1063facfbb68148e66c80ef55adaeb54841ef72221c017671d9e SHA512 9b97ba9c3d5c010e678085f1b8a20228798ed0c32b1fe4ec7381e6dc14a858293e0fb5b2429e649552606abf96a142ef10462bbaa0058808eff6eefcf528375b
+EBUILD gpxsee-7.30.ebuild 1332 BLAKE2B 42ad66c628a19675ebe8e7f730cc683166cac2f6f8101b093bfdf5f7e9feca2d0815dec5c4884cc98a0cf98555d0ce8330c654b77549720043cfec2f0a786e2f SHA512 5ba50c60ab60d45c871dffccc971b32d8ea32192ddc91ddb5c1201db24ba26a6db4c97c6f9b4923ad43fe32a07d0ff4a7e2439637fd26354899ca7f70b603eeb
MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-7.30.ebuild b/sci-geosciences/gpxsee/gpxsee-7.30.ebuild
new file mode 100644
index 000000000000..c5b1bd5f1e11
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.30.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en es fi fr hu nb pl pt_BR ru sv tr uk"
+inherit desktop qmake-utils l10n 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/qtwidgets:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+ rm_ts() {
+ sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+ }
+
+ l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+ lrelease gpxsee.pro
+ eqmake5 gpxsee.pro
+ emake
+}
+
+src_install() {
+ local lang
+ dobin ${PN}
+ dodoc README.md
+ insinto /usr/share/${PN}
+ doins -r pkg/maps pkg/csv
+
+ insinto /usr/share/${PN}/translations
+ for lang in lang/*.qm; do
+ [ -f "${lang}" ] && doins "${lang}"
+ done
+
+ domenu pkg/${PN}.desktop
+ insinto /usr/share/mime/packages
+ doins pkg/${PN}.xml
+ doicon icons/${PN}.png
+}
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index 6298318e9004..43740dc71754 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -1,9 +1,10 @@
AUX liblas-1.8.0_remove-std-c++98.patch 1141 BLAKE2B 880a1d478c16e680b45e1a064cef2c50d6c662ef1ca15c6beb6548d9dda056e19d2bc30fa87f067e566abf22d1c1b72496539f073d749878933c00bf7d099d8d SHA512 90defe2149a8cf8766022af6cf1248985c350e56bb9fcae99daf9551acf9272b93ea9b9c25ecef86803e75deb0ab50c2a0f919c35705d54ca38c7cafe5940f03
AUX liblas-1.8.1-CVE-2018-20540-fixup.patch 901 BLAKE2B 81f8a3e8ea076146ad8ec258e37d75c0e3a567b1304d1283dff0151cb0a7318a70816b1dbb1c3c46ed7798be47f8a3fca4add34940150f093549fe55553d1b0f SHA512 919e91732b91e2d9b3de2365291c7679e08dd2f3d5262a2fe026ef9360be2b367bd1f3822f7fc6cead04da58c3f454066bc4776282f66d268e06cddb3be65d4a
AUX liblas-1.8.1-CVE-2018-20540.patch 1628 BLAKE2B c62bf39a1dd73ec8b1d82d9c4ae499f902ce7c34d0dac20ac3fae58983048503fca393dabcae8206a5e3ef17680bfd627d2005928ce161c37073ecf4d90fb47d SHA512 549c4b29620519521bfbf3bbaa8c01c90e7bf7f7aca411822e2a846476e3cde14212049c95f51f1db981c2f4c65fd1ad1e9644691aebb9db2c4142a883a3c316
+AUX liblas-1.8.1-boost-1.73.patch 1448 BLAKE2B adddc5aacf2961fbfdcc3a8eb82cf197e861ced0a027672ff1de5c70255e7a27d582143f63e1ed3b6e100838c08667787e01a39f4b74ae9ec17dd31ce50e66a9 SHA512 e4a71a3a229c075b4657e8ccca44682b29545ceafe5e2cfb4cdcf096f1813765219cf784c036964affd14a877ae0da95c96ed83a1ad96669634dbf67468cc237
AUX liblas-1.8.1-fix-debug.patch 600 BLAKE2B 6e8f94881f49058bb835e9978640721db4ef7a2b3e5b5a6780455146896d03ed49dcb952cdcb68c85cb47411f3abdd1a84e31200e49a50f5bdcc888464f6d791 SHA512 6e0cbce9451c0496b04da852c7b113c5a3d0b060a15675290c92b85d8c03cd59216e7fbda5d1bfe6c2a157c7777fa9f0d380034df709b20a318432ee756a4f56
AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6
AUX liblas-1.8.1-gdal-2.5.0.patch 1052 BLAKE2B 8686e4c02fccd1d638f7fc006a42ff7a84964bc236d8283bba24355352e2ef62a43eb8f3a44105cce516886c81cff43fb5be1162d3009b6d00a5f47425f01099 SHA512 3c784cedd45bf7fcd96438e22c5b8d672f91bcf08ce891d14aa2d6f9324f6106f8948b3002e8ceddbe03a949569b7e0a97087883eef4e79724fd33fd33d2558f
DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
-EBUILD liblas-1.8.1-r3.ebuild 1331 BLAKE2B 195719248c3083ebbf3b4bcc054afbf904216b4980ab7db205739fc737032ac5bc86cb31eec11a43f52abd5392be4f640c4ea2246f3104fd56408567e9833d7f SHA512 6af1d59520f69d8d4c4649617bb00bd05cbb409b9d0b4e8b8af1b89fd9460038ca1838e4f545c130cde69b01899bf073f7621d260ce3f4190383ec822f020f80
+EBUILD liblas-1.8.1-r3.ebuild 1381 BLAKE2B c62ff8dd074ba7af4bbc3fc064faf2cfca45c45e31248880af9ccd8af12446cdd7b3aa277004a8d0699cf8bd1287777a3f144f68a34939deabab977718b7a52e SHA512 34712d0608891a4579a6e159dbb6d614fb564f17635f4c301ab133250341fab50097fa302ad4d0486d2ac3ce2a5e8f4809737f37e1e71512ef2ac56059c7754b
MISC metadata.xml 497 BLAKE2B cdae8ef4bfaffefd73a5751950379c704581e09a9f435fc52bac7520f3632fc37007d21750616a05060e2f9213a8ee05278c565be9b80ee8529ff9e5a6c07b6c SHA512 21d5b18461e131a543ba5a5ac1b2f06652d5d49ebd0e590f0bd0971deb337efeb813698613e4bbf200a934a3afa9b20dbb80d6659778c22c8a97d9471007d3d7
diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch b/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch
new file mode 100644
index 000000000000..288f207737bf
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch
@@ -0,0 +1,55 @@
+diff --git a/include/liblas/detail/binary.hpp b/include/liblas/detail/binary.hpp
+index d3116a1..ab20e06 100644
+--- a/include/liblas/detail/binary.hpp
++++ b/include/liblas/detail/binary.hpp
+@@ -17,6 +17,8 @@
+ #ifndef LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+ #define LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+
++#include <liblas/detail/endian.hpp>
++
+ #include <cassert>
+ #include <climits>
+ #include <cstring>
+@@ -25,7 +27,6 @@
+
+ #include <boost/config.hpp>
+ #include <boost/static_assert.hpp>
+-#include <boost/detail/endian.hpp>
+ #include <boost/type_traits/is_signed.hpp>
+
+ #if CHAR_BIT != 8
+@@ -43,7 +44,7 @@ namespace detail { namespace binary {
+ struct big_endian_tag {};
+ struct little_endian_tag {};
+
+-#ifdef BOOST_BIG_ENDIAN
++#ifdef LIBLAS_BIG_ENDIAN
+ typedef big_endian_tag native_endian_tag;
+ #else
+ typedef little_endian_tag native_endian_tag;
+diff --git a/src/c_api.cpp b/src/c_api.cpp
+index a70fe74..e8be785 100644
+--- a/src/c_api.cpp
++++ b/src/c_api.cpp
+@@ -96,6 +96,7 @@ using namespace liblas;
+ #endif
+
+ #include <boost/lambda/lambda.hpp>
++#include <boost/bind.hpp>
+
+ bool IsReprojectionTransform(liblas::TransformPtr const& p)
+ {
+diff --git a/src/header.cpp b/src/header.cpp
+index 9987ce1..a5c8f7d 100644
+--- a/src/header.cpp
++++ b/src/header.cpp
+@@ -54,7 +54,7 @@
+ // boost
+ #include <boost/cstdint.hpp>
+ #include <boost/lambda/lambda.hpp>
+-
++#include <boost/bind.hpp>
+ //std
+ #include <algorithm>
+ #include <fstream>
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
index 46930174cabd..cee50e9a5456 100644
--- a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}"/${P}-CVE-2018-20540.patch # bug 678482
"${FILESDIR}"/${P}-CVE-2018-20540-fixup.patch # bug 698846
"${FILESDIR}"/${P}-fix-debug.patch # bug 668778
+ "${FILESDIR}"/${P}-boost-1.73.patch # bug 722878
)
src_prepare() {
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index b7072f92d314..b751eab6ab70 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,5 +1,6 @@
AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d441948fdcf2b642971bdb3ea5fa2649bbe9827fdc50ab72ca77ea6f2c80d690794a9ea539bda91eea1ec34fc98ec073d49cf933002df68747 SHA512 5e2b1d4a8d4294785b59ea3631e7f086c2d52ab8752574872088ae4cb26c5b11851ab1c597a53012797b6ec7c5d9c1012037baf9cfc4135b06542365c5eb60c9
+AUX merkaartor-0.18.4-qt-5.15.patch 831 BLAKE2B c56bfa01bbfdc22aabc6d8686708c21e5c6530647dcca915af41db164db1af47975ad414b060715e5ff6cb29b9b636e68fca6cb9c0d0d2accdc23a1c2d239988 SHA512 ef27cdb17f3c96dbba8e572edfa0e15991950a4bf57ed17f9088b5e0593c1287c68bd907d6683cc2043ef25c4f0c71e084a01c9b7e3e1158fb1934060841a179
DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c
-EBUILD merkaartor-0.18.4.ebuild 2382 BLAKE2B d925b465b72cfbf34cfb589480d58da47f78403d37b13036014d1b9d736ab1f35aaf85609c2d5a3b721a9ce72666253417cdfbbab683967aa8233fde10860511 SHA512 77ee2d718b52c1f4c87a1063827482019911c1ab04468fd3e6849fe225b2dddfa69ced7594a3df2b9ed6f722f7422aee300775650bc8da79597cfdcd54a2daeb
+EBUILD merkaartor-0.18.4.ebuild 2430 BLAKE2B 12d16caabf19e1eb53eea8d95713f74fce41e50bcc2ec5c75f3a7544a96928504a033a9d1292093a4d0070da0a1eb9f6342f633515e465441433097f4713e4ea SHA512 15c98ac9b2173afbafabb255a5516634c77dbaf127d5233f94551165b69a8216c0cfd8a8abd64376d4a4a1375c4ea8c0bf20377046aadada96fe80c5edf90024
EBUILD merkaartor-9999.ebuild 2533 BLAKE2B 8962729b3afc4066cfcab4fe076845b919cc17ac725d7c24af1a9b0da7fa5dd23784e27d34fa4c6579a098ef60346e62b4042764a74cf51dd8d5746be5a7a1e1 SHA512 cf5fa7525b1de10b457c1ea28b8f21d3596773302308b2194674242eeabc50190c38111edf3acd54ab9852f4998b8c4c46e979f7ce7a2392fa2c3f8dd0826766
MISC metadata.xml 575 BLAKE2B d9a30a01f5b6c55e9a4865f6f1aa92ea610ad2f1aa9ab1bcb129dfbf03f9579fe7f3d8bdf604da0564b4d53b65d54b8c32f3628f1e8e389f6368d14cfca9997b SHA512 d9e5293c9bf7a3bfc7fd691d5a61c7de6c284941da73883590e4956bb4a7b26215e003a9096b9fdaa1f7590765aad583bec04ad6ec8778bc4a26a422a3e2da38
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch
new file mode 100644
index 000000000000..e14cda8b5bd6
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch
@@ -0,0 +1,29 @@
+From e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 14 Jun 2020 22:19:24 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/Features/Feature.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/Features/Feature.h b/src/Features/Feature.h
+index 52fd3044..f466a5a9 100644
+--- a/src/Features/Feature.h
++++ b/src/Features/Feature.h
+@@ -8,8 +8,10 @@ class Feature;
+ #include "MapView.h"
+ #include "FeaturePainter.h"
+
+-#include <QtCore/QString>
+ #include <QList>
++#include <QPainter>
++#include <QPainterPath>
++#include <QString>
+
+ #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x))
+ #define CAST_NODE(x) (dynamic_cast<Node*>(x))
+--
+2.27.0
+
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
index e5d0a17a1269..360d580f309d 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
@@ -39,7 +39,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # bug 621826
+ "${FILESDIR}"/${P}-qt-5.15.patch # bug 727914
+)
DOCS=( AUTHORS CHANGELOG )