merge of a9390448d82c08088c9697046e14075f0c439840

     and d93900aa884b52d778b478749eeafadb6bef3a21

6 files changed, 66 insertions, 2 deletions

diff --git a/packages/aspell/aspell-lang.inc b/packages/aspell/aspell-lang.inc
new file mode 100644
index 0000000000..709183b428
--- /dev/null
+++ b/packages/aspell/aspell-lang.inc
@@ -0,0 +1,23 @@
+FILES_${PN} = "/usr/lib/aspell/* /usr/share/aspell/*"
+
+DEPENDS = "aspell-native"
+
+do_configure() {
+	cd ${S}
+	export dictdir=/usr/lib/aspell/
+	export datadir=/usr/share/aspell/
+	DESTDIR=${D} ./configure
+}
+
+do_compile() {
+        export dictdir=/usr/lib/aspell/
+	export datadir=/usr/share/aspell/
+	dictdir=/usr/lib/aspell oe_runmake
+}
+
+do_install() {
+        export dictdir=/usr/lib/aspell/
+        export datadir=/usr/share/aspell/
+	oe_runmake install
+}
+
diff --git a/packages/aspell/aspell5-en_6.0-0.bb b/packages/aspell/aspell5-en_6.0-0.bb
new file mode 100644
index 0000000000..fb13e24bdf
--- /dev/null
+++ b/packages/aspell/aspell5-en_6.0-0.bb
@@ -0,0 +1,4 @@
+SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell5-en-${PV}.tar.bz2"
+
+include aspell-lang.inc
+
diff --git a/packages/enchant/enchant_1.2.5.bb b/packages/enchant/enchant_1.2.5.bb
new file mode 100644
index 0000000000..693b2d9076
--- /dev/null
+++ b/packages/enchant/enchant_1.2.5.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Enchant Spell checker API Library"
+MAINTAINER  = "AbiWord Team"
+PRIORITY    = "optional"
+SECTION     = "libs"
+
+DEPENDS     = "aspell"
+RDEPENDS    = "aspell"
+
+inherit autotools pkgconfig
+
+PR = "r0"
+
+S = "${WORKDIR}/enchant-${PV}"
+
+SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz \
+           file://configure.patch;patch=1"
+
+EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR}/${HOST_SYS} --enable-aspell"
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DIR}/share/man
+}
diff --git a/packages/enchant/files/.mtn2git_empty b/packages/enchant/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/enchant/files/.mtn2git_empty
diff --git a/packages/enchant/files/configure.patch b/packages/enchant/files/configure.patch
new file mode 100644
index 0000000000..6f1f23e01d
--- /dev/null
+++ b/packages/enchant/files/configure.patch
@@ -0,0 +1,10 @@
+--- enchant-1.2.5/configure.in.orig	2006-04-14 11:08:20.000000000 +0100
++++ enchant-1.2.5/configure.in	2006-04-14 11:12:03.000000000 +0100
+@@ -147,6 +147,7 @@
+        LDFLAGS="-L$with_aspell_prefix/lib "$LDFLAGS
+        ASPELL_INC="-I$with_aspell_prefix/include"
+        ASPELL_LIBS="-L$with_aspell_prefix/lib -laspell"
++       aspell_prefix=$with_aspell_prefix
+    else
+        aspell_prefix=${prefix}
+        if test "x$prefix" = "xNONE"; then
diff --git a/packages/qt/qt4-x11-free_4.1.1.bb b/packages/qt/qt4-x11-free_4.1.1.bb
index 6c32026f38..755510cc7d 100644
--- a/packages/qt/qt4-x11-free_4.1.1.bb
+++ b/packages/qt/qt4-x11-free_4.1.1.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL QPL"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "uicmoc4-native qmake2-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor"
 PROVIDES = "qt4x11"
-PR = "r2"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://cross-compile.patch;patch=1 \
@@ -51,7 +51,7 @@ do_configure() {
 	ln -sf ${STAGING_BINDIR}/qmake2 bin/qmake
 	#rm -rf ./mkspecs
 	#ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs
-	echo yes | ./configure -prefix / -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \
+	echo yes | ./configure -prefix / -platform ${TARGET_OS}-g++ -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \
 		-L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
 }