summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/ipaq-common.conf6
-rw-r--r--conf/machine/netvista.conf4
-rw-r--r--packages/dbus/dbus_0.23.4.bb2
-rw-r--r--packages/dhclient/dhclient_2.0pl5.bb2
-rw-r--r--packages/dhcp/dhcp_3.0.2.bb2
-rw-r--r--packages/dpkg/dpkg_1.10.23.bb11
-rw-r--r--packages/dpkg/dpkg_1.10.28.bb (renamed from packages/dpkg/dpkg_1.10.27.bb)0
-rw-r--r--packages/gimp/gimp_2.3.2.bb19
-rw-r--r--packages/gnome/goffice_0.0.2.bb21
-rw-r--r--packages/gnumeric/gnumeric-1.5.2/.mtn2git_empty0
-rw-r--r--packages/gnumeric/gnumeric-1.5.2/remove-docs.patch8
-rw-r--r--packages/gnumeric/gnumeric_1.5.2.bb18
-rw-r--r--packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb51
-rw-r--r--packages/gpe-mini-browser/gpe-mini-browser_0.15.bb4
-rw-r--r--packages/gstreamer/gst-plugins_0.8.7.bb5
-rw-r--r--packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb23
-rw-r--r--packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb2
-rw-r--r--packages/ifupdown/ifupdown_0.6.4.bb3
-rwxr-xr-xpackages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map138
-rw-r--r--packages/initscripts/initscripts_1.0.bb2
-rw-r--r--packages/ion/ion3_0.0+ds20041104.bb3
-rw-r--r--packages/libgsf/libgsf_1.12.1.bb47
-rw-r--r--packages/linux/gumstix_2.6.5-gnalm1-gum0.bb3
-rw-r--r--packages/mailx/mailx_8.1.2-0.20040524cvs.bb2
-rw-r--r--packages/meta/meta-maemo.bb5
-rw-r--r--packages/totem/totem-0.101/.mtn2git_empty0
-rw-r--r--packages/totem/totem-0.101/include.patch11
-rw-r--r--packages/totem/totem-0.101/omf.patch13
-rw-r--r--packages/totem/totem_0.101.bb34
-rw-r--r--packages/totem/totem_0.99.15.bb2
-rw-r--r--packages/tslib/tslib/ipaq-pxa270/.mtn2git_empty0
-rw-r--r--packages/tslib/tslib/ipaq-pxa270/tslib.sh6
-rw-r--r--packages/tslib/tslib_cvs.bb2
-rw-r--r--packages/xscreensaver/xscreensaver_4.16.bb3
-rw-r--r--packages/xserver/xserver-kdrive_20050207.bb2
35 files changed, 357 insertions, 97 deletions
diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index 24a1e202f1..791abd2103 100644
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,7 +1,9 @@
IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev"
-BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6 atmelwlandriver"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver"
+BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 567cee8ba1..fc61ba4f6a 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for the IBM Netvista thin client
TARGET_ARCH = "i386"
-IPKG_ARCHS = "all i386 ${MACHINE}"
+IPKG_ARCHS = "all i386"
PREFERRED_PROVIDER_xserver = "xserver-xorg"
PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils module-init-tools strace"
@@ -17,6 +17,8 @@ TARGET_VENDOR = "-oe"
PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
IMAGE_FSTYPE = "ext2"
GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser"
#BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
#BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace
diff --git a/packages/dbus/dbus_0.23.4.bb b/packages/dbus/dbus_0.23.4.bb
index 30e694f08e..dc3f6f2e72 100644
--- a/packages/dbus/dbus_0.23.4.bb
+++ b/packages/dbus/dbus_0.23.4.bb
@@ -1,5 +1,5 @@
SECTION = "base"
-PR = "r0"
+PR = "r1"
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
DESCRIPTION = "message bus system for applications to talk to one another"
LICENSE = "GPL"
diff --git a/packages/dhclient/dhclient_2.0pl5.bb b/packages/dhclient/dhclient_2.0pl5.bb
index cee9cdece2..20b0dfc440 100644
--- a/packages/dhclient/dhclient_2.0pl5.bb
+++ b/packages/dhclient/dhclient_2.0pl5.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
DESCRIPTION = "ISC DHCP Distribution (client and server)."
LICENSE = "BSD"
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-2.0-history/dhcp-${PV}.tar.gz \
file://make.patch;patch=1"
S = "${WORKDIR}/dhcp-${PV}"
diff --git a/packages/dhcp/dhcp_3.0.2.bb b/packages/dhcp/dhcp_3.0.2.bb
index 3dbf803106..c734af1534 100644
--- a/packages/dhcp/dhcp_3.0.2.bb
+++ b/packages/dhcp/dhcp_3.0.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.isc.org/"
MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
LICENSE = "BSD"
PR = "r1"
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
file://noattrmode.patch;patch=1 \
file://init-relay file://default-relay \
file://init-server file://default-server \
diff --git a/packages/dpkg/dpkg_1.10.23.bb b/packages/dpkg/dpkg_1.10.23.bb
deleted file mode 100644
index 21d2a9b2b3..0000000000
--- a/packages/dpkg/dpkg_1.10.23.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-include dpkg.inc
-
-SRC_URI += "file://autofoo.patch;patch=1"
-
-inherit autotools gettext
-
-EXTRA_OECONF = "--without-static-progs \
- --without-dselect \
- --with-start-stop-daemon \
- --with-zlib \
- --without-sgml-doc"
diff --git a/packages/dpkg/dpkg_1.10.27.bb b/packages/dpkg/dpkg_1.10.28.bb
index ec8a887300..ec8a887300 100644
--- a/packages/dpkg/dpkg_1.10.27.bb
+++ b/packages/dpkg/dpkg_1.10.28.bb
diff --git a/packages/gimp/gimp_2.3.2.bb b/packages/gimp/gimp_2.3.2.bb
new file mode 100644
index 0000000000..98237579d0
--- /dev/null
+++ b/packages/gimp/gimp_2.3.2.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
+HOMEPAGE = "http://www.gimp.org"
+LICENSE = "GPL"
+MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+
+SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2"
+
+DEPENDS = "sed-native gtk+ jpeg libpng libexif tiff"
+
+inherit autotools pkgconfig
+#Don't laugh, this just builds a threaded gimp
+EXTRA_OECONF = " --disable-gtktest \
+ --disable-print \
+ --disable-python \
+ --enable-mp"
+
+do_configure_append() {
+ find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+}
diff --git a/packages/gnome/goffice_0.0.2.bb b/packages/gnome/goffice_0.0.2.bb
new file mode 100644
index 0000000000..db26a617a5
--- /dev/null
+++ b/packages/gnome/goffice_0.0.2.bb
@@ -0,0 +1,21 @@
+DESCRIPTION="Gnome Office Library"
+LICENSE="GPLv2"
+PR="r0"
+
+DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
+
+inherit gnome pkgconfig
+
+
+
+do_stage() {
+ gnome_stage_includes
+ oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+ goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
+
+ do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
+}
+
diff --git a/packages/gnumeric/gnumeric-1.5.2/.mtn2git_empty b/packages/gnumeric/gnumeric-1.5.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnumeric/gnumeric-1.5.2/.mtn2git_empty
diff --git a/packages/gnumeric/gnumeric-1.5.2/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.2/remove-docs.patch
new file mode 100644
index 0000000000..4a9108bd4e
--- /dev/null
+++ b/packages/gnumeric/gnumeric-1.5.2/remove-docs.patch
@@ -0,0 +1,8 @@
+--- gnumeric-1.5.2/Makefile.am.orig 2005-08-01 11:32:36.119921544 +0000
++++ gnumeric-1.5.2/Makefile.am 2005-08-01 11:32:44.689618752 +0000
+@@ -1,4 +1,4 @@
+-SUBDIRS = . po po-functions src plugins icons templates doc schemas
++SUBDIRS = . po po-functions src plugins icons templates schemas
+ if WITH_WIN32
+ SUBDIRS += tools
+ endif
diff --git a/packages/gnumeric/gnumeric_1.5.2.bb b/packages/gnumeric/gnumeric_1.5.2.bb
new file mode 100644
index 0000000000..03b42fc86a
--- /dev/null
+++ b/packages/gnumeric/gnumeric_1.5.2.bb
@@ -0,0 +1,18 @@
+LICENSE = "GPL"
+SECTION = "x11/utils"
+PR = "r0"
+S = "${WORKDIR}/gnumeric-${PV}"
+DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui"
+DESCRIPTION = "Gnumeric spreadsheet for GNOME"
+
+inherit gnome flow-lossage
+
+SRC_URI += "file://remove-docs.patch;patch=1"
+
+EXTRA_OECONF=" --without-perl "
+
+python populate_packages_prepend () {
+ gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
+
+ do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True)
+}
diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb
new file mode 100644
index 0000000000..14f5313bcc
--- /dev/null
+++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb
@@ -0,0 +1,51 @@
+PR = "r0"
+
+SRC_URI = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz"
+DESCRIPTION = "A lightweight webbrowser for the GPE platform (Hildon UI)"
+LICENSE = "GPL"
+DEPENDS = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget"
+EXTRA_OECONF = "--enable-hildon"
+
+S = "${WORKDIR}/gpe-mini-browser-${PV}"
+
+inherit autotools
+
+do_install() {
+ install -d ${D}/usr/share/applications/hildon
+ install -m 0644 ${S}/hildon/gpe-mini-browser.desktop ${D}/usr/share/applications/hildon/gpe-mini-browser.desktop
+ install -d ${D}/usr/share/pixmaps
+ install -m 0644 ${S}/gpe-mini-browser.png ${D}/usr/share/pixmaps/gpe-mini-browser.png
+ autotools_do_install
+}
+
+pkg_postinst_${PN}-doc () {
+ #!/bin/sh
+ if [ "x$D" != "x" ]; then
+ if [ -e /etc/gpe/gpe-help.conf ]; then
+ echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
+ else
+ echo [Help] >> /etc/gpe/gpe-help.conf
+ echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
+ fi
+ if [ -x /usr/bin/gpe-helpindex ]; then
+ echo generating help-index
+ gpe-helpindex
+ else
+ echo not generating index for gpe-mini-browser
+ fi
+ fi
+}
+
+pkg_postrm_${PN}-doc () {
+ #!/bin/sh
+ if [ -e /etc/gpe/gpe-help.conf ]; then
+ sed '/^\<gpe-mini-browser\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf
+ mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf
+ fi
+ if [ -x /usr/bin/gpe-helpindex ]; then
+ echo generating help-index
+ gpe-helpindex
+ else
+ echo not generating index for gpe-mini-browser
+ fi
+}
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
index 5dcf78cb0d..2745e5f8a9 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
@@ -1,9 +1,9 @@
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz"
DESCRIPTION = "A lightweight webbrowser for the GPE platform"
LICENSE = "GPL"
-DEPENDS = "osb-nrcit"
+DEPENDS = "osb-nrcit libgpewidget"
S = "${WORKDIR}/gpe-mini-browser-${PV}"
diff --git a/packages/gstreamer/gst-plugins_0.8.7.bb b/packages/gstreamer/gst-plugins_0.8.7.bb
index 517f28359f..430830e392 100644
--- a/packages/gstreamer/gst-plugins_0.8.7.bb
+++ b/packages/gstreamer/gst-plugins_0.8.7.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Plugins for GStreamer"
SECTION = "x11/libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r2"
+PR = "r3"
DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
@@ -14,7 +14,8 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.ta
EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \
--disable-artsc --disable-jack --disable-libfame --disable-sdl --disable-shout2 \
- --disable-gnome_vfs --disable-gconf --disable-libcaca --disable-directfb "
+ --disable-gnome_vfs --disable-gconf --disable-libcaca --disable-directfb \
+ --disable-cairo"
inherit autotools pkgconfig gconf
diff --git a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
new file mode 100644
index 0000000000..34e1212694
--- /dev/null
+++ b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
@@ -0,0 +1,23 @@
+SECTION = "x11/base"
+DESCRIPTION = "Clearlooks theme engine for GTK"
+MAINTAINER = "Koen Kooi <koenhandhelds.org>"
+LICENSE = "GPL2"
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/clearlooks/clearlooks-0.6.2.tar.bz2"
+
+S = "${WORKDIR}/clearlooks-${PV}"
+
+PACKAGES += "gtk-theme-clearlooks"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so"
+FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_gtk-theme-clearlooks = "${datadir}/icons ${datadir}/themes"
+
+inherit autotools
+
+do_configure_prepend() {
+ for i in `ls gtk-common`; do
+ ln -sf ../gtk-common/$i gtk2-engine/$i
+ done
+}
+
diff --git a/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb b/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
index 43b64aa005..8c5efa8622 100644
--- a/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
+++ b/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.cgabriel.org/sw/gtk2-ssh-askpass/"
LICENSE = "GPL"
SECTION = "net-misc"
-SRC_URI="http://www.cgabriel.org/sw/gtk2-ssh-askpass/gtk2-ssh-askpass-${PV}.tar.gz \
+SRC_URI="http://src.gentoo.pl/distfiles/gtk2-ssh-askpass-${PV}.tar.gz \
file://makefile.patch;patch=1"
DEPENDS="gtk+"
diff --git a/packages/ifupdown/ifupdown_0.6.4.bb b/packages/ifupdown/ifupdown_0.6.4.bb
index 81490eda01..0d37223eaf 100644
--- a/packages/ifupdown/ifupdown_0.6.4.bb
+++ b/packages/ifupdown/ifupdown_0.6.4.bb
@@ -1,3 +1,6 @@
+BROKEN = "1"
+# Debian moved to 0.6.7
+
DESCRIPTION = "High level tools to configure network interfaces \
This package provides the tools ifup and ifdown which may be used to \
configure (or, respectively, deconfigure) network interfaces, based on \
diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
index 85a194b850..dbfde00053 100755
--- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
+++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
@@ -30,7 +30,7 @@ keycode 13 =
keycode 14 = BackSpace
altgr keycode 14 = Delete
keycode 15 = Tab
- shift keycode 65 = Caps_Lock
+ altgr keycode 15 = Caps_Lock
keycode 16 = q
keycode 17 = w
altgr keycode 17 = asciicircum
@@ -143,71 +143,71 @@ string Prior = "\033[5~"
string Next = "\033[6~"
string Macro = "\033[M"
string Pause = "\033[P"
-compose '`' 'A' to '�
-compose '`' 'a' to '�
-compose '\'' 'A' to '�
-compose '\'' 'a' to '�
-compose '^' 'A' to '�
-compose '^' 'a' to '�
-compose '~' 'A' to '�
-compose '~' 'a' to '�
-compose '"' 'A' to '�
-compose '"' 'a' to '�
-compose 'O' 'A' to '�
-compose 'o' 'a' to '�
-compose '0' 'A' to '�
-compose '0' 'a' to '�
-compose 'A' 'A' to '�
-compose 'a' 'a' to '�
-compose 'A' 'E' to '�
-compose 'a' 'e' to '�
-compose ',' 'C' to '�
-compose ',' 'c' to '�
-compose '`' 'E' to '�
-compose '`' 'e' to '�
-compose '\'' 'E' to '�
-compose '\'' 'e' to '�
-compose '^' 'E' to '�
-compose '^' 'e' to '�
-compose '"' 'E' to '�
-compose '"' 'e' to '�
-compose '`' 'I' to '�
-compose '`' 'i' to '�
-compose '\'' 'I' to '�
-compose '\'' 'i' to '�
-compose '^' 'I' to '�
-compose '^' 'i' to '�
-compose '"' 'I' to '�
-compose '"' 'i' to '�
-compose '-' 'D' to '�
-compose '-' 'd' to '�
-compose '~' 'N' to '�
-compose '~' 'n' to '�
-compose '`' 'O' to '�
-compose '`' 'o' to '�
-compose '\'' 'O' to '�
-compose '\'' 'o' to '�
-compose '^' 'O' to '�
-compose '^' 'o' to '�
-compose '~' 'O' to '�
-compose '~' 'o' to '�
-compose '"' 'O' to '�
-compose '"' 'o' to '�
-compose '/' 'O' to '�
-compose '/' 'o' to ''
-compose '`' 'U' to '�
-compose '`' 'u' to ''
-compose '\'' 'U' to '�
-compose '\'' 'u' to ''
-compose '^' 'U' to '�
-compose '^' 'u' to ''
-compose '"' 'U' to '�
-compose '"' 'u' to ''
-compose '\'' 'Y' to '�
-compose '\'' 'y' to ''
-compose 'T' 'H' to '�
-compose 't' 'h' to ''
-compose 's' 's' to '�
-compose '"' 'y' to ''
-compose 's' 'z' to '�
-compose 'i' 'j' to ''
+compose '`' 'A' to 'À'
+compose '`' 'a' to 'à'
+compose '\'' 'A' to 'Á'
+compose '\'' 'a' to 'á'
+compose '^' 'A' to 'Â'
+compose '^' 'a' to 'â'
+compose '~' 'A' to 'Ã'
+compose '~' 'a' to 'ã'
+compose '"' 'A' to 'Ä'
+compose '"' 'a' to 'ä'
+compose 'O' 'A' to 'Å'
+compose 'o' 'a' to 'å'
+compose '0' 'A' to 'Å'
+compose '0' 'a' to 'å'
+compose 'A' 'A' to 'Å'
+compose 'a' 'a' to 'å'
+compose 'A' 'E' to 'Æ'
+compose 'a' 'e' to 'æ'
+compose ',' 'C' to 'Ç'
+compose ',' 'c' to 'ç'
+compose '`' 'E' to 'È'
+compose '`' 'e' to 'è'
+compose '\'' 'E' to 'É'
+compose '\'' 'e' to 'é'
+compose '^' 'E' to 'Ê'
+compose '^' 'e' to 'ê'
+compose '"' 'E' to 'Ë'
+compose '"' 'e' to 'ë'
+compose '`' 'I' to 'Ì'
+compose '`' 'i' to 'ì'
+compose '\'' 'I' to 'Í'
+compose '\'' 'i' to 'í'
+compose '^' 'I' to 'Î'
+compose '^' 'i' to 'î'
+compose '"' 'I' to 'Ï'
+compose '"' 'i' to 'ï'
+compose '-' 'D' to 'Ð'
+compose '-' 'd' to 'ð'
+compose '~' 'N' to 'Ñ'
+compose '~' 'n' to 'ñ'
+compose '`' 'O' to 'Ò'
+compose '`' 'o' to 'ò'
+compose '\'' 'O' to 'Ó'
+compose '\'' 'o' to 'ó'
+compose '^' 'O' to 'Ô'
+compose '^' 'o' to 'ô'
+compose '~' 'O' to 'Õ'
+compose '~' 'o' to 'õ'
+compose '"' 'O' to 'Ö'
+compose '"' 'o' to 'ö'
+compose '/' 'O' to 'Ø'
+compose '/' 'o' to 'ø'
+compose '`' 'U' to 'Ù'
+compose '`' 'u' to 'ù'
+compose '\'' 'U' to 'Ú'
+compose '\'' 'u' to 'ú'
+compose '^' 'U' to 'Û'
+compose '^' 'u' to 'û'
+compose '"' 'U' to 'Ü'
+compose '"' 'u' to 'ü'
+compose '\'' 'Y' to 'Ý'
+compose '\'' 'y' to 'ý'
+compose 'T' 'H' to 'Þ'
+compose 't' 'h' to 'þ'
+compose 's' 's' to 'ß'
+compose '"' 'y' to 'ÿ'
+compose 's' 'z' to 'ß'
+compose 'i' 'j' to 'ÿ'
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 5e7d6fe44c..bf60cec12f 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
DEPENDS_openzaurus = "makedevs virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r52"
+PR = "r53"
SRC_URI = "file://halt \
file://ramdisk \
diff --git a/packages/ion/ion3_0.0+ds20041104.bb b/packages/ion/ion3_0.0+ds20041104.bb
index cef2d2acd7..81af3169fd 100644
--- a/packages/ion/ion3_0.0+ds20041104.bb
+++ b/packages/ion/ion3_0.0+ds20041104.bb
@@ -1,3 +1,6 @@
+BROKEN = "1"
+# is unfetchable now - upstream updated to 20050728
+
DEPENDS += "lua-native lua x11 xext"
DESCRIPTION = "Ion is a tiling tabbed window manager designed with keyboard \
users in mind."
diff --git a/packages/libgsf/libgsf_1.12.1.bb b/packages/libgsf/libgsf_1.12.1.bb
new file mode 100644
index 0000000000..310d922d6e
--- /dev/null
+++ b/packages/libgsf/libgsf_1.12.1.bb
@@ -0,0 +1,47 @@
+LICENSE = "GPL"
+SECTION = "libs"
+PR = "r0"
+
+DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs"
+
+PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
+
+FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*"
+FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome"
+
+inherit autotools pkgconfig gnome
+
+libgsf_includes = "gsf-doc-meta-data.h gsf-infile.h gsf-input-textline.h \
+ gsf-outfile-zip.h gsf-output-stdio.h gsf-impl-utils.h \
+ gsf-input-bzip.h gsf-input.h gsf-outfile.h gsf-output.h \
+ gsf-infile-impl.h gsf-input-gzip.h gsf-libxml.h \
+ gsf-output-bzip.h gsf-structured-blob.h gsf-infile-msole.h \
+ gsf-input-impl.h gsf-msole-utils.h gsf-output-gzip.h \
+ gsf-timestamp.h gsf-infile-msvba.h gsf-input-iochannel.h \
+ gsf-outfile-impl.h gsf-output-impl.h gsf-utils.h \
+ gsf-infile-stdio.h gsf-input-memory.h gsf-outfile-msole.h \
+ gsf-output-iochannel.h gsf.h gsf-infile-zip.h gsf-input-stdio.h \
+ gsf-outfile-stdio.h gsf-output-memory.h gsf-output-csv.h \
+ gsf-output-iconv.h "
+
+libgsf_gnome_includes = "gsf-input-gnomevfs.h \
+ gsf-output-gnomevfs.h \
+ gsf-input-bonobo.h \
+ gsf-output-bonobo.h \
+ gsf-shared-bonobo-stream.h"
+
+do_stage() {
+ oe_libinstall -so -C gsf libgsf-1 ${STAGING_LIBDIR}
+
+ mkdir -p ${STAGING_INCDIR}/libgsf-1/gsf/
+ for i in ${libgsf_includes}; do
+ install -m 0644 gsf/$i ${STAGING_INCDIR}/libgsf-1/gsf/$i
+ done
+
+ oe_libinstall -so -C gsf-gnome libgsf-gnome-1 ${STAGING_LIBDIR}
+
+ mkdir -p ${STAGING_INCDIR}/libgsf-1/gsf-gnome/
+ for i in ${libgsf_gnome_includes}; do
+ install -m 0644 gsf-gnome/$i ${STAGING_INCDIR}/libgsf-1/gsf-gnome/$i
+ done
+}
diff --git a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
index 9bf400a9f7..c0b3bf2742 100644
--- a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
+++ b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
@@ -1,3 +1,6 @@
+BROKEN = "1"
+#linux-2.6.5-gnalm1-gum0.patch is not fetchable
+
SECTION = "kernel"
DESCRIPTION = "Linux kernel for OMAP processors"
LICENSE = "GPL"
diff --git a/packages/mailx/mailx_8.1.2-0.20040524cvs.bb b/packages/mailx/mailx_8.1.2-0.20040524cvs.bb
index bf2a3d4640..18ef830a08 100644
--- a/packages/mailx/mailx_8.1.2-0.20040524cvs.bb
+++ b/packages/mailx/mailx_8.1.2-0.20040524cvs.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "mailx is the traditional command-line-mode \
mail user agent."
LICENSE = "GPL"
SRC_URI = "${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}.orig.tar.gz \
- ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-1.diff.gz;patch=1 \
+ ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-4.diff.gz;patch=1 \
file://install.patch;patch=1"
S = "${WORKDIR}/mailx-${PV}.orig"
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index 17b9c66653..fc0e9854ed 100644
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -1,5 +1,5 @@
-PR = "r6"
+PR = "r7"
PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme
DESCRIPTION = "Meta-package for maemo environment"
MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
@@ -84,7 +84,8 @@ maemo-task-apps = "\
osso-app-killer \
osso-screenshot-tool \
gpe-todo-hildon \
- gpe-contacts-hildon"
+ gpe-contacts-hildon \
+ gpe-mini-browser-hildon"
RDEPENDS_maemo-task-apps := "${maemo-task-apps}"
DEPENDS += " ${maemo-task-apps}"
diff --git a/packages/totem/totem-0.101/.mtn2git_empty b/packages/totem/totem-0.101/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/totem/totem-0.101/.mtn2git_empty
diff --git a/packages/totem/totem-0.101/include.patch b/packages/totem/totem-0.101/include.patch
new file mode 100644
index 0000000000..6e99c4e21e
--- /dev/null
+++ b/packages/totem/totem-0.101/include.patch
@@ -0,0 +1,11 @@
+--- totem-0.99.15/src/video-utils.c 2004-07-03 16:54:31.000000000 -0700
++++ totem-0.99.15.new/src/video-utils.c 2004-08-04 11:03:30.822669856 -0700
+@@ -4,7 +4,7 @@
+ #include "video-utils.h"
+
+ #include <glib/gi18n.h>
+-#include <libintl.h>
++/* #include <libintl.h> */
+
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
diff --git a/packages/totem/totem-0.101/omf.patch b/packages/totem/totem-0.101/omf.patch
new file mode 100644
index 0000000000..a889db10ba
--- /dev/null
+++ b/packages/totem/totem-0.101/omf.patch
@@ -0,0 +1,13 @@
+--- totem-0.99.12/omf.make 2003-11-08 18:04:41.000000000 -0700
++++ totem-0.99.12.new/omf.make 2004-06-30 09:39:58.765495480 -0700
+@@ -41,7 +41,9 @@
+ install-data-hook-omf:
+ $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ for file in $(omffile); do \
+- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++ if [ -f $$file.out ]; then \
++ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++ fi; \
+ done
+ -scrollkeeper-update -o $(DESTDIR)$(omf_dest_dir)
+
diff --git a/packages/totem/totem_0.101.bb b/packages/totem/totem_0.101.bb
new file mode 100644
index 0000000000..e78ce09043
--- /dev/null
+++ b/packages/totem/totem_0.101.bb
@@ -0,0 +1,34 @@
+BROKEN = "1"
+# do_configure() broken with:
+# No package 'libnautilus-burn' found
+
+SECTION = "x11/multimedia"
+# totem OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="A GTK2 based media player"
+HOMEPAGE="http://www.hadess.net/totem.php3"
+LICENSE="GPL"
+
+SRC_URI="http://www.hadess.net/files/software/totem/totem-${PV}.tar.gz \
+ file://include.patch;patch=1 \
+ file://omf.patch;patch=1"
+
+DEPENDS="gtk+ libglade gnome-vfs gconf libxine libgnomeui"
+RDEPENDS += " libgnomeui"
+
+inherit autotools
+
+EXTRA_OECONF="--disable-schemas-install --disable-nvtv --enable-gtk --disable-debug --disable-gstreamer --disable-mozilla"
+
+#SELECTED_OPTIMIZATION="-O0 -g"
+LDFLAGS_append = " -Wl,--export-dynamic"
+
+pkg_postinst_totem() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi;
+SOURCE=`gconftool-2 --get-default-source`
+GCONF_CONFIG_SOURCE=$SOURCE gconftool-2 --makefile-install-rule \
+/etc/gconf/schemas/totem.schemas > /dev/null
+}
diff --git a/packages/totem/totem_0.99.15.bb b/packages/totem/totem_0.99.15.bb
index aaf956917f..807eee4023 100644
--- a/packages/totem/totem_0.99.15.bb
+++ b/packages/totem/totem_0.99.15.bb
@@ -7,7 +7,7 @@ DESCRIPTION="A GTK2 based media player"
HOMEPAGE="http://www.hadess.net/totem.php3"
LICENSE="GPL"
-SRC_URI="http://www.hadess.net/files/software/totem/totem-${PV}.tar.gz \
+SRC_URI="http://ftp.acc.umu.se/pub/GNOME/sources/totem/0.99/totem-${PV}.tar.gz \
file://include.patch;patch=1 \
file://omf.patch;patch=1"
diff --git a/packages/tslib/tslib/ipaq-pxa270/.mtn2git_empty b/packages/tslib/tslib/ipaq-pxa270/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/ipaq-pxa270/.mtn2git_empty
diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
new file mode 100644
index 0000000000..72ebcba7c2
--- /dev/null
+++ b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index b5d073c8e7..535ff89ee4 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -40,7 +40,7 @@ do_install_append() {
install -d ${D}${sysconfdir}/profile.d/
install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
case ${MACHINE} in
- h3600 | h3900 | h1940)
+ h3600 | h3900 | h1940 | ipaq-pxa270)
install -d ${D}${datadir}/tslib
for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200; do
install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb
index efb80ae9be..3caa8cb70f 100644
--- a/packages/xscreensaver/xscreensaver_4.16.bb
+++ b/packages/xscreensaver/xscreensaver_4.16.bb
@@ -2,6 +2,9 @@
# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
# Released under the MIT license (see packages/COPYING)
+BROKEN = "1"
+# upstream is at 4.22 now - patches do not apply
+
SRC_URI="http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
file://fixes.patch;patch=1 \
file://configure.patch;patch=1 \
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index 534772e91f..53b704e362 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -42,9 +42,11 @@ SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \
file://disable-apm.patch;patch=1"
SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1"
+SRC_URI_append_ipaq-pxa270 = " file://disable-apm.patch;patch=1"
PACKAGE_ARCH_poodle = "poodle"
PACKAGE_ARCH_c7x0 = "c7x0"
+PACKAGE_ARCH_ipaq-pxa270 = "ipaq-pxa270"
S = "${WORKDIR}/xserver"