summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/abiword/abiword-2.3.6/cdump-hack.patch11
-rw-r--r--packages/abiword/abiword-plugins_2.4.4.bb24
-rw-r--r--packages/abiword/abiword_2.2.7.bb52
-rw-r--r--packages/abiword/abiword_2.3.6.bb52
-rw-r--r--packages/abiword/abiword_2.4.2.bb52
-rw-r--r--packages/abiword/abiword_2.4.4.bb (renamed from packages/abiword/abiword_2.4.1.bb)16
-rw-r--r--packages/abiword/files/cdump-hack.patch11
-rw-r--r--packages/enchant/enchant_1.2.5.bb27
-rw-r--r--packages/enchant/files/.mtn2git_empty (renamed from packages/abiword/abiword-2.3.6/.mtn2git_empty)0
-rw-r--r--packages/enchant/files/configure.patch10
-rw-r--r--packages/gpe-bootsplash/files/init.patch (renamed from packages/gpe-bootsplash/files/speed.patch)31
-rw-r--r--packages/gpe-bootsplash/files/tty2-message.patch19
-rw-r--r--packages/gpe-bootsplash/gpe-bootsplash_1.15.bb5
-rw-r--r--packages/libwpd/.mtn2git_empty (renamed from packages/abiword/files/.mtn2git_empty)0
-rw-r--r--packages/libwpd/libwpd_0.8.4.bb14
-rw-r--r--packages/matchbox-wm/matchbox-wm/c7x0/.mtn2git_empty0
-rw-r--r--packages/matchbox-wm/matchbox-wm/c7x0/kbdconfig51
-rw-r--r--packages/matchbox-wm/matchbox-wm_1.0.bb2
-rw-r--r--packages/mml-widget/.mtn2git_empty0
-rw-r--r--packages/mml-widget/gtkmathview_0.7.6.bb19
-rw-r--r--packages/perl/perl_5.8.7.bb5
-rw-r--r--packages/poppler/poppler_0.5.1.bb5
-rw-r--r--packages/udev/files/akita/.mtn2git_empty0
-rw-r--r--packages/udev/files/akita/mount.blacklist4
-rw-r--r--packages/udev/files/c7x0/.mtn2git_empty0
-rw-r--r--packages/udev/files/c7x0/mount.blacklist4
-rw-r--r--packages/udev/files/mount.blacklist0
-rw-r--r--packages/udev/files/mount.sh10
-rw-r--r--packages/udev/files/spitz/.mtn2git_empty0
-rw-r--r--packages/udev/files/spitz/mount.blacklist5
-rw-r--r--packages/udev/files/tosa/.mtn2git_empty0
-rw-r--r--packages/udev/files/tosa/mount.blacklist4
-rw-r--r--packages/udev/udev_084.bb8
-rw-r--r--packages/udev/udev_089.bb6
-rw-r--r--packages/xserver-common/files/Xdefaults-200DPI.patch7
-rw-r--r--packages/xserver-common/files/calibrate_zaurusd.patch12
-rw-r--r--packages/xserver-common/files/setDPI.sh92
-rw-r--r--packages/xserver-common/xserver-common_1.8.bb12
38 files changed, 326 insertions, 244 deletions
diff --git a/packages/abiword/abiword-2.3.6/cdump-hack.patch b/packages/abiword/abiword-2.3.6/cdump-hack.patch
deleted file mode 100644
index afe75287e5..0000000000
--- a/packages/abiword/abiword-2.3.6/cdump-hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- abi/src/wp/ap/xp/GNUmakefile.am.orig 2005-05-09 21:33:34.915201456 +0000
-+++ abi/src/wp/ap/xp/GNUmakefile.am 2005-05-09 21:33:49.341008400 +0000
-@@ -107,7 +107,7 @@
- ap_wp_sidebar.cpp
-
- CDUMP=$(top_srcdir)/src/tools/cdump/xp/cdump.c
--CDUMPAPP=$(top_builddir)/src/tools/cdump/xp/cdump
-+CDUMPAPP=cdump
-
- ap_wp_splash.cpp: $(CDUMP) $(srcdir)/splash.png
- $(CDUMPAPP) $(srcdir)/splash.png g_pngSplash > ap_wp_splash.cpp
diff --git a/packages/abiword/abiword-plugins_2.4.4.bb b/packages/abiword/abiword-plugins_2.4.4.bb
new file mode 100644
index 0000000000..085a0f506b
--- /dev/null
+++ b/packages/abiword/abiword-plugins_2.4.4.bb
@@ -0,0 +1,24 @@
+DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
+HOMEPAGE="http://www.abiword.org""
+MAINTAINER="Koen Kooi <koen@dominion.kabel.utwente.nl>"
+LICENSE="GPLv2"
+
+DEPENDS = "abiword libwpd gtkmathview librsvg goffice poppler"
+PR="r0"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+S = "${WORKDIR}/abiword-${PV}/abiword-plugins"
+
+FILES_${PN} += " ${datadir}/icons/* \
+${datadir}/AbiSuite-2.4/ \
+${libdir}/AbiWord-2.4/plugins/*.so \
+"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = ""
+
+
+
diff --git a/packages/abiword/abiword_2.2.7.bb b/packages/abiword/abiword_2.2.7.bb
deleted file mode 100644
index de857a4abc..0000000000
--- a/packages/abiword/abiword_2.2.7.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
-HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@handhelds.org>"
-LICENSE="GPLv2"
-
-DEPENDS = "cdump-native libglade libfribidi enchant jpeg libpng perl glibc libxml2"
-RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
- glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-PR="r3"
-
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
- file://cdump-hack.patch;patch=1"
-S = "${WORKDIR}/abiword-${PV}/abi"
-
-FILES_${PN} += " ${datadir}/icons/* \
-${datadir}/AbiSuite-2.2/AbiWord/glade \
-${datadir}/AbiSuite-2.2/AbiWord/scripts \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en_GB \
-#${datadir}/AbiSuite-2.2/templates/A4.awt \
-#${datadir}/AbiSuite-2.2/templates/US-Letter.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt-en_GB \
-${datadir}/AbiSuite-2.2/templates/Employee-Directory.awt \
-${datadir}/AbiSuite-2.2/templates/Business-Report.awt \
-${datadir}/AbiSuite-2.2/templates/Fax-Coversheet.awt \
-${datadir}/AbiSuite-2.2/templates/Resume.awt \
-${datadir}/AbiSuite-2.2/templates/Two-Columns.awt \
-${datadir}/AbiSuite-2.2/templates/Memo.awt \
-${datadir}/AbiSuite-2.2/templates/Press-Release.awt "
-
-inherit autotools
-
-#abiword needs this native tool
-export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump"
-
-PARALLEL_MAKE=""
-
-do_configure () {
- cd ${S}
- ./autogen.sh
- ./configure --prefix=/usr --host=${TARGET_SYS} --disable-pspell --enable-enchant
-# --enable-debug
- cp -f ${STAGING_BINDIR}/cdump src/tools/cdump/xp/
-}
-
-do_install_append() {
- install -d ${D}${datadir}/pixmaps/
- mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
-}
-
-
diff --git a/packages/abiword/abiword_2.3.6.bb b/packages/abiword/abiword_2.3.6.bb
deleted file mode 100644
index 76b569db29..0000000000
--- a/packages/abiword/abiword_2.3.6.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
-HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@handhelds.org>"
-LICENSE="GPLv2"
-
-DEPENDS = "cdump-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
-RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
- glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-PR="r4"
-
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
- file://cdump-hack.patch;patch=1"
-S = "${WORKDIR}/abiword-${PV}/abi"
-
-FILES_${PN} += " ${datadir}/icons/* \
-${datadir}/AbiSuite-2.2/AbiWord/glade \
-${datadir}/AbiSuite-2.2/AbiWord/scripts \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en_GB \
-#${datadir}/AbiSuite-2.2/templates/A4.awt \
-#${datadir}/AbiSuite-2.2/templates/US-Letter.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt-en_GB \
-${datadir}/AbiSuite-2.2/templates/Employee-Directory.awt \
-${datadir}/AbiSuite-2.2/templates/Business-Report.awt \
-${datadir}/AbiSuite-2.2/templates/Fax-Coversheet.awt \
-${datadir}/AbiSuite-2.2/templates/Resume.awt \
-${datadir}/AbiSuite-2.2/templates/Two-Columns.awt \
-${datadir}/AbiSuite-2.2/templates/Memo.awt \
-${datadir}/AbiSuite-2.2/templates/Press-Release.awt "
-
-inherit autotools
-
-#abiword needs this native tool
-export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump"
-
-PARALLEL_MAKE=""
-
-do_configure () {
- cd ${S}
- ./autogen.sh
- ./configure --prefix=/usr --host=${TARGET_SYS} --disable-pspell --enable-enchant
-# --enable-debug
- cp -f ${STAGING_BINDIR}/cdump src/tools/cdump/xp/
-}
-
-do_install_append() {
- install -d ${D}${datadir}/pixmaps/
- mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
-}
-
-
diff --git a/packages/abiword/abiword_2.4.2.bb b/packages/abiword/abiword_2.4.2.bb
deleted file mode 100644
index 26a16dfc32..0000000000
--- a/packages/abiword/abiword_2.4.2.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
-HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@handhelds.org>"
-LICENSE="GPLv2"
-
-DEPENDS = "cdump-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
-RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
- glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-PR="r0"
-
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
- file://cdump-hack.patch;patch=1"
-S = "${WORKDIR}/abiword-${PV}/abi"
-
-FILES_${PN} += " ${datadir}/icons/* \
-${datadir}/AbiSuite-2.4/AbiWord/glade \
-${datadir}/AbiSuite-2.4/AbiWord/scripts \
-${datadir}/AbiSuite-2.4/AbiWord/system.profile-en \
-${datadir}/AbiSuite-2.4/AbiWord/system.profile-en_GB \
-#${datadir}/AbiSuite-2.4/templates/A4.awt \
-#${datadir}/AbiSuite-2.4/templates/US-Letter.awt \
-${datadir}/AbiSuite-2.4/templates/normal.awt \
-${datadir}/AbiSuite-2.4/templates/normal.awt-en_GB \
-${datadir}/AbiSuite-2.4/templates/Employee-Directory.awt \
-${datadir}/AbiSuite-2.4/templates/Business-Report.awt \
-${datadir}/AbiSuite-2.4/templates/Fax-Coversheet.awt \
-${datadir}/AbiSuite-2.4/templates/Resume.awt \
-${datadir}/AbiSuite-2.4/templates/Two-Columns.awt \
-${datadir}/AbiSuite-2.4/templates/Memo.awt \
-${datadir}/AbiSuite-2.4/templates/Press-Release.awt "
-
-inherit autotools
-
-#abiword needs this native tool
-export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump"
-
-PARALLEL_MAKE=""
-
-do_configure () {
- cd ${S}
- ./autogen.sh
- ./configure --prefix=/usr --host=${TARGET_SYS} --disable-pspell --enable-enchant
-# --enable-debug
- cp -f ${STAGING_BINDIR}/cdump src/tools/cdump/xp/
-}
-
-do_install_append() {
- install -d ${D}${datadir}/pixmaps/
- mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
-}
-
-
diff --git a/packages/abiword/abiword_2.4.1.bb b/packages/abiword/abiword_2.4.4.bb
index 26a16dfc32..8b1ed52d8a 100644
--- a/packages/abiword/abiword_2.4.1.bb
+++ b/packages/abiword/abiword_2.4.4.bb
@@ -3,13 +3,12 @@ HOMEPAGE="http://www.abiword.org""
MAINTAINER="Koen Kooi <koen@handhelds.org>"
LICENSE="GPLv2"
-DEPENDS = "cdump-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
+DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
PR="r0"
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
- file://cdump-hack.patch;patch=1"
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
S = "${WORKDIR}/abiword-${PV}/abi"
FILES_${PN} += " ${datadir}/icons/* \
@@ -31,18 +30,9 @@ ${datadir}/AbiSuite-2.4/templates/Press-Release.awt "
inherit autotools
-#abiword needs this native tool
-export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump"
-
PARALLEL_MAKE=""
-do_configure () {
- cd ${S}
- ./autogen.sh
- ./configure --prefix=/usr --host=${TARGET_SYS} --disable-pspell --enable-enchant
-# --enable-debug
- cp -f ${STAGING_BINDIR}/cdump src/tools/cdump/xp/
-}
+EXTRA_OECONF = "--disable-pspell --enable-enchant"
do_install_append() {
install -d ${D}${datadir}/pixmaps/
diff --git a/packages/abiword/files/cdump-hack.patch b/packages/abiword/files/cdump-hack.patch
deleted file mode 100644
index afe75287e5..0000000000
--- a/packages/abiword/files/cdump-hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- abi/src/wp/ap/xp/GNUmakefile.am.orig 2005-05-09 21:33:34.915201456 +0000
-+++ abi/src/wp/ap/xp/GNUmakefile.am 2005-05-09 21:33:49.341008400 +0000
-@@ -107,7 +107,7 @@
- ap_wp_sidebar.cpp
-
- CDUMP=$(top_srcdir)/src/tools/cdump/xp/cdump.c
--CDUMPAPP=$(top_builddir)/src/tools/cdump/xp/cdump
-+CDUMPAPP=cdump
-
- ap_wp_splash.cpp: $(CDUMP) $(srcdir)/splash.png
- $(CDUMPAPP) $(srcdir)/splash.png g_pngSplash > ap_wp_splash.cpp
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/abiword/abiword-2.3.6/.mtn2git_empty b/packages/enchant/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/abiword/abiword-2.3.6/.mtn2git_empty
+++ 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/gpe-bootsplash/files/speed.patch b/packages/gpe-bootsplash/files/init.patch
index cc670d00e4..8e2cf750d4 100644
--- a/packages/gpe-bootsplash/files/speed.patch
+++ b/packages/gpe-bootsplash/files/init.patch
@@ -1,19 +1,28 @@
---- gpe-bootsplash-1.15/gpe-bootsplash.init.orig 2006-02-19 14:34:22.404426869 +0100
-+++ gpe-bootsplash-1.15/gpe-bootsplash.init 2006-02-19 14:29:35.044269116 +0100
-@@ -32,14 +32,46 @@
+--- gpe-bootsplash-1.15/gpe-bootsplash.init.orig 2006-04-13 20:26:28.164825368 +0200
++++ gpe-bootsplash-1.15/gpe-bootsplash.init 2006-04-13 20:25:28.620877424 +0200
+@@ -7,6 +7,8 @@
+
+ mount /proc 2>/dev/null
+
++mount -o remount,rw /
++
+ case $1 in
+ 'start')
+ case `module_id` in
+@@ -31,8 +33,47 @@
+ ;;
esac
echo "0" > /proc/sys/kernel/printk
-
-- # Clear tty2
++
+ # Clear tty2
- echo -e "\033c" > /dev/tty2
++ echo -e "\033c" > /dev/tty2
+
chvt 2
-
- echo -e "\nLoading bootsplash..." > /dev/tty2
- echo "Use Fn-LeftArrow to see the boot messages." > /dev/tty2
-
-- /usr/bin/gpe-bootsplash $ARGS || chvt 1
+- /usr/bin/gpe-bootsplash $ARGS
++
++ echo -e "\nLoading bootsplash..." > /dev/tty2
++ echo "Use Alt-LeftArrow to see the boot messages." > /dev/tty2
++
+ # Catch when the user has changed the symlinks manually (normally it doesn't matter which link we check
+ # as themes always update both of them
+ echo "$ARGS" | grep -q -- "--force-landscape" && source_link="splash-l.svg" || source_link="splash-p.svg"
diff --git a/packages/gpe-bootsplash/files/tty2-message.patch b/packages/gpe-bootsplash/files/tty2-message.patch
deleted file mode 100644
index 0c3b2d859b..0000000000
--- a/packages/gpe-bootsplash/files/tty2-message.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- gpe-bootsplash-1.15/gpe-bootsplash.init.orig 2006-02-12 19:36:10.600838563 +0100
-+++ gpe-bootsplash-1.15/gpe-bootsplash.init 2006-02-12 19:36:13.957218949 +0100
-@@ -31,8 +31,15 @@
- ;;
- esac
- echo "0" > /proc/sys/kernel/printk
-+
-+ # Clear tty2
-+ echo -e "\033c" > /dev/tty2
- chvt 2
-- /usr/bin/gpe-bootsplash $ARGS
-+
-+ echo -e "\nLoading bootsplash..." > /dev/tty2
-+ echo "Use Fn-LeftArrow to see the boot messages." > /dev/tty2
-+
-+ /usr/bin/gpe-bootsplash $ARGS || chvt 1
- ;;
- 'stop')
- ;;
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
index 761a0500c7..61dea1d847 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
@@ -5,12 +5,11 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
SRC_URI += "file://splash-p.svg \
file://splash-l.svg \
- file://tty2-message.patch;patch=1 \
- file://speed.patch;patch=1"
+ file://init.patch;patch=1"
FILES_${PN} += "${datadir}/gpe"
diff --git a/packages/abiword/files/.mtn2git_empty b/packages/libwpd/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/abiword/files/.mtn2git_empty
+++ b/packages/libwpd/.mtn2git_empty
diff --git a/packages/libwpd/libwpd_0.8.4.bb b/packages/libwpd/libwpd_0.8.4.bb
new file mode 100644
index 0000000000..9be164437d
--- /dev/null
+++ b/packages/libwpd/libwpd_0.8.4.bb
@@ -0,0 +1,14 @@
+LICENSE = "LGPL"
+DESCRIPTION = "libwpd is a C++ library designed to help process WordPerfect documents."
+HOMEPAGE = "http://libwpd.sourceforge.net/index.html"
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+
+
+inherit autotools pkgconfig
+
+
+do_stage() {
+autotools_stage_all
+}
diff --git a/packages/matchbox-wm/matchbox-wm/c7x0/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/c7x0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/c7x0/.mtn2git_empty
diff --git a/packages/matchbox-wm/matchbox-wm/c7x0/kbdconfig b/packages/matchbox-wm/matchbox-wm/c7x0/kbdconfig
new file mode 100644
index 0000000000..7de0071c08
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/c7x0/kbdconfig
@@ -0,0 +1,51 @@
+#
+# This is an example keyboard config file for matchbox
+#
+# You can edit this file or change per user by copying to
+# ~/.matchbox/kbdconfig
+#
+# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox )
+
+### Window operation short cuts
+
+<Alt>n=next
+<Alt>p=prev
+<Alt>c=close
+<Alt>d=desktop
+<Alt>m=!matchbox-remote -mbmenu
+
+### App launching.
+
+<ctrl><alt>x=!xterm
+<ctrl><alt>r=!rxvt
+
+### App launching with startup notify
+
+<ctrl><alt>e=!!gpe-calender
+
+### windows style key shortcuts
+
+<alt>Tab=next
+<alt><shift>Tab=prev
+
+<alt>space=taskmenu
+<alt>escape=!matchbox-remote -mbmenu
+<alt>f4=close
+
+# On SL-Cxxxx, F11 is the "menu" key. In order to be able to assign a function
+# to this key via keylaunch, this must be commented out.
+# NOTE: Uncommenting this usually means that matchbox crashes on startup!
+#
+# f11=fullscreen
+
+### super should be a 'window' key, uncomment '#' if you have one.
+
+#<super>d=desktop
+#<super>r=!xterm
+#<super>e=!!nautilus
+
+### Special keys, likely probably only available on extended keyboards.
+
+#App=!matchbox-remote -mbmenu
+#Menu=!matchbox-remote -mbmenu
+
diff --git a/packages/matchbox-wm/matchbox-wm_1.0.bb b/packages/matchbox-wm/matchbox-wm_1.0.bb
index 2270fccbce..a464dcfcdd 100644
--- a/packages/matchbox-wm/matchbox-wm_1.0.bb
+++ b/packages/matchbox-wm/matchbox-wm_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
-PR="r0"
+PR="r1"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/matchbox-window-manager-${PV}.tar.gz \
diff --git a/packages/mml-widget/.mtn2git_empty b/packages/mml-widget/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mml-widget/.mtn2git_empty
diff --git a/packages/mml-widget/gtkmathview_0.7.6.bb b/packages/mml-widget/gtkmathview_0.7.6.bb
new file mode 100644
index 0000000000..fbb6b5faf9
--- /dev/null
+++ b/packages/mml-widget/gtkmathview_0.7.6.bb
@@ -0,0 +1,19 @@
+LICENSE = "GPL"
+HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/"
+DEPENDS = "gtk+ popt libxslt libxml2"
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+
+SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-binreloc"
+
+do_configure() {
+oe_runconf
+}
+
+do_stage() {
+autotools_stage_all
+}
+
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index a960439ad2..6743406b9b 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -4,9 +4,10 @@ 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 = "r14"
+PR = "r15"
do_configure() {
ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
@@ -18,6 +19,8 @@ do_configure() {
cp ${WORKDIR}/config.sh-i686-linux .
cp ${WORKDIR}/config.sh-i386-linux .
cp ${WORKDIR}/config.sh-armeb-linux .
+ #perl insists on an extra config.sh for arm EABI
+ cp config.sh-arm-linux config.sh-arm-linux-gnueabi
# nslu2 LE uclibc builds do not work with the default config.sh
if test "${MACHINE}" = nslu2
then
diff --git a/packages/poppler/poppler_0.5.1.bb b/packages/poppler/poppler_0.5.1.bb
index ebe06c4015..83990e94d7 100644
--- a/packages/poppler/poppler_0.5.1.bb
+++ b/packages/poppler/poppler_0.5.1.bb
@@ -1,12 +1,13 @@
DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
LICENSE = "GPL"
+PR = "r1"
DEPENDS = "fontconfig jpeg gtk+ cairo"
SRC_URI="http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
-EXTRA_OECONF = "--disable-gtk-test --disable-poppler-qt"
+EXTRA_OECONF = "--enable-xpdf-headers --disable-gtk-test --disable-poppler-qt"
inherit pkgconfig autotools
diff --git a/packages/udev/files/akita/.mtn2git_empty b/packages/udev/files/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/akita/.mtn2git_empty
diff --git a/packages/udev/files/akita/mount.blacklist b/packages/udev/files/akita/mount.blacklist
new file mode 100644
index 0000000000..c2684b7c28
--- /dev/null
+++ b/packages/udev/files/akita/mount.blacklist
@@ -0,0 +1,4 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
diff --git a/packages/udev/files/c7x0/.mtn2git_empty b/packages/udev/files/c7x0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/c7x0/.mtn2git_empty
diff --git a/packages/udev/files/c7x0/mount.blacklist b/packages/udev/files/c7x0/mount.blacklist
new file mode 100644
index 0000000000..c2684b7c28
--- /dev/null
+++ b/packages/udev/files/c7x0/mount.blacklist
@@ -0,0 +1,4 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
diff --git a/packages/udev/files/mount.blacklist b/packages/udev/files/mount.blacklist
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/mount.blacklist
diff --git a/packages/udev/files/mount.sh b/packages/udev/files/mount.sh
index 7e641b08d7..010b7289f2 100644
--- a/packages/udev/files/mount.sh
+++ b/packages/udev/files/mount.sh
@@ -9,6 +9,16 @@ MOUNT="/bin/mount"
PMOUNT="/usr/bin/pmount"
UMOUNT="/bin/umount"
+for line in `cat /etc/udev/mount.blacklist | grep -v ^#`
+do
+ if ( echo "$DEVNAME" | grep -q "$line" )
+ then
+ logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
+ exit 0
+ fi
+done
+
+
if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
if [ -x "$PMOUNT" ]; then
$PMOUNT $DEVNAME 2> /dev/null
diff --git a/packages/udev/files/spitz/.mtn2git_empty b/packages/udev/files/spitz/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/spitz/.mtn2git_empty
diff --git a/packages/udev/files/spitz/mount.blacklist b/packages/udev/files/spitz/mount.blacklist
new file mode 100644
index 0000000000..1dad9117da
--- /dev/null
+++ b/packages/udev/files/spitz/mount.blacklist
@@ -0,0 +1,5 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
+/dev/hda
diff --git a/packages/udev/files/tosa/.mtn2git_empty b/packages/udev/files/tosa/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/tosa/.mtn2git_empty
diff --git a/packages/udev/files/tosa/mount.blacklist b/packages/udev/files/tosa/mount.blacklist
new file mode 100644
index 0000000000..c2684b7c28
--- /dev/null
+++ b/packages/udev/files/tosa/mount.blacklist
@@ -0,0 +1,4 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb
index fc8a701684..30baa9e2fe 100644
--- a/packages/udev/udev_084.bb
+++ b/packages/udev/udev_084.bb
@@ -7,13 +7,14 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
file://flags.patch;patch=1 \
file://udevsynthesize.patch;patch=1 \
- file://udevsynthesize.sh"
-
+ file://udevsynthesize.sh \
+ file://mount.blacklist"
+
include udev.inc
INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ."
-PR = "r4"
+PR = "r5"
FILES_${PN} += "${base_libdir}"
UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
@@ -28,6 +29,7 @@ do_install () {
install -d ${D}${sysconfdir}/udev/rules.d/
+ install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/
install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
diff --git a/packages/udev/udev_089.bb b/packages/udev/udev_089.bb
index 28cda40f0f..ba1e5b4161 100644
--- a/packages/udev/udev_089.bb
+++ b/packages/udev/udev_089.bb
@@ -5,11 +5,14 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
the hotplug package and requires a kernel not older than 2.6.12."
RPROVIDES = "hotplug"
+PR = "r1"
+
SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
file://flags.patch;patch=1 \
file://udevsynthesize.patch;patch=1 \
- file://udevsynthesize.sh"
+ file://udevsynthesize.sh \
+ file://mount.blacklist"
include udev.inc
@@ -28,6 +31,7 @@ do_install () {
install -d ${D}${sysconfdir}/udev/rules.d/
+ install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/
install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
diff --git a/packages/xserver-common/files/Xdefaults-200DPI.patch b/packages/xserver-common/files/Xdefaults-200DPI.patch
deleted file mode 100644
index 8931bfd0a9..0000000000
--- a/packages/xserver-common/files/Xdefaults-200DPI.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- xserver-common-1.8/X11/Xdefaults.orig 2006-04-08 11:08:35.158478256 +0200
-+++ xserver-common-1.8/X11/Xdefaults 2006-04-08 11:08:42.711330048 +0200
-@@ -1,3 +1,2 @@
- Rxvt*scrollBar_right: true
--Rxvt*font: xft:Mono:pixelsize=9
--Xft.dpi: 100
-+Rxvt*font: xft:Mono:pixelsize=12
diff --git a/packages/xserver-common/files/calibrate_zaurusd.patch b/packages/xserver-common/files/calibrate_zaurusd.patch
new file mode 100644
index 0000000000..6a7e3b02b7
--- /dev/null
+++ b/packages/xserver-common/files/calibrate_zaurusd.patch
@@ -0,0 +1,12 @@
+--- xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate.orig 2006-04-09 15:12:16.167950472 +0200
++++ xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate 2006-04-09 15:14:51.511334688 +0200
+@@ -2,4 +2,9 @@
+
+ if [ ! -f /etc/pointercal ]; then
+ /usr/bin/run-calibrate.sh
++
++ if [ -x /etc/init.d/zaurusd ]; then
++ /etc/init.d/zaurusd stop
++ /etc/init.d/zaurusd start
++ fi
+ fi
diff --git a/packages/xserver-common/files/setDPI.sh b/packages/xserver-common/files/setDPI.sh
new file mode 100644
index 0000000000..04a2edd6c6
--- /dev/null
+++ b/packages/xserver-common/files/setDPI.sh
@@ -0,0 +1,92 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: setDPI.sh
+# Date: 09-Apr-06
+
+# This script configures Xft.dpi dependent on your screens DPI. This insures that the same font-size
+# setting of 7 can be used on all machines.
+
+
+XDEFAULTS="/etc/X11/Xdefaults"
+
+
+
+set_dpi() {
+
+ CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Xft.dpi\:/s/.*\:\(.*\)/\1/p" | sed -n "s/\ //p"`"
+
+ if test "$CURRENT_SETTING" != "$1"
+ then
+ echo "Using Xft.dpi of $SET_SCREEN_DPI for your $SCREEN_DPI DPI screen"
+
+ if grep -q "Xft.dpi" "$XDEFAULTS"
+ then
+ cat "${XDEFAULTS}" | sed "s/^Xft.dpi\:.*/Xft.dpi\: $SET_SCREEN_DPI/" > "${XDEFAULTS}_"
+ mv "${XDEFAULTS}_" "${XDEFAULTS}"
+ else
+ echo -e "Xft.dpi: $SET_SCREEN_DPI\n" >> "$XDEFAULTS"
+ fi
+ else
+ echo "Your $SCREEN_DPI DPI screen is already configured."
+ fi
+}
+
+set_rxvt_font() {
+
+ CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Rxvt\*font/s/\(.*\pixelsize=\)\(.*\)/\2/p"`"
+
+ if test "$1" -gt 100
+ then
+
+ # Configure the rxvt font-size for your screen here:
+ test "$1" -gt 180 -a "$1" -lt "221" && RXVT_FONT_SIZE=16
+
+ if test -z "$RXVT_FONT_SIZE"
+ then
+ echo "WARNING: No rxvt font-size configured for a $SCREEN_DPI DPI screen!"
+ echo "Defaulting to size 9"
+ RXVT_FONT_SIZE=9
+ fi
+
+ if test "$CURRENT_SETTING" != "$RXVT_FONT_SIZE"
+ then
+ echo "Using a rxvt font-size of $RXVT_FONT_SIZE"
+ cat ${XDEFAULTS} | sed "/Rxvt\*font/s/\(.*\pixelsize\)\(=*.*\)/\1=$RXVT_FONT_SIZE/" > ${XDEFAULTS}_
+ mv ${XDEFAULTS}_ ${XDEFAULTS}
+ else
+ echo "The rxvt font-size is already configured"
+ fi
+ fi
+}
+
+if test -z "$DISPLAY"
+then
+ echo "DISPLAY is not set, aborting..."
+ exit 0
+fi
+
+SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`"
+
+if test -z "$SCREEN_DPI"
+then
+ echo "WARNING: Couldn't read your screens DPI, defaulting to 100"
+ SCREEN_DPI=100
+fi
+
+# Configure your screen here:
+test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160
+test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100
+
+
+if test -z "$SET_SCREEN_DPI"
+then
+ echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!"
+ echo "Using 100 DPI"
+ SET_SCREEN_DPI=100
+fi
+
+set_dpi "$SET_SCREEN_DPI"
+set_rxvt_font "$SCREEN_DPI"
diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb
index 19ae2ba851..b7b3f554f3 100644
--- a/packages/xserver-common/xserver-common_1.8.bb
+++ b/packages/xserver-common/xserver-common_1.8.bb
@@ -3,14 +3,16 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
+PR = "r2"
PACKAGE_ARCH = "all"
# we are using a gpe-style Makefile
inherit gpe
-SRC_URI_append_akita = " file://Xdefaults-200DPI.patch;patch=1"
-SRC_URI_append_spitz = " file://Xdefaults-200DPI.patch;patch=1"
-SRC_URI_append_c7x0 = " file://Xdefaults-200DPI.patch;patch=1"
-SRC_URI_append_tosa = " file://Xdefaults-200DPI.patch;patch=1"
+SRC_URI_append = " file://setDPI.sh \
+ file://calibrate_zaurusd.patch;patch=1"
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}