diff options
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/Manifest.gz | bin | 7717 -> 7715 bytes | |||
-rw-r--r-- | sci-geosciences/qmapshack/Manifest | 5 | ||||
-rw-r--r-- | sci-geosciences/qmapshack/files/dbus-r1.patch | 63 | ||||
-rw-r--r-- | sci-geosciences/qmapshack/qmapshack-1.17.1_p602.ebuild (renamed from sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild) | 6 |
4 files changed, 4 insertions, 70 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex 635eac9229e8..ca6380d5b5d5 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index fe6827d0da22..ab32f830dc5c 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,6 +1,5 @@ -AUX dbus-r1.patch 1778 BLAKE2B 94515e2418d13a72479d4517316c915f11694e2176acdbebbb410fce9dd23a414deceace0b348d0026a9c638889dc08e695b9a448d33b301b57d446119481f9e SHA512 add33ab9744d6552d5500530a88771bb89c09434f8d10573398e63cc3805f5ff0dbb5da19c5bca3d50ffe36dca4ea1ab00dcd755e49df26848d66eed9fcb9d18 DIST qmapshack-1.17.1.tar.gz 56704889 BLAKE2B 1fda3f9874f39eb6b7a0c71ac7b681ebc0f6ea7ae2eefae2b6de4d780556fc5aee45aff230bebcf6ba025959beccffe14a59002fd9552b339892956d2fdd5c50 SHA512 79bdeb59e366cefb2d2a6c9bd084760b5935c93f385a6f2d26bdd25bb4af6939003decc4659afd1567a3b6698a0048e5c79baa716139fc20a96cc0e8dc206d9c -DIST qmapshack-1.17.1_p601.tar.gz 56720740 BLAKE2B 7fd8232e0c5b693d565897dff90ac6c6012918f2739d9cbfa48e7629e3a905609f47b9665d1a7666a131da64739a499a54f9959d275ab4c7f013db0e83d9760a SHA512 9378e1d42a6217cbf169fc67476765f6700886b59518a1c800c5a639b2822e8116cabaac28c147f3a52014bb2393deb1a8e8b7b9c4112f1990361d0376530c80 +DIST qmapshack-1.17.1_p602.tar.gz 56718904 BLAKE2B 1ff2176373201b77f232a6158d853dce1916137f524b05cfd3703314425a293c09a776c417f092b7fda60fd417476736ddaea0e756349fe27e8da38e511ab55d SHA512 3620e3a2f9f5bd3e251779116539bbc6d7bdeb5b25c99df68ee5c6922d31eb3de1019ef02297db92690edba78204c48f163f4223a5f1e0b11c8603a3756d8b17 EBUILD qmapshack-1.17.1.ebuild 969 BLAKE2B c493f1a1c94a3a4f09e8653e9f6c16ad50a44bfe05194d6f4a5518c1855841503dee1326e8dfbbb4ebc93f959ce343dfc100476bb42609b26874da4c5bdaddc4 SHA512 1219fdc5c23217295f31393347e047198dd803f8691686821ed69f7bb56c2bbdc2ded947c5a74a1114d84efe2b1450f507f77a7d109cdd1ba069b39f99f82f95 -EBUILD qmapshack-1.17.1_p601.ebuild 1249 BLAKE2B e41696112d560b226665b81b513cb379f64eafdff2685b8a31e96bf09b7a55b27e754840906c4be06c8a9d38213595de729176ec12c5be1b1c502e9330e774db SHA512 2352fbb61601867b5aab107d1835ab410f22dcc3b6f25a2ddcc264d6fe978a50a6ed604f85989538df12e42b9b1381f24d5a20654bfce3d519d2dc6bef5678a7 +EBUILD qmapshack-1.17.1_p602.ebuild 1208 BLAKE2B e62f88aa6a59473ec95090cdfde7d44401910050df9bdd51cd733de53536bfc5ed12574116dcef9d9042663b0dbc2872a812e258ff234ad478cc6cd28efcdb7d SHA512 ea7447154c8ff7d070e479fc1c1234806624f515366ecd642b734ee599d172809e43afa9caa12183e45bf231016c5ea36d7096e885708c904c4af28918ec2078 MISC metadata.xml 834 BLAKE2B af7dac2c7ce98d1a40e993e51e646fdadb328515d1aa1e3e8c508e30f47ae1bc25e71ddb774b7ab65126f4644e119aa2be1a01c075c783fcd5f5fa2d06f23e75 SHA512 8e6e2d99a1ed77eee5b511901c190b8e9b2dc12e9a83525463cb96db811cda03c4a7dc3bd6fe7bc83dff93bd5d202ac7a66f69f350f7ac0773a6e894e6b64a85 diff --git a/sci-geosciences/qmapshack/files/dbus-r1.patch b/sci-geosciences/qmapshack/files/dbus-r1.patch deleted file mode 100644 index 0ab4294f63ad..000000000000 --- a/sci-geosciences/qmapshack/files/dbus-r1.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff '--color=auto' -ur qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/CMakeLists.txt qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/CMakeLists.txt ---- qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/CMakeLists.txt 2024-09-30 20:02:57.701618381 +0200 -+++ qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/CMakeLists.txt 2024-09-30 20:05:59.159600329 +0200 -@@ -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 '--color=auto' -ur qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/src/qmapshack/CMakeLists.txt qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/src/qmapshack/CMakeLists.txt ---- qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/src/qmapshack/CMakeLists.txt 2024-09-30 20:02:57.687618460 +0200 -+++ qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/src/qmapshack/CMakeLists.txt 2024-09-30 20:06:51.470306845 +0200 -@@ -368,12 +368,12 @@ - ) - - --if(Qt5DBus_FOUND) -+if(Qt6DBus_FOUND) - set( SRCS - ${SRCS} - device/CDeviceWatcherLinux.cpp - ) --endif(Qt5DBus_FOUND) -+endif(Qt6DBus_FOUND) - - - if (APPLE) -@@ -746,12 +746,12 @@ - ) - - --if(Qt5DBus_FOUND) -+if(Qt6DBus_FOUND) - set( HDRS - ${HDRS} - device/CDeviceWatcherLinux.h - ) --endif(Qt5DBus_FOUND) -+endif(Qt6DBus_FOUND) - - - if(APPLE) -@@ -977,11 +977,11 @@ - ) - endif(${DEVELOPMENT_VERSION}) - --if(Qt5DBus_FOUND) -+if(Qt6DBus_FOUND) - set(DBUS_LIB Qt6::DBus) --else(Qt5DBus_FOUND) -+else(Qt6DBus_FOUND) - set(DBUS_LIB) --endif(Qt5DBus_FOUND) -+endif(Qt6DBus_FOUND) - - target_link_libraries(${APPLICATION_NAME} - Qt6::Widgets diff --git a/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1_p602.ebuild index 656f6b3977ce..e1c1be1c79ab 100644 --- a/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild +++ b/sci-geosciences/qmapshack/qmapshack-1.17.1_p602.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit cmake xdg DESCRIPTION="GPS mapping utility" HOMEPAGE="https://github.com/Maproom/qmapshack/wiki" -COMMIT="b53959a305587f0a7f2330b99267b3b24abb76f4" +COMMIT="23d6fe3e11bd251f123fdba1f1cf2ac8170d4f83" SRC_URI="https://github.com/Maproom/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/${PN}-${COMMIT} LICENSE="GPL-3+" @@ -31,8 +31,6 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="dev-qt/qttools:6[linguist]" -PATCHES=( "${FILESDIR}"/dbus-r1.patch ) - src_configure() { local mycmakeargs=( -DUSE_QT6DBus=$(usex dbus) ) cmake_src_configure |