[oe-commits] org.oe.dev merge of '023be36fca00265ea31a1a05b16e2ff2a3480415'

mickeyl commit openembedded-commits at lists.openembedded.org
Sun Sep 16 12:31:30 UTC 2007 

merge of '023be36fca00265ea31a1a05b16e2ff2a3480415'
     and '2240acf86047820a29307f8c7417de1943260355'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 792a847683e9b397da23d64b9ccd2e06d73fac23
ViewMTN: http://monotone.openembedded.org/revision/info/792a847683e9b397da23d64b9ccd2e06d73fac23
Files:
1
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/tasks/task-openmoko-feed.bb
packages/tasks/task-openmoko.bb
packages/glibc/eglibc-svn/export-fcntl2.patch
packages/linux/linux-handhelds-2.6/h2200/hamcop-h11.patch
packages/linux/linux-handhelds-2.6_2.6.21-hh10.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh9.bb
packages/lighttpd/lighttpd_1.4.16.bb
packages/lighttpd/lighttpd_1.4.18.bb
packages/glib-2.0/glib-2.0-2.12.13
packages/glib-2.0/glib-2.0-2.14.0
packages/gtk+/gtk+-2.12.0
packages/linux/linux-openmoko-devel
packages/openmoko2/openmoko-sound-system2
packages/pango/pango-1.18.1
packages/pointercal/files/a780
packages/glib-2.0/files/atomic_fix.patch
packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch
packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch
packages/glib-2.0/glib-2.0_2.12.13.bb
packages/glib-2.0/glib-2.0_2.14.0.bb
packages/gtk+/gtk+-2.12.0/cellrenderer-cairo.patch
packages/gtk+/gtk+-2.12.0/combo-arrow-size.patch
packages/gtk+/gtk+-2.12.0/disable-print.patch
packages/gtk+/gtk+-2.12.0/entry-cairo.patch
packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch
packages/gtk+/gtk+-2.12.0/hardcoded_libtool.patch
packages/gtk+/gtk+-2.12.0/menu-deactivate.patch
packages/gtk+/gtk+-2.12.0/no-demos.patch
packages/gtk+/gtk+-2.12.0/pangoxft2.10.6.diff
packages/gtk+/gtk+-2.12.0/range-no-redraw.patch
packages/gtk+/gtk+-2.12.0/run-iconcache.patch
packages/gtk+/gtk+-2.12.0/scrolled-placement.patch
packages/gtk+/gtk+-2.12.0/toggle-font.diff
packages/gtk+/gtk+-2.12.0/xsettings.patch
packages/gtk+/gtk+.inc
packages/gtk+/gtk+_2.12.0.bb
packages/linux/linux-ezx-2.6.21/patches/lcd_18BPP_support.diff
packages/linux/linux-openmoko-devel/defconfig
packages/linux/linux-openmoko-devel/fix-EVIOCGRAB-semantics-2.6.22.5.patch
packages/linux/linux-openmoko-devel/logo_linux_clut224.ppm
packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
packages/openmoko2/openmoko-sound-system2/pulseaudio
packages/openmoko2/openmoko-sound-system2/session
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
packages/pango/pango-1.18.1/no-tests.patch
packages/pango/pango_1.18.1.bb
packages/pointercal/files/a780/pointercal
packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-1.3-18bpp.patch
conf/distro/angstrom-2008.1.conf
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/preferred-xorg-versions-X11R7.3.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
conf/machine/gumstix-connex.conf
conf/machine/gumstix-verdex.conf
conf/machine/omap5912osk.conf
packages/glibc/eglibc_svn.bb
packages/glibc/glibc-package.bbclass
packages/gnome/gconf-dbus_svn.bb
packages/gsm/files/default
packages/gsm/libgsmd_svn.bb
packages/linux/linux-ezx-2.6.21/a1200/defconfig
packages/linux/linux-ezx-2.6.21/rokre6/defconfig
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux-handhelds-2.6/asus620/defconfig
packages/linux/linux-handhelds-2.6/asus730/defconfig
packages/linux/linux-handhelds-2.6/aximx50/defconfig
packages/linux/linux-handhelds-2.6/eteng500/defconfig
packages/linux/linux-handhelds-2.6/h1910/defconfig
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/linux/linux-handhelds-2.6/h3600/defconfig
packages/linux/linux-handhelds-2.6/h3800/defconfig
packages/linux/linux-handhelds-2.6/h3900/defconfig
packages/linux/linux-handhelds-2.6/h4000/defconfig
packages/linux/linux-handhelds-2.6/h5000/defconfig
packages/linux/linux-handhelds-2.6/htcalpine/defconfig
packages/linux/linux-handhelds-2.6/htcapache/defconfig
packages/linux/linux-handhelds-2.6/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6/htcsable/defconfig
packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6/hx4700/defconfig
packages/linux/linux-handhelds-2.6/looxc550/defconfig
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/linux/linux-handhelds-2.6/rx1950/defconfig
packages/linux/linux-handhelds-2.6/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb
packages/linux/linux.inc
packages/openmoko-base/openmoko-sound-system/session
packages/openmoko-base/openmoko-sound-system_0.1.0.bb
packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
packages/openocd/openocd_svn.bb
packages/pointercal/pointercal_0.0.bb
mtn:execute
true
Diffs:

