merge of 1de0fd1842b598a87e5a45127325beb9643793a4

     and aff5a7a57c5f19ed3d9fe9c0e2cee65bbadb6041

10 files changed, 83 insertions, 33 deletions

diff --git a/conf/distro/unslung-packages.conf b/conf/distro/unslung-packages.conf
index 4cef102535..e889a65df5 100644
--- a/conf/distro/unslung-packages.conf
+++ b/conf/distro/unslung-packages.conf
@@ -1,4 +1,3 @@
-# automatically generated by bitbake freeze
 BBFILES := "\
 ${PKGDIR}/packages/autoconf/*.bb \
 ${PKGDIR}/packages/automake/*.bb \
@@ -8,6 +7,7 @@ ${PKGDIR}/packages/busybox/*.bb \
 ${PKGDIR}/packages/cpio/*.bb \
 ${PKGDIR}/packages/devio/*.bb \
 ${PKGDIR}/packages/fakeroot/*.bb \
+${PKGDIR}/packages/file/*.bb \
 ${PKGDIR}/packages/findutils/*.bb \
 ${PKGDIR}/packages/flex/*.bb \
 ${PKGDIR}/packages/freeze/*.bb \
diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb
index 7b2237ae5d..46627d826d 100644
--- a/packages/fontconfig/fontconfig_2.2.95.bb
+++ b/packages/fontconfig/fontconfig_2.2.95.bb
@@ -5,9 +5,8 @@ DEPENDS = "expat freetype freetype-native zlib fontconfig-native"
 
 SRC_URI = "http://pdx.freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \
            file://fc-glyphname.patch;patch=1 \
-           file://fc-lang.patch;patch=1 \
-	   file://local.conf"
-PR = "r2"
+           file://fc-lang.patch;patch=1"
+PR = "r3"
 
 PACKAGES =+ "fontconfig-utils"
 FILES_fontconfig-utils = "${bindir}/*"
@@ -30,6 +29,5 @@ do_stage () {
 
 do_install () {
 	autotools_do_install
-	install -m 0644 ${WORKDIR}/local.conf ${D}${sysconfdir}/fonts/local.conf
 }
 
diff --git a/packages/gpe-login/gpe-login_0.76.bb b/packages/gpe-login/gpe-login_0.76.bb
deleted file mode 100644
index c25ddabb00..0000000000
--- a/packages/gpe-login/gpe-login_0.76.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd"
-RPROVIDES = "gpe-session-starter"
-PR = "r1"
-
-SRC_URI += "file://pre-session.patch;patch=1 \
-	    file://user-own-collie-devs.patch;patch=1"
diff --git a/packages/gpe-login/gpe-login_0.86.bb b/packages/gpe-login/gpe-login_0.86.bb
new file mode 100644
index 0000000000..093c291134
--- /dev/null
+++ b/packages/gpe-login/gpe-login_0.86.bb
@@ -0,0 +1,19 @@
+LICENSE = "GPL"
+inherit gpe
+
+DESCRIPTION = "GPE user login screen"
+SECTION     = "gpe"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS    = "xkbd"
+RPROVIDES   = "gpe-session-starter"
+PR = "r0"
+
+#apply a patch to set the fontsize for bigdpi (200+) devices to 5
+SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_borzoi = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
+
diff --git a/packages/matchbox-common/matchbox-common/.mtn2git_empty b/packages/matchbox-common/matchbox-common/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-common/matchbox-common/.mtn2git_empty
diff --git a/packages/matchbox-common/matchbox-common/no-utilities-category.patch b/packages/matchbox-common/matchbox-common/no-utilities-category.patch
new file mode 100644
index 0000000000..6801533ac3
--- /dev/null
+++ b/packages/matchbox-common/matchbox-common/no-utilities-category.patch
@@ -0,0 +1,7 @@
+--- matchbox-common-0.9.1.orig/data/vfolders-pda/Root.order	2006-02-03 22:26:55.000000000 +0100
++++ matchbox-common-0.9.1/data/vfolders-pda/Root.order	2006-02-03 22:32:08.000000000 +0100
+@@ -1,4 +1,3 @@
+-Utilities
+ Games
+ Settings
+ Other
diff --git a/packages/matchbox-common/matchbox-common_0.9.1.bb b/packages/matchbox-common/matchbox-common_0.9.1.bb
index 2927ccd08f..27c2bdf508 100644
--- a/packages/matchbox-common/matchbox-common_0.9.1.bb
+++ b/packages/matchbox-common/matchbox-common_0.9.1.bb
@@ -2,8 +2,10 @@ SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager common files"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox"
+PR = "r1"
 
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz"
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
+           file://no-utilities-category.patch;patch=1"
 
 inherit autotools  pkgconfig
 
diff --git a/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb
new file mode 100644
index 0000000000..4163c0c4a7
--- /dev/null
+++ b/packages/pango/pango_1.8.2.bb
@@ -0,0 +1,49 @@
+LICENSE = "LGPL"
+SECTION = "x11/libs"
+# Xt needed to keep autoconf's check for X11 happy
+DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc"
+DESCRIPTION = "The goal of the Pango project is to provide an \
+Open Source framework for the layout and rendering of \
+internationalized text."
+PR = "r0"
+
+# seems to go wrong with default cflags
+FULL_OPTIMIZATION_arm = "-O2"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/pango-${PV}.tar.bz2 \
+	   file://no-tests.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest \
+		--enable-explicit-deps=no \
+	        --disable-debug"
+
+FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
+
+LIBV = "1.4.0"
+
+do_stage () {
+	for lib in pango pangox pangoft2 pangoxft; do
+		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
+	done
+	install -d ${STAGING_INCDIR}/pango
+	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
+}
+
+postinst_prologue() {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+}
+
+PACKAGES_DYNAMIC = "pango-module-*"
+
+python populate_packages_prepend () {
+	prologue = bb.data.getVar("postinst_prologue", d, 1)
+
+	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
+
+	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
+}
diff --git a/packages/xserver-common/xserver-common_1.1.bb b/packages/xserver-common/xserver-common_1.1.bb
deleted file mode 100644
index 76bd376365..0000000000
--- a/packages/xserver-common/xserver-common_1.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r3"
-
-# we are using a gpe-style Makefile
-inherit gpe
-
-SRC_URI += "file://cxk-rotation.patch;patch=1"
\ No newline at end of file
diff --git a/packages/xserver-common/xserver-common_1.2.bb b/packages/xserver-common/xserver-common_1.7.bb
index 343abe9258..a825ddf6de 100644
--- a/packages/xserver-common/xserver-common_1.2.bb
+++ b/packages/xserver-common/xserver-common_1.7.bb
@@ -4,7 +4,8 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r0"
+
 
 # we are using a gpe-style Makefile
 inherit gpe
-