summaryrefslogtreecommitdiff
path: root/packages/qt/qt-x11-free
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/qt/qt-x11-free
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (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 'packages/qt/qt-x11-free')
-rw-r--r--packages/qt/qt-x11-free/configure.patch51
-rw-r--r--packages/qt/qt-x11-free/gcc4_1-HACK.patch28
-rw-r--r--packages/qt/qt-x11-free/no-examples.patch16
3 files changed, 0 insertions, 95 deletions
diff --git a/packages/qt/qt-x11-free/configure.patch b/packages/qt/qt-x11-free/configure.patch
deleted file mode 100644
index 9d6c1e8ef7..0000000000
--- a/packages/qt/qt-x11-free/configure.patch
+++ /dev/null
@@ -1,51 +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
-@@ -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/packages/qt/qt-x11-free/gcc4_1-HACK.patch b/packages/qt/qt-x11-free/gcc4_1-HACK.patch
deleted file mode 100644
index 818bced4ee..0000000000
--- a/packages/qt/qt-x11-free/gcc4_1-HACK.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- qt-x11-free-3.3.6/src/tools/qstring.h~gcc4_1.patch
-+++ qt-x11-free-3.3.6/src/tools/qstring.h
-@@ -60,7 +60,7 @@
- #endif
- #endif
-
--
-+#define Q_NO_PACKED_REFERENCE
- /*****************************************************************************
- QString class
- *****************************************************************************/
-@@ -194,9 +194,9 @@
- char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
- ushort unicode() const { return ucs; }
- #ifdef Q_NO_PACKED_REFERENCE
-- ushort &unicode() { return *(&ucs); }
-+ ushort &unicode() { return *((ushort*)&ucs); }
- #else
-- ushort &unicode() { return ucs; }
-+ ushort &unicode() { return (ushort)ucs; }
- #endif
- #ifndef QT_NO_CAST_ASCII
- // like all ifdef'd code this is undocumented
diff --git a/packages/qt/qt-x11-free/no-examples.patch b/packages/qt/qt-x11-free/no-examples.patch
deleted file mode 100644
index b0ee6374ef..0000000000
--- a/packages/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"