package/{gnuradio|opencv3|python-matplotlib|qt5|qwt|wireshark}: drop redundant BR2_PACKAGE_QT5BASE select
PATCH v2 1/2 package/{gnuradio|opencv3|python-matplotlib|qt5|qwt|wireshark}: drop redundant BR2_PACKAGE_QT5BASE select
Drop redundant BR2_PACKAGE_QT5BASE select as BR2_PACKAGE_QT5 already implies select BR2_PACKAGE_QT5BASE (see package/qt5/Config.in).
---
Changes v1 -> v2:
- new patch to fix recursive dependency warning
--- package/gnuradio/Config.in | 1 - package/opencv3/Config.in | 1 - package/python-matplotlib/Config.in | 1 - package/qt5/qt53d/Config.in | 1 - package/qt5/qt5charts/Config.in | 1 - package/qt5/qt5connectivity/Config.in | 1 - package/qt5/qt5declarative/Config.in | 1 - package/qt5/qt5imageformats/Config.in | 1 - package/qt5/qt5location/Config.in | 1 - package/qt5/qt5multimedia/Config.in | 1 - package/qt5/qt5script/Config.in | 1 - package/qt5/qt5scxml/Config.in | 1 - package/qt5/qt5sensors/Config.in | 1 - package/qt5/qt5serialbus/Config.in | 1 - package/qt5/qt5serialport/Config.in | 1 - package/qt5/qt5svg/Config.in | 1 - package/qt5/qt5webchannel/Config.in | 1 - package/qt5/qt5webkit/Config.in | 1 - package/qt5/qt5websockets/Config.in | 1 - package/qt5/qt5xmlpatterns/Config.in | 1 - package/qwt/Config.in | 1 - package/wireshark/Config.in | 1 - 22 files changed, 22 deletions(-)
package/gnuradio/Config.in +0 -1
@@ -141,7 +141,6 @@ config BR2_PACKAGE_GNURADIO_QTGUI select BR2_PACKAGE_GNURADIO_FFT select BR2_PACKAGE_GNURADIO_FILTER select BR2_PACKAGE_PYTHON_PYQT5 - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_FONTCONFIG # runtime select BR2_PACKAGE_QT5BASE_GUI # runtime select BR2_PACKAGE_QT5BASE_WIDGETS # runtime
package/opencv3/Config.in +0 -1
@@ -85,7 +85,6 @@ comment "gtk3 support needs libgtk3" config BR2_PACKAGE_OPENCV3_WITH_QT5 bool "qt5" depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS
package/python-matplotlib/Config.in +0 -1
@@ -29,7 +29,6 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB_QT bool "qt display" depends on BR2_PACKAGE_QT5 # python-pyqt5 select BR2_PACKAGE_PYTHON_PYQT5 - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_FONTCONFIG select BR2_PACKAGE_QT5BASE_WIDGETS
package/qt5/qt53d/Config.in +0 -1
@@ -2,7 +2,6 @@ config BR2_PACKAGE_QT53D bool "qt53d" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK
package/qt5/qt5charts/Config.in +0 -1
@@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5CHARTS bool "qt5charts" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS help
package/qt5/qt5connectivity/Config.in +0 -1
@@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5CONNECTIVITY bool "qt5connectivity" depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ5_UTILS - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_DBUS help
package/qt5/qt5declarative/Config.in +0 -1
@@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5DECLARATIVE bool "qt5declarative" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for
package/qt5/qt5imageformats/Config.in +0 -1
@@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5IMAGEFORMATS bool "qt5imageformats" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for
package/qt5/qt5location/Config.in +0 -1
@@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for
package/qt5/qt5multimedia/Config.in +0 -1
@@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5MULTIMEDIA bool "qt5multimedia" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE_OPENGL
package/qt5/qt5script/Config.in +0 -1
@@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5SCRIPT bool "qt5script" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++.
package/qt5/qt5scxml/Config.in +0 -1
@@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5SCXML bool "qt5scxml" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5DECLARATIVE help Qt is a cross-platform application and UI framework for
package/qt5/qt5sensors/Config.in +0 -1
@@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5SENSORS bool "qt5sensors" - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++.
package/qt5/qt5serialbus/Config.in +0 -1
@@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5SERIALBUS bool "qt5serialbus" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5SERIALPORT help Qt is a cross-platform application and UI framework for
package/qt5/qt5serialport/Config.in +0 -1
@@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5SERIALPORT bool "qt5serialport" - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++.
package/qt5/qt5svg/Config.in +0 -1
@@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5SVG bool "qt5svg" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for
package/qt5/qt5webchannel/Config.in +0 -1
@@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5WEBCHANNEL bool "qt5webchannel" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5WEBSOCKETS help Qt is a cross-platform application and UI framework for
package/qt5/qt5webkit/Config.in +0 -1
@@ -10,7 +10,6 @@ config BR2_PACKAGE_QT5WEBKIT # assumes a FPU is available on MIPS depends on !BR2_MIPS_SOFT_FLOAT select BR2_PACKAGE_LEVELDB - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_SQLITE
package/qt5/qt5websockets/Config.in +0 -1
@@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5WEBSOCKETS bool "qt5websockets" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_NETWORK help Qt is a cross-platform application and UI framework for
package/qt5/qt5xmlpatterns/Config.in +0 -1
@@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5XMLPATTERNS bool "qt5xmlpatterns" - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++.
package/qwt/Config.in +0 -1
@@ -1,7 +1,6 @@ config BR2_PACKAGE_QWT bool "qwt" depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS # printsupport select BR2_PACKAGE_QT5BASE_CONCURRENT
package/wireshark/Config.in +0 -1
@@ -25,7 +25,6 @@ config BR2_PACKAGE_WIRESHARK_GUI depends on !BR2_arc # qt5 depends on BR2_PACKAGE_HAS_UDEV # qt5 input select BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_FONTCONFIG # runtime select BR2_PACKAGE_QT5BASE_PNG # runtime select BR2_PACKAGE_QT5BASE_WIDGETS
Signature · 1 line
2.28.0
PATCH v2 2/2 package/qt5webengine: examples need qt5svg
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/674934350
make[3]: Entering directory '.../build/qt5webengine-5.15.0/examples/webenginewidgets' Project ERROR: Unknown module(s) in QT: svg
Makefile:47: recipe for target 'sub-pdfviewer-make_first' failed
---
Changes v1 -> v2:
- no changes
--- package/qt5/qt5webengine/Config.in | 1 + package/qt5/qt5webengine/qt5webengine.mk | 4 ++++ 2 files changed, 5 insertions(+)
package/qt5/qt5webengine/Config.in +1 -0
@@ -54,6 +54,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_QT5DECLARATIVE_QUICK select BR2_PACKAGE_QT5QUICKCONTROLS select BR2_PACKAGE_QT5QUICKCONTROLS2 + select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5BASE_EXAMPLES select BR2_PACKAGE_QT5WEBCHANNEL select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB
package/qt5/qt5webengine/qt5webengine.mk +4 -0
@@ -18,6 +18,10 @@ QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +QT5WEBENGINE_DEPENDENCIES += qt5svg +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst
Signature · 1 line
2.28.0
PATCH v2 1/2 package/{gnuradio|opencv3|python-matplotlib|qt5|qwt|wireshark}: drop redundant BR2_PACKAGE_QT5BASE select
In reply to Peter SeidererQuoted 23 lines · On Tue, 11 Aug 2020 23:23:02 +0200 Peter Seiderer via buildroot…
Drop redundant
BR2_PACKAGE_QT5BASEselect asBR2_PACKAGE_QT5already implies selectBR2_PACKAGE_QT5BASE(see package/qt5/Config.in).Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- new patch to fix recursive dependency warning--- package/gnuradio/Config.in | 1 - package/opencv3/Config.in | 1 - package/python-matplotlib/Config.in | 1 - package/qt5/qt53d/Config.in | 1 - package/qt5/qt5charts/Config.in | 1 - package/qt5/qt5connectivity/Config.in | 1 - package/qt5/qt5declarative/Config.in | 1 - package/qt5/qt5imageformats/Config.in | 1 - package/qt5/qt5location/Config.in | 1 - package/qt5/qt5multimedia/Config.in | 1 - package/qt5/qt5script/Config.in | 1 - package/qt5/qt5scxml/Config.in | 1 - package/qt5/qt5sensors/Config.in | 1 - package/qt5/qt5serialbus/Config.in | 1 - package/qt5/qt5serialport/Config.in | 1 -
Quoted 8 lines
package/qt5/qt5svg/Config.in | 1 - package/qt5/qt5webchannel/Config.in | 1 - package/qt5/qt5webkit/Config.in | 1 - package/qt5/qt5websockets/Config.in | 1 - package/qt5/qt5xmlpatterns/Config.in | 1 - package/qwt/Config.in | 1 - package/wireshark/Config.in | 1 - 22 files changed, 22 deletions(-)
Thanks, both patches applied to master. I've added the Acked-by from Yann, which he gave on IRC.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com