From 1503b28e7a30c164cab750c27268f704b8a5cec6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 26 Jul 2022 14:59:08 +0100 Subject: gentoo auto-resync : 26:07:2022 - 14:59:07 --- kde-frameworks/Manifest.gz | Bin 13725 -> 13735 bytes kde-frameworks/kio/Manifest | 2 + .../kio-5.96.0-fix-RAW-file-image-preview.patch | 37 ++++++++ kde-frameworks/kio/kio-5.96.0-r2.ebuild | 99 +++++++++++++++++++++ kde-frameworks/kirigami/Manifest | 2 + kde-frameworks/kirigami/kirigami-5.96.0-r1.ebuild | 47 ++++++++++ kde-frameworks/kjobwidgets/Manifest | 2 + .../kjobwidgets-5.96.0-fix-ui-server-crash.patch | 82 +++++++++++++++++ .../kjobwidgets/kjobwidgets-5.96.0-r1.ebuild | 42 +++++++++ kde-frameworks/plasma/Manifest | 2 + ...asma-5.96.0-fix-crash-in-WindowShadowTile.patch | 55 ++++++++++++ kde-frameworks/plasma/plasma-5.96.0-r1.ebuild | 75 ++++++++++++++++ kde-frameworks/qqc2-desktop-style/Manifest | 5 ++ ...p-style-5.96.0-drop-layout-direction-hack.patch | 27 ++++++ ...c2-desktop-style-5.96.0-fix-menubar-theme.patch | 31 +++++++ .../qqc2-desktop-style-5.96.0-fix-precision.patch | 70 +++++++++++++++ ...-desktop-style-5.96.0-strip-out-apersands.patch | 47 ++++++++++ .../qqc2-desktop-style-5.96.0-r1.ebuild | 36 ++++++++ 18 files changed, 661 insertions(+) create mode 100644 kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch create mode 100644 kde-frameworks/kio/kio-5.96.0-r2.ebuild create mode 100644 kde-frameworks/kirigami/kirigami-5.96.0-r1.ebuild create mode 100644 kde-frameworks/kjobwidgets/files/kjobwidgets-5.96.0-fix-ui-server-crash.patch create mode 100644 kde-frameworks/kjobwidgets/kjobwidgets-5.96.0-r1.ebuild create mode 100644 kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch create mode 100644 kde-frameworks/plasma/plasma-5.96.0-r1.ebuild create mode 100644 kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch create mode 100644 kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch create mode 100644 kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch create mode 100644 kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch create mode 100644 kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild (limited to 'kde-frameworks') diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz index 80076624505b..820dafac45a7 100644 Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index 27926f29c904..e9136b224dc9 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,6 +1,8 @@ +AUX kio-5.96.0-fix-RAW-file-image-preview.patch 1439 BLAKE2B e987ab2493674d99c24e485f295b3229c852cf35c505b370b7b3603b1e1894a4514978ee8b6cf3edb135c4f0025ab9a1f5fd939ec448a95ce4602ea89087a91e SHA512 b71376b9fd5774037c7d434a248a3c50856e9de60c9b9e547e322e9bced4ee9d9dff3764b7dc0768b597790868545397f2288a5bd2d6fe33f15b009feffac405 AUX kio-5.96.0-fix-crash-in-dropjob.patch 1568 BLAKE2B 91837508cbcdb278a1b38747beccb9d61f99ca0424558264c422240f83d461c3977f5a9dda365305a4fc0a3c71d523ba55d95ea34dc4d12e9761ea8406809d10 SHA512 9a39c65a9603b73b0aacd51063d28d217a4e0bec26d6c1945e890a39f90c0375cfa5dedd7354326bc6f9a7527663de2ecb4940941d28175af28a0c7bc5f4b0e0 DIST kio-5.92.0.tar.xz 3304432 BLAKE2B 31b78c2cc5a543126d8494935e9956ce169f9bf6b863c0be562775ba3d5a30cf1fadc7bc48e818530eb51a5726bb528f15c51f89dfb9a7511bd6865d6f7092d9 SHA512 5064db660c5b6207eff2bb12261198118c89014f4d71a09531e72bc6185fd070fa262ef617cbbbacc1f334f69f65cc831fa91fd641d59d89303813ec5ef620b6 DIST kio-5.96.0.tar.xz 3349852 BLAKE2B 981f0568c30678173f1c38972641b0a53071cce4b03cecdd1f829de7ace7244e3b67f9d63269501866474bcd64d22edc8d98e012f2197cb83f8cafd301a93da0 SHA512 70e7291efbd4b97916023cee7c44a96f3226355773f764f92a2c58c9110b75b04896196ab663ff468b757d1c2a5911f6e9021246044e7754a2ac47723eff8bd3 EBUILD kio-5.92.0.ebuild 2408 BLAKE2B dbf6929b37fc23ecedb5452e67a6a063bddd276476f70a8c04ff18d0662dd851af960a4f83b64348c2e6ad5782bfb387ebdb4f0849a4e5dcad733b76e937997c SHA512 fda5731b4c8ccf515100b97a029c7b635e0918ab703c62b001d3096669c93de7cf717048691ec557db49bee13cbc9bab0d4104bba7f3685e6e0656b5383f3efd EBUILD kio-5.96.0-r1.ebuild 2506 BLAKE2B 9cd53fccf2aa575c7c430da716c3ed6f99bb8347a3fd1084f0bf94c307d4e6dc44c78970599e37e7d8816a50305d8d08d92e47e95f2153dcaff627e098d16970 SHA512 0671c37881ce015ad2dc177afe136b8e8d2839e682b315cd5a63df596b99b5bd9694ec1af18122baf2695a960f34fb47c4a3705c62f7d02cdb9c94457b8f2c58 +EBUILD kio-5.96.0-r2.ebuild 2576 BLAKE2B c6622529b22b402626e44acd7c9f3e11858751f94f63885369c6f5d7570fe1109e2816bc5aa44098aff18f2e17f9e0f6c74d663444ea1b9ac42bf63b488c22e8 SHA512 1a9615f522ee51433fcb03b4da8ef93097ea8f841bf3838d483c0dffcacc7b39d56349dc74971a5e96c51e7baef268788d9b219e95f2ff667fbe3e2f7d9e6300 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce diff --git a/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch b/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch new file mode 100644 index 000000000000..12d4a4c05f2d --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch @@ -0,0 +1,37 @@ +From 5002a07e71ff270a8717911b965a75c33993f883 Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau +Date: Fri, 8 Jul 2022 11:00:42 +0200 +Subject: [PATCH] Fix thumbnailer result for parent mime types being + overwritten + +BUG: 453480 +--- + src/widgets/previewjob.cpp | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp +index c53bcc88a..91be5575e 100644 +--- a/src/widgets/previewjob.cpp ++++ b/src/widgets/previewjob.cpp +@@ -384,11 +384,13 @@ void PreviewJobPrivate::startPreview() + } + } + +- // Check the wildcards last, see BUG 453480 +- QString groupMimeType = mimeType; +- static const QRegularExpression expr(QStringLiteral("/.*")); +- groupMimeType.replace(expr, QStringLiteral("/*")); +- pluginIt = mimeMap.constFind(groupMimeType); ++ if (pluginIt == mimeMap.constEnd()) { ++ // Check the wildcards last, see BUG 453480 ++ QString groupMimeType = mimeType; ++ static const QRegularExpression expr(QStringLiteral("/.*")); ++ groupMimeType.replace(expr, QStringLiteral("/*")); ++ pluginIt = mimeMap.constFind(groupMimeType); ++ } + } + + if (pluginIt != mimeMap.constEnd()) { +-- +GitLab + diff --git a/kde-frameworks/kio/kio-5.96.0-r2.ebuild b/kde-frameworks/kio/kio-5.96.0-r2.ebuild new file mode 100644 index 000000000000..f04669079060 --- /dev/null +++ b/kde-frameworks/kio/kio-5.96.0-r2.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.4 +VIRTUALX_REQUIRED="test" +inherit ecm frameworks.kde.org xdg-utils + +DESCRIPTION="Framework providing transparent file and data management" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="acl +handbook kerberos +kwallet X" + +# tests hang +RESTRICT="test" + +RDEPEND=" + dev-libs/libxml2 + dev-libs/libxslt + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5[ssl] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + =kde-frameworks/kauth-${PVCUT}*:5 + =kde-frameworks/karchive-${PVCUT}*:5 + =kde-frameworks/kbookmarks-${PVCUT}*:5 + =kde-frameworks/kcodecs-${PVCUT}*:5 + =kde-frameworks/kcompletion-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kcrash-${PVCUT}*:5 + =kde-frameworks/kdbusaddons-${PVCUT}*:5 + =kde-frameworks/kguiaddons-${PVCUT}*:5 + =kde-frameworks/ki18n-${PVCUT}*:5 + =kde-frameworks/kiconthemes-${PVCUT}*:5 + =kde-frameworks/kitemviews-${PVCUT}*:5 + =kde-frameworks/kjobwidgets-${PVCUT}*:5 + =kde-frameworks/knotifications-${PVCUT}*:5 + =kde-frameworks/kservice-${PVCUT}*:5 + =kde-frameworks/ktextwidgets-${PVCUT}*:5 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5 + =kde-frameworks/kxmlgui-${PVCUT}*:5 + =kde-frameworks/solid-${PVCUT}*:5 + acl? ( + sys-apps/attr + virtual/acl + ) + handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 ) + kerberos? ( virtual/krb5 ) + kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 ) + X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) +" +DEPEND="${RDEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 + test? ( sys-libs/zlib ) + X? ( + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + ) +" +PDEPEND=">=kde-frameworks/kded-${PVCUT}:5" + +PATCHES=( + "${FILESDIR}/${P}-fix-crash-in-dropjob.patch" # KDE-bug 454747 + "${FILESDIR}/${P}-fix-RAW-file-image-preview.patch" # KDE-bug 453480 +) + +src_configure() { + local mycmakeargs=( + -DKIO_NO_PUBLIC_QTCONCURRENT=ON + $(cmake_use_find_package acl ACL) + $(cmake_use_find_package handbook KF5DocTools) + $(cmake_use_find_package kerberos GSSAPI) + $(cmake_use_find_package kwallet KF5Wallet) + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + xdg_desktop_database_update +} + +pkg_postrm() { + ecm_pkg_postrm + xdg_desktop_database_update +} diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest index afa3a46de94e..1d991ee46fe6 100644 --- a/kde-frameworks/kirigami/Manifest +++ b/kde-frameworks/kirigami/Manifest @@ -1,6 +1,8 @@ AUX kirigami-5.92.0-ListItemDragHandle-emit-moveRequest.patch 1029 BLAKE2B 4e625a0336aa9ff3734cddaa6ffc4708a4555a365f1a69e79c10cb13300d07707faa63d7efb24cd6c2b747005f4bd7ac7f7ac907d9ecd81876c152a41826a5c2 SHA512 e6f1d125b54a9f5d1af758172cfd06e4801225a5ef1c38a3daad5f6ac8cb41d23fd96fa636c646df8428a268988626236e424d9f8a9a7f70a5ffd7ea536fc5cf +DIST kirigami-5.96.0-fix-ScrollBar-binding-loop-freeze.patch.xz 8864 BLAKE2B f0222c16436c2fbe72198acdf6e00427d6b2ced08a3d7294ddeb11f39b10a744eabc11dc8cf3cf2353dc985405141b25e77f548f79de064b207bcea5ca7b0857 SHA512 10669cfc2e835d0d1904f2ecaef79a5c89807839a85c175006921336942b8b5f2b05e5e4d2cad249ec57d6937ff38e044ba15bc6f2d7c61eadab060851267da2 DIST kirigami2-5.92.0.tar.xz 354848 BLAKE2B 7aab1579693f7cf57a61f45eb3d7bc7431bee01ed1ede918e0068d3b4d41abe2f5b5f97cae9538068ae6ebe27a5abce3797c7ade7ff225a40ac49cf46c61a742 SHA512 42d75b8931f28ce2fa200c19acfc9194518b856dd33d9bbeb490f24ddb0ae03ba7c01443a5bc2a07088de69a9300245434460ddcd28cb2b1caa2f2288e45405a DIST kirigami2-5.96.0.tar.xz 359936 BLAKE2B cadba252c1065d7c1c7a539b9d28489dc61683a3b688bdeb4c7d43528494d62d9f4fa3515d29a554d0c47c0bcc81169ab8d3f83952911147ef4fb06658560e50 SHA512 c96e7d53d263f3c5f0c3f3f98c6523555fd67fa5e12dbb0aecb81bc9f8a46f641d2176d377e9c7d901ca235151e004ff1163ac07521aabfb53e0e6517b4df546 EBUILD kirigami-5.92.0-r1.ebuild 1071 BLAKE2B c7f454c207320b6eab18a81ef5ea08127e27660ecf8961335796919eccbc2761f3b2a6d1a3f5479f3f3a09b41e3393d19062851fa63ea580a96fa6ee2da5cfa5 SHA512 5da52aef003d143b266668241acc5c573c710168e92db8699c4aefecbe00fd0838d6059d7109dc55124ecc08e0582766508bd0c034e085868b1bfbcd5829bf88 +EBUILD kirigami-5.96.0-r1.ebuild 1187 BLAKE2B 5bc07b865bbc1537ca5a63d49db8c756bb5ea7533596d9bf3f7f2477ca030f7b1f09e7967efcb1890c6c45b4c67a474c140ba0986d17d5b12e58afa1d858187b SHA512 a1ca927a3579ed05de65174dea73b78f81e2a78d4fd0df76a6a88e131854fe7bd4ae2c02917dade4e589b80f018a02130cee4d939c44f3d9802dbf58cade94fd EBUILD kirigami-5.96.0.ebuild 1001 BLAKE2B 31472a210d3861e392e05d04b2773c44d7a56f70106dd8baf463fbe8e4635a03dbe81d14195b873e59e1c9bb0285bac01c9af7144aa68e6a72b82cf242fa0c3b SHA512 77833c2cefad0aa17b51ea9d251f5b49544420e4339048b9584c63bd6286ed727190a76ebcaaa6b8ef1510bd3ec241c7dd222302b199f9cd7c9fe89fbd8b0641 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/kirigami/kirigami-5.96.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.96.0-r1.ebuild new file mode 100644 index 000000000000..e9cd38c1d1c0 --- /dev/null +++ b/kde-frameworks/kirigami/kirigami-5.96.0-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_EXAMPLES="true" +ECM_QTHELP="false" +ECM_TEST="true" +KDE_ORG_NAME="${PN}2" +QTMIN=5.15.4 +inherit ecm frameworks.kde.org + +DESCRIPTION="Lightweight user interface framework for mobile and convergent applications" +HOMEPAGE="https://techbase.kde.org/Kirigami" +EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-fix-ScrollBar-binding-loop-freeze.patch.xz" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="" + +# requires package to already be installed +RESTRICT="test" + +DEPEND=" + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 +" +RDEPEND="${DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 +" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" + +PATCHES=( "${WORKDIR}/${P}-fix-ScrollBar-binding-loop-freeze.patch" ) # KDE-bug 448784 + +src_configure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=$(usex examples) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest index 70895772df40..ab6417786fa9 100644 --- a/kde-frameworks/kjobwidgets/Manifest +++ b/kde-frameworks/kjobwidgets/Manifest @@ -1,5 +1,7 @@ +AUX kjobwidgets-5.96.0-fix-ui-server-crash.patch 3545 BLAKE2B 2647b1e300997a7c83c480e47c0495afbc8575d9d705882663f39dfe27156377b25f00ae59a4cd74f4d4114b33c02cb647af9475513e4b29f8ab59f21e0e0c72 SHA512 3ec987ee9dd4a2ab40f3a5e82694982461ca575f835e36d94ca417f35e76dda0c4de619411783b3b636c84541beb1bc12d0334976fc36deb7b7581bb238414cc DIST kjobwidgets-5.92.0.tar.xz 101620 BLAKE2B 29eb6b131ca2c858ee416afab137ed84b1f1e00039673794418bb352ed656df13e91e2b47a98d1b6dd933034e0fb5dad44fa021aaa6ac0c84913f8cd733cde1f SHA512 6bd21dc93146ded88981bf61c1365c333c9ba369ac358ef4b5b06c2d26f0e6cac7880ecad27cd7cd950cf1b502c9202ced6c66fcdb78b7cacec1da6a92558976 DIST kjobwidgets-5.96.0.tar.xz 101704 BLAKE2B 98f647b2bc7266364c05f5e57ddefbb60b8a16260f83abac4b33d7819987b2083029c14d78e49f6cd1fd5e087a343b11893e30d45c496e345fe98d67465055b5 SHA512 17fb818efa4f241a3e8248b81ba16c3a879b0580eb3a33efc19983faa5b39959e0cb1032b9044e953accd13ad93c028bfc619c49b26076416f707e6ea9480510 EBUILD kjobwidgets-5.92.0.ebuild 779 BLAKE2B 799eb93717845cf4301b8fbf639c69f3e064bfc4d9689ae6683c76ac336d25812d9f2f658202b8f7cb413c99cf19a0f4d041766a00e092eaf4e0a7c189f3d7cf SHA512 ecb9ad26a6feca68ac8fecee6a7873fb103f3a83ed35b82c3004917c2431b357ccf363a7ec2293d913810ab8d0c0f52e024a8f3015b5f3fe24465f6a88b68afc +EBUILD kjobwidgets-5.96.0-r1.ebuild 876 BLAKE2B 8a83c78e1d3571e3f98bdcb53e1e2da21ece36a5cdbaec9cd89fca5c833efc0c8160ea8906cd7e8dafd687707d30569dec9e2b79e4f7d1052350726ee24a1586 SHA512 897a64b089c63029316b9e805f0074f41d268ef26206c75bfa3b8b5985a785ea28b1c24467cbe02c8c57a2e1a4c1a34c581580ea1d84ac02bed959def52c407e EBUILD kjobwidgets-5.96.0.ebuild 800 BLAKE2B 1c5b6c791953aa47f46f593d275422c4bf0b356c7a205f87533a57582240b5c7c89654f188cea8976fab8f155ccb62a3b75c3c3a6134044d80d8f43ca169e3f3 SHA512 bc29348b23b470b28e354e9adb561c0a23ea96b414b229c14a57002b53653449d382a3774235356b8677c3dd0e74340322199b8cc6778881fe8180b9f51323e9 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/kjobwidgets/files/kjobwidgets-5.96.0-fix-ui-server-crash.patch b/kde-frameworks/kjobwidgets/files/kjobwidgets-5.96.0-fix-ui-server-crash.patch new file mode 100644 index 000000000000..463daf84f573 --- /dev/null +++ b/kde-frameworks/kjobwidgets/files/kjobwidgets-5.96.0-fix-ui-server-crash.patch @@ -0,0 +1,82 @@ +From 5aeba3f01ef8cdf723813cacdd29945328288663 Mon Sep 17 00:00:00 2001 +From: Michael Pyne +Date: Sat, 2 Jul 2022 17:57:10 -0400 +Subject: [PATCH] ui-server: Fix crash by only re-registering live KJobs. + +This addresses a frequently-reported crash in the job tracker for +KUiServerV2 that occurs when attempting to re-register new job views for +active KJobs after a new UI server comes online. + +Although I have not been able to reproduce the crash myself, (by +attempting to use both long-lived and short-lived file transfers from +Dolphin and restarting plasmashell), inspection of the code shows that +it is possible for there to be deleted KJobs pointing to JobView objects +during some portions of the job tracker's lifetime. + +The current code deals with this in situations including DBus calls to +create a U/I view for a KJob (the KJob may terminate before the DBus +reply is received) and even a short delay that can be optionally +introduced (the KJob may terminate before the delay elapses). A +QPointer is used as a guard in these situations, but there is no +similar guard for the re-registration code. + +In this case we cannot use QPointer to guard the job's lifetime +because the KJob must be alive when the QPointer is created, and +this crash occurs when the KJob is terminated. However the KJob's +destruction should lead to the unregisterJob() function being called, +which handles removing the terminated KJob from the map of job views +with only one exception, where instead the job view for the KJob has its +"terminated" pending status set. + +So the fix here checks for the "terminated" state in the same way as +performed in requestView(), and if the KJob is terminated, handles +requesting the job view to terminate the U/I and finally removing the +terminated KJob from the map of job views. + +By doing this, we avoid passing a deleted KJob to the registerJob() +function, which will attempt to dereference it and crash the +application. + +See also merge request !22 + +BUG:450325 +--- + src/kuiserverv2jobtracker.cpp | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/src/kuiserverv2jobtracker.cpp b/src/kuiserverv2jobtracker.cpp +index 737c880..3592618 100644 +--- a/src/kuiserverv2jobtracker.cpp ++++ b/src/kuiserverv2jobtracker.cpp +@@ -209,12 +209,24 @@ void KUiServerV2JobTracker::registerJob(KJob *job) + + const auto oldState = view.currentState; + +- delete view.jobView; +- d->jobViews.remove(job); ++ // It is possible that the KJob has been deleted already so do not ++ // use or deference if marked as terminated ++ if (oldState.value(QStringLiteral("terminated")).toBool()) { ++ const uint errorCode = oldState.value(QStringLiteral("errorCode")).toUInt(); ++ const QString errorMessage = oldState.value(QStringLiteral("errorMessage")).toString(); + +- registerJob(job); ++ view.jobView->terminate(errorCode, errorMessage, QVariantMap() /*hints*/); + +- d->jobViews[job].currentState = oldState; ++ delete view.jobView; ++ d->jobViews.remove(job); ++ } else { ++ delete view.jobView; ++ d->jobViews.remove(job); // must happen before registerJob ++ ++ registerJob(job); ++ ++ d->jobViews[job].currentState = oldState; ++ } + } + }); + } +-- +GitLab + diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0-r1.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0-r1.ebuild new file mode 100644 index 000000000000..d52076a835bf --- /dev/null +++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.4 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="nls X" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) +" +DEPEND="${RDEPEND} + X? ( + x11-base/xorg-proto + x11-libs/libX11 + ) +" +BDEPEND=" + nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) +" + +PATCHES=( "${FILESDIR}/${P}-fix-ui-server-crash.patch" ) # KDE-bug 450325 + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest index 847943424896..16a47c0eae27 100644 --- a/kde-frameworks/plasma/Manifest +++ b/kde-frameworks/plasma/Manifest @@ -1,7 +1,9 @@ AUX plasma-5.92.0-breeze-light-dark-visual-fix.patch 1689 BLAKE2B 8c15834e53bdb2dfe4707a2173bdf19fd1a98652f644256f050ce55cc57e3268f1d33a1d67901d68301749bf7458137092c71e68d50454bd8db88d962c2bcd01 SHA512 d490f815b11bbf6af35266fab33392cfd5562b2011970b433b2c3952e1e9638af56175e10258596dd863c8fff49d448f141c22bfa3d688c9194a31ca0ed2f1ee AUX plasma-5.92.0-fix-blurry-buttons.patch 5410 BLAKE2B 689bf20c1848fd5ac299991f6dcc1e6ee81ef2fecd68d87952967dbb2367326aee8d464588824b059f7162a1cc6092c84cce7d254ac20dbbef3da639a5eaa4e0 SHA512 facb4d4ca36f5edaad918253f8d79442d350a12d611d833d0c48684abd2160527813d7186614fc54d3d5f67171400bbaf56f64c0ffb98c2433e062ee024b180d +AUX plasma-5.96.0-fix-crash-in-WindowShadowTile.patch 1634 BLAKE2B 80da6c10e57948875d18ee3699e092e47cef3a75e55b643438bf3d1b5d5c368ac1425aae1b49c55ec20a0f4986c228a31f22e390ffea39a9b34d4d459dd70c48 SHA512 7af67805cf73c01132a162c03dc50398b5cb4b3d5b1b1001b31c2b1ec8fa749c8e883b8185734e47d8434350426b6990315fc74bec8880c8bdc36ad8b1d5aee2 DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c DIST plasma-framework-5.96.0.tar.xz 3145380 BLAKE2B a9190358fc454dfba03d8f5881b52e21e7e209f471823d4d4ead54818103436775f09df7f1dd42ade4d4b5b2df448f5cb1bb682ea77d32c57cdfe7c39ecab238 SHA512 9361948197c69ab8b2a1b943c1e9a2e44443588cd3bb4073eaa9ac6a4575bb4c1e6a257eb2fda6333df13eb568e09ed26a88d128fdafbe517bca705b8a8f2a5b EBUILD plasma-5.92.0-r2.ebuild 2070 BLAKE2B 6e234e85ddc2694560bcdd46a9b12df6a9ab7ee1a3fb2f29e2a9c835a0255a981af7d73f12caf4bd4a7ef90320cb7f23d3906b083b2346e289c6e8bd092f1acb SHA512 3d9389f095b09c330f552f52fa2d7c624c968abc658f6c447bbed066e864d205573314878f8b47f207dcdf3e7273beaecf62de39984bc763a494b26e29bceac9 +EBUILD plasma-5.96.0-r1.ebuild 2051 BLAKE2B e96e556d063ec7897525d371f47d93aaff6924a95801fa0915f1507ccc2d157617ba5ff589a509fbc5cb0049b2b9c8cf4fae36d52261945bfae10e33e91455a5 SHA512 e844dec9ad63dd13d8fdd075c64aa363a757a8861e3462ae271cb4985451694519b669008018073f701cc63cf61e44642f272de72911275271f0d6bdd3bd37d6 EBUILD plasma-5.96.0.ebuild 1966 BLAKE2B 59b813bcd2ad1f7ea60ad8faecab79ce0fa9875e0058a8f8c01b7f88fde6ea5b101585cb33fb615266296bd028e36b8c41de3c804bf9239ea5170b7646e4f8f0 SHA512 e49b18b9775bf72ffd82e8d48743a53feedc4db49134354e1c3964bcd9fa434aacc16bb79755ff88edbef5e11f1b012955779d7b60ca1c658afaabb3b060c0e1 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch b/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch new file mode 100644 index 000000000000..8d37a508b359 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch @@ -0,0 +1,55 @@ +From 50eaece7aef004b588a684c9fadff0f6787f2ef8 Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Thu, 14 Jul 2022 22:45:14 +0100 +Subject: [PATCH] Scope DialogShadows lifetime to application + +- DialogShadows own KWayland::Client::buffer objects + - Buffer cleanup makes wayland calls + - wayland calls after QGuiApplication has stoped will fail + +Q_GLOBAL_STATIC mangaged objects can outlive the QGuiApplication. + +BUG:443706 +--- + src/plasmaquick/dialogshadows.cpp | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +diff --git a/src/plasmaquick/dialogshadows.cpp b/src/plasmaquick/dialogshadows.cpp +index 17c9a41e2..93b9bcc0f 100644 +--- a/src/plasmaquick/dialogshadows.cpp ++++ b/src/plasmaquick/dialogshadows.cpp +@@ -37,17 +37,6 @@ public: + QVector m_tiles; + }; + +-class DialogShadowsSingleton +-{ +-public: +- DialogShadowsSingleton() +- { +- } +- +- DialogShadows self; +-}; +- +-Q_GLOBAL_STATIC(DialogShadowsSingleton, privateDialogShadowsSelf) + + DialogShadows::DialogShadows(QObject *parent, const QString &prefix) + : Plasma::Svg(parent) +@@ -64,7 +53,12 @@ DialogShadows::~DialogShadows() + + DialogShadows *DialogShadows::self() + { +- return &privateDialogShadowsSelf->self; ++ // KF6 port to Q_APPLICATION_STATIC ++ static DialogShadows *s_privateDialogShadowsSelf = nullptr; ++ if (!s_privateDialogShadowsSelf) { ++ s_privateDialogShadowsSelf = new DialogShadows(qApp); ++ } ++ return s_privateDialogShadowsSelf; + } + + void DialogShadows::addWindow(QWindow *window, Plasma::FrameSvg::EnabledBorders enabledBorders) +-- +GitLab + diff --git a/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild new file mode 100644 index 000000000000..401899a558a0 --- /dev/null +++ b/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_NAME="${PN}-framework" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.4 +VIRTUALX_REQUIRED="test" +inherit ecm frameworks.kde.org + +DESCRIPTION="Plasma framework" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="gles2-only man wayland X" + +RESTRICT="test" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=] + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + =kde-frameworks/kactivities-${PVCUT}*:5 + =kde-frameworks/karchive-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5[qml] + =kde-frameworks/kconfigwidgets-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kdeclarative-${PVCUT}*:5 + =kde-frameworks/kglobalaccel-${PVCUT}*:5 + =kde-frameworks/kguiaddons-${PVCUT}*:5 + =kde-frameworks/ki18n-${PVCUT}*:5 + =kde-frameworks/kiconthemes-${PVCUT}*:5 + =kde-frameworks/kio-${PVCUT}*:5 + =kde-frameworks/kirigami-${PVCUT}*:5 + =kde-frameworks/knotifications-${PVCUT}*:5 + =kde-frameworks/kpackage-${PVCUT}*:5 + =kde-frameworks/kservice-${PVCUT}*:5 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5 + =kde-frameworks/kxmlgui-${PVCUT}*:5 + !gles2-only? ( media-libs/libglvnd[X?] ) + wayland? ( + =kde-frameworks/kwayland-${PVCUT}*:5 + media-libs/libglvnd + ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + x11-libs/libxcb + ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" + +PATCHES=( "${FILESDIR}/${P}-fix-crash-in-WindowShadowTile.patch" ) # KDE-bug 443706 + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package !gles2-only OpenGL) + $(cmake_use_find_package man KF5DocTools) + $(cmake_use_find_package wayland EGL) + $(cmake_use_find_package wayland KF5Wayland) + $(cmake_use_find_package X X11) + $(cmake_use_find_package X XCB) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest index d4b9853f0828..d667622b457f 100644 --- a/kde-frameworks/qqc2-desktop-style/Manifest +++ b/kde-frameworks/qqc2-desktop-style/Manifest @@ -1,5 +1,10 @@ +AUX qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch 1122 BLAKE2B d6ebe10059ab464d7b23b984c5cd6f3ef53119d859c66748edd1d2aa5b266ce282998eda840bd6453e9e1907c8cc70029ada9d0bd20e95e0f72d96118ca63052 SHA512 745f9e2ccd408d74081e65e3e0894f8bb47166f8725c40c88e7cab3087bb78397920b236d6225687548362e36a43904bff8d6855908e5ea2359b0b301e5cd526 +AUX qqc2-desktop-style-5.96.0-fix-menubar-theme.patch 1139 BLAKE2B 54cedc67638008e3111d85542096197b73aa24ab70b9e8e2f8b6df8cc2e2b6a5c7a2212442cec138a87c460710e36b1f6d7127fe1e698d5d63818e87487e4da0 SHA512 a9149516f9b7286669de5e16311105b627d33d1e8e01eb065e712db31cb184504e4eec95f1a196adb5c4c8d1e9c32d0cb2c33261eab5c4efb117c542e8a30222 +AUX qqc2-desktop-style-5.96.0-fix-precision.patch 2790 BLAKE2B 8d596e297587bbf7106b7e1d9d0a3f71645409330632db32afe7f12a4f27723c7195b6de3badcb9072c906692046feb957bf598f9187185341ad80b107a1d90f SHA512 dade8a1d8d26dae251b7c808ce0e3ee7dbc0e8418d292ab2daa907004526e87378bada6e02430576cb55c3ccec571fd3699ecdf85a6ab3634d3db1ca52a04bde +AUX qqc2-desktop-style-5.96.0-strip-out-apersands.patch 1729 BLAKE2B 6134a0aa51a5a4fd8b91c70cf88df49535de8192953050e2212cbd20fd9f1f6be1474442824395d9b69a37e571ad618db76ae1ea9f57802b00824c8b2a105d5b SHA512 51e5b32ecdbcb95fffbd455475bcd566ef173cf7984af9573775dab4008ce0a389baa7c8d5a00ee3e3477ce1cea410dc2445d7f48fad3853a0873f8d6b4f8b97 DIST qqc2-desktop-style-5.92.0.tar.xz 65396 BLAKE2B 1cf4e6d27c7db8f518f5c9e46f77373a72b30a3060bac3e46d94473bcf6c6fa17c26a90d9589550bee2974b3c541963ed614a6422690b32d97a80b7dbfbc5434 SHA512 698675c526f8c1174c617045113c613a1eb4684db30bf6d88600b9863273c814c4ebe0bcf45b60f24023d7b3d8ef59dab4ab1b704add55131431cc3e701b3549 DIST qqc2-desktop-style-5.96.0.tar.xz 64896 BLAKE2B f2bc4a599feb1aa0ed7d604cc0c81c20d5f07471845d9fd8c28a112c7c6ff0bb66223975a44a2e1ee771b540e1634e6d4be8eb8aa0761db63068fb8411515ce7 SHA512 ef9342933beecfd7ddc5c934c2d0f399f3d3eb8dd1f02b5e0f397e1d377ec06487363bcd7f6d1be3679b4db971fec80904e20acb391b57b2795f6be3a73e6db9 EBUILD qqc2-desktop-style-5.92.0.ebuild 725 BLAKE2B 519eeacecba5a7692f868ab520f9aaf407250943f0c9a7ae50b861be49f3555fe8c1ae6ab84fe779486b93d5649e040ea0a0893982f452f3195eca6f4c2d7611 SHA512 5b969c02b61b9381c6992fdb512082042c7abd6ccbef1453cda96316f73123119ccb9b6b9f118d5a2a2732a9f0af0f8ba6c3d31bdc23f0b98a476ce0e6264a35 +EBUILD qqc2-desktop-style-5.96.0-r1.ebuild 1029 BLAKE2B c61624355837e4f7a1823ed48e33f15df9ca54c816fbbb4c9b72493ed4b532081335ee97d07b950d8abb6ac349b9a1c2fe2d58c97ffc45c49a787d0cd08e886e SHA512 86235763d9c7d2f801a40b7b4f1481a747a373a8b5582ef75564f7cb480d43b16ba610862b2eccfcb09ef7c9773255679171054abf49fcd8c3c2c1fe8cc3581e EBUILD qqc2-desktop-style-5.96.0.ebuild 746 BLAKE2B fa0c7f0add9c717e7951c2bdd5e10cbedb445acaa46c79d27918e5a8e3c823f0745269d98955fcbf99e30f673bc11aaf0b0018e17f27378e0d79de65b906c32c SHA512 461be09283fac87fcbc9cd640da371f5634dbecba99ca50d4b20d2ef6abb1a7fb1c205cfa47eda68936089c218566bed3c1484f7c0ed1b65e73ac05bc067e97a MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch new file mode 100644 index 000000000000..6f31670f5a52 --- /dev/null +++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch @@ -0,0 +1,27 @@ +From 6a095ad15153479e22472628ddfe1bab1183d911 Mon Sep 17 00:00:00 2001 +From: ivan tkachenko +Date: Sat, 4 Jun 2022 03:11:58 +0300 +Subject: [PATCH] ProgressBar: Drop layout direction hack + +It is not needed anymore: mirroring is now handled correctly in the +Breeze theme implementation. +--- + org.kde.desktop/ProgressBar.qml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/org.kde.desktop/ProgressBar.qml b/org.kde.desktop/ProgressBar.qml +index 23c1df3..2d075c7 100644 +--- a/org.kde.desktop/ProgressBar.qml ++++ b/org.kde.desktop/ProgressBar.qml +@@ -26,7 +26,7 @@ T.ProgressBar { + control: controlRoot + maximum: indeterminate ? 0 : 10000 * controlRoot.to + minimum: indeterminate ? 0 : 10000 * controlRoot.from +- value: indeterminate ? 0 : 10000 * ((Qt.application.layoutDirection === Qt.LeftToRight ? controlRoot.visualPosition : 1 - controlRoot.visualPosition) * (controlRoot.to - controlRoot.from) + controlRoot.from) ++ value: indeterminate ? 0 : 10000 * controlRoot.value + horizontal: true + enabled: controlRoot.enabled + +-- +GitLab + diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch new file mode 100644 index 000000000000..6cb908283ffc --- /dev/null +++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch @@ -0,0 +1,31 @@ +From 299748e9bdc01a30e90cb7413b0815564864dc3b Mon Sep 17 00:00:00 2001 +From: Kartikey Subramanium +Date: Wed, 20 Jul 2022 14:33:55 +0000 +Subject: [PATCH] Fix QQC2 MenuBar theme. + +BUG: 456729 + +| Before | After | +| ------ | ------ | +| ![Screenshot_20220720_193546](/uploads/4eded8d26fe77b8a64d9abd7806ecf2f/Screenshot_20220720_193546.png) | ![Screenshot_20220720_193536](/uploads/825c2cc901d859ea5cd84fe299bdc941/Screenshot_20220720_193536.png) | +--- + org.kde.desktop/MenuBar.qml | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/org.kde.desktop/MenuBar.qml b/org.kde.desktop/MenuBar.qml +index f10b01a..68b92af 100644 +--- a/org.kde.desktop/MenuBar.qml ++++ b/org.kde.desktop/MenuBar.qml +@@ -13,6 +13,9 @@ import org.kde.kirigami 2.4 as Kirigami + T.MenuBar { + id: controlRoot + ++ Kirigami.Theme.colorSet: Kirigami.Theme.Header ++ Kirigami.Theme.inherit: false ++ + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, +-- +GitLab + diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch new file mode 100644 index 000000000000..36705ce0c8b6 --- /dev/null +++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch @@ -0,0 +1,70 @@ +From efb795efbe0579cb30cc042d61214c139c5fb110 Mon Sep 17 00:00:00 2001 +From: ivan tkachenko +Date: Fri, 22 Jul 2022 20:31:48 +0300 +Subject: [PATCH] ProgressBar,Slider: Adapt great precision to the harsh + reality + +Test case: `to` values >= 214749 should work. + +BUG: 455339 +--- + org.kde.desktop/ProgressBar.qml | 10 +++++++--- + org.kde.desktop/Slider.qml | 12 ++++++++---- + 2 files changed, 15 insertions(+), 7 deletions(-) + +diff --git a/org.kde.desktop/ProgressBar.qml b/org.kde.desktop/ProgressBar.qml +index 18d879b..77beb1b 100644 +--- a/org.kde.desktop/ProgressBar.qml ++++ b/org.kde.desktop/ProgressBar.qml +@@ -22,11 +22,15 @@ T.ProgressBar { + contentItem: Item {} + + background: StylePrivate.StyleItem { ++ // Rescale for extra precision. Adapts to the range of `from` & `to` to avoid integer overflow. ++ property int factor: (Math.abs(controlRoot.from) < 100000 && Math.abs(controlRoot.to) < 100000) ++ ? 10000 : 1 ++ + elementType: "progressbar" + control: controlRoot +- maximum: indeterminate ? 0 : 10000 * controlRoot.to +- minimum: indeterminate ? 0 : 10000 * controlRoot.from +- value: indeterminate ? 0 : 10000 * controlRoot.value ++ maximum: indeterminate ? 0 : factor * controlRoot.to ++ minimum: indeterminate ? 0 : factor * controlRoot.from ++ value: indeterminate ? 0 : factor * controlRoot.value + horizontal: true + enabled: controlRoot.enabled + +diff --git a/org.kde.desktop/Slider.qml b/org.kde.desktop/Slider.qml +index 58bc99a..49b8ccb 100644 +--- a/org.kde.desktop/Slider.qml ++++ b/org.kde.desktop/Slider.qml +@@ -28,6 +28,10 @@ T.Slider { + snapMode: T.Slider.SnapOnRelease + + background: StylePrivate.StyleItem { ++ // Rescale for extra precision. Adapts to the range of `from` & `to` to avoid integer overflow. ++ property int factor: (Math.abs(controlRoot.from) < 100000 && Math.abs(controlRoot.to) < 100000) ++ ? 10000 : 1 ++ + control: controlRoot + elementType: "slider" + sunken: controlRoot.pressed +@@ -36,10 +40,10 @@ T.Slider { + contentHeight: horizontal ? (Kirigami.Settings.tabletMode ? 24 : 22) : controlRoot.implicitHeight + anchors.verticalCenter: controlRoot.verticalCenter + +- maximum: 10000 * controlRoot.to +- minimum: 10000 * controlRoot.from +- step: 10000 * controlRoot.stepSize +- value: 10000 * controlRoot.value ++ maximum: factor * controlRoot.to ++ minimum: factor * controlRoot.from ++ step: factor * controlRoot.stepSize ++ value: factor * controlRoot.value + horizontal: controlRoot.orientation === Qt.Horizontal + enabled: controlRoot.enabled + hasFocus: controlRoot.activeFocus +-- +GitLab + diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch new file mode 100644 index 000000000000..59bb60c6c347 --- /dev/null +++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch @@ -0,0 +1,47 @@ +From 939273025ed92246b5e6d1e3a944a8c88bbc682b Mon Sep 17 00:00:00 2001 +From: ivan tkachenko +Date: Fri, 22 Jul 2022 21:27:04 +0300 +Subject: [PATCH] ToolTip: Sync to PC3: Strip out ampersands +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Easily reproducible broken example: put a notes applet on a desktop, +hover over its "Configure…" button (it should be fine so far), then +right click it, press Escape (or otherwise close the context menu, and +hover again: now the tooltip spells "&Configure…" because for some +reason a mnemonic was added during this time. +--- + org.kde.desktop/ToolTip.qml | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/org.kde.desktop/ToolTip.qml b/org.kde.desktop/ToolTip.qml +index 40dfcbd..3a03cc5 100644 +--- a/org.kde.desktop/ToolTip.qml ++++ b/org.kde.desktop/ToolTip.qml +@@ -13,7 +13,7 @@ import QtQuick.Layouts 1.15 + import org.kde.kirigami 2.12 as Kirigami + + T.ToolTip { +- id: controlRoot ++ id: control + + Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip + Kirigami.Theme.inherit: false +@@ -41,9 +41,11 @@ T.ToolTip { + closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent + + contentItem: Controls.Label { +- text: controlRoot.text ++ // Strip out ampersands right before non-whitespace characters, i.e. ++ // those used to determine the alt key shortcut ++ text: control.text.replace(/&(?=\S)/g, "") + wrapMode: Text.WordWrap +- font: controlRoot.font ++ font: control.font + Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip + color: Kirigami.Theme.textColor + } +-- +GitLab + diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild new file mode 100644 index 000000000000..4f8f1501b88f --- /dev/null +++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="false" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.4 +inherit ecm frameworks.kde.org + +DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting" + +LICENSE="|| ( GPL-2+ LGPL-3+ )" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5= + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5 + =kde-frameworks/kiconthemes-${PVCUT}*:5 + =kde-frameworks/kirigami-${PVCUT}*:5 + =kde-frameworks/sonnet-${PVCUT}*:5[qml] +" +RDEPEND="${DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 +" + +PATCHES=( + "${FILESDIR}/${P}-fix-menubar-theme.patch" # KDE-bug #456729 + "${FILESDIR}/${P}-drop-layout-direction-hack.patch" # mirror fix in breeze 5.24.6-r1 + "${FILESDIR}/${P}-fix-precision.patch" # KDE-bug #455339 + "${FILESDIR}/${P}-strip-out-apersands.patch" # KDE-bug #457079 +) -- cgit v1.2.3