diff options
Diffstat (limited to 'kde-plasma/libksysguard')
| -rw-r--r-- | kde-plasma/libksysguard/Manifest | 3 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/files/libksysguard-5.27.7-sensors-correctly-handle-return-val.patch | 36 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/libksysguard-5.27.7-r1.ebuild (renamed from kde-plasma/libksysguard/libksysguard-5.27.7.ebuild) | 7 |
3 files changed, 43 insertions, 3 deletions
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index 01f60d95134e..1e65439daeb4 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,6 +1,7 @@ AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f46cb60f1423523eb53ed564b2d0d8d6ab0429851f1e73e1aef844cbdcb23cfa70c4b0aac125587caa924fed50da94c5cb8de49d5f215fd38c03a SHA512 281b047e7f7e4d3a8e8d5ca9247dd4aca538cb13d1ff3e35303c059187140586233cff1b7c50caf5f289f9e4f63a2f57421ff0389cbbb50ad3f408a2addb396b +AUX libksysguard-5.27.7-sensors-correctly-handle-return-val.patch 1235 BLAKE2B 238d7760c4d320f4b3a2d2b5f319d5f7a7eaaad54d0e4036dad903fb2e1e9e58d9c6956474bef3d1d400ad68e87c72021ce19808b83e4a7dabd719ff556140bd SHA512 5adf3788d2bf3ef78da57fe394d74a8e3100a62ecbd5fa90b3c946180ef9dd1a06ed830a8ea64eb911263d35c344464b78a8cacc8d5041973b4917582997513b DIST libksysguard-5.27.6.tar.xz 878196 BLAKE2B 892c1a797622a337b7790fdd0dac2439d0941454b7d149f8770878847c9e9781a47de578906b739cefded53ec5b76103e287ddd7d71b89f67e692e070e0ebe13 SHA512 06f059baf7ae7e283b31a052cccf91a2982ddea4de1490da69de46709c4ccbdb1eae972408751045806a1e67e4dc4c945131d2006f7d69fc5af64d73a22113cd DIST libksysguard-5.27.7.tar.xz 880568 BLAKE2B 0600dc903603a8e18f61cf89bc42fa8a7bd7d2bba8df7c08f1c16231d9b5611e38cba5d5e3d02d424581103127334192428e98525b24d1f6baf183b5a0165aca SHA512 928afc2dd38dac8e8b94d2293eb7121ca9fa60f7707b969977a56d98db833af6dd1f26d7f1f726fd5c2b3f328d9357ce93751db735668d8b31002a8e476d6627 EBUILD libksysguard-5.27.6.ebuild 1861 BLAKE2B 010845b967364f32da7253f4e3a35042c18b65995946f0a3d01b9ac0697d0cadb1f7749684556924dc67008df164fdb0b98385354fa2cdc58fe411f351afe75b SHA512 dae4c03f1d262f6f12b02c18b6093caf1695e1ffe934b8318c9eee05a0ae060cf7e02e656e8b1a2374013cbee8beb7a9994f6b840f9e48fe6e8817f409e12d5b -EBUILD libksysguard-5.27.7.ebuild 1864 BLAKE2B 229f22ebb538686b0a48aa4035d027d1e817dfcf385a44664552c3f4700544707d733a6693706bbca4932679d67d17b5b6c6736bb6b9b6186ea6e378abc762aa SHA512 0b29018ca622242a7cd4faeceff2ddc6880f7640456221d4992caf52a25c59e85f01b1dd69741d8e1a1f8233526f69f4d3673656604763c1f99ecf8cc665e80f +EBUILD libksysguard-5.27.7-r1.ebuild 1953 BLAKE2B 5f31f770e10e768147ef7477876659750e765889bebed3d0d093039af6881d4e91b1fa9dfe9868699a4ff514094310480216c38d0474f2954fdebaf1d058a86c SHA512 db688e9da9634961b3662d8e9948ab1f531803a259767556d021b431cea9e107dff27e41008144dd76fc9005c03f74d1b3495a7ff2b1def8713dfb1164e9f862 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302 diff --git a/kde-plasma/libksysguard/files/libksysguard-5.27.7-sensors-correctly-handle-return-val.patch b/kde-plasma/libksysguard/files/libksysguard-5.27.7-sensors-correctly-handle-return-val.patch new file mode 100644 index 000000000000..599648228272 --- /dev/null +++ b/kde-plasma/libksysguard/files/libksysguard-5.27.7-sensors-correctly-handle-return-val.patch @@ -0,0 +1,36 @@ +From bf2685a3628f213e930743676a6d713e630c6a59 Mon Sep 17 00:00:00 2001 +From: Maciej Stanczew <maciej.stanczew@gmail.com> +Date: Sun, 6 Aug 2023 20:23:01 +0200 +Subject: [PATCH] sensors: Correctly handle the return value of + QCollator::compare + +QCollator::compare() can return any integer, not just [-1, 0, 1]. +Comparing the result with -1 happened to work with most locales, +but it broke with the C locale. As a result, when sensors were put +into std::map, they were sometimes erroneously treated as duplicates, +leading to a randomly incomplete and garbled sensor list. + +BUG: 461070 + + +(cherry picked from commit 0a7efca4b331eb9619a2a88fe9093cbbbd351b6e) +--- + sensors/SensorTreeModel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sensors/SensorTreeModel.cpp b/sensors/SensorTreeModel.cpp +index 6f318035..8487730b 100644 +--- a/sensors/SensorTreeModel.cpp ++++ b/sensors/SensorTreeModel.cpp +@@ -44,7 +44,7 @@ struct Compare { + collator->setCaseSensitivity(Qt::CaseInsensitive); + } + +- return collator->compare(first, second) == -1; ++ return collator->compare(first, second) < 0; + } + + // This uses thread-local storage because QCollator may not be thread safe. +-- +GitLab + diff --git a/kde-plasma/libksysguard/libksysguard-5.27.7.ebuild b/kde-plasma/libksysguard/libksysguard-5.27.7-r1.ebuild index 69923cad9b11..7d102918a2db 100644 --- a/kde-plasma/libksysguard/libksysguard-5.27.7.ebuild +++ b/kde-plasma/libksysguard/libksysguard-5.27.7-r1.ebuild @@ -55,8 +55,11 @@ RDEPEND="${COMMON_DEPEND} !<kde-plasma/ksysguard-5.21.90:5 " -# downstream patch -PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" ) +PATCHES=( + # downstream patch + "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" + "${FILESDIR}/${P}-sensors-correctly-handle-return-val.patch" # KDE-bug 461070, 5.27.8 +) src_configure() { local mycmakeargs=( |