From 55e6e700493f5c579f2884e7c900867afca6de96 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen Date: Tue, 12 May 2020 10:42:39 +0200 Subject: [PATCH] MycroftOS: GUI: More work.. Plasma-framework now included. - next to go is plasma-nano - then mycroft-gui-mark-2 --- buildroot-external/Config.in | 4 + buildroot-external/configs/rpi3_defconfig | 104 +++------ .../package/kf5-karchive/kf5-karchive.mk | 6 + .../package/kf5-kconfig/kf5-kconfig.mk | 6 + .../kf5-kdeclarative/kf5-kdeclarative.mk | 4 +- .../package/kf5-ki18n/kf5-ki18n.mk | 6 + .../kf5-kiconthemes/kf5-kiconthemes.mk | 2 +- buildroot-external/package/kf5-kio/kf5-kio.mk | 16 +- .../package/kf5-kirigami2/kf5-kirigami2.hash | 1 + .../package/kf5-kitemviews/kf5-kitemviews.mk | 2 +- .../package/kf5-knotifications/Config.in | 2 + .../kf5-knotifications.hash | 2 + .../kf5-knotifications/kf5-knotifications.mk | 25 ++ .../package/kf5-kpackage/kf5-kpackage.hash | 1 + .../package/kf5-kpackage/kf5-kpackage.mk | 8 + .../package/kf5-kwayland/Config.in | 2 + .../package/kf5-kwayland/kf5-kwayland.hash | 2 + .../package/kf5-kwayland/kf5-kwayland.mk | 25 ++ .../package/kf5-kxmlgui/kf5-kxmlgui.mk | 2 +- .../package/kf5-phonon/Config.in | 2 + .../package/kf5-phonon/kf5-phonon.hash | 2 + .../package/kf5-phonon/kf5-phonon.mk | 17 ++ .../kf5-plasma-framework.hash | 1 + .../kf5-plasma-framework.mk | 3 +- .../package/kf5-plasma-nano/Config.in | 2 + .../kf5-plasma-nano/kf5-plasma-nano.hash | 2 + .../kf5-plasma-nano/kf5-plasma-nano.mk | 17 ++ .../package/respeaker/Config.in | 1 - .../0110-Bump-and-patch-KF5.patch | 69 ++++++ .../0110-Upgrade-KF5-to-version-5.69.patch | 25 -- ...ow-for-KF5-framework-to-be-installed.patch | 220 ------------------ 31 files changed, 253 insertions(+), 328 deletions(-) create mode 100644 buildroot-external/package/kf5-knotifications/Config.in create mode 100644 buildroot-external/package/kf5-knotifications/kf5-knotifications.hash create mode 100644 buildroot-external/package/kf5-knotifications/kf5-knotifications.mk create mode 100644 buildroot-external/package/kf5-kwayland/Config.in create mode 100644 buildroot-external/package/kf5-kwayland/kf5-kwayland.hash create mode 100644 buildroot-external/package/kf5-kwayland/kf5-kwayland.mk create mode 100644 buildroot-external/package/kf5-phonon/Config.in create mode 100644 buildroot-external/package/kf5-phonon/kf5-phonon.hash create mode 100644 buildroot-external/package/kf5-phonon/kf5-phonon.mk create mode 100644 buildroot-external/package/kf5-plasma-nano/Config.in create mode 100644 buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.hash create mode 100644 buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.mk create mode 100644 buildroot-patches/0110-Bump-and-patch-KF5.patch delete mode 100644 buildroot-patches/0110-Upgrade-KF5-to-version-5.69.patch delete mode 100644 buildroot-patches/0200-Allow-for-KF5-framework-to-be-installed.patch diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index e172dae8..bbe7b57b 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -32,13 +32,17 @@ menu "KF5" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-kirigami2/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-kitemviews/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-kjobwidgets/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-knotifications/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-kpackage/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-kservice/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-ktextwidgets/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-kwayland/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-kwidgetsaddons/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-kwindowsystem/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-kxmlgui/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-phonon/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-plasma-framework/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-plasma-nano/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-solid/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/kf5-sonnet/Config.in" endmenu diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index cd91591c..d95f48e5 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -60,34 +60,18 @@ BR2_PACKAGE_ALSA_UTILS_ASEQNET=y BR2_PACKAGE_ALSA_UTILS_BAT=y BR2_PACKAGE_ALSA_UTILS_IECSET=y BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y -BR2_PACKAGE_ESPEAK=y -BR2_PACKAGE_FAAD2=y +BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y BR2_PACKAGE_FFMPEG_NONFREE=y BR2_PACKAGE_FFMPEG_FFPLAY=y BR2_PACKAGE_FFMPEG_FFPROBE=y +BR2_PACKAGE_FFMPEG_AVRESAMPLE=y BR2_PACKAGE_FFMPEG_POSTPROC=y -BR2_PACKAGE_LAME=y BR2_PACKAGE_MIMIC=y BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO=y -BR2_PACKAGE_MIRACLECAST=y -BR2_PACKAGE_MJPEGTOOLS=y -BR2_PACKAGE_MOTION=y -BR2_PACKAGE_MPD=y -BR2_PACKAGE_MPV=y -BR2_PACKAGE_NCMPC=y -BR2_PACKAGE_OMXPLAYER=y -BR2_PACKAGE_OPUS_TOOLS=y +BR2_PACKAGE_MPG123=y BR2_PACKAGE_PULSEAUDIO=y BR2_PACKAGE_PULSEAUDIO_DAEMON=y -BR2_PACKAGE_SQUEEZELITE=y -BR2_PACKAGE_SQUEEZELITE_RESAMPLE=y -BR2_PACKAGE_V4L2GRAB=y -BR2_PACKAGE_V4L2LOOPBACK=y -BR2_PACKAGE_V4L2LOOPBACK_UTILS=y -BR2_PACKAGE_VLC=y -BR2_PACKAGE_VORBIS_TOOLS=y -BR2_PACKAGE_WAVPACK=y BR2_PACKAGE_GZIP=y BR2_PACKAGE_LZ4=y BR2_PACKAGE_LZIP=y @@ -112,30 +96,25 @@ BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y +BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_PACKAGE_NFS_UTILS=y BR2_PACKAGE_NTFS_3G=y -BR2_PACKAGE_DIRECTFB=y -BR2_PACKAGE_DIRECTFB_TIFF=y -BR2_PACKAGE_DIRECTFB_IMLIB2=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y BR2_PACKAGE_FBV=y -BR2_PACKAGE_FREERDP=y -BR2_PACKAGE_SDL2_DIRECTFB=y +BR2_PACKAGE_MESA3D=y +BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y +BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y +BR2_PACKAGE_MESA3D_OPENGL_ES=y +BR2_PACKAGE_SDL2_KMSDRM=y BR2_PACKAGE_SDL2_OPENGLES=y -BR2_PACKAGE_SDL2_GFX=y -BR2_PACKAGE_SDL2_IMAGE=y -BR2_PACKAGE_SDL2_MIXER=y -BR2_PACKAGE_SDL2_NET=y -BR2_PACKAGE_SDL2_TTF=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT53D=y BR2_PACKAGE_QT5BASE_CONCURRENT=y BR2_PACKAGE_QT5BASE_SQLITE_QT=y BR2_PACKAGE_QT5BASE_LINUXFB=y -BR2_PACKAGE_QT5BASE_DIRECTFB=y BR2_PACKAGE_QT5BASE_EGLFS=y BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs" BR2_PACKAGE_QT5BASE_FONTCONFIG=y @@ -154,11 +133,9 @@ BR2_PACKAGE_QT5SCRIPT=y BR2_PACKAGE_QT5VIRTUALKEYBOARD=y BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS="en_US" BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION=y +BR2_PACKAGE_QT5WAYLAND=y BR2_PACKAGE_KF5=y BR2_PACKAGE_KF5_KCOREADDONS=y -BR2_PACKAGE_ARMBIAN_FIRMWARE=y -BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y -BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_IBT=y BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650=y @@ -216,7 +193,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y BR2_PACKAGE_RPI_BT_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y -BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG=y BR2_PACKAGE_RPI_WIFI_FIRMWARE=y BR2_PACKAGE_UX500_FIRMWARE=y BR2_PACKAGE_WILC1000_FIRMWARE=y @@ -225,7 +201,6 @@ BR2_PACKAGE_ZD1211_FIRMWARE=y BR2_PACKAGE_DBUS_CPP=y BR2_PACKAGE_DBUS_PYTHON=y BR2_PACKAGE_KBD=y -BR2_PACKAGE_OFONO=y BR2_PACKAGE_PARTED=y BR2_PACKAGE_RASPI_GPIO=y BR2_PACKAGE_SPI_TOOLS=y @@ -279,15 +254,11 @@ BR2_PACKAGE_PYTHON_TEXTTABLE=y BR2_PACKAGE_PYTHON_TORNADO=y BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT=y BR2_PACKAGE_PYTHON_WRAPT=y -BR2_PACKAGE_AUDIOFILE=y -BR2_PACKAGE_LIBCDDB=y -BR2_PACKAGE_LIBMPD=y -BR2_PACKAGE_LIBSIDPLAY2=y +BR2_PACKAGE_LIBAO=y BR2_PACKAGE_OPUS_FIXED_POINT=y +BR2_PACKAGE_OPUSFILE=y BR2_PACKAGE_PORTAUDIO=y BR2_PACKAGE_PORTAUDIO_OSS=y -BR2_PACKAGE_SBC=y -BR2_PACKAGE_SPEEXDSP=y BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING=y BR2_PACKAGE_LIBARCHIVE=y BR2_PACKAGE_LIBARCHIVE_BSDTAR=y @@ -295,43 +266,50 @@ BR2_PACKAGE_LIBARCHIVE_BSDCPIO=y BR2_PACKAGE_LIBARCHIVE_BSDCAT=y BR2_PACKAGE_LIBZIP=y BR2_PACKAGE_CA_CERTIFICATES=y +BR2_PACKAGE_GNUTLS=y BR2_PACKAGE_GNUTLS_OPENSSL=y BR2_PACKAGE_GNUTLS_TOOLS=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_LIBOPENSSL_BIN=y BR2_PACKAGE_LIBOPENSSL_ENGINES=y BR2_PACKAGE_LIBNFS=y -BR2_PACKAGE_LIBRSVG=y -BR2_PACKAGE_OPENCV3=y +BR2_PACKAGE_GDK_PIXBUF=y +BR2_PACKAGE_LIBEPOXY=y +BR2_PACKAGE_LIBSVG_CAIRO=y +BR2_PACKAGE_TIFF=y BR2_PACKAGE_LIBCEC=y BR2_PACKAGE_LIBGUDEV=y +BR2_PACKAGE_LIBV4L=y BR2_PACKAGE_LIBV4L_UTILS=y -BR2_PACKAGE_MRAA=y BR2_PACKAGE_WIRINGPI=y BR2_PACKAGE_LIBFASTJSON=y BR2_PACKAGE_YAJL=y -BR2_PACKAGE_LIBLOGGING=y -BR2_PACKAGE_LIBASS=y -BR2_PACKAGE_LIBBLURAY=y -BR2_PACKAGE_LIBDVBPSI=y BR2_PACKAGE_LIBMATROSKA=y BR2_PACKAGE_LIBMMS=y BR2_PACKAGE_LIBMPEG2=y BR2_PACKAGE_LIBMPEG2_BINS=y BR2_PACKAGE_LIBOPENH264=y +BR2_PACKAGE_LIBOPUSENC=y BR2_PACKAGE_LIBTHEORA=y BR2_PACKAGE_X264=y BR2_PACKAGE_X265=y BR2_PACKAGE_C_ARES=y +BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_LIBHTTPPARSER=y +BR2_PACKAGE_LIBIDN=y +BR2_PACKAGE_LIBMICROHTTPD=y BR2_PACKAGE_LIBNDP=y BR2_PACKAGE_LIBSHAIRPLAY=y -BR2_PACKAGE_LIBUPNP18=y BR2_PACKAGE_NGHTTP2=y +BR2_PACKAGE_BOOST_SYSTEM=y +BR2_PACKAGE_CMOCKA=y +BR2_PACKAGE_ELL=y +BR2_PACKAGE_LIBCAP_NG=y BR2_PACKAGE_LIBUV=y BR2_PACKAGE_PROTOBUF=y BR2_PACKAGE_LIBESTR=y +BR2_PACKAGE_LIBFRIBIDI=y BR2_PACKAGE_LIBUNISTRING=y BR2_PACKAGE_NCURSES_WCHAR=y BR2_PACKAGE_NCURSES_TARGET_PROGS=y @@ -355,19 +333,19 @@ BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_NTPTIME=y BR2_PACKAGE_OPENSSH=y -BR2_PACKAGE_SAMBA4=y BR2_PACKAGE_SHAIRPORT_SYNC=y BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION=y BR2_PACKAGE_SHAIRPORT_SYNC_DBUS=y BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR=y -BR2_PACKAGE_SHAIRPORT_SYNC_MQTT=y BR2_PACKAGE_WGET=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS_LIB=y BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y +BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING=y BR2_PACKAGE_WPA_SUPPLICANT_EAP=y BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y +BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y @@ -375,14 +353,15 @@ BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y BR2_PACKAGE_BASH_COMPLETION=y BR2_PACKAGE_FILE=y BR2_PACKAGE_SCREEN=y +BR2_PACKAGE_SUDO=y BR2_PACKAGE_TIME=y BR2_PACKAGE_WHICH=y BR2_PACKAGE_HTOP=y -BR2_PACKAGE_START_STOP_DAEMON=y -BR2_PACKAGE_SYSKLOGD=y BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y BR2_PACKAGE_SYSTEMD_HIBERNATE=y BR2_PACKAGE_SYSTEMD_LOCALED=y +BR2_PACKAGE_SYSTEMD_POLKIT=y +BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_SYSTEMD_RFKILL=y # BR2_PACKAGE_SYSTEMD_VCONSOLE is not set BR2_PACKAGE_TAR=y @@ -402,8 +381,6 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_PKGCONF=y -BR2_PACKAGE_HOST_PYTHON=y -BR2_PACKAGE_HOST_PYTHON_SSL=y BR2_PACKAGE_HOST_PYTHON_CYTHON=y BR2_PACKAGE_HOST_PYTHON_LXML=y BR2_PACKAGE_HOST_PYTHON_SIX=y @@ -425,21 +402,14 @@ BR2_PACKAGE_KF5_KARCHIVE=y BR2_PACKAGE_KF5_KAUTH=y BR2_PACKAGE_KF5_KBOOKMARKS=y BR2_PACKAGE_KF5_KCOMPLETION=y -BR2_PACKAGE_KF5_KCRASH=y -BR2_PACKAGE_KF5_KDBUSADDONS=y BR2_PACKAGE_KF5_KDECLARATIVE=y -BR2_PACKAGE_KF5_KGLOBALACCEL=y -BR2_PACKAGE_KF5_KICONTHEMES=y -BR2_PACKAGE_KF5_KIO=y BR2_PACKAGE_KF5_KIRIGAMI2=y -BR2_PACKAGE_KF5_KITEMVIEWS=y -BR2_PACKAGE_KF5_KJOBWIDGETS=y +BR2_PACKAGE_KF5_KNOTIFICATIONS=y BR2_PACKAGE_KF5_KPACKAGE=y -BR2_PACKAGE_KF5_KSERVICE=y -BR2_PACKAGE_KF5_KTEXTWIDGETS=y -BR2_PACKAGE_KF5_KXMLGUI=y -BR2_PACKAGE_KF5_SOLID=y -BR2_PACKAGE_KF5_SONNET=y +BR2_PACKAGE_KF5_KWAYLAND=y +BR2_PACKAGE_KF5_PHONON=y +BR2_PACKAGE_KF5_PLASMA_FRAMEWORK=y +BR2_PACKAGE_KF5_PLASMA_NANO=y BR2_PACKAGE_RESPEAKER=y BR2_PACKAGE_SNAPCAST=y BR2_PACKAGE_SNAPCAST_SERVER=y diff --git a/buildroot-external/package/kf5-karchive/kf5-karchive.mk b/buildroot-external/package/kf5-karchive/kf5-karchive.mk index b259fd9d..58b422f4 100644 --- a/buildroot-external/package/kf5-karchive/kf5-karchive.mk +++ b/buildroot-external/package/kf5-karchive/kf5-karchive.mk @@ -15,3 +15,9 @@ KF5_KARCHIVE_INSTALL_STAGING = YES KF5_KARCHIVE_SUPPORTS_IN_SOURCE_BUILD = NO $(eval $(cmake-package)) + +HOST_KF5_KARCHIVE_DEPENDENCIES = host-kf5-extra-cmake-modules +HOST_KF5_KARCHIVE_CXXFLAGS = $(HOST_CXXFLAGS) +HOST_KF5_KARCHIVE_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(HOST_KF5_KARCHIVE_CXXFLAGS)" + +$(eval $(host-cmake-package)) diff --git a/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk b/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk index 7335eaa5..4ff71f0f 100644 --- a/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk +++ b/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk @@ -23,3 +23,9 @@ endif KF5_KCONFIG_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KCONFIG_CXXFLAGS)" $(eval $(cmake-package)) + +HOST_KF5_KCONFIG_DEPENDENCIES = host-kf5-extra-cmake-modules +HOST_KF5_KCONFIG_CXXFLAGS = $(HOST_CXXFLAGS) +HOST_KF5_KCONFIG_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(HOST_KF5_KCONFIG_CXXFLAGS)" + +$(eval $(host-cmake-package)) diff --git a/buildroot-external/package/kf5-kdeclarative/kf5-kdeclarative.mk b/buildroot-external/package/kf5-kdeclarative/kf5-kdeclarative.mk index ce9a5e00..3d90b1aa 100644 --- a/buildroot-external/package/kf5-kdeclarative/kf5-kdeclarative.mk +++ b/buildroot-external/package/kf5-kdeclarative/kf5-kdeclarative.mk @@ -10,8 +10,10 @@ 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-kio +KF5_KDECLARATIVE_DEPENDENCIES = host-pkgconf kf5-kio kf5-kpackage host-kf5-kpackage KF5_KDECLARATIVE_INSTALL_STAGING = YES KF5_KDECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO +KF5_KDECLARATIVE_CONF_OPTS += -DKF5_HOST_TOOLING=$(HOST_DIR)/lib/x86_64-linux-gnu/cmake + $(eval $(cmake-package)) diff --git a/buildroot-external/package/kf5-ki18n/kf5-ki18n.mk b/buildroot-external/package/kf5-ki18n/kf5-ki18n.mk index 3491f91f..a610a5ae 100644 --- a/buildroot-external/package/kf5-ki18n/kf5-ki18n.mk +++ b/buildroot-external/package/kf5-ki18n/kf5-ki18n.mk @@ -15,3 +15,9 @@ KF5_KI18N_INSTALL_STAGING = YES KF5_KI18N_SUPPORTS_IN_SOURCE_BUILD = NO $(eval $(cmake-package)) + +HOST_KF5_KI18N_DEPENDENCIES = host-kf5-extra-cmake-modules +HOST_KF5_KI18N_CXXFLAGS = $(HOST_CXXFLAGS) +HOST_KF5_KI18N_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(HOST_KF5_KI18N_CXXFLAGS)" + +$(eval $(host-cmake-package)) diff --git a/buildroot-external/package/kf5-kiconthemes/kf5-kiconthemes.mk b/buildroot-external/package/kf5-kiconthemes/kf5-kiconthemes.mk index 34759a05..4ba466b7 100644 --- a/buildroot-external/package/kf5-kiconthemes/kf5-kiconthemes.mk +++ b/buildroot-external/package/kf5-kiconthemes/kf5-kiconthemes.mk @@ -10,7 +10,7 @@ KF5_KICONTHEMES_SOURCE = kiconthemes-$(KF5_KICONTHEMES_VERSION).tar.xz KF5_KICONTHEMES_LICENSE = BSD-3-Clause KF5_KICONTHEMES_LICENSE_FILES = COPYING-CMAKE-SCRIPTS -KF5_KICONTHEMES_DEPENDENCIES = host-pkgconf +KF5_KICONTHEMES_DEPENDENCIES = host-pkgconf kf5-kitemviews KF5_KICONTHEMES_INSTALL_STAGING = YES KF5_KICONTHEMES_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/buildroot-external/package/kf5-kio/kf5-kio.mk b/buildroot-external/package/kf5-kio/kf5-kio.mk index 63ca8e0b..c206e351 100644 --- a/buildroot-external/package/kf5-kio/kf5-kio.mk +++ b/buildroot-external/package/kf5-kio/kf5-kio.mk @@ -10,19 +10,15 @@ 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 host-kf5-kcoreaddons kf5-kservice kf5-solid \ - kf5-kjobwidgets kf5-ktextwidgets +KF5_KIO_DEPENDENCIES = host-pkgconf kf5-kservice kf5-solid \ + kf5-kjobwidgets kf5-ktextwidgets \ + kf5-knotifications host-kf5-kconfig \ + host-kf5-kcoreaddons + 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 +KF5_KIO_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake" $(eval $(cmake-package)) diff --git a/buildroot-external/package/kf5-kirigami2/kf5-kirigami2.hash b/buildroot-external/package/kf5-kirigami2/kf5-kirigami2.hash index f45dec46..de9a00d6 100644 --- a/buildroot-external/package/kf5-kirigami2/kf5-kirigami2.hash +++ b/buildroot-external/package/kf5-kirigami2/kf5-kirigami2.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 ed2dd9e3a56f4728aca40c74ab02d48f9dda8d140b20328c5b29825f5683aad5 kirigami2-5.47.0.tar.xz +sha256 8cf742d8f695c5ff6c7bcb5da1baddb50f5f5a0e96e879d8243704c847cd1443 kirigami2-5.69.0.tar.xz diff --git a/buildroot-external/package/kf5-kitemviews/kf5-kitemviews.mk b/buildroot-external/package/kf5-kitemviews/kf5-kitemviews.mk index 3849d787..19a523ce 100644 --- a/buildroot-external/package/kf5-kitemviews/kf5-kitemviews.mk +++ b/buildroot-external/package/kf5-kitemviews/kf5-kitemviews.mk @@ -10,7 +10,7 @@ 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-kiconthemes +KF5_KITEMVIEWS_DEPENDENCIES = host-pkgconf KF5_KITEMVIEWS_INSTALL_STAGING = YES KF5_KITEMVIEWS_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/buildroot-external/package/kf5-knotifications/Config.in b/buildroot-external/package/kf5-knotifications/Config.in new file mode 100644 index 00000000..e4566bc7 --- /dev/null +++ b/buildroot-external/package/kf5-knotifications/Config.in @@ -0,0 +1,2 @@ +config BR2_PACKAGE_KF5_KNOTIFICATIONS + bool "kf5-knotifications" diff --git a/buildroot-external/package/kf5-knotifications/kf5-knotifications.hash b/buildroot-external/package/kf5-knotifications/kf5-knotifications.hash new file mode 100644 index 00000000..6f8f8ad7 --- /dev/null +++ b/buildroot-external/package/kf5-knotifications/kf5-knotifications.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 d449673969123f72d891498f39461a6b25d69ff8b64911c4179d7ca48d229e15 knotifications-5.69.0.tar.xz diff --git a/buildroot-external/package/kf5-knotifications/kf5-knotifications.mk b/buildroot-external/package/kf5-knotifications/kf5-knotifications.mk new file mode 100644 index 00000000..9c2814a3 --- /dev/null +++ b/buildroot-external/package/kf5-knotifications/kf5-knotifications.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# kf5-knotifications +# +################################################################################ + +KF5_KNOTIFICATIONS_VERSION = $(KF5_VERSION) +KF5_KNOTIFICATIONS_SITE = $(KF5_SITE) +KF5_KNOTIFICATIONS_SOURCE = knotifications-$(KF5_KNOTIFICATIONS_VERSION).tar.xz +KF5_KNOTIFICATIONS_LICENSE = BSD-3-Clause +KF5_KNOTIFICATIONS_LICENSE_FILES = COPYING-CMAKE-SCRIPTS + +KF5_KNOTIFICATIONS_DEPENDENCIES = host-pkgconf kf5-phonon +KF5_KNOTIFICATIONS_INSTALL_STAGING = YES +KF5_KNOTIFICATIONS_SUPPORTS_IN_SOURCE_BUILD = NO + +KF5_KNOTIFICATIONS_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +KF5_KNOTIFICATIONS_CXXFLAGS += -latomic +endif + +KF5_KNOTIFICATIONS_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KNOTIFICATIONS_CXXFLAGS)" + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/kf5-kpackage/kf5-kpackage.hash b/buildroot-external/package/kf5-kpackage/kf5-kpackage.hash index 7c2b0a01..6944fa83 100644 --- a/buildroot-external/package/kf5-kpackage/kf5-kpackage.hash +++ b/buildroot-external/package/kf5-kpackage/kf5-kpackage.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 284971ce1728ad7d3a6b069abe15b7529884bf418b33161c7e32b3642bdb94df kpackage-5.47.0.tar.xz +sha256 d740c4e159617dcf969584b94bc3e6f2c1da45c3a5d366f2be18decda0466e1b kpackage-5.69.0.tar.xz diff --git a/buildroot-external/package/kf5-kpackage/kf5-kpackage.mk b/buildroot-external/package/kf5-kpackage/kf5-kpackage.mk index b18c4050..7ce6a02d 100644 --- a/buildroot-external/package/kf5-kpackage/kf5-kpackage.mk +++ b/buildroot-external/package/kf5-kpackage/kf5-kpackage.mk @@ -15,3 +15,11 @@ KF5_KPACKAGE_INSTALL_STAGING = YES KF5_KPACKAGE_SUPPORTS_IN_SOURCE_BUILD = NO $(eval $(cmake-package)) + +HOST_KF5_KPACKAGE_DEPENDENCIES = host-kf5-extra-cmake-modules host-kf5-karchive \ + host-kf5-ki18n + +HOST_KF5_KPACKAGE_CXXFLAGS = $(HOST_CXXFLAGS) +HOST_KF5_KPACKAGE_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(HOST_KF5_KPACKAGE_CXXFLAGS)" + +$(eval $(host-cmake-package)) diff --git a/buildroot-external/package/kf5-kwayland/Config.in b/buildroot-external/package/kf5-kwayland/Config.in new file mode 100644 index 00000000..54bc3dcf --- /dev/null +++ b/buildroot-external/package/kf5-kwayland/Config.in @@ -0,0 +1,2 @@ +config BR2_PACKAGE_KF5_KWAYLAND + bool "kf5-kwayland" diff --git a/buildroot-external/package/kf5-kwayland/kf5-kwayland.hash b/buildroot-external/package/kf5-kwayland/kf5-kwayland.hash new file mode 100644 index 00000000..36485301 --- /dev/null +++ b/buildroot-external/package/kf5-kwayland/kf5-kwayland.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 977d599f8f83ee5f6d6789bcddc21648238fb429e8b25cbebee79562ff084c85 kwayland-5.69.0.tar.xz diff --git a/buildroot-external/package/kf5-kwayland/kf5-kwayland.mk b/buildroot-external/package/kf5-kwayland/kf5-kwayland.mk new file mode 100644 index 00000000..74b86c09 --- /dev/null +++ b/buildroot-external/package/kf5-kwayland/kf5-kwayland.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# kf5-kwayland +# +################################################################################ + +KF5_KWAYLAND_VERSION = $(KF5_VERSION) +KF5_KWAYLAND_SITE = $(KF5_SITE) +KF5_KWAYLAND_SOURCE = kwayland-$(KF5_KWAYLAND_VERSION).tar.xz +KF5_KKWAYLAND_LICENSE = BSD-3-Clause +KF5_KKWAYLAND_LICENSE_FILES = COPYING-CMAKE-SCRIPTS + +KF5_KWAYLAND_DEPENDENCIES = host-pkgconf qt5wayland wayland-protocols +KF5_KWAYLAND_INSTALL_STAGING = YES +KF5_KWAYLAND_SUPPORTS_IN_SOURCE_BUILD = NO + +KF5_KWAYLAND_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +KF5_KWAYLAND_CXXFLAGS += -latomic +endif + +KF5_KWAYLAND_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KWAYLAND_CXXFLAGS)" + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/kf5-kxmlgui/kf5-kxmlgui.mk b/buildroot-external/package/kf5-kxmlgui/kf5-kxmlgui.mk index dc010ccc..95e777ff 100644 --- a/buildroot-external/package/kf5-kxmlgui/kf5-kxmlgui.mk +++ b/buildroot-external/package/kf5-kxmlgui/kf5-kxmlgui.mk @@ -10,7 +10,7 @@ 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-kitemviews kf5-kglobalaccel +KF5_KXMLGUI_DEPENDENCIES = host-pkgconf kf5-kitemviews kf5-kiconthemes kf5-kglobalaccel KF5_KXMLGUI_INSTALL_STAGING = YES KF5_KXMLGUI_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/buildroot-external/package/kf5-phonon/Config.in b/buildroot-external/package/kf5-phonon/Config.in new file mode 100644 index 00000000..f2e4d5cb --- /dev/null +++ b/buildroot-external/package/kf5-phonon/Config.in @@ -0,0 +1,2 @@ +config BR2_PACKAGE_KF5_PHONON + bool "kf5-phonon" diff --git a/buildroot-external/package/kf5-phonon/kf5-phonon.hash b/buildroot-external/package/kf5-phonon/kf5-phonon.hash new file mode 100644 index 00000000..cd612e17 --- /dev/null +++ b/buildroot-external/package/kf5-phonon/kf5-phonon.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d phonon-4.11.1.tar.xz diff --git a/buildroot-external/package/kf5-phonon/kf5-phonon.mk b/buildroot-external/package/kf5-phonon/kf5-phonon.mk new file mode 100644 index 00000000..864711d1 --- /dev/null +++ b/buildroot-external/package/kf5-phonon/kf5-phonon.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# kf5-phonon +# +################################################################################ + +KF5_PHONON_VERSION = 4.11.1 +KF5_PHONON_SITE = https://download.kde.org/stable/phonon/$(KF5_PHONON_VERSION) +KF5_PHONON_SOURCE = phonon-$(KF5_PHONON_VERSION).tar.xz +KF5_PHONON_LICENSE = BSD-3-Clause +KF5_PHONON_LICENSE_FILES = COPYING-CMAKE-SCRIPTS + +KF5_PHONON_DEPENDENCIES = host-pkgconf +KF5_PHONON_SOLID_INSTALL_STAGING = YES +KF5_PHONON_SOLID_SUPPORTS_IN_SOURCE_BUILD = NO + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.hash b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.hash index d95d35cb..8b113fd6 100644 --- a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.hash +++ b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 4a43bb699e2d6e004b0d218c98079eea329d3a2d3de82b33b7d298e4cb146eb4 plasma-framework-5.47.0.tar.xz +sha256 16a70a068116ccbad4ee48160c8d5585e4aa755b72399afafacbc5fe80fab8d0 plasma-framework-5.69.0.tar.xz diff --git a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk index 7499c907..741c4b03 100644 --- a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk +++ b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk @@ -12,6 +12,7 @@ KF5_PLASMA_FRAMEWORK_LICENSE_FILES = COPYING-CMAKE-SCRIPTS KF5_PLASMA_FRAMEWORK_DEPENDENCIES = host-pkgconf KF5_PLASMA_FRAMEWORK_INSTALL_STAGING = YES -KF5_PLASMA_FRAMEWORK_INSTALL_TARGET = NO + +KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake" $(eval $(cmake-package)) diff --git a/buildroot-external/package/kf5-plasma-nano/Config.in b/buildroot-external/package/kf5-plasma-nano/Config.in new file mode 100644 index 00000000..92a56e54 --- /dev/null +++ b/buildroot-external/package/kf5-plasma-nano/Config.in @@ -0,0 +1,2 @@ +config BR2_PACKAGE_KF5_PLASMA_NANO + bool "kf5-plasma-nano" diff --git a/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.hash b/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.hash new file mode 100644 index 00000000..4e35dd8a --- /dev/null +++ b/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 d2f29b05894573517cb3336088e102d3604b1c2735e9bbe605119f559f0c6341 plasma-nano-5.18.5.tar.xz diff --git a/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.mk b/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.mk new file mode 100644 index 00000000..75027f64 --- /dev/null +++ b/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# kf5-plasma-nano +# +################################################################################ + +KF5_PLASMA_NANO_VERSION = 5.18.5 +KF5_PLASMA_NANO_SITE = https://download.kde.org/stable/plasma/$(KF5_PLASMA_NANO_VERSION) +KF5_PLASMA_NANO_SOURCE = plasma-nano-$(KF5_PLASMA_NANO_VERSION).tar.xz +KF5_PLASMA_NANO_LICENSE = BSD-3-Clause +KF5_PLASMA_NANO_LICENSE_FILES = COPYING-CMAKE-SCRIPTS + +KF5_PLASMA_NANO_DEPENDENCIES = host-pkgconf kf5-plasma-framework kf5-kwayland +KF5_PLASMA_NANO_SOLID_INSTALL_STAGING = YES +KF5_PLASMA_NANO_SOLID_SUPPORTS_IN_SOURCE_BUILD = NO + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/respeaker/Config.in b/buildroot-external/package/respeaker/Config.in index 8a01b876..d92d397b 100644 --- a/buildroot-external/package/respeaker/Config.in +++ b/buildroot-external/package/respeaker/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_RESPEAKER bool "respeaker" - select BR2_PACKAGE_RPI_USERLAND select BR2_PACKAGE_DTC select BR2_PACKAGE_DTC_PROGRAMS help diff --git a/buildroot-patches/0110-Bump-and-patch-KF5.patch b/buildroot-patches/0110-Bump-and-patch-KF5.patch new file mode 100644 index 00000000..94b6878e --- /dev/null +++ b/buildroot-patches/0110-Bump-and-patch-KF5.patch @@ -0,0 +1,69 @@ +From 2ecffef841e3fe7ee6745f48cceeeaee8497de01 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Tue, 12 May 2020 10:38:34 +0200 +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 +++++ + package/kf5/kf5.mk | 2 +- + 5 files changed, 9 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..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)) +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) + +-- +2.26.2 + diff --git a/buildroot-patches/0110-Upgrade-KF5-to-version-5.69.patch b/buildroot-patches/0110-Upgrade-KF5-to-version-5.69.patch deleted file mode 100644 index 62e83f60..00000000 --- a/buildroot-patches/0110-Upgrade-KF5-to-version-5.69.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 198ab7d0e7cd1862d84b2cae029a4b2c6471d945 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Sat, 25 Apr 2020 21:11:34 +0200 -Subject: [PATCH 1/1] Upgrade KF5 to version 5.69 - ---- - package/kf5/kf5.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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) - --- -2.26.1 - diff --git a/buildroot-patches/0200-Allow-for-KF5-framework-to-be-installed.patch b/buildroot-patches/0200-Allow-for-KF5-framework-to-be-installed.patch deleted file mode 100644 index b17ad322..00000000 --- a/buildroot-patches/0200-Allow-for-KF5-framework-to-be-installed.patch +++ /dev/null @@ -1,220 +0,0 @@ -From eec61f4acf2b47fbc6536478f98c2568cda092e6 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -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 -