diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/qt/qt-x11-free/configure.patch | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/qt/qt-x11-free/configure.patch')
| -rw-r--r-- | recipes/qt/qt-x11-free/configure.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/recipes/qt/qt-x11-free/configure.patch b/recipes/qt/qt-x11-free/configure.patch new file mode 100644 index 0000000000..9d6c1e8ef7 --- /dev/null +++ b/recipes/qt/qt-x11-free/configure.patch @@ -0,0 +1,51 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-free-3.3.2/configure~configure.patch ++++ qt-x11-free-3.3.2/configure +@@ -1754,21 +1754,14 @@ + CFG_FREETYPE=yes + fi + fi +- # add freetype2 include path +- if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.inc ];then +- QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $outpath/config.tests/x11/xft.inc`\"" +- fi +- rm -f $outpath/config.tests/x11/xft.inc + # add Xft specific libraries + if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.lib ]; then + QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat $outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\"" + fi +- rm -f $outpath/config.tests/x11/xft.lib + # add Xft specific config options + if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.cfg ]; then + QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`" + fi +- rm -f $outpath/config.tests/x11/xft.cfg + # auto-detect Session Management support + if [ "$CFG_SM" = "auto" ]; then + if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then +@@ -2553,12 +2546,6 @@ + (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2 + fi + +-# clean up temporary qconfig.h and qmodules.h +-rm -f $outpath/include/qmake/qconfig.h +-rm -f $outpath/include/qmake/qmodules.h +-rmdir $outpath/include/qmake +- +- + #------------------------------------------------------------------------------- + # tests that need qmake + #------------------------------------------------------------------------------- +@@ -3605,7 +3592,7 @@ + + EOF + else +- EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a" ++ EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a $OE_EXTRA_QMAKE" + if [ "$OPT_VERBOSE" = "yes" ]; then + echo " (`basename $SPEC`)" + if echo '\c' | grep '\c' >/dev/null; then |