From 532f1e681477bc15f7f19308753d9f2d6e91b2a3 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 14 Apr 2006 10:50:48 +0000 Subject: enchant_1.2.5.bb : add a new version and fix a problem with configure.in that was preventing aspell support building. --- packages/enchant/enchant_1.2.5.bb | 27 +++++++++++++++++++++++++++ packages/enchant/files/.mtn2git_empty | 0 packages/enchant/files/configure.patch | 10 ++++++++++ 3 files changed, 37 insertions(+) create mode 100644 packages/enchant/enchant_1.2.5.bb create mode 100644 packages/enchant/files/.mtn2git_empty create mode 100644 packages/enchant/files/configure.patch 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 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 -- cgit v1.2.3 From 9a7a995ebcbdaa1899d27b64a30462298106434a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Apr 2006 11:42:38 +0000 Subject: qt4: set platform to ${TARGET_OS}-g++ to prevent host based assumptions --- packages/qt/qt4-x11-free_4.1.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 " 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 } -- cgit v1.2.3 From b1413b277ff1ec28bb24861971cca2fe04ac9a12 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 14 Apr 2006 11:55:10 +0000 Subject: aspell5-en_6.0-0.bb, aspell-lang.inc : Add English dictionary for aspell everyone go ahead and copy/alter for languages you can read/test. I am unfortuneately unilingal --- packages/aspell/aspell-lang.inc | 23 +++++++++++++++++++++++ packages/aspell/aspell5-en_6.0-0.bb | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 packages/aspell/aspell-lang.inc create mode 100644 packages/aspell/aspell5-en_6.0-0.bb 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 + -- cgit v1.2.3 From 0c9a8e4fd40c857390d4b729aa1449d3308c32d9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Apr 2006 12:18:01 +0000 Subject: perl 5.8.7: remove extra copy of config.sh from SRC_URI --- packages/perl/perl_5.8.7.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 6743406b9b..456cc95c84 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -4,7 +4,6 @@ include perl.inc SRC_URI += "file://config.sh-armeb-linux \ file://config.sh-arm-linux \ - file://config.sh-arm-linux-gnueabi \ file://config.sh-i386-linux" PR = "r15" -- cgit v1.2.3