gentoo auto-resync : 19:06:2024 - 00:09:54

3 files changed, 2 insertions, 41 deletions

diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 9e7a4ed09730..493146a3c7e7 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,7 +1,6 @@
 AUX discover-5.25.90-tests-optional.patch 3080 BLAKE2B 074ce41b4aee3fe8203f83fd63361189b78ddd4dc45a72a0d3e98a8ff50a92a463c680b93c7c7643e2bfc479e9374eda78148d41fed55c17035e751c0c584efa SHA512 bd82fe11d5ff1884c9457c655502831a3dab70ff172b5d49cdbdfa0cb6818735405ef1f4c519eaf46dd607bccf71077f11741cc11c85553f4e8f639125721767
-AUX discover-6.0.90-fix-build-w-flatpak.patch 1476 BLAKE2B 89bdc5691b469fdc388005168812093a680088d36fa88711cf1388605bace01183223e1065c1ffa87625077b4262dcef268b116fe732b293d8be7d41bfa4984c SHA512 14b668b519b1562dfc363f73def2b7c74e52b440f7e2e58136ed36fa96b3d8018fce268fb086add342972a0cabd3f81e1cd30a74625b810957ba010ebf400fc5
 DIST discover-5.27.11.tar.xz 881132 BLAKE2B 8f60d92745f38aef3a767f41c763d12fe07a915ea7f89ce03a37f1ed4bae1814081d08761be496e1020998a986650269f217eb6820a15b7bbb84aa056034ce60 SHA512 3393b99df506314420c18d2fbf05f7476dd86d4b27c1a153f5da4ebce03add63b0001194d1717b90d0f4bb34f106f34ed4f54f06bcdbf7aa3de492b94a470e37
-DIST discover-6.0.90.tar.xz 1016296 BLAKE2B 9c66ee48bd97bb5ad6ada50a105dfd88dde6731930831821e17c75ac29e7ed5cd6c8666893e709edb6b2fbe09a8075120dafb7bc54e21e9ac9fb9d5b94fadad4 SHA512 f3bfd2bea30bb88ada38e86cd46e31bdb3d8cd688520e31d25cfc51c869dd89841da60e3b11ec09d9853b701f733e01bcfb3d480293915b5252bd2d0894e9f0d
+DIST discover-6.1.0.tar.xz 1020224 BLAKE2B c3de0301853fc473f63b132fd14a6974ec3ffbc6f76b2f11f8c4513cc2973120e4af85b139cde48a1012262f00847f48913d27d93364d5e0b37ce24c33f3237e SHA512 d081b0f1ecf367d85a7f47b9ba4d2c0a1e0aaae5c3e861b746aa89501d72dff45e28e227e0ec3d7d6c72947cde4a8188c148b0044d1f3c6bb11398ef1118cebe
 EBUILD discover-5.27.11.ebuild 2778 BLAKE2B e9561e7f177bf8d123f06201aa209c31f9e5a769872ec5cca265d437cf71fd1f2aa9fc30fca997e009883ae5b2e2cb1c62df7a7eab08ec20e6041f976e0da11a SHA512 a7296b8848de18084cccf8751434a8eb195bb808db8cb2577b7c2772b9758d32757d674bf53a3b52d210e41bae1abc5e904aedfe3d4e2b2fd86d9707b2f293b7
-EBUILD discover-6.0.90-r1.ebuild 2794 BLAKE2B c393ea66ef8f0a8c1bff1eab7f438ccfd45fea98f4ab7726f35741e1d14bce12fc6262d5f945b7c11ef0fa8944db7aeaaf62f37cd2629c6ed2fcbd33051cffbd SHA512 554573f0a3954c1e90f2cc18e728ff568d79652683c13aa8c5603a3a8c1cc2c0784ac3a654f6eed5fbec3d5ae5ec8aae24ed2653adfffc7ce30bd3e2e57692e6
+EBUILD discover-6.1.0.ebuild 2719 BLAKE2B 30d00d06ce2c99e51ed9b3395583d619d186109961abaa2e0451838adabc740bc98d365929622a486fd91cf66a0943439d661787fd1da981788b434b18a0eb4a SHA512 e36b9f0f2037d179392c5fac0558a9659c680b07d0a3922c89c374823db59283d96e3c98d0e579a19d5ef2a07e948a486935b943e9ac7524d1af2dd559e01b31
 MISC metadata.xml 845 BLAKE2B 87d892ce29180263400147d7a7b98e42093d613897bc09764b58e43712faff76bc13f0b9e09782faf6c6f8c78d02a555271159be54ccc5213241422931d43e65 SHA512 6fda677eb8dfe74813872cad68d234d7f272f7466f654b1d0a2725b6ceb6872f51887b5861f419cf5aeb09ffc593af230a923eafa22c0db9e1353b831a4a7187
diff --git a/kde-plasma/discover/discover-6.0.90-r1.ebuild b/kde-plasma/discover/discover-6.1.0.ebuild
index 710b1f6f0bfe..06d46c861821 100644
--- a/kde-plasma/discover/discover-6.0.90-r1.ebuild
+++ b/kde-plasma/discover/discover-6.1.0.ebuild
@@ -52,8 +52,6 @@ RDEPEND="${DEPEND}
 "
 BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
 
-PATCHES=( "${FILESDIR}/${P}-fix-build-w-flatpak.patch" ) # KDE-bug 487404
-
 src_prepare() {
 	ecm_src_prepare
 	# we don't need it with PackageKitBackend off
diff --git a/kde-plasma/discover/files/discover-6.0.90-fix-build-w-flatpak.patch b/kde-plasma/discover/files/discover-6.0.90-fix-build-w-flatpak.patch
deleted file mode 100644
index e457401028c0..000000000000
--- a/kde-plasma/discover/files/discover-6.0.90-fix-build-w-flatpak.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a9ec35c48ee121e05213c447a3f3e676675a1b5e Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Sat, 25 May 2024 01:17:35 +0200
-Subject: [PATCH] flatpak: Allow building with flatpaks older than 1.15
-
-It's still fresh and not even considered stable
----
- .../backends/FlatpakBackend/FlatpakTransactionThread.cpp     | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.cpp b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.cpp
-index 4211f30a38..7749187c7d 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.cpp
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.cpp
-@@ -393,6 +393,7 @@ bool FlatpakTransactionThread::end_of_lifed_with_rebase(const char *remote,
-                                                         const char *rebased_to_ref,
-                                                         const char **previous_ids)
- {
-+#if FLATPAK_CHECK_VERSION(1, 15, 0)
-     QMutexLocker lock(&m_proceedMutex);
- 
-     if (QString::fromUtf8(rebased_to_ref).startsWith("runtime/"_L1)) {
-@@ -421,6 +422,10 @@ bool FlatpakTransactionThread::end_of_lifed_with_rebase(const char *remote,
-         return false;
-     }
-     return m_proceed;
-+#else
-+    Q_EMIT passiveMessage(i18n("Could not update %1, %2", QString::fromLatin1(ref), QString::fromLatin1(reason)));
-+    return false;
-+#endif
- }
- 
- void FlatpakTransactionThread::proceed()
--- 
-GitLab
-