[oe-commits] org.oe.dev merge of '289a0ae2ef5b937f19a659d56d37d2b368af059b'

koen commit openembedded-commits at lists.openembedded.org
Mon Aug 27 11:16:19 UTC 2007


merge of '289a0ae2ef5b937f19a659d56d37d2b368af059b'
     and '51d9e57dcb74a214f91e70c080c84da43520598b'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 3a073c2579c44ba5ce3b37f7376cf03e28b0361f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3a073c2579c44ba5ce3b37f7376cf03e28b0361f
Files:
1
packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock
packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch
packages/gcc/gcc-4.2.1/200-uclibc-locale.patch.lock
packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch
packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock
packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch.lock
packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock
packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock
packages/gcc/gcc-4.2.1/304-index_macro.patch.lock
packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch
packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch
packages/gcc/gcc-4.2.1/307-locale_facets.patch
packages/gcc/gcc-4.2.1/402-libbackend_dep_gcov-iov.h.patch
packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch.lock
packages/gcc/gcc-4.2.1/740-sh-pr24836.patch.lock
packages/gcc/gcc-4.2.1/800-arm-bigendian.patch.lock
packages/gcc/gcc-4.2.1/904-flatten-switch-stmt-00.patch.lock
packages/gcc/gcc-4.2.1/arm-nolibfloat.patch.lock
packages/gcc/gcc-4.2.1/arm-softfloat.patch.lock
packages/gcc/gcc-4.2.1/arm-thumb-cache.patch.lock
packages/gcc/gcc-4.2.1/arm-thumb.patch.lock
packages/gcc/gcc-4.2.1/cache-amnesia.patch.lock
packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff.lock
packages/gcc/gcc-4.2.1/gcc41-configure.in.patch.lock
packages/gcc/gcc-4.2.1/ldflags.patch.lock
packages/gcc/gcc-4.2.1/unbreak-armv4t.patch.lock
packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch.lock
packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch.lock
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc_4.2.1.bb
packages/gpephone/libabenabler2_1.0.bb
packages/gpephone/vochistory_0.1.bb
packages/xserver-common/xserver-common_1.17.bb
packages/gpephone/gpe-session-scripts-phone/phonesession
packages/gpephone/gpe-session-scripts-phone_0.67.bb
packages/gpephone/ptim-engine_svn.bb
packages/tasks/task-gpephone.bb
Diffs:

