rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity
OpenVoiceOS/buildroot-patches/0110-Bump-and-patch-KF5.patch

80 lines
4.0 KiB
Diff
Raw Normal View History

MycroftOS: Fix missing hash for qt5-networkmanager
2020-07-20 11:58:54 +02:00
From 62ed523c06d6c5981f7908b1978f53ba018b40df Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Mon, 20 Jul 2020 11:54:28 +0200
MycroftOS: GUI: More work.. Plasma-framework now included. - next to go is plasma-nano - then mycroft-gui-mark-2
2020-05-12 10:42:39 +02:00
Subject: [PATCH 1/1] Bump and patch KF5
---
.../kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash | 1 +
.../kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk | 1 +
package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash | 1 +
package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 5 +++++
MycroftOS: Fix missing hash for qt5-networkmanager
2020-07-20 11:58:54 +02:00
package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash | 1 +
MycroftOS: GUI: More work.. Plasma-framework now included. - next to go is plasma-nano - then mycroft-gui-mark-2
2020-05-12 10:42:39 +02:00
package/kf5/kf5.mk | 2 +-
MycroftOS: Fix missing hash for qt5-networkmanager
2020-07-20 11:58:54 +02:00
6 files changed, 10 insertions(+), 1 deletion(-)
MycroftOS: GUI: More work.. Plasma-framework now included. - next to go is plasma-nano - then mycroft-gui-mark-2
2020-05-12 10:42:39 +02:00
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..99cf3015ca 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,4 @@
# Locally calculated
sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz
+sha256 dacc8e0be8605b6c609ea35bda2d87bf06e1d228bcbf8957b0f0230c4a888359 extra-cmake-modules-5.69.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..a04f8b8a29 100644
--- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
+++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
@@ -1,3 +1,4 @@
# Locally calculated
sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz
+sha256 e9cc3bc95dd2e3382d0221fbb6ebe8eb8afe5d14fbd2ce8d375eace9e4e74856 kcoreaddons-5.69.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..20cf9f80b1 100644
--- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
+++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
@@ -27,3 +27,8 @@ KF5_KCOREADDONS_CONF_OPTS += -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-fatal-warning
endif
$(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))
MycroftOS: Fix missing hash for qt5-networkmanager
2020-07-20 11:58:54 +02:00
diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
index 8ccada455e..4d92be5aa1 100644
--- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
+++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
@@ -1,3 +1,4 @@
# Locally calculated
sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz
+sha256 9e836e8dd97931231bb92b5ae84777dc54977860aeed881d784209868a2759f0 networkmanager-qt-5.69.0.tar.xz
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
MycroftOS: GUI: More work.. Plasma-framework now included. - next to go is plasma-nano - then mycroft-gui-mark-2
2020-05-12 10:42:39 +02:00
diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk
index 8360fc9b63..3386c14ca4 100644
--- a/package/kf5/kf5.mk
+++ b/package/kf5/kf5.mk
@@ -4,7 +4,7 @@
#
################################################################################
-KF5_VERSION_MAJOR = 5.47
+KF5_VERSION_MAJOR = 5.69
KF5_VERSION = $(KF5_VERSION_MAJOR).0
KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR)
--
MycroftOS: Fix missing hash for qt5-networkmanager
2020-07-20 11:58:54 +02:00
2.20.1
MycroftOS: GUI: More work.. Plasma-framework now included. - next to go is plasma-nano - then mycroft-gui-mark-2
2020-05-12 10:42:39 +02:00