summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Dietze <di@fh-wedel.de>2007-04-18 17:14:11 +0000
committerMartin Dietze <di@fh-wedel.de>2007-04-18 17:14:11 +0000
commitfd06e9a14b39a2132c5689fc36dd785132839aff (patch)
tree2538589258d2ca5726cbb47d5880f2c8bbd06eaf
parentbcbe2cb0a539e74e9053dd1e69e29a5f4e47abbf (diff)
parent5e755a1c503c090de21133f80753eefd8fae3591 (diff)
merge of '2620a9b57f6ef565cef134f6a34c2a51381ac2e3'
and '29e9fec80f07c69a19d9942792954c2d692e7d13'
-rw-r--r--packages/gpephone/gpe-session-scripts-phone/standard-apps.patch23
-rw-r--r--packages/gpephone/gpe-session-scripts-phone_0.67.bb5
-rw-r--r--packages/gpephone/linphone_1.5.0.bb2
3 files changed, 27 insertions, 3 deletions
diff --git a/packages/gpephone/gpe-session-scripts-phone/standard-apps.patch b/packages/gpephone/gpe-session-scripts-phone/standard-apps.patch
new file mode 100644
index 0000000000..3be47c03b2
--- /dev/null
+++ b/packages/gpephone/gpe-session-scripts-phone/standard-apps.patch
@@ -0,0 +1,23 @@
+--- gpe-session-scripts/X11/Xsession.d/98standard-apps~ 2007-04-18 18:54:59.000000000 +0200
++++ gpe-session-scripts/X11/Xsession.d/98standard-apps 2007-04-18 18:54:59.000000000 +0200
+@@ -7,20 +7,3 @@
+ else
+ time_set_already=no
+ fi
+-
+-# No action if .mbdock exists
+-if [ ! -f $HOME/.matchbox/mbdock.session ]; then
+- mkdir -p $HOME/.matchbox
+- cp /etc/gpe/gpe.mbdock $HOME/.matchbox/mbdock.session
+-
+- if [ "$time_set_already" = "no" ]; then
+- gpe-conf time user_only &
+- fi
+-
+- gpe-question --icon !gtk-dialog-info --question "<b>Welcome to GPE!</b>
+-
+-I have added some standard programs to the panel at the bottom of the screen.
+-
+-To remove these, or add more, tap and hold on an empty area of the panel." --buttons !gtk-ok &
+-fi
+-
diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index 5af3ff683a..1e67d2a290 100644
--- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -11,9 +11,10 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
file://matchbox-session \
file://matchbox-session.vm \
file://phonesession \
- file://disable-composite.xsettings"
+ file://disable-composite.xsettings \
+ file://standard-apps.patch;patch=1"
-PR = "r4"
+PR = "r5"
S = "${WORKDIR}/gpe-session-scripts-${PV}"
diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb
index ee59000133..0671c826bd 100644
--- a/packages/gpephone/linphone_1.5.0.bb
+++ b/packages/gpephone/linphone_1.5.0.bb
@@ -26,7 +26,7 @@ do_configure () {
}
do_compile () {
- oe_runmake "LIBTOOL=${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool"
+ oe_runmake LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" SPEEX_LIBS="-lspeex" SPEEX_CFLAGS=" "
}
do_install () {