#
# mt diff -r023be36fca00265ea31a1a05b16e2ff2a3480415 -r792a847683e9b397da23d64b9ccd2e06d73fac23
#
# 
# 
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
#  from [473fde484283e9e9ecdc176e1bda70a0d3f7fc9f]
#    to [8bf49f597b50d24a957ebe9e6f05404637ab6560]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [cf10662aea8138defdb07d131192ae1de18ec644]
#    to [2f8ec02e7147e7aad394dad1204d210e52626bc8]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [732cc2b15ee798ca00f5bf1855e650be36e08741]
#    to [8bae7a09e4956d7750cdd285857089383e895865]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [c8527c9bada246974a8da5467941abc86bf3d4d2]
#    to [853e5cf4effc206059d9e3955df4a6d161c7188b]
# 
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session	473fde484283e9e9ecdc176e1bda70a0d3f7fc9f
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session	8bf49f597b50d24a957ebe9e6f05404637ab6560
@@ -1,8 +1,6 @@ SHOWCURSOR="no"
 #!/bin/sh
 SHOWCURSOR="no"
 
-export GTK_MODULES="libgtkstylus.so" 
-
 openmoko-today &
 openmoko-dialer &
 
============================================================
--- packages/openmoko2/openmoko-session2.bb	cf10662aea8138defdb07d131192ae1de18ec644
+++ packages/openmoko2/openmoko-session2.bb	2f8ec02e7147e7aad394dad1204d210e52626bc8
@@ -1,10 +1,10 @@
-DESCRIPTION = "Custom MB session files for OpenMoko"
+DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r31"
+PR = "r32"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
============================================================
--- packages/tasks/task-openmoko-feed.bb	732cc2b15ee798ca00f5bf1855e650be36e08741
+++ packages/tasks/task-openmoko-feed.bb	8bae7a09e4956d7750cdd285857089383e895865
@@ -24,9 +24,13 @@ RDEPENDS_task-openmoko-feed = "\
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
   python python-pygtk python-pyserial \
   ruby \
+  libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
   synergy \
   tzdata \
+  timezones \
   tor \
   vnc \
+  wxwidgets \
+  x11vnc \
 "
 
============================================================
--- packages/tasks/task-openmoko.bb	c8527c9bada246974a8da5467941abc86bf3d4d2
+++ packages/tasks/task-openmoko.bb	853e5cf4effc206059d9e3955df4a6d161c7188b
@@ -1,8 +1,8 @@ PROVIDES = "task-openmoko-everything"
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r64"
+PR = "r65"
 
 inherit task
 
