mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -3,8 +3,8 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK
|
||||
depends on BR2_PACKAGE_QT5
|
||||
depends on !BR2_STATIC_LIBS # qt5webkit
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5webkit -> icu
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5webkit -> icu
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5webkit -> icu
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # qt5webkit -> icu
|
||||
depends on !BR2_BINFMT_FLAT # qt5webkit -> icu
|
||||
depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
@@ -15,6 +15,8 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK
|
||||
help
|
||||
Simple kiosk-mode browser powered by Qt5Webkit
|
||||
|
||||
https://github.com/sergey-dryabzhinsky/qt-webkit-kiosk
|
||||
|
||||
if BR2_PACKAGE_QT_WEBKIT_KIOSK
|
||||
|
||||
config BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS
|
||||
@@ -24,9 +26,9 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS
|
||||
|
||||
endif
|
||||
|
||||
comment "qt-webkit-kiosk needs a toolchain w/ dynamic library, gcc >= 4.8, host gcc >= 4.8"
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
|
||||
!BR2_HOST_GCC_AT_LEAST_4_8
|
||||
comment "qt-webkit-kiosk needs a toolchain w/ dynamic library, gcc >= 4.9, host gcc >= 4.9"
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
|
||||
!BR2_HOST_GCC_AT_LEAST_4_9
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
depends on !BR2_MIPS_SOFT_FLOAT
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 07fbc3f5053f55e4ef6566a15b42b74895314b48a0dfd46f0984f96f0fbb3e02 qt-webkit-kiosk-a7720e50f2bd70aad99e0b465f5c4a57aca48127.tar.gz
|
||||
sha256 07fbc3f5053f55e4ef6566a15b42b74895314b48a0dfd46f0984f96f0fbb3e02 qt-webkit-kiosk-a7720e50f2bd70aad99e0b465f5c4a57aca48127.tar.gz
|
||||
sha256 de59ec6c939f4c4def79c0a996b3bd5626895fcbd1ae108e7bddb1dac8218381 doc/lgpl.html
|
||||
|
||||
@@ -11,13 +11,7 @@ QT_WEBKIT_KIOSK_DEPENDENCIES = qt5webkit qt5multimedia
|
||||
QT_WEBKIT_KIOSK_LICENSE = LGPL-3.0
|
||||
QT_WEBKIT_KIOSK_LICENSE_FILES = doc/lgpl.html
|
||||
|
||||
define QT_WEBKIT_KIOSK_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr)
|
||||
endef
|
||||
|
||||
define QT_WEBKIT_KIOSK_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
QT_WEBKIT_KIOSK_CONF_OPTS = PREFIX=/usr
|
||||
|
||||
define QT_WEBKIT_KIOSK_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src -f Makefile.qt-webkit-kiosk \
|
||||
@@ -29,4 +23,4 @@ define QT_WEBKIT_KIOSK_INSTALL_TARGET_CMDS
|
||||
$(if $(BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS),install_sound)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(qmake-package))
|
||||
|
||||
Reference in New Issue
Block a user