From e1136f863032a8c35fc80a86687b4e4b901b052c Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Wed, 8 Sep 2021 12:33:06 +0200
Subject: [PATCH 1/1] Bump and patch KF5

---
 .../kf5-extra-cmake-modules.hash                    |  2 +-
 .../kf5-extra-cmake-modules.mk                      |  1 +
 package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash    |  2 +-
 package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk      | 13 ++++++++++++-
 .../kf5-networkmanager-qt.hash                      |  2 +-
 package/kf5/kf5.mk                                  |  2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
index 733e267fdb..7d742a2e04 100644
--- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
+++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz
+sha256 5972ec6d78c3e95ab9cbecdb0661c158570e868466357c5cec2b63a4251ecce4 extra-cmake-modules-5.82.0.tar.xz
 sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS
diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk
index 3c4281b960..d3aad89264 100644
--- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk
+++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk
@@ -15,3 +15,4 @@ KF5_EXTRA_CMAKE_MODULES_INSTALL_STAGING = YES
 KF5_EXTRA_CMAKE_MODULES_INSTALL_TARGET = NO
 
 $(eval $(cmake-package))
+$(eval $(host-cmake-package))
diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
index 0cd8dcfc15..1a476915c4 100644
--- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
+++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz
+sha256 12077aac579065ca5ca877aee3bbdce65c52b6d0e9ef8b1fc0e127dd2e7f6843 kcoreaddons-5.82.0.tar.xz
 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB
diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
index 76be8876cc..dbde5d3285 100644
--- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
+++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
@@ -10,7 +10,7 @@ KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz
 KF5_KCOREADDONS_LICENSE = LGPL-2.1
 KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB
 
-KF5_KCOREADDONS_DEPENDENCIES = kf5-extra-cmake-modules qt5tools
+KF5_KCOREADDONS_DEPENDENCIES = kf5-extra-cmake-modules qt5tools host-kf5-kcoreaddons
 KF5_KCOREADDONS_INSTALL_STAGING = YES
 
 KF5_KCOREADDONS_CXXFLAGS = $(TARGET_CXXFLAGS)
@@ -26,4 +26,15 @@ ifeq ($(BR2_microblaze),y)
 KF5_KCOREADDONS_CONF_OPTS += -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-fatal-warnings"
 endif
 
+KF5_KCOREADDONS_POST_INSTALL_STAGING_HOOKS += KF5_KCOREADDONS_COPY_BINS
+
+define KF5_KCOREADDONS_COPY_BINS
+        cp ${HOST_DIR}/bin/desktoptojson $(STAGING_DIR)/usr/bin
+endef
+
 $(eval $(cmake-package))
+HOST_KF5_KCOREADDONS_DEPENDENCIES = host-kf5-extra-cmake-modules
+HOST_KF5_KCOREADDONS_CXXFLAGS = $(HOST_CXXFLAGS)
+HOST_KF5_KCOREADDONS_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(HOST_KF5_KCOREADDONS_CXXFLAGS)"
+
+$(eval $(host-cmake-package))
diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
index 8ccada455e..72b67dff96 100644
--- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
+++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz
+sha256 14f9fe4a6caa3f1cb97927f525ebe10816203b8a7e7f8ec7016bc895f378c7f1 networkmanager-qt-5.82.0.tar.xz
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING.LIB
diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk
index 8360fc9b63..49451cb907 100644
--- a/package/kf5/kf5.mk
+++ b/package/kf5/kf5.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KF5_VERSION_MAJOR = 5.47
+KF5_VERSION_MAJOR = 5.82
 KF5_VERSION = $(KF5_VERSION_MAJOR).0
 KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR)
 
-- 
2.31.0