gentoo resync : 11.05.2021

3 files changed, 256 insertions, 6 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 3e6e504f9b6b..dad2ab40ec5f 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,8 +1,9 @@
 AUX plasma-desktop-5.20.5-compress-new-input-notifications.patch 3572 BLAKE2B 90872167841b752dd3803d176cddc5ff053e64a4f0dd95bdfda8565c683c0e837b8df7e34efbc16abcf95b75821b73a7ea114da7dfb4ccbec73d3921d8d131eb SHA512 2468be82790c7beb41d8b40aaae5b0490be04761b687188790bd80d0c66ed28a7b26468dba60338bf4ea45a15700e32c1ade1fe1530d693457a9470b7b10f883
 AUX plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch 995 BLAKE2B b4e00a862885bae9cad600c0a67dfb1578c2bda0bb96b9585d5690f3d4303de1cd6808c7abc3709c030dba25c98d9cb7d4e8d0aafe0d1b89ffe48a6b9d15101a SHA512 3ad5a021eef8a20564b06a4a67952484712733efb989274438330343d40c86164fcacfe41d39b36d8ffb8839de1be17b63b39ed0ac705b5dd660bb2bdf22a9b9
+AUX plasma-desktop-5.21.5-transparency.patch 8828 BLAKE2B d847a5daf3836ecbc1cbc0bacb8e6a507e5a060330d835cbb5500982d0d20148831be53e39b9613fb48d0cb5c3203b00dafa7a627ff4471d866ac6217691b729 SHA512 9b7b73d59e7d52a1acc4eb2db498c8baa31853561900653c86d6ba651093099c4bc98197a23914276ca18553c538a79b927f5829feefbbbc76592f36947fc8c7
 DIST plasma-desktop-5.20.5.tar.xz 15899532 BLAKE2B 1ed7d6c1bbc8b368ed98c4f35bcfd10f8436909a8f66fbfdf2e4e5eb8b8dcd36903600a934512dac7a07d54ef830ed2604e1ee39df6e40156ef7cec1e96dd041 SHA512 a1af8d04dbf16e94777e018ff0f289b69928ccefeb31e6dc73a2425d6170a0a5a3fdc324d192b41664cd118eea9b15cb6e7bd3f49ee03095ede16a3fa53a6f2b
-DIST plasma-desktop-5.21.4.tar.xz 15914768 BLAKE2B e816775c1c6aba4d94db1c56f4298a43c488d720d0b84b7e1da63020a7f40e4cd9a034ce570f7b2f691194200bcccabed5b1ed029721787c238f2664968cb891 SHA512 91cce61b1c685266eb53a34f6533a95d092901280e48ed6ed8364a9b9f6d32594a1d5209fc52295e1c2ecdec40f39959dd332fa61cd914c0199d1e81b9596dd3
+DIST plasma-desktop-5.21.5.tar.xz 15913496 BLAKE2B 6923a4c48d20f2611ab92ec34517a339a4fbc53875545beb5c33700933262f67b48b22ea311812d7b0cd4a169a4b19f497c0cd559c5b5f74e52410e30c187ec7 SHA512 40814910676a05d3d5a308a432c06ce9664b90724fe8c56c4f68f6eb939f35401f19dddb8c46006f44fa418e0f18b4a42b0ff78b5b07031f54e6b3c10c919e57
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
 EBUILD plasma-desktop-5.20.5-r1.ebuild 4879 BLAKE2B a099ab12d2c22952694f9990180523bcd3d36c2f2166baa6d8fc78a6c81a9c69d48b3cbaecb1d96984ad629bffe16709ab193069fdb5f4f522691b993a8c14a8 SHA512 74bd8aa888856ca1ea599e5df140f4236db55a4e18f0e4a4a69119c549649822cb7ac28a40ea1a596d9b72427dba98852b17a5dabb7eced8e5472d537be3ebab
-EBUILD plasma-desktop-5.21.4.ebuild 4922 BLAKE2B 21fbf7d3e8351ffc280bc2074dea08b4345faa4cb95f79eeeae24b6387357d62c998b8e75ad0442a320039e497543993f703f707f53c19bbbad8b6b3a693aa72 SHA512 5fda0060d3ca4b4d2abf7b66ca0cb1eb148c9dd908d0a3f78f7f1d4d620df274b6101d6660278db916a8957b1cc1c0c9c3f06686425e1e2fad817fd8ca21ea54
+EBUILD plasma-desktop-5.21.5.ebuild 5196 BLAKE2B 60c867601091f91d2f4fca44a30423d7701e9f41ec1527dbbee1a6ceac875699007ec370a05a6d051c9ad6f4f61cf1f4f55e5599dc50634d6876876ddecb853a SHA512 50a309c3ddd1c9ffb30e7f10caca7d68fbb373d0b102b2a9509c043e79070046113de086bedd92004ff22550dc1637ae38fe27afeeacaf404dd63cf864286349
 MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch
