[oe-commits] org.oe.dev merge of '17052bfd7be914a890ec54d73c91df769727c7db'

[john_lee commit]

merge of '17052bfd7be914a890ec54d73c91df769727c7db'
     and '8e540d3afdaf92d4b67de7855fe900164a9a3c69'

Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: 68b307acdcebbfa76e48b811ca400ec5c07e768c
ViewMTN: http://monotone.openembedded.org/revision/info/68b307acdcebbfa76e48b811ca400ec5c07e768c
Files:
1
packages/openmoko-projects/tangogps_0.7.bb
packages/images/openmoko-qtopia-x11-image.bb
packages/tasks/task-openmoko-qtopia-x11.bb
packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
Diffs:

#
# mt diff -r17052bfd7be914a890ec54d73c91df769727c7db -r68b307acdcebbfa76e48b811ca400ec5c07e768c
#
#
#
# patch "packages/openmoko-projects/tangogps_0.7.bb"
#  from [939f4befded5b788ae4e9e042ef71ead0fce6956]
#    to [9bfda29d9c3b350217af6cc0ac304b8ee2340584]
#
============================================================
--- packages/openmoko-projects/tangogps_0.7.bb	939f4befded5b788ae4e9e042ef71ead0fce6956
+++ packages/openmoko-projects/tangogps_0.7.bb	9bfda29d9c3b350217af6cc0ac304b8ee2340584
@@ -13,3 +13,5 @@ inherit autotools
 S = "${WORKDIR}/tangoGPS-0.7"
 
 inherit autotools
+
+CPPFLAGS += "-I${STAGING_INCDIR}/gconf/2/"


#
# mt diff -r8e540d3afdaf92d4b67de7855fe900164a9a3c69 -r68b307acdcebbfa76e48b811ca400ec5c07e768c
#
#
#
# add_file "packages/images/openmoko-qtopia-x11-image.bb"
#  content [fd1679f4eb35ac9f3302c6a11f82e975921a169f]
# 
# add_file "packages/tasks/task-openmoko-qtopia-x11.bb"
#  content [38da0e6335542addd488373f6e8cee974a877a58]
# 
# patch "packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia"
#  from [d4c0aafd1334ad5324011a762d43cf91f294aa5c]
#    to [a8d4a67e0c7769a5e892d61f199fcb66eb0a671a]
# 
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
#  from [793f42a67a2b3684beeeb96f10259216c87d06fc]
#    to [0d30f0e2f203011597df480fb0ec8c0bd4d438ba]
# 
# patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
#  from [5379ad2dc442e5311c7f1903f8ac2900f7886323]
#    to [6d801f6abfc58aaf724ee5f32f75326a83882415]
#
============================================================
--- packages/images/openmoko-qtopia-x11-image.bb	fd1679f4eb35ac9f3302c6a11f82e975921a169f
+++ packages/images/openmoko-qtopia-x11-image.bb	fd1679f4eb35ac9f3302c6a11f82e975921a169f
@@ -0,0 +1,7 @@
+#------------------------------------------------------
+# OpenMoko Qtopia/X11 Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+IMAGE_INSTALL += "task-openmoko-qtopia-x11"
============================================================
--- packages/tasks/task-openmoko-qtopia-x11.bb	38da0e6335542addd488373f6e8cee974a877a58
+++ packages/tasks/task-openmoko-qtopia-x11.bb	38da0e6335542addd488373f6e8cee974a877a58
@@ -0,0 +1,35 @@
+DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+LICENSE = "MIT"
+PR = "r46"
+
+inherit task
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+PACKAGES = "task-openmoko-qtopia-x11"
+
+#
+# task-openmoko-qtopia-x11
+#
+DESCRIPTION_task-openmoko-qtopia-x11 = "OpenMoko: The Qtopia/X11 based User Interface"
+RDEPENDS_task-openmoko-qtopia-x11 = "\
+  alsa-state \
+  bluez-hcidump \
+  readline \
+  qtopia-phone-x11 \
+  e-wm \
+  illume \
+  ${XSERVER} \
+  xserver-kdrive-common \
+  xserver-nodm-init \
+  xauth \
+  xhost \
+  xset \
+  xrandr \
+  neod \
+  libnotify \
+"
+
============================================================
--- packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia	d4c0aafd1334ad5324011a762d43cf91f294aa5c
+++ packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia	a8d4a67e0c7769a5e892d61f199fcb66eb0a671a
@@ -3,6 +3,7 @@ export PATH=$QPEDIR/bin:$PATH
 # path setup
 export QPEDIR=/opt/Qtopia
 export PATH=$QPEDIR/bin:$PATH
+export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH
 
 #tell how to inform illume on incoming phone calls
 #export ILLUME_PHONE_CALL=
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	793f42a67a2b3684beeeb96f10259216c87d06fc
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	0d30f0e2f203011597df480fb0ec8c0bd4d438ba
@@ -10,9 +10,9 @@ HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "glib-2.0 dbus tslib freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"
+DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"
 PROVIDES = "qtopia-phone"
-PR = "r1"
+PR = "r2"
 SRCREV = "${AUTOREV}"
 SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
            file://device-conf \
============================================================
--- packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb	5379ad2dc442e5311c7f1903f8ac2900f7886323
+++ packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb	6d801f6abfc58aaf724ee5f32f75326a83882415
@@ -9,9 +9,9 @@ PE = "1"
 RDEPENDS_${PN} = "xserver-kdrive"
 PROVIDES = "virtual/xserver"
 PE = "1"
-PR = "r0"
+PR = "r1"
 
-XGLAMO_GIT_REV = "d96175a2db993ef4bc7d9d910e0b47ec7ff20561"
+XGLAMO_GIT_REV = "0d2605edeb50a4b118ac00ae1f00abd085477323"
 
 SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \
         file://kmode.patch;patch=1 \