merge of '3d49f3c12ce537f3ff8637c42ffd33a7b7afb27f'

     and 'bc07881d61476e6cb24c670f87e81bdda9ebc462'

8 files changed, 51 insertions, 15 deletions

diff --git a/packages/gpe-session-scripts/files/angstrom/matchbox-session b/packages/gpe-session-scripts/files/angstrom/matchbox-session
index b0bec8c742..d48b9ed308 100644
--- a/packages/gpe-session-scripts/files/angstrom/matchbox-session
+++ b/packages/gpe-session-scripts/files/angstrom/matchbox-session
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
-
-  matchbox-desktop &
-
-matchbox-panel --no-flip  --orientation south &
+#XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
 
+matchbox-desktop &
+matchbox-panel --no-flip --orientation south &
diff --git a/packages/gpe-session-scripts/files/matchbox-session b/packages/gpe-session-scripts/files/matchbox-session
index e4c0e0c68e..77d5db9df8 100644
--- a/packages/gpe-session-scripts/files/matchbox-session
+++ b/packages/gpe-session-scripts/files/matchbox-session
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
-
-  matchbox-desktop &
-
-MB_MENU_PANEL_DISABLED=1 matchbox-panel  --orientation south &
+#XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
 
+matchbox-desktop &
+MB_MENU_PANEL_DISABLED=1 matchbox-panel --orientation south &
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 b8d91538c6..bab26e7df0 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -11,7 +11,7 @@ DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputm
 SRC_URI += "file://matchbox-session \
 	file://disable-composite.xsettings"
 
-PR = "r10"
+PR = "r11"
 
 #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/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
index ca048155c9..8d4ede20af 100644
--- a/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DESCRIPTION = "Transparent xcursor theme for handheld systems"
 SECTION = "x11/base"
-PR="r1"
+PR="r2"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
 	   file://use-relative-symlinks.patch;patch=1 \
@@ -9,3 +9,5 @@ SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent
 FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
 
 inherit autotools
