rixty/OpenVoiceOS
1
1
Fork 0
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS synced 2024-12-21 13:54:05 +01:00
Code Issues Releases Wiki Activity
df21d07af2
OpenVoiceOS/buildroot-patches/0110-Bump-and-patch-KF5.patch

96 lines
4.5 KiB
Diff
Raw Normal View History

Add plasma-workspace and its dependencies
2020-10-21 15:49:35 +02:00
From 4fc823103b3c7401a30bb3461276c076b446ecdf Mon Sep 17 00:00:00 2001
MycroftOS: Fix missing hash for qt5-networkmanager
2020-07-20 11:58:54 +02:00
From: j1nx <p.steenbergen@j1nx.nl>
Add plasma-workspace and its dependencies
2020-10-21 15:49:35 +02:00
Date: Mon, 19 Oct 2020 20:18:18 +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
---
Add plasma-workspace and its dependencies
2020-10-21 15:49:35 +02:00
.../kf5-extra-cmake-modules.hash | 1 +
.../kf5-extra-cmake-modules.mk | 1 +
package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash | 1 +
package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 13 ++++++++++++-
.../kf5-networkmanager-qt.hash | 1 +
package/kf5/kf5.mk | 2 +-
6 files changed, 17 insertions(+), 2 deletions(-)
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
Add plasma-workspace and its dependencies
2020-10-21 15:49:35 +02:00
index 733e267fdb..bf017ed377 100644
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
--- 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
WIP Push for backup
2020-11-02 20:55:40 +01:00
+sha256 878d47a901056d5303bf37414d787046e1d38fac2bd9f2f5ddd00a9dd6b9f4eb extra-cmake-modules-5.75.0.tar.xz
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
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
Add plasma-workspace and its dependencies
2020-10-21 15:49:35 +02:00
index 0cd8dcfc15..415c084cad 100644
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
--- 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
WIP Push for backup
2020-11-02 20:55:40 +01:00
+sha256 9ca2cf82ddc12e27ff73aaefdf616c3eb6552a3a5531f014b5bf52a34a4c73f9 kcoreaddons-5.75.0.tar.xz
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
sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB
diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
Add plasma-workspace and its dependencies
2020-10-21 15:49:35 +02:00
index 76be8876cc..dbde5d3285 100644
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
--- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
+++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
Add plasma-workspace and its dependencies
2020-10-21 15:49:35 +02:00
@@ -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"
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
endif
Add plasma-workspace and its dependencies
2020-10-21 15:49:35 +02:00
+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
+
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
$(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
Add plasma-workspace and its dependencies
2020-10-21 15:49:35 +02:00
index 8ccada455e..a57d848e07 100644
MycroftOS: Fix missing hash for qt5-networkmanager
2020-07-20 11:58:54 +02:00
--- 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
WIP Push for backup
2020-11-02 20:55:40 +01:00
+sha256 ba9d15eb5e0e624ffaac591cdaad43dc62e60ccfa25b98be686b58800b41018b networkmanager-qt-5.75.0.tar.xz
MycroftOS: Fix missing hash for qt5-networkmanager
2020-07-20 11:58:54 +02:00
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
Add plasma-workspace and its dependencies
2020-10-21 15:49:35 +02:00
index 8360fc9b63..f744939ecf 100644
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
--- a/package/kf5/kf5.mk
+++ b/package/kf5/kf5.mk
@@ -4,7 +4,7 @@
#
################################################################################
-KF5_VERSION_MAJOR = 5.47
WIP Push for backup
2020-11-02 20:55:40 +01:00
+KF5_VERSION_MAJOR = 5.75
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
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
Reference in New Issue Copy Permalink