diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /qt/qt-x11-free | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'qt/qt-x11-free')
| -rw-r--r-- | qt/qt-x11-free/configure.patch | 60 | ||||
| -rw-r--r-- | qt/qt-x11-free/no-examples.patch | 16 |
2 files changed, 0 insertions, 76 deletions
diff --git a/qt/qt-x11-free/configure.patch b/qt/qt-x11-free/configure.patch deleted file mode 100644 index a56c621abb..0000000000 --- a/qt/qt-x11-free/configure.patch +++ /dev/null @@ -1,60 +0,0 @@ - -# -# 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 -@@ -219,7 +219,7 @@ - # licensed modules depend on type of commercial license - MODULES="styles tools kernel widgets dialogs iconview workspace" - [ "$PLATFORM_QWS" = "yes" ] && [ "$Products" = "qt-professional" ] && MODULES="$MODULES network" --[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml opengl sql" -+[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml sql" - CFG_MODULES_AVAILABLE=$MODULES - QMAKE_VARS="$QMAKE_VARS \"QT_PRODUCT=$Products\"" - QMAKE_VARS="$QMAKE_VARS \"styles += windows motif mac platinum sgi cde motifplus\"" -@@ -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 diff --git a/qt/qt-x11-free/no-examples.patch b/qt/qt-x11-free/no-examples.patch deleted file mode 100644 index b0ee6374ef..0000000000 --- a/qt/qt-x11-free/no-examples.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-embedded-free-3.3.2/Makefile~no-examples 2003-08-11 16:37:25.000000000 +0200 -+++ qt-embedded-free-3.3.2/Makefile 2004-05-11 15:53:53.000000000 +0200 -@@ -11,7 +11,7 @@ - install: FORCE - @$(MAKE) qt.install - --all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples -+all: symlinks src-qmake src-moc sub-src sub-tools - @echo - @echo "The Qt library is now built in ./lib" - @echo "The Qt examples are built in the directories in ./examples" |