From a252d6f4c7b9bc122d6461b3db3f703f5fe1aeea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Wed, 18 Sep 2013 10:23:32 +0300 Subject: [PATCH] qt5webkit: select libXrender if xcb is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit [Peter: also add libXext] Signed-off-by: Fatih Aşıcı Signed-off-by: Peter Korsgaard --- package/qt5/qt5webkit/Config.in | 2 ++ package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 48b512504f..9eb5ef8375 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB # This module does not support static linking depends on !BR2_PREFER_STATIC_LIB help diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index b51f5c5eed..c95f3b460c 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -21,6 +21,10 @@ QT5WEBKIT_LICENSE = Commercial license QT5WEBKIT_REDISTRIBUTE = NO endif +ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) +QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender +endif + define QT5WEBKIT_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef -- 2.30.2