[oe-commits] org.oe.dev merge of '6129c0fae0db59de2238bc4edb8130cfe7cddc48'
openmoko commit
openembedded-commits at lists.openembedded.org
Sun Sep 9 13:22:09 UTC 2007
merge of '6129c0fae0db59de2238bc4edb8130cfe7cddc48'
and 'b6be8d0c408671e0b3ce69563f1c511819083ede'
Author: openmoko at openembedded.org
Branch: org.openembedded.dev
Revision: 13c46aa842974ca948296aa5fa9f48e9abe116c6
ViewMTN: http://monotone.openembedded.org/revision/info/13c46aa842974ca948296aa5fa9f48e9abe116c6
Files:
1
packages/linux/linux-ezx-2.6.21/e2
packages/linux/linux-ezx-2.6.21/e6
packages/netbase/netbase/a780
packages/netbase/netbase/a780/interfaces
packages/netbase/netbase/e680
packages/netbase/netbase/e680/interfaces
packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch
packages/xorg-xserver/xserver-kdrive/devfs.patch
packages/xorg-xserver/xserver-kdrive/faster-rotated.patch
classes/qmake-base.bbclass
classes/qmake_base.bbclass
packages/linux/linux-ezx-2.6.21/e2/defconfig
packages/linux/linux-ezx-2.6.21/rokre2/defconfig
packages/linux/linux-ezx-2.6.21/e6/defconfig
packages/linux/linux-ezx-2.6.21/rokre6/defconfig
packages/xorg-xserver/xserver-kdrive/enable-epson.patch
packages/xorg-xserver/xserver-kdrive-1.1.0/enable-epson.patch
packages/xorg-xserver/xserver-kdrive/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-1.1.0/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive/optional-xkb.patch
packages/xorg-xserver/xserver-kdrive-1.1.0/optional-xkb.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch
packages/xorg-xserver/xserver-kdrive/fix_default_mode.patch
packages/linux/linux-ezx-2.6.21/rokre6
packages/xorg-xserver/xserver-kdrive-1.1.0
packages/xorg-xserver/xserver-kdrive-1.4
packages/xorg-xserver/xserver-kdrive-git
packages/gcc/gcc-4.2.1/204-uclibc-locale-wchar_fix.patch
packages/gcc/gcc-4.2.1/205-uclibc-locale-update.patch
packages/xorg-xserver/xserver-kdrive/fbdev-evdev.patch
packages/xorg-xserver/xserver-kdrive/tslib-default-device.patch
packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch
packages/xorg-xserver/xserver-kdrive/xcalibrate-new-input-world-order.patch
packages/xorg-xserver/xserver-kdrive/xcalibrate_coords.patch
packages/xorg-xserver/xserver-kdrive-1.4/disable-xf86-dga-xorgcfg.patch
packages/xorg-xserver/xserver-kdrive-1.4/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-1.4/enable-xcalibrate.patch
packages/xorg-xserver/xserver-kdrive-1.4/w100-autofoo.patch
packages/xorg-xserver/xserver-kdrive-git/enable-epson.patch
packages/xorg-xserver/xserver-kdrive-git/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-git/enable-xcalibrate.patch
packages/xorg-xserver/xserver-kdrive-git/w100-autofoo.patch
packages/xorg-xserver/xserver-kdrive-git/w100-post-1.4-buildfix.patch
packages/xorg-xserver/xserver-kdrive-git/xephyr-post-1.4-buildfix.patch
packages/xorg-xserver/xserver-kdrive_1.4.bb
classes/qmake.bbclass
classes/qmake2.bbclass
classes/qt3e.bbclass
classes/qt3x11.bbclass
packages/base-files/base-files_3.0.14.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc_4.2.1.bb
packages/gsm/files/default
packages/gsm/files/gsmd
packages/gsm/libgsmd_svn.bb
packages/linux/linux-ezx-2.6.21/a780/defconfig
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux.inc
packages/netbase/netbase_4.21.bb
packages/nonworking/gnuboy/qtopiagnuboy_1.0.3.bb
packages/nonworking/zethereal/zethereal_1.0.0.bb
packages/opie-reader/uqtreader_cvs.bb
packages/putty/putty_svn.bb
packages/qt/qt-x11-free-common.inc
packages/qt/qt-x11-free-native_3.3.5.bb
packages/qt/qt4-x11-free_4.1.2.bb
packages/qt/qt4-x11-free_4.3.0.bb
packages/snes9x/snes9x-sdl-qpe_1.39.bb
packages/taglib/taglib_1.4.bb
packages/taglib/taglibc_1.4.bb
packages/uicmoc/uicmoc-native_2.3.10.bb
packages/uicmoc/uicmoc3-native_3.3.5.bb
packages/xorg-xserver/xserver-kdrive-common.inc
packages/xorg-xserver/xserver-kdrive_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/xorg-xserver/xserver-kdrive_git.bb
packages/e17/exhibit_cvs.bb
Diffs:
#
# mt diff -r6129c0fae0db59de2238bc4edb8130cfe7cddc48 -r13c46aa842974ca948296aa5fa9f48e9abe116c6
#
#
#
# delete "packages/linux/linux-ezx-2.6.21/e2"
#
# delete "packages/linux/linux-ezx-2.6.21/e6"
#
# delete "packages/netbase/netbase/a780"
#
# delete "packages/netbase/netbase/a780/interfaces"
#
# delete "packages/netbase/netbase/e680"
#
# delete "packages/netbase/netbase/e680/interfaces"
#
# delete "packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch"
#
# delete "packages/xorg-xserver/xserver-kdrive/devfs.patch"
#
# delete "packages/xorg-xserver/xserver-kdrive/faster-rotated.patch"
#
# rename "classes/qmake-base.bbclass"
# to "classes/qmake_base.bbclass"
#
# rename "packages/linux/linux-ezx-2.6.21/e2/defconfig"
# to "packages/linux/linux-ezx-2.6.21/rokre2/defconfig"
#
# rename "packages/linux/linux-ezx-2.6.21/e6/defconfig"
# to "packages/linux/linux-ezx-2.6.21/rokre6/defconfig"
#
# rename "packages/xorg-xserver/xserver-kdrive/enable-epson.patch"
# to "packages/xorg-xserver/xserver-kdrive-1.1.0/enable-epson.patch"
#
# rename "packages/xorg-xserver/xserver-kdrive/enable-tslib.patch"
# to "packages/xorg-xserver/xserver-kdrive-1.1.0/enable-tslib.patch"
#
# rename "packages/xorg-xserver/xserver-kdrive/optional-xkb.patch"
# to "packages/xorg-xserver/xserver-kdrive-1.1.0/optional-xkb.patch"
#
# rename "packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch"
# to "packages/xorg-xserver/xserver-kdrive/fix_default_mode.patch"
#
# add_dir "packages/linux/linux-ezx-2.6.21/rokre6"
#
# add_dir "packages/xorg-xserver/xserver-kdrive-1.1.0"
#
# add_dir "packages/xorg-xserver/xserver-kdrive-1.4"
#
# add_dir "packages/xorg-xserver/xserver-kdrive-git"
#
# add_file "packages/gcc/gcc-4.2.1/204-uclibc-locale-wchar_fix.patch"
# content [9ae599ff2c2039f1a0eaff5298fbc2aa47d4b016]
#
# add_file "packages/gcc/gcc-4.2.1/205-uclibc-locale-update.patch"
# content [129ab676c2787de37f94bf3c802616e8b21b7ab9]
#
# add_file "packages/xorg-xserver/xserver-kdrive/enable-epson.patch"
# content [b50349474f8d1803cef15512f95a4b4166905d74]
#
# add_file "packages/xorg-xserver/xserver-kdrive/fbdev-evdev.patch"
# content [0d39700c7dda9f0e282dd3638b3b0822e8e50127]
#
# add_file "packages/xorg-xserver/xserver-kdrive/optional-xkb.patch"
# content [98dc794e9631ab770a2d951909a6976b250fa4e8]
#
# add_file "packages/xorg-xserver/xserver-kdrive/tslib-default-device.patch"
# content [92a70fc2ecbf0243c3e6ee5ab7e0ed0686284568]
#
# add_file "packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch"
# content [6045c1bf5a2f86e83240d1c1718bf41574dda458]
#
# add_file "packages/xorg-xserver/xserver-kdrive/xcalibrate-new-input-world-order.patch"
# content [cdd73e5679fed84bbed80a0585ddf4b074d28241]
#
# add_file "packages/xorg-xserver/xserver-kdrive/xcalibrate_coords.patch"
# content [088e08e2806c67c085c9dc8ffffea069e7da97b5]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/disable-xf86-dga-xorgcfg.patch"
# content [0e8754f39994efeff67f876087794543f5ec4a2f]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/enable-tslib.patch"
# content [d8f011120dc0a345fc9c5f897049fea887c705c3]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/enable-xcalibrate.patch"
# content [08d76cc4f9d1c156f3ac72604bd0b9eb126d9b48]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/w100-autofoo.patch"
# content [93931fd9a64ed0b3fee8337b05894bab22e14f63]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/enable-epson.patch"
# content [56d6ba391c1bba04f130af29dbb020558d21ce27]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/enable-tslib.patch"
# content [f62f7ac48ba6955a87651622b7b11a1de9ddd992]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/enable-xcalibrate.patch"
# content [e02870f2fb2e036cbac227b0ac28978e1741d2c4]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/w100-autofoo.patch"
# content [6f05b71251d094a674b948defb10df73039cbb13]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/w100-post-1.4-buildfix.patch"
# content [4e1b8078b6020505d5801133b25d2b6b3a10a59d]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/xephyr-post-1.4-buildfix.patch"
# content [76414d87c4e38fec11b5dc9b0fffeef8132776b2]
#
# add_file "packages/xorg-xserver/xserver-kdrive_1.4.bb"
# content [c9837b4198cd07399be8e9f76ed051e1a9919cfe]
#
# patch "classes/qmake.bbclass"
# from [3ef973d2c334ac644e2f124902ea399136985ee5]
# to [4fb295886f71d537f0bdce9a0c0548d276e993e9]
#
# patch "classes/qmake2.bbclass"
# from [a1af56cd2193e33f5e44f6c7781760386a74d850]
# to [4720a6ca5e41a1786e98f6876c83791801e04a1a]
#
# patch "classes/qmake_base.bbclass"
# from [ad812ccb8f270d4c422cc80258d173e249f04f12]
# to [257ee0c42b534ce40a854f7500ead08cdc37287a]
#
# patch "classes/qt3e.bbclass"
# from [fc9de250333c26f3395549302051e5f0d3cbeaa9]
# to [13fd2f64835873afe33fd96ebb2d538da23fbd4f]
#
# patch "classes/qt3x11.bbclass"
# from [2ec159a14bb13067cc41509f582734ae8329cbb6]
# to [021061b87cd1c52fec22479c0efe7312a0d41898]
#
# patch "packages/base-files/base-files_3.0.14.bb"
# from [7d46d8dffa08a722ac5317549a58f8520ccae5a5]
# to [26083a7751f60fc116a9d07b00b6fa20ed63f4fc]
#
# patch "packages/gcc/gcc-cross_4.2.1.bb"
# from [c01b9500bc2acab9b402e91ca8eb66869dc50d8e]
# to [7c1b83bd533cc9f0be3ff22dfc2f2f421a61b51d]
#
# patch "packages/gcc/gcc_4.2.1.bb"
# from [6e8cf07bbf0b47253a3b63f2c4b0f44b0d66407f]
# to [75d1f330d3edd4d9ef0c6477866c817ffddf9f14]
#
# patch "packages/gsm/files/default"
# from [0db3a380100ebc8548f519ca51e460e710593a18]
# to [d11d3c89b215d54d2e182754e1343c9a2fb716d2]
#
# patch "packages/gsm/files/gsmd"
# from [a0900c11652d1a1755019fc170dcdf36658ef086]
# to [0e44967ffb2d602f531bea0cde6006d337dc4cf8]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [2a8eaeac4025570622a8d2e31183b60094c23103]
# to [367a54f8a664bfa37b00160037aa16f940344d46]
#
# patch "packages/linux/linux-ezx-2.6.21/a780/defconfig"
# from [c9d05f481541b78a034e8da06a789406b69f5499]
# to [98940162319ba1284117359355914689b7f0d76a]
#
# patch "packages/linux/linux-ezx_2.6.21.bb"
# from [935dbd5faafe8b44a770899fe547001db05d19df]
# to [3fba5817ee1b10b077d3b01f0616ad1732492df5]
#
# patch "packages/linux/linux.inc"
# from [4f5f493a73db7cb33ae34f7b5501c9bb911df71f]
# to [18094dd2d248a8de080a6166f54618a19b22af04]
#
# patch "packages/netbase/netbase_4.21.bb"
# from [6f3ca0feab30d1dfc81d97ff3ab8c242e8084886]
# to [8d3a1db23199321161b8aec311e1e9170f56d2bb]
#
# patch "packages/nonworking/gnuboy/qtopiagnuboy_1.0.3.bb"
# from [35f93ddc3180d0d88cb37f504ed87cad1f09f104]
# to [365900054bc871c7d50d2ae0e76fe932475431d8]
#
# patch "packages/nonworking/zethereal/zethereal_1.0.0.bb"
# from [a85d3daf3ac29cf7b5e7cb2454d339e7b686a8a4]
# to [ea1de8219c2fed20fdabc89e425518654aaf0997]
#
# patch "packages/opie-reader/uqtreader_cvs.bb"
# from [8403c9a2b21f0d9505daa16ba0afa062cdd3e607]
# to [61873b6271c2f1decde3ab439dda692a2aa98a36]
#
# patch "packages/putty/putty_svn.bb"
# from [f58f9c215ec8c94ae9d7401adfa1c2315b6f9372]
# to [7407e5ea942f7936e600c68bcaceff08c8556d99]
#
# patch "packages/qt/qt-x11-free-common.inc"
# from [56b0bf6597459e0c2b3d4d8e4840efe5943938d0]
# to [6dcb32e86f0ad84e9cccbc5e9c36107259b8a388]
#
# patch "packages/qt/qt-x11-free-native_3.3.5.bb"
# from [6f26a634b3717bf6128b607b1328c561494948f9]
# to [59251d06fe96fd830e70b5d3f020c7ae2c0aec22]
#
# patch "packages/qt/qt4-x11-free_4.1.2.bb"
# from [6f37f072d6f0ee744fb3b14a36b451bfb7f15d39]
# to [87ff0a36e1696d7c7726c3e3ffd517ca7f9233f3]
#
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
# from [81b2d4f19a5e7a05beed1318a962589e6c8beac9]
# to [2a8bfa1b9cc3aa059dd561726a7bbdfc8bcc4e79]
#
# patch "packages/snes9x/snes9x-sdl-qpe_1.39.bb"
# from [be78c34b9de5652bcd1b72e4182b39b3747ec019]
# to [e72d7742c9c38f87dd93a9ad9a55eb8e1a11c5b3]
#
# patch "packages/taglib/taglib_1.4.bb"
# from [95c3d0a183ed6167101a89a3684c94090bca0b9a]
# to [ba6c47f548d00f94ed177f8934c40cbaea043095]
#
# patch "packages/taglib/taglibc_1.4.bb"
# from [c612c09cd5e88f8074a856179ff84c2431ff0eec]
# to [f43aaaf6f92e11d94d08a787158d2f93d7afd217]
#
# patch "packages/uicmoc/uicmoc-native_2.3.10.bb"
# from [aef21967161c38e506e0763c794755313d83cad0]
# to [d343168478c8c6e8b0748587327fb181ecea6164]
#
# patch "packages/uicmoc/uicmoc3-native_3.3.5.bb"
# from [d698d734a6f89bc64b45c009e340ef00d1ed100e]
# to [f5fb5daae8ef66f9b2d4df4f8372d83f7815347c]
#
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
# from [701a8d99a136183c1057c39066992f41228dd86c]
# to [41111959110e4d02e8cbcb965b17cd1d2494d5b9]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.2.0.bb"
# from [bdd727e7b87cdcef8b2df5c9ee7f48271999900c]
# to [01b72f8f41c67dcc67866b812084e1deabea0619]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [792ae3a3ba391da0e6b49555e228e96517577637]
# to [7f2e709c62424285446c1f454d2bd609e6ab405d]
#
# patch "packages/xorg-xserver/xserver-kdrive_git.bb"
# from [42b262dd40e9be4cfc18266789dfbcb89138c6e1]
# to [071ef9bf1599c5bad428889ff124bb453f739da6]
#
============================================================
--- packages/gcc/gcc-4.2.1/204-uclibc-locale-wchar_fix.patch 9ae599ff2c2039f1a0eaff5298fbc2aa47d4b016
+++ packages/gcc/gcc-4.2.1/204-uclibc-locale-wchar_fix.patch 9ae599ff2c2039f1a0eaff5298fbc2aa47d4b016
@@ -0,0 +1,48 @@
+--- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:37:27 +0100
+@@ -401,7 +401,7 @@
+ # ifdef __UCLIBC_HAS_XLOCALE__
+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
+-# else
++# elif defined __UCLIBC_HAS_LOCALE__
+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
+ # endif
+@@ -556,7 +556,7 @@
+ # ifdef __UCLIBC_HAS_XLOCALE__
+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
+-# else
++# elif defined __UCLIBC_HAS_LOCALE__
+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
+ # endif
+--- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:37:27 +0100
+@@ -127,12 +127,25 @@
+ {
+ // Named locale.
+ // NB: In the GNU model wchar_t is always 32 bit wide.
++#ifdef __UCLIBC_MJN3_ONLY__
++#warning fix this... should be numeric
++#endif
++#ifdef __UCLIBC__
++# ifdef __UCLIBC_HAS_XLOCALE__
++ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
++ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
++# elif defined __UCLIBC_HAS_LOCALE__
++ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
++ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
++# endif
++#else
+ union { char *__s; wchar_t __w; } __u;
+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
+ _M_data->_M_decimal_point = __u.__w;
+
+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
+ _M_data->_M_thousands_sep = __u.__w;
++#endif
+
+ if (_M_data->_M_thousands_sep == L'\0')
+ _M_data->_M_grouping = "";
============================================================
--- packages/gcc/gcc-4.2.1/205-uclibc-locale-update.patch 129ab676c2787de37f94bf3c802616e8b21b7ab9
+++ packages/gcc/gcc-4.2.1/205-uclibc-locale-update.patch 129ab676c2787de37f94bf3c802616e8b21b7ab9
@@ -0,0 +1,347 @@
+--- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200_update~ 2006-03-10 15:32:37 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 2006-03-10 15:39:14 +0100
+@@ -46,16 +47,13 @@
+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
+ const __c_locale& __cloc)
+ {
+- if (!(__err & ios_base::failbit))
+- {
+- char* __sanity;
+- errno = 0;
+- float __f = __strtof_l(__s, &__sanity, __cloc);
+- if (__sanity != __s && errno != ERANGE)
+- __v = __f;
+- else
+- __err |= ios_base::failbit;
+- }
++ char* __sanity;
++ errno = 0;
++ float __f = __strtof_l(__s, &__sanity, __cloc);
++ if (__sanity != __s && errno != ERANGE)
++ __v = __f;
++ else
++ __err |= ios_base::failbit;
+ }
+
+ template<>
+@@ -63,16 +61,13 @@
+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
+ const __c_locale& __cloc)
+ {
+- if (!(__err & ios_base::failbit))
+- {
+- char* __sanity;
+- errno = 0;
+- double __d = __strtod_l(__s, &__sanity, __cloc);
+- if (__sanity != __s && errno != ERANGE)
+- __v = __d;
+- else
+- __err |= ios_base::failbit;
+- }
++ char* __sanity;
++ errno = 0;
++ double __d = __strtod_l(__s, &__sanity, __cloc);
++ if (__sanity != __s && errno != ERANGE)
++ __v = __d;
++ else
++ __err |= ios_base::failbit;
+ }
+
+ template<>
+@@ -80,16 +75,13 @@
+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
+ const __c_locale& __cloc)
+ {
+- if (!(__err & ios_base::failbit))
+- {
+- char* __sanity;
+- errno = 0;
+- long double __ld = __strtold_l(__s, &__sanity, __cloc);
+- if (__sanity != __s && errno != ERANGE)
+- __v = __ld;
+- else
+- __err |= ios_base::failbit;
+- }
++ char* __sanity;
++ errno = 0;
++ long double __ld = __strtold_l(__s, &__sanity, __cloc);
++ if (__sanity != __s && errno != ERANGE)
++ __v = __ld;
++ else
++ __err |= ios_base::failbit;
+ }
+
+ void
+@@ -110,7 +102,7 @@
+ void
+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
+ {
+- if (_S_get_c_locale() != __cloc)
++ if (__cloc && _S_get_c_locale() != __cloc)
+ __freelocale(__cloc);
+ }
+
+--- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200_update~ 2006-03-10 15:32:37 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2006-03-10 15:39:14 +0100
+@@ -33,9 +33,14 @@
+
+ // Written by Benjamin Kosnik <bkoz at redhat.com>
+
++#include <features.h>
++#ifdef __UCLIBC_HAS_LOCALE__
+ #define _LIBC
+ #include <locale>
+ #undef _LIBC
++#else
++#include <locale>
++#endif
+ #include <bits/c++locale_internal.h>
+
+ namespace std
+@@ -138,20 +143,34 @@
+ ctype<wchar_t>::
+ do_is(mask __m, wchar_t __c) const
+ {
+- // Highest bitmask in ctype_base == 10, but extra in "C"
+- // library for blank.
++ // The case of __m == ctype_base::space is particularly important,
++ // due to its use in many istream functions. Therefore we deal with
++ // it first, exploiting the knowledge that on GNU systems _M_bit[5]
++ // is the mask corresponding to ctype_base::space. NB: an encoding
++ // change would not affect correctness!
+ bool __ret = false;
+- const size_t __bitmasksize = 11;
+- for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
+- if (__m & _M_bit[__bitcur]
+- && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
+- {
+- __ret = true;
+- break;
+- }
++ if (__m == _M_bit[5])
++ __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype);
++ else
++ {
++ // Highest bitmask in ctype_base == 10, but extra in "C"
++ // library for blank.
++ const size_t __bitmasksize = 11;
++ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
++ if (__m & _M_bit[__bitcur])
++ {
++ if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
++ {
++ __ret = true;
++ break;
++ }
++ else if (__m == _M_bit[__bitcur])
++ break;
++ }
++ }
+ return __ret;
+ }
+-
++
+ const wchar_t*
+ ctype<wchar_t>::
+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
+--- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200_update~ 2006-03-10 15:32:37 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-03-10 15:39:14 +0100
+@@ -47,18 +47,21 @@
+ template<typename _CharT>
+ messages<_CharT>::messages(size_t __refs)
+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
+- _M_name_messages(_S_get_c_name())
++ _M_name_messages(_S_get_c_name())
+ { }
+
+ templat%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rb6be8d0c408671e0b3ce69563f1c511819083ede -r13c46aa842974ca948296aa5fa9f48e9abe116c6
#
#
#
# patch "packages/e17/exhibit_cvs.bb"
# from [fd141a172c394c58b0e20dad078fce7046c83fc4]
# to [0fb73195eb74fba616a7e95d1b0fc13facb15932]
#
============================================================
--- packages/e17/exhibit_cvs.bb fd141a172c394c58b0e20dad078fce7046c83fc4
+++ packages/e17/exhibit_cvs.bb 0fb73195eb74fba616a7e95d1b0fc13facb15932
@@ -1,5 +1,5 @@ DESCRIPTION = "Exhibit is the ETK pictur
DESCRIPTION = "Exhibit is the ETK picture viewer"
-DEPENDS = "evas ecore edje etk epsilon engrave"
+DEPENDS = "evas ecore epsilon edje eet etk efreet"
LICENSE = "MIT"
PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
More information about the Openembedded-commits
mailing list