bitbake world fixes and gnome/xfce work:

* Remove meta-java from builds. Too many broken builds and it was only needed for plasma-mobile
* add gimp to all plasma images
* add nodejs
* Exclude broken packages on riscv64
* Bump yocto-meta-kde layer

conf/distro/pinix.conf

@@ -44,7 +44,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
 VIRTUAL-RUNTIME_initscripts = ""
 
 PREFERRED_PROVIDER:virtual/sshd ?= "openssh"
-
+PREFERRED_RPROVIDER:ssh ?= "openssh"
 
 PACKAGE_CLASSES ?= "package_deb"
 
@@ -60,4 +60,15 @@ FULL_OPTIMIZATION  += " -mtune=sifive-u74"
 #Mask out these recipes as the meta-kde-gear provides them
 BBMASK:append = " \
     yocto-meta-kde/recipes-playground/kjournald_git.bb \
-"
+"
+
+COMPATIBLE_HOST:pn-bcc:riscv64 = "null"
+COMPATIBLE_HOST:pn-libphonenumber:riscv64 = "null"
+COMPATIBLE_HOST:pn-plasma-mobile:riscv64 = "null"
+COMPATIBLE_HOST:pn-bpftrace:riscv64 = "null"
+COMPATIBLE_HOST:pn-packagegroup-plasma-mobile-workspace:riscv64 = "null"
+COMPATIBLE_HOST:pn-packagegroup-plasma-mobile:riscv64 = "null"
+COMPATIBLE_HOST:pn-maliit-plugins-qt5:riscv64 = "null"
+COMPATIBLE_HOST:pn-qtopcua:riscv64 = "null"
+COMPATIBLE_HOST:pn-mozjs-78:riscv64 = "null"
+COMPATIBLE_HOST:pn-openmp:riscv64 = "null"

conf/templates/pinix/bblayers.conf.sample

@@ -20,7 +20,6 @@ BBLAYERS ?= " \
   ##OEROOT##/../meta-openembedded/meta-filesystems \
   ##OEROOT##/../meta-openembedded/meta-webserver \
   ##OEROOT##/../meta-openembedded/meta-perl \
-  ##OEROOT##/../meta-java \
   ##OEROOT##/../meta-qt5 \
   ##OEROOT##/../yocto-meta-kf5 \
   ##OEROOT##/../yocto-meta-kde \

recipes-core/packagegroups/packagegroup-pinetabv-plasma.bb

@@ -24,6 +24,7 @@ RDEPENDS:packagegroup-pinetabv-plasma = " \
     cups \
     firewalld-applet \
     firefox \
+    gimp \
     git \
     gstreamer1.0 \
     gstreamer1.0-plugins-base \

recipes-core/packagegroups/packagegroup-star64-plasma.bb

@@ -22,6 +22,7 @@ RDEPENDS:packagegroup-star64-plasma = " \
     cups \
     firewalld-applet \
     firefox \
+    gimp \
     git \
     gstreamer1.0 \
     gstreamer1.0-plugins-base \

recipes-core/psplash/files/COPYING

