[oe-commits] org.oe.dev merge of 'aaa315ace8e5a65feb9e95d2a87bb19cf744b860'

thebohemian commit openembedded-commits at lists.openembedded.org
Thu Feb 14 15:01:10 UTC 2008 

merge of 'aaa315ace8e5a65feb9e95d2a87bb19cf744b860'
     and 'd625decf5e60fa8f122af65024dbcaad6a1f0b19'

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: e3eea2ab1eb9f03b1640b15f0943c4fec05494cb
ViewMTN: http://monotone.openembedded.org/revision/info/e3eea2ab1eb9f03b1640b15f0943c4fec05494cb
Files:
1
packages/gnome/gconf-dbus/gconf-dbus-update.patch
packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
packages/gnome/gconf-dbus_cvs.bb
packages/opie-irc/files
packages/opie-irc/files/utf8-topic.patch
packages/opie-irc/files/utf8.patch
packages/tslib/tslib/ts.conf
packages/udev/udev-115/noasmlinkage.patch
packages/klibc/files/fstype-sane-and-vfat.patch
packages/klibc/files/fstype-sane-and-vfat-jffs2.patch
packages/libpcap/libpcap_0.9.6.bb
packages/libpcap/libpcap.inc
packages/tslib/tslib-1.0/bd-neon
packages/tslib/tslib/bd-neon
packages/tslib/tslib-1.0/fic-gta01
packages/tslib/tslib/fic-gta01
packages/tslib/tslib-1.0/ts.conf
packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch
packages/tslib/tslib/tslib-input_raw-grab_events.patch
packages/udev/udev-115
packages/udev/udev-118
packages/udev/udev_115.bb
packages/udev/udev_118.bb
packages/busybox/busybox-1.9.1
packages/gstreamer/gst-plugin-pulse
packages/linux/linux-rt-2.6.24
packages/linux/linux-rt-2.6.24/mpc8313e-rdb
conf/distro/include/angstrom-2008-preferred-versions.inc
packages/busybox/busybox_1.9.1.bb
packages/gstreamer/gst-plugin-pulse/dont-overload-pulseaudio.patch
packages/images/x11-gpe-java-image.bb
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux-rt_2.6.24.bb
packages/tasks/task-java.bb
conf/distro/angstrom-2008.1.conf
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/sharprom-compatible.conf
packages/busybox/busybox-1.7.2/defconfig
packages/busybox/busybox_1.7.2.bb
packages/gnome/gconf-dbus_svn.bb
packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch
packages/gpe-login/files/lock-on-supend.patch
packages/gpe-login/files/size-autolock-properly.patch
packages/gstreamer/gst-plugin-pulse_0.9.7.bb
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/keylaunch/files/unbreak-keyevents.patch
packages/klibc/klibc-utils-fstype_1.1.1.bb
packages/libpcap/libpcap_0.9.3.bb
packages/libpcap/libpcap_0.9.5.bb
packages/linux/linux-2.6.22/bd-neon/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/linux/linux_2.6.22.bb
packages/logic-analyzer/logic-analyzer_0.8.bb
packages/opie-irc/opie-irc_1.2.3.bb
packages/opie-irc/opie-irc_cvs.bb
packages/python/python_2.5.1.bb
packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch
packages/u-boot/u-boot_1.1.2.bb
packages/maemo4/hildon-1
packages/maemo4/hildon-1/buttonbox.patch
packages/maemo4/hildon-1_svn.bb
packages/maemo4/hildon-base-lib_0.11.1.bb
packages/maemo4/hildon-lgpl_0.12.1.bb
packages/maemo4/hildon-libs_0.15.1.bb
packages/maemo4/hildon-thumbnail_0.11.bb
packages/maemo4/libconic
packages/maemo4/libconic/dbus-api-update.patch
packages/maemo4/libhildonfm/hildonfm-ifdef-maemogtk.diff
packages/maemo4/libhildonfm_1.9.41.bb
packages/maemo4/libhildonhelp_1.9.1.bb
packages/maemo4/libosso_1.20.bb
packages/maemo4/mce-dev_1.5.6.bb
packages/maemo4/osso-gwconnect_1.0.8.bb
packages/maemo4/osso-thumbnail_0.7.bb
packages/maemo4/outo_0.1.1.bb
packages/maemo4/libhildon
packages/maemo4/libosso
packages/maemo4/osso-gnome-vfs2
packages/maemo4/hildon-thumbnail.inc
packages/maemo4/hildon-thumbnail_0.14.bb
packages/maemo4/libhildon/libhildon-buildfix.patch
packages/maemo4/libhildon.inc
packages/maemo4/libhildon_1.99.0.bb
packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch
packages/maemo4/libhildonfm.inc
packages/maemo4/libhildonfm_1.9.46.bb
packages/maemo4/libhildonhelp.inc
packages/maemo4/libhildonhelp_1.9.6.bb
packages/maemo4/libhildonmime.inc
packages/maemo4/libhildonmime_1.10.0.bb
packages/maemo4/libosso/libosso-buildfix.patch
packages/maemo4/libosso.inc
packages/maemo4/libosso_2.13.bb
packages/maemo4/mce-dev.inc
packages/maemo4/mce-dev_1.6.3.bb
packages/maemo4/osso-gnome-vfs2/gnome-vfs-no-kerberos.patch
packages/maemo4/osso-gnome-vfs2_2.16.3.bb
packages/maemo4/osso-gwconnect.inc
packages/maemo4/osso-gwconnect_1.0.12.bb
packages/maemo4/libconic_0.13.bb
packages/maemo4/libgpsbt_0.1.bb
packages/maemo4/libgpsmgr_0.1.bb
packages/maemo4/libhildonmime_1.9.5.bb
packages/maemo4/libosso-gsf_1.11.10.4.bb
packages/maemo4/osso-ic-oss_1.0.4.bb
Diffs:

