[oe-commits] org.oe.dev merge of '6b297f40d507a619bdd7d471e82d15807c186499'

john_lee commit oe at amethyst.openembedded.net
Fri Apr 25 15:39:32 UTC 2008 

merge of '6b297f40d507a619bdd7d471e82d15807c186499'
     and '9a77355907ffaa2a2ea581e3bb7d0ffaa7e4b9fb'

Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: 260ac30759d367f219f8b619b4ffbd57816bceaf
ViewMTN: http://monotone.openembedded.org/revision/info/260ac30759d367f219f8b619b4ffbd57816bceaf
Files:
1
packages/openmoko-projects/tangogps
packages/openmoko-projects/tangogps/global-config-h.patch
packages/openmoko-projects/tangogps_0.7.bb
packages/openmoko-projects/diversity-daemon_svn.bb
packages/openmoko-projects/diversity-nav_svn.bb
packages/packagekit/packagekit_git.bb
packages/tasks/task-openmoko-feed.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
Diffs:

#
# mt diff -r6b297f40d507a619bdd7d471e82d15807c186499 -r260ac30759d367f219f8b619b4ffbd57816bceaf
#
#
#
# add_dir "packages/openmoko-projects/tangogps"
# 
# add_file "packages/openmoko-projects/tangogps/global-config-h.patch"
#  content [1f14bafd396575e8b2246ac3aafe3903fd5a3317]
# 
# add_file "packages/openmoko-projects/tangogps_0.7.bb"
#  content [939f4befded5b788ae4e9e042ef71ead0fce6956]
# 
# patch "packages/openmoko-projects/diversity-daemon_svn.bb"
#  from [999b1e20ed0a67ee79e83a1483e4de1d18c21e1f]
#    to [d791f5379c76cef1135ea42eb1ad3e1199c7320c]
# 
# patch "packages/openmoko-projects/diversity-nav_svn.bb"
#  from [735e09ebf7933d1a68caa20982cd25a68e8dae54]
#    to [dd3619fc28f05cad72d65a94fbe062468b4920b0]
# 
# patch "packages/packagekit/packagekit_git.bb"
#  from [8fe65fd15a32dc4664adf3b54c04374d3aff362c]
#    to [0c24a5e5353dfdb7388797f10cb564ae32860786]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [7d43d2e53f32c8b0e07bf9fd81220d696a824a49]
#    to [f668de304d6dbe5d8fd3192db4c38f78cd6fbb96]
#
============================================================
--- packages/openmoko-projects/tangogps/global-config-h.patch	1f14bafd396575e8b2246ac3aafe3903fd5a3317
+++ packages/openmoko-projects/tangogps/global-config-h.patch	1f14bafd396575e8b2246ac3aafe3903fd5a3317
@@ -0,0 +1,30 @@
+Index: tangoGPS-0.7/src/globals.c
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.c	2008-03-13 14:21:02.000000000 +0800
++++ tangoGPS-0.7/src/globals.c	2008-03-13 14:28:49.000000000 +0800
+@@ -3,11 +3,11 @@
+  *  License    GPLv2
+  ****************************************************************************/
+ 
++#include "globals.h"
++
+ #include <gtk/gtk.h>
+ #include <gps.h>
+ 
+-#include "globals.h"
+-
+ GdkPixmap *pixmap = NULL;
+ GtkWidget *window1 = NULL;
+ GtkWidget *window2 = NULL;
+Index: tangoGPS-0.7/src/globals.h
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.h	2008-03-13 14:27:46.000000000 +0800
++++ tangoGPS-0.7/src/globals.h	2008-03-13 14:27:48.000000000 +0800
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+ 
============================================================
--- packages/openmoko-projects/tangogps_0.7.bb	939f4befded5b788ae4e9e042ef71ead0fce6956
+++ packages/openmoko-projects/tangogps_0.7.bb	939f4befded5b788ae4e9e042ef71ead0fce6956
@@ -0,0 +1,15 @@
+DESCRIPTION = "tangoGPS map"
+AUTHOR = "Marcus Bauer <marcus.bauer at gmail.com>"
+HOMEPAGE = "http://tangogps.org/"
+SECTION = "openmoko/pim"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "curl gtk+ gpsd"
+PR = "r1"
+
+SRC_URI = "http://tangogps.org/tangoGPS-0.7.tar.gz \
+           file://global-config-h.patch;patch=1"
+
+S = "${WORKDIR}/tangoGPS-0.7"
+
+inherit autotools
============================================================
--- packages/openmoko-projects/diversity-daemon_svn.bb	999b1e20ed0a67ee79e83a1483e4de1d18c21e1f
+++ packages/openmoko-projects/diversity-daemon_svn.bb	d791f5379c76cef1135ea42eb1ad3e1199c7320c
@@ -2,10 +2,10 @@ LICENSE = "GPL"
 HOMEPAGE = "http://diversity.projects.openmoko.org/"
 SECTION = "net/misc"
 LICENSE = "GPL"
-DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus gypsy libjana curl"
-RDEPENDS = "eds-dbus gypsy openmoko-dialer2"
+DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
+RDEPENDS = "eds-dbus openmoko-dialer2"
 PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
 
@@ -13,7 +13,7 @@ inherit autotools pkgconfig
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--disable-nm --disable-geoclue --disable-xmpp --enable-session-bus"
+EXTRA_OECONF = "--disable-nm --disable-xmpp --enable-session-bus"
 
 FILES_${PN} += "${datadir}/dbus-1/"
 FILES_${PN} += "${sysconfdir}/dbus-1/"
============================================================
--- packages/openmoko-projects/diversity-nav_svn.bb	735e09ebf7933d1a68caa20982cd25a68e8dae54
+++ packages/openmoko-projects/diversity-nav_svn.bb	dd3619fc28f05cad72d65a94fbe062468b4920b0
@@ -3,9 +3,9 @@ DEPENDS = "evas edje ecore edbus"
 SECTION = "openmoko/applications"
 LICENSE = "GPL"
 DEPENDS = "evas edje ecore edbus"
-RDEPENDS = "libevas-engine-buffer libevas-engine-software-16 libevas-engine-software-16-x11 libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-eet libevas-loader-jpeg libevas-loader-png"
+RDEPENDS = "diversity-daemon"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
 
============================================================
--- packages/packagekit/packagekit_git.bb	8fe65fd15a32dc4664adf3b54c04374d3aff362c
+++ packages/packagekit/packagekit_git.bb	0c24a5e5353dfdb7388797f10cb564ae32860786
@@ -3,9 +3,9 @@ DEPENDS = "dbus (>= 1.1.1) dbus-glib gli
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool"
-RDEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 opkg"
+RDEPENDS = "opkg"
 PV = "0.1+git${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
            file://disable-docbook2man.patch;patch=1"
============================================================
--- packages/tasks/task-openmoko-feed.bb	7d43d2e53f32c8b0e07bf9fd81220d696a824a49
+++ packages/tasks/task-openmoko-feed.bb	f668de304d6dbe5d8fd3192db4c38f78cd6fbb96
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r25"
+PR = "r26"
 
 inherit task
 
@@ -42,4 +42,8 @@ RDEPENDS_task-openmoko-feed = "\
   qtopia-phone \
   gnash \
   mono \
+  diversity-daemon \
+  diversity-nav \
+  assassin \
+  tangogps \
 "


#
# mt diff -r9a77355907ffaa2a2ea581e3bb7d0ffaa7e4b9fb -r260ac30759d367f219f8b619b4ffbd57816bceaf
#
#
#
# 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]
#
============================================================
--- 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 \

More information about the Openembedded-commits mailing list