Various Fixes for 1.1 release

2025-03-15 11:31:32 +00:00 · 2023-05-10 14:43:51 +08:00 · 2023-05-10 14:43:51 +08:00 · 21f57e3509
commit 21f57e3509
parent 84cfe63848
35 changed files with 754 additions and 9 deletions
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \

 BBFILE_COLLECTIONS += "meta-pine64"
 BBFILE_PATTERN_meta-pine64 = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-pine64 = "6"
+BBFILE_PRIORITY_meta-pine64 = "10"

 LAYERDEPENDS_meta-pine64 = "core"
 LAYERSERIES_COMPAT_meta-pine64 = "mickledore kirkstone"
--- a/recipes-core/base-files/base-files/COPYING
+++ b/recipes-core/base-files/base-files/COPYING
@ -0,0 +1,23 @@
+
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
--- a/recipes-core/base-files/base-files/akonadiserverrc
+++ b/recipes-core/base-files/base-files/akonadiserverrc
@ -0,0 +1,4 @@
+[%General]
+Driver=QSQLITE
+
+[QSQLITE]
--- a/recipes-core/base-files/base-files/kde_settings.conf
+++ b/recipes-core/base-files/base-files/kde_settings.conf
@ -0,0 +1,4 @@
+[Theme]
+Current=Wings-SDDM
+CursorTheme=breeze_cursors
+Font=Noto Sans,10,-1,0,50,0,0,0,0,0
--- a/recipes-core/base-files/base-files/kdeglobals
+++ b/recipes-core/base-files/base-files/kdeglobals
@ -0,0 +1,13 @@
+[KDE]
+LookAndFeelPackage=Wings-Dark-Global
+widgetStyle=kvantum-dark
+
+[General]
+ColorScheme=WingsQueenBlueDarkColor
+
+[Icons]
+Theme=Wings-Dark-Icons
+
+[Greeter][Wallpaper][org.kde.image][General]
+Image=/usr/share/wallpapers/WingsDark/
+PreviewImage=/usr/share/wallpapers/WingsDark/
--- a/recipes-core/base-files/base-files/kvantum.kvconfig
+++ b/recipes-core/base-files/base-files/kvantum.kvconfig
@ -0,0 +1,2 @@
+[General]
+theme=Wings-Kvantum
--- a/recipes-core/base-files/base-files_%.bbappend
+++ b/recipes-core/base-files/base-files_%.bbappend
@ -0,0 +1,26 @@
+SUMMARY = "Customization for PinIx Distribution"
+DESCRIPTION ="This recipe applies our custom configs for PinIx Distribution"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+    file://COPYING \
+    file://kde_settings.conf \
+    file://akonadiserverrc \
+    file://kdeglobals \
+    file://kvantum.kvconfig \
+"
+S="${WORKDIR}"
+
+do_install:append() {
+    install -d ${D}${sysconfdir}/sddm.conf.d/
+    install -m 0644 ${WORKDIR}/kde_settings.conf ${D}${sysconfdir}/sddm.conf.d/
+    install -d ${D}${sysconfdir}/xdg/akonadi
+    install -m 0644 ${WORKDIR}/akonadiserverrc ${D}${sysconfdir}/xdg/akonadi/akonadiserverrc
+    install -m 0644 ${WORKDIR}/kdeglobals ${D}${sysconfdir}/xdg/kdeglobals
+    install -d ${D}${sysconfdir}/skel/.config/Kvantum
+    install -m 0644 ${WORKDIR}/kvantum.kvconfig ${D}${sysconfdir}/skel/.config/Kvantum/kvantum.kvconfig
+    install -m 0644 ${WORKDIR}/kdeglobals ${D}${sysconfdir}/skel/.config/kdeglobals
+}
--- a/recipes-core/packagegroups/packagegroup-star64-plasma.bb
+++ b/recipes-core/packagegroups/packagegroup-star64-plasma.bb
@ -38,6 +38,7 @@ RDEPENDS:packagegroup-star64-plasma = " \
    kpipewire \
    kirigami-addons \
    ksystemstats \
+    kvantum \
    libkscreen \
    libksysguard \
    milou \
@ -55,6 +56,7 @@ RDEPENDS:packagegroup-star64-plasma = " \
    plasma-sdk \
    plasma-disks \
    plasma-browser-integration \
+    plasma-welcome \
    pulseaudio \
    pulseaudio-server \
    xdg-desktop-portal-kde \
@ -72,5 +74,8 @@ RDEPENDS:packagegroup-star64-plasma = " \
    gstreamer1.0-plugins-good \
    gstreamer1.0-plugins-bad \
    gstreamer1.0-plugins-ugly \
-    udisks2 \                                
+    udisks2 \
+    cups \
+    wings-theme \
+    systemsettings \                              
 "
