[oe-commits] org.oe.dev merge of '2dd66e01098fdefc97b79f2c26ae0b399f517579'

mickeyl commit openembedded-commits at lists.openembedded.org
Thu Dec 13 23:19:43 UTC 2007


merge of '2dd66e01098fdefc97b79f2c26ae0b399f517579'
     and 'f4fae9004af31107f4f7bba2a4fae3dcb11bc1e5'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 271812b06e9220ace7e7eeaf74f580e3d0ab5da1
ViewMTN: http://monotone.openembedded.org/revision/info/271812b06e9220ace7e7eeaf74f580e3d0ab5da1
Files:
1
packages/mono/mono-1.2.5.1+1.2.6pre4
packages/mono/mono-1.2.6
packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb
packages/mono/mono-mcs-intermediate_1.2.6.bb
packages/mono/mono_1.2.5.1+1.2.6pre4.bb
packages/mono/mono_1.2.6.bb
packages/python/python-sip_4.7.1.bb
packages/python/python-sip_4.7.3.bb
packages/sip/sip-native_4.7.1.bb
packages/sip/sip-native_4.7.3.bb
packages/gnome/libart-lgpl/armeb
packages/gnome/libart-lgpl/armeb/art_config.h
packages/meta/meta-angstrom-2007.bb
classes/scons.bbclass
conf/checksums.ini
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
contrib/angstrom/build-release.sh
packages/enca/enca_1.9.bb
packages/fbreader/fbreader_0.7.3d.bb
packages/fbreader/fbreader_0.7.4q.bb
packages/fbreader/fbreader_0.8.2a.bb
packages/gnome/gconf-dbus_svn.bb
packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
packages/linux/linux-handhelds-2.6/asus620/defconfig
packages/linux/linux-handhelds-2.6/asus730/defconfig
packages/linux/linux-handhelds-2.6/aximx50/defconfig
packages/linux/linux-handhelds-2.6/eteng500/defconfig
packages/linux/linux-handhelds-2.6/h1910/defconfig
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/linux/linux-handhelds-2.6/h3600/defconfig
packages/linux/linux-handhelds-2.6/h3800/defconfig
packages/linux/linux-handhelds-2.6/h3900/defconfig
packages/linux/linux-handhelds-2.6/h4000/defconfig
packages/linux/linux-handhelds-2.6/h5000/defconfig
packages/linux/linux-handhelds-2.6/htcalpine/defconfig
packages/linux/linux-handhelds-2.6/htcapache/defconfig
packages/linux/linux-handhelds-2.6/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6/htcsable/defconfig
packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6/hx4700/defconfig
packages/linux/linux-handhelds-2.6/looxc550/defconfig
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/linux/linux-handhelds-2.6/rx1950/defconfig
packages/linux/linux-handhelds-2.6/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
packages/lua/lua-gtk2_0.3.bb
packages/mono/mono_1.2.6.inc
packages/roadmap/zroadmap-1.0.12/zroadgps.png
packages/roadmap/files/zroadgps.png
packages/roadmap/files/qt
packages/roadmap/files/qt/qt2-fixes.patch
packages/roadmap/files/qt/qt_canvas.patch
packages/roadmap/files/qt/qt_main.patch
packages/roadmap/files/qt/roadmap.desktop.patch
packages/roadmap/files/qt/roadmap_main.patch
packages/roadmap/roadmap.inc
packages/roadmap/zroadmap.inc
packages/roadmap/zroadmap_1.1.0.bb
packages/roadmap/roadmap-gtk2_cvs.bb
packages/roadmap/zroadmap_1.0.12.bb
packages/roadmap/zroadmap_cvs.bb
Diffs:

