qt4-tools-native: Build the tools as -embedded to avoid X11 deps

We only need command line utilities and can avoid requiring X11.

diff --git a/recipes/qt4/qt4-tools-native-4.7.0/fix.xlib-test.libs.patch b/recipes/qt4/qt4-tools-native-4.7.0/fix.xlib-test.libs.patch
deleted file mode 100644 (file)
index d761303..0000000
--- a/recipes/qt4/qt4-tools-native-4.7.0/fix.xlib-test.libs.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: qt-everywhere-opensource-src-4.7.0-beta1/config.tests/x11/xlib/xlib.pro
-===================================================================
---- qt-everywhere-opensource-src-4.7.0-beta1.orig/config.tests/x11/xlib/xlib.pro
-+++ qt-everywhere-opensource-src-4.7.0-beta1/config.tests/x11/xlib/xlib.pro    
-@@ -1,3 +1,4 @@
- CONFIG += x11
- CONFIG -= qt
- SOURCES = xlib.cpp
-+LIBS += -lXau -lXdmcp

diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
index b6e3107..6915ba8 100644 (file)
--- a/recipes/qt4/qt4-tools-native.inc
+++ b/recipes/qt4/qt4-tools-native.inc
@@ -1,11 +1,11 @@
 DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "zlib-native dbus-native libsm-native"
+DEPENDS = "zlib-native dbus-native"
 SECTION = "libs"
 HOMEPAGE = "http://www.trolltech.com"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 inherit native
 
@@ -26,6 +26,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
                 -no-nas-sound \
                 -no-nis \
                 -verbose -release -static \
+                -embedded \
                 -qt3support"
 
 # yank default -e, otherwise we get the following error:

diff --git a/recipes/qt4/qt4-tools-native_4.7.0.bb b/recipes/qt4/qt4-tools-native_4.7.0.bb
index b7fb8a6..35c8ced 100644 (file)
--- a/recipes/qt4/qt4-tools-native_4.7.0.bb
+++ b/recipes/qt4/qt4-tools-native_4.7.0.bb
@@ -3,15 +3,11 @@ DEFAULT_PREFERENCE = "-1"
 require qt4-tools-native.inc
 LICENSE = "LGPLv2.1 GPLv3"
 
-DEPENDS += "libxau-native libxdmcp-native"
-
-
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 # Find the g++.conf/linux.conf in the right directory.
 FILESPATHPKG =. "qt-${PV}:"
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://fix.xlib-test.libs.patch \
            file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"