--- a/recipes-devtools/nodejs/nodejs/0001-fix-includes.patch
+++ b/recipes-devtools/nodejs/nodejs/0001-fix-includes.patch
@ -0,0 +1,34 @@
+From 6e77ad748924ca2e79a69f9cce61bda85a1a7c7e Mon Sep 17 00:00:00 2001
+From: Justin Hammond <justin@dynam.ac>
+Date: Tue, 9 May 2023 15:50:06 +0800
+Subject: [PATCH] fix includes
+
+---
+ deps/v8/src/base/logging.h                    | 1 +
+ deps/v8/src/inspector/v8-string-conversions.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/deps/v8/src/base/logging.h b/deps/v8/src/base/logging.h
+index 08db24a..94abd7e 100644
+--- a/deps/v8/src/base/logging.h
+++ b/deps/v8/src/base/logging.h
+@@ -8,6 +8,7 @@
+ #include <cstring>
+ #include <sstream>
+ #include <string>
+#include <cstdint>
+ 
+ #include "src/base/base-export.h"
+ #include "src/base/build_config.h"
+diff --git a/deps/v8/src/inspector/v8-string-conversions.h b/deps/v8/src/inspector/v8-string-conversions.h
+index c1d69c1..66b3564 100644
+--- a/deps/v8/src/inspector/v8-string-conversions.h
+++ b/deps/v8/src/inspector/v8-string-conversions.h
+@@ -6,6 +6,7 @@
+ #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
+ 
+ #include <string>
+#include <cstdint>
+ 
+ // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
+ // want to use string-16.h directly rather than these.
--- a/recipes-devtools/nodejs/nodejs_%.bbappend
+++ b/recipes-devtools/nodejs/nodejs_%.bbappend
@ -0,0 +1,6 @@
+COMPATIBLE_HOST:riscv64 = ".*riscv64.*"FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-fix-includes.patch"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
--- a/recipes-devtools/rust/rust-llvm/0001-fix-include.patch
+++ b/recipes-devtools/rust/rust-llvm/0001-fix-include.patch
@ -0,0 +1,21 @@
+From 1fbcc602140c6e2d8ba6904f4a18162f9bf2c6b6 Mon Sep 17 00:00:00 2001
+From: Justin Hammond <justin@dynam.ac>
+Date: Tue, 9 May 2023 13:49:18 +0800
+Subject: [PATCH] fix include
+
+---
+ src/llvm-project/llvm/include/llvm/Support/Signals.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/llvm-project/llvm/include/llvm/Support/Signals.h b/src/llvm-project/llvm/include/llvm/Support/Signals.h
+index 44f5a750f..ccb429bdd 100644
+--- a/src/llvm-project/llvm/include/llvm/Support/Signals.h
+++ b/src/llvm-project/llvm/include/llvm/Support/Signals.h
+@@ -15,6 +15,7 @@
+ #define LLVM_SUPPORT_SIGNALS_H
+ 
+ #include <string>
+#include <cstdint>
+ 
+ namespace llvm {
+ class StringRef;
--- a/recipes-devtools/rust/rust-llvm_%.bbappend
+++ b/recipes-devtools/rust/rust-llvm_%.bbappend
@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-fix-include.patch;patchdir=../../.. \
+            "
+
--- a/recipes-kde/kirigami-addons/kirigami-addons_0.8.0.bb
+++ b/recipes-kde/kirigami-addons/kirigami-addons_0.8.0.bb
@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require recipes-playground/${BPN}.inc
+SRCREV = "470f93dd00c619dedd41a85f0e53b035ff48d6b1"
--- a/recipes-kf5/kfilemetadata/kfilemetadata_%.bbappend
+++ b/recipes-kf5/kfilemetadata/kfilemetadata_%.bbappend
@ -0,0 +1,12 @@
+inherit kconfig
+
+DEPENDS += " \
+    libkexiv2 \
+    ffmpeg \
+    poppler \
+    taglib \
+"
+
+FILES:${PN} += " \
+    ${libdir}/plugins/kf5/kfilemetadata/writers/ \
+"
--- a/recipes-plasma/kinfocenter/kinfocenter_5.27.4.bb
+++ b/recipes-plasma/kinfocenter/kinfocenter_5.27.4.bb
@ -30,6 +30,10 @@ DEPENDS = " \
    pciutils \ 
 "

+RDEPENDS:${PN} = " \
+    systemsettings \
+    wayland-utils \
+"
 KF5_REUSE_LICENSECHECK_ENABLED="1"

 FILES:${PN} += " \
--- a/recipes-plasma/kvantum/kvantum/0001-fix-install-prefix.patch
+++ b/recipes-plasma/kvantum/kvantum/0001-fix-install-prefix.patch
@ -0,0 +1,40 @@
+From e279f0f1aa42bb74744e235049c00d49798d9e89 Mon Sep 17 00:00:00 2001
+From: Justin Hammond <justin@dynam.ac>
+Date: Sat, 6 May 2023 16:42:04 +0800
+Subject: [PATCH] fix install prefix
+
+---
+ Kvantum/style/CMakeLists.txt | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/Kvantum/style/CMakeLists.txt b/Kvantum/style/CMakeLists.txt
+index 215a45e1..b641ba3b 100644
+--- a/Kvantum/style/CMakeLists.txt
+++ b/Kvantum/style/CMakeLists.txt
+@@ -34,24 +34,14 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
+ 
+ if(QT_VERSION_MAJOR EQUAL 6)
+-  get_target_property(REAL_QMAKE_EXECUTABLE Qt6::qmake
+-                      IMPORTED_LOCATION)
+-  execute_process(COMMAND "${REAL_QMAKE_EXECUTABLE}" -query QT_INSTALL_PLUGINS
+-                  OUTPUT_VARIABLE _Qt6_PLUGIN_INSTALL_DIR
+-                  ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  set(KVANTUM_STYLE_DIR "${_Qt6_PLUGIN_INSTALL_DIR}/styles/")
+  set(KVANTUM_STYLE_DIR "${CMAKE_INSTALL_PREFIX}/lib/plugins/styles/")
+ 
+   include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+                       ${Qt6Core_INCLUDE_DIRS} ${Qt6Widgets_INCLUDE_DIRS}
+                       ${Qt6Gui_INCLUDE_DIRS} ${Qt6Svg_INCLUDE_DIRS}
+                       ${X11_INCLUDE_DIR})
+ elseif(QT_VERSION_MAJOR EQUAL 5)
+-  get_target_property(REAL_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE}
+-                      IMPORTED_LOCATION)
+-  execute_process(COMMAND "${REAL_QMAKE_EXECUTABLE}" -query QT_INSTALL_PLUGINS
+-                  OUTPUT_VARIABLE _Qt5_PLUGIN_INSTALL_DIR
+-                  ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  set(KVANTUM_STYLE_DIR "${_Qt5_PLUGIN_INSTALL_DIR}/styles/")
+  set(KVANTUM_STYLE_DIR "${CMAKE_INSTALL_PREFIX}/lib/plugins/styles/")
+ 
+   include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+                       ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}
--- a/recipes-plasma/kvantum/kvantum_1.0.10.bb
+++ b/recipes-plasma/kvantum/kvantum_1.0.10.bb
@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2023 Justin Hammond <justin@dynam.ac>
+#
+# SPDX-License-Identifier: MIT
+
+DESCRIPTION = "A Linux SVG-based theme engine for Qt and KDE "
+SUMMARY = "A Linux SVG-based theme engine for Qt and KDE "
+HOMEPAGE = "https://github.com/tsujan/Kvantum"
+LICENSE = "LGPL-3.0-only"
+
+SRC_URI += "git://github.com/tsujan/Kvantum.git;protocol=https;branch=master \
+           file://0001-fix-install-prefix.patch;patchdir=.. \
+           "
+SRCREV = "a868cd0b4f98bc5f72d15dafbebd0cdc8dd11f2e"
+
+LIC_FILES_CHKSUM=" \
+    file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a \
+"
+
+S="${WORKDIR}/git/Kvantum"
+
+inherit cmake_plasma
+
+DEPENDS = " \
+    qtbase \
+"
+
+FILES:${PN} += " \
+    ${datadir}/Kvantum/ \
+    ${datadir}/color-schemes \
+    ${datadir}/kvantumpreview \
+    ${datadir}/kvantummanager \
+"
--- a/recipes-plasma/kwin/kwin.inc
+++ b/recipes-plasma/kwin/kwin.inc
@ -0,0 +1,134 @@
+# SPDX-FileCopyrightText: 2017-2020 Volker Krause <vkrause@kde.org>
+# SPDX-FileCopyrightText: 2018 Alistair Francis <alistair.francis@wdc.com>
+# SPDX-FileCopyrightText: 2020-2022 Andreas Cord-Landwehr <cordlandwehr@kde.org>
+#
+# SPDX-License-Identifier: MIT
+
+DESCRIPTION = "KWin"
+HOMEPAGE = ""
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977"
+PR = "r0"
+
+DEPENDS:class-target = " \
+    qtdeclarative \
+    qtsensors \
+    qtwayland-native \
+    kpackage-native \
+    qtscript \
+    kconfigwidgets \
+    kcrash \
+    kglobalaccel \
+    kinit \
+    knotifications \
+    kpackage \
+    kwin-native \
+    wayland \
+    wayland-protocols \
+    plasma-framework \
+    kwindowsystem \
+    kiconthemes \
+    kidletime \
+    kwayland \
+    kcompletion \
+    kdeclarative \
+    kio \
+    ktextwidgets \
+    knewstuff \
+    kservice \
+    kxmlgui \
+    kdecoration \
+    krunner \
+    kscreenlocker \
+    libxcb \
+    xcb-util-cursor \
+    fontconfig \
+    lcms \
+    libepoxy \
+    libinput \
+    pipewire \
+    libxcvt \
+    hwdata \
+"
+
+DEPENDS:class-native = " \
+    qtbase-native \
+    extra-cmake-modules-native \
+"
+
+SRC_URI:append = " \
+    file://kwinrc \
+    file://0002-Include-missing-header-for-std-round.patch \
+    file://0003-Add-missing-cmath-include-for-std-ceil.patch \
+"
+
+SRC_URI:append:class-native = " \
+    file://0001-Add-install-operation-for-native-build.patch \
+"
+
+OECMAKE_SOURCEPATH:class-native = "${S}/src/wayland/tools"
+EXTRA_OECMAKE:append:class-target = " \
+    -DQTWAYLANDSCANNER_KDE_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/qtwaylandscanner_kde \
+    -DBUILD_TESTING=OFF \
+"
+
+inherit kauth
+inherit kcmutils
+inherit kconfig
+inherit kdoctools
+inherit cmake_qt5
+inherit pkgconfig
+# TODO skip inherit of cmake_plasma for now because it leads to build errors for native package
+
+
+FILES_SOLIBSDEV = ""
+FILES:${PN} += " \
+    ${datadir}/config.kcfg/*.kcfg \
+    ${datadir}/icons/hicolor \
+    ${datadir}/kconf_update/* \
+    ${datadir}/knotifications5/*.notifyrc \
+    ${datadir}/knsrcfiles/* \
+    ${datadir}/kpackage \
+    ${datadir}/krunner/dbusplugins/*.desktop \
+    ${datadir}/kservices5/*.desktop \
+    ${datadir}/kservices5/kwin/*.desktop \
+    ${datadir}/kservicetypes5/*.desktop \
+    ${datadir}/kwincompositing/qml/*.qml \
+    ${datadir}/qlogging-categories5 \
+    ${libdir}/kconf_update_bin/kwin5_update_default_rules \
+    ${libdir}/plugins/*.so \
+    ${libdir}/plugins/kf5/org.kde.kidletime.platforms/*.so \
+    ${libdir}/plugins/kpackage/packagestructure/*.so \
+    ${libdir}/plugins/kwin/effects/configs/*.so \
+    ${libdir}/plugins/kwin/plugins/*.so \
+    ${libdir}/plugins/org.kde.kdecoration2/*.so \
+    ${libdir}/plugins/org.kde.kglobalaccel5.platforms/*.so \
+    ${libdir}/plugins/org.kde.kwin.platforms/*.so \
+    ${libdir}/plugins/org.kde.kwin.scenes/*.so \
+    ${libdir}/plugins/org.kde.kwin.waylandbackends/*.so \
+    ${libdir}/plugins/plasma/kcms/systemsettings/*.so \
+    ${libdir}/plugins/plasma/kcms/systemsettings_qwidgets/*.so \
+    ${libdir}/plugins/platforms/*.so \
+    ${libdir}/qml/org/kde/kwin.2/* \
+    ${libdir}/qml/org/kde/kwin/decoration/* \
+    ${libdir}/qml/org/kde/kwin/decorations/plastik/* \
+    ${libdir}/qml/org/kde/kwin/effects/* \
+    ${libdir}/qml/org/kde/kwin/private/effects/* \
+    ${libdir}/qml/org/kde/kwin/private/kdecoration/* \
+    ${libdir}/qml/org/kde/plasma/quicksetting/nightcolor/* \
+    ${libdir}/systemd/user/*.service \
+"
+
+FILES:${PN}-dev += " \
+    ${libdir}/libkwin*.so \
+    ${datadir}/dbus-1/interfaces/*.xml \
+"
+
+RDEPENDS:${PN}:append:class-target = " \
+    maliit-keyboard-qt5 \
+    qtwayland-plugins \
+    xwayland \
+    perl \
+"
+
+BBCLASSEXTEND = "native"
--- a/recipes-plasma/kwin/kwin/0001-Add-install-operation-for-native-build.patch
+++ b/recipes-plasma/kwin/kwin/0001-Add-install-operation-for-native-build.patch
@ -0,0 +1,24 @@
+From 0c28771f3d09794bf549e26a8b13f568812e9634 Mon Sep 17 00:00:00 2001
+From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
+Date: Sun, 26 Jun 2022 19:55:01 +0200
+Subject: [PATCH] Add install operation for native build
+
+---
+ src/wayland/tools/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/wayland/tools/CMakeLists.txt b/src/wayland/tools/CMakeLists.txt
+index 767df3f28..9ea0a1e66 100644
+--- a/src/wayland/tools/CMakeLists.txt
+++ b/src/wayland/tools/CMakeLists.txt
+@@ -43,6 +43,7 @@ else()
+     remove_definitions(-DQT_NO_CAST_FROM_ASCII)
+     add_executable(qtwaylandscanner_kde qtwaylandscanner.cpp)
+     target_link_libraries(qtwaylandscanner_kde Qt::Core)
+    install(TARGETS qtwaylandscanner_kde ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+     include(ECMMarkNonGuiExecutable)
+     ecm_mark_nongui_executable(qtwaylandscanner_kde)
+ endif()
+-- 
+2.34.1
+
--- a/recipes-plasma/kwin/kwin/0001-Set-CXX-standard-for-crossbuilding-utility.patch
+++ b/recipes-plasma/kwin/kwin/0001-Set-CXX-standard-for-crossbuilding-utility.patch
@ -0,0 +1,37 @@
+From 484d2da0465f531158e217def769a3aef80039c6 Mon Sep 17 00:00:00 2001
+From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
+Date: Sun, 12 Feb 2023 08:31:06 +0100
+Subject: [PATCH] Set CXX standard for crossbuilding utility
+
+---
+ src/wayland/tools/CMakeLists.txt       | 1 +
+ src/wayland/tools/qtwaylandscanner.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/wayland/tools/CMakeLists.txt b/src/wayland/tools/CMakeLists.txt
+index 767df3f28..97757693e 100644
+--- a/src/wayland/tools/CMakeLists.txt
+++ b/src/wayland/tools/CMakeLists.txt
+@@ -3,6 +3,7 @@
+ if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
+     cmake_minimum_required(VERSION 3.16)
+     project(qtwaylandscanner_kde CXX)
+    set(CMAKE_CXX_STANDARD 20)
+     find_package(Qt5 5.15.0 CONFIG REQUIRED Core)
+     find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)
+     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+diff --git a/src/wayland/tools/qtwaylandscanner.cpp b/src/wayland/tools/qtwaylandscanner.cpp
+index 285253a10..ec7a29725 100644
+--- a/src/wayland/tools/qtwaylandscanner.cpp
+++ b/src/wayland/tools/qtwaylandscanner.cpp
+@@ -42,6 +42,7 @@
+ #include <QXmlStreamReader>
+ 
+ #include <vector>
+#include <utility>
+ 
+ class Scanner
+ {
+-- 
+2.37.2
+
--- a/recipes-plasma/kwin/kwin/0002-Include-missing-header-for-std-round.patch
+++ b/recipes-plasma/kwin/kwin/0002-Include-missing-header-for-std-round.patch
@ -0,0 +1,24 @@
+From eb4079e3993ee4d62ab1e9afeb14536bf6ea8980 Mon Sep 17 00:00:00 2001
+From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
+Date: Wed, 12 Apr 2023 18:41:58 +0200
+Subject: [PATCH] Include missing cmath header
+
+---
+ src/wayland/outputmanagement_v2_interface.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/wayland/outputmanagement_v2_interface.cpp b/src/wayland/outputmanagement_v2_interface.cpp
+index bed5dcd648..2a6069d9d6 100644
+--- a/src/wayland/outputmanagement_v2_interface.cpp
+++ b/src/wayland/outputmanagement_v2_interface.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include "qwayland-server-kde-output-management-v2.h"
+ 
+#include <cmath>
+ #include <optional>
+ 
+ using namespace KWin;
+-- 
+2.37.2
+
--- a/recipes-plasma/kwin/kwin/0003-Add-missing-cmath-include-for-std-ceil.patch
+++ b/recipes-plasma/kwin/kwin/0003-Add-missing-cmath-include-for-std-ceil.patch
@ -0,0 +1,25 @@
+From 4c2952a5335ef38a2d8e2785226e0d848812cb50 Mon Sep 17 00:00:00 2001
+From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
+Date: Sun, 12 Feb 2023 12:12:46 +0100
+Subject: [PATCH] Add missing cmath include for std::ceil
+
+---
+ src/wayland/output_interface.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/wayland/output_interface.cpp b/src/wayland/output_interface.cpp
+index 6bbb3c35d..6ffd60210 100644
+--- a/src/wayland/output_interface.cpp
+++ b/src/wayland/output_interface.cpp
+@@ -17,6 +17,8 @@
+ #include <QTimer>
+ #include <QVector>
+ 
+#include <cmath>
+
+ namespace KWaylandServer
+ {
+ static const int s_version = 4;
+-- 
+2.37.2
+
--- a/recipes-plasma/kwin/kwin/kwinrc
+++ b/recipes-plasma/kwin/kwin/kwinrc
@ -0,0 +1,2 @@
+[Windows]
+Placement=Maximizing
--- a/recipes-plasma/kwin/kwin_5.27.4.bb
+++ b/recipes-plasma/kwin/kwin_5.27.4.bb
@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI += "https://download.kde.org/stable/plasma/5.27.4/kwin-5.27.4.tar.xz"
+SRC_URI[sha256sum] = "58449053d64ce58227fee5ac3f099289bc133d2feb5e61f2c3e4cd74b7a9e6b4"
+
--- a/recipes-plasma/plasma-welcome/plasma-welcome_5.27.4.bb
+++ b/recipes-plasma/plasma-welcome/plasma-welcome_5.27.4.bb
@ -0,0 +1,39 @@
+# SPDX-FileCopyrightText: 2023 Justin Hammond <justin@dynam.ac>
+#
+# SPDX-License-Identifier: MIT
+
+DESCRIPTION = "A friendly onboarding wizard for Plasma"
+SUMMARY = "A friendly onboarding wizard for Plasma"
+HOMEPAGE = "https://invent.kde.org/plasma/plasma-welcome"
+LICENSE = "CC-By-SA-4.0 & CC0-1.0 & GPL-2.0-Only & GPL-2.0-or-later & GPL-3.0-only & LicenseRef-KDE-Accepted-GPL"
+
+SRC_URI += " \
+   https://download.kde.org/stable/plasma/5.27.4/plasma-welcome-5.27.4.tar.xz \
+"
+SRC_URI[sha256sum] = "86ab1567623907be7e5e38450b997b51527c6f1062ebc186ae0978707983301c"
+
+inherit cmake_plasma
+inherit reuse_license_checksums
+inherit kcoreaddons
+inherit kcmutils 
+inherit kconfig 
+inherit ki18n 
+
+DEPENDS = " \
+    kirigami \
+    kdbusaddons \
+    kio \
+    knewstuff \
+    knotifications \
+    plasma-framework \
+    kservice \
+    kwindowsystem \
+    kuserfeedback \
+    kaccounts-integration \
+"
+
+KF5_REUSE_LICENSECHECK_ENABLED="1"
+
+FILES:${PN} += " \
+    ${libdir}/qml/org/kde/plasma/welcome \
+"
--- a/recipes-plasma/plasma-workspace/plasma-workspace_%.bbappend
+++ b/recipes-plasma/plasma-workspace/plasma-workspace_%.bbappend
@ -4,4 +4,5 @@ SRC_URI:append:jh7110 = " \

 DEPENDS:append = " \
    appstream \
+    libkexiv2 \
 "
--- a/recipes-plasma/wings-theme/wings-theme/metadata.json
+++ b/recipes-plasma/wings-theme/wings-theme/metadata.json
@ -0,0 +1,14 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Name": "l4ki"
+            }
+        ],
+        "Id": "WingsDark",
+        "License": "GPLv3",
+        "Name": "WingsDark"
+    }
+}
+
+
--- a/recipes-plasma/wings-theme/wings-theme_060523.bb
+++ b/recipes-plasma/wings-theme/wings-theme_060523.bb
@ -0,0 +1,68 @@
+# SPDX-FileCopyrightText: 2023 Justin Hammond <justin@dynam.ac>
+#
+# SPDX-License-Identifier: MIT
+
+DESCRIPTION = "Wings Themes For Plasma Desktop"
+SUMMARY = "Wings Themes For Plasma Desktop"
+HOMEPAGE = "https://github.com/L4ki/Wings-Plasma-Themes"
+LICENSE = "GPL-3.0-only "
+
+SRC_URI += " \
+   git://github.com/L4ki/Wings-Plasma-Themes.git;protocol=https;branch=main \
+   file://metadata.json \
+"
+SRCREV="a501de99fd8d5e89cf02fd1cd2a8cde54e9ec871"
+
+PV = "1.1+git${SRCPV}"
+
+S="${WORKDIR}/git"
+
+LIC_FILES_CHKSUM=" \
+    file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464 \
+"
+
+RDEPENDS:${PN} = " \
+    kvantum \
+"
+
+do_install() {
+    install -m 0755 -d ${D}${datadir}/color-schemes/
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings Color Schemes'/* ${D}${datadir}/color-schemes/
+    install -m 0755 -d ${D}${datadir}/plasma/look-and-feel
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings Global Themes'/* ${D}${datadir}/plasma/look-and-feel/
+    install -m 0755 -d ${D}${datadir}/icons
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings Icons Themes'/* ${D}${datadir}/icons/
+    install -m 0755 -d ${D}${datadir}/konsole
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings Konsole Color Schemes'/* ${D}${datadir}/konsole/
+    install -m 0755 -d ${D}${datadir}/Kvantum
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings Kvantum Themes'/* ${D}${datadir}/Kvantum/
+    install -m 0755 -d ${D}${datadir}/plasma/desktoptheme
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings Plasma Themes'/* ${D}${datadir}/plasma/desktoptheme/
+    install -m 0755 -d ${D}${datadir}/sddm/themes
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings SDDM Themes'/* ${D}${datadir}/sddm/themes/
+    install -m 0755 -d ${D}${datadir}/wallpapers/Wings/
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings Wallpapers'/* ${D}${datadir}/wallpapers/Wings/
+    install -m 0755 -d ${D}${datadir}/aurorae/themes/
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings Window Decorations'/* ${D}${datadir}/aurorae/themes/
+    install -m 0755 -d ${D}${datadir}/wallpapers/WingsDark/contents/images/
+    cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/metadata.json ${D}${datadir}/wallpapers/WingsDark/
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings Wallpapers/Wings-Wallpaper-Without Plasma Logo.png' ${D}${datadir}/wallpapers/WingsDark/contents/images/2560x1600.jpg
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings Wallpapers/Wings-Wallpaper-Without Plasma Logo.png' ${D}${datadir}/wallpapers/WingsDark/contents/preview.jpg
+    install -d ${D}${sysconfdir}/skel/.config/Kvantum/Wings-Kvantum
+    cp -R --no-dereference --preserve=mode,links -v ${S}/'Wings Kvantum Themes'/Wings-Kvantum/* ${D}${sysconfdir}/skel/.config/Kvantum/Wings-Kvantum/
+    sed -i 's/Image=.*/Image=WingsDark/g' ${D}${datadir}/plasma/look-and-feel/Wings-Dark-Global/contents/defaults
+}
+
+FILES:${PN} = " \
+    ${datadir}/plasma/desktoptheme \
+    ${datadir}/wallpapers/Wings/ \
+    ${datadir}/wallpapers/WingsDark/ \
+    ${datadir}/aurorae/themes/ \
+    ${datadir}/sddm/themes/ \
+    ${datadir}/Kvantum/ \
+    ${datadir}/konsole/ \
+    ${datadir}/icons/ \
+    ${datadir}/plasma/look-and-feel/ \
+    ${datadir}/color-schemes/ \
+    ${sysconfdir}/skel/.config/Kvantum/Wings-Kvantum \
+"
--- a/recipes-qt/pyqt5/python3-pyqt5_5.15.1.bb
+++ b/recipes-qt/pyqt5/python3-pyqt5_5.15.1.bb
@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "\
 "

 inherit pypi
