WIP: more kf5 tinkering (pushed for backup purposes)

This commit is contained in:
Peter Steenbergen 2020-04-29 08:42:42 +02:00
parent 0962623368
commit 3a13bb225b
56 changed files with 341 additions and 18 deletions

View File

@ -146,6 +146,7 @@ BR2_PACKAGE_QT5BASE_PNG=y
BR2_PACKAGE_QT5BASE_DBUS=y
BR2_PACKAGE_QT5BASE_ICU=y
BR2_PACKAGE_QT5BASE_TSLIB=y
BR2_PACKAGE_QT5GRAPHICALEFFECTS=y
BR2_PACKAGE_QT5IMAGEFORMATS=y
BR2_PACKAGE_QT5MULTIMEDIA=y
BR2_PACKAGE_QT5QUICKCONTROLS2=y
@ -423,16 +424,11 @@ BR2_PACKAGE_KF5_KACTIVITIES=y
BR2_PACKAGE_KF5_KARCHIVE=y
BR2_PACKAGE_KF5_KAUTH=y
BR2_PACKAGE_KF5_KBOOKMARKS=y
BR2_PACKAGE_KF5_KCODECS=y
BR2_PACKAGE_KF5_KCOMPLETION=y
BR2_PACKAGE_KF5_KCONFIG=y
BR2_PACKAGE_KF5_KCONFIGWIDGETS=y
BR2_PACKAGE_KF5_KCRASH=y
BR2_PACKAGE_KF5_KDBUSADDONS=y
BR2_PACKAGE_KF5_KDECLARATIVE=y
BR2_PACKAGE_KF5_KGLOBALACCEL=y
BR2_PACKAGE_KF5_KGUIADDONS=y
BR2_PACKAGE_KF5_KI18N=y
BR2_PACKAGE_KF5_KICONTHEMES=y
BR2_PACKAGE_KF5_KIO=y
BR2_PACKAGE_KF5_KIRIGAMI2=y
@ -441,8 +437,6 @@ BR2_PACKAGE_KF5_KJOBWIDGETS=y
BR2_PACKAGE_KF5_KPACKAGE=y
BR2_PACKAGE_KF5_KSERVICE=y
BR2_PACKAGE_KF5_KTEXTWIDGETS=y
BR2_PACKAGE_KF5_KWIDGETSADDONS=y
BR2_PACKAGE_KF5_KWINDOWSYSTEM=y
BR2_PACKAGE_KF5_KXMLGUI=y
BR2_PACKAGE_KF5_SOLID=y
BR2_PACKAGE_KF5_SONNET=y

View File

@ -1,2 +1,4 @@
config BR2_PACKAGE_KF5_KACTIVITIES
bool "kf5-kactivities"
select BR2_PACKAGE_KF5_KCONFIG
select BR2_PACKAGE_KF5_KWINDOWSYSTEM

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 8d61e07a61772491b666a4331e7579a68bdc7a8b0d2fe8d40bff4d0e2a510506 kactivities-5.47.0.tar.xz
sha256 ffc689a1f9fbb89bbd0c5e0e3c2de3970a5c4e810c38ea9c22108c11ef691cba kactivities-5.69.0.tar.xz

View File

@ -10,7 +10,7 @@ KF5_KACTIVITIES_SOURCE = kactivities-$(KF5_KACTIVITIES_VERSION).tar.xz
KF5_KACTIVITIES_LICENSE = BSD-3-Clause
KF5_KACTIVITIES_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KACTIVITIES_DEPENDENCIES = host-pkgconf
KF5_KACTIVITIES_DEPENDENCIES = host-pkgconf kf5-kconfig kf5-kwindowsystem
KF5_KACTIVITIES_INSTALL_STAGING = YES
KF5_KACTIVITIES_SUPPORTS_IN_SOURCE_BUILD = NO

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 b92ccd1ed51734df0d5521b255ad76f88d82aeeaf0dff79cffd76a1e9eeb1d65 karchive-5.47.0.tar.xz
sha256 1a9555eadb72909adbf512e476db29abb5223e736b3c3b77b47753c1138aa039 karchive-5.69.0.tar.xz

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 29c7c3d6c539d52200806502e4b11a132c1941512df6f2d3e073ed3e7f7e00e9 kauth-5.47.0.tar.xz
sha256 20cff8f232ac648bbdad824d819786190ccab2eef2e285866952d63e3edf1ec2 kauth-5.69.0.tar.xz

