[oe-commits] org.oe.dev merge of '453235132f7854f1822704d1398a978b23b4a64a'
freyther commit
oe at amethyst.openembedded.net
Fri Apr 25 15:40:17 UTC 2008
merge of '453235132f7854f1822704d1398a978b23b4a64a'
and 'be98f2c49ea68651e064574cc2379f2e04febe3c'
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: cd8009341954417c09d389f5169b09d222f5efc8
ViewMTN: http://monotone.openembedded.org/revision/info/cd8009341954417c09d389f5169b09d222f5efc8
Files:
1
packages/openmoko-projects/tangogps
packages/openmoko-projects/tangogps/global-config-h.patch
packages/openmoko-projects/tangogps_0.7.bb
packages/alsa/alsa-state/fic-gta01/asound.state
packages/alsa/alsa-state/fic-gta01/capturehandset.state
packages/alsa/alsa-state/fic-gta01/captureheadset.state
packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
packages/alsa/alsa-state/fic-gta01/gsmhandset.state
packages/alsa/alsa-state/fic-gta01/gsmheadset.state
packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state
packages/alsa/alsa-state/fic-gta01/stereoout.state
packages/alsa/alsa-state/fic-gta01/voip-handset.state
packages/alsa/alsa-state/fic-gta01/voip-headset.state
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/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
packages/qtopia-phone/qtopia-phone-x11/qtopia.sh
packages/efl1/edbus_cvs.bb
packages/efl1/exml_cvs.bb
packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
Diffs:
#
# mt diff -r453235132f7854f1822704d1398a978b23b4a64a -rcd8009341954417c09d389f5169b09d222f5efc8
#
#
#
# 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 [9bfda29d9c3b350217af6cc0ac304b8ee2340584]
#
# patch "packages/alsa/alsa-state/fic-gta01/asound.state"
# from [1caaafe9a0c00ae1dd0487d2cbb65dd85e68c043]
# to [24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28]
#
# patch "packages/alsa/alsa-state/fic-gta01/capturehandset.state"
# from [3d006b5dd4cd49bd5200ef7265aea7707a94742d]
# to [e9daf2ba483a71ce163925f4f8123f9b21fae829]
#
# patch "packages/alsa/alsa-state/fic-gta01/captureheadset.state"
# from [8d61d9d7df8eeca1b6d6b869e34092846cd6255d]
# to [c2a0fa104836312145b8705962462a0ab4f9049a]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state"
# from [3675af3b763a03a1931c72f602dcf9c10785d352]
# to [8f6dd94826572a3e21eb710a31de17c94b4ff6e5]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"
# from [e26913ea8ef767872f2a1bed7529a897a38a0528]
# to [88e380e6c174c2c8e0d067f5f3bf5cc23d9279a9]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmheadset.state"
# from [81f4f5e844fcec82dba762247aa29f3d0fcb49d7]
# to [d136d1e7e79a80885e9b7a0a03c442fdc032cc61]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state"
# from [bd1a1a0426f6ee33355f8a327e980e6dfea4b84e]
# to [534365ba106105f05e94a03aea74c9c6da59a017]
#
# patch "packages/alsa/alsa-state/fic-gta01/stereoout.state"
# from [1caaafe9a0c00ae1dd0487d2cbb65dd85e68c043]
# to [24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28]
#
# patch "packages/alsa/alsa-state/fic-gta01/voip-handset.state"
# from [c5b60d82c1897991c9945ce182c4b0ffca5a9d12]
# to [4d28d6e6a2f7c934263fadf690327fe6208168fd]
#
# patch "packages/alsa/alsa-state/fic-gta01/voip-headset.state"
# from [6e7478155fdc57345e3112db7c8de2755a5e931e]
# to [9693cce22afbd9cb814e2f71ff566df3306c8649]
#
# 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]
#
# patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
# from [5379ad2dc442e5311c7f1903f8ac2900f7886323]
# to [6d801f6abfc58aaf724ee5f32f75326a83882415]
#
============================================================
--- 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 9bfda29d9c3b350217af6cc0ac304b8ee2340584
+++ packages/openmoko-projects/tangogps_0.7.bb 9bfda29d9c3b350217af6cc0ac304b8ee2340584
@@ -0,0 +1,17 @@
+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
+
+CPPFLAGS += "-I${STAGING_INCDIR}/gconf/2/"
============================================================
--- packages/alsa/alsa-state/fic-gta01/asound.state 1caaafe9a0c00ae1dd0487d2cbb65dd85e68c043
+++ packages/alsa/alsa-state/fic-gta01/asound.state 24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28
@@ -491,7 +491,17 @@ state.neo1973 {
name 'ADC Data Select'
value Stereo
}
- control.52 {
+ control.52 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'ROUT2 Phase'
+ value Inverted
+ }
+ control.53 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -502,7 +512,7 @@ state.neo1973 {
name 'Mic Selection Mux'
value 'Mic 1'
}
- control.53 {
+ control.54 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -514,7 +524,7 @@ state.neo1973 {
name 'Rx Mixer'
value 'RXP - RXN'
}
- control.54 {
+ control.55 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -526,7 +536,7 @@ state.neo1973 {
name 'Line Mixer'
value 'Line 1 + 2'
}
- control.55 {
+ control.56 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -536,7 +546,7 @@ state.neo1973 {
name 'Line Mono Mux'
value 'Line Mix'
}
- control.56 {
+ control.57 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -546,7 +556,7 @@ state.neo1973 {
name 'Line Right Mux'
value 'Line 2'
}
- control.57 {
+ control.58 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -556,7 +566,7 @@ state.neo1973 {
name 'Line Left Mux'
value 'Line 1'
}
- control.58 {
+ control.59 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -564,7 +574,7 @@ state.neo1973 {
name 'ALC Mixer Line Capture Switch'
value false
}
- control.59 {
+ control.60 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -572,7 +582,7 @@ state.neo1973 {
name 'ALC Mixer Mic2 Capture Switch'
value false
}
- control.60 {
+ control.61 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -580,7 +590,7 @@ state.neo1973 {
name 'ALC Mixer Mic1 Capture Switch'
value false
}
- control.61 {
+ control.62 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -588,7 +598,7 @@ state.neo1973 {
name 'ALC Mixer Rx Capture Switch'
value false
}
- control.62 {
+ control.63 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -600,7 +610,7 @@ state.neo1973 {
name 'Mic Sidetone Mux'
value 'Left PGA'
}
- control.63 {
+ control.64 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -611,7 +621,7 @@ state.neo1973 {
name 'Capture Right Mux'
value PGA
}
- control.64 {
+ control.65 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -622,7 +632,7 @@ state.neo1973 {
name 'Capture Left Mux'
value PGA
}
- control.65 {
+ control.66 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -634,7 +644,7 @@ state.neo1973 {
name 'Capture Right Mixer'
value Stereo
}
- control.66 {
+ control.67 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -646,7 +656,7 @@ state.neo1973 {
name 'Capture Left Mixer'
value Stereo
}
- control.67 {
+ control.68 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -654,7 +664,7 @@ state.neo1973 {
name 'Playback Mixer Voice Capture Sw'
value false
}
- control.68 {
+ control.69 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -662,7 +672,7 @@ state.neo1973 {
name 'Playback Mixer Left Capture Swi'
value false
}
- control.69 {
+ control.70 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -670,7 +680,7 @@ state.neo1973 {
name 'Playback Mixer Right Capture Sw'
value false
}
- control.70 {
+ control.71 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -681,7 +691,7 @@ state.neo1973 {
name 'Out4 Mux'
value VREF
}
- control.71 {
+ control.72 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -692,7 +702,7 @@ state.neo1973 {
name 'Out3 Mux'
value VREF
}
- control.72 {
+ control.73 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -704,7 +714,7 @@ state.neo1973 {
name 'Mono 2 Mux'
value 'Inverted Mono 1'
}
- control.73 {
+ control.74 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -712,7 +722,7 @@ state.neo1973 {
name 'Mono Mixer Left Playback Switch'
value false
}
- control.74 {
+ control.75 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -720,7 +730,7 @@ state.neo1973 {
name 'Mono Mixer Right Playback Switc'
value false
}
- control.75 {
+ control.76 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -728,7 +738,7 @@ state.neo1973 {
name 'Mono Mixer Voice Playback Switc'
value false
}
- control.76 {
+ control.77 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -736,7 +746,7 @@ state.neo1973 {
name 'Mono Mixer Sidetone Playback Sw'
value false
}
- control.77 {
+ control.78 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -744,7 +754,7 @@ state.neo1973 {
name 'Mono Mixer Bypass Playback Swit'
value false
}
- control.78 {
+ control.79 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -752,7 +762,7 @@ state.neo1973 {
name 'Right Mixer Voice Playback Swit'
value false
}
- control.79 {
+ control.80 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -760,7 +770,7 @@ state.neo1973 {
name 'Right Mixer Sidetone Playback S'
value false
}
- control.80 {
+ control.81 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -768,7 +778,7 @@ state.neo1973 {
name 'Right Mixer Right Playback Swit'
value true
}
- control.81 {
+ control.82 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -776,7 +786,7 @@ state.neo1973 {
name 'Right Mixer Bypass Playback Swi'
value false
}
- control.82 {
+ control.83 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -784,7 +794,7 @@ state.neo1973 {
name 'Left Mixer Voice Playback Switc'
value false
}
- control.83 {
+ control.84 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -792,7 +802,7 @@ state.neo1973 {
name 'Left Mixer Sidetone Playback Sw'
value false
}
- control.84 {
+ control.85 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -800,7 +810,7 @@ state.neo1973 {
name 'Left Mixer Left Playback Switch'
value true
}
- control.85 {
+ control.86 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -808,7 +818,7 @@ state.neo1973 {
name 'Left Mixer Bypass Playback Swit'
value false
}
- control.86 {
+ control.87 {
comment.access 'read write'
comment.type INTEGER
comment.count 1
@@ -817,7 +827,7 @@ state.neo1973 {
name 'Amp Left Playback Volume'
value 22
}
- control.87 {
+ control.88 {
comment.access 'read write'
comment.type INTEGER
comment.count 1
@@ -826,7 +836,7 @@ state.neo1973 {
name 'Amp Right Playback Volume'
value 22
}
- control.88 {
+ control.89 {
comment.access 'read write'
comment.type INTEGER
comment.count 1
@@ -835,7 +845,7 @@ state.neo1973 {
name 'Amp Mono Playback Volume'
value 0
}
- control.89 {
+ control.90 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -848,7 +858,7 @@ state.neo1973 {
name 'Amp Mode'
value 'Stereo Speakers + Headphones'
}
- control.90 {
+ control.91 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -865,7 +875,7 @@ state.neo1973 {
name 'Neo Mode'
value Headphones
}
- control.91 {
+ control.92 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -873,7 +883,7 @@ state.neo1973 {
name 'Amp Spk 3D Playback Switch'
value false
}
- control.92 {
+ control.93 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -881,7 +891,7 @@ state.neo1973 {
name 'Amp HP 3d Playback Switch'
value false
}
- control.93 {
+ control.94 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -889,7 +899,7 @@ state.neo1973 {
name 'Amp Fast Wakeup Playback Switch'
value false
}
- control.94 {
+ control.95 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
============================================================
--- packages/alsa/alsa-state/fic-gta01/capturehandset.state 3d006b5dd4cd49bd5200ef7265aea7707a94742d
+++ packages/alsa/alsa-state/fic-gta01/capturehandset.state e9daf2ba483a71ce163925f4f8123f9b21fae829
@@ -491,7 +491,17 @@ state.neo1973 {
name 'ADC Data Select'
value Stereo
}
- control.52 {
+ control.52 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'ROUT2 Phase'
+ value Inverted
+ }
+ control.53 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -502,7 +512,7 @@ state.neo1973 {
name 'Mic Selection Mux'
value 'Mic 1'
}
- control.53 {
+ control.54 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -514,7 +524,7 @@ state.neo1973 {
name 'Rx Mixer'
value 'RXP - RXN'
}
- control.54 {
+ control.55 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -526,7 +536,7 @@ state.neo1973 {
name 'Line Mixer'
value 'Line 1 + 2'
}
- control.55 {
+ control.56 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -536,7 +546,7 @@ state.neo1973 {
name 'Line Mono Mux'
value 'Line Mix'
}
- control.56 {
+ control.57 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -546,7 +556,7 @@ state.neo1973 {
name 'Line Right Mux'
value 'Line 2'
}
- control.57 {
+ control.58 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -556,7 +566,7 @@ state.neo1973 {
name 'Line Left Mux'
value 'Line 1'
}
- control.58 {
+ control.59 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -564,7 +574,7 @@ state.neo1973 {
name 'ALC Mixer Line Capture Switch'
value false
}
- control.59 {
+ control.60 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -572,7 +582,7 @@ state.neo1973 {
name 'ALC Mixer Mic2 Capture Switch'
value true
}
- control.60 {
+ control.61 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -580,7 +590,7 @@ state.neo1973 {
name 'ALC Mixer Mic1 Capture Switch'
value false
}
- control.61 {
+ control.62 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -588,7 +598,7 @@ state.neo1973 {
name 'ALC Mixer Rx Capture Switch'
value false
}
- control.62 {
+ control.63 {
comment.access 'read write'
comment.type ENUMERATED
comment.c%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rbe98f2c49ea68651e064574cc2379f2e04febe3c -rcd8009341954417c09d389f5169b09d222f5efc8
#
#
#
# add_file "packages/qtopia-phone/qtopia-phone-x11/qtopia.sh"
# content [c955894686aae5510c5b36db674c9f457416616c]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [132848ec2182987753b4827a0c27d567ca12cce7]
# to [3c44c1091be07a94b0aeebd75bf2d9693bdb0298]
#
# patch "packages/efl1/exml_cvs.bb"
# from [2564777dc378cdf2b521b0e39fe35257f04e8314]
# to [36dc5bf1bc769d147967195abcd043d4bce849c6]
#
# patch "packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia"
# from [a8d4a67e0c7769a5e892d61f199fcb66eb0a671a]
# to [8aa8d733fbdbb97a512816a89d64a38de5d7ca55]
#
# patch "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf"
# from [47f4986691cbfef366a68a69bf18b72b28cbc6a9]
# to [17a2eb43db594b5219170a6f5c2fa23012edbd2f]
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# from [0d30f0e2f203011597df480fb0ec8c0bd4d438ba]
# to [337ea063ac2bf420284360097b31d9405a3be8eb]
#
============================================================
--- packages/qtopia-phone/qtopia-phone-x11/qtopia.sh c955894686aae5510c5b36db674c9f457416616c
+++ packages/qtopia-phone/qtopia-phone-x11/qtopia.sh c955894686aae5510c5b36db674c9f457416616c
@@ -0,0 +1,4 @@
+#!/bin/sh
+export QPEDIR=/opt/Qtopia
+export PATH=$PATH=$QPEDIR/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QPEDIR/lib
============================================================
--- packages/efl1/edbus_cvs.bb 132848ec2182987753b4827a0c27d567ca12cce7
+++ packages/efl1/edbus_cvs.bb 3c44c1091be07a94b0aeebd75bf2d9693bdb0298
@@ -1,6 +1,7 @@ LICENSE = "MIT BSD"
DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
DEPENDS = "dbus ecore"
LICENSE = "MIT BSD"
+PV = "0.1.0.042+cvs${SRCDATE}"
PR = "r2"
inherit efl_library
============================================================
--- packages/efl1/exml_cvs.bb 2564777dc378cdf2b521b0e39fe35257f04e8314
+++ packages/efl1/exml_cvs.bb 36dc5bf1bc769d147967195abcd043d4bce849c6
@@ -1,6 +1,7 @@ DEPENDS = "libxml2 libxslt ecore"
DESCRIPTION = "Exml is a generic XML parser wrapper."
LICENSE = "MIT"
DEPENDS = "libxml2 libxslt ecore"
+PV = "0.1.1+cvs${SRCDATE}"
inherit efl_library
============================================================
--- packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia a8d4a67e0c7769a5e892d61f199fcb66eb0a671a
+++ packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia 8aa8d733fbdbb97a512816a89d64a38de5d7ca55
@@ -1,34 +1,34 @@
#!/bin/sh
+# xmodmap to allow the soft-menu to work
+xmodmap -e "keycode 180 = 0x11000601"
+xmodmap -e "keycode 181 = 0x11000602"
+xmodmap -e "keycode 182 = 0x11000603"
+xmodmap -e "keycode 183 = 0x11000604"
+xmodmap -e "keycode 184 = 0x11000605"
+xmodmap -e "keycode 185 = 0x11000606"
+xmodmap -e "keycode 186 = 0x11000607"
+xmodmap -e "keycode 187 = 0x11000608"
+xmodmap -e "keycode 188 = 0x11000609"
+xmodmap -e "keycode 189 = 0x1100060A"
+xmodmap -e "keycode 190 = 0x1100060B"
+xmodmap -e "keycode 191 = 0x1100060B"
+xmodmap -e "keycode 192 = 0x1100060A"
+xmodmap -e "keycode 193 = 0x1100060C"
+xmodmap -e "keycode 194 = 0x1100060D"
+xmodmap -e "keycode 195 = 0x1100060E"
+xmodmap -e "keycode 196 = 0x1100060F"
+xmodmap -e "keycode 197 = 0x11000610"
+xmodmap -e "keycode 198 = 0x1008ff26"
+
# 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
+#tell Qtopia how to inform illume on incoming phone calls
#export ILLUME_PHONE_CALL=
-# xmodmap to allow the soft-menu to work
-xmodmap -e "keycode 223 = 0x11000601"
-xmodmap -e "keycode 224 = 0x11000602"
-xmodmap -e "keycode 225 = 0x11000603"
-xmodmap -e "keycode 226 = 0x11000604"
-xmodmap -e "keycode 227 = 0x11000605"
-xmodmap -e "keycode 228 = 0x11000606"
-xmodmap -e "keycode 229 = 0x11000607"
-xmodmap -e "keycode 230 = 0x11000608"
-xmodmap -e "keycode 231 = 0x11000609"
-xmodmap -e "keycode 232 = 0x1100060A"
-xmodmap -e "keycode 232 = 0x1100060B"
-xmodmap -e "keycode 233 = 0x1100060B"
-xmodmap -e "keycode 232 = 0x1100060A"
-xmodmap -e "keycode 234 = 0x1100060C"
-xmodmap -e "keycode 235 = 0x1100060D"
-xmodmap -e "keycode 236 = 0x1100060E"
-xmodmap -e "keycode 237 = 0x1100060F"
-xmodmap -e "keycode 238 = 0x11000610"
-xmodmap -e "keycode 239 = 0x1008ff26"
-
# Now start Qtopia
exec qpe
============================================================
--- packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf 47f4986691cbfef366a68a69bf18b72b28cbc6a9
+++ packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf 17a2eb43db594b5219170a6f5c2fa23012edbd2f
@@ -10,6 +10,7 @@
-extra-qtopiacore-config "-fast"
-extra-qtopiacore-config "-no-accessibility"
-extra-qtopiacore-config "-no-cups"
+-extra-qtopiacore-config "-no-iconv"
-extra-qtopiacore-config "-nomake demos"
-extra-qtopiacore-config "-nomake examples"
-extra-qtopiacore-config "-qt-libjpeg"
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb 0d30f0e2f203011597df480fb0ec8c0bd4d438ba
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb 337ea063ac2bf420284360097b31d9405a3be8eb
@@ -12,12 +12,13 @@ PROVIDES = "qtopia-phone"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"
PROVIDES = "qtopia-phone"
-PR = "r2"
+PR = "r4"
SRCREV = "${AUTOREV}"
SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
file://device-conf \
file://qplatformdefs.h \
- file://Xsession.d/99qtopia"
+ file://Xsession.d/99qtopia \
+ file://qtopia.sh"
S = "${WORKDIR}/git"
@@ -116,6 +117,9 @@ do_install() {
# Install some scripts
install -d ${D}${bindir}
install -m 0755 ${S}/bin/qcop-x11-launch ${D}${bindir}
+
+ install -d ${D}${sysconfdir}/profile.d/
+ install -m 0755 ${WORKDIR}/qtopia.sh ${D}${sysconfdir}/profile.d/
}
FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \
More information about the Openembedded-commits
mailing list