From a2a96dfd0bb8ea8d203da97f053bf1a5ab32b300 Mon Sep 17 00:00:00 2001
From: Haakon Drews <haakon.drews@remarkable.no>
Date: Thu, 27 Apr 2023 16:26:29 +0200
Subject: [PATCH] karchive: fix native recipe to use native dependencies

When using inherit native, native.bbclass will not automatically change
dependencies to their -native versions. Due to this, non-native
dependencies will be set for karchive-native.

This patch fixes that by using BBCLASSEXTEND instead, which will
automatically convert dependencies to their -native variants.

See
https://docs.yoctoproject.org/4.0.8/singleindex.html#term-BBCLASSEXTEND
---
 .../kf5/tier1/karchive/karchive-native.bb     |  3 ---
 recipes-kde/kf5/tier1/karchive/karchive.bb    | 21 +++++++++++++++++--
 recipes-kde/kf5/tier1/karchive/karchive.inc   | 15 -------------
 3 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 recipes-kde/kf5/tier1/karchive/karchive-native.bb
 delete mode 100644 recipes-kde/kf5/tier1/karchive/karchive.inc

diff --git a/recipes-kde/kf5/tier1/karchive/karchive-native.bb b/recipes-kde/kf5/tier1/karchive/karchive-native.bb
deleted file mode 100644
index 05b64f31..00000000
--- a/recipes-kde/kf5/tier1/karchive/karchive-native.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require ${BPN}.inc
-
-inherit native
diff --git a/recipes-kde/kf5/tier1/karchive/karchive.bb b/recipes-kde/kf5/tier1/karchive/karchive.bb
index 12f9e64e..58200839 100644
--- a/recipes-kde/kf5/tier1/karchive/karchive.bb
+++ b/recipes-kde/kf5/tier1/karchive/karchive.bb
@@ -1,3 +1,20 @@
-require ${BPN}.inc
+SUMMARY = "Qt 5 addon providing access to numerous types of archives"
+LICENSE = "BSD-2-Clause & LGPL-2.0-or-later"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+"
+
+inherit kde-kf5
+
+DEPENDS += "bzip2 xz zlib"
+
+BBCLASSEXTEND = "native nativesdk"
+DEPENDS:append:class-target = " ${BPN}-native"
+DEPENDS:append:class-nativesdk = " ${BPN}-native"
+
+PV = "${KF5_VERSION}"
+SRC_URI[sha256sum] = "571957caf8304344ef3d5b47092be96563e1526d4a1d70abf04ebcc38dd495fc"
+
+EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
-DEPENDS += "${BPN}-native"
diff --git a/recipes-kde/kf5/tier1/karchive/karchive.inc b/recipes-kde/kf5/tier1/karchive/karchive.inc
deleted file mode 100644
index 833ab61a..00000000
--- a/recipes-kde/kf5/tier1/karchive/karchive.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Qt 5 addon providing access to numerous types of archives"
-LICENSE = "BSD-2-Clause & LGPL-2.0-or-later"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
-    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
-"
-
-inherit kde-kf5
-
-DEPENDS += "bzip2 xz zlib"
-
-PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "571957caf8304344ef3d5b47092be96563e1526d4a1d70abf04ebcc38dd495fc"
-
-EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"