From 7d0d0c112bf7b1383be043d5d3bca6c8dc50c02f Mon Sep 17 00:00:00 2001
From: Sam Hadow <sam.hadow@inbox.lv>
Date: Wed, 13 Mar 2024 18:08:45 +0100
Subject: [PATCH] coreaddons + Kirigami Avatar fix

---
 package/contents/ui/FullRepresentation.qml | 3 +--
 package/contents/ui/Header.qml             | 9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/contents/ui/FullRepresentation.qml b/package/contents/ui/FullRepresentation.qml
index c983892..3520d86 100644
--- a/package/contents/ui/FullRepresentation.qml
+++ b/package/contents/ui/FullRepresentation.qml
@@ -304,8 +304,7 @@ Item {
 
     PlasmaComponents.TabBar {
         id: tabBar
-
-        property int count: 5 // updated in createButtons()
+        count: 5 // updated in createButtons()
 
         Behavior on width {
             NumberAnimation { duration: Kirigami.Units.longDuration; easing.type: Easing.InQuad; }
diff --git a/package/contents/ui/Header.qml b/package/contents/ui/Header.qml
index b46489c..be2f9ee 100644
--- a/package/contents/ui/Header.qml
+++ b/package/contents/ui/Header.qml
@@ -23,13 +23,14 @@ import org.kde.plasma.core as PlasmaCore
 import org.kde.kirigami as Kirigami
 import org.kde.plasma.components 3.0 as PlasmaComponents
 import org.kde.plasma.extras as PlasmaExtras
-import org.kde.kcoreaddons 1.0 as KCoreAddons
+import org.kde.coreaddons 1.0 as KCoreAddons
 // While using Kirigami in applets is normally a no, we
 // use Avatar, which doesn't need to read the colour scheme
 // at all to function, so there won't be any oddities with colours.
-import org.kde.kirigami 2.13 as Kirigami
+import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigamiaddons.components as KirigamiAddons
 import org.kde.kquickcontrolsaddons 2.0
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects 1.0
 
 PlasmaExtras.PlasmoidHeading {
     id: header
@@ -81,7 +82,7 @@ PlasmaExtras.PlasmoidHeading {
             Layout.preferredWidth: Kirigami.Units.gridUnit * 3
             Layout.preferredHeight: Kirigami.Units.gridUnit * 3
 
-            Kirigami.Avatar {
+            KirigamiAddons.Avatar {
                 source: kuser.faceIconUrl
                 name: nameLabel
                 anchors {