new file mode 100644
index 000000000000..3066d3a2747b
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch
@@ -0,0 +1,239 @@
+From 6fb37dc0260c298bc35ec5e39399aa1f31693e79 Mon Sep 17 00:00:00 2001
+From: Carson Black <uhhadd@gmail.com>
+Date: Thu, 6 Aug 2020 11:58:23 +0200
+Subject: [PATCH] Implement adaptive opacity for panels
+
+---
+ .../contents/applet/CompactApplet.qml         |   1 +
+ .../panelconfiguration/MoreSettingsMenu.qml   |  35 +++++
+ desktoppackage/contents/views/Panel.qml       | 144 +++++++++++++++++-
+ 3 files changed, 174 insertions(+), 6 deletions(-)
+
+diff --git a/desktoppackage/contents/applet/CompactApplet.qml b/desktoppackage/contents/applet/CompactApplet.qml
+index 0d4c85f52..65eb0468e 100644
+--- a/desktoppackage/contents/applet/CompactApplet.qml
++++ b/desktoppackage/contents/applet/CompactApplet.qml
+@@ -153,6 +153,7 @@ PlasmaCore.ToolTipArea {
+         visualParent: compactRepresentation ? compactRepresentation : null
+         location: plasmoid.location
+         hideOnWindowDeactivate: plasmoid.hideOnWindowDeactivate
++        backgroundHints: (plasmoid.containmentDisplayHints & PlasmaCore.Types.DesktopFullyCovered) ? PlasmaCore.Dialog.SolidBackground : PlasmaCore.Dialog.StandardBackground
+ 
+         property var oldStatus: PlasmaCore.Types.UnknownStatus
+ 
+diff --git a/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml b/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
+index 2e577fbcc..d668eb3c2 100644
+--- a/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
++++ b/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
+@@ -131,6 +131,41 @@ PlasmaCore.Dialog {
+                 flat: false
+             }
+         }
++        PlasmaExtras.Heading {
++            level: 3
++            text: i18nd("plasma_shell_org.kde.plasma.desktop", "Opacity")
++            visible: panel.adaptiveOpacityEnabled
++        }
++        PlasmaComponents.ButtonColumn {
++            spacing: 0
++            visible: panel.adaptiveOpacityEnabled
++            Layout.fillWidth: true
++            Layout.minimumWidth: implicitWidth
++            PlasmaComponents.ToolButton {
++                width: Math.max(implicitWidth, parent.width)
++                text: i18nd("plasma_shell_org.kde.plasma.desktop", "Adaptive")
++                checkable: true
++                checked: configDialog.opacityMode === 0
++                onClicked: configDialog.opacityMode = 0
++                flat: false
++            }
++            PlasmaComponents.ToolButton {
++                width: Math.max(implicitWidth, parent.width)
++                text: i18nd("plasma_shell_org.kde.plasma.desktop", "Opaque")
++                checkable: true
++                checked: configDialog.opacityMode === 1
++                onClicked: configDialog.opacityMode = 1
++                flat: false
++            }
++            PlasmaComponents.ToolButton {
++                width: Math.max(implicitWidth, parent.width)
++                text: i18nd("plasma_shell_org.kde.plasma.desktop", "Translucent")
++                checkable: true
++                checked: configDialog.opacityMode === 2
++                onClicked: configDialog.opacityMode = 2
++                flat: false
++            }
++        }
+         PlasmaComponents.ToolButton {
+             Layout.fillWidth: true
+             text: i18nd("plasma_shell_org.kde.plasma.desktop", "Maximize Panel")
+diff --git a/desktoppackage/contents/views/Panel.qml b/desktoppackage/contents/views/Panel.qml
+index 2fd6ac4d5..cf6c04328 100644
+--- a/desktoppackage/contents/views/Panel.qml
++++ b/desktoppackage/contents/views/Panel.qml
+@@ -21,17 +21,27 @@ import QtQuick.Layouts 1.1
+ import QtQml 2.15
+ 
+ import org.kde.plasma.core 2.0 as PlasmaCore
++import org.kde.taskmanager 0.1 as TaskManager
+ 
+-PlasmaCore.FrameSvgItem {
++Item {
+     id: root
+ 
+-    imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "widgets/panel-background"
+-
+-    enabledBorders: panel.enabledBorders
+-
+     property Item containment
+ 
+-    property alias panelMask: root.mask
++    property alias panelMask: privateSwapper.mask
++
++    QtObject {
++        id: privateSwapper
++        property string completedState: ""
++        // Work around the fact that we can't use a ternary if in an alias
++        readonly property var mask: {
++            if (completedState == "opaque") {
++                return opaqueItem.mask
++            } else {
++                return translucentItem.mask
++            }
++        }
++    }
+ 
+     readonly property bool verticalPanel: containment && containment.formFactor === PlasmaCore.Types.Vertical
+ 
+@@ -47,6 +57,128 @@ PlasmaCore.FrameSvgItem {
+     readonly property int leftPadding: Math.round(Math.min(thickPanelSvg.fixedMargins.left, spacingAtMinSize));
+     readonly property int rightPadding: Math.round(Math.min(thickPanelSvg.fixedMargins.right, spacingAtMinSize));
+ 
++    TaskManager.VirtualDesktopInfo {
++        id: virtualDesktopInfo
++    }
++
++    TaskManager.ActivityInfo {
++        id: activityInfo
++    }
++
++    PlasmaCore.SortFilterModel {
++        id: visibleWindowsModel
++        filterRole: 'IsMinimized'
++        filterRegExp: 'false'
++        sourceModel: TaskManager.TasksModel {
++            filterByVirtualDesktop: true
++            filterByActivity: true
++            filterNotMaximized: true
++            filterByScreen: true
++
++            screenGeometry: panel.screenGeometry
++            virtualDesktop: virtualDesktopInfo.currentDesktop
++            activity: activityInfo.currentActivity
++
++            id: tasksModel
++            groupMode: TaskManager.TasksModel.GroupDisabled
++        }
++    }
++
++    PlasmaCore.FrameSvgItem {
++        id: translucentItem
++        enabledBorders: panel.enabledBorders
++        anchors.fill: parent
++
++        imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "widgets/panel-background"
++    }
++
++    PlasmaCore.FrameSvgItem {
++        id: opaqueItem
++        enabledBorders: panel.enabledBorders
++        anchors.fill: parent
++
++        imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "solid/widgets/panel-background"
++    }
++
++    transitions: [
++        Transition {
++            from: "*"
++            to: "transparent"
++            SequentialAnimation {
++                ScriptAction {
++                    script: {
++                        translucentItem.visible = true
++                    }
++                }
++                NumberAnimation {
++                    target: opaqueItem
++                    properties: "opacity"
++                    from: 1
++                    to: 0
++                    duration: units.veryLongDuration
++                    easing.type: Easing.InOutQuad
++                }
++                ScriptAction {
++                    script: {
++                        opaqueItem.visible = false
++                        privateSwapper.completedState = "transparent"
++                        root.panelMaskChanged()
++                    }
++                }
++            }
++        },
++        Transition {
++            from: "*"
++            to: "opaque"
++            SequentialAnimation {
++                ScriptAction {
++                    script: {
++                        opaqueItem.visible = true
++                    }
++                }
++                NumberAnimation {
++                    target: opaqueItem
++                    properties: "opacity"
++                    from: 0
++                    to: 1
++                    duration: units.veryLongDuration
++                    easing.type: Easing.InOutQuad
++                }
++                ScriptAction {
++                    script: {
++                        translucentItem.visible = false
++                        privateSwapper.completedState = "opaque"
++                        root.panelMaskChanged()
++                    }
++                }
++            }
++        }
++    ]
++
++    Component.onCompleted: {
++        state = Qt.binding(function() {
++            let mstate = '';
++            if (panel.opacityMode == 0) {
++                mstate = visibleWindowsModel.count > 0 ? "opaque" : "transparent"
++            } else if (panel.opacityMode == 1) {
++                mstate = "opaque"
++            } else {
++                mstate = "transparent"
++            }
++            if (mstate == 'opaque') {
++                containment.containmentDisplayHints |= PlasmaCore.Types.DesktopFullyCovered;
++            } else {
++                containment.containmentDisplayHints &= ~PlasmaCore.Types.DesktopFullyCovered;
++            }
++            return mstate;
++        })
++    }
++    state: ""
++    states: [
++        State { name: "opaque" },
++        State { name: "transparent" }
++    ]
++
+     function adjustPrefix() {
+         if (!containment) {
+             return "";
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
index 9c62103b0a89..68705edda325 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.21.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
@@ -5,11 +5,11 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.78.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="KDE Plasma desktop"
 XORGHDRS="${PN}-override-include-dirs-0"
@@ -20,7 +20,6 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
-BDEPEND="virtual/pkgconfig"
 COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -104,7 +103,6 @@ DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/kdeplasma-addons-5.15.80
 	!kde-plasma/user-manager
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -117,9 +115,11 @@ RDEPEND="${COMMON_DEPEND}
 	kaccounts? ( net-libs/signon-oauth2 )
 	policykit? ( sys-apps/accountsservice )
 "
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202
 )
 
 src_prepare() {
@@ -134,6 +134,9 @@ src_prepare() {
 		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
 			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
 	fi
+
+	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
+		cmake_comment_add_subdirectory emojier
 }
 
 src_configure() {
@@ -166,3 +169,10 @@ src_test() {
 
 	ecm_src_test
 }
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "screen reader support" app-accessibility/orca
+	fi
+	ecm_pkg_postinst
+}