+
+PACKAGE_ARCH = "all"
diff --git a/packages/xcursor-transparent-theme/xcursor-watchonly-theme/.mtn2git_empty b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/.mtn2git_empty
diff --git a/packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent
new file mode 100755
index 0000000000..6fa068214e
--- /dev/null
+++ b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Only if there's no mouse at all, we use use transparent cursors
+# for stylus use comfort.
+if ! ls /dev/input/mouse* >/dev/null 2>&1; then
+    echo "Xcursor.theme: xcursor-transparent" | xrdb -merge -nocpp
+fi
diff --git a/packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch
new file mode 100644
index 0000000000..5c13fa885a
--- /dev/null
+++ b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch
@@ -0,0 +1,23 @@
+diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
+--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am	2003-10-30 13:13:59.000000000 +0100
++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am	2005-12-20 23:35:17.000000000 +0100
+@@ -79,7 +79,6 @@
+ 	ul_angle \
+ 	ur_angle \
+ 	v_double_arrow \
+-	watcha \
+ 	xterm  
+ 
+ CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
+diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in xcursor-transparent-theme-0.1.1/cursors/Makefile.in
+--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in	2003-10-31 15:31:13.000000000 +0100
++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.in	2005-12-20 23:35:36.000000000 +0100
+@@ -67,7 +67,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
+-CURSOR_NAMES =  	00008160000006810000408080010102 	028006030e0e7ebffc7f7070c0600140 	03b6e0fcb3499374a867c041f52298f0 	08e8e1c95fe2fc01f976f1e063a24ccd 	14fef782d02440884392942c11205230 	2870a09082c103050810ffdffffe0204 	3ecb610c1bf2410f44200f48c40d3599 	4498f0e0c1937ffe01fd06f973665830 	9d800788f1b08800ae810202380a0822 	c7088f0f3e6c8088236ef8e1e3e70000 	d9ce0ab605698f320427677b458ad60b 	e29285e634086352946a0e7090d73106 	fcf1c3c7cd4491d801f1e1c78f100000 	X_cursor 	arrow 	base_arrow_down 	base_arrow_up 	based_arrow_down 	based_arrow_up 	bd_double_arrow 	boat 	bottom_left_corner 	bottom_right_corner 	bottom_side 	bottom_tee 	center_ptr 	circle 	cross 	cross_reverse 	crossed_circle 	crosshair 	dot 	dot_box_mask 	dotbox 	double_arrow 	draft_large  	draft_small  	draped_box   	exchange     	fd_double_arrow 	fleur 	gumby 	h_double_arrow 	hand 	hand1 	hand2 	left_ptr 	left_ptr_watch 	left_side 	left_tee  	ll_angle  	lr_angle  	move      	pencil    	pirate    	plus      	question_arrow 	right_ptr      	right_side     	right_tee      	sailboat       	sb_down_arrow  	sb_h_double_arrow 	sb_left_arrow 	sb_right_arrow 	sb_up_arrow 	sb_v_double_arrow 	shuttle 	sizing  	target  	tcross  	top_left_arrow  	top_left_corner 	top_right_corner 	top_side 	top_tee 	trek 	ul_angle 	ur_angle 	v_double_arrow 	watcha 	xterm  
++CURSOR_NAMES =  	00008160000006810000408080010102 	028006030e0e7ebffc7f7070c0600140 	03b6e0fcb3499374a867c041f52298f0 	08e8e1c95fe2fc01f976f1e063a24ccd 	14fef782d02440884392942c11205230 	2870a09082c103050810ffdffffe0204 	3ecb610c1bf2410f44200f48c40d3599 	4498f0e0c1937ffe01fd06f973665830 	9d800788f1b08800ae810202380a0822 	c7088f0f3e6c8088236ef8e1e3e70000 	d9ce0ab605698f320427677b458ad60b 	e29285e634086352946a0e7090d73106 	fcf1c3c7cd4491d801f1e1c78f100000 	X_cursor 	arrow 	base_arrow_down 	base_arrow_up 	based_arrow_down 	based_arrow_up 	bd_double_arrow 	boat 	bottom_left_corner 	bottom_right_corner 	bottom_side 	bottom_tee 	center_ptr 	circle 	cross 	cross_reverse 	crossed_circle 	crosshair 	dot 	dot_box_mask 	dotbox 	double_arrow 	draft_large  	draft_small  	draped_box   	exchange     	fd_double_arrow 	fleur 	gumby 	h_double_arrow 	hand 	hand1 	hand2 	left_ptr 	left_ptr_watch 	left_side 	left_tee  	ll_angle  	lr_angle  	move      	pencil    	pirate    	plus      	question_arrow 	right_ptr      	right_side     	right_tee      	sailboat       	sb_down_arrow  	sb_h_double_arrow 	sb_left_arrow 	sb_right_arrow 	sb_up_arrow 	sb_v_double_arrow 	shuttle 	sizing  	target  	tcross  	top_left_arrow  	top_left_corner 	top_right_corner 	top_side 	top_tee 	trek 	ul_angle 	ur_angle 	v_double_arrow 	 	xterm  
+ 
+ 
+ CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
diff --git a/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb b/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
index e9e6479daf..094b303409 100644
--- a/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
+++ b/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
@@ -3,13 +3,21 @@ DESCRIPTION = "Transparent xcursor theme for handheld systems with visible watch
 SECTION = "x11/base"
 RREPLACES = "xcursor-transparent-theme"
 RPROVIDES = "xcursor-transparent-theme"
-PR="r2"
+PR="r4"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
 	   file://use-relative-symlinks.patch;patch=1 \
-	   file://skip_watch_cursor.patch;patch=1"
+	   file://skip_watch_cursor.patch;patch=1 \
+	   file://20xcursor-transparent"
 S = "${WORKDIR}/xcursor-transparent-theme-${PV}"
 
-FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
+FILES_${PN} += "${datadir}/icons/xcursor-transparent/cursors/*"
 
 inherit autotools
+
+do_install_append () {
+        install -d ${D}${sysconfdir}/X11/Xsession.d
+        install -m 0755 ${WORKDIR}/20xcursor-transparent ${D}${sysconfdir}/X11/Xsession.d
+}
+
+PACKAGE_ARCH = "all"