+inherit pkgconfig

 PYPI_PACKAGE = "PyQt5"

@ -20,7 +21,7 @@ inherit qmake5
 inherit python3native python3-dir

 DEPENDS = "qtbase qtdeclarative qtquickcontrols2"
-DEPENDS += "sip3 sip3-native python3"
+DEPENDS += "sip3 sip3-native python3 dbus python3-dbus-native python3-dbus"

 export BUILD_SYS
 export HOST_SYS
@ -31,7 +32,7 @@ PARALLEL_MAKEINST = ""

 DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '', 'PyQt_OpenGL', d)}"

-PYQT_MODULES = "QtCore QtGui QtNetwork QtXml QtNetwork QtQml ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'QtQuick QtWidgets QtQuickWidgets', '', d)}"
+PYQT_MODULES = "QtCore QtGui QtNetwork QtXml QtNetwork QtQml QtDBus ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'QtQuick QtWidgets QtQuickWidgets', '', d)}"

 do_configure:prepend() {
    cd ${S}
@ -59,6 +60,9 @@ do_compile() {
 do_install() {
    cd ${S}
    oe_runmake MAKEFLAGS='-j 1' install
+    #dbus mainloop gets installed in a sysroot-native location!
+    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/dbus/mainloop/
+    cp ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/dbus/mainloop/pyqt5.so ${D}${libdir}/${PYTHON_DIR}/site-packages/dbus/mainloop/
 }

 FILES:${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/"
--- a/recipes-qt/qtspeech/qtspeech_5.15.9.bb
+++ b/recipes-qt/qtspeech/qtspeech_5.15.9.bb
@ -0,0 +1,30 @@
+HOMEPAGE = "https://code.qt.io/cgit/qt/qtspeech.git/"
+SUMMARY = "Qt Speech support "
+DESCRIPTION = "Qt Speech support"
+
+
+LICENSE = "GPL-2.0-only & LGPL-3.0-only & FDL"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
+    file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \    
+"
+
+SRC_URI = " \
+    git://code.qt.io/qt/qtspeech.git;protocol=https;branch=5.15 \
+"
+SRCREV="b2fdbe275f558893096356d152162df9f67cd22d"
+
+S = "${WORKDIR}/git"
+
+inherit qmake5 pkgconfig
+
+DEPENDS = " \
+    qtbase \
+    speechd \
+"
+
+FILES:${PN}-dev += " \
+    ${libdir}/libQt5TextToSpeech.prl \
+    ${libdir}/mkspecs/modules/ \
+"
--- a/recipes-support/libdotconf/libdotconf_0.11.4.bb
+++ b/recipes-support/libdotconf/libdotconf_0.11.4.bb
@ -0,0 +1,16 @@
+SUMMARY = "dot.conf configuration file parser "
+HOMEPAGE = "https://github.com/williamh/dotconf"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=155b66f2dc258f05886f9886a60fd870 \
+    "
+
+SRC_URI = "git://github.com/williamh/dotconf.git;branch=master;protocol=https \
+           "
+SRCREV = "4cd7b3a6e89b7f1269851caea8374a8f137ea1c0"
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+inherit autotools
+
+
--- a/recipes-support/sddm/sddm/sddm.conf
+++ b/recipes-support/sddm/sddm/sddm.conf
@ -37,13 +37,13 @@ RebootCommand=/usr/bin/systemctl reboot

 [Theme]
 # Current theme name
-Current=
+# Current=

 # Cursor size used in the greeter
 CursorSize=

 # Cursor theme used in the greeter
-CursorTheme=
+# CursorTheme=

 # Number of users to use as threshold
 # above which avatars are disabled
@ -58,7 +58,7 @@ EnableAvatars=true
 FacesDir=/usr/share/sddm/faces

 # Font used in the greeter
-Font=
+# Font=

 # Theme directory path
 ThemeDir=/usr/share/sddm/themes
--- a/recipes-support/speechd/speechd/0001-fix-include-paths-and-disable-NAS.patch
+++ b/recipes-support/speechd/speechd/0001-fix-include-paths-and-disable-NAS.patch
@ -0,0 +1,49 @@
+From c0038f1e54c1b55e88831c55edb60d0cb7bfd759 Mon Sep 17 00:00:00 2001
+From: Justin Hammond <justin@dynam.ac>
+Date: Sun, 7 May 2023 17:00:51 +0800
+Subject: [PATCH] fix include paths and disable NAS
+
+---
+ configure.ac                | 15 ---------------
+ src/clients/say/Makefile.am |  2 +-
+ 2 files changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e83a2ade..34f90796 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -443,21 +443,6 @@ AS_IF([test $with_oss != "no"],
+ AM_CONDITIONAL([oss_support], [test $with_oss = "yes"])
+ AS_IF([test $with_oss = "yes"], [audio_methods="${audio_methods} oss"])
+ 
+-# check for NAS support
+-AC_ARG_WITH([nas],
+-	[AS_HELP_STRING([--with-nas], [include network audio system (nas) support])],
+-	[],
+-	[with_nas=check])
+-AS_IF([test $with_nas != "no"],
+-	[AC_CHECK_LIB([audio], [AuOpenServer],
+-		[with_nas=yes
+-		AS_IF([test -z "$default_audio_method"],
+-			[default_audio_method=nas])
+-		audio_dlopen_modules="$audio_dlopen_modules -dlopen ../audio/spd_nas.la";
+-		NAS_LIBS="-L/usr/X11R6/lib -lXau -laudio"],
+-		[AS_IF([test $with_nas = "yes"],
+-			[AC_MSG_FAILURE([nas is not available])])],
+-	[-L/usr/X11R6/lib -lXau])])
+ AM_CONDITIONAL([nas_support], [test $with_nas = "yes"])
+ AC_SUBST([NAS_LIBS])
+ AS_IF([test $with_nas = "yes"], [audio_methods="${audio_methods} nas"])
+diff --git a/src/clients/say/Makefile.am b/src/clients/say/Makefile.am
+index f63d2cd9..efc62f41 100644
+--- a/src/clients/say/Makefile.am
+++ b/src/clients/say/Makefile.am
+@@ -17,7 +17,7 @@
+ 
+ ## Process this file with automake to produce Makefile.in
+ 
+-inc_local = -I$(top_srcdir)/include -I$(top_srcdir)/src/api/c
+inc_local = -I$(top_srcdir)/include -I$(top_srcdir)/src/api/c -I$(top_builddir)/src/api/c/
+ c_api = $(top_builddir)/src/api/c
+ 
+ bin_PROGRAMS = spd-say
--- a/recipes-support/speechd/speechd_0.11.4.bb
+++ b/recipes-support/speechd/speechd_0.11.4.bb
@ -0,0 +1,34 @@
+SUMMARY = "Common high-level interface to speech synthesis"
+HOMEPAGE = "https://freebsoft.org/speechd"
+LICENSE = "GPL-2.0-only & GPL-3.0-only & LGPL-2.1-only"
+LIC_FILES_CHKSUM = " \
+    file://COPYING.GPL-2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.GPL-3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
+    "
+
+SRC_URI = "git://github.com/brailcom/speechd.git;branch=speech-dispatcher-0-11;protocol=https \
+           file://0001-fix-include-paths-and-disable-NAS.patch \
+           "
+SRCREV = "4a1203287ba0a1ff9e9164ec06a19c9b3be53d8f"
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+inherit autotools-brokensep
+inherit gettext 
+
+DEPENDS = " \
+    glib-2.0 \
+    libdotconf \
+    libsndfile1 \
+    systemd \
+    pulseaudio \
+"
+
+FILES:${PN} += " \
+    ${datadir}/speech-dispatcher \
+    ${libdir}/python3.11/site-packages \
+    ${libdir}/speech-dispatcher \
+    ${systemd_system_unitdir}/speech-dispatcherd.service \
+"
+INSANE_SKIP:${PN} = "file-rdeps"
--- a/setup.sh
+++ b/setup.sh
@ -25,13 +25,14 @@ echo "Setting up PinIx Yocto Build"
 declare -A layers
 layers['poky']='git://git.yoctoproject.org/poky|kirkstone|4cc0e9438b450b43749730e128b6b9adb30f9663'
 layers['meta-openembedded']='https://github.com/openembedded/meta-openembedded|kirkstone|571e36e20e9d1f27af0eb4545291beeb64f280e2'
-layers['meta-riscv']='https://github.com/Fishwaldo/meta-riscv.git|master|479ac1523ba592d0f9dd8a219e54674455a41f01'
+layers['meta-riscv']='https://github.com/Fishwaldo/meta-riscv.git|master|579e8e113be29d2e2a84c7409c4eaead6a8a3bed'
 layers['meta-qt5']='https://github.com/meta-qt5/meta-qt5.git|master|cf6ffcbad5275a3428f6046468a0c9d572e813d1'
 layers['yocto-meta-kf5']='https://github.com/KDE/yocto-meta-kf5.git|master|288288033137c19b72948a91d74b82b66c788fe3'
 layers['yocto-meta-kde']='https://github.com/KDE/yocto-meta-kde.git|master|e533c2bf3133cc3fec6f78104ed0839fd84e2165'
 layers['meta-python2']='https://git.openembedded.org/meta-python2|kirkstone|f02882e2aa9279ca7becca8d0cedbffe88b5a253'
 layers['meta-java']='https://github.com/meta-java/meta-java.git|kirkstone|8bf79fc2002bb83c6439d25bb63e4206894c2d10'
-layers['meta-kde-gear']='https://github.com/Fishwaldo/meta-kde-gear.git|master|6f223b0b9ee6d64d009a1c1f48c9613434454a29'
+layers['meta-kde-gear']='https://github.com/Fishwaldo/meta-kde-gear.git|master|d684eb323b972627858e7a7daadd30dd52d23761'
+#layers['meta-clang']='https://github.com/davidlt/meta-clang.git|langdale|aa46b8e9599c1d3cc165b79355100adbc4c8effa'

 echo "Checking Layers..."
 echo ""