View File

@ -1,2 +1,5 @@
config BR2_PACKAGE_KF5_KBOOKMARKS
bool "kf5-kbookmarks"
select BR2_PACKAGE_KF5_KCODECS
select BR2_PACKAGE_KF5_KCONFIGWIDGETS
select BR2_PACKAGE_KF5_KXMLGUI

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 93d71e429b0718f0681b4d297290e524b12cac8e96bff080d391ee3bae178b2c kbookmarks-5.47.0.tar.xz
sha256 9bd8c3226cde3fa307cc72875fe3f2b768949c16ef3b198e01a49a39b1624ea4 kbookmarks-5.69.0.tar.xz

View File

@ -10,7 +10,7 @@ KF5_KBOOKMARKS_SOURCE = kbookmarks-$(KF5_KBOOKMARKS_VERSION).tar.xz
KF5_KBOOKMARKS_LICENSE = BSD-3-Clause
KF5_KBOOKMARKS_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KBOOKMARKS_DEPENDENCIES = host-pkgconf
KF5_KBOOKMARKS_DEPENDENCIES = host-pkgconf kf5-kcodecs kf5-kconfigwidgets kf5-kxmlgui
KF5_KBOOKMARKS_INSTALL_STAGING = YES
KF5_KBOOKMARKS_SUPPORTS_IN_SOURCE_BUILD = NO

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 1b8606bf45ecefbd44f33bc1414f14b522fc24aa7de2857cc30da5ce48910de2 kcodecs-5.47.0.tar.xz
sha256 57b990379ed7149fb984ab554839131e83337263f8896c16826dec269b3c334d kcodecs-5.69.0.tar.xz

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 17001dcb7e036e248ab597ce14fc55f845faf59b9723de5b6d14a4b8c820bcf1 kcompletion-5.47.0.tar.xz
sha256 02070a926d252ca8a29970764a39cf984e80e72a4260fe8086718e96c43c0e14 kcompletion-5.69.0.tar.xz

View File

@ -14,4 +14,6 @@ KF5_KCOMPLETION_DEPENDENCIES = host-pkgconf
KF5_KCOMPLETION_INSTALL_STAGING = YES
KF5_KCOMPLETION_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KCOMPLETION_CONF_OPTS = -DBUILD_DESIGNERPLUGIN=OFF
$(eval $(cmake-package))

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 d882255769ab95d49d4df4b40e659b25754935206b1fc07310e2cbc34d3cdb45 kconfig-5.47.0.tar.xz
sha256 18fd38af0fd49fa52cbef2f5c2fc060dec75876b02ff8b9e8cf55a2de0131e28 kconfig-5.69.0.tar.xz

View File

@ -14,4 +14,12 @@ KF5_KCONFIG_DEPENDENCIES = host-pkgconf
KF5_KCONFIG_INSTALL_STAGING = YES
KF5_KCONFIG_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KCONFIG_CXXFLAGS = $(TARGET_CXXFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
KF5_KCONFIG_CXXFLAGS += -latomic
endif
KF5_KCONFIG_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KCONFIG_CXXFLAGS)"
$(eval $(cmake-package))

View File

@ -1,2 +1,5 @@
config BR2_PACKAGE_KF5_KCONFIGWIDGETS
bool "kf5-kconfigwidgets"
select BR2_PACKAGE_KF5_KGUIADDONS
select BR2_PACKAGE_KF5_KI18N
select BR2_PACKAGE_KF5_KWIDGETSADDONS

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 d334f86d5751cd4c04943b5104f3e62db1ed3ed64bc095391807b814ca51fd16 kconfigwidgets-5.47.0.tar.xz
sha256 6fcf93cf2a5c7f81a272f685d329e711a21d2ff314fe7737a52592a138c37473 kconfigwidgets-5.69.0.tar.xz

