summaryrefslogtreecommitdiffstats
path: root/recipes-qt3/qt3/qt-x11-free/configure.patch
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-05-09 15:55:14 -0700
committerSaul Wold <sgw@linux.intel.com>2011-05-09 15:55:14 -0700
commit422a054589a05844c9eced03abf3664ec6cd33a0 (patch)
tree6d74b031fbe1e2e11edfb400784c48bbef84a6c2 /recipes-qt3/qt3/qt-x11-free/configure.patch
parent302576f9b9a87a86eb156b842aa28009446102da (diff)
downloadmeta-qt3-422a054589a05844c9eced03abf3664ec6cd33a0.tar.gz
meta-qt3: move files to top level for layer
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'recipes-qt3/qt3/qt-x11-free/configure.patch')
-rw-r--r--recipes-qt3/qt3/qt-x11-free/configure.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/recipes-qt3/qt3/qt-x11-free/configure.patch b/recipes-qt3/qt3/qt-x11-free/configure.patch
new file mode 100644
index 0000000..9d6c1e8
--- /dev/null
+++ b/recipes-qt3/qt3/qt-x11-free/configure.patch
@@ -0,0 +1,51 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- qt-x11-free-3.3.2/configure~configure.patch
7+++ qt-x11-free-3.3.2/configure
8@@ -1754,21 +1754,14 @@
9 CFG_FREETYPE=yes
10 fi
11 fi
12- # add freetype2 include path
13- if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.inc ];then
14- QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $outpath/config.tests/x11/xft.inc`\""
15- fi
16- rm -f $outpath/config.tests/x11/xft.inc
17 # add Xft specific libraries
18 if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.lib ]; then
19 QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat $outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\""
20 fi
21- rm -f $outpath/config.tests/x11/xft.lib
22 # add Xft specific config options
23 if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.cfg ]; then
24 QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`"
25 fi
26- rm -f $outpath/config.tests/x11/xft.cfg
27 # auto-detect Session Management support
28 if [ "$CFG_SM" = "auto" ]; then
29 if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then
30@@ -2553,12 +2546,6 @@
31 (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2
32 fi
33
34-# clean up temporary qconfig.h and qmodules.h
35-rm -f $outpath/include/qmake/qconfig.h
36-rm -f $outpath/include/qmake/qmodules.h
37-rmdir $outpath/include/qmake
38-
39-
40 #-------------------------------------------------------------------------------
41 # tests that need qmake
42 #-------------------------------------------------------------------------------
43@@ -3605,7 +3592,7 @@
44
45 EOF
46 else
47- EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a"
48+ EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a $OE_EXTRA_QMAKE"
49 if [ "$OPT_VERBOSE" = "yes" ]; then
50 echo " (`basename $SPEC`)"
51 if echo '\c' | grep '\c' >/dev/null; then