gentoo auto-resync : 23:09:2022 - 23:30:45

5 files changed, 94 insertions, 1 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 4c33db87bf11..a21295ce823b 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 42a04ea1e6e1..56f8b31ce811 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -4,9 +4,11 @@ AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95
 AUX plasma-workspace-5.22.5-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd
 AUX plasma-workspace-5.24.80-split-libkworkspace.patch 1175 BLAKE2B 74dabcc26da223fb46bd97c2d07b5913ad51ab85a20062835dbb80b2a555129029996f99129ea9d99af76399722a404cf9baabbea48de4ab4392f068539f3c9f SHA512 95a63a106242449cdf605f943e794e07834b5d1e8fff2ad4e6a025fd68cc20fc6725ec0f0389898c4fe8c87587c7a51381b343cf116b2ff812236f0fe95ed314
 AUX plasma-workspace-5.25.5-delay-ksplash-until-after-env-setup.patch 2718 BLAKE2B 92a97286860d97a64f6bc19bfe0a1e42a85d594a7a9bc7d879ed08a92b3a0a1e03030c6c06315929534c51116e04c00a35330f0642e6fdd22dbb32353b9b58bd SHA512 2ec73f0c30a1bf2d73a4f63b76551bbbabff87462077e7137c699b0d65d6e5b52100d1bf66b279ce5cac8f52f5c54612a9a51e7b7ced91d09740cb8f79cc9497
+AUX plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch 1920 BLAKE2B 0bf6253ad9b2d9fa83ddc04cf804311053ec310f6d5bed67a0b67f542957294da697dcf402c7b46984631d4a0aa830f52c8c90a753351fdb4dc25b1170c0f201 SHA512 8891594b6895dfc46968ece1d4dfb69b6eb2f9b6500cc72bcec1d1e7600a3b5225b84af8e7408e648908e7ed3022d271322bf983450f5f9af5f0bb249b5c1541
+AUX plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch 992 BLAKE2B bace8863e329cd23caa6770fe47d716701adc0245b437606545d0a286c48f54325b35a9ea70cc267cc1533f48de59fe3d4fe0a92c3ef6699cc24dc33276959d5 SHA512 1c3196b5309b234163e6c9dfca3788a958791f6b81a4b69e40ff1fbe60676875615dd85d6a769f94963af35028d2e8fdbf819d89c2bf4f16cf9ca070fd7a78be
 AUX plasma-workspace-5.25.5-widgetexplorer-recurse-containments.patch 1438 BLAKE2B d33271c8fafe0e7b14205009d541f6d7bba98e405a47f0d5c85fc60028d093a4e8b135dac122a18bc78288ed43d489adef6e66ff53e4ddc2098f74a1525126e6 SHA512 7f623ca5d8a184cb31af5039e49ac0a8a6a35cc9ada2959d2ae38fb2e4e1aafc44d3e684740a9d0c97b00e92af858b2ab374c2d5c793b17dac2e4808239dd0e0
 DIST plasma-workspace-5.24.6.tar.xz 18500752 BLAKE2B 1e469e91e8f1828f0b819aaa03f2918fa7df551786d7bbc963c7b4f7078719e9655176c5ddeea262175c36b14ba360e143e182dad78e369f833338ef147af06a SHA512 4e49f59d565e0b84951122155158966a54c05a6999ff99503bfff667c780fac6cfc076326f0cac7d53629bfc1d81599b30e919848168f6beb79a4dc7cf7c5560
 DIST plasma-workspace-5.25.5.tar.xz 18638932 BLAKE2B f83aabf84b775c0bf9d1e60db03f94400e3363fa8f45767bdc471706682cda7323fae4948cffa156188cc7ed2d30d05349a385dd370ef941c16464ddddf8fa01 SHA512 0c6cf5104b584b34a8bcb45d57069fed3b25e871fccf1bfefd47d8fc1b595867c1c4f0fcfcc0e07847534e1e77ce8ed1f3be1ac6cb7eea8669a9c7649c8466cb
 EBUILD plasma-workspace-5.24.6.ebuild 6504 BLAKE2B 70a8668b7062c419bc5b671f0e0359c590f5a340d2289b0688d24b3f5dac135ea3788863873a304c3c43ee38576424a29fe0dfe2ba60629cd63669b9606c379f SHA512 9d611f6ae062daac80f4d4f9fdeb8535ac5f567b9215797a4eba33e23fd808c3c61ab8b3956a4199e6b46635f766cd7f9bdb7cf20edb4907bb37746f5e54b51e
