merge of 4b8efd8ea23df73f8397284e81b3d7ba92173f77

     and b17f8aca9921dd6c79812ee173e34e711b252634

4 files changed, 82 insertions, 1 deletions

diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb
new file mode 100644
index 0000000000..4a09fb827d
--- /dev/null
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb
@@ -0,0 +1,51 @@
+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 sqlite libgpewidget"
+RRECOMMENDS =   "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
+
+
+S = "${WORKDIR}/gpe-mini-browser-${PV}"
+
+inherit autotools
+
+do_install() {
+		install -d ${D}/usr/share/applications
+		install -m 0644 ${S}/gpe-mini-browser.desktop ${D}/usr/share/applications/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/librsvg/librsvg_2.11.1.bb b/packages/librsvg/librsvg_2.11.1.bb
new file mode 100644
index 0000000000..7ccec5fa07
--- /dev/null
+++ b/packages/librsvg/librsvg_2.11.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Library for rendering SVG files"
+SECTION = "x11/utils"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt"
+LICENSE = "LGPL"
+PR = "r0"
+
+inherit autotools pkgconfig gnome
+
+PACKAGES =+ "librsvg-gtk librsvg-gtk-dev rsvg"
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_rsvg = "${bindir}/rsvg ${bindir}/rsvg-view ${datadir}/pixmaps/svg-viewer.svg"
+FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
+FILES_librsvg-gtk-dev = "${libdir}/gtk-2.0"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/qte/qte-2.3.10/simpad-defaultkbd.patch b/packages/qte/qte-2.3.10/simpad-defaultkbd.patch
new file mode 100644
index 0000000000..3e5450a4da
--- /dev/null
+++ b/packages/qte/qte-2.3.10/simpad-defaultkbd.patch
@@ -0,0 +1,11 @@
+--- qt-2.3.10/src/kernel/qwindowsystem_qws.cpp.orig	2005-11-30 10:53:32.000000000 +0100
++++ qt-2.3.10/src/kernel/qwindowsystem_qws.cpp	2005-11-30 10:55:51.000000000 +0100
+@@ -2917,7 +2917,7 @@
+ {
+     QString keyboards = getenv("QWS_KEYBOARD");
+     if ( keyboards.isEmpty() ) {
+-#if defined( QT_QWS_CASSIOPEIA )
++#if defined( QT_QWS_CASSIOPEIA ) || defined( QT_QWS_SIMPAD )
+ 	keyboards = "Buttons";
+ #elif !defined(QT_NO_QWS_VFB)
+ 	extern bool qvfbEnabled;
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 32a41d207a..e247431282 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -7,7 +7,7 @@ DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 DEPENDS_mnci = "zlib libpng jpeg uicmoc-native"
 DEPENDS_append_c7x0 = " sharp-aticore-oss"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r27"
+PR = "r28"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5=1f7ad30113afc500cab7f5b2f4dec0d7 \
    	   file://qpe.patch;patch=1 \
@@ -33,6 +33,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
 	   file://key.patch;patch=1 \
        file://bidimetrics.patch;patch=5 \
 	   file://fix-native-build.patch;patch=1 \
+	   file://simpad-defaultkbd.patch;patch=1 \
 	   file://sharp_char.h \
 	   file://switches.h "