#
# mt diff -r2dd66e01098fdefc97b79f2c26ae0b399f517579 -r271812b06e9220ace7e7eeaf74f580e3d0ab5da1
#
# 
# 
# rename "packages/mono/mono-1.2.5.1+1.2.6pre4"
#     to "packages/mono/mono-1.2.6"
# 
# rename "packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb"
#     to "packages/mono/mono-mcs-intermediate_1.2.6.bb"
# 
# rename "packages/mono/mono_1.2.5.1+1.2.6pre4.bb"
#     to "packages/mono/mono_1.2.6.bb"
# 
# rename "packages/python/python-sip_4.7.1.bb"
#     to "packages/python/python-sip_4.7.3.bb"
# 
# rename "packages/sip/sip-native_4.7.1.bb"
#     to "packages/sip/sip-native_4.7.3.bb"
# 
# add_dir "packages/gnome/libart-lgpl/armeb"
# 
# add_file "packages/gnome/libart-lgpl/armeb/art_config.h"
#  content [d94c2cc1288fee878cb8c9791b3b847eaa6b93e7]
# 
# add_file "packages/meta/meta-angstrom-2007.bb"
#  content [4bfd1a85218210707ef5559a74494f4a8159a2e6]
# 
# patch "classes/scons.bbclass"
#  from [7daf072a8b69aecb7a353e129508b5e514b1b5f0]
#    to [c546b54256dc44ccc4500ce748fb77c6d7efdcbd]
# 
# patch "conf/checksums.ini"
#  from [04b4283b58de2ba2856f6def18df3e268135b9bc]
#    to [ce22da057e8b56ac8825b7a043b4fa7cc3f86027]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [666f9821fd13c25a57a85d18bede92a2a755d104]
#    to [f3d89d1d37708d933d79f1a37dbef5925a80cf82]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [bc08487711a74b011fdf760aa1a788af6b5c8a6a]
#    to [4134eefa163f900e3bbf5f1853477a6b6f109033]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [07b627e17e9ef591c5ada94c502a4e67b77e885c]
#    to [9a85ba9d86a1ceae58415bb7a11eed3fb6d5f333]
# 
# patch "contrib/angstrom/build-release.sh"
#  from [0d3b7a36cc56801803e97fa8da4ec459e9a991cd]
#    to [063085f7fea8b84ad5d548c22c48e61a73e934d2]
# 
# patch "packages/enca/enca_1.9.bb"
#  from [7815a20c38ea4d3a4b163268f1afc426eb36fbbe]
#    to [12cf67dc83f652c02eab5abef8445e1d981b41ab]
# 
# patch "packages/fbreader/fbreader_0.7.3d.bb"
#  from [aab2e6e0b1fd44ae8961388d9eb632ca132d9d9c]
#    to [34b11aba6a01b2904f78acd8ce7ad7c3befa6385]
# 
# patch "packages/fbreader/fbreader_0.7.4q.bb"
#  from [3071750398f41c84ca376433b0dd88d50e80577c]
#    to [44451b9b9caf082b52726f201197b9f344126ada]
# 
# patch "packages/fbreader/fbreader_0.8.2a.bb"
#  from [d21eeca9a1bb496e84541d55957587838aaa33e9]
#    to [44fe07852ed8432ebe5f55988cb384231d8b214a]
# 
# patch "packages/gnome/gconf-dbus_svn.bb"
#  from [cfb0cd440b4736752691aef4cc9761eb15e6a9e4]
#    to [17c69da4bd130d92af8af24b002ef34409149a33]
# 
# patch "packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb"
#  from [9781b60290a0df053d4514a522caa2b65fba46e7]
#    to [837a617f042a71fda1b806d153ad3ddf07156a19]
# 
# patch "packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb"
#  from [a29d8bc3586b86df7583d9ab0091bfff380bd07d]
#    to [d18fee8247c479d929f51640542c12d4827b584c]
# 
# patch "packages/linux/linux-handhelds-2.6/asus620/defconfig"
#  from [25e597b7b4d198e03d0d13da080b7b6770a91494]
#    to [1f28f885c5d38a58e7286ab2b6ac1002fdb25919]
# 
# patch "packages/linux/linux-handhelds-2.6/asus730/defconfig"
#  from [0e8d5cfdfde878a557606427897b95ca0ed89e05]
#    to [be44aaf3fb8180bec1b20f704ddcf5310f388c1a]
# 
# patch "packages/linux/linux-handhelds-2.6/aximx50/defconfig"
#  from [c9f1e7f6d4d88ad1489c2bdefbf6c9c836997811]
#    to [5eb86eec70dcb5cd7849c55d2c30f3fa150c699d]
# 
# patch "packages/linux/linux-handhelds-2.6/eteng500/defconfig"
#  from [48d4f15c17a3acca48375951fa650888b11328b0]
#    to [46081d5ce43fbed774749aa007f415e38a84c459]
# 
# patch "packages/linux/linux-handhelds-2.6/h1910/defconfig"
#  from [4edecb50b9ccde22ac6f11152eb079e4ddee7f59]
#    to [d4ecc27e27fe31f1162de33855d5f470a667f155]
# 
# patch "packages/linux/linux-handhelds-2.6/h2200/defconfig"
#  from [be9ab6709d2cbacb25194cc8c418ef362d23cc83]
#    to [08b3c80cfa2998d235449d22eebca4323d6fc861]
# 
# patch "packages/linux/linux-handhelds-2.6/h3600/defconfig"
#  from [062fd682e93b2be2952ce6cd369694e8b1ac98b4]
#    to [3371e00777176fc053ef6c639da693ff9bd8177f]
# 
# patch "packages/linux/linux-handhelds-2.6/h3800/defconfig"
#  from [53c0db328030e9c261b3c25335a476e0382bf159]
#    to [ccabe93146ef341f44e458dc87655fa5b6672b04]
# 
# patch "packages/linux/linux-handhelds-2.6/h3900/defconfig"
#  from [8968beac1464c9ac3f49cd96ca6d44fe7d1a8f44]
#    to [ffc92b049046023011e9edc3be646f0a7171412e]
# 
# patch "packages/linux/linux-handhelds-2.6/h4000/defconfig"
#  from [6679e336469fe518991a6713b58fcc6f01e283a6]
#    to [f8c89b6ee9fd85b9f73616125173acb08dcd876f]
# 
# patch "packages/linux/linux-handhelds-2.6/h5000/defconfig"
#  from [829a8026372e855cabb67aae687021a5ec4807bd]
#    to [a4b32acece2cb8b3cabcfdf0bfb966fbcc84f727]
# 
# patch "packages/linux/linux-handhelds-2.6/htcalpine/defconfig"
#  from [6d8cb5802383d1901b4757495e5d1a96a62ae90e]
#    to [28a648c7ed768cc6d1893808d60c138957994101]
# 
# patch "packages/linux/linux-handhelds-2.6/htcapache/defconfig"
#  from [5a07e8000ae245a21252eef03de6d369324f1c26]
#    to [728952328872977446a2a1f5c5d517fd85b77fe6]
# 
# patch "packages/linux/linux-handhelds-2.6/htcbeetles/defconfig"
#  from [90b63bec87cc48280fdcff164c76f901ee31a9a5]
#    to [d0b072fcacb3d1198cf6492b6a8d9f4842a8deb6]
# 
# patch "packages/linux/linux-handhelds-2.6/htcblueangel/defconfig"
#  from [93877a6b119ac6ff9eac335f5209ace4526ebc26]
#    to [4298a8b960bf2bbbf29d0117be20cc2ddcc2dbfc]
# 
# patch "packages/linux/linux-handhelds-2.6/htchimalaya/defconfig"
#  from [15ed48296aeb843fb65397ab07c3c91b7f551329]
#    to [a0b1e58b136d82b046c1f9f09ea54fe319ef7b9e]
# 
# patch "packages/linux/linux-handhelds-2.6/htcsable/defconfig"
#  from [25c38ecbeefb000df27167a7f64c71575d4e3fd5]
#    to [6be07a550a272c9438b89e3aa72f0077a228b33a]
# 
# patch "packages/linux/linux-handhelds-2.6/htcuniversal/defconfig"
#  from [bad1578f36cf211ff37bf06ddd4814803093fde9]
#    to [4f4cc6cbb707682abc20f3d4f416354fb10ec460]
# 
# patch "packages/linux/linux-handhelds-2.6/htcwallaby/defconfig"
#  from [150bbd7fb1efe62256c73d94c9f73c7d2a573c78]
#    to [69f3e1be12eb511255b730a73ceca46476781aa1]
# 
# patch "packages/linux/linux-handhelds-2.6/hx4700/defconfig"
#  from [658007cf47d59e334d15c78614d0f579c9ee5186]
#    to [dcb72d61b8285f06ef5d4ffb05edddde96c8e41a]
# 
# patch "packages/linux/linux-handhelds-2.6/looxc550/defconfig"
#  from [9173c6f7100182781b44a1b9cfa96d780acd7f44]
#    to [e4fc3f28dfd712bf9f578ff39add76ad21b7a470]
# 
# patch "packages/linux/linux-handhelds-2.6/magician/defconfig"
#  from [7eef8e486c42fc9ae1aedc28705d3194e7aa50b7]
#    to [1c3f28a4f54b40982eb1d7a668d725f8fc66b212]
# 
# patch "packages/linux/linux-handhelds-2.6/rx1950/defconfig"
#  from [27c732122cbbae9384cbed08a597d68154115f8e]
#    to [2df0b2e984871d4e1a64dec9c4d294029b78f2ec]
# 
# patch "packages/linux/linux-handhelds-2.6/rx3000/defconfig"
#  from [efa192ab9c34739127619f4ce566b48b0fb6ecd2]
#    to [a539effd5649afcb400b289746fa35d7cde586e8]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb"
#  from [2e774376b648af5299a532253bd79480809c5e54]
#    to [49685f54bf88b77f0c58a25c20ad416690435f97]
# 
# patch "packages/lua/lua-gtk2_0.3.bb"
#  from [c9dfa04bfadacb293d77536191d5d47951a938fa]
#    to [ce285cb56e4d70c5f08d7a58733d767cc735e58e]
# 
# patch "packages/mono/mono-mcs-intermediate_1.2.6.bb"
#  from [deef347df360a53f2881906e3b02eff6c10d718b]
#    to [fdadd0de483cc47df3e9cae3991787e3ac405de4]
# 
# patch "packages/mono/mono_1.2.6.bb"
#  from [216093941cee4967f4f56a2bc1549128a6d7d30e]
#    to [642bc86c2b995b52f4648891b36cbb23eade40f3]
# 
# patch "packages/mono/mono_1.2.6.inc"
#  from [122a38765ac62d06ad578e74a78979b8bbb87185]
#    to [d1f74194e2241a0bfaab079b1c043f92b0e31f12]
# 
============================================================
--- packages/gnome/libart-lgpl/armeb/art_config.h	d94c2cc1288fee878cb8c9791b3b847eaa6b93e7
+++ packages/gnome/libart-lgpl/armeb/art_config.h	d94c2cc1288fee878cb8c9791b3b847eaa6b93e7
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
============================================================
--- packages/meta/meta-angstrom-2007.bb	4bfd1a85218210707ef5559a74494f4a8159a2e6
+++ packages/meta/meta-angstrom-2007.bb	4bfd1a85218210707ef5559a74494f4a8159a2e6
@@ -0,0 +1,32 @@
+# Meta file to inform the autobuilder which packages to build for the feeds
+# Any changes should be discussed first on the angstrom-distro-devel mailinglist
+
+# Try to keep it alphabetically sorted please
+ 
+inherit meta
+
+RDEPENDS = ""
+
+# Basic tools
+RDEPENDS += " \
+         task-proper-tools \
+	 screen \
+	 "
+
+# Browsers know to work on all archs
+RDEPENDS += " \
+         gpe-mini-browser \
+         midori \
+	 minimo \
+         openmoko-browser2 \
+	 webkit-gtklauncher \
+         "
+
+# Webservers
+RDEPENDS += " \
+        apache2 \
+        boa \
+	cherokee \
+	lighttpd \
+	thttpd \
+	"
============================================================
--- classes/scons.bbclass	7daf072a8b69aecb7a353e129508b5e514b1b5f0
+++ classes/scons.bbclass	c546b54256dc44ccc4500ce748fb77c6d7efdcbd
@@ -6,6 +6,7 @@ scons_do_install() {
 }
 
 scons_do_install() {
+	install -d ${D}${prefix}
         ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \
         oefatal "scons install execution failed."
 }
