merge of '06296810795c121aba4a5607d1e6e154bec0c768'

     and 'eb7e5bf33c6692e556183f311e95eb606e10c626'

8 files changed, 37 insertions, 15 deletions

diff --git a/packages/gpe-conf/gpe-conf_0.2.4.bb b/packages/gpe-conf/gpe-conf_0.2.4.bb
index deea518a86..4a45b599a1 100644
--- a/packages/gpe-conf/gpe-conf_0.2.4.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.4.bb
@@ -4,10 +4,10 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client"
-RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones"
+RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
-PR = "r0"
+PR = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-conf/gpe-conf_svn.bb b/packages/gpe-conf/gpe-conf_svn.bb
index e4675ecfae..f3782ef0ac 100644
--- a/packages/gpe-conf/gpe-conf_svn.bb
+++ b/packages/gpe-conf/gpe-conf_svn.bb
@@ -5,13 +5,13 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons"
-RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons"
+DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ntp gpe-login gpe-icons"
+RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
 inherit autotools gpe
 
-PV = "0.2.2+svn${SRCDATE}"
+PV = "0.2.5+svn${SRCDATE}"
 PR = "r0"
 
 SRC_URI = "${GPE_SVN}"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index 583fe2f7e3..3596e4e6cd 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -4,14 +4,14 @@ DESCRIPTION = "GPE session startup scripts"
 LICENSE = "GPL"
 SECTION = "gpe"
 PRIORITY = "optional"
-RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common"
-# more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common"
+RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep"
+# more rdepends: keylaunch apmd blueprobe
+DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep"
 
 SRC_URI += "file://matchbox-session \
 	file://disable-composite.xsettings"
 
-PR = "r6"
+PR = "r7"
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
diff --git a/packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty b/packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty
diff --git a/packages/gpephone/gpe-applauncher-0.7/default-icon.patch b/packages/gpephone/gpe-applauncher-0.7/default-icon.patch
new file mode 100644
index 0000000000..e1ec24f141
--- /dev/null
+++ b/packages/gpephone/gpe-applauncher-0.7/default-icon.patch
@@ -0,0 +1,20 @@
+Index: applications.c
+===================================================================
+--- applications.c	(Revision 598)
++++ applications.c	(Arbeitskopie)
+@@ -463,8 +463,13 @@
+                                          applauncher_settings.themename ? applauncher_settings.themename : "default",
+                                          THEMEFOLDER, ICON_LOADING, NULL);
+               }
+-             
+-            g_print ("\nloading icon: %s\n", file);
++              
++            if (!g_file_test (file, G_FILE_TEST_EXISTS))
++              {
++                g_free (file);
++                file = g_build_filename (LOCAL_THEMEDIR, "default",
++                                         THEMEFOLDER, ICON_LOADING, NULL);
++              }
+                 
+             nc_window = gtk_app_notification_new();
+             gtk_widget_set_size_request(GTK_WIDGET(nc_window), -1, 70);
diff --git a/packages/gpephone/gpe-applauncher_0.7.bb b/packages/gpephone/gpe-applauncher_0.7.bb
index ae6cd31d9a..349330047b 100644
--- a/packages/gpephone/gpe-applauncher_0.7.bb
+++ b/packages/gpephone/gpe-applauncher_0.7.bb
@@ -2,13 +2,15 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r0"
+PR          = "r1"
 
 DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-client"
 
 GPE_TARBALL_SUFFIX= "gz"
 inherit gpephone autotools
 
+SRC_URI += " file://default-icon.patch;patch=1;pnum=0"
+
 #EXTRA_OECONF = "--enable-gridlayout"
 
 FILES_${PN} += '${datadir}/themes'
diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession
index b08aa74dbc..8fb5065d67 100755
--- a/packages/gpephone/gpe-session-scripts-phone/phonesession
+++ b/packages/gpephone/gpe-session-scripts-phone/phonesession
@@ -45,8 +45,8 @@ soundserver &
 
 # Run GSM support stuff
 
-cms92init &
+#cms92init &
 gsmMux -d -p /dev/ttyS0 -m cms92 -f 128 -b 115200 -c /dev/ptmx /dev/ptmx &
 
 # Start PhoneServer
-phoneserver &
+phoneserver
diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index beb1b360ad..afa4fb1683 100644
--- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "GPE session startup scripts hack for GPE Phone Edition"
 LICENSE = "GPL"
 SECTION = "gpe"
 PRIORITY = "optional"
-RDEPENDS_${PN} = "gpe-applauncher gpe-phonepanel gpe-session-starter gpe-question xmodmap xdpyinfo xserver-common"
-DEPENDS = "matchbox-wm gpe-applauncher gpe-phonepanel gpe-question xmodmap xdpyinfo xserver-common"
+RDEPENDS_${PN} = "gpe-applauncher gpe-phonepanel gpe-session-starter gpe-question xmodmap xdpyinfo xserver-common esd esd-utils"
+DEPENDS = "matchbox-wm gpe-applauncher gpe-phonepanel gpe-question xmodmap xdpyinfo xserver-common esound"
 
 SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
            file://matchbox-session \
@@ -13,7 +13,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
            file://phonesession \
 	   file://disable-composite.xsettings"
 
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"