@@ -0,0 +1,76 @@
+# PINE64 Branding
+
+## Name
+
+The PINE64 name should always be capitalized in official communications.
+
+## Logo
+
+The PINE64 logo consists of our pinecone icon and the "PINE64" text. Both elements are always in this visual order; the icon then the text.
+
+The text in this logo is laid in the font "Jesaya Regular", which can be found on [DaFont](https://www.dafont.com/jesaya-free.font), or its original source [Typodermic Fonts](https://typodermicfonts.com/jesaya/)
+
+### Standard
+
+The standard logo variant features the pinecone icon to the left of the PINE64 text.
+
+Use the standard variant whenever horizontal space will allow. For example, at the top of most letter-size documents or as a main component of a splash screen in landscape orientation.
+
+This logo is available in three colourways to suit the situation:
+
+#### Original
+
+![Pine64 Standard Logo -- Blue pinecone to the left of black PINE64 text](standard/Logo-text-standard-black-blue.svg)
+
+The original colourway features our pinecone icon in our branded blue colour scheme with black text. It should be used in all situations where a white or almost-white background can be guaranteed.
+
+You should use this version of the logo whenever the background suits.
+
+#### Black-on-white
+
+![Pine64 Standard Logo -- Black pinecone to the left of black PINE64 text](standard/Logo-text-standard-black.svg)
+
+The black-on-white colourway replaces the branded blue pinecone with a black pinecone. This version of the logo is suitable for situations where the background is light but not white, or if there is a gradient that clashes with the standard variant.
+
+#### White-on-black
+
+![Pine64 Standard Logo -- White pinecone to the left of white PINE64 text](standard/Logo-text-standard-white.svg)
+
+The white-on-black colourway keeps the monochromatic design of black-on-white but is suitable for use on dark backgrounds.
+
+Avoid combining the brand colour pinecone with white text on a black background.
+
+### Stacked
+
+The stacked logo variant features our pinecone on top of the "PINE64" text.
+
+This variant is suitable for spaces where horizontal space is limited, such as when it is used as a main element on a portrait screen.
+
+Guidance for using the colourways available for this logo is the same as the standard logo. The only exception is that the black-on-white colourway takes the place of the standard colourway as the default option.
+
+#### Black-on-white
+
+![Pine64 stacked Logo -- Black pinecone above black PINE64 text](stacked/Logo-text-stacked-black.svg)
+
+#### White-on-black
+
+![Pine64 stacked Logo -- White pinecone above white PINE64 text](stacked/Logo-text-stacked-white.svg)
+
+## Icon
+
+The pinecone icon represents the growth of our community: From a single stem, in many interesting segments, all leading up toward our goals.
+
+That said, the icon should only be used in one of these formats when one of the logo variants has already been displayed. Notable followers of this rule include the PineBook Pro, which ships with a sticker with the standard logo variation attached. Notable exceptions include the PineTab and PinePhone, which are unbranded except for the pinecone icon.
+
+Various example colourways are shown here.
+
+![Pinecone icon - Brand colours on white](icon/Gradient-white.svg)
+
+
+![Pinecone icon - Black on white](icon/Black-white.svg)
+
+![Pinecone icon - White on black](icon/White-black.svg)
+
+![Pinecone icon - White on blue](icon/White-blue.svg)
+
+![Pinecone icon - Brand colours on black](icon/Gradient-black.svg)

recipes-devtools/nodejs/nodejs_%.bbappend

@@ -4,3 +4,4 @@ SRC_URI += "file://0001-fix-includes.patch"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
+COMPATIBLE_HOST:riscv64 = ".*riscv64.*"

recipes-gnome/babl/babl/0001-fix-compatibility-with-meson.patch

@@ -0,0 +1,26 @@
+From cefb0a893a39e7539e4f6abc79f4b0a3e91f75f8 Mon Sep 17 00:00:00 2001
+From: Justin Hammond <justin@dynam.ac>
+Date: Thu, 31 Aug 2023 03:48:24 +0000
+Subject: [PATCH] fix compatibility with meson
+
+---
+ meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 487e470..deabda9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -55,8 +55,7 @@ lib_name    = meson.project_name() + '-' + api_version
+ stability_version_number = (major_version != 0 ? minor_version : micro_version)
+ stable = (stability_version_number % 2 == 0)
+ 
+-conf.set10('BABL_UNSTABLE', not stable, Description:
+-  'Define to 1 if this is an unstable version of BABL.')
++conf.set10('BABL_UNSTABLE', not stable)
+ 
+ conf.set       ('BABL_MAJOR_VERSION',    '@0@'.format(major_version))
+ conf.set       ('BABL_MINOR_VERSION',    '@0@'.format(minor_version))
+-- 
+2.25.1
+

recipes-gnome/babl/babl_0.1.92.bbappend

@@ -0,0 +1,4 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append = " \
+    file://0001-fix-compatibility-with-meson.patch \
+"

recipes-gnome/cogl/cogl-1.0_1.22.8.bbappend

@@ -0,0 +1 @@
+ERDEPENDS_GLES2 = "mesa-pvr"

recipes-gnome/geary/geary_40.0.bbappend

@@ -0,0 +1 @@
+EXTRA_OEMESON += "-Diso_639_xml=${STAGING_DIR_TARGET}/usr/share/xml/iso-codes/iso_639.xml -Diso_3166_xml=${STAGING_DIR_TARGET}/usr/share/xml/iso-codes/iso_3166.xml"

recipes-graphics/kmscube/kmscube_git.bbappend

@@ -0,0 +1,2 @@
+#depends on virtual/libgles3 in original reciepe
+DEPENDS = "virtual/libgles2 virtual/egl libdrm virtual/libgbm"

recipes-graphics/libforms/libforms_1.2.3.bbappend

@@ -0,0 +1,2 @@
+#original recipe is hardcoded to mesa
+DEPENDS = "libxpm jpeg libx11 virtual/libgl"

recipes-networking/cherokee/cherokee/0001-fix-configure.ac-calling-AM_INIT_AUTOMAKE-twice.patch

@@ -0,0 +1,25 @@
+From beb68d87d50955c491e9336a41605ba2ca2ef431 Mon Sep 17 00:00:00 2001
+From: Justin Hammond <justin@dynam.ac>
+Date: Thu, 31 Aug 2023 07:29:21 +0000
+Subject: [PATCH] fix configure.ac calling AM_INIT_AUTOMAKE twice
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 98cab791..15946bed 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -197,7 +197,7 @@ LIBTOOL_EXPORT_OPTIONS=
+ AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
+ 
+ dnl Set the Version
+-AM_INIT_AUTOMAKE
++dnl AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+ 
+ AC_CONFIG_HEADERS(config.h)
+-- 
+2.25.1
+

recipes-networking/cherokee/cherokee_git.bbappend

@@ -0,0 +1,6 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append = " \
+    file://0001-fix-configure.ac-calling-AM_INIT_AUTOMAKE-twice.patch \
+"
+
+INSANE_SKIP:${PN} = "empty-dirs"

recipes-python/python3-pyqtchart/python3-pyqtchart_5.15.1.bbappend

@@ -0,0 +1,5 @@
+#its sip3, not sip
+DEPENDS = "qtcharts sip3 sip3-native python3 python3-pyqt5"
+
+RDEPENDS:${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs qtcharts"
+RDEPENDS:${PN} += "python3-core sip3 python3-pyqt5"

recipes-qt/qt5/qt5-creator/0001-add-libatomic-for-help-plugin-on-riscv.patch

@@ -0,0 +1,25 @@
+From e541ef66421fe2dd893d551ade81a507b9c37a7d Mon Sep 17 00:00:00 2001
+From: Justin Hammond <justin@dynam.ac>
+Date: Wed, 30 Aug 2023 08:13:33 +0000
+Subject: [PATCH] add libatomic for help plugin on riscv
+
+---
+ src/plugins/help/help.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
+index 1cb2f11156..8eb049a721 100644
+--- a/src/plugins/help/help.pro
++++ b/src/plugins/help/help.pro
+@@ -75,6 +75,8 @@ osx {
+     }
+ }
+ 
++LIBS += -latomic
++
+ QLITEHTML_DIR = $$PWD/../../libs/qlitehtml
+ exists($$QLITEHTML_DIR/src/qlitehtml.pri) {
+     exists($$QLITEHTML_DIR/src/3rdparty/litehtml/CMakeLists.txt)|!isEmpty(LITEHTML_INSTALL_DIR) {
+-- 
+2.25.1
+

recipes-qt/qt5/qt5-creator_git.bbappend

@@ -0,0 +1,4 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append:riscv64 = " \
+    file://0001-add-libatomic-for-help-plugin-on-riscv.patch \
+"

recipes-support/glmark2/glmark2/0001-fix-path-to-wayland-scanner.patch

@@ -0,0 +1,25 @@
+From cbe849eab45de3db14a2228254632cace3387bda Mon Sep 17 00:00:00 2001
+From: Justin Hammond <justin@dynam.ac>
+Date: Thu, 31 Aug 2023 07:44:08 +0000
+Subject: [PATCH] fix path to wayland-scanner
+
+---
+ src/wscript_build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wscript_build b/src/wscript_build
+index a01c8a8..90f0283 100644
+--- a/src/wscript_build
++++ b/src/wscript_build
+@@ -51,7 +51,7 @@ else:
+ 
+ if 'WAYLAND_SCANNER_wayland_scanner' in bld.env.keys():
+     def wayland_scanner_cmd(arg, src):
+-        return '%s %s < %s > ${TGT}' % (bld.env['WAYLAND_SCANNER_wayland_scanner'], arg, src)
++        return 'wayland-scanner %s < %s > ${TGT}' % ( arg, src)
+ 
+     def wayland_proto_src_path(proto, ver):
+         wp_dir = bld.env['WAYLAND_PROTOCOLS_pkgdatadir']
+-- 
+2.25.1
+

recipes-support/glmark2/glmark2_git.bbappend

@@ -0,0 +1,4 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append = " \
+    file://0001-fix-path-to-wayland-scanner.patch \
+"

recipes-support/libmwaw/libmwaw_0.3.22.bb

@@ -1,16 +0,0 @@
-#needed by libreoffice, but the included recipe is pointing to a non-existant download (0.3.21)
-
-SUMMARY = "A library for import of many old Mac document formats"
-HOMEPAGE = "http://sourceforge.net/projects/libmwaw"
-LICENSE = " LGPL-2.1-only & MPL-2.0"
-LIC_FILES_CHKSUM = " \
-    file://COPYING.LGPL;md5=a049c5e22d3bd7bc3c9a2e9135a6d104 \
-    file://COPYING.MPL;md5=cce0d89a18de69e7f51f693182ac4a3e \
-"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "fea4773ff24344814c7501a4b5fc3beecd94d25c180f812330e0974cab941235"
-
-inherit autotools-brokensep pkgconfig
-
-DEPENDS = "librevenge"

recipes-support/mozjs/mozjs-91_91.8.0.bbappend

@@ -0,0 +1,21 @@
+do_copy_rustlib() {
+    # we need to copy the riscv64gc-unknown-linux-gnu sysroot to the
+    # the native sysroot so rust can pick it up
+    cp -r ${STAGING_DIR_HOST}/usr/lib/rustlib/riscv64gc-* ${STAGING_DIR_NATIVE}/usr/lib/rustlib/
+}
+
+addtask copy_rustlib before do_configure after do_patch do_prepare_recipe_sysroot
+
+do_configure() {
+    cd ${B}
+    python3 ${S}/configure.py \
+        --enable-project=js \
+        --target=${RUST_HOST_SYS} \
+        --host=${BUILD_SYS} \
+        --prefix=${prefix} \
+        --libdir=${libdir} \
+        --disable-jemalloc \
+        --disable-strip \
+        ${JIT} \
+        ${ICU}
+}

setup.sh

@@ -28,9 +28,8 @@ layers['meta-openembedded']='https://github.com/openembedded/meta-openembedded|k
 layers['meta-riscv']='https://github.com/Fishwaldo/meta-riscv.git|master|ea2bc5eb8f03e126ff4a132b7f160c57edde4adc'
 layers['meta-qt5']='https://github.com/meta-qt5/meta-qt5.git|master|cf6ffcbad5275a3428f6046468a0c9d572e813d1'
 layers['yocto-meta-kf5']='https://github.com/Fishwaldo/yocto-meta-kf5.git|master|e17d3eab6de7289987216d2c5126e67798a6e7fa'
-layers['yocto-meta-kde']='https://github.com/Fishwaldo/yocto-meta-kde.git|master|11cf088e8e4e3ef0ca110757c1dbd2877a6e1e3b'
+layers['yocto-meta-kde']='https://github.com/Fishwaldo/yocto-meta-kde.git|master|066c10ac3b4bbf8b724e8b7f6711d76fef1d7e1b'
 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|81458800c7dfc0ef1d6e70b35d7a8504a3b263b4'
 layers['meta-clang']='https://github.com/kraj/meta-clang.git|kirkstone|71321ddf78ea522b87a6b4bffefb14c988a6d921'
 layers['meta-lts-rust']='https://git.yoctoproject.org/git/meta-lts-mixins|kirkstone/rust-1.68|feed1bb0eb4aefb701d582156d7defb0c1fc0473'
@@ -61,12 +60,12 @@ do
 done
 
 echo ""
-rustpatch=`md5sum layers/poky/meta/lib/oe/rust.py | awk '{print $1;}'`
-if [ ! $rustpatch = "717271b44ab7b5eb803d088591a82157" ]; then
-	echo "Patching Rust Support in Poky"
-	patch -p1 < patches/rust.patch
-	echo ""
-fi
+# rustpatch=`md5sum layers/poky/meta/lib/oe/rust.py | awk '{print $1;}'`
+# if [ ! $rustpatch = "717271b44ab7b5eb803d088591a82157" ]; then
+# 	echo "Patching Rust Support in Poky"
+# 	patch -p1 < patches/rust.patch
+# 	echo ""
+# fi
 
 if [ ! -f layers/poky/oe-init-build-env ]; then
 	echo "Error: Build Repo Layout Invalid"