============================================================
--- conf/checksums.ini	04b4283b58de2ba2856f6def18df3e268135b9bc
+++ conf/checksums.ini	ce22da057e8b56ac8825b7a043b4fa7cc3f86027
@@ -7806,7 +7806,7 @@ sha256=d68f597c303678c3f325f552a0e2780b6
 md5=b67ef657b83ca26249d7b9e9c5e7da69
 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5
 
-[http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.6.tar.bz2]
+[http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2]
 md5=391f85b4f962269e044ceac2b5235310
 sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
 
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	666f9821fd13c25a57a85d18bede92a2a755d104
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	f3d89d1d37708d933d79f1a37dbef5925a80cf82
@@ -1236,7 +1236,7 @@ PREFERRED_VERSION_microwindows ?= "0.90"
 PREFERRED_VERSION_micro-emacs ?= "20060909"
 PREFERRED_VERSION_microcom ?= "1.02"
 PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.0.12"
+PREFERRED_VERSION_midori ?= "0.0.13"
 PREFERRED_VERSION_midpath ?= "0.1"
 PREFERRED_VERSION_midpath-alsa ?= "0.1"
 PREFERRED_VERSION_midpath-cldc ?= "0.1"
@@ -1274,6 +1274,7 @@ PREFERRED_VERSION_mono ?= "1.2.5.1"
 PREFERRED_VERSION_modutils-initscripts ?= "1.0"
 PREFERRED_VERSION_moin ?= "1.5.8"
 PREFERRED_VERSION_mono ?= "1.2.5.1"
+PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1"
 PREFERRED_VERSION_mono-native ?= "1.2.5.1"
 PREFERRED_VERSION_monotone-4 ?= "0.19"
 PREFERRED_VERSION_monotone-5 ?= "0.25.2"
============================================================
--- conf/distro/include/moko-autorev.inc	bc08487711a74b011fdf760aa1a788af6b5c8a6a
+++ conf/distro/include/moko-autorev.inc	4134eefa163f900e3bbf5f1853477a6b6f109033
@@ -10,31 +10,19 @@ SRCREV_pn-neod ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 
-SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-common ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
 SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
 SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
 SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
 SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
@@ -46,21 +34,11 @@ SRCREV_pn-openmoko-sample2 ?= "${AUTOREV
 SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-session ?= "${AUTOREV}"
-SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
-SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
-SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
 SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-today ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	07b627e17e9ef591c5ada94c502a4e67b77e885c
+++ conf/distro/include/sane-srcrevs.inc	9a85ba9d86a1ceae58415bb7a11eed3fb6d5f333
@@ -94,6 +94,7 @@ SRCREV_pn-openmoko-panel-usb ?= "3360"
 SRCREV_pn-openmoko-panel-gsm ?= "3256"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "3360"
+SRCREV_pn-openmoko-sample2 ?= "3528"
 SRCREV_pn-openmoko-session ?= "152"
 SRCREV_pn-openmoko-sample2 ?= "3537"
 SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
