summaryrefslogtreecommitdiff
path: root/sci-geosciences
diff options
context:
space:
mode:
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/Manifest.gzbin11596 -> 11588 bytes
-rw-r--r--sci-geosciences/josm-bin/Manifest2
-rw-r--r--sci-geosciences/josm-bin/josm-bin-19128.ebuild37
-rw-r--r--sci-geosciences/qmapshack/Manifest3
-rw-r--r--sci-geosciences/qmapshack/files/dbus.patch15
-rw-r--r--sci-geosciences/qmapshack/qmapshack-1.17.1_p600-r2.ebuild (renamed from sci-geosciences/qmapshack/qmapshack-1.17.1_p600-r1.ebuild)19
6 files changed, 31 insertions, 45 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 1bf751ce6945..eb342d200a76 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
Binary files differ
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index e8c5630e51d0..b47075f1d4df 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,7 +1,5 @@
-DIST josm-snapshot-19128.jar 18376543 BLAKE2B 055d652eccfe820a7e793190dab69fb39a5961d147996a6d8bb51518d3f91df6de6989547cfbb10e7c20db86abe1bfeda800a873bd26f5d92d896a2ee8c51829 SHA512 d21f3d4bccc4a0e83c5c65fba195af2490d7f1751dcd1b3d542c69ee2edce0a99881c21b52bd7d9aed5848a667542a4e67a6dcb8a701b74531a57c75ae23dd3f
DIST josm-snapshot-19160.jar 18236258 BLAKE2B c0650ed766476aca4ff05fc07e1630e8a524f01a3c154233e4fba76db2998a7b18b18618815c6c44c091409f3dd922cbda61ea801974e0103adbfcb7e11bf378 SHA512 a8ba54e729b3699b0a380087ba1986cfd4061380c6fe2554e950751cf4a41803c1c92b480b93b0e17a41aedf789047f67494ef0a2495b9f360963a4f9508137a
DIST josm-snapshot-19207.jar 18348268 BLAKE2B 35d8a35b6f2ba4553784d44c6928b2d179d82fae65a98c71c859fd7bb8ce5a26510cfa784318b83f21c38e944685fec2e83e3138f5c7a6cf47229e505ab80ad3 SHA512 7de9b9f4a70cd3b4788254d4b1ab979df311362671d47ec53d8abf5324b32ecb8577ffc1b7619d51df8f8e901cbd4710bfa25e01cba3d8495fd741e53a7966af
-EBUILD josm-bin-19128.ebuild 1193 BLAKE2B 72ac4adcb57a503336c4ef0b309b015de45b57c7598a67fbc05231f7ee9d2dce71b53ae8d57477350718251a0028df2eb9a83390ad04fa9c9e88388b41148065 SHA512 160da9353ea4dfed9e7b42e2c7e9b4972ad74a7dd1edc5bb8cc7be44dfae11822ab690055c3b8ad00c95276735ba2a0770ad600eb59cc590a631d702cf701781
EBUILD josm-bin-19160.ebuild 1193 BLAKE2B 72ac4adcb57a503336c4ef0b309b015de45b57c7598a67fbc05231f7ee9d2dce71b53ae8d57477350718251a0028df2eb9a83390ad04fa9c9e88388b41148065 SHA512 160da9353ea4dfed9e7b42e2c7e9b4972ad74a7dd1edc5bb8cc7be44dfae11822ab690055c3b8ad00c95276735ba2a0770ad600eb59cc590a631d702cf701781
EBUILD josm-bin-19207.ebuild 1194 BLAKE2B 4d3baae83ce1ec9b343eaf3223cfa0f0dc15fb32674a50ca13eac19f64c906d9d3bdcf5f494d2bfd9c985a32db6e23e838d4fd992233040714ddcd7a8b2487b2 SHA512 3824da326ecef5d2a7faad42ba89061dcb5d00f12387b42c3ad46a8647b1a9a23e33c4a7298e5a7b9bea6a46926da96b428af81eb07fcd2525369620361d7a5c
MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-19128.ebuild b/sci-geosciences/josm-bin/josm-bin-19128.ebuild
deleted file mode 100644
index 3c2c192c743d..000000000000
--- a/sci-geosciences/josm-bin/josm-bin-19128.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop java-utils-2 xdg
-
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="https://josm.openstreetmap.de/"
-# PV should be stable here https://josm.openstreetmap.de/wiki/StartupPage
-SRC_URI="https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0 GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8"
-BDEPEND="app-arch/unzip"
-
-src_install() {
- java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar
- java-pkg_dolauncher ${PN} --jar ${PN}.jar \
- --java_args "\
- --add-exports=java.base/sun.security.action=ALL-UNNAMED \
- --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED \
- --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"
-
- local icon_size
- for icon_size in 16 32 48; do
- newicon -s ${icon_size} -t hicolor \
- images/logo_${icon_size}x${icon_size}x32.png ${PN}.png
- newicon -s ${icon_size} -t locolor \
- images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
- done
- make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
-}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index d34b184cc016..4963539ec649 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,5 +1,6 @@
+AUX dbus.patch 673 BLAKE2B 5d624093856dc17fa576b7603eb04d70a652dfe187dfc022d10c3048da875901bf65d32d3358f42ca748f256469823fe31fa8570a9782182c6f0343baef41cb0 SHA512 38c9ad76acdcc1b95ac4a3b4e067e9ff7127f55d83e67bd45fb0f8049a59c2bb6c1c3cb2ec42826403996de2f26afb95a9c8b1e1a0015a941f9b7ff364454d88
DIST qmapshack-1.17.1.tar.gz 56704889 BLAKE2B 1fda3f9874f39eb6b7a0c71ac7b681ebc0f6ea7ae2eefae2b6de4d780556fc5aee45aff230bebcf6ba025959beccffe14a59002fd9552b339892956d2fdd5c50 SHA512 79bdeb59e366cefb2d2a6c9bd084760b5935c93f385a6f2d26bdd25bb4af6939003decc4659afd1567a3b6698a0048e5c79baa716139fc20a96cc0e8dc206d9c
DIST qmapshack-1.17.1_p600.tar.gz 56720384 BLAKE2B 0a76b90273838898c74d6fcf81de0903cd24c294e5ccb7333cdc478b22f01bb771bcc155683c27e0310b018b2c47cf23235b3cd65b81779f97104e389b79450b SHA512 05729eddaca0fd845490eb56e0a0c4ed6d3a721433c24c3e8a6a424a2d6dbb6f9a16dfc8babe4a4ae1b48d8215f586654b1385f748ee8497d629ecdbe4fae2f9
EBUILD qmapshack-1.17.1.ebuild 974 BLAKE2B 7ad2c6158aca5ad05afa5118ab0d868ac81b1bb4c43c4cb4195f1ca43ef8aa2e201e3eeb11e1072c901a5f19be5d1a338cba1311bfc7b4cadf70580de5deb7d0 SHA512 e73cd171b4db592739fa2c9d8f4b028c97fd2864e781cc30291354d5b88c6b3359286f120babca4d586aeb0a548abc71559906e6ee2cd2f81c2a08bde89db850
-EBUILD qmapshack-1.17.1_p600-r1.ebuild 1101 BLAKE2B 0ba2790aaf9432faa31c8825e33773d70c95c6ff15c92179b8c12b375853f09d8d35f5571b5634bd47828b4a04f475cc829471e2e17a55241f496d7da5b5ee93 SHA512 fc139b4c86996d3a8dd619ab4bcb5e361a28ea20f3ea80f1ae9c66ecadad834780fc8caecbb83f293d9bc86b253bc8b1a58401a2a0956c000f4b6798534579cc
+EBUILD qmapshack-1.17.1_p600-r2.ebuild 1250 BLAKE2B d0f4540df82716b3df8e481ef8bcd5b56e11377120f33c42950593cda3cf8e91c52313166376b261a67009864c46ca4dd66c2ad4dcbfd0ce7f46c751faaa23da SHA512 2cac05a0e0a43d425b1cd6a9f8f3f950001663cbed96e3df2cbe2bb1cab51b0d92c4d40f0a61c29b099a2afbdf64ac361c65ccda49949b7786fa604eac245b27
MISC metadata.xml 834 BLAKE2B af7dac2c7ce98d1a40e993e51e646fdadb328515d1aa1e3e8c508e30f47ae1bc25e71ddb774b7ab65126f4644e119aa2be1a01c075c783fcd5f5fa2d06f23e75 SHA512 8e6e2d99a1ed77eee5b511901c190b8e9b2dc12e9a83525463cb96db811cda03c4a7dc3bd6fe7bc83dff93bd5d202ac7a66f69f350f7ac0773a6e894e6b64a85
diff --git a/sci-geosciences/qmapshack/files/dbus.patch b/sci-geosciences/qmapshack/files/dbus.patch
new file mode 100644
index 000000000000..39018124d64e
--- /dev/null
+++ b/sci-geosciences/qmapshack/files/dbus.patch
@@ -0,0 +1,15 @@
+diff '--color=auto' -U3 -r qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/CMakeLists.txt qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/CMakeLists.txt
+--- qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/CMakeLists.txt 2024-09-04 18:48:55.000000000 +0700
++++ qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/CMakeLists.txt 2024-09-23 22:32:02.157927751 +0700
+@@ -200,9 +200,9 @@
+
+ if(USE_QT6DBus)
+ find_package(Qt6DBus REQUIRED)
+- if(Qt5DBus_FOUND)
++ if(Qt6DBus_FOUND)
+ add_definitions(-DHAVE_DBUS)
+- endif(Qt5DBus_FOUND)
++ endif(Qt6DBus_FOUND)
+ endif(USE_QT6DBus)
+
+ # Everything included. Let's finetune the mess a bit more
diff --git a/sci-geosciences/qmapshack/qmapshack-1.17.1_p600-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1_p600-r2.ebuild
index c884821ce0d6..c97e39c4ae0f 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.17.1_p600-r1.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.17.1_p600-r2.ebuild
@@ -10,24 +10,33 @@ HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
COMMIT="1f009ac0be1d1c2a4c31aa1283f4009e88685d34"
SRC_URI="https://github.com/kiozen/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}"/${PN}-${COMMIT}
-
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
RDEPEND="
dev-db/sqlite
>=dev-libs/quazip-1.3:0=[qt6]
- dev-qt/qt5compat:6[icu,qml]
- dev-qt/qtbase[dbus,gui,icu,network,opengl,sql,widgets,xml]
- dev-qt/qttools:6[assistant,linguist,opengl,qdbus,qml,widgets,zstd]
- dev-qt/qtwebengine:6[qml,widgets]
+ dev-qt/qt5compat:6
+ dev-qt/qtbase:6[dbus,gui,network,sql,widgets,xml]
+ dev-qt/qtdeclarative:6
+ dev-qt/qttools:6[assistant,widgets]
+ dev-qt/qtwebengine:6[widgets]
sci-geosciences/routino
sci-libs/alglib
sci-libs/gdal:=
sci-libs/proj:=
"
DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+PATCHES=( "${FILESDIR}"/dbus.patch )
+
+src_configure() {
+ local mycmakeargs=( -DUSE_QT6DBus=$(usex dbus) )
+ cmake_src_configure
+}
src_install() {
docompress -x /usr/share/doc/${PF}/html
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-18 11:16:45 +0000