diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-01-29 02:53:24 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-29 02:53:24 +0000 |
commit | b8ec9071f5d20d8518b02d0077428b2c9f88861b (patch) | |
tree | 6214c0d63a2bd5ae464941924a90f415687fa63c /kde-frameworks | |
parent | bdf6e70da7a28f45617c02a251bb6b3844202bc5 (diff) |
gentoo auto-resync : 29:01:2023 - 02:53:24
Diffstat (limited to 'kde-frameworks')
-rw-r--r-- | kde-frameworks/Manifest.gz | bin | 13726 -> 13735 bytes | |||
-rw-r--r-- | kde-frameworks/kded/Manifest | 2 | ||||
-rw-r--r-- | kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch | 34 | ||||
-rw-r--r-- | kde-frameworks/kded/kded-5.102.0-r1.ebuild | 42 | ||||
-rw-r--r-- | kde-frameworks/kguiaddons/Manifest | 2 | ||||
-rw-r--r-- | kde-frameworks/kguiaddons/files/kguiaddons-5.102.0-fix-waylandclipboard.patch | 47 | ||||
-rw-r--r-- | kde-frameworks/kguiaddons/kguiaddons-5.102.0-r1.ebuild | 47 | ||||
-rw-r--r-- | kde-frameworks/kirigami/Manifest | 3 | ||||
-rw-r--r-- | kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-1.patch | 59 | ||||
-rw-r--r-- | kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-2.patch | 114 | ||||
-rw-r--r-- | kde-frameworks/kirigami/kirigami-5.102.0-r1.ebuild | 55 | ||||
-rw-r--r-- | kde-frameworks/plasma/Manifest | 2 | ||||
-rw-r--r-- | kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch | 44 | ||||
-rw-r--r-- | kde-frameworks/plasma/plasma-5.102.0-r2.ebuild | 72 |
14 files changed, 523 insertions, 0 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz Binary files differindex 85f9b204c75a..937db3368f5d 100644 --- a/kde-frameworks/Manifest.gz +++ b/kde-frameworks/Manifest.gz diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest index 7e93f20e2861..8e45ac3d276d 100644 --- a/kde-frameworks/kded/Manifest +++ b/kde-frameworks/kded/Manifest @@ -1,5 +1,7 @@ +AUX kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch 1224 BLAKE2B f4877cb828dce5e7099398532c649cb1dac52bc0001394a942601aebcefc87141aae729bbd67e979e9b2dbd645ddb7ee7cbf07e7a44f3e0fd283fef5182e9753 SHA512 9513a3522b372b88aa13a324e6c1e0b573560f9522e31b9ac9a694a2a4b7961b670f9ef3cb29baa510158d844c35fc318d0cea3d9822f30995dceca62d586f48 DIST kded-5.102.0.tar.xz 40968 BLAKE2B d7bf8ac8e5def70dce42afa4050bd1a0ecb5a6354b58ca16eee5cc8ea0ee368c0125e290643318b288cc18db102925bf5a77664b7f23e8e234205d3d95e488a5 SHA512 971eca90bca7218c0637a62740aaefa2bb3fb68a2941bd8c25bf65b79e07b69cdf1d629733b2511382b6fab2cd112f194ef09939d8043e96d9242d4253eb1e83 DIST kded-5.99.0.tar.xz 40800 BLAKE2B 847c242751204487745c5693c94e5bd851dc741a659a8c6cdffbdb0e0351e68809d62ff6ad63816cd99ac20829ae69d92246a360cd55e1c2d0ed0059610439fc SHA512 7e2fc9528dcf95b252a1921d141c984bdbe05f7cae780eefad3f1f768c738e0873588242ebc8f9c7a710b8c5badb521dbd80b9cff89abfcfcf9689ac284ae913 +EBUILD kded-5.102.0-r1.ebuild 963 BLAKE2B cf8661e7c9568f7f93584b5a723123aae734126da44feb9cfbde30485c1ebd38fc89feddfdcd0612e05b3e4edf362e8edb5cf99a79cefa2038f00748bbedeeab SHA512 4fa0c799ffe2a99beb798dcdb37399a37d58d0f4bcc59977686e522e8a5b74f341d1b21c648849ea62d67dce3801d96e1db85ddfcffed35e2cc06b66d70a64b4 EBUILD kded-5.102.0.ebuild 867 BLAKE2B 130775388d4089876e90b56efa7ba7c00e564cd5fa089e2732bb961103ca0b249d1ac385ffd4ae9c7ff839dcaf19861a20513eb485d110a3834e65642a944b2a SHA512 fa9e7da3abb8fda4d09f3746fc67b29297b8156e06abc95c38853f66fc64810db3b0baf6d848d5de5d430ec19184ba3ded1f766bb669ebe0232124120271b649 EBUILD kded-5.99.0.ebuild 860 BLAKE2B 9a7add79a2c20a085c453c806813e898f780f4f6c894d44bb5f373ee18e2c41282a4859fb49a775eeb7817089759a6fb7f469756d24e9b0d87d17c70b36bf17f SHA512 6462b8efe3d5be79821d635ce94270280adbaf168bfa75e2a1943c42839eaa51b9622c659f106bb8640adf08e680a394de1de4cd31ae0ef5b7c5844fd55f8eae MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch b/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch new file mode 100644 index 000000000000..3fd652bd2483 --- /dev/null +++ b/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch @@ -0,0 +1,34 @@ +From 23cb03267ae1b1cdb8a75be1992d2fbf122aaa6e Mon Sep 17 00:00:00 2001 +From: David Redondo <kde@david-redondo.de> +Date: Tue, 24 Jan 2023 10:20:01 +0100 +Subject: [PATCH] Only recreate icons if an icon dir changed + +Other paths that we are watching can end in "icons" +as we are watching subdirs. Make sure to not take the wrong code +path and only do an icon change if one our watched icon dirs +changes. +BUG:463353 +FIXED-IN:5.103 + + +(cherry picked from commit b6a3e25e81014110f1e0f470832006cc60cbc86d) +--- + src/kded.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kded.cpp b/src/kded.cpp +index 1f90f9c..b473f1c 100644 +--- a/src/kded.cpp ++++ b/src/kded.cpp +@@ -525,7 +525,7 @@ void Kded::dirDeleted(const QString &path) + + void Kded::update(const QString &path) + { +- if (path.endsWith(QLatin1String("/icons"))) { ++ if (path.endsWith(QLatin1String("/icons")) && m_pDirWatch->contains(path)) { + // If the dir was created or updated there could be new folders to merge into the active theme(s) + QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KIconLoader"), QStringLiteral("org.kde.KIconLoader"), QStringLiteral("iconChanged")); + message << 0; +-- +GitLab + diff --git a/kde-frameworks/kded/kded-5.102.0-r1.ebuild b/kde-frameworks/kded/kded-5.102.0-r1.ebuild new file mode 100644 index 000000000000..81846924c148 --- /dev/null +++ b/kde-frameworks/kded/kded-5.102.0-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="false" +ECM_TEST="false" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.5 +inherit ecm frameworks.kde.org + +DESCRIPTION="Central daemon of KDE workspaces" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="+man" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + =kde-frameworks/kconfig-${PVCUT}*:5[dbus] + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kcrash-${PVCUT}*:5 + =kde-frameworks/kdbusaddons-${PVCUT}*:5 + =kde-frameworks/kinit-${PVCUT}*:5 + =kde-frameworks/kservice-${PVCUT}*:5 +" +RDEPEND="${DEPEND}" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" + +PATCHES=( + "${FILESDIR}/${P}-only-recreate-icons-if-icon-dir-changed.patch" # KDE-bug 463353 +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package man KF5DocTools) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest index 40132c728e86..09c6c67be85a 100644 --- a/kde-frameworks/kguiaddons/Manifest +++ b/kde-frameworks/kguiaddons/Manifest @@ -1,5 +1,7 @@ +AUX kguiaddons-5.102.0-fix-waylandclipboard.patch 2260 BLAKE2B b048b54bd280309e547f0fd4069a030d3efda4bfa4c0e7deb79626239f2dcdc05357704a8bae203558c9551edec5e2584986eef0f51110a4279271060ea1eb1b SHA512 2d37e2f9dcb50b7349a1df61438ba69e373f50cc588b06bde8e99ae78bfe9ece1b5ba0e74590f574a8e0479f51e1cb40fa92ab28a7f4403dbb25212dfedda071 DIST kguiaddons-5.102.0.tar.xz 78104 BLAKE2B 59f1e0718790fec770af182a2bd2c0770d708e022e3637bb1986fc7950377f27fcd36a39db7b80f33f502ac41140c4c581d50e1adacd09af814e5b03f1a3977c SHA512 933cc5dae575567b9f568ee778e90614c369ff6b3432b083b4c2fb94cca957b698050a3a4bebe4de11d70fc7b2484022977a77093a2d671002eacbde0921b565 DIST kguiaddons-5.99.0.tar.xz 74324 BLAKE2B 9111bbad7d92ee73da6aa606246802937183986b8346cdc5b74d1115b0cd31255bd2eb379bbe2ddba6146edb607f96c735a85abf6b4831384587bf2df6b00749 SHA512 a47a9b4d642d33a4ed9cccc351fcdc317cc41482b5a10bc9a38500f6c20ba9c0afc88f864c63e5c916d205cb685b4d653f001c4f4719a86e7bc4670acbf9f108 +EBUILD kguiaddons-5.102.0-r1.ebuild 1078 BLAKE2B 095eca830c2b31d7d38afe4a87a6000496a5661f91ea7d5637e50b372052346441b7e63d01e65185d977da5b82a9ba24c7b8d6b562fc6b7f1b109a6719ae219d SHA512 f346c80b9739e72d0c8233664d1850ac5faa1e8dcf15fe10d5316757684bc8fb026d20859d973676508a93eaebba22899682249963a75cfb387086b17cd8aef8 EBUILD kguiaddons-5.102.0.ebuild 1002 BLAKE2B 662ae41f5d7da92b40d61327bf3f8fbbdf69b90906f19837f6d92ce676aa2803ebf8d9f0d45efcddb85c93965a36d8277fa549f4faeff72f593843ccb4847a43 SHA512 6f7df88a7fea3f8280fa728fb9b0d4cd1cc21ff71ffe14a1f1cc69d295abc98722cc180fb9857385ecf95000c90ebe02b0f61e170a7404765ceb7229aac4582d EBUILD kguiaddons-5.99.0.ebuild 928 BLAKE2B 1e66ee806beb05532f8289352cd8879f113e9e9f0952a0ab85ac2f19a36f5bbf195071bf88b3b35222f6d99afc61b012752e7da3f8e9edb40bf0df27a1b52815 SHA512 ef749031a2fe2a9dfaa11b6e3ce9c2c674e59b69166dcbb64bd1b2ae8bad7b88dcc6a4f11b492e77421421ff14419323555d3fd00f3a9d20e96e498ff2c3ad6b MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/kguiaddons/files/kguiaddons-5.102.0-fix-waylandclipboard.patch b/kde-frameworks/kguiaddons/files/kguiaddons-5.102.0-fix-waylandclipboard.patch new file mode 100644 index 000000000000..e8b157abebec --- /dev/null +++ b/kde-frameworks/kguiaddons/files/kguiaddons-5.102.0-fix-waylandclipboard.patch @@ -0,0 +1,47 @@ +From dcb254dc6b4e5b76e04a5ee8b4db8177aff10d29 Mon Sep 17 00:00:00 2001 +From: David Redondo <kde@david-redondo.de> +Date: Fri, 27 Jan 2023 13:17:43 +0100 +Subject: [PATCH] waylandclipboard: roundtrip to get accurate focus state + +The current approach is too complicated and not correct anyway. +To summarize QGuiApplication::focusWindow is delayed so the focus +watcher was introduced, however when the window is hidden and +setMimeData called before Wayland events have been processed, +then focusWatcher is naturally out of sync, so the check +was complicated to work around this state. However the same +issue arises when the window is deleted before calling +setMimeData. +Instead of introducing more complicated checks and workaround +roundtrip so the focusWatcher state is up to date before setting +the clipboard. +BUG:463199 +FIXED-IN: 5.103 +--- + src/systemclipboard/waylandclipboard.cpp | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/systemclipboard/waylandclipboard.cpp b/src/systemclipboard/waylandclipboard.cpp +index 4c68904..d6c4c08 100644 +--- a/src/systemclipboard/waylandclipboard.cpp ++++ b/src/systemclipboard/waylandclipboard.cpp +@@ -591,9 +591,14 @@ void WaylandClipboard::setMimeData(QMimeData *mime, QClipboard::Mode mode) + if (!m_device) { + return; + } +- // If the application is focused, use the normal mechanism so a future paste will not deadlock itself +- // On enter Qt delays processing of the enter event but when a window is hidden the leave event arrives after hiding the window +- if (const auto fw = QGuiApplication::focusWindow(); (fw && fw->isVisible()) || (!fw && m_keyboardFocusWatcher->hasFocus())) { ++ ++ // roundtrip to have accurate focus state when losing focus but setting mime data before processing wayland events. ++ auto native = qGuiApp->platformNativeInterface(); ++ auto display = static_cast<struct ::wl_display *>(native->nativeResourceForIntegration("wl_display")); ++ wl_display_roundtrip(display); ++ ++ // If the application is focused, use the normal mechanism so a future paste will not deadlock itselfs ++ if (m_keyboardFocusWatcher->hasFocus()) { + QGuiApplication::clipboard()->setMimeData(mime, mode); + return; + } +-- +GitLab + diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.102.0-r1.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.102.0-r1.ebuild new file mode 100644 index 000000000000..5d03529205c3 --- /dev/null +++ b/kde-frameworks/kguiaddons/kguiaddons-5.102.0-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_NONGUI="false" +QTMIN=5.15.5 +VIRTUALX_REQUIRED="test" +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing assorted high-level user interface components" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="dbus wayland X" + +# slot op: includes qpa/qplatformnativeinterface.h +RDEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) + wayland? ( + dev-libs/wayland + >=dev-qt/qtgui-${QTMIN}:5=[wayland] + >=dev-qt/qtwayland-${QTMIN}:5 + ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 ) + X? ( x11-libs/libxcb ) +" +BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )" + +PATCHES=( "${FILESDIR}/${P}-fix-waylandclipboard.patch" ) # KDE-bug 463199 + +src_configure() { + local mycmakeargs=( + -DWITH_DBUS=$(usex dbus) + -DWITH_WAYLAND=$(usex wayland) + -DWITH_X11=$(usex X) + ) + ecm_src_configure +} diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest index f1d7f26378e4..5a86180fd26a 100644 --- a/kde-frameworks/kirigami/Manifest +++ b/kde-frameworks/kirigami/Manifest @@ -1,5 +1,8 @@ +AUX kirigami-5.102.0-fix-title-delegate-elision-glitch-1.patch 2012 BLAKE2B 8f6a1dbadc5911096716ac603bd729dbe354906582e412d079ab4f0786b8ff0d6877710833f2bea47f913e09028aeae6a3087dddc2b24a6af40c75efbc6e520d SHA512 d2d173cc84086674e58dd9f5bb6530aa39de2dbb5aa9b56d12c3d943988843144d958d09d02d9152c582160844d294829d9119f2ac0f37b13669fe947520df55 +AUX kirigami-5.102.0-fix-title-delegate-elision-glitch-2.patch 3536 BLAKE2B c93834f6f0eef9c21bf194ea08ef43ee8b38aede8927dac4295cdd4fce768f8e6a59e12a2d85164fe3ab975597e53d2d81eaa3a2926acdd75abb3cd214d63138 SHA512 62abf63ee5758ecf52d4f4536e37ead4265eb208cc9cfa16ceb86dd79b0c047f9c90de7657c186fcea04a9a167e89f1b781c8607fc06eb4875969e5812211c0b DIST kirigami2-5.102.0.tar.xz 371140 BLAKE2B 827f7a82f2a0b8c98516718aef5556d7f072d9fe2aa82115fbf5445d9cf19de8957c929a70f4c329ec0a4c1424d6bc926e028d4d19909c88997b80c791506108 SHA512 dee0dfbe8f4d7cc329707510f5ab4beef436de4887978b790bdd98ef001e3241768c9edcdfe39204b5c53997bdf7779457f7293b923282acd27a1dea4c1d911c DIST kirigami2-5.99.0.tar.xz 365032 BLAKE2B 45d7691e2a5eba7a60c133436a8187c1af1d132d06e516057160b99769a2db5acd7d1b14425a6b4e28bf4f84b388a9e890c58c67ed0577e067db00af7ac00f1c SHA512 ca7fdd861483f22e7c028b65c0daed9756556053fd3db43e2fa991643a9f38ebec3e2840d9bc04f4caa81c50757a16c96609300aa7c85361a23267eff7985533 +EBUILD kirigami-5.102.0-r1.ebuild 1305 BLAKE2B 5305a08d489ef1a1331fe4b6c80635805c9609d5ac2f45f414f10228b72016306c6858a79bd3f48d5d66dcc7e2b9faae8fa4d5bc1e32eb6ddac88bcc79a78bd3 SHA512 844d23d3c4a1bc63457773978e9d537e3833573c041669af1ee97940ac30801cc0bdf88d5bc8ec4ef1562cacaf6b2cc3a4ed2daa50e3c2b35c18da7d93ad2c15 EBUILD kirigami-5.102.0.ebuild 1227 BLAKE2B 649d51a9a91c0816c1ef4fd0507ad69b57cc6e227e1fee498d5d911b373fe208cc5b4be17756958b1c8d4b949dced295ddceb164fbf83e34a3eee2eb8e1ce4e0 SHA512 045f4caa93f67e444fe79dbb8cf54241b267d1265cfce7aa2f14b18e60f5a22a3087baf5464d1c8d29fc0ef20a6460a5e8c4928ba0cb6bfb710eb77eb0419336 EBUILD kirigami-5.99.0.ebuild 998 BLAKE2B 527ae1e81dce244f53dff19e2c6aaae053781fecf519c9e2204d3fd15ccd936709707afb798ef28dbf1c382c1196e662977f053d2a26ae85c20716c54991b666 SHA512 56dcdf0c9bb3a46249011b2ab2183ff5b37d33476a37b0185083fc6acf23bccf9c88b759dfaeb2adf76011148deb033ea4c14ab3e8c3480b5d2ed60a0ec71c72 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-1.patch b/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-1.patch new file mode 100644 index 000000000000..31d38f3313b2 --- /dev/null +++ b/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-1.patch @@ -0,0 +1,59 @@ +From f69ff1b0fec56486fd96fd1154160593c1ccedeb Mon Sep 17 00:00:00 2001 +From: ivan tkachenko <me@ratijas.tk> +Date: Wed, 11 Jan 2023 02:50:10 +0300 +Subject: [PATCH] Page: Fix title delegate elision glitch + +Implicitly sized items like QtQuick/Text don't play nicely with Loader, +and generally with kinda-recursive bindings on Layout.* properties. + +This combination of two fixes does the trick: + +1. Use extra TextMetrics for reliable width/height values. +2. Round up text's advance width, so that container loader or layout +won't ever round it down (which it did with implicitWidth before). + +(cherry picked from commit bc03a15b52c7512a1757da77963be5e1e48d5df1) +--- + src/controls/Page.qml | 24 ++++++++++++++++++------ + 1 file changed, 18 insertions(+), 6 deletions(-) + +diff --git a/src/controls/Page.qml b/src/controls/Page.qml +index fccb96ebb..8c9aa04ab 100644 +--- a/src/controls/Page.qml ++++ b/src/controls/Page.qml +@@ -248,14 +248,26 @@ QQC2.Page { + */ + property Component titleDelegate: Component { + id: defaultTitleDelegate +- Kirigami.Heading { ++ Item { + Layout.fillWidth: true +- Layout.maximumWidth: implicitWidth + 1 // The +1 is to make sure we do not trigger eliding at max width + Layout.minimumWidth: 0 +- maximumLineCount: 1 +- elide: Text.ElideRight +- text: root.title +- textFormat: Text.PlainText ++ Layout.maximumWidth: implicitWidth ++ implicitWidth: Math.ceil(metrics.advanceWidth) ++ implicitHeight: metrics.height ++ ++ Kirigami.Heading { ++ id: heading ++ anchors.fill: parent ++ maximumLineCount: 1 ++ elide: Text.ElideRight ++ text: root.title ++ textFormat: Text.PlainText ++ } ++ TextMetrics { ++ id: metrics ++ font: heading.font ++ text: heading.text ++ } + } + } + +-- +GitLab + diff --git a/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-2.patch b/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-2.patch new file mode 100644 index 000000000000..4da10130a1b7 --- /dev/null +++ b/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-2.patch @@ -0,0 +1,114 @@ +From eacfc6961158cc4f493a5d7e3c47619157f54291 Mon Sep 17 00:00:00 2001 +From: ivan tkachenko <me@ratijas.tk> +Date: Wed, 11 Jan 2023 23:00:03 +0300 +Subject: [PATCH] Page: Split default page title delegate into separate + component + +There's no need to clutter Page component with potentially unused Items +and IDs, and an extra self-contained component wouldn't hurt. + +(cherry picked from commit e9f19ecd20a881a6bfeaf0676fc8d6f570fe387f) +--- + src/CMakeLists.txt | 1 + + src/controls/Page.qml | 22 +--------- + .../private/DefaultPageTitleDelegate.qml | 43 +++++++++++++++++++ + 3 files changed, 46 insertions(+), 20 deletions(-) + create mode 100644 src/controls/private/DefaultPageTitleDelegate.qml + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 28c17c137..e3e7b3569 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -216,6 +216,7 @@ ecm_target_qml_sources(KirigamiPlugin PRIVATE PATH private SOURCES + controls/private/DefaultCardBackground.qml + controls/private/DefaultChipBackground.qml + controls/private/DefaultListItemBackground.qml ++ controls/private/DefaultPageTitleDelegate.qml + controls/private/EdgeShadow.qml + controls/private/GlobalDrawerActionItem.qml + controls/private/PageActionPropertyGroup.qml +diff --git a/src/controls/Page.qml b/src/controls/Page.qml +index 8c9aa04ab..2641b96cf 100644 +--- a/src/controls/Page.qml ++++ b/src/controls/Page.qml +@@ -248,26 +248,8 @@ QQC2.Page { + */ + property Component titleDelegate: Component { + id: defaultTitleDelegate +- Item { +- Layout.fillWidth: true +- Layout.minimumWidth: 0 +- Layout.maximumWidth: implicitWidth +- implicitWidth: Math.ceil(metrics.advanceWidth) +- implicitHeight: metrics.height +- +- Kirigami.Heading { +- id: heading +- anchors.fill: parent +- maximumLineCount: 1 +- elide: Text.ElideRight +- text: root.title +- textFormat: Text.PlainText +- } +- TextMetrics { +- id: metrics +- font: heading.font +- text: heading.text +- } ++ P.DefaultPageTitleDelegate { ++ text: root.title + } + } + +diff --git a/src/controls/private/DefaultPageTitleDelegate.qml b/src/controls/private/DefaultPageTitleDelegate.qml +new file mode 100644 +index 000000000..8c84d1b5c +--- /dev/null ++++ b/src/controls/private/DefaultPageTitleDelegate.qml +@@ -0,0 +1,43 @@ ++/* ++ * SPDX-FileCopyrightText: 2023 ivan tkachenko <me@ratijas.tk> ++ * ++ * SPDX-License-Identifier: LGPL-2.0-or-later ++ */ ++ ++import QtQuick 2.15 ++import QtQuick.Layouts 1.15 ++import org.kde.kirigami 2.20 as Kirigami ++ ++/** ++ * This component is used as a default representation for a page title within ++ * page's header/toolbar. It is just a Heading item with shrinking + eliding ++ * behavior. ++ * ++ * \private ++ */ ++Item { ++ property alias text: heading.text ++ ++ Layout.fillWidth: true ++ Layout.minimumWidth: 0 ++ Layout.maximumWidth: implicitWidth ++ ++ implicitWidth: Math.ceil(metrics.advanceWidth) ++ implicitHeight: metrics.height ++ ++ Kirigami.Heading { ++ id: heading ++ ++ anchors.fill: parent ++ maximumLineCount: 1 ++ elide: Text.ElideRight ++ textFormat: Text.PlainText ++ } ++ ++ TextMetrics { ++ id: metrics ++ ++ font: heading.font ++ text: heading.text ++ } ++} +-- +GitLab + diff --git a/kde-frameworks/kirigami/kirigami-5.102.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.102.0-r1.ebuild new file mode 100644 index 000000000000..246e902cfecb --- /dev/null +++ b/kde-frameworks/kirigami/kirigami-5.102.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 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.5 +inherit ecm frameworks.kde.org toolchain-funcs + +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}}" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="+openmp" + +# 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=( "${FILESDIR}"/${P}-fix-title-delegate-elision-glitch-{1,2}.patch ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=$(usex examples) + $(cmake_use_find_package openmp OpenMP) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest index 0cabb9d5f294..228d1c5d195b 100644 --- a/kde-frameworks/plasma/Manifest +++ b/kde-frameworks/plasma/Manifest @@ -1,5 +1,7 @@ +AUX plasma-5.102.0-fix-flicker-on-fade-animation.patch 2092 BLAKE2B 73e7958fa8c61e8a0fca590642283f46e0655bd6da7f90a350c862e98046cbc14e3fe0c3e53079f7ad8df1e3872b21e032d13b0e40041ffc78f7261158bf27bc SHA512 3d57a2b8bff651950c946aaafbf606f814e0469ac75569a187bd71fa6afd4a0e487a944219247525a0323afe2c36d40c2d1ad99e41ceb0588da91f43d034e9df DIST plasma-framework-5.102.0.tar.xz 3305096 BLAKE2B 225bb5a2d3cc5e0631defa59bafaeef49e6b1c4cf650d19d4b15cd270ec47ab2a613d4e3689bdea8d6cee19ed26aff78cb5c24a1ef0c8245fac4b80fa2a2147d SHA512 0db243ad6425c1f543149f4d939b7787cc20af526d4e81246debf7910b05a318cf18822ab0518d70dbb2641ad5853359a4e23104138f131c3a4073237c56d4b1 DIST plasma-framework-5.99.0.tar.xz 3141664 BLAKE2B b37534440bc1f3d8f5fc13b6b62527c1bdde4b5d5d1c88530c49da2be221c9f55afac832cd8db61eb1bb91328145bc9b4c9e7b227b1ce740b10fa1bbefd3d2ef SHA512 bcf4f33facb20b542a90f5216fc0c5778d4de51d6a0ae86abdd5a22d7d1bfd7156dfd7a7d6cdad524b8f98596a75aa064fcbb295a36161ce288d4be4f42c5abb EBUILD plasma-5.102.0-r1.ebuild 1945 BLAKE2B 3108cbd3ea42e08678c6aabc3eebcb84a5a547aaf995d3de52e5cf3394a4aa7f75cd54f665f04b85538b82d8fe93ec84f444de8ad2b38f9e2d3b4a699295758a SHA512 7cf34b6f753f4c6bfe80389969796eeb8c6ab57042c585da1e8d1229ed8e4401ea994e5a909f7c9ff78d0431d24ae06b9672895a4cdfdb5f6c64d6d8152e65dc +EBUILD plasma-5.102.0-r2.ebuild 2038 BLAKE2B 977118fa8d1333a54270eeaeebca8ec629988d8ebe2b3c9c6af72d0735e649a5b1de8e8730e43f6afa6632920a2d6b2c3f1568db78255d4762050c356814f616 SHA512 c63154c59c32b7b2298032802cc6e2f9318e1b7d99975faa05a11bb3c026cf4b21f7d044b69003d451c2f43b913a41bfc8aad98e26c9a7bfd80fa167b24d9236 EBUILD plasma-5.99.0.ebuild 1926 BLAKE2B f241e720ae257014353cc38da113054dee7165a535a4e38d4c116c9f3a3680308f16d286ce4e76f28d50e56e3acbbb0c26d410f21449d9e88b32624ca30c83bf SHA512 7400aa7e239e3f9855850cb534f5bb6e173326cd2c2c7f05f66435c9bf96afcb3fa61d5e86d3a387c45b0ed75a8b438e7b895fd3e0c9b86b0fefe705c1c236a6 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch b/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch new file mode 100644 index 000000000000..1c6ddab618aa --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch @@ -0,0 +1,44 @@ +From 3fcd43a6ed03d0aff188dfc190cc464c34302a1f Mon Sep 17 00:00:00 2001 +From: Arjen Hiemstra <ahiemstra@heimr.nl> +Date: Tue, 10 Jan 2023 12:46:20 +0100 +Subject: [PATCH] iconitem: Adjust fade animation to not flicker as much + +As it turns out, mix(old texture, new texture, animation value) does +actually result in a different visual from simply blending the two +textures on top of each other, because the old texture first gets +blended with the underlying color. This results in some of the +underlying color bleeding through, which can cause flickering if the two +textures are almost the same. To avoid this, change the animation +slightly so that rather than crossfading, we first fade in the new +texture then fade out the old texture. This doesn't cause a whole lot of +visual difference for two completely different textures, but removes the +flickering when they are very similar. + +BUG: 463061 +BUG: 463685 +--- + src/declarativeimports/core/iconitem.cpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp +index de1f56c69..a474a72f9 100644 +--- a/src/declarativeimports/core/iconitem.cpp ++++ b/src/declarativeimports/core/iconitem.cpp +@@ -645,8 +645,12 @@ QSGNode *IconItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *update + m_textureChanged = true; + } + +- updateSubtree(oldNode->firstChild(), 1.0 - m_animValue); +- updateSubtree(oldNode->lastChild(), m_animValue); ++ // Rather than doing a perfect crossfade, first fade in the new texture ++ // then fade out the old texture. This is done to avoid the underlying ++ // color bleeding through when both textures are at ~0.5 opacity, which ++ // causes flickering if the two textures are very similar. ++ updateSubtree(oldNode->firstChild(), 2.0 - m_animValue * 2.0); ++ updateSubtree(oldNode->lastChild(), m_animValue * 2.0); + } else { + if (oldNode->childCount() == 0) { + oldNode->appendChildNode(createSubtree(1.0)); +-- +GitLab + diff --git a/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild new file mode 100644 index 000000000000..19a29410133d --- /dev/null +++ b/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2023 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.5 +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" + +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +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 + >=dev-qt/qtx11extras-${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[X] + =kde-frameworks/kxmlgui-${PVCUT}*:5 + x11-libs/libX11 + x11-libs/libxcb + !gles2-only? ( media-libs/libglvnd[X] ) + wayland? ( + =kde-frameworks/kwayland-${PVCUT}*:5 + media-libs/libglvnd + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" + +PATCHES=( "${FILESDIR}/${P}-fix-flicker-on-fade-animation.patch" ) # KDE-bug 463061, 463685 + +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) + ) + + ecm_src_configure +} |