============================================================
--- contrib/angstrom/build-release.sh	0d3b7a36cc56801803e97fa8da4ec459e9a991cd
+++ contrib/angstrom/build-release.sh	063085f7fea8b84ad5d548c22c48e61a73e934d2
@@ -36,6 +36,7 @@ do
 for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk
 do
 	BUILD_MACHINE=$machine
+	BUILD_CLEAN="libtool-cross"
 	BUILD_TARGETS="minimal-image console-image"
 	do_build
 done
@@ -59,7 +60,7 @@ do
 for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie 
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="minimal-image console-image x11-image"
+	BUILD_TARGETS="minimal-image console-image minimal-gpe-image x11-image"
 	do_build
 done
 
@@ -76,16 +77,25 @@ do
 for machine in fic-gta01 a780 
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="openmoko-image"
+	BUILD_TARGETS="minimal-openmoko-image openmoko-image"
 	BUILD_CLEAN="qmake2-native"
 	do_build
 done	
 
-#native toolchain
+# populate feeds
 for machine in ep93xx a780 efika collie ixp4xxbe
 do
         BUILD_MACHINE=$machine
-        BUILD_TARGETS="gcc binutils pkgconfig make automake autoconf libtool m4 perl python gdb strace screen"
+        BUILD_TARGETS="meta-angstrom-2007"
         do_build
 done
 
+#cross toolchain
+#for machine in ep93xx a780 efika collie ixp4xxbe
+#do
+#        BUILD_MACHINE=$machine
+#        BUILD_TARGETS="meta-toolchain"
+#	BUILD_CLEAN="meta-toolchain"
+#        do_build
+#done
+
============================================================
--- packages/enca/enca_1.9.bb	7815a20c38ea4d3a4b163268f1afc426eb36fbbe
+++ packages/enca/enca_1.9.bb	12cf67dc83f652c02eab5abef8445e1d981b41ab
@@ -1,7 +1,7 @@ DESCRIPTION = "Enca is an Extremely Naiv
 DESCRIPTION = "Enca is an Extremely Naive Charset Analyser"
-LICENSE = "GPL2"
 SECTION = "libs"
 PRIORITY = "optional"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://trific.ath.cx/software/enca/"
 PR = "r2"
 
