2010-07-15 Brian Lu <[email protected]> gnome-2-30 NEVADA_145
authorhawklu
Thu, 15 Jul 2010 06:04:42 +0000
branchgnome-2-30
changeset 18352 43c0f36fae6d
parent 18351 6cce76cd861b
child 18353 1f70d45d099e
2010-07-15 Brian Lu <[email protected]> * base-specs/thunderbird.spec: * patches/thunderbird3-35-compiler-workaround-3.diff:
ChangeLog
base-specs/thunderbird.spec
patches/thunderbird3-35-compiler-workaround-3.diff
--- a/ChangeLog	Tue Jul 13 05:33:46 2010 +0000
+++ b/ChangeLog	Thu Jul 15 06:04:42 2010 +0000
@@ -1,3 +1,8 @@
+2010-07-15  Brian Lu  <[email protected]>
+
+	* base-specs/thunderbird.spec:
+	* patches/thunderbird3-35-compiler-workaround-3.diff:
+
 2010-07-13  Brian Lu  <[email protected]>
 
 	* base-specs/thunderbird.spec:
--- a/base-specs/thunderbird.spec	Tue Jul 13 05:33:46 2010 +0000
+++ b/base-specs/thunderbird.spec	Thu Jul 15 06:04:42 2010 +0000
@@ -103,6 +103,9 @@
 
 Patch33: thunderbird3-33-using-bash.diff
 
+# owner:hawklu date:2010-07-15 type:bug d.o.o 16490 
+Patch34: thunderbird3-35-compiler-workaround-3.diff
+
 URL:         http://www.sun.com/software/javadesktopsystem/
 
 BuildRoot:   %{_tmppath}/%{name}-%{tarball_version}-build
@@ -153,6 +156,7 @@
 %patch21 -p1
 %patch31 -p1
 %patch33 -p1
+%patch34 -p1
 
 %if %option_without_moz_nss_nspr
 %patch20 -p1
@@ -282,6 +286,8 @@
 /bin/rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jul 15 2010 - [email protected]
+- Fix d.o.o 16490
 * Tue Jul 13 2010 - [email protected]
 - Fix bug d.o.o 16285
 * Wed Jun 30 2010 - [email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/thunderbird3-35-compiler-workaround-3.diff	Thu Jul 15 06:04:42 2010 +0000
@@ -0,0 +1,12 @@
+--- a/js/src/jsvector.h	2009-10-16 14:59:39.988229000 +0800
++++ b/js/src/jsvector.h	2009-10-16 15:00:12.259437000 +0800
+@@ -662,7 +662,8 @@
+     /* We are !usingInlineStorage(). Initialize new elements. */
+     JS_ASSERT(heapLength() <= heapCapacity() && heapCapacity() - heapLength() >= needed);
+     Impl::copyConstructN(heapEnd(), needed, t);
+-    heapEnd() += needed;
++    T *& heapEndTmp = heapEnd();
++    heapEndTmp += needed;
+     return true;
+ }
+