mirror of
https://github.com/OpenVoiceOS/OpenVoiceOS
synced 2025-03-23 06:50:08 +01:00
[WIP] More fixes and additions for kwin
This commit is contained in:
j1nx
parent
eacf33b658
commit
78ce792574
@ -64,6 +64,7 @@ menu "KF5"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-ktextwidgets/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kunitconversion/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kwayland/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kwayland-server/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kwallet/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kwidgetsaddons/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kwin/Config.in"
|
||||
@ -77,6 +78,7 @@ menu "KF5"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-plasma-pa/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-plasma-wayland-protocols/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-plasma-workspace/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-prison/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-solid/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-sonnet/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-threadweaver/Config.in"
|
||||
|
||||
@ -220,7 +220,6 @@ BR2_PACKAGE_QT5TOOLS_PIXELTOOL=y
|
||||
BR2_PACKAGE_QT5TOOLS_QTDIAG=y
|
||||
BR2_PACKAGE_QT5TOOLS_QTPATHS=y
|
||||
BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y
|
||||
BR2_PACKAGE_QT5TOOLS_DESIGNER=y
|
||||
BR2_PACKAGE_QT5VIRTUALKEYBOARD=y
|
||||
BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS="en_US"
|
||||
BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION=y
|
||||
@ -397,6 +396,7 @@ BR2_PACKAGE_LIBNFS=y
|
||||
BR2_PACKAGE_GDK_PIXBUF=y
|
||||
BR2_PACKAGE_GIFLIB=y
|
||||
BR2_PACKAGE_LIBEPOXY=y
|
||||
BR2_PACKAGE_LIBQRENCODE=y
|
||||
BR2_PACKAGE_LIBSVG_CAIRO=y
|
||||
BR2_PACKAGE_OPENJPEG=y
|
||||
BR2_PACKAGE_TIFF=y
|
||||
@ -556,6 +556,7 @@ BR2_PACKAGE_KF5_KSCREENLOCKER=y
|
||||
BR2_PACKAGE_KF5_KSYSGUARD=y
|
||||
BR2_PACKAGE_KF5_KUNITCONVERSION=y
|
||||
BR2_PACKAGE_KF5_KWAYLAND=y
|
||||
BR2_PACKAGE_KF5_KWAYLAND_SERVER=y
|
||||
BR2_PACKAGE_KF5_KWALLET=y
|
||||
BR2_PACKAGE_KF5_KWIN=y
|
||||
BR2_PACKAGE_KF5_LIBKSCREEN=y
|
||||
@ -566,6 +567,7 @@ BR2_PACKAGE_KF5_PLASMA_NANO=y
|
||||
BR2_PACKAGE_KF5_PLASMA_PA=y
|
||||
BR2_PACKAGE_KF5_PLASMA_WAYLAND_PROTOCOLS=y
|
||||
BR2_PACKAGE_KF5_PLASMA_WORKSPACE=y
|
||||
BR2_PACKAGE_KF5_PRISON=y
|
||||
BR2_PACKAGE_KF5_THREADWEAVER=y
|
||||
BR2_PACKAGE_LIBCANBERRA=y
|
||||
BR2_PACKAGE_LIBRE=y
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kdecoration-5.20.2.tar.xz
|
||||
sha256 7b49c0a3a0a7be93127b4b7a7273575a037af5447adf55154cabb2c6f87637f6 kdecoration-5.20.2.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kded-5.75.0.tar.xz
|
||||
sha256 dd811f4e8058348f772133d910aa8623fde4208c50c7d7a834605cf04f8f097d kded-5.75.0.tar.xz
|
||||
|
||||
@ -0,0 +1,58 @@
|
||||
From 070948999d5fb4cc583cc0e796108d55f112b317 Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Wed, 11 Nov 2020 10:21:51 +0100
|
||||
Subject: [PATCH 1/1] No designer plugin
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
src/CMakeLists.txt | 21 ---------------------
|
||||
2 files changed, 1 insertion(+), 22 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5c19ab59..9f72b46b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,7 +20,7 @@ include(GenerateExportHeader)
|
||||
include(CMakeFindFrameworks)
|
||||
|
||||
set(REQUIRED_QT_VERSION 5.12.0)
|
||||
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
|
||||
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport)
|
||||
|
||||
find_package(KF5Completion ${KF5_DEP_VERSION} REQUIRED)
|
||||
find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index b249bd53..04ea9f5f 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -371,27 +371,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES
|
||||
)
|
||||
|
||||
|
||||
-########## Designer plugin
|
||||
-
|
||||
-kf5designerplugin_add_plugin(kf5deprecatedwidgets
|
||||
- kdedeprecated.widgets
|
||||
- kdedeprecated.qrc
|
||||
- classpreviews.cpp
|
||||
-)
|
||||
-
|
||||
-target_link_libraries(kf5deprecatedwidgets KF5::KDELibs4Support
|
||||
- Qt5::Widgets
|
||||
- Qt5::Designer
|
||||
- KF5::ConfigCore
|
||||
- KF5::Completion
|
||||
- KF5::WidgetsAddons
|
||||
- KF5::Auth
|
||||
- )
|
||||
-
|
||||
-install(TARGETS kf5deprecatedwidgets DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer)
|
||||
-
|
||||
-##########
|
||||
-
|
||||
add_subdirectory(pics)
|
||||
|
||||
install(TARGETS KF5KDELibs4Support
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kdelibs4support-5.75.0.tar.xz
|
||||
sha256 54466e73d05dfbb6ffd65b2018d689b8c807e0569e59da29a70daf2ac195461d kdelibs4support-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kdesignerplugin-5.75.0.tar.xz
|
||||
sha256 fd8812b4fb6922091b53da72eb74104f9438be3063e65ffe23d6948a292f18e9 kdesignerplugin-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kdesu-5.75.0.tar.xz
|
||||
sha256 c9ac069e7958f95f69891b78bd752310688624dc02f6e1595d4c41645f0a2bd9 kdesu-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kemoticons-5.75.0.tar.xz
|
||||
sha256 4ac70cee9d7fafe6ef9668d37a146489b341804e0bf0dba6a7cce2d6ecaa78c1 kemoticons-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kidletime-5.75.0.tar.xz
|
||||
sha256 da1a980bec52f00baa20bb1f886fc32392587ffd467404888d3a1cb5897bd200 kidletime-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kinit-5.75.0.tar.xz
|
||||
sha256 f4f6f0caf7bfe7a321b0e822735ac5377e2b46600249ae77010a1252a5b87647 kinit-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kitemmodels-5.75.0.tar.xz
|
||||
sha256 fb3f4caa2e55ffb5e21ea8f65bcb6ea9b074c54f9dbbce458ba7320d6c50fdb6 kitemmodels-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x knewstuff-5.75.0.tar.xz
|
||||
sha256 1a1f8771ac879e7f08ce688c63a9b0f8bb60d8d3460acf739752c5e05d26c980 knewstuff-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x knotifyconfig-5.75.0.tar.xz
|
||||
sha256 b98f5ff6f92e147d36e1204261895ee1557af847ede00333b0cb946dcd00a94b knotifyconfig-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kparts-5.75.0.tar.xz
|
||||
sha256 ea745811e4b14a9c62fae161eb6bf97306d28a082e25430dac183d0772ba7fee kparts-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kpeople-5.75.0.tar.xz
|
||||
sha256 8b8a8fa8829db7b36c0bf0eeb3bc9ba4733d7ce8b9db6bd3b2721a3f39d40367 kpeople-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kpty-5.75.0.tar.xz
|
||||
sha256 ef5484c65fae63acf744787293e74008601063a5eb74f3183449e85895e27c67 kpty-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x krunner-5.75.0.tar.xz
|
||||
sha256 50383177abd782ad852985162a00d86e94d1abf8775ceb75825a7015fff21c66 krunner-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kscreen-5.20.2.tar.xz
|
||||
sha256 42d55e891516192773ba1dd405c80c76fef86b7e4e5a6bbea3b9dcf38c713f28 kscreen-5.20.2.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kscreenlocker-5.20.2.tar.xz
|
||||
sha256 2499d88be243d64a854860c2aaa9c03f05f2078419aaf55d7eab65a885c24175 kscreenlocker-5.20.2.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x ksysguard-5.20.2.tar.xz
|
||||
sha256 1fc3529453c38151bebd582da9256907d213b309d7e1f6870b0aac0626208cf7 ksysguard-5.20.2.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kunitconversion-5.75.0.tar.xz
|
||||
sha256 bb0587276d081163cb86328370c77d9ebc109fc3b633f46af299656de900a36a kunitconversion-5.75.0.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kwallet-5.75.0.tar.xz
|
||||
sha256 87b28d5b0c93f6085d6ccabc78b3e21590889767432ef22316f3e87322df1363 kwallet-5.75.0.tar.xz
|
||||
|
||||
2
buildroot-external/package/kf5-kwayland-server/Config.in
Normal file
2
buildroot-external/package/kf5-kwayland-server/Config.in
Normal file
@ -0,0 +1,2 @@
|
||||
config BR2_PACKAGE_KF5_KWAYLAND_SERVER
|
||||
bool "kf5-kwayland-server"
|
||||
@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kwayland-server-5.20.2.tar.xz
|
||||
@ -0,0 +1,17 @@
|
||||
################################################################################
|
||||
#
|
||||
# kf5-kwayland-server
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KF5_KWAYLAND_SERVER_VERSION = 5.20.2
|
||||
KF5_KWAYLAND_SERVER_SITE = https://download.kde.org/stable/plasma/$(KF5_KWAYLAND_SERVER_VERSION)
|
||||
KF5_KWAYLAND_SERVER_SOURCE = kwayland-server-$(KF5_KWAYLAND_SERVER_VERSION).tar.xz
|
||||
KF5_KWAYLAND_SERVER_LICENSE = BSD-3-Clause
|
||||
KF5_KWAYLAND_SERVER_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
|
||||
|
||||
KF5_KWAYLAND_SERVER_DEPENDENCIES = host-pkgconf kf5-kwayland
|
||||
KF5_KWAYLAND_SERVER_INSTALL_STAGING = YES
|
||||
KF5_KWAYLAND_SERVER_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
|
||||
$(eval $(cmake-package))
|
||||
37522
buildroot-external/package/kf5-kwin/0001-No-Doctools.patch
Normal file
37522
buildroot-external/package/kf5-kwin/0001-No-Doctools.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x kwin-5.20.2.tar.xz
|
||||
sha256 79557de888c8cd671ca592b5d105e236c959f877b7e9f836bcd69ddef193759c kwin-5.20.2.tar.xz
|
||||
|
||||
@ -11,11 +11,9 @@ KF5_KWIN_LICENSE = BSD-3-Clause
|
||||
KF5_KWIN_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
|
||||
|
||||
KF5_KWIN_DEPENDENCIES = host-pkgconf qt5sensors kf5-plasma-framework kf5-kwayland \
|
||||
kf5-kidletime kf5-kinit kf5-kcmutils kf5-knewstuff \
|
||||
kf5-attica kf5-kdecoration kf5-kscreenlocker
|
||||
kf5-kwayland-server kf5-kidletime kf5-kinit kf5-kcmutils \
|
||||
kf5-knewstuff kf5-attica kf5-kdecoration kf5-kscreenlocker
|
||||
KF5_KWIN_INSTALL_STAGING = YES
|
||||
KF5_KWIN_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
|
||||
KF5_KWIN_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake"
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x libkscreen-5.20.2.tar.xz
|
||||
sha256 2ee2c77556ac30ec49be5bc7db552332f6b1084f6d7737b711d3c9c01b523c5d libkscreen-5.20.2.tar.xz
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
From ad500d845a25506ba666a78ed0bc955b4c150b56 Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Wed, 11 Nov 2020 11:06:21 +0100
|
||||
Subject: [PATCH 1/1] No designer plugin
|
||||
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 338adfc..b6fe915 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -88,8 +88,8 @@ set(HAVE_X11 ${X11_FOUND})
|
||||
set(HAVE_XRES ${X11_XRes_FOUND})
|
||||
configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguard.h )
|
||||
|
||||
-option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
|
||||
-add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
|
||||
+#option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
|
||||
+#add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
|
||||
|
||||
|
||||
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x libksysguard-5.20.2.tar.xz
|
||||
sha256 9f57a3719d665df6d6b3c494a62bb7d60c79b06f30c0e9c75eb03568d2046d71 libksysguard-5.20.2.tar.xz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KF5_LIBKSYSGUARD_VERSION = 5.18.5
|
||||
KF5_LIBKSYSGUARD_VERSION = 5.20.2
|
||||
KF5_LIBKSYSGUARD_SITE = https://download.kde.org/stable/plasma/$(KF5_LIBKSYSGUARD_VERSION)
|
||||
KF5_LIBKSYSGUARD_SOURCE = libksysguard-$(KF5_LIBKSYSGUARD_VERSION).tar.xz
|
||||
KF5_LIBKSYSGUARD_LICENSE = BSD-3-Clause
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x plasma-nano-5.20.2.tar.xz
|
||||
sha256 f4c86648daf14c6d0089d974a12cec5cb0c456b94a3c08c404aff46a8e03481e plasma-nano-5.20.2.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x plasma-pa-5.20.2.tar.xz
|
||||
sha256 2011169926b9119c4574979d6fa350f16a9587ebca64a09603e9d93ccea103ec plasma-pa-5.20.2.tar.xz
|
||||
|
||||
@ -14,6 +14,4 @@ KF5_PLASMA_PA_DEPENDENCIES = host-pkgconf libcanberra kf5-plasma-framework kf5-k
|
||||
KF5_PLASMA_PA_INSTALL_STAGING = YES
|
||||
KF5_PLASMA_PA_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
|
||||
KF5_PLASMA_PA_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake"
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x plasma-workspace-5.20.2.tar.xz
|
||||
sha256 2bd71e6054577f881b0fcab7af5c7e1d39db1ef03470fb6e662713559da9e5f4 plasma-workspace-5.20.2.tar.xz
|
||||
|
||||
@ -13,7 +13,9 @@ KF5_PLASMA_WORKSPACE_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
|
||||
KF5_PLASMA_WORKSPACE_DEPENDENCIES = host-pkgconf libcanberra kf5-plasma-framework kf5-kwayland \
|
||||
kf5-kdelibs4support kf5-krunner kf5-knotifyconfig \
|
||||
kf5-kdesu kf5-kwallet kf5-kitemmodels kf5-kpeople \
|
||||
kf5-kactivities-stats kf5-ksysguard kf5-kscreen
|
||||
kf5-kactivities-stats kf5-ksysguard kf5-kscreen \
|
||||
kf5-prison
|
||||
|
||||
KF5_PLASMA_WORKSPACE_INSTALL_STAGING = YES
|
||||
KF5_PLASMA_WORKSPACE_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
|
||||
|
||||
2
buildroot-external/package/kf5-prison/Config.in
Normal file
2
buildroot-external/package/kf5-prison/Config.in
Normal file
@ -0,0 +1,2 @@
|
||||
config BR2_PACKAGE_KF5_PRISON
|
||||
bool "kf5-prison"
|
||||
2
buildroot-external/package/kf5-prison/kf5-prison.hash
Normal file
2
buildroot-external/package/kf5-prison/kf5-prison.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 7e1ee466b0eed9b861f9b746dc5579f1e82d5e165696116c5c657dd35038ade0 prison-5.75.0.tar.xz
|
||||
17
buildroot-external/package/kf5-prison/kf5-prison.mk
Normal file
17
buildroot-external/package/kf5-prison/kf5-prison.mk
Normal file
@ -0,0 +1,17 @@
|
||||
################################################################################
|
||||
#
|
||||
# kf5-prison
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KF5_PRISON_VERSION = $(KF5_VERSION)
|
||||
KF5_PRISON_SITE = $(KF5_SITE)
|
||||
KF5_PRISON_SOURCE = prison-$(KF5_PRISON_VERSION).tar.xz
|
||||
KF5_PRISON_LICENSE = BSD-3-Clause
|
||||
KF5_PRISON_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
|
||||
|
||||
KF5_PRISON_DEPENDENCIES = host-pkgconf libqrencode
|
||||
KF5_PRISON_INSTALL_STAGING = YES
|
||||
KF5_PRISON_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
|
||||
$(eval $(cmake-package))
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 x threadweaver-5.75.0.tar.xz
|
||||
sha256 d082f863fb119e2b98c9e01877b2730eedc0b54392449e3cc9bd54d7803d16ff threadweaver-5.75.0.tar.xz
|
||||
|
||||
@ -1,102 +0,0 @@
|
||||
From 633e0713a0248f1e01e8b539105607e949c3ea64 Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Thu, 29 Oct 2020 21:30:49 +0100
|
||||
Subject: [PATCH 1/1] Add and build the qtdesigner tools
|
||||
|
||||
---
|
||||
.../qt5tools/0002-Build-designer-tools.patch | 53 +++++++++++++++++++
|
||||
package/qt5/qt5tools/Config.in | 5 ++
|
||||
package/qt5/qt5tools/qt5tools.mk | 3 ++
|
||||
3 files changed, 61 insertions(+)
|
||||
create mode 100644 package/qt5/qt5tools/0002-Build-designer-tools.patch
|
||||
|
||||
diff --git a/package/qt5/qt5tools/0002-Build-designer-tools.patch b/package/qt5/qt5tools/0002-Build-designer-tools.patch
|
||||
new file mode 100644
|
||||
index 0000000000..2a8389e6a1
|
||||
--- /dev/null
|
||||
+++ b/package/qt5/qt5tools/0002-Build-designer-tools.patch
|
||||
@@ -0,0 +1,53 @@
|
||||
+From 8441d3adeb285862632e4d05c60af2dc17ab31f3 Mon Sep 17 00:00:00 2001
|
||||
+From: j1nx <p.steenbergen@j1nx.nl>
|
||||
+Date: Wed, 28 Oct 2020 10:00:30 +0100
|
||||
+Subject: [PATCH 1/1] Build designer tools
|
||||
+
|
||||
+---
|
||||
+ src/designer/src/src.pro | 30 +++++++++---------------------
|
||||
+ 1 file changed, 9 insertions(+), 21 deletions(-)
|
||||
+
|
||||
+diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
|
||||
+index 79e9e64e..8af9edf8 100644
|
||||
+--- a/src/designer/src/src.pro
|
||||
++++ b/src/designer/src/src.pro
|
||||
+@@ -2,27 +2,15 @@ TEMPLATE = subdirs
|
||||
+
|
||||
+ SUBDIRS = \
|
||||
+ uiplugin \
|
||||
+- uitools
|
||||
+-
|
||||
+-qtConfig(process) {
|
||||
+- SUBDIRS += \
|
||||
+- lib \
|
||||
+- components \
|
||||
+- designer
|
||||
+-
|
||||
+- lib.depends = uiplugin
|
||||
+- components.depends = lib
|
||||
+- designer.depends = components
|
||||
+- plugins.depends = lib
|
||||
++ uitools \
|
||||
++ lib \
|
||||
++ components \
|
||||
++ designer
|
||||
+
|
||||
+- contains(QT_CONFIG, shared): SUBDIRS += plugins
|
||||
+-}
|
||||
++contains(QT_CONFIG, shared): SUBDIRS += plugins
|
||||
+
|
||||
+ uitools.depends = uiplugin
|
||||
+-
|
||||
+-qtNomakeTools( \
|
||||
+- lib \
|
||||
+- components \
|
||||
+- designer \
|
||||
+- plugins \
|
||||
+-)
|
||||
++lib.depends = uiplugin
|
||||
++components.depends = lib
|
||||
++designer.depends = components
|
||||
++plugins.depends = lib
|
||||
+--
|
||||
+2.20.1
|
||||
+
|
||||
diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in
|
||||
index 60106c1ee3..b538c0f05c 100644
|
||||
--- a/package/qt5/qt5tools/Config.in
|
||||
+++ b/package/qt5/qt5tools/Config.in
|
||||
@@ -56,4 +56,9 @@ config BR2_PACKAGE_QT5TOOLS_QTPLUGININFO
|
||||
help
|
||||
Compile and install the qtplugininfo program.
|
||||
|
||||
+config BR2_PACKAGE_QT5TOOLS_DESIGNER
|
||||
+ bool "qtdesigner"
|
||||
+ help
|
||||
+ Compile and install the qtdesigner programs.
|
||||
+
|
||||
endif
|
||||
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
|
||||
index 0543afd8f7..68abe42cb5 100644
|
||||
--- a/package/qt5/qt5tools/qt5tools.mk
|
||||
+++ b/package/qt5/qt5tools/qt5tools.mk
|
||||
@@ -44,6 +44,9 @@ QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths
|
||||
QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
|
||||
QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
|
||||
|
||||
+QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_DESIGNER) += designer
|
||||
+QT5TOOLS_INSTALL_STAGING_DIR_$(BR2_PACKAGE_QT5TOOLS_DESIGNER) += designer
|
||||
+
|
||||
define QT5TOOLS_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) sub-src-qmake_all
|
||||
$(foreach p,$(QT5TOOLS_BUILD_DIRS_y), \
|
||||
--
|
||||
2.20.1
|
||||
|
||||
115
buildroot-patches/0114-Just-build-all-qttools.patch
Normal file
115
buildroot-patches/0114-Just-build-all-qttools.patch
Normal file
@ -0,0 +1,115 @@
|
||||
From 38eb7557c88fed444774792af1ab30249c862d97 Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Wed, 11 Nov 2020 14:41:06 +0100
|
||||
Subject: [PATCH 1/1] Just build all qttools
|
||||
|
||||
---
|
||||
...-designer-tool-fixes-configure-error.patch | 46 -------------------
|
||||
package/qt5/qt5tools/qt5tools.mk | 28 -----------
|
||||
2 files changed, 74 deletions(-)
|
||||
delete mode 100644 package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch
|
||||
|
||||
diff --git a/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch b/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch
|
||||
deleted file mode 100644
|
||||
index 20c5e2a470..0000000000
|
||||
--- a/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch
|
||||
+++ /dev/null
|
||||
@@ -1,46 +0,0 @@
|
||||
-From a70da8d731b969305096a0213b70659dc641591a Mon Sep 17 00:00:00 2001
|
||||
-From: Peter Seiderer <ps.report@gmx.net>
|
||||
-Date: Tue, 17 Dec 2019 11:01:59 +0100
|
||||
-Subject: [PATCH] Disable designer tool (fixes configure error).
|
||||
-
|
||||
-Fixes:
|
||||
-
|
||||
- .../build/qt5tools-5.14.0/src/designer/src/components/lib/lib.pro
|
||||
- Project ERROR: Multiple modules claim plugin type 'designer' (uitools, in addition to designer)
|
||||
-
|
||||
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
-[Rebased for Qt5.15.0]
|
||||
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
----
|
||||
- src/linguist/linguist/linguist.pro | 2 +-
|
||||
- src/src.pro | 3 ---
|
||||
- 2 files changed, 1 insertion(+), 4 deletions(-)
|
||||
-
|
||||
-diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
|
||||
-index d083896..7d74cfc 100644
|
||||
---- a/src/linguist/linguist/linguist.pro
|
||||
-+++ b/src/linguist/linguist/linguist.pro
|
||||
-@@ -1,4 +1,4 @@
|
||||
--QT += core-private gui-private widgets uitools-private printsupport
|
||||
-+QT += core-private gui-private widgets printsupport
|
||||
-
|
||||
- DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
|
||||
-
|
||||
-diff --git a/src/src.pro b/src/src.pro
|
||||
-index 5c256ea..6d079be 100644
|
||||
---- a/src/src.pro
|
||||
-+++ b/src/src.pro
|
||||
-@@ -7,10 +7,7 @@ qtHaveModule(widgets) {
|
||||
- QT_FOR_CONFIG += widgets
|
||||
- qtConfig(pushbutton):qtConfig(toolbutton) {
|
||||
- SUBDIRS = assistant \
|
||||
-- designer \
|
||||
- pixeltool
|
||||
--
|
||||
-- linguist.depends = designer
|
||||
- }
|
||||
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
|
||||
- }
|
||||
---
|
||||
-2.26.2
|
||||
-
|
||||
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
|
||||
index 0543afd8f7..1d07261474 100644
|
||||
--- a/package/qt5/qt5tools/qt5tools.mk
|
||||
+++ b/package/qt5/qt5tools/qt5tools.mk
|
||||
@@ -21,44 +21,16 @@ endif
|
||||
QT5TOOLS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
|
||||
QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
|
||||
|
||||
-QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \
|
||||
- linguist/lconvert linguist/lrelease linguist/lupdate
|
||||
-QT5TOOLS_INSTALL_STAGING_DIR_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \
|
||||
- linguist
|
||||
-
|
||||
ifeq ($(BR2_PACKAGE_QT5TOOLS_QDOC_TOOL),y)
|
||||
-QT5TOOLS_BUILD_DIRS_y += qdoc
|
||||
-QT5TOOLS_INSTALL_STAGING_DIR_y += qdoc
|
||||
QT5TOOLS_DEPENDENCIES += host-clang
|
||||
endif
|
||||
|
||||
-QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool
|
||||
QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool
|
||||
|
||||
-QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTDIAG) += qtdiag
|
||||
QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTDIAG) += qtdiag
|
||||
|
||||
-QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths
|
||||
QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths
|
||||
|
||||
-QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
|
||||
QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
|
||||
|
||||
-define QT5TOOLS_BUILD_CMDS
|
||||
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) sub-src-qmake_all
|
||||
- $(foreach p,$(QT5TOOLS_BUILD_DIRS_y), \
|
||||
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p)$(sep))
|
||||
-endef
|
||||
-
|
||||
-# use install target to copy cmake module files
|
||||
-define QT5TOOLS_INSTALL_STAGING_CMDS
|
||||
- $(foreach p,$(QT5TOOLS_INSTALL_STAGING_DIR_y), \
|
||||
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p) install$(sep))
|
||||
-endef
|
||||
-
|
||||
-define QT5TOOLS_INSTALL_TARGET_CMDS
|
||||
- $(foreach p,$(QT5TOOLS_INSTALL_TARGET_y), \
|
||||
- $(INSTALL) -D -m0755 $(@D)/bin/$(p) $(TARGET_DIR)/usr/bin/$(p)$(sep))
|
||||
-endef
|
||||
-
|
||||
$(eval $(qmake-package))
|
||||
--
|
||||
2.20.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user