[oe-commits] org.oe.dev merge of '55132066284089ca5853bcbb50bbd4990ec25823'

woglinde2 commit oe at amethyst.openembedded.net
Mon Sep 1 17:58:11 UTC 2008 

merge of '55132066284089ca5853bcbb50bbd4990ec25823'
     and '5565cda387e227c33c34f8743f541e7737fc5b1b'

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: 44147c36bbb2a3438d57b6293a393355eeffc48b
ViewMTN: http://monotone.openembedded.org/revision/info/44147c36bbb2a3438d57b6293a393355eeffc48b
Files:
1
packages/linux/linux-omap2-git/beagleboard/flash.patch
packages/linux/linux-omap2-git/beagleboard/flash2.patch
packages/motion/motion_3.2.9.bb
packages/motion/motion_3.2.10.1.bb
packages/fvwm
packages/fvwm/files
packages/glib-2.0/glib-2.0-2.16.4
packages/gtk+/gtk+-2.12.11
packages/openmax
packages/openmax/gst-openmax
packages/xorg-font/xorg-minimal-fonts
packages/xorg-font/xorg-minimal-fonts/misc
packages/dvbtools/wscan_20080720.bb
packages/fvwm/files/acinclude.m4.patch
packages/fvwm/files/oe-configure.ac.patch
packages/fvwm/files/upstream-configure.ac.patch
packages/fvwm/fvwm_2.5.26.bb
packages/gimp/gimp_2.5.2.bb
packages/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch
packages/glib-2.0/glib-2.0_2.16.4.bb
packages/gtk+/gtk+-2.12.11/cellrenderer-cairo.patch
packages/gtk+/gtk+-2.12.11/combo-arrow-size.patch
packages/gtk+/gtk+-2.12.11/disable-print.patch
packages/gtk+/gtk+-2.12.11/entry-cairo.patch
packages/gtk+/gtk+-2.12.11/hardcoded_libtool.patch
packages/gtk+/gtk+-2.12.11/menu-deactivate.patch
packages/gtk+/gtk+-2.12.11/no-demos.patch
packages/gtk+/gtk+-2.12.11/pangoxft2.10.6.diff
packages/gtk+/gtk+-2.12.11/range-no-redraw.patch
packages/gtk+/gtk+-2.12.11/run-iconcache.patch
packages/gtk+/gtk+-2.12.11/scrolled-placement.patch
packages/gtk+/gtk+-2.12.11/toggle-font.diff
packages/gtk+/gtk+_2.12.11.bb
packages/libexif/libexif_0.6.16.bb
packages/librsvg/librsvg_2.22.2.bb
packages/linux-libc-headers/linux-libc-headers-2.6.25/netfilter-include-types_h-in-userspace.patch
packages/openmax/gst-openmax/check.diff
packages/openmax/gst-openmax_0.10.0.4.bb
packages/openmax/libomxil-bellagio_0.9.0.bb
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias
packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir
packages/xorg-font/xorg-minimal-fonts.bb
classes/cpan.bbclass
classes/gnome.bbclass
conf/distro/include/preferred-om-2008-versions.inc
packages/ffmpeg/ffmpeg_git.bb
packages/gcc/gcc-4.2.4.inc
packages/gcc/gcc-configure-common.inc
packages/gcc/gcc-cross_4.2.4.bb
packages/gcc/gcc_4.2.4.bb
packages/gimp/babl_svn.bb
packages/gimp/gegl_svn.bb
packages/gnome/gconf_2.6.1.bb
packages/gstreamer/gst-common.inc
packages/gstreamer/gstreamer_0.10.17.bb
packages/images/beagleboard-demo-image.bb
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie
packages/lcms/lcms_1.17.bb
packages/libexif/libexif_0.6.13.bb
packages/linux/linux-kaiser_2.6.24+git.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/linux-libc-headers/linux-libc-headers_2.6.25.bb
packages/mozilla/firefox.inc
packages/mozilla/firefox_3.0.1.bb
packages/perl/liburi-perl_1.35.bb
packages/perl/libwww-perl_5.808.bb
packages/postgresql/postgresql.inc
packages/postgresql/postgresql_8.1.4.bb
packages/postgresql/postgresql_8.1.8.bb
packages/postgresql/postgresql_8.2.4.bb
packages/qmake/qmake2-sdk_2.10a.bb
packages/quake/quetoo_0.6.1.bb
packages/rrdtool/rrdtool_1.0.49.bb
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg/xorg.conf
packages/xorg-xserver/xserver-xorg_1.4.2.bb
packages/xorg-xserver/xserver-xorg_1.4.bb
site/common
mtn:manual_merge
true
packages/gettext/gettext-native_0.14.1.bb
packages/gettext/gettext-native_0.17.bb
packages/gettext/gettext_0.14.1.bb
packages/gettext/gettext_0.17.bb
packages/gettext/gettext-0.17
packages/gettext/gettext-0.17/autotools.patch
packages/gettext/gettext-0.17/gettext-error_print_progname.patch
packages/gettext/gettext-0.17/wchar-uclibc.patch
Diffs:

#
# mt diff -r55132066284089ca5853bcbb50bbd4990ec25823 -r44147c36bbb2a3438d57b6293a393355eeffc48b
#
#
#
# delete "packages/linux/linux-omap2-git/beagleboard/flash.patch"
# 
# delete "packages/linux/linux-omap2-git/beagleboard/flash2.patch"
# 
# rename "packages/motion/motion_3.2.9.bb"
#     to "packages/motion/motion_3.2.10.1.bb"
# 
# add_dir "packages/fvwm"
# 
# add_dir "packages/fvwm/files"
# 
# add_dir "packages/glib-2.0/glib-2.0-2.16.4"
# 
# add_dir "packages/gtk+/gtk+-2.12.11"
# 
# add_dir "packages/openmax"
# 
# add_dir "packages/openmax/gst-openmax"
# 
# add_dir "packages/xorg-font/xorg-minimal-fonts"
# 
# add_dir "packages/xorg-font/xorg-minimal-fonts/misc"
# 
# add_file "packages/dvbtools/wscan_20080720.bb"
#  content [52a3be74a31e93046af2d5a4e6f97de827f031da]
# 
# add_file "packages/fvwm/files/acinclude.m4.patch"
#  content [561b9b06c336299032206d93e32b80521024c017]
# 
# add_file "packages/fvwm/files/oe-configure.ac.patch"
#  content [4e865a38ec6a1a3c6e368c12c0ce2f135e54ae75]
# 
# add_file "packages/fvwm/files/upstream-configure.ac.patch"
#  content [a568633c0100b87cff00930b1f23aa83bda56e84]
# 
# add_file "packages/fvwm/fvwm_2.5.26.bb"
#  content [93a5c0c7fcfc00221d47c5c222ec083b77226ece]
# 
# add_file "packages/gimp/gimp_2.5.2.bb"
#  content [9c89b8d8103081d0931b9b8ae5eda2e158992b98]
# 
# add_file "packages/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch"
#  content [3944dc9eb7d2637db0cf7bba8a08ce35a84ccdb9]
# 
# add_file "packages/glib-2.0/glib-2.0_2.16.4.bb"
#  content [5d9c30d63163e5b32ab11e915123af2ceb09d8fd]
# 
# add_file "packages/gtk+/gtk+-2.12.11/cellrenderer-cairo.patch"
#  content [f343e9c8fa9252834d1fc2d38498f7ca81027cf7]
# 
# add_file "packages/gtk+/gtk+-2.12.11/combo-arrow-size.patch"
#  content [86b154ddff681414b9ee93698f070af87eba8941]
# 
# add_file "packages/gtk+/gtk+-2.12.11/disable-print.patch"
#  content [15ba697401f4585005e6347d20498c7b1417f917]
# 
# add_file "packages/gtk+/gtk+-2.12.11/entry-cairo.patch"
#  content [7716bcd4fe95b61148fe31a6054081e08dfa616e]
# 
# add_file "packages/gtk+/gtk+-2.12.11/hardcoded_libtool.patch"
#  content [a40162e85381f42e96a15ef9f6b7a8293f07fd63]
# 
# add_file "packages/gtk+/gtk+-2.12.11/menu-deactivate.patch"
#  content [e0d8b253f81a5a01dbf5ffb9cfadda1799d7a3af]
# 
# add_file "packages/gtk+/gtk+-2.12.11/no-demos.patch"
#  content [765d8c563c164194e2b075eb32f57ef54bbba098]
# 
# add_file "packages/gtk+/gtk+-2.12.11/pangoxft2.10.6.diff"
#  content [c646b9f34fcf6fe7f0ddfef6d3ae66dfe24da0ab]
# 
# add_file "packages/gtk+/gtk+-2.12.11/range-no-redraw.patch"
#  content [2a456a9d163cedfca69de0662b26ad7060a41827]
# 
# add_file "packages/gtk+/gtk+-2.12.11/run-iconcache.patch"
#  content [2ab8f280d83e22b887247404cd6d7ac1afc3ed37]
# 
# add_file "packages/gtk+/gtk+-2.12.11/scrolled-placement.patch"
#  content [7258aed311d562ad735d04a51494b529cf66483b]
# 
# add_file "packages/gtk+/gtk+-2.12.11/toggle-font.diff"
#  content [892becbc52bd83e40c849d6d81f6f25f5d1d36ed]
# 
# add_file "packages/gtk+/gtk+_2.12.11.bb"
#  content [0ea862be3391e179125d0f3d9ef779ecc9dcf19c]
# 
# add_file "packages/libexif/libexif_0.6.16.bb"
#  content [a5932ff26f4fc735af6140a6be7dc0d012ce2ca3]
# 
# add_file "packages/librsvg/librsvg_2.22.2.bb"
#  content [26a76090cdc2b610d75c764240326436d53ceb78]
# 
# add_file "packages/linux-libc-headers/linux-libc-headers-2.6.25/netfilter-include-types_h-in-userspace.patch"
#  content [6c628c3b14fcd2311708e6c5c0476b7424bde03e]
# 
# add_file "packages/openmax/gst-openmax/check.diff"
#  content [529efd5da40132846a3b9f486a964ed181172fa3]
# 
# add_file "packages/openmax/gst-openmax_0.10.0.4.bb"
#  content [aff077d569ce12cb4c35561b4eb7b540f8dc007d]
# 
# add_file "packages/openmax/libomxil-bellagio_0.9.0.bb"
#  content [fda311d4a0f0f4e5e8e500079e7e19d321341b47]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz"
#  content [429c6b61382bd539052d61e0e492ff06351d415c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz"
#  content [db8ecae135e0d092c20091c93dbd96a8e241ea8c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz"
#  content [05488b45cf91e6fc2583fb970317d3ff62b07e4e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz"
#  content [44a1121639c0366043e14b57614197e456cbdade]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz"
#  content [3beb6a9f8e524c1caeeef4b119a1fd932431be01]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz"
#  content [b68f5991e595ba87974d5b2a2a348e9a41f31ff6]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz"
#  content [5a8f30aa3a84090edd9d9970138f8518ad52ea42]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz"
#  content [f39689a63574d53673ce145236b793a8fb74eb86]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz"
#  content [ce0483714796cf32b129e2942ce43bd90616018c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz"
#  content [1c7c5ebaaec6677141f849f5645a159e9b5ae6c5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz"
#  content [b9a2401a4204bb8e3eb7eab6ceab34cfa84b0b78]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz"
#  content [aa16398f10c3db5d484643953c24712c8560292c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz"
#  content [d664e50af10cda6de4fe527c64ec4c1ee4d2681d]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz"
#  content [1b80980bf41f523d19329a8aeea8b34d5ffcbf0e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz"
#  content [903b975d18174204adc7edd8aefdeb450b11e5e2]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz"
#  content [31be221a15a70ae08c27b7f90d960b4134989b13]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz"
#  content [1770b1947e0b38dd824efd94a1822ee837a55a8d]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz"
#  content [34646b988ede3dd8b014b3c95a6b48797947f5ac]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz"
#  content [0f16a79b6100b05944a24e44dd6c30236993a7cb]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz"
#  content [8e3f20be3888b366abfa6969307ddcd5f8cbe979]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz"
#  content [2d5905c96babfa884e27d2c3a6cd242fbda13808]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz"
#  content [3e0f5a2204c8b6abb4438121599aa4e919ce3e98]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz"
#  content [8a01078bf324b72895e5382b2131cf4e2320dcd8]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz"
#  content [984c0734cf03f8cfcd639ca58e1853b30bc11c64]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz"
#  content [65e8f70706059874a7f3636de1309872121d51ef]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz"
#  content [e19a28316eb5d9f5ddea50bd251a6096cc9ed80c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz"
#  content [c99d4b1acc34525c5b3edc8934055f20993d8734]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz"
#  content [8171a73bd899c977a45be7911e3447ff359fd7ab]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz"
#  content [5ddf8d8f0687adee0cdf59d72197637bf8b3ffe4]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz"
#  content [49b9cd3f8ab1f85617d802849bb1a9659be523c5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz"
#  content [91c33f543dbdd6cd0f501c56f99442ca00350a4e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz"
#  content [2aa33281920e9cdbaf75be8ae349734790f405a4]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz"
#  content [d28f0501a4a2c34b5dbd6c280b0928ba0bb0eb4e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz"
#  content [7b4de156dfe17c3f8b85d4890b98236d616ab7a9]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz"
#  content [9bb679311df33d678ad0c7d90a3388c97dd07db6]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz"
#  content [8b71f81331c1732338fb00db4177df7b72f90d62]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz"
#  content [6b2fe6ae191a51600ebd3a3f990bb8d87e5874d5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz"
#  content [7442f1b4431b7d3608ae143117e241eec026b424]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz"
#  content [d917ba3a15f4d6cc6818e7b58af42e42ade5ab1b]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz"
#  content [a00b42e132501f6495fabaf610b97bb93d426de9]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz"
#  content [f8d0bd0a06ce0f3781a88f44caccb5ad12716b6e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz"
#  content [4ea48ceada126e28020ea6065119328c4d518aec]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz"
#  content [a0a2722378df5eceb96bd35710505b7b1adc6b7e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz"
#  content [8b58c81f468ac66f1b69e2093abb140db026d499]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias"
#  content [1233785d59e32e65a1dc9fdab5ee10df3b1b8d5c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir"
#  content [cce53ac2ae8af5bd5dde9078f46422a8160c00e5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts.bb"
#  content [ead866f55cd01c842a77f7f3b8bf058f7592737f]
# 
# patch "classes/cpan.bbclass"
#  from [37cd3844dffec6f7c9516f2353be95eda9f98c1a]
#    to [260c9e28c5f7b6f682e8bfc326558a3b825ce267]
# 
# patch "classes/gnome.bbclass"
#  from [1daac43b6be66b6b9360df2f5ad3156442ecf7bf]
#    to [4403c136d11cd98f47e1fe50476b27958db23fd3]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [679c230eb147ac091e5d246a98381ec1ec18d7d5]
#    to [3f57cc1d9ccc38ec468bbbd65dd70825bc572a26]
# 
# patch "packages/ffmpeg/ffmpeg_git.bb"
#  from [b95d010568a0ab37a6ab0ef5c267c9d3580ace9d]
#    to [2444e0335de6facacd9f9a2e3622fd5d31f23e4d]
# 
# patch "packages/gcc/gcc-4.2.4.inc"
#  from [17aab98b41346ebafaaa72a61fb944baf12be8b0]
#    to [c19d6f421c89aafcc3831e5693496a19b54c1669]
# 
# patch "packages/gcc/gcc-configure-common.inc"
#  from [289254ae33945cfd6fd5d0e536396c7a9138b3f4]
#    to [965beb9a16367d295098b459866583325cb55bbe]
# 
# patch "packages/gcc/gcc-cross_4.2.4.bb"
#  from [dfd68186d6bc5f27d810ecf46bcdf4bfecbbd7cd]
#    to [6cf8f04c1b793136fa18d9dd62e474f0d85ea003]
# 
# patch "packages/gcc/gcc_4.2.4.bb"
#  from [ba2b49c6f1d3b783738f3b08e6204626d197a32d]
#    to [1272c0f19670c6f29790e35aa5d2f4bb7fe86aff]
# 
# patch "packages/gimp/babl_svn.bb"
#  from [c716f40ef5e189472766d3030247c8369d6eb021]
#    to [6b2dc8b5bc32d0a64dd638194331d9119d230d41]
# 
# patch "packages/gimp/gegl_svn.bb"
#  from [ea46aefd30598cc1ac4f70c2515efdf2595e618e]
#    to [8fcb963579c017d77d08637bee2e0d5ce9b5f4b0]
# 
# patch "packages/gnome/gconf_2.6.1.bb"
#  from [8576f10b7a8c6bc87cc71f24e3065ec4b52d572b]
#    to [0089690cddb11048bb5f20d090561701b1542220]
# 
# patch "packages/gstreamer/gst-common.inc"
#  from [860249c91df6da7ad81a6dffba9d5529cc114c67]
#    to [312b6f501cb0d90950525431c523780c57f0b623]
# 
# patch "packages/gstreamer/gstreamer_0.10.17.bb"
#  from [ec06bc77d66c0e2f9c6286fa2dafe211dfacb017]
#    to [ceff85a9459f581a2755200ffe0ecbc98dfc2c79]
# 
# patch "packages/images/beagleboard-demo-image.bb"
#  from [a331c7d784384394318bb658ab691ae57a70156d]
#    to [a3ba2267ca6a95d83ee68c01389ba2f50649981a]
# 
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie"
#  from [89887186a0de9fe4ac9fad235b3f52a56a8524f6]
#    to [3116104b1993adceb7928aa2096e668fe22dd163]
# 
# patch "packages/lcms/lcms_1.17.bb"
#  from [f431b2ca601e274ae7f142b6669aa5d09584aa76]
#    to [f7a20e6614222513e0e1355644fb87877d625ae5]
# 
# patch "packages/libexif/libexif_0.6.13.bb"
#  from [7715ce667ef9b4d713dbf04fbe23c8b7105e0191]
#    to [3cebb40e32069ec9001246624ad8bca7b9b7b37c]
# 
# patch "packages/linux/linux-kaiser_2.6.24+git.bb"
#  from [179f47a7546391b82d05471702ef85d5ff831bc9]
#    to [3846f7ed91c47398672be0e85d09c95c6a15e4ac]
# 
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
#  from [5dcf73d1dc04bac818a527f9cc2fe572619f8d29]
#    to [c23b7af31c00fe87a9bcf702cd52ff278c144bea]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [1c611a9841069aa3ea975876ec119421f07d7b4f]
#    to [ff0b8fc25b7fd96f207d47814cc87e62ea2f543b]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.25.bb"
#  from [db5fbde3ea8fba339863fac327c7734070be0da6]
#    to [2bff3cf48922ef5f800c00275b9984a8b4b7830d]
# 
# patch "packages/motion/motion_3.2.10.1.bb"
#  from [6ee124c5a1433238d4ff9e8f20ca72f7cb218fe0]
#    to [bd352e4eba96e4898a56065c01e6d0633c2b55dc]
# 
# patch "packages/mozilla/firefox.inc"
#  from [e6e0e8db04ee0e6031d8a920c57d549e71af2932]
#    to [fcf882c98cb2ecfebe08686ffb477faf55261957]
# 
# patch "packages/mozilla/firefox_3.0.1.bb"
#  from [9c0f25ea9e92ec6a7ec963fbf16ee6168e45923d]
#    to [5747a684fd3be549857c7c0f811a2ac8ccd81027]
# 
# patch "packages/perl/liburi-perl_1.35.bb"
#  from [d0232309024956a0930efe962141a14589bd56de]
#    to [0b656d160a124be74b71ebfb01e6cb1524a6dd80]
# 
# patch "packages/perl/libwww-perl_5.808.bb"
#  from [c76a162b7e6844022d4b9826386bfeed71c6328e]
#    to [949fd21bc7d09a20e04de4a163560dca8a5ddce0]
# 
# patch "packages/postgresql/postgresql.inc"
#  from [8b832570bbbaa4820874dafaf2bd0f9a67c4ac27]
#    to [47b5583b22f751261bd901b62424ef9feec72d89]
# 
# patch "packages/postgresql/postgresql_8.1.4.bb"
#  from [79c5e972227143e510f235a65389cbef1c6abf4f]
#    to [1a33bf1120ce5b5477cec97ae296759634bb4501]
# 
# patch "packages/postgresql/postgresql_8.1.8.bb"
#  from [79c5e972227143e510f235a65389cbef1c6abf4f]
#    to [1a33bf1120ce5b5477cec97ae296759634bb4501]
# 
# patch "packages/postgresql/postgresql_8.2.4.bb"
#  from [245d9ebda952c084c0e06ed75f6ee4df41af3d4f]
#    to [8c3a42c258a0c2c64302c75b3de4bd4bf0046a97]
# 
# patch "packages/qmake/qmake2-sdk_2.10a.bb"
#  from [931674d68171befe4ba574c8c1333e334ac6efab]
#    to [3d39aa347739eddb79fdf2674e4df325345a7853]
# 
# patch "packages/quake/quetoo_0.6.1.bb"
#  from [2744c0ee32602658716842b67e622d558b65bb7b]
#    to [e4f408fa9fd73a0ca1ba0ff90f91bdbde6216049]
# 
# patch "packages/rrdtool/rrdtool_1.0.49.bb"
#  from [a364d6c23ab74530732b748ae5ffa3e7df3c3e57]
#    to [b213b9e3759ac6784e9cfef5ef940a4a3bb3ada4]
# 
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [1cc605fc952cb675700394a0e68ce0f8c83f5d6f]
#    to [f246fbf0028822fd0a27404cfc02bb19da3ad7cb]
# 
# patch "packages/xorg-xserver/xserver-xorg/xorg.conf"
#  from [067fe1120fc0e93fa9c0e580a748ab38ad9a52c7]
#    to [bfcc63810ece1d786706fcb229fa67ac029b54d2]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.2.bb"
#  from [82f378de1913460628054471e7fd0daca8a411a1]
#    to [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
#  from [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
#    to [bfac91f5fae3ca879600e9617161fd20d17d8953]
# 
# patch "site/common"
#  from [857abced4aa9fe4d65b58b9a23c6d110159eb31a]
#    to [e8c0ed0b7341bdaa54cca3f47e8830cd294f24e0]
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO88%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r5565cda387e227c33c34f8743f541e7737fc5b1b -r44147c36bbb2a3438d57b6293a393355eeffc48b
#
#
#
# rename "packages/gettext/gettext-native_0.14.1.bb"
#     to "packages/gettext/gettext-native_0.17.bb"
# 
# rename "packages/gettext/gettext_0.14.1.bb"
#     to "packages/gettext/gettext_0.17.bb"
# 
# add_dir "packages/gettext/gettext-0.17"
# 
# add_file "packages/gettext/gettext-0.17/autotools.patch"
#  content [ec263abf653b43c91d83157df78087f3f1523c85]
# 
# add_file "packages/gettext/gettext-0.17/gettext-error_print_progname.patch"
#  content [64a9f6d5686b4ab0c6a01a26c5ab3dec32843732]
# 
# add_file "packages/gettext/gettext-0.17/wchar-uclibc.patch"
#  content [73e1d5a5c03f5d656a1e636325b0fbce9d3def8d]
# 
# add_file "packages/gettext/gettext-native_0.14.1.bb"
#  content [2e903067b552793b23bc96c5ec738ada09f03316]
# 
# add_file "packages/gettext/gettext_0.14.1.bb"
#  content [3a0fa051089a75ecb61149ba3b56405116c60bb2]
# 
# patch "packages/gettext/gettext-native_0.17.bb"
#  from [2e903067b552793b23bc96c5ec738ada09f03316]
#    to [ad61300cb0a81b7353a8eebc4f25857676cd22b9]
# 
# patch "packages/gettext/gettext_0.17.bb"
#  from [3a0fa051089a75ecb61149ba3b56405116c60bb2]
#    to [d39e7c39ab4154e36e9937b5f173e7652e401999]
#
============================================================
--- packages/gettext/gettext-0.17/autotools.patch	ec263abf653b43c91d83157df78087f3f1523c85
+++ packages/gettext/gettext-0.17/autotools.patch	ec263abf653b43c91d83157df78087f3f1523c85
@@ -0,0 +1,62 @@
+Index: gettext-0.17/gettext-runtime/man/Makefile.am
+===================================================================
+--- gettext-0.17.orig/gettext-runtime/man/Makefile.am	2007-10-07 21:37:36.000000000 +0200
++++ gettext-0.17/gettext-runtime/man/Makefile.am	2008-05-09 22:46:37.000000000 +0200
+@@ -158,8 +158,7 @@
+ 	$(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
+ 	mv t-$@ $@
+ 
+-install-html-local:
+-	$(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ 	for file in $(man_HTML); do \
+ 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+Index: gettext-0.17/gettext-tools/man/Makefile.am
+===================================================================
+--- gettext-0.17.orig/gettext-tools/man/Makefile.am	2007-10-28 00:18:37.000000000 +0200
++++ gettext-0.17/gettext-tools/man/Makefile.am	2008-05-09 22:46:37.000000000 +0200
+@@ -186,8 +186,7 @@
+ 	$(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
+ 	mv t-$@ $@
+ 
+-install-html-local:
+-	$(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ 	for file in $(man_HTML); do \
+ 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+Index: gettext-0.17/gettext-runtime/libasprintf/configure.ac
+===================================================================
+--- gettext-0.17.orig/gettext-runtime/libasprintf/configure.ac	2008-05-09 22:53:42.000000000 +0200
++++ gettext-0.17/gettext-runtime/libasprintf/configure.ac	2008-05-09 22:53:54.000000000 +0200
+@@ -1,5 +1,5 @@
+ dnl Configuration for the GNU libasprintf library
+-dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
++dnl Copyright (C) 2002-2007 Free Software Foundation, Inc.
+ dnl
+ dnl This program is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU General Public License as published by
+@@ -54,8 +54,7 @@
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+-gl_AC_TYPE_LONG_LONG
+-gt_TYPE_LONGDOUBLE
++AC_TYPE_LONG_LONG_INT
+ gt_TYPE_WCHAR_T
+ gt_TYPE_WINT_T
+ AC_CHECK_TYPE([ptrdiff_t], ,
+@@ -79,8 +78,11 @@
+ AC_SUBST([ALLOCA_H])
+ 
+ AC_CHECK_FUNCS([snprintf vasprintf wcslen])
+-AC_CHECK_DECLS([_snprintf])
++dnl Use the _snprintf function only if it is declared (because on NetBSD it
++dnl is defined as a weak alias of snprintf; we prefer to use the latter).
++AC_CHECK_DECLS([_snprintf], , , [#include <stdio.h>])
+ gt_PRINTF_POSIX
++gl_EOVERFLOW
+ 
+ dnl Check for tools needed for formatting the documentation.
+ ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
============================================================
--- packages/gettext/gettext-0.17/gettext-error_print_progname.patch	64a9f6d5686b4ab0c6a01a26c5ab3dec32843732
+++ packages/gettext/gettext-0.17/gettext-error_print_progname.patch	64a9f6d5686b4ab0c6a01a26c5ab3dec32843732
@@ -0,0 +1,13 @@
+Index: gettext-0.17/gettext-tools/libgettextpo/error.h
+===================================================================
+--- gettext-0.17.orig/gettext-tools/libgettextpo/error.h	2008-07-27 21:16:25.561115527 +0200
++++ gettext-0.17/gettext-tools/libgettextpo/error.h	2008-07-27 21:16:52.454440505 +0200
+@@ -49,7 +49,7 @@
+ /* If NULL, error will flush stdout, then print on stderr the program
+    name, a colon and a space.  Otherwise, error will call this
+    function without parameters instead.  */
+-extern DLL_VARIABLE void (*error_print_progname) (void);
++void (*error_print_progname) (void);
+ 
+ /* This variable is incremented each time `error' is called.  */
+ extern DLL_VARIABLE unsigned int error_message_count;
============================================================
--- packages/gettext/gettext-0.17/wchar-uclibc.patch	73e1d5a5c03f5d656a1e636325b0fbce9d3def8d
+++ packages/gettext/gettext-0.17/wchar-uclibc.patch	73e1d5a5c03f5d656a1e636325b0fbce9d3def8d
@@ -0,0 +1,96 @@
+Index: gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h
+===================================================================
+--- gettext-0.17.orig/gettext-runtime/gnulib-lib/wchar.in.h	2008-07-29 14:51:52.336394636 +0200
++++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h	2008-07-29 14:52:25.546430195 +0200
+@@ -1,6 +1,6 @@
+ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+ 
+-   Copyright (C) 2007 Free Software Foundation, Inc.
++   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -26,6 +26,14 @@
+  * the declaration of wcwidth().
+  */
+ 
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files.  */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention.  */
++
+ #ifndef _GL_WCHAR_H
+ 
+ /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+@@ -80,3 +88,4 @@
+ 
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
++#endif
+Index: gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h
+===================================================================
+--- gettext-0.17.orig/gettext-tools/gnulib-lib/wchar.in.h	2008-07-29 14:52:03.886393956 +0200
++++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h	2008-07-29 14:52:50.876388000 +0200
+@@ -1,6 +1,6 @@
+ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+ 
+-   Copyright (C) 2007 Free Software Foundation, Inc.
++   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -26,6 +26,14 @@
+  * the declaration of wcwidth().
+  */
+ 
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files.  */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention.  */
++
+ #ifndef _GL_WCHAR_H
+ 
+ /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+@@ -80,3 +88,4 @@
+ 
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
++#endif
+Index: gettext-0.17/gettext-tools/libgettextpo/wchar.in.h
+===================================================================
+--- gettext-0.17.orig/gettext-tools/libgettextpo/wchar.in.h	2008-07-29 14:51:58.826395009 +0200
++++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h	2008-07-29 14:52:38.609723575 +0200
+@@ -1,6 +1,6 @@
+ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+ 
+-   Copyright (C) 2007 Free Software Foundation, Inc.
++   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -26,6 +26,14 @@
+  * the declaration of wcwidth().
+  */
+ 
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files.  */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention.  */
++
+ #ifndef _GL_WCHAR_H
+ 
+ /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+@@ -80,3 +88,4 @@
+ 
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
++#endif
============================================================
--- packages/gettext/gettext-native_0.14.1.bb	2e903067b552793b23bc96c5ec738ada09f03316
+++ packages/gettext/gettext-native_0.14.1.bb	2e903067b552793b23bc96c5ec738ada09f03316
@@ -0,0 +1,60 @@
+require gettext_${PV}.bb
+S = "${WORKDIR}/gettext-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
+inherit native
+DEPENDS = ""
+PROVIDES = ""
+
+M4 = "\
+lib-ld.m4 \
+lib-link.m4 \
+lib-prefix.m4 \
+codeset.m4 \
+gettext.m4 \
+glibc21.m4 \
+iconv.m4 \
+intdiv0.m4 \
+intmax.m4 \
+inttypes.m4 \
+inttypes_h.m4 \
+inttypes-pri.m4 \
+isc-posix.m4 \
+lcmessage.m4 \
+longdouble.m4 \
+longlong.m4 \
+nls.m4 \
+po.m4 \
+printf-posix.m4 \
+progtest.m4 \
+signed.m4 \
+size_max.m4 \
+stdint_h.m4 \
+uintmax_t.m4 \
+ulonglong.m4 \
+wchar_t.m4 \
+wint_t.m4 \
+xsize.m4 \
+"
+
+do_stage_append() {
+	for i in ${M4}; do
+		src="gettext-runtime/m4/$i"
+		if [ ! -f $src ]; then
+			src="gettext-tools/m4/$i"
+		fi
+		if [ ! -f $src ]; then
+			src="autoconf-lib-link/m4/$i"
+		fi
+		if [ ! -f $src ]; then
+			echo "can't find $i" >&2
+			exit 1
+		fi
+		install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i
+	done
+	# config.rpath is needed by some configure macros and needs to be autoinstalled.
+	# automake will do this but config.rpath needs to be visible to automake
+	for i in `ls -d ${STAGING_DATADIR}/automake*`
+	do
+		cp ${STAGING_DATADIR}/gettext/config.rpath $i
+	done
+}
============================================================
--- packages/gettext/gettext_0.14.1.bb	3a0fa051089a75ecb61149ba3b56405116c60bb2
+++ packages/gettext/gettext_0.14.1.bb	3a0fa051089a75ecb61149ba3b56405116c60bb2
@@ -0,0 +1,49 @@
+DESCRIPTION = "The GNU internationalization library."
+HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
+SECTION = "libs"
+LICENSE = "GPL"
+PR = "r9"
+DEPENDS = "virtual/libiconv"
+PROVIDES = "virtual/libintl"
+
+SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
+	   file://gettext-vpath.patch;patch=1;pnum=1 \
+	   file://fixchicken.patch;patch=1;pnum=1 \
+	   file://linklib_from_0.17.patch;patch=1 \
+           file://getline.m4.patch;patch=1 \
+           file://disable_java.patch;patch=1"
+
+SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
+SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
+
+PARALLEL_MAKE = ""
+
+inherit autotools
+
+EXTRA_OECONF += "--without-lisp --disable-csharp"
+acpaths = '-I ${S}/autoconf-lib-link/m4/ \
+	   -I ${S}/gettext-runtime/m4 \
+	   -I ${S}/gettext-tools/m4'
+
+do_configure_prepend() {
+	rm -f ${S}/config/m4/libtool.m4
+	install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/
+}
+
+# these lack the .x behind the .so, but shouldn't be in the -dev package
+# Otherwise you get the following results:
+# 7.4M    glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# 25M     uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# because gettext depends on gettext-dev, which pulls in more -dev packages:
+# 15228   KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk
+# 1300    KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
+# 140     KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
+# 4       KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
+
+PACKAGES =+ "libgettextlib libgettextsrc"
+FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
+FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/gettext/gettext-native_0.14.1.bb	2e903067b552793b23bc96c5ec738ada09f03316
+++ packages/gettext/gettext-native_0.17.bb	ad61300cb0a81b7353a8eebc4f25857676cd22b9
@@ -1,39 +1,44 @@ require gettext_${PV}.bb
 require gettext_${PV}.bb
-S = "${WORKDIR}/gettext-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
-inherit native
+
 DEPENDS = ""
 PROVIDES = ""
 
+inherit native
+
+S = "${WORKDIR}/gettext-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
+
 M4 = "\
-lib-ld.m4 \
-lib-link.m4 \
-lib-prefix.m4 \
+ansi-c++.m4 \
 codeset.m4 \
 gettext.m4 \
 glibc21.m4 \
+glibc2.m4 \
 iconv.m4 \
 intdiv0.m4 \
+intldir.m4 \
+intl.m4 \
+intlmacosx.m4 \
 intmax.m4 \
-inttypes.m4 \
 inttypes_h.m4 \
 inttypes-pri.m4 \
-isc-posix.m4 \
 lcmessage.m4 \
-longdouble.m4 \
+lock.m4 \
 longlong.m4 \
 nls.m4 \
 po.m4 \
 printf-posix.m4 \
 progtest.m4 \
-signed.m4 \
 size_max.m4 \
 stdint_h.m4 \
 uintmax_t.m4 \
-ulonglong.m4 \
+visibility.m4 \
 wchar_t.m4 \
 wint_t.m4 \
 xsize.m4 \
+lib-ld.m4 \
+lib-link.m4 \
+lib-prefix.m4 \
 "
 
 do_stage_append() {
@@ -51,10 +56,4 @@ do_stage_append() {
 		fi
 		install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i
 	done
-	# config.rpath is needed by some configure macros and needs to be autoinstalled.
-	# automake will do this but config.rpath needs to be visible to automake
-	for i in `ls -d ${STAGING_DATADIR}/automake*`
-	do
-		cp ${STAGING_DATADIR}/gettext/config.rpath $i
-	done
 }
============================================================
--- packages/gettext/gettext_0.14.1.bb	3a0fa051089a75ecb61149ba3b56405116c60bb2
+++ packages/gettext/gettext_0.17.bb	d39e7c39ab4154e36e9937b5f173e7652e401999
@@ -2,33 +2,42 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
-PR = "r9"
+PR = "r0"
+DEFAULT_PREFERENCE = "-1"
 DEPENDS = "virtual/libiconv"
 PROVIDES = "virtual/libintl"
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
-	   file://gettext-vpath.patch;patch=1;pnum=1 \
-	   file://fixchicken.patch;patch=1;pnum=1 \
-	   file://linklib_from_0.17.patch;patch=1 \
-           file://getline.m4.patch;patch=1 \
-           file://disable_java.patch;patch=1"
+	   file://autotools.patch;patch=1 \
+	   file://wchar-uclibc.patch;patch=1 \
+	  "
 
 SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
 SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
 
+#gettext.class cant be inherit here so use this hack same as in libiconv
+DEPENDS += "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
+
+EXTRA_OECONF +=  "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
+
+
 PARALLEL_MAKE = ""
 
 inherit autotools
 
-EXTRA_OECONF += "--without-lisp --disable-csharp"
+EXTRA_OECONF += "--without-lispdir \
+		 --disable-csharp \
+		 --disable-libasprintf \
+		 --disable-java \
+		 --disable-native-java \
+		 --disable-openmp \
+		 --with-included-glib \
+		 --without-emacs \
+	        "
 acpaths = '-I ${S}/autoconf-lib-link/m4/ \
 	   -I ${S}/gettext-runtime/m4 \
 	   -I ${S}/gettext-tools/m4'
 
-do_configure_prepend() {
-	rm -f ${S}/config/m4/libtool.m4
-	install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/
-}
 
 # these lack the .x behind the .so, but shouldn't be in the -dev package
 # Otherwise you get the following results:

More information about the Openembedded-commits mailing list