@@ -52,25 +52,26 @@ RDEPENDS_task-openmoko-ui = "\
   pango-module-basic-x \
   pango-module-basic-fc \
   gtk+ \
-  libgtkstylus \
-  libgtkinput \
   matchbox-common \
   matchbox-wm \
   xserver-kdrive-fbdev \
   xserver-kdrive-common \
   xserver-nodm-init \
-#  x11-c-locale \
   ttf-bitstream-vera \
   xauth \
   xhost \
   xset \
   xrandr \
+  \
   settings-daemon \
+  notification-daemon \
+  neod \
+  libnotify \
   \
   openmoko-session2 \
   openmoko-sound-system2 \
   openmoko-sound-theme-standard2 \
-  neod \
+  \
   gpe-scap \
 "
 
@@ -92,24 +93,24 @@ PACKAGE_ARCH_task-openmoko-ui = "${MACHI
 #
 # task-openmoko-base
 #
-DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and Footer"
+DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager"
 RDEPENDS_task-openmoko-base = "\
   matchbox-panel-2 \
   matchbox-panel-2-applets \
-  matchbox-applet-inputmanager \
-#  openmoko-appmanager \
   matchbox-keyboard-inputmethod \
   matchbox-keyboard-im \
   matchbox-keyboard-applet \
   matchbox-stroke \
   openmoko-terminal2 \
-  openmoko-keyboard \
-#  openmoko-panel-mainmenu \
+#  openmoko-keyboard \
   openmoko-panel-battery \
   openmoko-panel-bt \
   openmoko-panel-clock \
   openmoko-panel-usb \
   ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
+  \
+  openmoko-today2 \
+#  openmoko-appmanager \
 "
 
 #
@@ -127,7 +128,7 @@ RDEPENDS_task-openmoko-phone = "\
 #
 # task-openmoko-pim
 #
-DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications"
+DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite"
 RDEPENDS_task-openmoko-pim = "\
   eds-dbus \
   openmoko-calculator2 \
@@ -135,7 +136,7 @@ RDEPENDS_task-openmoko-pim = "\
   openmoko-dates2 \
   openmoko-feedreader2 \
   openmoko-tasks2 \
-  openmoko-today2 \
+  openmoko-mediaplayer2 \
 #  openmoko-messages \
 "
 