============================================================
--- packages/fbreader/fbreader_0.7.3d.bb	aab2e6e0b1fd44ae8961388d9eb632ca132%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rf4fae9004af31107f4f7bba2a4fae3dcb11bc1e5 -r271812b06e9220ace7e7eeaf74f580e3d0ab5da1
#
# 
# 
# rename "packages/roadmap/zroadmap-1.0.12/zroadgps.png"
#     to "packages/roadmap/files/zroadgps.png"
# 
# add_dir "packages/roadmap/files/qt"
# 
# add_file "packages/roadmap/files/qt/qt2-fixes.patch"
#  content [83ebf600b82912603be342974976e1632293f259]
# 
# add_file "packages/roadmap/files/qt/qt_canvas.patch"
#  content [74b0e83a35a344fd9bf34cacb8a7b4406d829290]
# 
# add_file "packages/roadmap/files/qt/qt_main.patch"
#  content [22e4ac263d7fc8c659d6c9ee48b94afb88c0bfb6]
# 
# add_file "packages/roadmap/files/qt/roadmap.desktop.patch"
#  content [42b9a60edcb76bd0609020c491eaa1d1fa6fb1b5]
# 
# add_file "packages/roadmap/files/qt/roadmap_main.patch"
#  content [4d19c6f3d39ebf81201b518228e4ae8376742647]
# 
# add_file "packages/roadmap/roadmap.inc"
#  content [18f16cbe822cba5f8dd391e023297f98a693d254]
# 
# add_file "packages/roadmap/zroadmap.inc"
#  content [6f4897b3cbc5a817995412a0c649a7fffc71554b]
# 
# add_file "packages/roadmap/zroadmap_1.1.0.bb"
#  content [47050a07f10a909f16525fb375ad0bff60a3822e]
# 
# patch "packages/roadmap/roadmap-gtk2_cvs.bb"
#  from [910392dc4aba52e64d998814ab3c6309cde2d477]
#    to [3d494fe1e57842d791e68ad3ac1b63b1692305d6]
# 
# patch "packages/roadmap/zroadmap_1.0.12.bb"
#  from [f694a330e8568d7ed7fa8ef74193a3d34c3837c7]
#    to [defdf4312079c65d41c8d23a255e656af962c476]
# 
# patch "packages/roadmap/zroadmap_cvs.bb"
#  from [9482663decb86dcafc9a60c4a8270154a0fa35df]
#    to [a3e925537e5fc4d227e62224726e06d610c448b3]
# 
============================================================
--- packages/roadmap/files/qt/qt2-fixes.patch	83ebf600b82912603be342974976e1632293f259
+++ packages/roadmap/files/qt/qt2-fixes.patch	83ebf600b82912603be342974976e1632293f259
@@ -0,0 +1,10 @@
+--- src/qt/Makefile~qt2-fixes.patch
++++ src/qt/Makefile
+@@ -19,7 +19,7 @@
+ 
+ ifeq ($(DESKTOP),QPE)
+    CFLAGS += -I$(QTDIR)/include -DQWS
+-   LIBS += -lqte -lqpe
++   LIBS += -lqpe
+    INSTALLDIR=$(QTDIR)
+ endif
============================================================
--- packages/roadmap/files/qt/qt_canvas.patch	74b0e83a35a344fd9bf34cacb8a7b4406d829290
+++ packages/roadmap/files/qt/qt_canvas.patch	74b0e83a35a344fd9bf34cacb8a7b4406d829290
@@ -0,0 +1,20 @@
+--- src/qt/qt_canvas.cc.old	2007-12-08 20:29:52.000000000 -0600
++++ src/qt/qt_canvas.cc	2007-12-13 02:34:22.000000000 -0600
+@@ -122,7 +122,7 @@ void RMapCanvas::getTextExtents(const ch
+    *w = r.width();
+    *ascent = fm.ascent();
+    *descent = fm.descent();
+-#ifdef QT_NO_ROTATE
++#ifdef QT_NO_TRANSFORMATIONS
+    if (can_tilt) *can_tilt = 0;
+ #else
+    if (can_tilt) *can_tilt = 1;
+@@ -169,7 +169,7 @@ void RMapCanvas::drawString(RoadMapGuiPo
+ 
+ void RMapCanvas::drawStringAngle(RoadMapGuiPoint* position,
+       int center, const char* text, int angle) {
+-#ifndef QT_NO_ROTATE
++#ifndef QT_NO_TRANSFORMATIONS
+    if (!pixmap) {
+       return;
+    }
============================================================
--- packages/roadmap/files/qt/qt_main.patch	22e4ac263d7fc8c659d6c9ee48b94afb88c0bfb6
+++ packages/roadmap/files/qt/qt_main.patch	22e4ac263d7fc8c659d6c9ee48b94afb88c0bfb6
@@ -0,0 +1,61 @@
+--- src/qt/qt_main.cc.old	2007-12-08 20:32:34.000000000 -0600
++++ src/qt/qt_main.cc	2007-12-08 20:34:38.000000000 -0600
+@@ -27,6 +27,7 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <unistd.h>
+ #include "qt_main.h"
+ 
+ static int signalFd[2];
+@@ -168,12 +169,6 @@ void RMapMainWindow::addTool(const char*
+                              const char* tip,
+                              RoadMapCallback callback) {
+ 
+-#ifndef QWS
+-   // For some unknown reason, this toolbar crashes RoadMap
+-   // on the Sharp Zaurus.
+-   // This should be fixed and the ifndef removed.
+-   // Pascal: I believe this has been fixed now.
+-
+    if (toolBar == 0) {
+       addToolbar("");
+    }
+@@ -193,20 +188,13 @@ void RMapMainWindow::addTool(const char*
+ 
+       connect(b, SIGNAL(clicked()), cb, SLOT(fire()));
+    }
+-#endif
+ }  
+ 
+ void RMapMainWindow::addToolSpace(void) {
+ 
+-#ifndef QWS
+-   // For some unknown reason, this toolbar crashes RoadMap
+-   // on the Sharp Zaurus. This should be fixed and the ifndef
+-   // removed.
+-
+    addTool (NULL, NULL, NULL, NULL);
+ 
+    toolBar->addSeparator();
+-#endif
+ }
+ 
+ 
+@@ -299,14 +287,14 @@ void RMapMainWindow::closeEvent(QCloseEv
+ 
+ void RMapMainWindow::signalHandler(int sig)
+ {
+-  ::write(signalFd[0], &sig, sizeof(sig));
++  write(signalFd[0], &sig, sizeof(sig));
+ }
+ 
+ void RMapMainWindow::handleSignal()
+ {
+   snSignal->setEnabled(false);
+   int tmp;
+-  ::read(signalFd[1], &tmp, sizeof(tmp));
++  read(signalFd[1], &tmp, sizeof(tmp));
+   QString action;
+   switch (tmp) {
+     case SIGTERM: action="SIGTERM"; break;
============================================================
--- packages/roadmap/files/qt/roadmap.desktop.patch	42b9a60edcb76bd0609020c491eaa1d1fa6fb1b5
+++ packages/roadmap/files/qt/roadmap.desktop.patch	42b9a60edcb76bd0609020c491eaa1d1fa6fb1b5
@@ -0,0 +1,16 @@
+--- src/roadmap.desktop.old	2007-12-08 23:15:45.000000000 -0600
++++ src/roadmap.desktop	2007-12-08 23:17:48.000000000 -0600
+@@ -1,11 +1,8 @@
+ [Desktop Entry]
+-Comment=RoadMap
+ Comment=Car Navigation System
+ Exec=roadmap
+-Icon=roadmap.png
++Icon=roadmap
+ Type=Application
+ Name=RoadMap
+ GenericName=Map Viewer
+-Categories=Application;Other;VectorGraphics;Graphics;Viewer;GTK;
+-FilePattern=*roadmap;*.rdm
+-
++Categories=VectorGraphics;Graphics;Viewer;GTK;
============================================================
--- packages/roadmap/files/qt/roadmap_main.patch	4d19c6f3d39ebf81201b518228e4ae8376742647
+++ packages/roadmap/files/qt/roadmap_main.patch	4d19c6f3d39ebf81201b518228e4ae8376742647
@@ -0,0 +1,16 @@
+--- src/qt/roadmap_main.cc.old	2007-12-08 15:47:05.000000000 -0600
++++ src/qt/roadmap_main.cc	2007-12-07 20:39:15.000000000 -0600
+@@ -195,11 +195,11 @@ void roadmap_main_set_cursor (int newcur
+          break;
+ 
+       case ROADMAP_CURSOR_WAIT:
+-         mainWindow->setCursor (QCursor(Qt::WaitCursor));
++         mainWindow->setCursor (QCursor(Qt::waitCursor));
+          break;
+ 
+       case ROADMAP_CURSOR_CROSS:
+-         mainWindow->setCursor (QCursor(Qt::CrossCursor));
++         mainWindow->setCursor (QCursor(Qt::crossCursor));
+          break;
+       }
+    }
============================================================
--- packages/roadmap/roadmap.inc	18f16cbe822cba5f8dd391e023297f98a693d254
+++ packages/roadmap/roadmap.inc	18f16cbe822cba5f8dd391e023297f98a693d254
@@ -0,0 +1,7 @@
+DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX." 
+PRIORITY = "optional"
+AUTHOR = "Pascal Martin <pascal.martin at iname.com>"
+HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
+LICENSE = "GPL"
+
+PARALLEL_MAKE = ""
============================================================
--- packages/roadmap/zroadmap.inc	6f4897b3cbc5a817995412a0c649a7fffc71554b
+++ packages/roadmap/zroadmap.inc	6f4897b3cbc5a817995412a0c649a7fffc71554b
@@ -0,0 +1,13 @@
+require roadmap.inc
+
+SECTION = "opie/applications"
+
+inherit palmtop
+
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
+QT_LIBRARY_append_c7x0 = " -laticore"
+
+do_configure() {
+	echo removing pregenerated stuff
+	find . -name "moc*"|xargs rm -f
+}
============================================================
--- packages/roadmap/zroadmap_1.1.0.bb	47050a07f10a909f16525fb375ad0bff60a3822e
+++ packages/roadmap/zroadmap_1.1.0.bb	47050a07f10a909f16525fb375ad0bff60a3822e
@@ -0,0 +1,40 @@
+require zroadmap.inc
+
+DEPENDS += "expat"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
+           file://cross.patch;patch=1;pnum=2 \
+           file://qt/qt2-fixes.patch;patch=1 \
+           file://qt/qt_canvas.patch;patch=1 \
+           file://qt/qt_main.patch;patch=1 \
+           file://qt/roadmap_main.patch;patch=1 \
+           file://qt/roadmap.desktop.patch;patch=1 \
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
+           file://zroadgps.png"
+S = "${WORKDIR}/roadmap-${PV}/src"
+
+EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \
+                CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
+                LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
+
+do_compile() {
+	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
+	oe_runmake -C gpx libgpx.a
+	oe_runmake -C unix libosroadmap.a
+	oe_runmake -C qt qtroadmap qtroadgps
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/apps/Applications
+	install -d ${D}${palmtopdir}/pics
+        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
+	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+	install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+        install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/
+	install -d ${D}${palmtopdir}/share/roadmap/
+        install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/
+	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
+}
============================================================
--- packages/roadmap/roadmap-gtk2_cvs.bb	910392dc4aba52e64d998814ab3c6309cde2d477
+++ packages/roadmap/roadmap-gtk2_cvs.bb	3d494fe1e57842d791e68ad3ac1b63b1692305d6
@@ -1,13 +1,8 @@
-DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
-It displays a map of the streets, tracks the position provided by a NMEA-compliant \
-GPS receiver, identifies the street matching this GPS position and announces the name \
-of the crossing street at the next intersection."
-AUTHOR = "Pascal Martin <pascal.martin at iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
-DEPENDS = "popt expat gtk+"
-LICENSE = "GPL"
+require roadmap.inc
+
+DEPENDS = "expat gtk+"
 PV = "1.0.12+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
            file://cross.patch;patch=1;pnum=2 \
@@ -16,7 +11,6 @@ S = "${WORKDIR}/roadmap/src"
 
 S = "${WORKDIR}/roadmap/src"
 
-PARALLEL_MAKE = ""
 CFLAGS += " -I${S} "
 
 
@@ -39,6 +33,5 @@ do_install() {
 	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
 }
 
-
 FILES_${PN} += "${datadir}/roadmap"
 
============================================================
--- packages/roadmap/zroadmap_1.0.12.bb	f694a330e8568d7ed7fa8ef74193a3d34c3837c7
+++ packages/roadmap/zroadmap_1.0.12.bb	defdf4312079c65d41c8d23a255e656af962c476
@@ -1,53 +1,33 @@
-DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
-It displays a map of the streets, tracks the position provided by a NMEA-compliant \
-GPS receiver, identifies the street matching this GPS position and announces the name \
-of the crossing street at the next intersection. A rudimentary trip feature allows \
-RoadMap to display some basic navigation information (distance to the destination, \
-direction, speed, etc..). Voice messages are generated that duplicate some of the screen information."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin at iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
-LICENSE = "GPL"
-PR = "r0"
+require zroadmap.inc
 
+PR = "r1"
+
 SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \
            file://qt2-fixes.patch;pnum=2;patch=1 \
            http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
            file://zroadgps.png"
 S = "${WORKDIR}/roadmap-${PV}/src"
 
-inherit palmtop
-
-QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
-QT_LIBRARY_append_c7x0 = " -laticore"
-
 EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \
                 GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \
                 GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"'
-PARALLEL_MAKE = ""
 
-do_configure() {
-	echo removing pregenerated stuff
-	find . -name "moc*"|xargs rm -f
-}
-
 do_compile() {
 	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a
 	cd qt && oe_runmake
 }
 
 do_install() {
-	cd qt
         install -d ${D}${palmtopdir}/bin
 	install -d ${D}${palmtopdir}/apps/Applications
 	install -d ${D}${palmtopdir}/pics
-        install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap
-	install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps
-	install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
+        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
+	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+        install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
+	install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
 	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
-        install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
+        install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
 	install -d ${D}${palmtopdir}/share/roadmap/
-        install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/
+        install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/
 	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
 }
============================================================
--- packages/roadmap/zroadmap_cvs.bb	9482663decb86dcafc9a60c4a8270154a0fa35df
+++ packages/roadmap/zroadmap_cvs.bb	a3e925537e5fc4d227e62224726e06d610c448b3
@@ -1,37 +1,25 @@
-DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
-It displays a map of the streets, tracks the position provided by a NMEA-compliant \
-GPS receiver, identifies the street matching this GPS position and announces the name \
-of the crossing street at the next intersection."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin at iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
-DEPENDS = "popt expat"
-LICENSE = "GPL"
-PV = "1.0.12+cvs-${SRCDATE}"
+require zroadmap.inc
+
+DEPENDS += "expat"
+SRCDATE = "20071212"
+PV = "1.1.0+cvs-${SRCDATE}"
 PR = "r0"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
-           file://qt2-fixes-r1.patch;pnum=1;patch=1 \
-           http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+           file://cross.patch;patch=1;pnum=2 \
+           file://qt/qt2-fixes.patch;patch=1 \
+           file://qt/qt_canvas.patch;patch=1 \
+#upstream  file://qt/qt_main.patch;patch=1 \
+           file://qt/roadmap_main.patch;patch=1 \
+#upstream  file://qt/roadmap.desktop.patch;patch=1 \
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
            file://zroadgps.png"
 S = "${WORKDIR}/roadmap/src"
 
-inherit palmtop
-
-QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
-QT_LIBRARY_append_c7x0 = " -laticore"
-
 EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
-                CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
+                CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
                 LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
-PARALLEL_MAKE = ""
 
-do_configure() {
-	echo removing pregenerated stuff
-	find . -name "moc*"|xargs rm -f
-}
-
 do_compile() {
 	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
 	oe_runmake -C gpx libgpx.a
@@ -45,10 +33,10 @@ do_install() {
 	install -d ${D}${palmtopdir}/pics
         install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
 	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
-	install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
+	install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
 	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
-        install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
+        instal%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list