-EBUILD plasma-workspace-5.25.5-r2.ebuild 6752 BLAKE2B 15a43994f708886bd3740a7c020aed7e66a40d1a905a8110b7cc367e675ff24c3bfa2669396ae5aeb930e61ca087290174651ee21be5880099eff88e27b991cc SHA512 72177aa799b5ed60cc6a01784fc915866c162d18be18074d7f8995b615ea9bf9e9669edac8425d034a8a7d2d63aaac02b7a1cea339dc4798c9477c02af3e9f29
+EBUILD plasma-workspace-5.25.5-r3.ebuild 6958 BLAKE2B fa5bdce424fec74638726a7d4b9d2416ac2394bfa3eee1b44c211c43efbc22e531a5daffadc6f4fb3f45a5da053a8bf01ebbb16d1b8f9b94762e1641daab8d8b SHA512 b549689c7afc50889bf020d72649979fc27ce999a9346ca094c6606528f1e53b202e4f0bd0a5fbc82fe821e1154ca8eb2516ae11469d3de6e237343d6df928ee
 MISC metadata.xml 726 BLAKE2B ee1a0b82d5852d7c68784107563ccf0245d26cfcc1c2f2bb4cef243b7ab9a0925c0cbe848f387ebe7928ea68cb50c9c267203c00535b716bdb1c7c56eb4cbcff SHA512 f7ffe99faf800f559dcd966c7f3f72523484a851870fcf9cead18b878f1089bc33a6d20fc682c2c45db012b1e908618bdfdb4590816554245c11dbb9baf10100
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch
new file mode 100644
index 000000000000..4e2b579646fc
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch
@@ -0,0 +1,55 @@
+From dc24b7c1c4e2c9dfb74090f716da029e44e209ff Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Mon, 19 Sep 2022 12:39:54 +0200
+Subject: [PATCH] fonts: honor & present system defaults
+
+previously we'd pretend that a missing value meant our "plasma-ish"
+defaults would apply but that is utterly false. when no hitting is set,
+no hinting is set. this can happen when the system default fontconfigs
+don't set up any hinting.
+
+BUG: 416140
+
+
+(cherry picked from commit 5dd8cc919f54bf28152a80e1fa6f3f649ea4e47a)
+---
+ kcms/fonts/fontsaasettings.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/kcms/fonts/fontsaasettings.cpp b/kcms/fonts/fontsaasettings.cpp
+index a7159b0e63..e7192aa89d 100644
+--- a/kcms/fonts/fontsaasettings.cpp
++++ b/kcms/fonts/fontsaasettings.cpp
+@@ -1,5 +1,6 @@
+ /*
+     SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>
++    SPDX-FileCopyrightText: 2022 Harald Sitter <sitter@kde.org>
+ 
+     SPDX-License-Identifier: GPL-2.0-or-later
+ */
+@@ -211,18 +212,18 @@ public:
+         // sub pixel
+         KXftConfig::SubPixel::Type spType = KXftConfig::SubPixel::NotSet;
+         xft.getSubPixelType(spType);
+-        // if it is not set, we set it to rgb
++        // if it is not set, we have no subpixel hinting
+         if (spType == KXftConfig::SubPixel::NotSet) {
+-            spType = KXftConfig::SubPixel::Rgb;
++            spType = KXftConfig::SubPixel::None;
+         }
+         setSubPixel(spType);
+ 
+         // hinting
+         KXftConfig::Hint::Style hStyle = KXftConfig::Hint::NotSet;
+         xft.getHintStyle(hStyle);
+-        // if it is not set, we set it to slight hinting
++        // if it is not set, we have no hinting
+         if (hStyle == KXftConfig::Hint::NotSet) {
+-            hStyle = KXftConfig::Hint::Slight;
++            hStyle = KXftConfig::Hint::None;
+         }
+         setHinting(hStyle);
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
new file mode 100644
index 000000000000..457470f0807c
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
@@ -0,0 +1,33 @@
+From 9c7ac7061c5c85d63875eaee70793ba04334c1d0 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 16 Sep 2022 14:34:27 +0000
+Subject: [PATCH] Revert "Revert "Prevent panel going out of screen
+ boundaries""
+
+This reverts commit 17774bc4c673294a7c8a6e80660d83cce1ba8891
+
+There is still a known culprit (duplicate display names) so the hack shouldn't be reverted.
+
+CCBUG: 353975
+CCBUG: 438114
+---
+ shell/panelview.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index b5c87bbf71..4be1e26ca4 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -859,6 +859,9 @@ void PanelView::moveEvent(QMoveEvent *ev)
+     updateEnabledBorders();
+     m_strutsTimer.start(STRUTSTIMERDELAY);
+     PlasmaQuick::ContainmentView::moveEvent(ev);
++    if (m_screenToFollow && !m_screenToFollow->geometry().contains(geometry())) {
++        positionPanel();
++    }
+ }
+ 
+ void PanelView::keyPressEvent(QKeyEvent *event)
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild
index 809aabe37bf7..212a7c1e7178 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild
@@ -24,6 +24,7 @@ RESTRICT="test"
 
 # slot op: various private QtWaylandClient headers
 COMMON_DEPEND="
+	dev-libs/icu:=
 	>=dev-libs/wayland-1.15
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
@@ -157,6 +158,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
 	"${FILESDIR}/${P}-widgetexplorer-recurse-containments.patch" # https://mail.kde.org/pipermail/distributions/2022-September/001287.html
 	"${FILESDIR}/${P}-delay-ksplash-until-after-env-setup.patch" # KDE-bug 458865 w/ Qt 5.15.6
+	"${FILESDIR}/${P}-fonts-honor-and-present-system-defaults.patch" # KDE-bug 416140
+	"${FILESDIR}/${P}-prevent-panel-go-out-of-screen.patch" # git master and Plasma/5.24 branch double revert
 )
 
 src_prepare() {