#
# mt diff -r2240acf86047820a29307f8c7417de1943260355 -r792a847683e9b397da23d64b9ccd2e06d73fac23
#
# 
# 
# delete "packages/glibc/eglibc-svn/export-fcntl2.patch"
# 
# delete "packages/linux/linux-handhelds-2.6/h2200/hamcop-h11.patch"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh10.bb"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh9.bb"
# 
# rename "packages/lighttpd/lighttpd_1.4.16.bb"
#     to "packages/lighttpd/lighttpd_1.4.18.bb"
# 
# add_dir "packages/glib-2.0/glib-2.0-2.12.13"
# 
# add_dir "packages/glib-2.0/glib-2.0-2.14.0"
# 
# add_dir "packages/gtk+/gtk+-2.12.0"
# 
# add_dir "packages/linux/linux-openmoko-devel"
# 
# add_dir "packages/openmoko2/openmoko-sound-system2"
# 
# add_dir "packages/pango/pango-1.18.1"
# 
# add_dir "packages/pointercal/files/a780"
# 
# add_file "packages/glib-2.0/files/atomic_fix.patch"
#  content [1c1d87400ddcdc128f69d78145194c9d4edb1221]
# 
# add_file "packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch"
#  content [5ebb4d41aaa5ee93fc6bae495b83c5153feb1d7f]
# 
# add_file "packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch"
#  content [2e9bdca6abde5498601df5b513b4ed387f00d49e]
# 
# add_file "packages/glib-2.0/glib-2.0_2.12.13.bb"
#  content [83e73c427da8f2e30cb58950bde9a902e2900d65]
# 
# add_file "packages/glib-2.0/glib-2.0_2.14.0.bb"
#  content [21999f530ce7682e78fd14b67e5d29e2bf2c322f]
# 
# add_file "packages/gtk+/gtk+-2.12.0/cellrenderer-cairo.patch"
#  content [f343e9c8fa9252834d1fc2d38498f7ca81027cf7]
# 
# add_file "packages/gtk+/gtk+-2.12.0/combo-arrow-size.patch"
#  content [86b154ddff681414b9ee93698f070af87eba8941]
# 
# add_file "packages/gtk+/gtk+-2.12.0/disable-print.patch"
#  content [15ba697401f4585005e6347d20498c7b1417f917]
# 
# add_file "packages/gtk+/gtk+-2.12.0/entry-cairo.patch"
#  content [7716bcd4fe95b61148fe31a6054081e08dfa616e]
# 
# add_file "packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch"
#  content [f8a32fce3abbb76c766cc6906e0300f3b281cbeb]
# 
# add_file "packages/gtk+/gtk+-2.12.0/hardcoded_libtool.patch"
#  content [c9c51ebeaf32844e38b9cc0062ca09911a680f3a]
# 
# add_file "packages/gtk+/gtk+-2.12.0/menu-deactivate.patch"
#  content [e0d8b253f81a5a01dbf5ffb9cfadda1799d7a3af]
# 
# add_file "packages/gtk+/gtk+-2.12.0/no-demos.patch"
#  content [765d8c563c164194e2b075eb32f57ef54bbba098]
# 
# add_file "packages/gtk+/gtk+-2.12.0/pangoxft2.10.6.diff"
#  content [c646b9f34fcf6fe7f0ddfef6d3ae66dfe24da0ab]
# 
# add_file "packages/gtk+/gtk+-2.12.0/range-no-redraw.patch"
#  content [2a456a9d163cedfca69de0662b26ad7060a41827]
# 
# add_file "packages/gtk+/gtk+-2.12.0/run-iconcache.patch"
#  content [2ab8f280d83e22b887247404cd6d7ac1afc3ed37]
# 
# add_file "packages/gtk+/gtk+-2.12.0/scrolled-placement.patch"
#  content [7258aed311d562ad735d04a51494b529cf66483b]
# 
# add_file "packages/gtk+/gtk+-2.12.0/toggle-font.diff"
#  content [892becbc52bd83e40c849d6d81f6f25f5d1d36ed]
# 
# add_file "packages/gtk+/gtk+-2.12.0/xsettings.patch"
#  content [1492aa80fb7bcb9008296d469f4d55183c904d37]
# 
# add_file "packages/gtk+/gtk+.inc"
#  content [ffdca8e93dd38acb3bb2afdd28ab143a8438af91]
# 
# add_file "packages/gtk+/gtk+_2.12.0.bb"
#  content [4b06154f496fb45640853f54b964720268a461de]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/lcd_18BPP_support.diff"
#  content [789a83493fc58a4dbafa14e25bf11c3f15ace873]
# 
# add_file "packages/linux/linux-openmoko-devel/defconfig"
#  content [e0d5e01862edf513ce61dd257d3e4a6790a4bfab]
# 
# add_file "packages/linux/linux-openmoko-devel/fix-EVIOCGRAB-semantics-2.6.22.5.patch"
#  content [aad1fad01b6ce0e521a45dad330521825ac0903f]
# 
# add_file "packages/linux/linux-openmoko-devel/logo_linux_clut224.ppm"
#  content [b813734bedbef63070aad2fc214f59df971d30e1]
# 
# add_file "packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb"
#  content [b49376120f1dc1282d69613b3b21a271fe730912]
# 
# add_file "packages/openmoko2/openmoko-sound-system2/pulseaudio"
#  content [d433451e55cb5437d6d11869506ebab909fc386b]
# 
# add_file "packages/openmoko2/openmoko-sound-system2/session"
#  content [440f08023fd2111ebd3ab7b3914fba30c36e0d59]
# 
# add_file "packages/openmoko2/openmoko-sound-system2_0.1.0.bb"
#  content [d2d7385073d2de3086a6fc7137fa76d25390a2c1]
# 
# add_file "packages/openmoko2/openmoko-sound-theme-standard2_svn.bb"
#  content [bfa0e09f44be1950d51c8251ab99fdf9fce69bea]
# 
# add_file "packages/pango/pango-1.18.1/no-tests.patch"
#  content [60137f9cd0f6a15a189956274570896d16cd4631]
# 
# add_file "packages/pango/pango_1.18.1.bb"
#  content [eaad55dfd537e120a121c814d110d1f4674a2660]
# 
# add_file "packages/pointercal/files/a780/pointercal"
#  content [746ced31da69780530c774d54918e4a349c92224]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-1.3-18bpp.patch"
#  content [2f7599315f4267047fc44ddb7832c91f37d90cfd]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [2c1087ea613e50928fa16de73a4ead8786695b85]
#    to [487c3506ad8cb3ca5d78cfd66fa53492cacba1af]
# 
# patch "conf/distro/include/insane-srcrevs.inc"
#  from [63ea6dbb957d94e0f729963a34f021d69c8a2f5a]
#    to [77f0eea1a733be785bb5acfaed64815e5f62f68a]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [5709f08bc2fb571ee70795901ea2c48568d7653a]
#    to [7ab3e4a626dd86961455dfee876c957f998cfb14]
# 
# patch "conf/distro/include/preferred-xorg-versions-X11R7.3.inc"
#  from [3ecc9d70639781883037e151c1d10b3622fd366a]
#    to [e17728838422c7e739af9d24b6c0fd5a4d84811f]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [01cdd7f15c21314dbd3bcdaf1fe669cb962d28ab]
#    to [86ede12635b8634bc89c2f7e82da56ea8d4e1e5a]
# 
# patch "conf/machine/fic-gta01.conf"
#  from [1c711840be95b64cb1a2f2235a958946d248996d]
#    to [3b60c2c075f0438fce7fc3fff2336638b598b475]
# 
# patch "conf/machine/fic-gta02.conf"
#  from [6429c345c220cf4df533401bcc9e3ae162c8f41a]
#    to [03635ef8706b0a62df25a7e8295733d57bbdf8e6]
# 
# patch "conf/machine/gumstix-connex.conf"
#  from [0903ecc3169560cf41fbd2d7ac041fe5500bae63]
#    to [deeb462cffbf6d7f3d19d242016ef26a05a9558e]
# 
# patch "conf/machine/gumstix-verdex.conf"
#  from [04af755da5ac1ae0a6ca0357f3ebd3488923d7ba]
#    to [f78eb3bf604512a85079d15b5a2c4dd897f3168e]
# 
# patch "conf/machine/omap5912osk.conf"
#  from [245c8c69dbbb47327266fced63526ea02d5cc4e6]
#    to [f0942949911d73f57760fb48a9469e67db0154ef]
# 
# patch "packages/glibc/eglibc_svn.bb"
#  from [d271198997ba4fa58ec16de91362b22a79f8d84f]
#    to [bb25ed1e0fdfd432e265209f03dfaf36f79bdf1b]
# 
# patch "packages/glibc/glibc-package.bbclass"
#  from [6fd787a481dfe0225e24a491cb5fb0b7937c3b58]
#    to [71e532d510413de3e18dd2b598fc5523ea29f7a9]
# 
# patch "packages/gnome/gconf-dbus_svn.bb"
#  from [ac71d333e0e42e01c188b5c90a4374123f6b96b5]
#    to [736ff2e0f199bacf3c0368448f9d7fcbd6de5973]
# 
# patch "packages/gsm/files/default"
#  from [4f726b64e780ec4724b1d50580aa9d1d0bc585e2]
#    to [4f5482852a023458bb03627f6e4033dc88afaba6]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [9aa39b60aa04ee474e8c277bf9337a9194ce32a7]
#    to [4cba1496c29bd744fd3f2e590315d449dbe0b940]
# 
# patch "packages/linux/linux-ezx-2.6.21/a1200/defconfig"
#  from [9e8c88b007bf864832fb39e66adebdb694fdefdf]
#    to [54fc215efd04504bd6949f6c853b8291ab31bf05]
# 
# patch "packages/linux/linux-ezx-2.6.21/rokre6/defconfig"
#  from [e76c158c332dcdd6e636e5b628f7f86daac14a22]
#    to [b79ae70ebd4748e59c20b3a234ba65c2360a45dd]
# 
# patch "packages/linux/linux-ezx_2.6.21.bb"
#  from [6e4787b56b3ece5bf65f590bc86d49ad31617a39]
#    to [3c48486e78593d7765b057c718fb0f4e971ea814]
# 
# patch "packages/linux/linux-handhelds-2.6/asus620/defconfig"
#  from [9b923da1d93fab440e7dc7f47b3b5c6d6ca79178]
#    to [5480504730606977c786cfa34c0e9262bef66fa6]
# 
# patch "packages/linux/linux-handhelds-2.6/asus730/defconfig"
#  from [867d364998ebc11540c28b942b726921d8933a06]
#    to [5c3c278c9503d52d9e9adeaff6ec6532db522eaf]
# 
# patch "packages/linux/linux-handhelds-2.6/aximx50/defconfig"
#  from [ead49bfcfa6db89810d53a6938e43ab6cd46a45e]
#    to [cc980b7f191f98dae38e3615fde9934df38bfa88]
# 
# patch "packages/linux/linux-handhelds-2.6/eteng500/defconfig"
#  from [19ab5745b5cbba413fdf2e39aa774e06e9daea69]
#    to [edaa277f640f1061e25ce562b0a9a59342fedd18]
# 
# patch "packages/linux/linux-handhelds-2.6/h1910/defconfig"
#  from [3a950d7958a738fff96afedb0a4dd9b41eaf8fcf]
#    to [20c90ba133927d7d99065280a8044d6a8621235f]
# 
# patch "packages/linux/linux-handhelds-2.6/h2200/defconfig"
#  from [6f60622a6c3257b507d66772637c986adf0fef66]
#    to [7b078b455805a66bc22b8e46860e19f8ab9c1e19]
# 
# patch "packages/linux/linux-handhelds-2.6/h3600/defconfig"
#  from [62ad8ca3a007e8d103fedcf07af867e39bd569b5]
#    to [c7a2fb8616c663f28a606838169cf2a36163ddd5]
# 
# patch "packages/linux/linux-handhelds-2.6/h3800/defconfig"
#  from [55604b887d2542e3ca0b5bdae03d6401f0b88f24]
#    to [03237e114b7c68ad6a403781104f7877e40db711]
# 
# patch "packages/linux/linux-handhelds-2.6/h3900/defconfig"
#  from [0ef2cf86ba9f4b1a690fca55f20f26e3fe705c1a]
#    to [6f5f028e331ddd89c42af12cc613271fcf815b9b]
# 
# patch "packages/linux/linux-handhelds-2.6/h4000/defconfig"
#  from [4c4ef316e87b2701debde996356dc211f0984d4c]
#    to [41e89b487da8c03a4d56841f134894ccc4c54091]
# 
# patch "packages/linux/linux-handhelds-2.6/h5000/defconfig"
#  from [d9b0dc9d07eb489a0591bb3460bc9c1298f52e56]
#    to [1b0fc9751820752a9cd38d4927ee8b1eeefc09b9]
# 
# patch "packages/linux/linux-handhelds-2.6/htcalpine/defconfig"
#  from [ca3b83031cb4706bd1b38fc959005e193347b495]
#    to [e2a2562d03e04de80cfb2a9078ee332ab135fc8f]
# 
# patch "packages/linux/linux-handhelds-2.6/htcapache/defconfig"
#  from [2c5c92c717c2ec9b4af538cf0e2a74c691c94de8]
#    to [f29b8e390b7c5718c67a361a5dc3452582b3a7c6]
# 
# patch "packages/linux/linux-handhelds-2.6/htcbeetles/defconfig"
#  from [2a4c510935376651e66157dd528585af39865dac]
#    to [f10a7c1cf76509218a673ebaed8aefe5b6ba7042]
# 
# patch "packages/linux/linux-handhelds-2.6/htcblueangel/defconfig"
#  from [bfb7bbbda72f7bbf20bf56afa4b83048a1bad42a]
#    to [c94328be341a3ace8f48abcdc6bd033c16953414]
# 
# patch "packages/linux/linux-handhelds-2.6/htchimalaya/defconfig"
#  from [0329e7123849a5a77bd6945d1aabc082fc0196e7]
#    to [f1f0aabe49cd147bb8d9a7b975975a36e94cf506]
# 
# patch "packages/linux/linux-handhelds-2.6/htcsable/defconfig"
#  from [d397c4acf4dd5de7f29fcb05d3e1736b15009fdc]
#    to [a0bae791857e9e9b76130fdeb17e680f125dad88]
# 
# patch "packages/linux/linux-handhelds-2.6/htcuniversal/defconfig"
#  from [41e239442531189ee9dcab39e8101f255e163054]
#    to [df18d4eab0b906bd56f7cce68c284c446129c6a6]
# 
# patch "packages/linux/linux-handhelds-2.6/htcwallaby/defconfig"
#  from [3c9ee3a9e2aa1fe121d7a68dee93e78fefc4386e]
#    to [50a353fc541d723c1122c207e4e9d08e6b541520]
# 
# patch "packages/linux/linux-handhelds-2.6/hx4700/defconfig"
#  from [e8114409c1b5d94e0d1a4c51d8d6c025f593b315]
#    to [543816ac8842fd001cce338be41206cd3c2f7a2a]
# 
# patch "packages/linux/linux-handhelds-2.6/looxc550/defconfig"
#  from [ae755cfa9d17b9e9f0ae72d8d077d35bae3d8afd]
#    to [483644f28bac794d41473d64647931c71a18caa3]
# 
# patch "packages/linux/linux-handhelds-2.6/magician/defconfig"
#  from [b3b898939335a099d3e3a18926b8a9ee9f084d8a]
#    to [4404225ab84877a2cc260e62c83a9d5878f8352d]
# 
# patch "packages/linux/linux-handhelds-2.6/rx1950/defconfig"
#  from [58066635777b315d6e69d5844421d0a7ffd716f0]
#    to [af6394a43d31bc9a0148f05e07f559e79f419360]
# 
# patch "packages/linux/linux-handhelds-2.6/rx3000/defconfig"
#  from [e41beb45e34331838e46a19098c8c51adb7cb142]
#    to [cf01a8c036fe966f824b6b71c55ab48ad146edce]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb"
#  from [252b9c26ddd2fda4271f4352999ce0facbfece99]
#    to [2e774376b648af5299a532253bd79480809c5e54]
# 
# patch "packages/linux/linux.inc"
#  from [47bdad4587ba5a4eecb2eb3c827967a56828c9ae]
#    to [eeda309489292a9867f8339d7e9cface90455b79]
# 
# patch "packages/openmoko-base/openmoko-sound-system/session"
#  from [2d729d476a1b9fa1ab08c40c8f8d00ff7e126359]
#    to [440f08023fd2111ebd3ab7b3914fba30c36e0d59]
# 
# patch "packages/openmoko-base/openmoko-sound-system_0.1.0.bb"
#  from [b17f4014d9d87df4e995907d56b14ff983834d1d]
#    to [97eccb1347577824e44ae717d9c252f5c9712e4d]
# 
# patch "packages/openmoko-base/openmoko-sound-theme-standard_svn.bb"
#  from [ffdd2c4eb73a274c31f10be81ceaea91f36b1bf0]
#    to [cc26de0759df303d921d485edb20c50d06019574]
# 
# patch "packages/openocd/openocd_svn.bb"
#  from [a0cc3e78ddf617567092bc819022548cfb0fd186]
#    to [ff4b08ed923a74c3efa4730980288907a11baeb7]
# 
# patch "packages/pointercal/pointercal_0.0.bb"
#  from [eabe88f64e9db5eb9c843878fc7ee328e8043d85]
#    to [b8790bb4f4ba0f5d19f857367be5e221745356d0]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [ac6d51a00c1a855d53bc5d8f88e618f5e2cffa93]
#    to [853e5cf4effc206059d9e3955df4a6d161c7188b]
# 
#   set "packages/openmoko2/openmoko-sound-system2/pulseaudio"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- packages/glib-2.0/files/atomic_fix.patch	1c1d87400ddcdc128f69d78145194c9d4edb1221
+++ packages/glib-2.0/files/atomic_fix.patch	1c1d87400ddcdc128f69d78145194c9d4edb1221
@@ -0,0 +1,16 @@
+Index: glib-2.10.3/glib/gthread.c
+===================================================================
+--- glib-2.10.3.orig/glib/gthread.c	2005-12-01 16:34:26.000000000 +0000
++++ glib-2.10.3/glib/gthread.c	2006-07-06 08:17:18.000000000 +0100
+@@ -164,10 +164,10 @@
+   _g_messages_thread_init_nomessage ();
+ 
+   /* we may run full-fledged initializers from here */
++  _g_atomic_thread_init ();
+   _g_convert_thread_init ();
+   _g_rand_thread_init ();
+   _g_main_thread_init ();
+-  _g_atomic_thread_init ();
+   _g_utils_thread_init ();
+ #ifdef G_OS_WIN32
+   _g_win32_thread_init ();
============================================================
--- packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch	5ebb4d41aaa5ee93fc6bae495b83c5153feb1d7f
+++ packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch	5ebb4d41aaa5ee93fc6bae495b83c5153feb1d7f
@@ -0,0 +1,11 @@
+--- glib-2.12.10/configure.in.orig	2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in	2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+   G_MODULE_LDFLAGS=
+ else
+   export SED
+-  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
============================================================
--- packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch	2e9bdca6abde5498601df5b513b4ed387f00d49e
+++ packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch	2e9bdca6abde5498601df5b513b4ed387f00d49e
@@ -0,0 +1,29 @@
+--- glib-2.12.10/configure.in.orig	2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in	2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+   G_MODULE_LDFLAGS=
+ else
+   export SED
+-  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1265,7 +1265,7 @@
+ 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+ 	echo "void glib_plugin_test(void) { }" > plugin.c
+-	${SHELL} ./libtool --mode=compile ${CC} -shared \
++	${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
+ 		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ 	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ 		glib_cv_rtldglobal_broken,[
+@@ -1339,7 +1339,7 @@
+ 
+ AC_MSG_CHECKING(for the suffix of shared libraries)
+ export SED
+-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
++shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
+ eval $shrext_cmds
+ module=yes eval std_shrext=$shrext_cmds
+ # chop the initial dot
============================================================
--- packages/glib-2.0/glib-2.0_2.12.13.bb	83e73c427da8f2e30cb58950bde9a902e2900d65
+++ packages/glib-2.0/glib-2.0_2.12.13.bb	83e73c427da8f2e30cb58950bde9a902e2900d65
@@ -0,0 +1,8 @@
+require glib.inc
+
+PR = "r2"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.ta%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list