#
# mt diff -r289a0ae2ef5b937f19a659d56d37d2b368af059b -r3a073c2579c44ba5ce3b37f7376cf03e28b0361f
#
# 
# 
# add_file "packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch"
#  content [b581c03296f5366b4537f115f0f15b882e4642d9]
# 
# add_file "packages/gcc/gcc-4.2.1/200-uclibc-locale.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch"
#  content [64a0003447e854b6c8205b5b87d3cdc8ca7caa1d]
# 
# add_file "packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/304-index_macro.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch"
#  content [18ed95506560584fd1d043968fbd4b0815788660]
# 
# add_file "packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch"
#  content [65b2d89ea79630ced487f720de9e5a517e54c408]
# 
# add_file "packages/gcc/gcc-4.2.1/307-locale_facets.patch"
#  content [5dd86533b193ad688496b19e73f8e0395bb18761]
# 
# add_file "packages/gcc/gcc-4.2.1/402-libbackend_dep_gcov-iov.h.patch"
#  content [1f1916106df0ca5ef09c7ab3bb7f1323de3574e6]
# 
# add_file "packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/740-sh-pr24836.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/800-arm-bigendian.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/904-flatten-switch-stmt-00.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/arm-nolibfloat.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/arm-softfloat.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/arm-thumb-cache.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/arm-thumb.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/cache-amnesia.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/gcc41-configure.in.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/ldflags.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/unbreak-armv4t.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# patch "packages/gcc/gcc-cross_4.2.1.bb"
#  from [320044acba5e9238f864668a392ad637e62641d5]
#    to [78f5b4b004f93529c71f6ccf6d0c605f7d25daac]
# 
# patch "packages/gcc/gcc_4.2.1.bb"
#  from [bafb5bf9dabe0cd6e870dcebb72d25a26d2ff890]
#    to [e8dadb13ddc8b7f5a90543b7fc26fd0466b3e1b6]
# 
============================================================
--- packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch	b581c03296f5366b4537f115f0f15b882e4642d9
+++ packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch	b581c03296f5366b4537f115f0f15b882e4642d9
@@ -0,0 +1,11 @@
+--- gcc/gcc/config.gcc.uclibc100-sh~	2006-03-06 20:46:56 +0100
++++ gcc/gcc/config.gcc	2006-03-10 15:02:41 +0100
+@@ -1905,7 +1905,7 @@
+ 	;;
+ sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
+ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
+-  sh-*-linux* | sh[346lbe]*-*-linux* | \
++  sh*-*-linux* | sh[346lbe]*-*-linux* | \
+   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
+    sh64-*-netbsd* | sh64l*-*-netbsd*)
+ 	tmake_file="${tmake_file} sh/t-sh sh/t-elf"
============================================================
--- packages/gcc/gcc-4.2.1/200-uclibc-locale.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/gcc/gcc-4.2.1/200-uclibc-locale.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch	64a0003447e854b6c8205b5b87d3cdc8ca7caa1d
+++ packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch	64a0003447e854b6c8205b5b87d3cdc8ca7caa1d
@@ -0,0 +1,213 @@
+--- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h.uclibc200no__x~	2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2006-03-10 15:32:37 +0100
+@@ -60,4 +60,49 @@
+ extern "C" __typeof(wctype_l) __wctype_l;
+ #endif 
+ 
++# define __nl_langinfo_l nl_langinfo_l
++# define __strcoll_l strcoll_l
++# define __strftime_l strftime_l
++# define __strtod_l strtod_l
++# define __strtof_l strtof_l
++# define __strtold_l strtold_l
++# define __strxfrm_l strxfrm_l
++# define __newlocale newlocale
++# define __freelocale freelocale
++# define __duplocale duplocale
++# define __uselocale uselocale
++
++# ifdef _GLIBCXX_USE_WCHAR_T
++#  define __iswctype_l iswctype_l
++#  define __towlower_l towlower_l
++#  define __towupper_l towupper_l
++#  define __wcscoll_l wcscoll_l
++#  define __wcsftime_l wcsftime_l
++#  define __wcsxfrm_l wcsxfrm_l
++#  define __wctype_l wctype_l
++# endif
++
++#else
++# define __nl_langinfo_l(N, L)       nl_langinfo((N))
++# define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
++# define __strtod_l(S, E, L)         strtod((S), (E))
++# define __strtof_l(S, E, L)         strtof((S), (E))
++# define __strtold_l(S, E, L)        strtold((S), (E))
++# define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
++# warning should dummy __newlocale check for C|POSIX ?
++# define __newlocale(a, b, c)        NULL
++# define __freelocale(a)             ((void)0)
++# define __duplocale(a)              __c_locale()
++//# define __uselocale ?
++//
++# ifdef _GLIBCXX_USE_WCHAR_T
++#  define __iswctype_l(C, M, L)       iswctype((C), (M))
++#  define __towlower_l(C, L)          towlower((C))
++#  define __towupper_l(C, L)          towupper((C))
++#  define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
++//#  define __wcsftime_l(S, M, F, T, L)  wcsftime((S), (M), (F), (T)) 
++#  define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
++#  define __wctype_l(S, L)            wctype((S))
++# endif
++
+ #endif // GLIBC 2.3 and later
+--- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc	2006-03-10 15:32:37 +0100
+@@ -39,20 +39,6 @@
+ #include <langinfo.h>
+ #include <bits/c++locale_internal.h>
+ 
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __strtol_l(S, E, B, L)      strtol((S), (E), (B))
+-#define __strtoul_l(S, E, B, L)     strtoul((S), (E), (B))
+-#define __strtoll_l(S, E, B, L)     strtoll((S), (E), (B))
+-#define __strtoull_l(S, E, B, L)    strtoull((S), (E), (B))
+-#define __strtof_l(S, E, L)         strtof((S), (E))
+-#define __strtod_l(S, E, L)         strtod((S), (E))
+-#define __strtold_l(S, E, L)        strtold((S), (E))
+-#warning should dummy __newlocale check for C|POSIX ?
+-#define __newlocale(a, b, c)        NULL
+-#define __freelocale(a)             ((void)0)
+-#define __duplocale(a)              __c_locale()
+-#endif
+-
+ namespace std 
+ {
+   template<>
+--- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc	2006-03-10 15:32:37 +0100
+@@ -36,13 +36,6 @@
+ #include <locale>
+ #include <bits/c++locale_internal.h>
+ 
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
+-#define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
+-#define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
+-#define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
+-#endif
+-
+ namespace std
+ {
+   // These are basically extensions to char_traits, and perhaps should
+--- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2006-03-10 15:32:37 +0100
+@@ -43,10 +43,6 @@
+ #warning tailor for stub locale support
+ #endif
+ 
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __nl_langinfo_l(N, L)         nl_langinfo((N))
+-#endif
+-
+ namespace std
+ {
+   // Construct and return valid pattern consisting of some combination of:
+--- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2006-03-10 15:32:37 +0100
+@@ -41,9 +41,6 @@
+ #ifdef __UCLIBC_MJN3_ONLY__
+ #warning tailor for stub locale support
+ #endif
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __nl_langinfo_l(N, L)         nl_langinfo((N))
+-#endif
+ 
+ namespace std
+ {
+--- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc	2006-03-10 15:32:37 +0100
+@@ -40,9 +40,6 @@
+ #ifdef __UCLIBC_MJN3_ONLY__
+ #warning tailor for stub locale support
+ #endif
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __nl_langinfo_l(N, L)         nl_langinfo((N))
+-#endif
+ 
+ namespace std
+ {
+--- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2006-03-10 15:32:37 +0100
+@@ -38,13 +38,6 @@
+ #undef _LIBC
+ #include <bits/c++locale_internal.h>
+ 
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __wctype_l(S, L)           wctype((S))
+-#define __towupper_l(C, L)         towupper((C))
+-#define __towlower_l(C, L)         towlower((C))
+-#define __iswctype_l(C, M, L)      iswctype((C), (M))
+-#endif
+-
+ namespace std
+ {
+   // NB: The other ctype<char> specializations are in src/locale.cc and
+--- gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc	2006-03-10 15:32:37 +0100
+@@ -39,13 +39,10 @@
+ #ifdef __UCLIBC_MJN3_ONLY__
+ #warning fix gettext stuff
+ #endif
+-#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
+-extern "C" char *__dcgettext(const char *domainname,
+-			     const char *msgid, int category);
+ #undef gettext
+-#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
++#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
++#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES)
+ #else
+-#undef gettext
+ #define gettext(msgid) (msgid)
+ #endif
+ 
+--- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200no__x~	2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-03-10 15:32:37 +0100
+@@ -36,15 +36,11 @@
+ #ifdef __UCLIBC_MJN3_ONLY__
+ #warning fix prototypes for *textdomain funcs
+ #endif
+-#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
+-extern "C" char *__textdomain(const char *domainname);
+-extern "C" char *__bindtextdomain(const char *domainname,
+-				  const char *dirname);
+-#else
+-#undef __textdomain
+-#undef __bindtextdomain
+-#define __textdomain(D)           ((void)0)
+-#define __bindtextdomain(D,P)     ((void)0)
++#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__
++#undef textdomain
++#undef bindtextdomain
++#define textdomain(D)           ((void)0)
++#define bindtextdomain(D,P)     ((void)0)
+ #endif
+ 
+   // Non-virtual member functions.
+@@ -70,7 +66,7 @@
+     messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, 
+ 			   const char* __dir) const
+     { 
+-      __bindtextdomain(__s.c_str(), __dir);
++      bindtextdomain(__s.c_str(), __dir);
+       return this->do_open(__s, __loc); 
+     }
+ 
+@@ -90,7 +86,7 @@
+     { 
+       // No error checking is done, assume the catalog exists and can
+       // be used.
+-      __textdomain(__s.c_str());
++      textdomain(__s.c_str());
+       return 0;
+     }
+ 
+--- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h.uclibc200no__x~	2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h	2006-03-10 15:32:37 +0100
+@@ -68,6 +68,7 @@
+ {
+   extern "C" __typeof(uselocale) __uselocale;
+ }
++#define __uselocale uselocale
+ #endif
+ 
+ namespace std
============================================================
--- packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/gcc/gcc-4.2.1/304-index_macro.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/gcc/gcc-4.2.1/304-index_macro.patch.lock	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch	18ed95506560584fd1d043968fbd4b0815788660
+++ packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch	18ed95506560584fd1d043968fbd4b0815788660
@@ -0,0 +1,49 @@
+Index: gcc-4.2/libmudflap/mf-hooks2.c
+===================================================================
+--- gcc-4.2/libmudflap/mf-hooks2.c	(revision 119834)
++++ gcc-4.2/libmudflap/mf-hooks2.c	(working copy)
+@@ -427,7 +427,7 @@
+ {
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
+-  bzero (s, n);
++  memset (s, 0, n);
+ }
+ 
+ 
+@@ -437,7 +437,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
+   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
+-  bcopy (src, dest, n);
++  memmove (dest, src, n);
+ }
+ 
+ 
+@@ -447,7 +447,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
+   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
+-  return bcmp (s1, s2, n);
++  return n == 0 ? 0 : memcmp (s1, s2, n);
+ }
+ 
+ 
+@@ -456,7 +456,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
+-  return index (s, c);
++  return strchr (s, c);
+ }
+ 
+ 
+@@ -465,7 +465,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
+-  return rindex (s, c);
++  return strrchr (s, c);
+ }
+ 
+ /* XXX:  stpcpy, memccpy */
============================================================
--- packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch	65b2d89ea79630ced487f720de9e5a517e54c408
+++ packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch	65b2d89ea79630ced487f720de9%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r51d9e57dcb74a214f91e70c080c84da43520598b -r3a073c2579c44ba5ce3b37f7376cf03e28b0361f
#
# 
# 
# add_file "packages/gpephone/libabenabler2_1.0.bb"
#  content [4f9c73be9459a6c41bed68e0a75c9b0fae0f5209]
# 
# add_file "packages/gpephone/vochistory_0.1.bb"
#  content [a6fc2d805c8e1894ef2c15a122934d42c45861d3]
# 
# add_file "packages/xserver-common/xserver-common_1.17.bb"
#  content [14f7d103bf373a302fc67211bc1c91f71605d7fb]
# 
# patch "packages/gpephone/gpe-session-scripts-phone/phonesession"
#  from [e0f4897cf03774795773888e2931554df0824118]
#    to [fef840f9cf5db3a22ea5bfac5e0d27b6516b52f2]
# 
# patch "packages/gpephone/gpe-session-scripts-phone_0.67.bb"
#  from [ea1d40745d9fe6c81ff23a05247b1fc791189eac]
#    to [78d311fb6d468089b270987a262475a63969ba75]
# 
# patch "packages/gpephone/ptim-engine_svn.bb"
#  from [7faa1b8b01b548efede423f2c32b31a4ae6ece7c]
#    to [ef51d9a661f2eb0e31b90b646ef0763265f8e070]
# 
# patch "packages/tasks/task-gpephone.bb"
#  from [32f3ddece27b455887f907603ffe167f70aaadd7]
#    to [c56f885095e703c6fe7dddc445c17a9632544977]
# 
============================================================
--- packages/gpephone/libabenabler2_1.0.bb	4f9c73be9459a6c41bed68e0a75c9b0fae0f5209
+++ packages/gpephone/libabenabler2_1.0.bb	4f9c73be9459a6c41bed68e0a75c9b0fae0f5209
@@ -0,0 +1,15 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS address book library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0 librecord2 gconf sqlite3"
+PR          = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpephone pkgconfig autotools
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/gpephone/vochistory_0.1.bb	a6fc2d805c8e1894ef2c15a122934d42c45861d3
+++ packages/gpephone/vochistory_0.1.bb	a6fc2d805c8e1894ef2c15a122934d42c45861d3
@@ -0,0 +1,12 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "Voice call event history"
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ dbus-glib libgpewidget libgpephone libiac libchenabler"
+
+inherit gpephone autotools
+
+SRC_URI = "${GPEPHONE_MIRROR}/vochistory-${PV}/callhistory-${PV}.tar.bz2"
+S = "${WORKDIR}/callhistory-${PV}"
============================================================
--- packages/xserver-common/xserver-common_1.17.bb	14f7d103bf373a302fc67211bc1c91f71605d7fb
+++ packages/xserver-common/xserver-common_1.17.bb	14f7d103bf373a302fc67211bc1c91f71605d7fb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r0"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh "
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
============================================================
--- packages/gpephone/gpe-session-scripts-phone/phonesession	e0f4897cf03774795773888e2931554df0824118
+++ packages/gpephone/gpe-session-scripts-phone/phonesession	fef840f9cf5db3a22ea5bfac5e0d27b6516b52f2
@@ -24,7 +24,6 @@ export	SMS_RING_TONE_PATH=$APP_PATH/shar
 export	SMS_RING_TONE_PATH=$APP_PATH/share/chocolate.mp3
 
 # For E-mail
-export	EMAIL_GRAPHIC_PATH=$APP_PATH/share/email-graphic
 export	TINYMAIL_CACHE_DIR=$APP_PATH/share/tinymail.cache
 
 # For Calendar
============================================================
--- packages/gpephone/gpe-session-scripts-phone_0.67.bb	ea1d40745d9fe6c81ff23a05247b1fc791189eac
+++ packages/gpephone/gpe-session-scripts-phone_0.67.bb	78d311fb6d468089b270987a262475a63969ba75
@@ -14,7 +14,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scr
 	   file://disable-composite.xsettings \
            file://standard-apps.patch;patch=1"
 
-PR = "r7"
+PR = "r8"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"
 
============================================================
--- packages/gpephone/ptim-engine_svn.bb	7faa1b8b01b548efede423f2c32b31a4ae6ece7c
+++ packages/gpephone/ptim-engine_svn.bb	ef51d9a661f2eb0e31b90b646ef0763265f8e070
@@ -14,7 +14,7 @@ S = "${WORKDIR}/imengine"
 
 S = "${WORKDIR}/imengine"
 
-FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so "
+FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pydatabase/*"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/engine/.debug/*.so"
 FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la"
 
============================================================
--- packages/tasks/task-gpephone.bb	32f3ddece27b455887f907603ffe167f70aaadd7
+++ packages/tasks/task-gpephone.bb	c56f885095e703c6fe7dddc445c17a9632544977
@@ -29,6 +29,7 @@ RDEPENDS_gpephone-task-base = "\
     phoneserver \
     soundserver \
     voicecall \
+    vochistory \
     sms \
     audioplayer \
     videoplayer \
@@ -87,4 +88,5 @@ RDEPENDS_gpephone-task-connectivity = "\
     gpe-windowlist"
 
 RDEPENDS_gpephone-task-connectivity = "\
+    email \
 "






More information about the Openembedded-commits mailing list