diff options
Diffstat (limited to 'kde-plasma/discover')
| -rw-r--r-- | kde-plasma/discover/Manifest | 5 | ||||
| -rw-r--r-- | kde-plasma/discover/discover-6.0.90.ebuild (renamed from kde-plasma/discover/discover-6.0.5.ebuild) | 7 | ||||
| -rw-r--r-- | kde-plasma/discover/files/discover-6.0.90-fix-build-w-flatpak.patch | 36 |
3 files changed, 43 insertions, 5 deletions
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index 5f591b6db57a..311807f72a74 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,6 +1,7 @@ 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.5.tar.xz 1002416 BLAKE2B f7ec128c2fc38883fe74de35da89a34c4beb9cb76bfcbd7d4a2b79f7738b5666805a16b62ebf7e3570bda8a6d60c94caddccec37eabd893d4afbe742be1cb408 SHA512 0be89b2a20c1591021a9fc324679a48f7df0f0883ba1a5385d890b0f08e3add818fdeac4149e0106b0cafbfbce266ee455d9cc516dce2ddf38f5449ae98effb6 +DIST discover-6.0.90.tar.xz 1016296 BLAKE2B 9c66ee48bd97bb5ad6ada50a105dfd88dde6731930831821e17c75ac29e7ed5cd6c8666893e709edb6b2fbe09a8075120dafb7bc54e21e9ac9fb9d5b94fadad4 SHA512 f3bfd2bea30bb88ada38e86cd46e31bdb3d8cd688520e31d25cfc51c869dd89841da60e3b11ec09d9853b701f733e01bcfb3d480293915b5252bd2d0894e9f0d EBUILD discover-5.27.11.ebuild 2778 BLAKE2B e9561e7f177bf8d123f06201aa209c31f9e5a769872ec5cca265d437cf71fd1f2aa9fc30fca997e009883ae5b2e2cb1c62df7a7eab08ec20e6041f976e0da11a SHA512 a7296b8848de18084cccf8751434a8eb195bb808db8cb2577b7c2772b9758d32757d674bf53a3b52d210e41bae1abc5e904aedfe3d4e2b2fd86d9707b2f293b7 -EBUILD discover-6.0.5.ebuild 2738 BLAKE2B 247740ebdb16faf0baa24189cafd6abd2f67eeb594c2a7ff96afd4b9f094b7a612e32c7bce2d9f3ad3ac11c21212e6a263f6b1fcfa2eceb1e595c338624d5c12 SHA512 efa632e6747aef9f03e0a236512f3013669931e7b3b4a3a59e19175864e3a796df6c10c7168ee78baa744d0823b39ab5465b70b590ca8dff97fd93b18a78cd37 +EBUILD discover-6.0.90.ebuild 2794 BLAKE2B 433ad674379c608ee91f25eef7cc60d28575032fd28d3548337b422b4d17ff88088c8609a92d6d00eb00c1cc85f7a88e4f4ebff2dd9677306244812feb0c191e SHA512 08a88d77d83884a32c88f3e42ccbf9328a1ef5c005c9daa87c8a4c9ef166f1c836e4dae0dd17d651f51f57ee75bf9a234f9465d561c673b0d6c5a938cc1c77da MISC metadata.xml 845 BLAKE2B 87d892ce29180263400147d7a7b98e42093d613897bc09764b58e43712faff76bc13f0b9e09782faf6c6f8c78d02a555271159be54ccc5213241422931d43e65 SHA512 6fda677eb8dfe74813872cad68d234d7f272f7466f654b1d0a2725b6ceb6872f51887b5861f419cf5aeb09ffc593af230a923eafa22c0db9e1353b831a4a7187 diff --git a/kde-plasma/discover/discover-6.0.5.ebuild b/kde-plasma/discover/discover-6.0.90.ebuild index 7a4ff24ff1ed..e9090b60f5de 100644 --- a/kde-plasma/discover/discover-6.0.5.ebuild +++ b/kde-plasma/discover/discover-6.0.90.ebuild @@ -4,8 +4,8 @@ EAPI=8 ECM_TEST="true" -KFMIN=6.0 -QTMIN=6.6.2 +KFMIN=6.2.0 +QTMIN=6.7.1 inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma resources management GUI" @@ -31,6 +31,7 @@ DEPEND=" >=kde-frameworks/kcrash-${KFMIN}:6 >=kde-frameworks/kdbusaddons-${KFMIN}:6 >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 >=kde-frameworks/kidletime-${KFMIN}:6 >=kde-frameworks/kio-${KFMIN}:6 >=kde-frameworks/kirigami-${KFMIN}:6 @@ -51,7 +52,7 @@ RDEPEND="${DEPEND} " BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" -PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" ) +PATCHES=( "${FILESDIR}/${P}-fix-build-w-flatpak.patch" ) # KDE-bug 487404 src_prepare() { ecm_src_prepare 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 new file mode 100644 index 000000000000..e457401028c0 --- /dev/null +++ b/kde-plasma/discover/files/discover-6.0.90-fix-build-w-flatpak.patch @@ -0,0 +1,36 @@ +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 + |