[oe-commits] org.oe.dev merge of '2940479bcfd956eef260cc704db455cc804377b8'

[Laibsch commit]

merge of '2940479bcfd956eef260cc704db455cc804377b8'
     and '46647ef87b7a613022c3f8fb0a5c5b1e117aecab'

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 28a8c519bdad5460acd375fdfc946ccc83177df6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=28a8c519bdad5460acd375fdfc946ccc83177df6
Files:
1
packages/zten/zten_1.6.2.bb
site/ix86-common
Diffs:

#
# mt diff -r2940479bcfd956eef260cc704db455cc804377b8 -r28a8c519bdad5460acd375fdfc946ccc83177df6
#
# 
# 
# patch "packages/zten/zten_1.6.2.bb"
#  from [6dc2302625ff7cc29b4fd02acda47bed412e77ae]
#    to [d16e5bbbdd5db91cc2059950ee052d9e1df00d1d]
# 
============================================================
--- packages/zten/zten_1.6.2.bb	6dc2302625ff7cc29b4fd02acda47bed412e77ae
+++ packages/zten/zten_1.6.2.bb	d16e5bbbdd5db91cc2059950ee052d9e1df00d1d
@@ -7,7 +7,7 @@ RCONFLICTS = "ztenv"
 RDEPENDS = "virtual/japanese-font"
 RCONFLICTS = "ztenv"
 
-SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc9321 \
+SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc932 \
            file://zten.patch;patch=1"
 
 S = "${WORKDIR}/zten"


#
# mt diff -r46647ef87b7a613022c3f8fb0a5c5b1e117aecab -r28a8c519bdad5460acd375fdfc946ccc83177df6
#
# 
# 
# patch "site/ix86-common"
#  from [9d67af966d6e1bf15300f65a6c132f686dbaa67c]
#    to [c94dc5adc2a936c8f531a54be0ce51d0b6b1a68d]
# 
============================================================
--- site/ix86-common	9d67af966d6e1bf15300f65a6c132f686dbaa67c
+++ site/ix86-common	c94dc5adc2a936c8f531a54be0ce51d0b6b1a68d
@@ -114,6 +114,7 @@ am_cv_func_working_getline=${am_cv_func_
 am_cv_func_working_getline=${am_cv_func_working_getline=yes}
 
 # glib
+glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
 glib_cv_has__inline=${glib_cv_has__inline=yes}
 glib_cv_has__inline__=${glib_cv_has__inline__=yes}
 glib_cv_hasinline=${glib_cv_hasinline=yes}