org.handhelds.familiar/packages/qt/qt-x11-free/configure.patch

   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 @@ -219,7 +219,7 @@
   9  # licensed modules depend on type of commercial license
  10  MODULES="styles tools kernel widgets dialogs iconview workspace"
  11  [ "$PLATFORM_QWS" = "yes" ] && [ "$Products" = "qt-professional" ] && MODULES="$MODULES network"
  12 -[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml opengl sql"
  13 +[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml sql"
  14  CFG_MODULES_AVAILABLE=$MODULES
  15  QMAKE_VARS="$QMAKE_VARS \"QT_PRODUCT=$Products\""
  16  QMAKE_VARS="$QMAKE_VARS \"styles += windows motif mac platinum sgi cde motifplus\""
  17 @@ -1754,21 +1754,14 @@
  18             CFG_FREETYPE=yes
  19         fi
  20      fi
  21 -    # add freetype2 include path
  22 -    if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.inc ];then
  23 -       QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $outpath/config.tests/x11/xft.inc`\""
  24 -    fi
  25 -    rm -f $outpath/config.tests/x11/xft.inc
  26      # add Xft specific libraries
  27      if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.lib ]; then
  28         QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat $outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\""
  29      fi
  30 -    rm -f $outpath/config.tests/x11/xft.lib
  31      # add Xft specific config options
  32      if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.cfg ]; then
  33         QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`"
  34      fi
  35 -    rm -f $outpath/config.tests/x11/xft.cfg
  36      # auto-detect Session Management support
  37      if [ "$CFG_SM" = "auto" ]; then
  38         if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then
  39 @@ -2553,12 +2546,6 @@
  40      (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2
  41  fi
  42
  43 -# clean up temporary qconfig.h and qmodules.h
  44 -rm -f $outpath/include/qmake/qconfig.h
  45 -rm -f $outpath/include/qmake/qmodules.h
  46 -rmdir $outpath/include/qmake
  47 -
  48 -
  49  #-------------------------------------------------------------------------------
  50  # tests that need qmake
  51  #-------------------------------------------------------------------------------
  52 @@ -3605,7 +3592,7 @@
  53
  54  EOF
  55         else
  56 -           EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a"
  57 +           EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a $OE_EXTRA_QMAKE"
  58             if [ "$OPT_VERBOSE" = "yes" ]; then
  59                 echo " (`basename $SPEC`)"
  60                 if echo '\c' | grep '\c' >/dev/null; then