View File

@ -10,8 +10,17 @@ KF5_KCONFIGWIDGETS_SOURCE = kconfigwidgets-$(KF5_KCONFIGWIDGETS_VERSION).tar.xz
KF5_KCONFIGWIDGETS_LICENSE = BSD-3-Clause
KF5_KCONFIGWIDGETS_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KCONFIGWIDGETS_DEPENDENCIES = host-pkgconf
KF5_KCONFIGWIDGETS_DEPENDENCIES = host-pkgconf kf5-kguiaddons kf5-ki18n kf5-kwidgetsaddons
KF5_KCONFIGWIDGETS_INSTALL_STAGING = YES
KF5_KCONFIGWIDGETS_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KCONFIGWIDGETS_CONF_OPTS = -DBUILD_DESIGNERPLUGIN=OFF
KF5_KCONFIGWIDGETS_CXXFLAGS = $(TARGET_CXXFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
KF5_KCONFIGWIDGETS_CXXFLAGS += -latomic
endif
KF5_KCONFIGWIDGETS_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(KF5_KCONFIGWIDGETS_CXXFLAGS)"
$(eval $(cmake-package))

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 e9e1e9cd1af1d2ed61d4ccc043b89eac5e744f64350a7ce665c319c1ce239697 kcrash-5.47.0.tar.xz
sha256 b6bc671e47a4cdb31c14965a1a68c7ac1a7e362c27e759ff41bd4c89e90cca40 kcrash-5.69.0.tar.xz

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 2bd65636ba6293e79f26195aa9273c6bbe7dbce580c879304b4babea6c064710 kdbusaddons-5.47.0.tar.xz
sha256 c80e78f93fc627342f801ac3b636bb63b3e0478bdc0e915efba89ec23b5e4611 kdbusaddons-5.69.0.tar.xz

View File

@ -1,2 +1,3 @@
config BR2_PACKAGE_KF5_KDECLARATIVE
bool "kf5-kdeclarative"
select BR2_PACKAGE_KF5_KIO

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 3a55236b3aed4ca1b5c754b2b97652a4c91c1c15107396c111bc41ef8d4874a0 kdeclarative-5.47.0.tar.xz
sha256 916618a660f9ddc319019bf63576d7a67fdf62669ef178a87a95dbd311ff6f38 kdeclarative-5.69.0.tar.xz

View File

@ -10,7 +10,7 @@ KF5_KDECLARATIVE_SOURCE = kdeclarative-$(KF5_KDECLARATIVE_VERSION).tar.xz
KF5_KDECLARATIVE_LICENSE = BSD-3-Clause
KF5_KDECLARATIVE_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KDECLARATIVE_DEPENDENCIES = host-pkgconf
KF5_KDECLARATIVE_DEPENDENCIES = host-pkgconf kf5-kio
KF5_KDECLARATIVE_INSTALL_STAGING = YES
KF5_KDECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO

View File

@ -1,2 +1,4 @@
config BR2_PACKAGE_KF5_KGLOBALACCEL
bool "kf5-kglobalaccel"
select BR2_PACKAGE_KF5_KCRASH
select BR2_PACKAGE_KF5_KDBUSADDONS

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 0b9a9c666179770bff4ef7c0e860fd68d6316e8fbec26b8dbdad59354b618ad1 kglobalaccel-5.47.0.tar.xz
sha256 bdaab7b8dfdca007025a194c928eec62b603be958024d556885d835d4cbf06e7 kglobalaccel-5.69.0.tar.xz

View File

@ -10,7 +10,7 @@ KF5_KGLOBALACCEL_SOURCE = kglobalaccel-$(KF5_KGLOBALACCEL_VERSION).tar.xz
KF5_KGLOBALACCEL_LICENSE = BSD-3-Clause
KF5_KGLOBALACCEL_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KGLOBALACCEL_DEPENDENCIES = host-pkgconf
KF5_KGLOBALACCEL_DEPENDENCIES = host-pkgconf kf5-kcrash kf5-kdbusaddons
KF5_KGLOBALACCEL_INSTALL_STAGING = YES
KF5_KGLOBALACCEL_SUPPORTS_IN_SOURCE_BUILD = NO

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 124249df6eb276dd483ec26312046ecfb07a980381d15d37ccb8567debdff192 kguiaddons-5.47.0.tar.xz
sha256 ff183277808d8884cdd30843d534ff554724efda688a6b26fbc58fc28c18cfc0 kguiaddons-5.69.0.tar.xz

View File

@ -1,2 +0,0 @@
# Locally calculated
sha256 x ki18n-5.47.0.tar.xz

View File

@ -0,0 +1,2 @@
# Locally calculated
sha256 7974178947ae111d527836e918f3a4090651e49216c42bbcfb0ade0c854cea5c ki18n-5.69.0.tar.xz

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 b7e17d2ed46b31ae13d87397ae78717701d4f9515d1a647b52a6b14c5f684892 kiconthemes-5.47.0.tar.xz
sha256 9ce961b79f13435f3db397a52a40787d6469da4b3a21a6494c2f25f86f14e532 kiconthemes-5.69.0.tar.xz

View File

@ -14,4 +14,6 @@ KF5_KICONTHEMES_DEPENDENCIES = host-pkgconf
KF5_KICONTHEMES_INSTALL_STAGING = YES
KF5_KICONTHEMES_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KICONTHEMES_CONF_OPTS = -DBUILD_DESIGNERPLUGIN=OFF
$(eval $(cmake-package))

View File

@ -0,0 +1,25 @@
From f6d020cedc5b5fe30ab9f66e50488452c8259377 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 27 Apr 2020 12:28:01 +0200
Subject: [PATCH 1/1] CMakeList: do not overwrite module path
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03921c2..67fcaa3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Mod
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
+list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
--
2.26.1

View File

@ -1,2 +1,6 @@
config BR2_PACKAGE_KF5_KIO
bool "kf5-kio"
select BR2_PACKAGE_KF5_KSERVICE
select BR2_PACKAGE_KF5_SOLID
select BR2_PACKAGE_KF5_KJOBWIDGETS
select BR2_PACKAGE_KF5_KTEXTWIDGETS

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 51122eae0b32cb11a20e2c4862c9770d55aac1a1c6d969b6e899fb06736f8720 kio-5.47.0.tar.xz
sha256 09e4d37058bb5b5993536ea6b010c605b9d2f732e141e9903e2d5f64fea20de6 kio-5.69.0.tar.xz

View File

@ -10,8 +10,19 @@ KF5_KIO_SOURCE = kio-$(KF5_KIO_VERSION).tar.xz
KF5_KIO_LICENSE = BSD-3-Clause
KF5_KIO_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KIO_DEPENDENCIES = host-pkgconf
KF5_KIO_DEPENDENCIES = host-pkgconf host-kf5-kcoreaddons kf5-kservice kf5-solid \
kf5-kjobwidgets kf5-ktextwidgets
KF5_KIO_INSTALL_STAGING = YES
KF5_KIO_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KIO_CONF_OPTS = -DBUILD_DESIGNERPLUGIN=OFF
KF5_KIO_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/usr/lib/cmake"
define KF5_KIO_PRE_XDG_EXPORT
# desktoptojson needs to find installed service type files
export XDG_DATA_DIRS=${HOST_DIR}/usr/share:$XDG_DATA_DIRS
endef
KF5_KIO_PRE_BUILD_HOOKS += KF5_KIO_PRE_XDG_EXPORT
$(eval $(cmake-package))

View File

@ -1,2 +1,3 @@
config BR2_PACKAGE_KF5_KITEMVIEWS
bool "kf5-kitemviews"
select BR2_PACKAGE_KF5_KICONTHEMES

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 e55644402f55def77e221e9da00850ddf0e27f8360ddeb08bd9d97068a3fd336 kitemviews-5.47.0.tar.xz
sha256 9e17697ccdfd6abc6199abdaa23e6869a0904eb284d285bb2a2c3e1f2d0f6947 kitemviews-5.69.0.tar.xz

View File

@ -10,8 +10,10 @@ KF5_KITEMVIEWS_SOURCE = kitemviews-$(KF5_KITEMVIEWS_VERSION).tar.xz
KF5_KITEMVIEWS_LICENSE = BSD-3-Clause
KF5_KITEMVIEWS_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KITEMVIEWS_DEPENDENCIES = host-pkgconf
KF5_KITEMVIEWS_DEPENDENCIES = host-pkgconf kf5-kiconthemes
KF5_KITEMVIEWS_INSTALL_STAGING = YES
KF5_KITEMVIEWS_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KITEMVIEWS_CONF_OPTS = -DBUILD_DESIGNERPLUGIN=OFF
$(eval $(cmake-package))

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 f72e3c095477238b8357508d500821417f5e18444b2a43b65d7c5d6747c56f17 kjobwidgets-5.47.0.tar.xz
sha256 6d08b636f9f6bcd7eceb192590f6689ab6b468872917c1aaa1f401fc862d6f32 kjobwidgets-5.69.0.tar.xz

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 a92d60aae5ebf99c1b518e39cb624b4da9a7f88ebc7e77e52722c1e677bdd167 kservice-5.47.0.tar.xz
sha256 c9980bd998b6b754e00afe3807d81386e11900b1e42afa04fd88c921c8d38877 kservice-5.69.0.tar.xz

View File

@ -1,2 +1,3 @@
config BR2_PACKAGE_KF5_KTEXTWIDGETS
bool "kf5-ktextwidgets"
select BR2_PACKAGE_KF5_SONNET

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 d9eb46747c0f2d4d4db5ac20c788b8894d2f7048f530b31c892c7bb44d2388a7 ktextwidgets-5.47.0.tar.xz
sha256 182661253bf2ed940ab52edfeb2d8cadf1abbde76cade2ba50ef490311002ec9 ktextwidgets-5.69.0.tar.xz

View File

@ -10,8 +10,10 @@ KF5_KTEXTWIDGETS_SOURCE = ktextwidgets-$(KF5_KTEXTWIDGETS_VERSION).tar.xz
KF5_KTEXTWIDGETS_LICENSE = BSD-3-Clause
KF5_KTEXTWIDGETS_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KTEXTWIDGETS_DEPENDENCIES = host-pkgconf
KF5_KTEXTWIDGETS_DEPENDENCIES = host-pkgconf kf5-sonnet
KF5_KTEXTWIDGETS_INSTALL_STAGING = YES
KF5_KTEXTWIDGETS_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KTEXTWIDGETS_CONF_OPTS = -DBUILD_DESIGNERPLUGIN=OFF
$(eval $(cmake-package))

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 5aa6f4002e6f1302f272b3839513debefafd51b7f3a9249f6ef2c5f30cec5a34 kwidgetsaddons-5.47.0.tar.xz
sha256 5fcc39eb17d832a14e8c2fe98ff26a300aa5c88013c63bcf8eef0017ca4eaf37 kwidgetsaddons-5.69.0.tar.xz

View File

@ -13,5 +13,6 @@ KF5_KWIDGETSADDONS_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KWIDGETSADDONS_DEPENDENCIES = host-pkgconf
KF5_KWIDGETSADDONS_INSTALL_STAGING = YES
KF5_KWIDGETSADDONS_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KWIDGETSADDONS_CONF_OPTS = -DBUILD_DESIGNERPLUGIN=OFF
$(eval $(cmake-package))

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 a673722d2dc8a0dd302cb5dad3e2069244af0918fc0f3508313c9a758297cbc1 kwindowsystem-5.47.0.tar.xz
sha256 d85ed73843f7310f557d4a39c55e87d6beaee249b330eeb739a493274479cff0 kwindowsystem-5.69.0.tar.xz

View File

@ -1,2 +1,4 @@
config BR2_PACKAGE_KF5_KXMLGUI
bool "kf5-kxmlgui"
select BR2_PACKAGE_KF5_KITEMVIEWS
select BR2_PACKAGE_KF5_KGLOBALACCEL

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 975afe9db3c2d0952991db9681309974fdd41dfbf92d480099b5f40ba08d94a4 kxmlgui-5.47.0.tar.xz
sha256 c6d6d5b05af21ebdca03f110a2563b0bad0f069078cb0d94a629624f29450657 kxmlgui-5.69.0.tar.xz

View File

@ -10,8 +10,10 @@ KF5_KXMLGUI_SOURCE = kxmlgui-$(KF5_KXMLGUI_VERSION).tar.xz
KF5_KXMLGUI_LICENSE = BSD-3-Clause
KF5_KXMLGUI_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KXMLGUI_DEPENDENCIES = host-pkgconf
KF5_KXMLGUI_DEPENDENCIES = host-pkgconf kf5-kitemviews kf5-kglobalaccel
KF5_KXMLGUI_INSTALL_STAGING = YES
KF5_KXMLGUI_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KXMLGUI_CONF_OPTS = -DBUILD_DESIGNERPLUGIN=OFF
$(eval $(cmake-package))

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 5437f3f3a70ff37251d5d88636c39819112c91fcfd36660b6d777d457bdf2e10 solid-5.47.0.tar.xz
sha256 0a033cb7dc0a8040a0e2fa31acfee62251033c98af93a3abe3e45e967a0697b0 solid-5.69.0.tar.xz

View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 f965f10dc3e1cc0ab810db38fe1be9385c8f505ca84bd87587f2d2f0c3cece92 sonnet-5.47.0.tar.xz
sha256 6353db0d68e5f34cd48e43edc7fc5f05465e55bf6e04d6772997321542b43d5e sonnet-5.69.0.tar.xz

View File

@ -14,4 +14,6 @@ KF5_SONNET_DEPENDENCIES = host-pkgconf
KF5_SONNET_INSTALL_STAGING = YES
KF5_SONNET_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_SONNET_CONF_OPTS = -DBUILD_DESIGNERPLUGIN=OFF
$(eval $(cmake-package))

View File

@ -0,0 +1,220 @@
From eec61f4acf2b47fbc6536478f98c2568cda092e6 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Wed, 29 Apr 2020 08:40:29 +0200
Subject: [PATCH 1/1] Allow for KF5 framework to be installed
---
.../kf5-extra-cmake-modules.hash | 1 +
.../kf5-extra-cmake-modules.mk | 1 +
.../kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash | 1 +
.../kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 3 ++
package/kf5/kf5.mk | 2 +-
package/qt5/qt5base/qt5base.mk | 52 +++++++++++++++++++
package/qt5/qt5declarative/qt5declarative.mk | 15 ++++++
package/qt5/qt5tools/qt5tools.mk | 24 +++++++++
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 15 ++++++
9 files changed, 113 insertions(+), 1 deletion(-)
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..0ed2affb31 100644
--- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
+++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
@@ -11,6 +11,8 @@ KF5_KCOREADDONS_LICENSE = LGPL-2.1
KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB
KF5_KCOREADDONS_DEPENDENCIES = kf5-extra-cmake-modules qt5tools
+HOST_KF5_KCOREADDONS_DEPENDENCIES = host-kf5-extra-cmake-modules host-qt5tools
+
KF5_KCOREADDONS_INSTALL_STAGING = YES
KF5_KCOREADDONS_CXXFLAGS = $(TARGET_CXXFLAGS)
@@ -27,3 +29,4 @@ KF5_KCOREADDONS_CONF_OPTS += -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-fatal-warning
endif
$(eval $(cmake-package))
+$(eval $(host-cmake-package))
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)
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 774c771bc9..67e5c07b86 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -433,4 +433,56 @@ define QT5BASE_INSTALL_TARGET_CMDS
endef
endif
+
+# We need a minimalistic host QT5 for the KF5 framework
+# this is needed to make and use KF5_HOST_TOOLING support
+HOST_QT5BASE_DEPENDENCIES = host-pkgconf
+
+define HOST_QT5BASE_CONFIGURE_CMDS
+ (cd $(@D); \
+ $(HOST_MAKE_ENV) \
+ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+ MAKEFLAGS="-j$(PARALLEL_JOBS) $(MAKEFLAGS)" \
+ ./configure \
+ -v \
+ -prefix /usr \
+ -extprefix $(HOST_DIR) \
+ -headerdir /usr/include/qt5 \
+ -plugindir /usr/lib/qt/plugins \
+ -examplesdir /usr/lib/qt/examples \
+ -no-rpath \
+ -nomake tests \
+ -nomake examples -no-compile-examples \
+ -optimized-qmake \
+ -skip qtwayland \
+ -skip qtwebengine \
+ -no-cups \
+ -no-iconv \
+ -system-zlib \
+ -system-pcre \
+ -no-pch \
+ -shared \
+ -no-ssl \
+ -evdev \
+ -qt-freetype \
+ -no-fontconfig \
+ -glib \
+ -opengl es2 -eglfs \
+ -no-gtk \
+ -qpa eglfs \
+ -release \
+ -opensource \
+ -confirm-license \
+ )
+endef
+
+define HOST_QT5BASE_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_QT5BASE_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 6210611961..50024f2050 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -63,4 +63,19 @@ define QT5DECLARATIVE_INSTALL_TARGET_CMDS
$(QT5DECLARATIVE_INSTALL_TARGET_LIBS)
endef
+HOST_QT5DECLARATIVE_DEPENDENCIES = host-qt5base
+
+define HOST_QT5DECLARATIVE_CONFIGURE_CMDS
+ (cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/qmake)
+endef
+
+define HOST_QT5DECLARATIVE_BUILD_CMDS
+ $(HOST__MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_QT5DECLARATIVE_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index 0d00022998..5a6a3c4e1a 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -71,4 +71,28 @@ define QT5TOOLS_INSTALL_TARGET_CMDS
$(INSTALL) -D -m0755 $(@D)/bin/$(p) $(TARGET_DIR)/usr/bin/$(p)$(sep))
endef
+
+# We need a minimalistic host QT5 for the KF5 framework
+# this is needed to make and use KF5_HOST_TOOLING support
+HOST_QT5TOOLS_DEPENDENCIES = host-qt5declarative
+
+HOST_QT5TOOLS_BUILD_DIRS_y += linguist/lconvert linguist/lrelease linguist/lupdate
+HOST_QT5TOOLS_INSTALL_HOST_DIR_y += linguist
+
+define HOST_QT5TOOLS_CONFIGURE_CMDS
+ (cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/qmake)
+endef
+
+define HOST_QT5TOOLS_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) sub-src-qmake_all
+ $(foreach p,$(HOST_QT5TOOLS_BUILD_DIRS_y), \
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p)$(sep))
+endef
+
+define HOST_QT5TOOLS_INSTALL_CMDS
+ $(foreach p,$(QT5TOOLS_INSTALL_HOST_DIR_y), \
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p) install$(sep))
+endef
+
$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 6ed247fd59..c6262b94b6 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -50,4 +50,19 @@ define QT5XMLPATTERNS_INSTALL_TARGET_CMDS
$(QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES)
endef
+HOST_QT5XMLPATTERNS_DEPENDENCIES = host-qt5base host-qt5tools host-qt5declarative
+
+define HOST_QT5XMLPATTERNS_CONFIGURE_CMDS
+ (cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/qmake)
+endef
+
+define HOST_QT5XMLPATTERNS_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_QT5XMLPATTERNS_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
$(eval $(generic-package))
+$(eval $(host-generic-package))
--
2.26.1