--- a/ChangeLog Thu Jul 01 03:11:02 2010 +0000
+++ b/ChangeLog Thu Jul 01 04:43:04 2010 +0000
@@ -1,3 +1,21 @@
+2010-07-01 Brian Lu <[email protected]>
+
+ * specs/SUNWthunderbird.spec:
+ * base-specs/thunderbird.spec:
+ * patches/thunderbird3-11-jemalloc-shared-library.diff:
+ * patches/thunderbird3-12-nspr_use_zone_allocator.diff:
+ * patches/thunderbird3-14-compiler-workaround.diff:
+ * patches/thunderbird3-16-delay-stopping-realplayer.diff:
+ * patches/thunderbird3-20-system-nss-nspr.diff:
+ * patches/thunderbird3-22-use-system-theora-and-sqlite.diff:
+ * patches/thunderbird3-24-gtk-includes.diff:
+ * patches/thunderbird3-27-startup-notification.diff:
+ * patches/thunderbird3-29-account-setup.diff:
+ * patches/thunderbird3-31-use-system-libffi.diff:
+ * patches/thunderbird3-32-package-jemalloc.diff:
+ * patches/thunderbird3-33-using-bash.diff:
+ Bump to 3.1
+
2010-07-01 Simon Jin <[email protected]>
* base-specs/libwnck.spec:Bump to 2.30.2
--- a/base-specs/thunderbird.spec Thu Jul 01 03:11:02 2010 +0000
+++ b/base-specs/thunderbird.spec Thu Jul 01 04:43:04 2010 +0000
@@ -13,13 +13,13 @@
Name: thunderbird
Summary: Mozilla Thunderbird Standalone E-mail and Newsgroup Client
-Version: 3.0.5
+Version: 3.1
%if %option_with_lightning
%define lightning_version 1.0
%endif
-%define tarball_version 3.0.5
+%define tarball_version 3.1
Release: 1
Copyright: MPL
License: MPL
@@ -30,7 +30,7 @@
Source1: thunderbird-icon.png
Source2: thunderbird.desktop
%if %option_with_lightning
-Source3: http://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b1/source/lightning-sunbird-1.0b1.source.tar.bz2
+Source3: http://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b2/source/lightning-1.0b2.source.tar.bz2
Source4: lightning-chrome.manifest
%endif
@@ -84,17 +84,9 @@
# owner:hawklu date:2009-05-22 type:branding
Patch22: thunderbird3-22-use-system-theora-and-sqlite.diff
-# owner:chrisk date:2009-07-19 type:bug
-# status:upstream
-Patch24: thunderbird3-24-gtk-includes.diff
-
# owner:hawklu date:2009-09-03 type:bug doo:1114
Patch26: thunderbird3-26-no-offline-download.diff
-# owner:ginnchen date:2009-12-15 type:bug bugzilla:416053 bugzilla:534845
-# status:upstream
-Patch27: thunderbird3-27-startup-notification.diff
-
# owner:hawklu date:2009-12-31 type:bug bugzilla:537210
Patch28: thunderbird3-28-sync-toolbar.diff
@@ -104,6 +96,13 @@
# owner:hawklu date:2010-05-08 type:bug d.o.o:15616
Patch30: thunderbird3-30-zoom.diff
+# owner:ginnchen date:2009-11-25 type:branding
+Patch31: thunderbird3-31-use-system-libffi.diff
+
+Patch32: thunderbird3-32-package-jemalloc.diff
+
+Patch33: thunderbird3-33-using-bash.diff
+
URL: http://www.sun.com/software/javadesktopsystem/
BuildRoot: %{_tmppath}/%{name}-%{tarball_version}-build
@@ -139,10 +138,10 @@
bzcat %SOURCE3 | tar xf -
cd ..
-rm -rf %{name}/comm-1.9.1/calendar
-cp -r sunbird/comm-1.9.1/calendar %{name}/comm-1.9.1/calendar
+rm -rf %{name}/comm-1.9.2/calendar
+cp -r sunbird/comm-1.9.2/calendar %{name}/comm-1.9.2/calendar
-cd %{name}/comm-1.9.1/mozilla
+cd %{name}/comm-1.9.2/mozilla
%patch1 -p1
%patch5 -p1
%patch12 -p1
@@ -152,8 +151,8 @@
%patch17 -p1
%patch18 -p1
%patch21 -p1
-%patch24 -p1
-%patch27 -p1
+%patch31 -p1
+%patch33 -p1
%if %option_without_moz_nss_nspr
%patch20 -p1
@@ -167,6 +166,7 @@
%patch28 -p1
%patch29 -p1
%patch30 -p1
+%patch32 -p1
#####################################
@@ -193,6 +193,7 @@
ac_add_options --libdir=%{_libdir}
ac_add_options --mandir=%{_mandir}
ac_add_options --enable-static
+ac_add_options --enable-static-mail
ac_add_options --enable-official-branding
ac_add_options --enable-application=mail
ac_add_options --enable-dtrace
@@ -202,6 +203,7 @@
ac_add_options --enable-system-cairo
ac_add_options --disable-updater
ac_add_options --disable-tests
+ac_add_options --disable-necko-wifi
%if %option_with_debug
ac_add_options --enable-debug
ac_add_options --disable-optimize
@@ -219,7 +221,7 @@
%if %option_with_lightning
ac_add_options --enable-calendar
%endif
-#ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-sqlite
ac_add_options --enable-startup-notification
EOF
@@ -241,7 +243,7 @@
%endif
cd ${SRCDIR}/../objdir-tb
-${SRCDIR}/comm-1.9.1/configure
+${SRCDIR}/comm-1.9.2/configure
make
make package
@@ -258,7 +260,11 @@
/bin/ln -s ../lib/thunderbird/thunderbird $RPM_BUILD_ROOT%{_bindir}/thunderbird
%if %option_with_lightning
LIGHTNING_ID="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
-cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/thunderbird/extensions/$LIGHTNING_ID/chrome.manifest
+#cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/thunderbird/extensions/$LIGHTNING_ID/chrome.manifest
+cd thunderbird/extensions
+mkdir $LIGHTNING_ID
+cd $LIGHTNING_ID
+unzip $BUILDDIR/mozilla/dist/xpi-stage/lightning.xpi
%endif
/bin/mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -276,6 +282,8 @@
/bin/rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jun 30 2010 - [email protected]
+- Bump to 3.1
* Fri Jun 18 2010 - [email protected]
- Bump to 3.0.5
* Tue Jun 08 2010 - [email protected]
--- a/patches/thunderbird3-11-jemalloc-shared-library.diff Thu Jul 01 03:11:02 2010 +0000
+++ b/patches/thunderbird3-11-jemalloc-shared-library.diff Thu Jul 01 04:43:04 2010 +0000
@@ -1,11 +1,30 @@
---- a/mozilla/memory/jemalloc/Makefile.in
-+++ b/mozilla/memory/jemalloc/Makefile.in
-@@ -88,23 +88,25 @@ endif
-
- else
-
- MODULE_OPTIMIZE_FLAGS = -O2
- ifeq ($(OS_ARCH),SunOS)
+--- comm-1.9.2/mail/installer/removed-files.in.old5 2010-05-28 11:57:41.434472713 +0800
++++ comm-1.9.2/mail/installer/removed-files.in 2010-05-28 11:58:04.032775995 +0800
+@@ -295,7 +295,9 @@
+ #endif
+ .autoreg
+ component.reg
++#ifndef SOLARIS
+ @DLL_PREFIX@jemalloc@DLL_SUFFIX@
++#endif
+ #ifdef XP_WIN
+ #ifdef MOZ_MEMORY
+ Microsoft.VC80.CRT.manifest
+--- comm-1.9.2/mozilla/browser/installer/removed-files.in.old5 2010-05-28 11:53:18.397388923 +0800
++++ comm-1.9.2/mozilla/browser/installer/removed-files.in 2010-05-28 11:53:46.568024986 +0800
+@@ -787,7 +787,9 @@
+ chrome/icons/default/default.xpm
+ dictionaries/PL.dic
+ dictionaries/PL.aff
++#ifndef SOLARIS
+ libjemalloc.so
++#endif
+ icons/mozicon16.xpm
+ icons/mozicon50.xpm
+ #endif
+--- comm-1.9.2/mozilla/memory/jemalloc/Makefile.in.old5 2010-05-28 11:50:46.547706148 +0800
++++ comm-1.9.2/mozilla/memory/jemalloc/Makefile.in 2010-05-28 11:51:32.464570863 +0800
+@@ -114,13 +114,15 @@
ifndef GNU_CC
MODULE_OPTIMIZE_FLAGS = -xO5
endif
@@ -22,64 +41,3 @@
FORCE_SHARED_LIB= 1
else
DIST_INSTALL = 1
- FORCE_STATIC_LIB= 1
- endif
-
- CSRCS = \
- jemalloc.c \
---- a/mozilla/browser/installer/removed-files.in
-+++ b/mozilla/browser/installer/removed-files.in
-@@ -622,17 +622,19 @@ res/cursors/CVS/Tag
- res/cursors/CVS/Tag
- #endif
- #ifdef XP_UNIX
- #ifndef XP_MACOSX
- readme.txt
- chrome/icons/default/default.xpm
- dictionaries/PL.dic
- dictionaries/PL.aff
-+#ifndef SOLARIS
- libjemalloc.so
-+#endif
- #endif
- #endif
- #ifdef XP_WIN
- #ifdef MOZ_MEMORY
- Microsoft.VC80.CRT.manifest
- msvcm80.dll
- msvcp80.dll
- msvcr80.dll
---- a/mozilla/browser/installer/unix/packages-static
-+++ b/mozilla/browser/installer/unix/packages-static
-@@ -49,16 +49,19 @@ bin/@MOZ_APP_NAME@
- bin/@MOZ_APP_NAME@
- bin/application.ini
- bin/platform.ini
- bin/mozilla-xremote-client
- bin/run-mozilla.sh
- bin/plugins/libnullplugin.so
- bin/libsqlite3.so
- bin/README.txt
-+#ifdef SOLARIS
-+bin/libjemalloc.so
-+#endif
- bin/blocklist.xml
-
- ; [Components]
- bin/components/alerts.xpt
- bin/components/accessibility.xpt
- bin/components/appshell.xpt
- bin/components/appstartup.xpt
- bin/components/autocomplete.xpt
---- a/mail/installer/removed-files.in 2009-11-13 22:11:53.211234709 +0800
-+++ b/mail/installer/removed-files.in 2009-11-13 22:12:13.865045935 +0800
-@@ -194,7 +194,9 @@
- #endif
- .autoreg
- component.reg
-+#ifndef SOLARIS
- @DLL_PREFIX@jemalloc@DLL_SUFFIX@
-+#endif
- #ifdef XP_WIN
- #ifdef MOZ_MEMORY
- Microsoft.VC80.CRT.manifest
--- a/patches/thunderbird3-12-nspr_use_zone_allocator.diff Thu Jul 01 03:11:02 2010 +0000
+++ b/patches/thunderbird3-12-nspr_use_zone_allocator.diff Thu Jul 01 04:43:04 2010 +0000
@@ -1,11 +1,11 @@
---- a/toolkit/xre/nsAppRunner.cpp 2010-02-04 14:57:10.363464487 +0800
-+++ b/toolkit/xre/nsAppRunner.cpp 2010-02-04 14:57:22.452336661 +0800
-@@ -2495,7 +2495,7 @@
+--- mozilla/toolkit/xre/nsAppRunner.cpp.old 2010-05-28 11:06:01.410749289 +0800
++++ mozilla/toolkit/xre/nsAppRunner.cpp 2010-05-28 11:06:26.541515417 +0800
+@@ -2620,7 +2620,7 @@
* By defining the symbol here, we can avoid the wasted lookup and hopefully
* improve startup performance.
*/
-PRBool nspr_use_zone_allocator = PR_FALSE;
+NS_VISIBILITY_DEFAULT PRBool nspr_use_zone_allocator = PR_FALSE;
- #ifdef XP_WIN
- typedef BOOL (WINAPI* SetProcessDEPPolicyFunc)(DWORD dwFlags);
+ #ifdef MOZ_SPLASHSCREEN
+ #define MOZ_SPLASHSCREEN_UPDATE(_i) do { if (splashScreen) splashScreen->Update(_i); } while(0)
--- a/patches/thunderbird3-14-compiler-workaround.diff Thu Jul 01 03:11:02 2010 +0000
+++ b/patches/thunderbird3-14-compiler-workaround.diff Thu Jul 01 04:43:04 2010 +0000
@@ -1,15 +1,10 @@
-diff --git a/js/src/xpconnect/src/xpcconvert.cpp b/js/src/xpconnect/src/xpcconvert.cpp
---- a/js/src/xpconnect/src/xpcconvert.cpp
-+++ b/js/src/xpconnect/src/xpcconvert.cpp
-@@ -1034,17 +1034,22 @@ CreateHolderIfNeeded(XPCCallContext& ccx
- {
- XPCJSObjectHolder* objHolder = XPCJSObjectHolder::newHolder(ccx, obj);
- if(!objHolder)
- return JS_FALSE;
+--- mozilla/js/src/xpconnect/src/xpcconvert.cpp.old1 2010-05-28 11:11:19.583804943 +0800
++++ mozilla/js/src/xpconnect/src/xpcconvert.cpp 2010-05-28 11:11:43.927610306 +0800
+@@ -1036,8 +1036,12 @@
NS_ADDREF(*dest = objHolder);
}
-
+-
+#ifdef __SUNPRO_CC
+ // Ugly workaound for a bug of Sun Studio 12. See Bug 478390.
+ *d = (jsval)obj;
@@ -19,8 +14,3 @@
return JS_TRUE;
}
-
- /***************************************************************************/
- // static
- JSBool
- XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx,
--- a/patches/thunderbird3-16-delay-stopping-realplayer.diff Thu Jul 01 03:11:02 2010 +0000
+++ b/patches/thunderbird3-16-delay-stopping-realplayer.diff Thu Jul 01 04:43:04 2010 +0000
@@ -1,17 +1,14 @@
-diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
---- a/layout/generic/nsObjectFrame.cpp
-+++ b/layout/generic/nsObjectFrame.cpp
-@@ -1897,7 +1897,8 @@
- DoDelayedStop(nsPluginInstanceOwner *aInstanceOwner, PRBool aDelayedStop)
- {
+--- mozilla/layout/generic/nsObjectFrame.cpp.old2 2010-05-28 11:16:25.080584207 +0800
++++ mozilla/layout/generic/nsObjectFrame.cpp 2010-05-28 11:18:22.194677294 +0800
+@@ -2203,6 +2203,7 @@
+
// Don't delay stopping QuickTime (bug 425157), Flip4Mac (bug 426524),
-- // XStandard (bug 430219), CMISS Zinc (bug 429604).
-+ // XStandard (bug 430219), CMISS Zinc (bug 429604),
+ // XStandard (bug 430219), CMISS Zinc (bug 429604).
+ // RealPlayer/Helix (bug 451007).
if (aDelayedStop
#if !(defined XP_WIN || defined MOZ_X11)
&& !aInstanceOwner->MatchPluginName("QuickTime")
-@@ -1905,6 +1906,8 @@
+@@ -2210,6 +2211,8 @@
&& !aInstanceOwner->MatchPluginName("XStandard plugin")
&& !aInstanceOwner->MatchPluginName("CMISS Zinc Plugin")
#endif
--- a/patches/thunderbird3-20-system-nss-nspr.diff Thu Jul 01 03:11:02 2010 +0000
+++ b/patches/thunderbird3-20-system-nss-nspr.diff Thu Jul 01 04:43:04 2010 +0000
@@ -9,58 +9,6 @@
#include "pk11func.h"
#include "cert.h"
#include "secitem.h"
---- a/security/manager/Makefile.in 2009-10-28 17:23:39.956702443 +0800
-+++ b/security/manager/Makefile.in 2009-10-28 17:36:40.838219286 +0800
-@@ -82,6 +82,11 @@
- $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+else
-+ifeq ($(OS_ARCH), SunOS)
-+SDK_LIBS = \
-+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX)
-+endif
- endif
-
- # Default
-@@ -255,6 +260,12 @@
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
- endif
- touch $@
-+else
-+ifeq ($(OS_ARCH), SunOS)
-+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-+ $(MAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS) clean
-+ touch $@
-+endif
- endif
-
- GARBAGE += .nss.cleaned
-@@ -335,6 +346,12 @@
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
- endif
-+else
-+ifeq ($(OS_ARCH), SunOS)
-+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
-+ $(MAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS)
-+ $(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
-+endif
- endif
- ifndef MOZ_NATIVE_NSS
- # NSS installs headers to dist/public and we want them in dist/include
-@@ -419,6 +436,11 @@
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
- endif
-+else
-+ifeq ($(OS_ARCH), SunOS)
-+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-+ $(MAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS) clean
-+endif
- endif
-
- echo-requires-recursive::
--- a/security/manager/ssl/src/nsNSSComponent.cpp Thu May 21 18:39:37 2009
+++ b/security/manager/ssl/src/nsNSSComponent.cpp Thu May 21 18:52:06 2009
@@ -812,6 +812,7 @@
@@ -85,14 +33,55 @@
fullLibraryPath = PR_GetLibraryName(nsnull, "nssckbi");
}
else
---- a/content/media/video/src/nsOggDecoder.cpp Tue Jun 9 18:36:36 2009
-+++ b/content/media/video/src/nsOggDecoder.cpp Tue Jun 9 18:37:32 2009
-@@ -53,6 +53,8 @@
- #include "nsNetUtil.h"
- #include "nsOggDecoder.h"
+--- mozilla-1.9.2/security/manager/Makefile.in.orig 2009-11-25 16:48:09.391408928 +0800
++++ mozilla-1.9.2/security/manager/Makefile.in 2009-11-25 16:52:16.460391559 +0800
+@@ -82,6 +82,11 @@
+ $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \
+ $(NULL)
+ endif
++else
++ifeq ($(OS_ARCH), SunOS)
++SDK_LIBS = \
++ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX)
++endif
+ endif
+
+ # Default
+@@ -292,6 +297,12 @@
+ $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+ endif
+ touch $@
++else
++ifeq ($(OS_ARCH), SunOS)
++ $(NSSMAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
++ $(NSSMAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS) clean
++ touch $@
++endif
+ endif
-+#define PR_ASSERT_CURRENT_THREAD_IN_MONITOR(/* PRMonitor* */ mon)
-+
- using mozilla::TimeDuration;
- using mozilla::TimeStamp;
+ GARBAGE += .nss.cleaned
+@@ -372,6 +383,12 @@
+ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
+ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
+ endif
++else
++ifeq ($(OS_ARCH), SunOS)
++ $(NSSMAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
++ $(NSSMAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS)
++ $(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
++endif
+ endif
+ ifndef MOZ_NATIVE_NSS
+ # NSS installs headers to dist/public and we want them in dist/include
+@@ -454,6 +471,11 @@
+ $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
+ $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+ endif
++else
++ifeq ($(OS_ARCH), SunOS)
++ $(NSSMAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
++ $(NSSMAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS) clean
++endif
+ endif
+ echo-requires-recursive::
--- a/patches/thunderbird3-22-use-system-theora-and-sqlite.diff Thu Jul 01 03:11:02 2010 +0000
+++ b/patches/thunderbird3-22-use-system-theora-and-sqlite.diff Thu Jul 01 04:43:04 2010 +0000
@@ -1,50 +1,11 @@
---- a/mozilla/layout/build/Makefile.in Mon May 25 18:35:12 2009
-+++ b/mozilla/layout/build/Makefile.in Mon May 25 18:37:44 2009
-@@ -150,11 +150,8 @@
- ifdef MOZ_OGG
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libfishsound/src/libfishsound/$(LIB_PREFIX)fishsound.$(LIB_SUFFIX) \
-- $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
- $(DEPTH)/media/liboggplay/src/liboggplay/$(LIB_PREFIX)oggplay.$(LIB_SUFFIX) \
- $(DEPTH)/media/liboggz/src/liboggz/$(LIB_PREFIX)oggz.$(LIB_SUFFIX) \
-- $(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
-- $(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
- $(NULL)
- endif
-
---- a/mozilla/toolkit/library/Makefile.in Mon May 25 18:35:06 2009
-+++ b/mozilla/toolkit/library/Makefile.in Mon May 25 18:37:44 2009
-@@ -248,7 +248,7 @@
- endif
-
- ifeq ($(OS_ARCH),SunOS)
--EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd
-+EXTRA_DSO_LDOPTS += -lvorbis -ltheora -logg -lelf -ldemangle -lCstd
- endif
-
- ifeq ($(OS_ARCH),WINNT)
---- a/mozilla/toolkit/toolkit-tiers.mk Mon May 25 18:37:31 2009
-+++ b/mozilla/toolkit/toolkit-tiers.mk Mon May 25 18:37:44 2009
-@@ -115,11 +115,8 @@
- ifdef MOZ_OGG
- tier_gecko_dirs += \
- media/libfishsound \
-- media/libogg \
- media/liboggplay \
- media/liboggz \
-- media/libtheora \
-- media/libvorbis \
- $(NULL)
- endif
-
---- a/mail/app/Makefile.in Mon May 25 18:32:25 2009
-+++ b/mail/app/Makefile.in Mon May 25 18:32:56 2009
-@@ -137,7 +137,18 @@
+--- comm-1.9.2/mail/app/Makefile.in.old6 2010-05-28 12:04:22.775599804 +0800
++++ comm-1.9.2/mail/app/Makefile.in 2010-05-28 22:30:39.955303949 +0800
+@@ -130,7 +130,18 @@
$(STATIC_COMPONENTS_LINKER_PATH) \
$(MOZ_JS_LIBS) \
$(EXTRA_DSO_LIBS) \
- $(APP_XPCOM_LIBS) \
-+ $(APP_XPCOM_LIBS)
++ $(APP_XPCOM_LIBS)
+
+ifdef BUILD_STATIC_LIBS
+ifdef MOZ_STORAGE
@@ -59,16 +20,68 @@
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)
-@@ -204,6 +215,12 @@
- RCFLAGS += -DMOZ_STATIC_BUILD
+@@ -212,6 +223,12 @@
endif
endif
-+
+
+ifeq ($(OS_ARCH),SunOS)
+ifdef BUILD_STATIC_LIBS
-+OS_LIBS += -lvorbis -ltheora -logg
++OS_LIBS += -lvorbis -ltheora -logg -lpixman-1 `pkg-config --libs libffi`
+endif
+endif
-
++
ifeq ($(OS_ARCH),BeOS)
ifdef BUILD_STATIC_LIBS
+ OS_LIBS += -ltracker -lgame
+--- comm-1.9.2/mozilla/layout/build/Makefile.in.old6 2010-05-28 12:01:41.525228783 +0800
++++ comm-1.9.2/mozilla/layout/build/Makefile.in 2010-05-28 12:02:30.447399193 +0800
+@@ -152,11 +152,8 @@
+ ifdef MOZ_OGG
+ SHARED_LIBRARY_LIBS += \
+ $(DEPTH)/media/libfishsound/src/libfishsound/$(LIB_PREFIX)fishsound.$(LIB_SUFFIX) \
+- $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
+ $(DEPTH)/media/liboggplay/src/liboggplay/$(LIB_PREFIX)oggplay.$(LIB_SUFFIX) \
+ $(DEPTH)/media/liboggz/src/liboggz/$(LIB_PREFIX)oggz.$(LIB_SUFFIX) \
+- $(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
+- $(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
+ $(DEPTH)/content/media/ogg/$(LIB_PREFIX)gkconogg_s.$(LIB_SUFFIX) \
+ $(NULL)
+ endif
+--- comm-1.9.2/mozilla/toolkit/library/Makefile.in.old6 2010-05-28 12:02:47.982180348 +0800
++++ comm-1.9.2/mozilla/toolkit/library/Makefile.in 2010-05-28 12:46:45.789847212 +0800
+@@ -253,7 +253,7 @@
+ endif
+
+ ifeq ($(OS_ARCH),SunOS)
+-EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd
++EXTRA_DSO_LDOPTS += -lvorbis -ltheora -logg -lelf -ldemangle -lCstd `pkg-config --libs libffi`
+ endif
+
+ ifeq ($(OS_ARCH),WINNT)
+--- comm-1.9.2/mozilla/toolkit/toolkit-tiers.mk.old6 2010-05-28 12:03:40.708283173 +0800
++++ comm-1.9.2/mozilla/toolkit/toolkit-tiers.mk 2010-05-28 12:39:48.020523367 +0800
+@@ -93,9 +93,9 @@
+
+ ifdef BUILD_CTYPES
+ ifndef _MSC_VER
+-tier_gecko_staticdirs += \
+- js/ctypes/libffi \
+- $(NULL)
++#tier_gecko_staticdirs += \
++# js/ctypes/libffi \
++# $(NULL)
+ endif
+ endif
+
+@@ -133,11 +133,8 @@
+ ifdef MOZ_OGG
+ tier_gecko_dirs += \
+ media/libfishsound \
+- media/libogg \
+ media/liboggplay \
+ media/liboggz \
+- media/libtheora \
+- media/libvorbis \
+ $(NULL)
+ endif
+
--- a/patches/thunderbird3-24-gtk-includes.diff Thu Jul 01 03:11:02 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diff -ruN firefox.orig/widget/src/gtk2/nsNativeKeyBindings.cpp firefox/widget/src/gtk2/nsNativeKeyBindings.cpp
---- firefox.orig/widget/src/gtk2/nsNativeKeyBindings.cpp 2009-07-19 00:25:17.588636142 +0100
-+++ firefox/widget/src/gtk2/nsNativeKeyBindings.cpp 2009-07-19 00:27:08.519481790 +0100
-@@ -42,10 +42,7 @@
- #include "nsGtkKeyUtils.h"
- #include "nsGUIEvent.h"
-
--#include <gtk/gtkentry.h>
--#include <gtk/gtktextview.h>
--#include <gtk/gtkbindings.h>
--#include <gtk/gtkmain.h>
-+#include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- #include <gdk/gdkevents.h>
-
--- a/patches/thunderbird3-27-startup-notification.diff Thu Jul 01 03:11:02 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3173,13 +3173,6 @@
-
- nsCOMPtr<nsICommandLineRunner> cmdLine;
-
--#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
-- nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
-- if (toolkit && !desktopStartupID.IsEmpty()) {
-- toolkit->SetDesktopStartupID(desktopStartupID);
-- }
--#endif
--
- nsCOMPtr<nsIFile> workingDir;
- rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir));
- NS_ENSURE_SUCCESS(rv, 1);
-@@ -3205,6 +3198,13 @@
- NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
- NS_ENSURE_SUCCESS(rv, 1);
-
-+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
-+ nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
-+ if (toolkit && !desktopStartupID.IsEmpty()) {
-+ toolkit->SetDesktopStartupID(desktopStartupID);
-+ }
-+#endif
-+
- // Extension Compatibility Checking and Startup
- if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) {
- nsCOMPtr<nsIExtensionManager> em(do_GetService("@mozilla.org/extensions/manager;1"));
-@@ -3396,20 +3396,13 @@
- }
- #endif
-
--// XXXkt s/MOZ_TOOLKIT_GTK2/MOZ_WIDGET_GTK2/?
--// but the hidden window has been destroyed so toolkit is NULL anyway.
--#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2)
-- nsGTKToolkit* toolkit = GetGTKToolkit();
-- if (toolkit) {
-- nsCAutoString currentDesktopStartupID;
-- toolkit->GetDesktopStartupID(¤tDesktopStartupID);
-- if (!currentDesktopStartupID.IsEmpty()) {
-- nsCAutoString desktopStartupEnv;
-- desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
-- desktopStartupEnv.Append(currentDesktopStartupID);
-- // Leak it with extreme prejudice!
-- PR_SetEnv(ToNewCString(desktopStartupEnv));
-- }
-+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
-+ if (!desktopStartupID.IsEmpty()) {
-+ nsCAutoString desktopStartupEnv;
-+ desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
-+ desktopStartupEnv.Append(desktopStartupID);
-+ // Leak it with extreme prejudice!
-+ PR_SetEnv(ToNewCString(desktopStartupEnv));
- }
- #endif
-
--- a/patches/thunderbird3-29-account-setup.diff Thu Jul 01 03:11:02 2010 +0000
+++ b/patches/thunderbird3-29-account-setup.diff Thu Jul 01 04:43:04 2010 +0000
@@ -1,12 +1,6 @@
-diff -r 9ff7974b294d mailnews/base/prefs/content/accountcreation/emailWizard.js
---- a/mailnews/base/prefs/content/accountcreation/emailWizard.js Sun Dec 27 17:32:09 2009 +0100
-+++ b/mailnews/base/prefs/content/accountcreation/emailWizard.js Mon Dec 28 15:25:32 2009 +0800
-@@ -88,16 +88,18 @@ function EmailConfigWizard()
- this._init();
- }
- EmailConfigWizard.prototype =
- {
- _init : function EmailConfigWizard__init()
+--- comm-1.9.2/mailnews/base/prefs/content/accountcreation/emailWizard.js.old7 2010-05-28 12:12:24.856745661 +0800
++++ comm-1.9.2/mailnews/base/prefs/content/accountcreation/emailWizard.js 2010-05-28 12:20:07.256870968 +0800
+@@ -93,6 +93,8 @@
{
gEmailWizardLogger.info("Initializing setup wizard");
this._probeAbortable = null;
@@ -15,44 +9,24 @@
},
onLoad : function()
- {
- this._domain = "";
- this._email = "";
- this._realname = "";
- this._password = "";
-@@ -446,18 +448,25 @@ EmailConfigWizard.prototype =
- me.showEditButton();
- me._probeAbortable = null;
- },
- function(e) // fetchConfigFromDB failed
- {
- gEmailWizardLogger.info("fetchConfigFromDB failed: " + e);
- var initialConfig = new AccountConfig();
- me._prefillConfig(initialConfig);
-- me.startSpinner("all", "looking_up_settings")
-+ if (!me._stopped)
-+ me.startSpinner("all", "looking_up_settings");
- me._guessConfig(domain, initialConfig, 'both');
-+ // If user clicks the 'stop' button,we should cancel
-+ // the current probe or probe will reset the fields
-+ // (such as 'Username') when it's timeout.
-+ // User should click (Go) button to restart probe.
-+ if (me._stopped)
-+ me._probeAbortable.cancel() ;
+@@ -504,8 +506,15 @@
+ gEmailWizardLogger.info("fetchConfigForMX failed: " + e);
+ var initialConfig = new AccountConfig();
+ me._prefillConfig(initialConfig);
+- me.startSpinner("all", "looking_up_settings_guess")
++ if (!me._stopped)
++ me.startSpinner("all", "looking_up_settings_guess")
+ me._guessConfig(domain, initialConfig, "both");
++ // If user clicks the 'stop' button,we should cancel
++ // the current probe or probe will reset the fields
++ // (such as 'Username') when it's timeout.
++ // User should click (Go) button to restart probe.
++ if (me._stopped)
++ me._probeAbortable.cancel() ;
+ });
});
});
- },
-
- _guessConfig : function(domain, initialConfig, which)
- {
- let me = this;
- // guessConfig takes several callback functions, which we define inline.
-@@ -1222,16 +1231,17 @@ EmailConfigWizard.prototype =
-
- /* (Stop) button click handler. This should stop short any probing or config
- * guessing progress and changing the config details area into manual edit
- * mode. This button should only be available during probing, after which it
- * is replaced by the (Edit) button.
+@@ -1310,6 +1319,7 @@
*/
onStop : function()
{
@@ -60,17 +34,7 @@
if (!this._probeAbortable)
{
gEmailWizardLogger.info("onStop without a _probeAbortable to cancel");
- }
- else
- {
- this._probeAbortable.cancel();
- gEmailWizardLogger.info("onStop cancelled _probeAbortable");
-@@ -1241,16 +1251,17 @@ EmailConfigWizard.prototype =
- },
-
- /* (Go) button click handler. Restarts the config guessing process after a
- * person possibly editing the fields. The go button replaces either the
- * (Stop) or (Edit) button after they have been clicked.
+@@ -1329,6 +1339,7 @@
*/
onGo : function()
{
@@ -78,8 +42,3 @@
// swap out go for stop button
_hide("go_button");
// the stop is naturally not hidden so has no place in the code where it is
- // told to be shown
- _show("stop_button");
- this._password = document.getElementById("password").value;
- this.goWithConfigDetails();
- var newConfig = this.getUserConfig();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/thunderbird3-31-use-system-libffi.diff Thu Jul 01 04:43:04 2010 +0000
@@ -0,0 +1,41 @@
+--- mozilla/js/ctypes/Makefile.in.old 2010-05-28 22:48:37.979725703 +0800
++++ mozilla/js/ctypes/Makefile.in 2010-05-28 22:49:28.989493230 +0800
+@@ -96,7 +96,7 @@
+
+ # build libffi proper
+ LOCAL_INCLUDES = \
+- -Ilibffi/include \
++ `pkg-config --cflags libffi` \
+ $(NULL)
+
+ ifeq ($(OS_ARCH),OS2)
+@@ -104,9 +104,7 @@
+ emxomf $<
+ endif
+
+-SHARED_LIBRARY_LIBS = \
+- libffi/.libs/$(LIB_PREFIX)ffi.$(LIB_SUFFIX) \
+- $(NULL)
++OS_LIBS += `pkg-config --libs libffi`
+
+ endif # _MSVC_VER
+
+--- mozilla/configure.old 2010-05-28 22:46:59.926484237 +0800
++++ mozilla/configure 2010-05-28 22:48:18.660240139 +0800
+@@ -24063,6 +24063,8 @@
+ ac_configure_args="$ac_configure_args --build=$build --host=$target"
+ fi
+ if test "$SOLARIS_SUNPRO_CC"; then
++ # Build against system libffi
++ if 0; then
+ # Always use gcc for libffi on Solaris
+ old_cache_file=$cache_file
+ cache_file=js/ctypes/libffi/config.cache
+@@ -24166,6 +24168,7 @@
+ fi
+
+ cache_file=$old_cache_file
++fi
+ else
+
+ if test "$no_recursion" != yes; then
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/thunderbird3-32-package-jemalloc.diff Thu Jul 01 04:43:04 2010 +0000
@@ -0,0 +1,10 @@
+--- comm-1.9.2/mail/installer/package-manifest.in.old 2010-06-10 13:13:49.577731815 +0800
++++ comm-1.9.2/mail/installer/package-manifest.in 2010-06-10 13:14:04.531073039 +0800
+@@ -36,6 +36,7 @@
+
+ [xpcom]
+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
++@BINPATH@/@DLL_PREFIX@jemalloc@DLL_SUFFIX@
+ #ifdef XP_OS2
+ @BINPATH@/@DLL_PREFIX@xpcomcor@DLL_SUFFIX@
+ #else
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/thunderbird3-33-using-bash.diff Thu Jul 01 04:43:04 2010 +0000
@@ -0,0 +1,8 @@
+--- comm-1.9.2/configure.old 2010-06-30 12:38:55.267120173 +0800
++++ comm-1.9.2/configure 2010-06-30 12:39:07.918156779 +0800
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+
+ if test `uname -s | grep -c MINGW 2>/dev/null` != "0"; then
+ msyshost=1
--- a/specs/SUNWthunderbird.spec Thu Jul 01 03:11:02 2010 +0000
+++ b/specs/SUNWthunderbird.spec Thu Jul 01 04:43:04 2010 +0000
@@ -113,8 +113,8 @@
export PKG_CONFIG_PATH=${_libdir}/pkgconfig:%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export LDFLAGS="-z ignore"
-export CFLAGS="-xlibmopt -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/X11/include"
-export CXXFLAGS="-xlibmil -xlibmopt -lCrun -lCstd -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+export CFLAGS="-xlibmopt -I/usr/X11/include"
+export CXXFLAGS="-xlibmil -xlibmopt -lCrun -lCstd -features=tmplrefstatic"
%thunderbird.build -d %name-%version
@@ -171,7 +171,7 @@
%files
%endif
-%doc -d thunderbird/comm-1.9.1/mozilla README.txt LICENSE
+%doc -d thunderbird/comm-1.9.2/mozilla README.txt LICENSE
%dir %attr (0755, root, other) %{_datadir}/doc
%defattr(-, root, bin)