aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-06-08 16:42:43 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-06-08 22:52:04 +0200
commit0110b3b04be1d7111013231101baa7b899eb2659 (patch)
treed6a71927d4e3ddfda2320e79dcc7354c59568fef
parent27246fcb5c692eaa77764b235f255fe1ba60ed5f (diff)
downloadopenembedded-0110b3b04be1d7111013231101baa7b899eb2659.tar.gz
openembedded-0110b3b04be1d7111013231101baa7b899eb2659.tar.bz2
openembedded-0110b3b04be1d7111013231101baa7b899eb2659.zip
qt4-tools-native_4.7.0-beta1: add Xau and Xdmcp to xlib.pro config.test
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch9
-rw-r--r--recipes/qt4/qt4-tools-native_4.7.0-beta1.bb1
2 files changed, 10 insertions, 0 deletions
diff --git a/recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch b/recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch
new file mode 100644
index 0000000000..d7613033df
--- /dev/null
+++ b/recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch
@@ -0,0 +1,9 @@
+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_4.7.0-beta1.bb b/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb
index fb08dedf7f..d54debfb8a 100644
--- a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb
+++ b/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb
@@ -8,6 +8,7 @@ PV = "4.6.2+${SRCVER}"
PR = "${INC_PR}.0"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${SRCVER}.tar.gz \
+ file://fix.xlib-test.libs.patch \
file://qt-config.patch \
file://g++.conf \
file://linux.conf"