gentoo auto-resync : 02:10:2024 - 01:26:10

4 files changed, 69 insertions, 21 deletions

diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 4963539ec649..9a40812dacda 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,6 +1,6 @@
-AUX dbus.patch 673 BLAKE2B 5d624093856dc17fa576b7603eb04d70a652dfe187dfc022d10c3048da875901bf65d32d3358f42ca748f256469823fe31fa8570a9782182c6f0343baef41cb0 SHA512 38c9ad76acdcc1b95ac4a3b4e067e9ff7127f55d83e67bd45fb0f8049a59c2bb6c1c3cb2ec42826403996de2f26afb95a9c8b1e1a0015a941f9b7ff364454d88
+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_p600.tar.gz 56720384 BLAKE2B 0a76b90273838898c74d6fcf81de0903cd24c294e5ccb7333cdc478b22f01bb771bcc155683c27e0310b018b2c47cf23235b3cd65b81779f97104e389b79450b SHA512 05729eddaca0fd845490eb56e0a0c4ed6d3a721433c24c3e8a6a424a2d6dbb6f9a16dfc8babe4a4ae1b48d8215f586654b1385f748ee8497d629ecdbe4fae2f9
+DIST qmapshack-1.17.1_p601.tar.gz 56720740 BLAKE2B 7fd8232e0c5b693d565897dff90ac6c6012918f2739d9cbfa48e7629e3a905609f47b9665d1a7666a131da64739a499a54f9959d275ab4c7f013db0e83d9760a SHA512 9378e1d42a6217cbf169fc67476765f6700886b59518a1c800c5a639b2822e8116cabaac28c147f3a52014bb2393deb1a8e8b7b9c4112f1990361d0376530c80
 EBUILD qmapshack-1.17.1.ebuild 974 BLAKE2B 7ad2c6158aca5ad05afa5118ab0d868ac81b1bb4c43c4cb4195f1ca43ef8aa2e201e3eeb11e1072c901a5f19be5d1a338cba1311bfc7b4cadf70580de5deb7d0 SHA512 e73cd171b4db592739fa2c9d8f4b028c97fd2864e781cc30291354d5b88c6b3359286f120babca4d586aeb0a548abc71559906e6ee2cd2f81c2a08bde89db850
-EBUILD qmapshack-1.17.1_p600-r2.ebuild 1250 BLAKE2B d0f4540df82716b3df8e481ef8bcd5b56e11377120f33c42950593cda3cf8e91c52313166376b261a67009864c46ca4dd66c2ad4dcbfd0ce7f46c751faaa23da SHA512 2cac05a0e0a43d425b1cd6a9f8f3f950001663cbed96e3df2cbe2bb1cab51b0d92c4d40f0a61c29b099a2afbdf64ac361c65ccda49949b7786fa604eac245b27
+EBUILD qmapshack-1.17.1_p601.ebuild 1254 BLAKE2B 0e02b4708e2e579f9e5f475b1651a39cfc5e4aa45a8acf3a87026f48769767dfd6ca0e0f68f34e4cdfd64da0fb53958046f1e1f8e182309d0c6e206f3c3f57c2 SHA512 9428eac70fac6a005fb78a53126e0cd0f6af332df5581e24c579660353c2d6aad37f287a4a902be4d20b01d28f637bc08ec9cbde333c7e88871101c2e7a9773d
 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
new file mode 100644
index 000000000000..0ab4294f63ad
--- /dev/null
+++ b/sci-geosciences/qmapshack/files/dbus-r1.patch
@@ -0,0 +1,63 @@
+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/files/dbus.patch b/sci-geosciences/qmapshack/files/dbus.patch
deleted file mode 100644
index 39018124d64e..000000000000
--- a/sci-geosciences/qmapshack/files/dbus.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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-r2.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild
index c97e39c4ae0f..d8473b11f33a 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.17.1_p600-r2.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild
@@ -7,8 +7,8 @@ inherit cmake xdg
 
 DESCRIPTION="GPS mapping utility"
 HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
-COMMIT="1f009ac0be1d1c2a4c31aa1283f4009e88685d34"
-SRC_URI="https://github.com/kiozen/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+COMMIT="b53959a305587f0a7f2330b99267b3b24abb76f4"
+SRC_URI="https://github.com/Maproom/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${COMMIT}
 LICENSE="GPL-3+"
 SLOT="0"
@@ -31,7 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/qttools:6[linguist]"
 
-PATCHES=( "${FILESDIR}"/dbus.patch )
+PATCHES=( "${FILESDIR}"/dbus-r1.patch )
 
 src_configure() {
 	local mycmakeargs=( -DUSE_QT6DBus=$(usex dbus) )