2009-09-23 Brian <
[email protected]>
* base-specs/thunderbird.spec:
* patches/thunderbird3-23-bug504043.diff:
* patches/thunderbird3-25-downloadable-font.diff:
* patches/thunderbird3-26-no-offline-download.diff:
Remove the upstreamed patch thunderbird3-23-bug504043.diff
and thunderbird3-25-downloadable-font.diff
Update patch thunderbird3-26-no-offline-download.diff
Bump to beta4
--- a/ChangeLog Wed Sep 23 09:32:36 2009 +0000
+++ b/ChangeLog Wed Sep 23 10:23:19 2009 +0000
@@ -1,3 +1,14 @@
+2009-09-23 Brian <[email protected]>
+
+ * base-specs/thunderbird.spec:
+ * patches/thunderbird3-23-bug504043.diff:
+ * patches/thunderbird3-25-downloadable-font.diff:
+ * patches/thunderbird3-26-no-offline-download.diff:
+ Remove the upstreamed patch thunderbird3-23-bug504043.diff
+ and thunderbird3-25-downloadable-font.diff
+ Update patch thunderbird3-26-no-offline-download.diff
+ Bump to beta4
+
2009-09-23 Jerry Tan <[email protected]>
* patches/sound-juicer-03*.diff
--- a/base-specs/thunderbird.spec Wed Sep 23 09:32:36 2009 +0000
+++ b/base-specs/thunderbird.spec Wed Sep 23 10:23:19 2009 +0000
@@ -12,13 +12,13 @@
Name: thunderbird
Summary: Mozilla Thunderbird Standalone E-mail and Newsgroup Client
Version: 3.0
-%define tarball_version 3.0b3
+%define tarball_version 3.0b4
Release: 1
Copyright: MPL/LGPL
Group: Applications/Internet
Distribution:Java Desktop System
Vendor: Sun Microsystems, Inc.
-Source: http://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/%{tarball_version}/source/%{name}-%{tarball_version}-source.tar.bz2
+Source: http://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/%{tarball_version}/source/%{name}-%{tarball_version}.source.tar.bz2
Source1: thunderbird-icon.png
Source2: thunderbird.desktop
Source4: thunderbird.cfg
@@ -77,15 +77,9 @@
# owner:hawklu date:2009-05-22 type:bug doo:9112
Patch22: thunderbird3-22-use-system-theora-and-sqlite.diff
-# owner:leon.sha date:2009-07-16 type:bug bugzilla:504043 status:upsteam
-Patch23: thunderbird3-23-bug504043.diff
-
# owner:chrisk date:2009-07-19 type:bug
Patch24: thunderbird3-24-gtk-includes.diff
-# owner:ginnchen date:2009-07-29 type:bug bugzilla:505678 status:upstream
-Patch25: thunderbird3-25-downloadable-font.diff
-
# owner:hawklu date:2009-09-03 type:bug doo:1114
Patch26: thunderbird3-26-no-offline-download.diff
@@ -138,7 +132,7 @@
/bin/mv %{name} %{name}.tmp.$$
# this is workaround for current 3.0 beta 2 tar ball
# fix it when we bump to beta 3
-/bin/mv %{name}.tmp.$$/thunderbird %{name} || /bin/mv %{name}.tmp.$$ %{name}
+/bin/mv %{name}.tmp.$$/comm-central %{name} || /bin/mv %{name}.tmp.$$ %{name}
rm -rf %{name}.tmp.$$
cd %{name}/mozilla
@@ -153,9 +147,7 @@
%patch17 -p1
%patch18 -p1
%patch21 -p1
-%patch23 -p1
%patch24 -p1
-%patch25 -p1
%if %option_without_moz_nss_nspr
%patch20 -p1
@@ -166,10 +158,10 @@
%patch22 -p1
%patch26 -p1
-cp %{SOURCE5} configure
-cp %{SOURCE6} mozilla/configure
-cp %{SOURCE7} mozilla/js/src/configure
-chmod +x configure mozilla/configure mozilla/js/src/configure
+#cp %{SOURCE5} configure
+#cp %{SOURCE6} mozilla/configure
+#cp %{SOURCE7} mozilla/js/src/configure
+#chmod +x configure mozilla/configure mozilla/js/src/configure
#####################################
## Package Build Section ##
@@ -221,7 +213,7 @@
%if %option_with_lightning
ac_add_options --enable-calendar
%endif
-ac_add_options --enable-system-sqlite
+#ac_add_options --enable-system-sqlite
EOF
BUILD_OFFICIAL=1
@@ -308,6 +300,11 @@
%{_datadir}/pixmaps/%{name}-icon.png
%changelog
+* Wed Sep 23 2009 - [email protected]
+- Remove the upstreamed patch thunderbird3-23-bug504043.diff
+ and thunderbird3-25-downloadable-font.diff
+- Update patch thunderbird3-26-no-offline-download.diff
+- Bump to beta4
* Tue Sep 22 2009 - [email protected]
- Update patch thunderbird3-26-no-offline-download.diff
* Fri Sep 18 2009 - [email protected]
--- a/patches/thunderbird3-23-bug504043.diff Wed Sep 23 09:32:36 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-diff --git a/js/src/nanojit/NativeSparc.cpp b/js/src/nanojit/NativeSparc.cpp
---- a/js/src/nanojit/NativeSparc.cpp
-+++ b/js/src/nanojit/NativeSparc.cpp
-@@ -78,22 +78,27 @@
- /**
- * Prologue
- */
-- underrunProtect(12);
-+ underrunProtect(16);
- uint32_t stackNeeded = STACK_GRANULARITY * _activation.highwatermark;
- uint32_t frameSize = stackNeeded + kcalleeAreaSize + kLinkageAreaSize;
- frameSize = BIT_ROUND_UP(frameSize, 8);
-
-- verbose_only( verbose_outputf(" %p:",_nIns); )
-- verbose_only( verbose_output(" patch entry:"); )
-- NIns *patchEntry = _nIns;
- if (frameSize <= 4096)
-- SAVEI(SP, (-frameSize), SP);
-+ SUBI(FP, frameSize, SP);
- else {
-- SAVE(SP, G1, SP);
-- ORI(G1, -frameSize & 0x3FF, G1);
-- SETHI(-frameSize, G1);
-+ SUB(FP, G1, SP);
-+ ORI(G1, frameSize & 0x3FF, G1);
-+ SETHI(frameSize, G1);
- }
-
-+ verbose_only( verbose_outputf(" %p:",_nIns); )
-+ verbose_only( verbose_output(" patch entry:"); )
-+ NIns *patchEntry = _nIns;
-+
-+ // The frame size in SAVE is faked. We will still re-caculate SP later.
-+ // We can use 0 here but it is not good for debuggers.
-+ SAVEI(SP, -148, SP);
-+
- // align the entry point
- asm_align_code();
-
-@@ -885,13 +890,11 @@
- freeRsrcOf(ins, false);
- if (d)
- {
-- Register r = registerAlloc(GpRegs);
-- _allocator.addFree(r);
- const int32_t* p = (const int32_t*) (ins-2);
-- STW32(r, d+4, FP);
-- SET32(p[0], r);
-- STW32(r, d, FP);
-- SET32(p[1], r);
-+ STW32(L2, d+4, FP);
-+ SET32(p[0], L2);
-+ STW32(L2, d, FP);
-+ SET32(p[1], L2);
- }
- }
-
-diff --git a/js/src/nanojit/NativeSparc.h b/js/src/nanojit/NativeSparc.h
---- a/js/src/nanojit/NativeSparc.h
-+++ b/js/src/nanojit/NativeSparc.h
-@@ -829,6 +829,12 @@
- Format_3_1(2, rd, 0x4, rs1, 0, rs2); \
- } while (0)
-
-+#define SUBI(rs1, simm13, rd) \
-+ do { \
-+ asm_output("sub %s, %d, %s", gpn(rs1), simm13, gpn(rd)); \
-+ Format_3_1I(2, rd, 0x4, rs1, simm13); \
-+ } while (0)
-+
- #define XOR(rs1, rs2, rd) \
- do { \
- asm_output("xor %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
--- a/patches/thunderbird3-25-downloadable-font.diff Wed Sep 23 09:32:36 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-diff --git a/gfx/thebes/src/gfxFontUtils.cpp b/gfx/thebes/src/gfxFontUtils.cpp
---- a/gfx/thebes/src/gfxFontUtils.cpp
-+++ b/gfx/thebes/src/gfxFontUtils.cpp
-@@ -512,38 +512,58 @@ nsresult gfxFontUtils::MakeUniqueUserFon
-
-
- // TrueType/OpenType table handling code
-
- // need byte aligned structs
- #pragma pack(1)
-
- struct AutoSwap_PRUint16 {
-+#ifdef __SUNPRO_CC
-+ AutoSwap_PRUint16& operator = (const PRUint16 aValue)
-+ { this->value = NS_SWAP16(aValue); return *this; }
-+#else
- AutoSwap_PRUint16(PRUint16 aValue) { value = NS_SWAP16(aValue); }
-+#endif
- operator PRUint16() const { return NS_SWAP16(value); }
- operator PRUint32() const { return NS_SWAP16(value); }
- operator PRUint64() const { return NS_SWAP16(value); }
- PRUint16 value;
- };
-
- struct AutoSwap_PRInt16 {
-+#ifdef __SUNPRO_CC
-+ AutoSwap_PRInt16& operator = (const PRInt16 aValue)
-+ { this->value = NS_SWAP16(aValue); return *this; }
-+#else
- AutoSwap_PRInt16(PRInt16 aValue) { value = NS_SWAP16(aValue); }
-+#endif
- operator PRInt16() const { return NS_SWAP16(value); }
- operator PRUint32() const { return NS_SWAP16(value); }
- PRInt16 value;
- };
-
- struct AutoSwap_PRUint32 {
-+#ifdef __SUNPRO_CC
-+ AutoSwap_PRUint32& operator = (const PRUint32 aValue)
-+ { this->value = NS_SWAP32(aValue); return *this; }
-+#else
- AutoSwap_PRUint32(PRUint32 aValue) { value = NS_SWAP32(aValue); }
-+#endif
- operator PRUint32() const { return NS_SWAP32(value); }
- PRUint32 value;
- };
-
- struct AutoSwap_PRUint64 {
-+#ifdef __SUNPRO_CC
-+ AutoSwap_PRUint64& operator = (const PRUint64 aValue)
-+ { this->value = NS_SWAP64(aValue); return *this; }
-+#else
- AutoSwap_PRUint64(PRUint64 aValue) { value = NS_SWAP64(aValue); }
-+#endif
- operator PRUint64() const { return NS_SWAP64(value); }
- PRUint64 value;
- };
-
- struct SFNTHeader {
- AutoSwap_PRUint32 sfntVersion; // Fixed, 0x00010000 for version 1.0.
- AutoSwap_PRUint16 numTables; // Number of tables.
- AutoSwap_PRUint16 searchRange; // (Maximum power of 2 <= numTables) x 16.
-@@ -1615,9 +1635,9 @@ gfxFontUtils::MakeEOTHeader(const PRUint
-
- eotHeader->eotSize = aHeader->Length() + fontDataSize;
-
- // DumpEOTHeader(aHeader->Elements(), aHeader->Length());
-
- return NS_OK;
- }
-
--#endif
-\ No newline at end of file
-+#endif
--- a/patches/thunderbird3-26-no-offline-download.diff Wed Sep 23 09:32:36 2009 +0000
+++ b/patches/thunderbird3-26-no-offline-download.diff Wed Sep 23 10:23:19 2009 +0000
@@ -1,15 +1,15 @@
---- thunderbird/mailnews/mailnews.js.old 2009-09-22 11:41:28.097666000 +0800
-+++ thunderbird/mailnews/mailnews.js 2009-09-22 11:42:25.368898000 +0800
-@@ -527,9 +527,9 @@
+--- comm-central/mailnews/mailnews.js.old 2009-09-23 13:57:22.281694000 +0800
++++ comm-central/mailnews/mailnews.js 2009-09-23 13:59:04.908429000 +0800
+@@ -522,9 +522,9 @@
// should we inhibit whitelisting of the domain for a server's identities?
pref("mail.server.default.inhibitWhiteListingIdentityDomain", false);
-// to activate auto-sync feature (preemptive message download for imap) by default
-pref("mail.server.default.autosync_offline_stores",true);
-pref("mail.server.default.offline_download",true);
-+// disable activate auto-sync feature (preemptive message download for imap) by default
++// disable auto-sync feature (preemptive message download for imap) by default
+pref("mail.server.default.autosync_offline_stores",false);
+pref("mail.server.default.offline_download",false);
- pref("mail.server.default.archive_granularity", 1);
- // the probablilty threshold over which messages are classified as junk
+ // -1 means no limit, no purging of offline stores.
+ pref("mail.server.default.autosync_max_age_days", -1);