#
# mt diff -raaa315ace8e5a65feb9e95d2a87bb19cf744b860 -re3eea2ab1eb9f03b1640b15f0943c4fec05494cb
#
# 
# 
# delete "packages/gnome/gconf-dbus/gconf-dbus-update.patch"
# 
# delete "packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch"
# 
# delete "packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch"
# 
# delete "packages/gnome/gconf-dbus_cvs.bb"
# 
# delete "packages/opie-irc/files"
# 
# delete "packages/opie-irc/files/utf8-topic.patch"
# 
# delete "packages/opie-irc/files/utf8.patch"
# 
# delete "packages/tslib/tslib/ts.conf"
# 
# delete "packages/udev/udev-115/noasmlinkage.patch"
# 
# rename "packages/klibc/files/fstype-sane-and-vfat.patch"
#     to "packages/klibc/files/fstype-sane-and-vfat-jffs2.patch"
# 
# rename "packages/libpcap/libpcap_0.9.6.bb"
#     to "packages/libpcap/libpcap.inc"
# 
# rename "packages/tslib/tslib-1.0/bd-neon"
#     to "packages/tslib/tslib/bd-neon"
# 
# rename "packages/tslib/tslib-1.0/fic-gta01"
#     to "packages/tslib/tslib/fic-gta01"
# 
# rename "packages/tslib/tslib-1.0/ts.conf"
#     to "packages/tslib/tslib/ts.conf"
# 
# rename "packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch"
#     to "packages/tslib/tslib/tslib-input_raw-grab_events.patch"
# 
# rename "packages/udev/udev-115"
#     to "packages/udev/udev-118"
# 
# rename "packages/udev/udev_115.bb"
#     to "packages/udev/udev_118.bb"
# 
# add_dir "packages/busybox/busybox-1.9.1"
# 
# add_dir "packages/gstreamer/gst-plugin-pulse"
# 
# add_dir "packages/linux/linux-rt-2.6.24"
# 
# add_dir "packages/linux/linux-rt-2.6.24/mpc8313e-rdb"
# 
# add_file "conf/distro/include/angstrom-2008-preferred-versions.inc"
#  content [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
# 
# add_file "packages/busybox/busybox_1.9.1.bb"
#  content [c8311698ef9ec25768ea49185d010c66448e5a0d]
# 
# add_file "packages/gstreamer/gst-plugin-pulse/dont-overload-pulseaudio.patch"
#  content [983f98f4a785983ba5ee43545808ddd20911b92a]
# 
# add_file "packages/images/x11-gpe-java-image.bb"
#  content [3b45ba2ebb901a469fad2c1a1d1fbe0cd62877e5]
# 
# add_file "packages/libpcap/libpcap_0.9.6.bb"
#  content [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
# 
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
#  content [c051c656cccc3f7c4bb15b21010e3e198b2e651d]
# 
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch"
#  content [4978804f67a8e4bbe5d9320b58f68773a3788b4b]
# 
# add_file "packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig"
#  content [338a192c1a985147143234c61e9e00e2354e4b88]
# 
# add_file "packages/linux/linux-rt_2.6.24.bb"
#  content [0d1629abe27c17f6539b15076ccc9e00513e7c4d]
# 
# add_file "packages/tasks/task-java.bb"
#  content [297623fd9c1f9cc6c4c53842cdc2d5060ac4eeb1]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [7ea86daa05508d4bd45a3e6eeba28b45153de9fe]
#    to [68d8c62fce1fc4da0724773e540d24dd355ccaeb]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [f09fc00fcb956472364428627b653deb21fa27ae]
#    to [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [a20012ca4a3de383c6062b1c564166182a18c681]
#    to [458c1cdc7fdad7be3787a02fe3c5ab93a2b03733]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [fb163a1560e2e33896cf337a40acbf4fc419e625]
#    to [06c680c836e1f326a6ad003d8e7198e317e64709]
# 
# patch "conf/distro/sharprom-compatible.conf"
#  from [dddff62a6004aa3bd797558e337f219b7a2ec7af]
#    to [1917f33c694aff55fe7253f1a1dcb3dcb92edde8]
# 
# patch "packages/busybox/busybox-1.7.2/defconfig"
#  from [1b817a040175f1743b843c14af87276af8dcfdff]
#    to [302bb125b48c659e36990a60ce62686437da9ab4]
# 
# patch "packages/busybox/busybox_1.7.2.bb"
#  from [c8c69ef36216408dc67cc3ed0cee0e19674a311e]
#    to [61b05f11ad827e5fe65f8b8140b7933dd41d915b]
# 
# patch "packages/gnome/gconf-dbus_svn.bb"
#  from [17c69da4bd130d92af8af24b002ef34409149a33]
#    to [0ae937994dd634efb5800bcac5e79d9dcfb531b6]
# 
# patch "packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch"
#  from [6fa3a2c1e0cb701a608210a0843aabcb82734d4d]
#    to [a5c1496221900c044e6c6483458094b98034ba9a]
# 
# patch "packages/gpe-login/files/lock-on-supend.patch"
#  from [20c5d7dd021d07ef26f5bd6ac589a5a43f3e2ea9]
#    to [5406866966cfc13b3e4607b2d9fbc0a94bc0a2a8]
# 
# patch "packages/gpe-login/files/size-autolock-properly.patch"
#  from [63db2b126d2eaaa270c82ccc859e7c367b7912e5]
#    to [c1a466579b9fd2ebfe11028e600aeeb50995c3c0]
# 
# patch "packages/gstreamer/gst-plugin-pulse_0.9.7.bb"
#  from [c5556734ddb08e6598f9977cfab0a4291ccd955b]
#    to [5554f865191f1f521ae855a40f67b2d8b13bc4ac]
# 
# patch "packages/initrdscripts/files/30-bootmenu.sh"
#  from [4b9e167d681b0021650afe5f3dadac184ba2a50b]
#    to [217e6fb3656133f0b3da59e7967d23f3bdf7a59a]
# 
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
#  from [d4ac079860c7ff288110f5543bbff07217a7c618]
#    to [394be03a399dd523d0e97625df53ae15512e0a5d]
# 
# patch "packages/keylaunch/files/unbreak-keyevents.patch"
#  from [2adb5ed37a6c319f1de6d797029f20c67ba92bb6]
#    to [9f39923446520b5769f8d37beadc51063c9d2831]
# 
# patch "packages/klibc/files/fstype-sane-and-vfat-jffs2.patch"
#  from [d4a15a94ce1fcbe5660e3ae975c493c18920219b]
#    to [a7465419a965e47d9c9dbfbd6bb38deb2cc9ebb2]
# 
# patch "packages/klibc/klibc-utils-fstype_1.1.1.bb"
#  from [aee9890849d771d8cb3019aa6ec1ac6af845eea7]
#    to [6ff908d2ee00f7b3302e2a5d0e6088e09b423d88]
# 
# patch "packages/libpcap/libpcap.inc"
#  from [722b9181c176704a1a8b52dcb63e595991e439fc]
#    to [b3fa7b30b55bc1b58d98951e6af205002321959e]
# 
# patch "packages/libpcap/libpcap_0.9.3.bb"
#  from [763b8478be56b0a412ec922f2a53da47b3cc4442]
#    to [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
# 
# patch "packages/libpcap/libpcap_0.9.5.bb"
#  from [763b8478be56b0a412ec922f2a53da47b3cc4442]
#    to [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
# 
# patch "packages/linux/linux-2.6.22/bd-neon/defconfig"
#  from [51ac8c6702a287c8d89868c676af977d0e22b6a8]
#    to [85fd7ff04ade351f2b978e1aabc701ce6ca7ede6]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig"
#  from [a204b75bf54f6f1f8a6ef7240e5e8b1f004a4b0a]
#    to [90a93f46c5489e0ccfb819e76f3dbcaf1dd8c7fd]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig"
#  from [23ca782d6f472d1e761a6093f95804a8b9791c01]
#    to [afd12a3af4f106f7aed0d17aa11d57ad1926ba67]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig"
#  from [f658be1e3ac73663c8b97072413fc3195361acc3]
#    to [4e01e38b76d921efe1287fa89dedcf60f4be9c60]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig"
#  from [f2da0d1b2981cc28521553858baffe9be357b7fb]
#    to [c1987ac5e14751d61e0d555c0e2e361362e72c7f]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig"
#  from [ac242fcf2177317324b66596e9141fedd42efd6b]
#    to [dda584217bf23dc94bbc30cfacdbe56087d9fee1]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
#  from [3c0488eb28e105d6462adbb24b45254313e68d9a]
#    to [f92a949985835df6b375a1c419aea95096316c60]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig"
#  from [5036d3297766c21733bc7cb3dd0e9041372fc268]
#    to [da563aa584be8a2be72ee32964d85d16175fd562]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig"
#  from [46085effa51a509b4586652bc3552e738b09cae2]
#    to [99b053b8acb4395312d738a99a6516c987d5d409]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig"
#  from [eea8af66869932f5258f41d195452406fa3fccee]
#    to [86542c3cc857687a74246ff718370ee11a788d8d]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig"
#  from [1608a8a900fbfe373d8c3adf15bbc5ebc10e5705]
#    to [2040c8752a6f755a6a20d9ff042c5912eb32bb0f]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig"
#  from [5855a7efbbc40ce36dc3168815f963ecbd0b2775]
#    to [32750cd6ada179a51ca03416acd45d51a32ea145]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig"
#  from [3b465d5a2c441d5d0be82a4ac2404697d67a5389]
#    to [85ae080bc9ddf4014b97cd550558c09bfd9ba085]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig"
#  from [5a4edbc07215c7454b6cc3cf1b11185fa10d581c]
#    to [7372bed084e45ce719cdc23451424de4a9893ee0]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig"
#  from [a00ad847e0ff51df836937b16d36a14c999251a9]
#    to [3585f1fc62fc9915c0103ac0650f5bada27c2146]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig"
#  from [d2dfa8c48ea3365f189acbdd681508f85bc577e6]
#    to [02bef9c1024f8dbc325f9d13a4f1d05f4d02ef90]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig"
#  from [2c256ea7858368490b3b310d708708762ddfad00]
#    to [15c4be5203c9d6af61b980beca140c9c48ab1934]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig"
#  from [2233fbc1493eeb6144d4fa69a39147b8e32c5b8e]
#    to [cc5addab0c771671efb084b73ad6608304bac4d9]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig"
#  from [709959ce6dad6b087a4ed4ccdaf25c883c0e17e1]
#    to [473005b7a9ca078839e7f3c06e1d0dbe7b5ce651]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig"
#  from [f9a95661b3adc248bbc695111f87b4ea71d22880]
#    to [ed1fef91e7b0071878107a770c28b2d9157564da]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig"
#  from [cc9b0a83d5a309443ce52868a64d2ef8daeaa4fa]
#    to [35f12816e4e84ebff59a17593f63de3cca783b9e]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig"
#  from [e21a60a2a4216f2069bdef53ae6340426992c992]
#    to [0c13f7fa7358c4fd3b369ac0d6398842b4a2f1f5]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig"
#  from [01b426c233dd9312f97e9dc54d118b7dd30c98ef]
#    to [eb78f0beed41b147084e0b6ab6173d5af624b25f]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig"
#  from [ce060a769fba7b737d9eb6778613d8e8c0d09612]
#    to [0037f3ae4cf65609124f84757a2b6b6398b12261]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig"
#  from [79587145b997777e6efca24a5fd56b92cf4154f4]
#    to [013956ef6b10d21772c7e6c1567c4c7771e7fc30]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
#  from [6ad48d1f06a1ebcf04856c1d9d9952a9c39fc161]
#    to [9b192edda6738e475e2ce3b34c431197f7390c51]
# 
# patch "packages/linux/linux_2.6.22.bb"
#  from [d2956319f8e397f13ec591b680e387dd8d9b6761]
#    to [aac5c473083091c9913aa0f23770731512906188]
# 
# patch "packages/logic-analyzer/logic-analyzer_0.8.bb"
#  from [887bea96f05438c0a3baacddfbfcf142ec2638c8]
#    to [1e3e07bd6310e527a51b823ad86b2c244344f083]
# 
# patch "packages/opie-irc/opie-irc_1.2.3.bb"
#  from [7c1584e98f129223f4252c85d691413f5ade1ec5]
#    to [c4b837cfd973ef9166c1d40ef456df935a8807a3]
# 
# patch "packages/opie-irc/opie-irc_cvs.bb"
#  from [cee4fec93573b3ece698d3fd00fb8ebb408da7e8]
#    to [a9a04d935da27288823d2c6ff1bc605bb7ec11ed]
# 
# patch "packages/python/python_2.5.1.bb"
#  from [6d27b00bf376c2bb92ca2334ea83cc13b1d06aa0]
#    to [06d728d5c77de9872867236d0f3de020ed8b79f1]
# 
# patch "packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb"
#  from [6926e921975f4064b4bf5b6e4030f8afc98652cb]
#    to [13c0bde7a606ffbf475967b7990ea82a22247655]
# 
# patch "packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch"
#  from [5bdc13848fb9c2d6730679aa4337a3e05d20ab64]
#    to [dd071708735bcbf55e0047cbc9a3e89f4da72359]
# 
# patch "packages/u-boot/u-boot_1.1.2.bb"
#  from [1665c20c3e71e8c616a87744bdb4af3b2d8a45fb]
#    to [3e59753d7bc615f69a67bd869ee5820479e942bf]
# 
# patch "packages/udev/udev_118.bb"
#  from [7291914002cb179304f1fa3a8206dbf86247b426]
#    to [ea5479f679eae83985b0d677a1317948a47e3ac4]
# 
============================================================
--- conf/distro/include/angstrom-2008-preferred-versions.inc	ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d
+++ conf/distro/include/angstrom-2008-preferred-versions.inc	ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d
@@ -0,0 +1,8 @@
+PREFERRED_VERSION_dbus = "1.1.4"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_libtool = "1.2.14"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_vte = "0.16.10"
+
============================================================
--- packages/busybox/busybox_1.9.1.bb	c8311698ef9ec25768ea49185d010c66448e5a0d
+++ packages/busybox/busybox_1.9.1.bb	c8311698ef9ec25768ea49185d010c66448e5a0d
@@ -0,0 +1,112 @@
+require busybox.inc
+PR = "r0"
+
+SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+           file://busybox-cron \
+           file://busybox-httpd \
+           file://busybox-udhcpd \
+           file://default.script \
+           file://hwclock.sh \
+           file://mount.busybox \
+           file://syslog \
+           file://syslog.conf \
+           file://udhcpscript.patch;patch=1 \
+           file://umount.busybox \
+           file://run_parts.c \
+           file://defconfig"
+
+EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
+
+do_configure () {
+	cp ${WORKDIR}/run_parts.c ${S}/debianutils/
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	cml1_do_configure
+}
+
+do_compile () {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	base_do_compile
+}
+
+do_install () {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	install -d ${D}${sysconfdir}/init.d
+	oe_runmake "PREFIX=${D}" install
+	cp -pPR ${S}/_install/* ${D}/
+
+	# Move everything to /busybox (not supposed to end up in any package)
+	install -d ${D}/busybox
+	ls ${D} -R
+
+	cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
+	# Move the busybox binary back to /bin
+	install -d ${D}${base_bindir}
+	mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
+	# Move back the sh symlink
+	test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
+
+	install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
+	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
+	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
+		# Move crond back to /usr/sbin/crond
+		install -d ${D}${sbindir}
+		mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
+
+		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
+	fi
+	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
+		# Move httpd back to /usr/sbin/httpd
+		install -d ${D}${sbindir}
+		mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
+
+		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
+		install -d ${D}/srv/www
+	fi
+	if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
+		# Move udhcpd back to /usr/sbin/udhcpd
+		install -d ${D}${sbindir}
+		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
+
+		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
+	fi
+	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
+		# Move hwclock back to /sbin/hwclock
+		install -d ${D}${base_sbindir}
+		mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
+
+		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
+	fi
+	if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
+		# Move dhcpc back to /usr/sbin/udhcpc
+		install -d ${D}${base_sbindir}
+		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
+
+		install -d ${D}${sysconfdir}/udhcpc.d
+		install -d ${D}${datadir}/udhcpc
+		install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
+		install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
+	fi
+
+	install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
+}
+
+pkg_prerm_${PN} () {
+	# This is so you can make busybox commit suicide - removing busybox with no other packages
+	# providing its files, this will make update-alternatives work, but the update-rc.d part
+	# for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
+	tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
+	ln -s /bin/busybox $tmpdir/[
+	ln -s /bin/busybox $tmpdir/test
+	ln -s /bin/busybox $tmpdir/head
+	ln -s /bin/busybox $tmpdir/sh
+	ln -s /bin/busybox $tmpdir/basename
+	ln -s /bin/busybox $tmpdir/echo
+	ln -s /bin/busybox $tmpdir/mv
+	ln -s /bin/busybox $tmpdir/ln
+	ln -s /bin/busybox $tmpdir/dirname
+	ln -s /bin/busybox $tmpdir/rm
+	ln -s /bin/busybox $tmpdir/sed
+	ln -s /bin/busybox $tmpdir/sort
+	export PATH=$PA%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rd625decf5e60fa8f122af65024dbcaad6a1f0b19 -re3eea2ab1eb9f03b1640b15f0943c4fec05494cb
#
# 
# 
# delete "packages/maemo4/hildon-1"
# 
# delete "packages/maemo4/hildon-1/buttonbox.patch"
# 
# delete "packages/maemo4/hildon-1_svn.bb"
# 
# delete "packages/maemo4/hildon-base-lib_0.11.1.bb"
# 
# delete "packages/maemo4/hildon-lgpl_0.12.1.bb"
# 
# delete "packages/maemo4/hildon-libs_0.15.1.bb"
# 
# delete "packages/maemo4/hildon-thumbnail_0.11.bb"
# 
# delete "packages/maemo4/libconic"
# 
# delete "packages/maemo4/libconic/dbus-api-update.patch"
# 
# delete "packages/maemo4/libhildonfm/hildonfm-ifdef-maemogtk.diff"
# 
# delete "packages/maemo4/libhildonfm_1.9.41.bb"
# 
# delete "packages/maemo4/libhildonhelp_1.9.1.bb"
# 
# delete "packages/maemo4/libosso_1.20.bb"
# 
# delete "packages/maemo4/mce-dev_1.5.6.bb"
# 
# delete "packages/maemo4/osso-gwconnect_1.0.8.bb"
# 
# delete "packages/maemo4/osso-thumbnail_0.7.bb"
# 
# delete "packages/maemo4/outo_0.1.1.bb"
# 
# add_dir "packages/maemo4/libhildon"
# 
# add_dir "packages/maemo4/libosso"
# 
# add_dir "packages/maemo4/osso-gnome-vfs2"
# 
# add_file "packages/maemo4/hildon-thumbnail.inc"
#  content [5f522a76af0f370d8aba840c711e6f53521948c3]
# 
# add_file "packages/maemo4/hildon-thumbnail_0.14.bb"
#  content [b965c3b2137d65d559b6e2fc3a5d1b06f42af721]
# 
# add_file "packages/maemo4/libhildon/libhildon-buildfix.patch"
#  content [95afc0884957f9c34df62b25506ef6bb991c4e84]
# 
# add_file "packages/maemo4/libhildon.inc"
#  content [70a67dff25516f5733a761759e0fe24718b8faa9]
# 
# add_file "packages/maemo4/libhildon_1.99.0.bb"
#  content [9c8b8b8a3261c7099d8d7e00f2c559f3577e526f]
# 
# add_file "packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch"
#  content [b3308e8f1d2f73e45f3a3a84ce22d4f0d3fa26ab]
# 
# add_file "packages/maemo4/libhildonfm.inc"
#  content [702ae68cf109a6449b217f12b2a3a9ae5b0ce95c]
# 
# add_file "packages/maemo4/libhildonfm_1.9.46.bb"
#  content [f13cecd2da630a4df022e8780af9cb3f75586d07]
# 
# add_file "packages/maemo4/libhildonhelp.inc"
#  content [d8798eb52cf25927b963391842c55fd69b1e89c0]
# 
# add_file "packages/maemo4/libhildonhelp_1.9.6.bb"
#  content [fc40d0fd11f7e9167f02bafeb9e9c2334118b144]
# 
# add_file "packages/maemo4/libhildonmime.inc"
#  content [47c2382c0cdb243012f49d3e541b7c340d787655]
# 
# add_file "packages/maemo4/libhildonmime_1.10.0.bb"
#  content [25951b1409cc178b5fb12b25009d3b44aa028546]
# 
# add_file "packages/maemo4/libosso/libosso-buildfix.patch"
#  content [3dcbcb1b3f4d798e66346fdb379b03e0bd80f16b]
# 
# add_file "packages/maemo4/libosso.inc"
#  content [304467b6e4fd87052f5fe7daf6f379f4a96c86ad]
# 
# add_file "packages/maemo4/libosso_2.13.bb"
#  content [4084cd02d497ea92af50a90283bd54226b6b3b01]
# 
# add_file "packages/maemo4/mce-dev.inc"
#  content [5af6061604f9698708256b504e2cd24676a9201c]
# 
# add_file "packages/maemo4/mce-dev_1.6.3.bb"
#  content [60831cce23d1983db9de94e671ef0e88559862ac]
# 
# add_file "packages/maemo4/osso-gnome-vfs2/gnome-vfs-no-kerberos.patch"
#  content [860446c945edbfcc96fafaaca0498b642e6a22dc]
# 
# add_file "packages/maemo4/osso-gnome-vfs2_2.16.3.bb"
#  content [bee779cc4c4133738b9494b780167ddb0d0d99d9]
# 
# add_file "packages/maemo4/osso-gwconnect.inc"
#  content [48df958c4d4eb97102b6f038e9f56b83505dd192]
# 
# add_file "packages/maemo4/osso-gwconnect_1.0.12.bb"
#  content [bda7afdb51174da9146347834d120c0ab889788e]
# 
# patch "packages/maemo4/libconic_0.13.bb"
#  from [a868945ce6c923fc705a172c4c384f2e3ccf6103]
#    to [ab4ddb0173de6129aef409aac2bc3aa58439a632]
# 
# patch "packages/maemo4/libgpsbt_0.1.bb"
#  from [15eacab347380f9222a9961bb33430d27ceae9e9]
#    to [acd6d25155e29d080a975c204b84771b813db795]
# 
# patch "packages/maemo4/libgpsmgr_0.1.bb"
#  from [e570f94af0edecdef5a0be390b83dea9b4f11d9e]
#    to [a44a220435fe6a837c7a32843e089c6e43f35c57]
# 
# patch "packages/maemo4/libhildonmime_1.9.5.bb"
#  from [bee736d32a41ff42806e5b50c9f6e17f193394b2]
#    to [fb43e486b4c6e10edbe7df380d4dee4844699741]
# 
# patch "packages/maemo4/libosso-gsf_1.11.10.4.bb"
#  from [50510c332d867a95b40caeef898ac30d59b53dbf]
#    to [3a58ae7ec2c9c3b275f3a7c4c5d8f2eaa1bcdee1]
# 
# patch "packages/maemo4/osso-ic-oss_1.0.4.bb"
#  from [dead034f542e3a2def64bfbccd112417c8ed2e7b]
#    to [b2b4db3ddd51e753e50b20cc518ea5e0e1c09b8f]
# 
============================================================
--- packages/maemo4/hildon-thumbnail.inc	5f522a76af0f370d8aba840c711e6f53521948c3
+++ packages/maemo4/hildon-thumbnail.inc	5f522a76af0f370d8aba840c711e6f53521948c3
@@ -0,0 +1,19 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon thumbnail library"
+
+DEPENDS = "libhildonmime"
+
+inherit autotools pkgconfig lib_package
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.ac
+
+	touch gtk-doc.make
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+
============================================================
--- packages/maemo4/hildon-thumbnail_0.14.bb	b965c3b2137d65d559b6e2fc3a5d1b06f42af721
+++ packages/maemo4/hildon-thumbnail_0.14.bb	b965c3b2137d65d559b6e2fc3a5d1b06f42af721
@@ -0,0 +1,10 @@
+require hildon-thumbnail.inc
+
+DEPENDS = "libhildon libosso"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/h/${PN}/${PN}_${PV}.tar.gz \
+          "
+
+
============================================================
--- packages/maemo4/libhildon/libhildon-buildfix.patch	95afc0884957f9c34df62b25506ef6bb991c4e84
+++ packages/maemo4/libhildon/libhildon-buildfix.patch	95afc0884957f9c34df62b25506ef6bb991c4e84
@@ -0,0 +1,16 @@
+Index: libhildon-1.99.0/src/hildon-code-dialog.c
+===================================================================
+--- libhildon-1.99.0.orig/src/hildon-code-dialog.c	2007-10-10 15:03:09.000000000 +0200
++++ libhildon-1.99.0/src/hildon-code-dialog.c	2008-02-13 13:54:47.000000000 +0100
+@@ -302,7 +302,11 @@
+     gtk_container_add (GTK_CONTAINER (priv->buttons[3][2]), image1);
+     dialog_action_area1 = GTK_DIALOG (dialog)->action_area;
+     gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),
++#if defined (MAEMO_GTK)
+             GTK_BUTTONBOX_CENTER);
++#else
++            GTK_BUTTONBOX_DEFAULT_STYLE);
++#endif
+ 
+     okButton = gtk_dialog_add_button (GTK_DIALOG (dialog) ,DEVICELOCK_OK,
+             GTK_RESPONSE_OK);
============================================================
--- packages/maemo4/libhildon.inc	70a67dff25516f5733a761759e0fe24718b8faa9
+++ packages/maemo4/libhildon.inc	70a67dff25516f5733a761759e0fe24718b8faa9
@@ -0,0 +1,13 @@
+DESCRIPTION = "Hildon widget library"
+LICENSE = "LGPL"
+
+DEPENDS = "gconf-dbus esound gtk+"
+
+inherit autotools pkgconfig lib_package
+
+EXTRA_OECONF = "--with-maemo-gtk=no"
+
+do_stage() {
+        autotools_stage_all
+}
+
============================================================
--- packages/maemo4/libhildon_1.99.0.bb	9c8b8b8a3261c7099d8d7e00f2c559f3577e526f
+++ packages/maemo4/libhildon_1.99.0.bb	9c8b8b8a3261c7099d8d7e00f2c559f3577e526f
@@ -0,0 +1,11 @@
+require libhildon.inc
+
+DEPENDS += "libpng libxt libxi"
+
+SRC_URI = "\
+  http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz \
+  file://libhildon-buildfix.patch;patch=1 \
+  "
+
+
+
============================================================
--- packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch	b3308e8f1d2f73e45f3a3a84ce22d4f0d3fa26ab
+++ packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch	b3308e8f1d2f73e45f3a3a84ce22d4f0d3fa26ab
@@ -0,0 +1,133 @@
+Index: libhildonfm-1.9.46/hildon-fm/hildon-file-chooser-dialog.c
+===================================================================
+--- libhildonfm-1.9.46.orig/hildon-fm/hildon-file-chooser-dialog.c	2007-10-16 10:11:59.000000000 +0200
++++ libhildonfm-1.9.46/hildon-fm/hildon-file-chooser-dialog.c	2008-02-14 08:24:41.000000000 +0100
+@@ -192,6 +192,7 @@
+   return (first_digit << 4) | second_digit;
+ }
+ 
++#ifdef USE_MAEMO_GTK
+ static void chooser_entry_invalid_input_cb (GtkEntry *entry,
+                                             GtkInvalidInputType inv_type,
+                                             gpointer user_data)
+@@ -202,6 +203,7 @@
+                                     HCS("ckdg_ib_maximum_characters_reached"));
+   }
+ }
++#endif
+ 
+ static gchar *
+ g_unescape_uri_string (const char *escaped,
+@@ -1838,7 +1840,9 @@
+     g_object_class_install_property(gobject_class, PROP_SELECTION_MODE, pspec);
+ 
+ 
++#ifdef USE_MAEMO_GTK
+     hildon_gtk_file_chooser_install_properties(gobject_class);
++#endif
+ }
+ 
+ static void hildon_file_chooser_dialog_sort_changed(GtkWidget * item,
+@@ -1975,10 +1979,10 @@
+           g_signal_connect( priv->entry_name, "changed",
+                           G_CALLBACK( hildon_file_chooser_entry_changed ),
+                           self );
+-
++#ifdef USE_MAEMO_GTK
+     g_signal_connect(priv->entry_name, "invalid-input",
+                      G_CALLBACK(chooser_entry_invalid_input_cb), self);
+-
++#endif
+     priv->hbox_location = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+     priv->hbox_items = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+     priv->image_location = gtk_image_new();
+Index: libhildonfm-1.9.46/hildon-fm/hildon-file-selection.c
+===================================================================
+--- libhildonfm-1.9.46.orig/hildon-fm/hildon-file-selection.c	2007-10-16 10:11:59.000000000 +0200
++++ libhildonfm-1.9.46/hildon-fm/hildon-file-selection.c	2008-02-14 08:21:31.000000000 +0100
+@@ -2036,6 +2036,7 @@
+     g_object_set(cell, "text", buffer, "sensitive", sensitive, NULL);
+ }
+ 
++#ifdef USE_MAEMO_GTK
+ static void hildon_file_selection_navigation_pane_context(GtkWidget *
+                                                           widget,
+                                                           gpointer data)
+@@ -2052,6 +2053,7 @@
+     ULOG_DEBUG(__FUNCTION__);
+     g_signal_emit(data, signal_content_pane_context_menu, 0);
+ }
++#endif
+ 
+ static gboolean hildon_file_selection_on_content_pane_key(GtkWidget *
+                                                           widget,
+@@ -2200,6 +2202,7 @@
+   }
+ }
+ 
++#ifdef USE_MAEMO_GTK
+ static gboolean
+ tap_and_hold_query (gpointer self, guint signal_id)
+ {
+@@ -2224,6 +2227,7 @@
+ {
+   return tap_and_hold_query (self, signal_navigation_pane_context_menu);
+ }
++#endif
+ 
+ static void hildon_file_selection_create_thumbnail_view(HildonFileSelection
+                                                         * self)
+@@ -2277,7 +2281,7 @@
+     g_signal_connect_object(tree, "key-press-event",
+                      G_CALLBACK(hildon_file_selection_on_content_pane_key),
+                      self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
+                                   GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+     g_signal_connect_object (tree, "tap-and-hold-query",
+@@ -2286,7 +2290,7 @@
+     g_signal_connect_object(tree, "tap-and-hold",
+                      G_CALLBACK
+                      (hildon_file_selection_content_pane_context), self, 0);
+-
++#endif
+     g_signal_connect_object(tree, "notify::has-focus",
+                      G_CALLBACK(content_pane_focus), self, 0);
+ }
+@@ -2397,7 +2401,7 @@
+         (selection, "changed",
+          G_CALLBACK (hildon_file_selection_content_pane_selection_changed),
+          self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
+                                   GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+     g_signal_connect_object (tree, "tap-and-hold-query",
+@@ -2406,7 +2410,7 @@
+     g_signal_connect_object(tree, "tap-and-hold",
+                      G_CALLBACK
+                      (hildon_file_selection_content_pane_context), self, 0);
+-
++#endif
+     g_signal_connect_object(tree, "key-press-event",
+                      G_CALLBACK(hildon_file_selection_on_content_pane_key),
+                      self, 0);
+@@ -2492,7 +2496,7 @@
+     g_signal_connect_object(selection, "changed",
+                      G_CALLBACK(hildon_file_selection_selection_changed),
+                      self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     gtk_widget_tap_and_hold_setup(GTK_WIDGET(self->priv->dir_tree), NULL,
+                                   NULL, GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+     g_signal_connect_object (self->priv->dir_tree, "tap-and-hold-query",
+@@ -2502,7 +2506,7 @@
+                      G_CALLBACK
+                      (hildon_file_selection_navigation_pane_context),
+                      self, 0);
+-
++#endif
+     g_signal_connect_object(self->priv->dir_tree, "key-press-event",
+                      G_CALLBACK
+                      (hildon_file_selection_on_navigation_pane_key), self, 0);
============================================================
--- packages/maemo4/libhildonfm.inc	702ae68cf109a6449b217f12b2a3a9ae5b0ce95c
+++ packages/maemo4/libhildonfm.inc	702ae68cf109a6449b217f12b2a3a9ae5b0ce95c
@@ -0,0 +1,22 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon filemanager library"
+
+DEPENDS = "gtk+ libxi libxt libpng gconf dbus libosso libhildon hildon-thumbnail libhildonmime osso-gwconnect mce-dev"
+
+inherit autotools pkgconfig lib_package
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.ac
+
+	touch gtk-doc.make
+}
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+	autotools_stage_all
+	ln -sf ${STAGING_INCDIR}/hildon-fm-2/hildon/* ${STAGING_INCDIR}/hildon-widgets/
+}
+
+
============================================================
--- packages/maemo4/libhildonfm_1.9.46.bb	f13cecd2da630a4df022e8780af9cb3f75586d07
+++ packages/maemo4/libhildonfm_1.9.46.bb	f13cecd2da630a4df022e8780af9cb3f75586d07
@@ -0,0 +1,9 @@
+require libhildonfm.inc
+
+PR = "r1"
+
+SRC_URI = "\
+	http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}.tar.gz \
+  file://libhildonfm-gtkmaemo-ifdef.patch;patch=1 \
+	"
+
============================================================
--- packages/maemo4/libhildonhelp.inc	d8798eb52cf25927b963391842c55fd69b1e89c0
+++ packages/maemo4/libhildonhelp.inc	d8798eb52cf25927b963391842c55fd69b1e89c0
@@ -0,0 +1,17 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon help library"
+
+DEPENDS = "gtk+ intltool-native libxml2 gtkhtml-3.8 libosso libhildon"
+
+inherit autotools pkgconfig lib_package
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.ac
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+
============================================================
--- packages/maemo4/libhildonhelp_1.9.6.bb	fc40d0fd11f7e9167f02bafeb9e9c2334118b144
+++ packages/maemo4/libhildonhelp_1.9.6.bb	fc40d0fd11f7e9167f02bafeb9e9c2334118b144
@@ -0,0 +1,6 @@
+require libhildonhelp.inc
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz"
+
============================================================
--- packages/maemo4/libhildonmime.inc	47c2382c0cdb243012f49d3e541b7c340d787655
+++ packages/maemo4/libhildonmime.inc	47c2382c0cdb243012f49d3e541b7c340d787655
@@ -0,0 +1,17 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon mime library"
+
+DEPENDS = "libosso gnome-vfs"
+
+inherit autotools pkgconfig lib_package
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.in
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+
============================================================
--- packages/maemo4/libhildonmime_1.10.0.bb	25951b1409cc178b5fb12b25009d3b44aa028546
+++ packages/maemo4/libhildonmime_1.10.0.bb	25951b1409cc178b5fb12b25009d3b44aa028546
@@ -0,0 +1,7 @@
+require libhildonmime.inc
+
+DEPENDS += "osso-gnome-vfs2"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz"
============================================================
--- packages/maemo4/libosso/libosso-buildfix.patch	3dcbcb1b3f4d798e66346fdb379b03e0bd80f16b
+++ packages/maemo4/libosso/libosso-buildfix.patch	3dcbcb1b3f4d798e66346fdb379b03e0bd80f16b
@@ -0,0 +1,64 @@
+Index: libosso-2.13/src/osso-hw.c
+===================================================================
+--- libosso-2.13.orig/src/osso-hw.c	2008-02-13 12:55:17.000000000 +0100
++++ libosso-2.13/src/osso-hw.c	2008-02-13 13:02:55.000000000 +0100
+@@ -23,6 +23,9 @@
+  * 02110-1301 USA
+  */%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list