[oe-commits] org.oe.dev merge of '6d8c580c215fa6c343a1c4854fc12d18080909db'
pfalcon commit
openembedded-commits at lists.openembedded.org
Mon Feb 18 23:17:06 UTC 2008
merge of '6d8c580c215fa6c343a1c4854fc12d18080909db'
and 'b3b92a70ff78c5b326825d71c4c28cc59a7fc00c'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: faf56bcfb610eaf73ff3c77e1c8c451cde82165d
ViewMTN: http://monotone.openembedded.org/revision/info/faf56bcfb610eaf73ff3c77e1c8c451cde82165d
Files:
1
packages/psplash/files/logo-math.patch
packages/acpid/acpid-1.0.3
packages/acpid/acpid-1.0.3/gcc40.patch
packages/sqlite/sqlite3-3.2.2/libtool.patch
packages/sqlite/sqlite3-3.2.5/libtool.patch
packages/sqlite/sqlite3-3.2.7/libtool.patch
packages/sqlite/sqlite3-3.3.12/cross-compile.patch
packages/sqlite/sqlite3-3.3.12/libtool.patch
packages/sqlite/sqlite3-3.3.13/cross-compile.patch
packages/sqlite/sqlite3-3.3.13/libtool.patch
packages/sqlite/sqlite3-3.3.17/libtool.patch
packages/sqlite/sqlite3-3.4.1/libtool.patch
packages/wxbase
packages/xorg-lib/libxcalibrate
packages/xorg-lib/libxcalibrate/coords.patch
packages/xorg-proto/calibrateproto
packages/xorg-proto/calibrateproto/coords.patch
packages/acpid/acpid-1.0.4
packages/acpid/acpid
packages/djvulibre/djvulibre_3.5.19.bb
packages/djvulibre/djvulibre_3.5.20.bb
packages/gnome/gnome-desktop_2.18.3.bb
packages/gnome/gnome-desktop.inc
packages/gnome/gnome-doc-utils_0.12.0.bb
packages/gnome/gnome-doc-utils.inc
packages/python/python-efl-examples.bb
packages/tasks/task-python-efl-examples.bb
packages/python/python-efl.bb
packages/tasks/task-python-efl.bb
packages/qclockchange/qclockchange_0.1a.bb
packages/qclockchange/qclockchange_0.1b.bb
packages/sqlite/sqlite3_3.5.2.bb
packages/sqlite/sqlite3_3.5.6.bb
packages/wxbase/wxbase_2.6.2.bb
packages/wxwidgets/wxbase_2.6.2.bb
packages/wxbase/wxbase_2.7+cvs.bb
packages/wxwidgets/wxbase_2.7+cvs.bb
packages/amule
packages/amule/files
packages/qclockchange/files
packages/amule/amule_2.1.3.bb
packages/amule/files/parser.patch
packages/at76c503a/at76c503a-modules_0.17.bb
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch
packages/qclockchange/files/qclockchange.desktop
packages/qclockchange/files/qclockchange.png
packages/wireshark/tshark_0.99.4.bb
classes/image.bbclass
classes/kernel.bbclass
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/preferred-xorg-versions-X11R7.0.inc
conf/distro/include/preferred-xorg-versions-X11R7.1.inc
conf/distro/include/preferred-xorg-versions-X11R7.2.inc
conf/distro/include/preferred-xorg-versions-X11R7.3.inc
conf/distro/include/preferred-xorg-versions-X11R7.4.inc
conf/distro/include/preferred-xorg-versions.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
conf/machine/h5000.conf
conf/machine/include/zaurus-2.6.inc
packages/acpid/acpid/gcc40.patch
packages/anki/anki_0.4.3.bb
packages/busybox/busybox-1.9.1/adduser-longops.patch
packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch
packages/gcc/gcc_4.2.2.bb
packages/glibc/glibc-2.4/zecke-sane-readelf.patch
packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch
packages/gnome/gnome-desktop_2.10.2.bb
packages/gnome/gnome-desktop_2.16.1.bb
packages/gnome/gnome-desktop_2.7.90.bb
packages/gnome/gnome-doc-utils_0.10.3.bb
packages/gnome/gnome-doc-utils_0.7.1.bb
packages/gstreamer/gst-plugin-pulse_0.9.7.bb
packages/gtk-webcore/osb-nrcore.inc
packages/icewm/icewm_1.2.20.bb
packages/icewm/icewm_1.2.30.bb
packages/libmrss/files/better-parse-url-r0.patch
packages/lighttpd/lighttpd/src-server.c.patch
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-rp-2.6.24/pxafb.patch
packages/linux/linux_2.6.23.bb
packages/linux/linux_2.6.24.bb
packages/maemo4/osso-gnome-vfs2_2.16.3.bb
packages/openmoko2/openmoko-sound-system2/session
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.9.bb
packages/python/python-ecore_cvs.bb
packages/python/python-edbus_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-efl.inc
packages/python/python-emotion_cvs.bb
packages/python/python-epsilon_cvs.bb
packages/python/python-evas_cvs.bb
packages/tasks/task-base.bb
packages/tasks/task-openmoko-python-devel.bb
packages/tasks/task-opie-all.bb
packages/xorg-lib/libice/autofoo.patch
packages/xorg-lib/libxau/autofoo.patch
packages/xorg-lib/libxcalibrate_git.bb
packages/xorg-lib/libxft/autofoo.patch
packages/xorg-lib/libxpm/autofoo.patch
packages/xorg-proto/calibrateproto_git.bb
packages/xorg-proto/renderproto_0.9.3.bb
packages/zten/files/zten.patch
packages/zten/zten_1.6.2.bb
mtn:manual_merge
true
Diffs:
#
# mt diff -r6d8c580c215fa6c343a1c4854fc12d18080909db -rfaf56bcfb610eaf73ff3c77e1c8c451cde82165d
#
#
#
# patch "packages/psplash/files/logo-math.patch"
# from [3863c6539054b0633895cdd79f7940fde4987c4f]
# to [383aad8b8836d830f9245957a98edb65d5d51079]
#
============================================================
--- packages/psplash/files/logo-math.patch 3863c6539054b0633895cdd79f7940fde4987c4f
+++ packages/psplash/files/logo-math.patch 383aad8b8836d830f9245957a98edb65d5d51079
@@ -1,3 +1,5 @@
+upstream: http://bugzilla.openedhand.com/show_bug.cgi?id=801
+comment:
Do better math when showing logo vs progressbar.
--- psplash/psplash.c.org 2007-09-22 20:33:36.000000000 +0300
#
# mt diff -rb3b92a70ff78c5b326825d71c4c28cc59a7fc00c -rfaf56bcfb610eaf73ff3c77e1c8c451cde82165d
#
#
#
# delete "packages/acpid/acpid-1.0.3"
#
# delete "packages/acpid/acpid-1.0.3/gcc40.patch"
#
# delete "packages/sqlite/sqlite3-3.2.2/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.2.5/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.2.7/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.3.12/cross-compile.patch"
#
# delete "packages/sqlite/sqlite3-3.3.12/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.3.13/cross-compile.patch"
#
# delete "packages/sqlite/sqlite3-3.3.13/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.3.17/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.4.1/libtool.patch"
#
# delete "packages/wxbase"
#
# delete "packages/xorg-lib/libxcalibrate"
#
# delete "packages/xorg-lib/libxcalibrate/coords.patch"
#
# delete "packages/xorg-proto/calibrateproto"
#
# delete "packages/xorg-proto/calibrateproto/coords.patch"
#
# rename "packages/acpid/acpid-1.0.4"
# to "packages/acpid/acpid"
#
# rename "packages/djvulibre/djvulibre_3.5.19.bb"
# to "packages/djvulibre/djvulibre_3.5.20.bb"
#
# rename "packages/gnome/gnome-desktop_2.18.3.bb"
# to "packages/gnome/gnome-desktop.inc"
#
# rename "packages/gnome/gnome-doc-utils_0.12.0.bb"
# to "packages/gnome/gnome-doc-utils.inc"
#
# rename "packages/python/python-efl-examples.bb"
# to "packages/tasks/task-python-efl-examples.bb"
#
# rename "packages/python/python-efl.bb"
# to "packages/tasks/task-python-efl.bb"
#
# rename "packages/qclockchange/qclockchange_0.1a.bb"
# to "packages/qclockchange/qclockchange_0.1b.bb"
#
# rename "packages/sqlite/sqlite3_3.5.2.bb"
# to "packages/sqlite/sqlite3_3.5.6.bb"
#
# rename "packages/wxbase/wxbase_2.6.2.bb"
# to "packages/wxwidgets/wxbase_2.6.2.bb"
#
# rename "packages/wxbase/wxbase_2.7+cvs.bb"
# to "packages/wxwidgets/wxbase_2.7+cvs.bb"
#
# add_dir "packages/amule"
#
# add_dir "packages/amule/files"
#
# add_dir "packages/qclockchange/files"
#
# add_file "packages/amule/amule_2.1.3.bb"
# content [e94b17ff6a0526951854c033da5fe53b89be7198]
#
# add_file "packages/amule/files/parser.patch"
# content [aa35fa9621c341aaf36abdc4f0a42887e4e6e384]
#
# add_file "packages/at76c503a/at76c503a-modules_0.17.bb"
# content [684ad95a1c7f9fb930a8aea5710d5f65a2f4e887]
#
# add_file "packages/gnome/gnome-desktop_2.18.3.bb"
# content [6079856c781ba60fdff12f64b4d1588ca08852a5]
#
# add_file "packages/gnome/gnome-doc-utils_0.12.0.bb"
# content [a19715799f019c23ef02f4de5acf3c726bec8650]
#
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch"
# content [84ca7646072efff95ac1ba21996214de0887506e]
#
# add_file "packages/qclockchange/files/qclockchange.desktop"
# content [dd18cef1ed03f54eced000fbd7443d98bba85a15]
#
# add_file "packages/qclockchange/files/qclockchange.png"
# content [73367d739fe256beff7ab2dd31953eb14bdfdeab]
#
# add_file "packages/wireshark/tshark_0.99.4.bb"
# content [4b37a9286676af526c662a32c4c6ad0a42072b44]
#
# patch "classes/image.bbclass"
# from [73120c465f8175c72d4001b3985cab785ee72ced]
# to [3ee271e04e5f55aafbefcc98d3e2d4a69568301f]
#
# patch "classes/kernel.bbclass"
# from [6eb314eeb40f044c37be9df698f02b9c149aa6f8]
# to [3aa638c9a8de8e90342e08b530a40c8c2f120497]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
# to [dd29a8bfa10a0d3f786220dee4b2c942deb59552]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.0.inc"
# from [e17d1ac473c7551aa878a4025a0c72d1299ddee1]
# to [0414701d17a1c2f342d391ce49ccd43dbdf2f92d]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.1.inc"
# from [22d02a23b97d863397deca71f6cf47ac842a3041]
# to [be10d29bb8807639b7ec4fff641a33f48a5d33fb]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.2.inc"
# from [e56e290af0c2177e02d83403e1a8719853127dba]
# to [554e0995c7ce93e7c76bf2affe531b1e77fd7e1d]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.3.inc"
# from [f0d0e9e8047b09eef4e513465a8e27652b9757d0]
# to [5f058c2bfda8331944c60e4241fb698a16acae65]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.4.inc"
# from [2bd8404a566895df3ee956c8fec2fb169386ffc9]
# to [1c80460587c91260a4733ef34bf4747aef7fc19b]
#
# patch "conf/distro/include/preferred-xorg-versions.inc"
# from [defa236a54b9b69361fb032b1fe6ec8b63cdc8e4]
# to [20bb18b5b3e0c5b530f74f5b0d3b9b050fcf972c]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [458c1cdc7fdad7be3787a02fe3c5ab93a2b03733]
# to [e417185fe87a77364d7d662829af7d8b658df96e]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [06c680c836e1f326a6ad003d8e7198e317e64709]
# to [c50ac937f3aa1f2966905448c3afbb2e1bb0025f]
#
# patch "conf/distro/openmoko.conf"
# from [32e366a34046342c394581a28fe3f1af2a0a1a4c]
# to [4512da55b21499913ae1534988c81c3c26b99c64]
#
# patch "conf/machine/h5000.conf"
# from [b0fe52891e392a5d43162145964546c7517d27e4]
# to [3ea37b416dd8fc0749b3f3ea3c6e59cf6fe06138]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [39d33e732bf59736015329814890e175fef292aa]
# to [28f9350146ad28dc16ffd19ca0f09a93374826cb]
#
# patch "packages/acpid/acpid/gcc40.patch"
# from [cf30b18ca31b7673bb4d0ab17cbc878a85931824]
# to [35d3c4c5e9be1ba04272e75faafb2e8f72c1ade0]
#
# patch "packages/anki/anki_0.4.3.bb"
# from [9835acc146314e91072d7098eeda6a3a4f40d543]
# to [31ac492693b17db388f5871371697d2f5bc0b838]
#
# patch "packages/busybox/busybox-1.9.1/adduser-longops.patch"
# from [661b2538eda36e581314cde361bb3efe6411959b]
# to [3737526f742ab3a8325c20ac9e35f2f74f1b10bf]
#
# patch "packages/djvulibre/djvulibre_3.5.20.bb"
# from [31780467586c24a7eb4054b32db0e117544ef4e0]
# to [827101405780029d53ee9eedf270321d2478d5ad]
#
# patch "packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch"
# from [6148ea439041ba0af321d2298fea9a6d602f585e]
# to [3df45360067c99ecdec52e388d544e6bd01f5efd]
#
# patch "packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch"
# from [6148ea439041ba0af321d2298fea9a6d602f585e]
# to [3df45360067c99ecdec52e388d544e6bd01f5efd]
#
# patch "packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch"
# from [6e9d8445c31e423d84214b7b5560ebd144b1fb51]
# to [0078a4cb532f5bbf3ac56c8b4ccd752667e2ebb7]
#
# patch "packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch"
# from [6148ea439041ba0af321d2298fea9a6d602f585e]
# to [3df45360067c99ecdec52e388d544e6bd01f5efd]
#
# patch "packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch"
# from [6148ea439041ba0af321d2298fea9a6d602f585e]
# to [3df45360067c99ecdec52e388d544e6bd01f5efd]
#
# patch "packages/gcc/gcc_4.2.2.bb"
# from [b649640ada6aa7b3be9155792213ea7689d6e6ac]
# to [e3cc18f11ea8954870f79c7a095814c2a298871d]
#
# patch "packages/glibc/glibc-2.4/zecke-sane-readelf.patch"
# from [1bf40ba5b96f9f1b55bfc59a01c270ca3d3ba229]
# to [1aedabaa230e8af859575e07484944f4b135b283]
#
# patch "packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch"
# from [83b1a8059735512cca0723c69deefedefe53ae34]
# to [dddc4f563edeb427c1e1fa4846f3f4a6fc4d954f]
#
# patch "packages/gnome/gnome-desktop.inc"
# from [ef92f7acaa754891bf23e36646e9c3faa46a8a6c]
# to [ae7d1f621863cadbef05eb1f7f7f0ff5238b949f]
#
# patch "packages/gnome/gnome-desktop_2.10.2.bb"
# from [9d8ed2560882aa4b8ce7f82115ed70e10d71a9b8]
# to [ea2004e40d21245dbc62c44f4224bc622966d11d]
#
# patch "packages/gnome/gnome-desktop_2.16.1.bb"
# from [565cba914027dd074428c1510c94057850e452ca]
# to [26b93ff26ce2ebe90d9da2d9e73875c725298e3f]
#
# patch "packages/gnome/gnome-desktop_2.7.90.bb"
# from [672cf3775b27ea7c0ca4479a528992bf28309f93]
# to [306e90595f3048833eace7255a0575e0ff9bd465]
#
# patch "packages/gnome/gnome-doc-utils.inc"
# from [20041d84ef0cc9aeae12802d43820966a313b667]
# to [c8e230031563a67eea32291c7e49e7e13ea71bb7]
#
# patch "packages/gnome/gnome-doc-utils_0.10.3.bb"
# from [769f90e66d1d2edcc7554bb98f763f4c6fcc1a1d]
# to [5e65c0d1c85e79f4a5aee77aeaa4e5434b746c83]
#
# patch "packages/gnome/gnome-doc-utils_0.7.1.bb"
# from [95ce2c16e2b48e5150f7697d34e97d40b964dad9]
# to [a19715799f019c23ef02f4de5acf3c726bec8650]
#
# patch "packages/gstreamer/gst-plugin-pulse_0.9.7.bb"
# from [5554f865191f1f521ae855a40f67b2d8b13bc4ac]
# to [c8b0b0e80f6d09a6542f2e0f6bbcfc2bee77c1c4]
#
# patch "packages/gtk-webcore/osb-nrcore.inc"
# from [fcbcebe1996ba7e345c0c82426a17e5ae37ba241]
# to [a81dab6970cf3f620379e415339da87027c19963]
#
# patch "packages/icewm/icewm_1.2.20.bb"
# from [0a027303c29416712c81e2ca8184eca58c4b12bb]
# to [12b5608a153a95d3d909b54fd317f078ed8eca48]
#
# patch "packages/icewm/icewm_1.2.30.bb"
# from [f7b7e77c36d0b7c8aeb429d0d3612d4d700b6be6]
# to [1afb403a34441aa9e4586f80e8bd2a29028cf9a4]
#
# patch "packages/libmrss/files/better-parse-url-r0.patch"
# from [319f2b0b847d67bbab8f062cfd8d5d99c55d4eed]
# to [42f3491db88f08e1d935154095c1970fddf9a538]
#
# patch "packages/lighttpd/lighttpd/src-server.c.patch"
# from [ff0cc797c5884c967e00ae132428f5aa6f206750]
# to [8b4f719a20587a5a8efb400bdb383aeb6cd6166f]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig"
# from [31fbac69083a743610a7b45b209c1eedf231ea8f]
# to [226e96adfe6504d2b1c198a787fe70f46c3a0b67]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# from [f9f0f5550a035d11532343bcf6adeddd9141aacb]
# to [ec0ab967eff58b5d646241e714a9e0f0ee02b8fa]
#
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig"
# from [71c60d4143f978557ba0717399bc7cc3c0c139b4]
# to [b1d251def3d0ffe97b8aa186ac96c852061db329]
#
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# from [c051c656cccc3f7c4bb15b21010e3e198b2e651d]
# to [c65b7970a1e647bf8a77f9cc13d979ea9215072b]
#
# patch "packages/linux/linux-rp-2.6.24/pxafb.patch"
# from [d67eb27feca26ea83424f3eebfe5fd89f5e3b75f]
# to [f885ab91c336e3345ebcc06ff37f90b630dca0d1]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [d0076453dce6a15a60ac441aaedca4b4d35b86da]
# to [a9d28d2fb58ab00bc0024eb2dc819228bbe6d7ea]
#
# patch "packages/linux/linux_2.6.24.bb"
# from [ac7980a3cabecb85ffc82d86da685f56c1aa8d23]
# to [90c088b9a606dde51c1eb8148602236bd47b8e9f]
#
# patch "packages/maemo4/osso-gnome-vfs2_2.16.3.bb"
# from [bee779cc4c4133738b9494b780167ddb0d0d99d9]
# to [3665eb673cea6a75e2df36a17daa87464aeb50c4]
#
# patch "packages/openmoko2/openmoko-sound-system2/session"
# from [963e0a668b32334f079f421e73b9a68bc5a9cfc5]
# to [9291bc4112b6646a2f915a992a0969068f8545ac]
#
# patch "packages/openmoko2/openmoko-sound-system2_0.1.0.bb"
# from [13b0af54bfe883481d5d3db51bf22cf84091f8d4]
# to [ee4a04630adac72cef3bd2b8bfe5edc6adf2e7e0]
#
# patch "packages/pulseaudio/pulse.inc"
# from [1d80936eb792c520f41e2b7d53e94292e959129f]
# to [21cfea996a2da42f5d28bdf518cec74f51f8454a]
#
# patch "packages/pulseaudio/pulseaudio_0.9.9.bb"
# from [90330867c2b9d3a07bbf0e113c2289c5fd452fca]
# to [a076f2143bcd4c95f958a442f117d983aef69d9c]
#
# patch "packages/python/python-ecore_cvs.bb"
# from [295246b44c66e0eec08f9eaa1d8d53026cfaaf09]
# to [b6e5ba00d6b809a3e441d6dc27d125164f78dacb]
#
# patch "packages/python/python-edbus_cvs.bb"
# from [b9e9b38cb16c01ec8101aa260e4284de97c19c1e]
# to [d5e8bad1f13826a22bcd975f9899d3048049d345]
#
# patch "packages/python/python-edje_cvs.bb"
# from [18a2503cde02ed33e4f15943318b8dfc8cfcfca3]
# to [46da9e504d792e8cd17a35cec8ebeea2f9a49c58]
#
# patch "packages/python/python-efl.inc"
# from [c89446d67552d9bb92644bcef06879c238785740]
# to [7a1e1c981a4d514c24d0cf695b0c335614b36bbb]
#
# patch "packages/python/python-emotion_cvs.bb"
# from [45709d87daaee3ee043e8c8536f35bb73b68f5ca]
# to [9fc029007ba460e19b900588f14fada95732512a]
#
# patch "packages/python/python-epsilon_cvs.bb"
# from [3aa59441db25ec4ff0a8fae0e15f87935ad266f7]
# to [ba4915bb31b83045d2be815f9b219c081c2701e1]
#
# patch "packages/python/python-evas_cvs.bb"
# from [8d47b306dcfe4ce206dd3e6188ebc30c94c155b7]
# to [004f170367e06ca113e955f686f51ce112ce9368]
#
# patch "packages/qclockchange/qclockchange_0.1b.bb"
# from [454f95d346a5672cd49d48db50e7ef5e74a78805]
# to [c6c230d3f270ff79f9f0763863be3b943720b3d2]
#
# patch "packages/tasks/task-base.bb"
# from [461108bf3685f7346e95114839d03eebb184593b]
# to [0cd29b3c066d3479d8e51bf7737d5674bec79deb]
#
# patch "packages/tasks/task-openmoko-python-devel.bb"
# from [cb71bae786a4c3afdb8e584ce30ec3ae8ebabdc3]
# to [561fb2c52bfab563c0929cbc0c48393897743b6b]
#
# patch "packages/tasks/task-opie-all.bb"
# from [86ca8dc0275a5b8803e7637f1535121d73aa1fbb]
# to [15c14539dc8f8cae41b6fac4fa108dce9012a130]
#
# patch "packages/xorg-lib/libice/autofoo.patch"
# from [3fcde1424986c894f2c95ec2e2ae8d69273b785d]
# to [26233c495b03001ffec7613c75a27d405f83681a]
#
# patch "packages/xorg-lib/libxau/autofoo.patch"
# from [7a38a148a80df505b8d6d47611626716ebfa48d3]
# to [7c531d092ea980785b1e9424ca7ef8131759a3e5]
#
# patch "packages/xorg-lib/libxcalibrate_git.bb"
# from [0c3313cd068d23c4d45e05f4b6f53a709eafce09]
# to [df9536d5608ab607d9b6bda50bf32fd193a87a41]
#
# patch "packages/xorg-lib/libxft/autofoo.patch"
# from [cb09956a2efa853725071d3c2f45af589094037e]
# to [012137cdbb131f8c3be48eab9cc6f17f69206d4a]
#
# patch "packages/xorg-lib/libxpm/autofoo.patch"
# from [795cec87b521dff7085631f95d9d2e55c414911c]
# to [e2d9a41160a4706d88816560bf28ede9c7b8b9d0]
#
# patch "packages/xorg-proto/calibrateproto_git.bb"
# from [98eeef1d63972f77c5d646db9e0db9e5b0ebdf7e]
# to [ed72aebe4fa009216a6b40e35b228cd1d2fd61bb]
#
# patch "packages/xorg-proto/renderproto_0.9.3.bb"
# from [1bb8221a34173072ea7c764733f75f2a635ff066]
# to [941a64141dc39736fe734344c9ecc6cbbb9620f4]
#
# patch "packages/zten/files/zten.patch"
# from [a4d0d1cf7012199ec440d1189262d3b651e04355]
# to [ffbf836fcbb8e8a4346209dd0d27adecb6b106c1]
#
# patch "packages/zten/zten_1.6.2.bb"
# from [d16e5bbbdd5db91cc2059950ee052d9e1df00d1d]
# to [3a657dad91761dc2aaaeecda01e90a118fd99cbe]
#
# set "packages/qclockchange/files/qclockchange.png"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
--- packages/amule/amule_2.1.3.bb e94b17ff6a0526951854c033da5fe53b89be7198
+++ packages/amule/amule_2.1.3.bb e94b17ff6a0526951854c033da5fe53b89be7198
@@ -0,0 +1,25 @@
+DESCRIPTION = "aMule is an eMule-like client for the eD2k \
+and Kademlia networks, supporting multiple platforms."
+HOMEPAGE = "http://www.amule.org"
+LICENSE = "GPL"
+SECTION = "web"
+PRIORITY = "optional"
+DEPENDS = "wxbase"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/amule/aMule-${PV}.tar.bz2 \
+ file://parser.patch;patch=1"
+
+S = "${WORKDIR}/aMule-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-amulecmd \
+ --enable-webserver \
+ --disable-monolithic \
+ --enable-amule-daemon \
+ --disable-nls"
+# --enable-optimize"
+
+FILES_${PN} += " \
+ ${libdir}/xchat"
============================================================
--- packages/amule/files/parser.patch aa35fa9621c341aaf36abdc4f0a42887e4e6e384
+++ packages/amule/files/parser.patch aa35fa9621c341aaf36abdc4f0a42887e4e6e384
@@ -0,0 +1,20 @@
+diff -ur aMule-2.1.0_orig/src/Parser.cpp aMule-2.1.0/src/Parser.cpp
+--- aMule-2.1.0_orig/src/Parser.cpp 2005-12-20 05:13:25.000000000 +0100
++++ aMule-2.1.0/src/Parser.cpp 2006-01-29 15:16:45.000000000 +0100
+@@ -203,14 +203,14 @@
+ # define YYMALLOC malloc
+ # if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+ && (defined (__STDC__) || defined (__cplusplus)))
+-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
++/*void *malloc (YYSIZE_T);*/ /* INFRINGES ON USER NAME SPACE */
+ # endif
+ # endif
+ # ifndef YYFREE
+ # define YYFREE free
+ # if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+ && (defined (__STDC__) || defined (__cplusplus)))
+-void free (void *); /* INFRINGES ON USER NAME SPACE */
++/*void free (void *);*/ /* INFRINGES ON USER NAME SPACE */
+ # endif
+ # endif
+ # ifdef __cplusplus
============================================================
--- packages/at76c503a/at76c503a-modules_0.17.bb 684ad95a1c7f9fb930a8aea5710d5f65a2f4e887
+++ packages/at76c503a/at76c503a-modules_0.17.bb 684ad95a1c7f9fb930a8aea5710d5f65a2f4e887
@@ -0,0 +1,19 @@
+SECTION = "base"
+LICENSE = "GPL"
+
+SRCDATE = "20080116"
+
+SRC_URI = "%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list