From f8f5431266689809be2e8c797eff20c9a3517560 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Sep 2010 00:03:36 +0200 Subject: thunderbird-3.1.3-1 --- thunderbird-3.0-ppc64.patch | 42 ------- thunderbird-mozconfig | 1 - thunderbird-mozconfig-debuginfo | 5 +- thunderbird-path.patch | 239 ---------------------------------------- thunderbird.desktop | 2 +- thunderbird.spec | 46 ++++---- xulrunner-missing-headers.patch | 11 -- 7 files changed, 29 insertions(+), 317 deletions(-) delete mode 100644 thunderbird-3.0-ppc64.patch delete mode 100644 thunderbird-path.patch delete mode 100644 xulrunner-missing-headers.patch diff --git a/thunderbird-3.0-ppc64.patch b/thunderbird-3.0-ppc64.patch deleted file mode 100644 index 394524d..0000000 --- a/thunderbird-3.0-ppc64.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- configure.in.ppc64 2009-07-21 14:01:25.000000000 +0200 -+++ configure.in 2009-07-21 14:01:51.000000000 +0200 -@@ -1451,7 +1451,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+x86_64 | ia64 | ppc64) - CPU_ARCH="$OS_TEST" - ;; - esac -@@ -4148,6 +4148,9 @@ - if test -n "${CPU_ARCH}" -a -n "${TARGET_COMPILER_ABI}"; then - TARGET_XPCOM_ABI="${CPU_ARCH}-${TARGET_COMPILER_ABI}" - fi -+echo CPU_ARCH=${CPU_ARCH} -+echo TARGET_COMPILER_ABI=${TARGET_COMPILER_ABI} -+echo TARGET_XPCOM_ABI=$TARGET_XPCOM_ABI - - dnl Mozilla specific options - dnl ======================================================== ---- mozilla/configure.in.ppc64 2009-07-15 22:36:48.000000000 +0200 -+++ mozilla/configure.in 2009-07-21 13:57:46.000000000 +0200 -@@ -1317,7 +1317,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+x86_64 | ia64 | ppc64) - CPU_ARCH="$OS_TEST" - ;; - esac -@@ -4033,6 +4033,9 @@ - if test -n "${CPU_ARCH}" -a -n "${TARGET_COMPILER_ABI}"; then - TARGET_XPCOM_ABI="${CPU_ARCH}-${TARGET_COMPILER_ABI}" - fi -+echo CPU_ARCH=${CPU_ARCH} -+echo TARGET_COMPILER_ABI=${TARGET_COMPILER_ABI} -+echo TARGET_XPCOM_ABI=$TARGET_XPCOM_ABI - - dnl Mozilla specific options - dnl ======================================================== diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig index 6e51584..e338eda 100644 --- a/thunderbird-mozconfig +++ b/thunderbird-mozconfig @@ -30,7 +30,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-necko-wifi ac_add_options --disable-updater - export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/thunderbird-mozconfig-debuginfo b/thunderbird-mozconfig-debuginfo index a0ef07a..65ec915 100644 --- a/thunderbird-mozconfig-debuginfo +++ b/thunderbird-mozconfig-debuginfo @@ -1,5 +1,6 @@ # For mozilla's debuginfo: -export CFLAGS="-gstabs+" -export CXXFLAGS="-gstabs+" +export CFLAGS="-gdwarf-2" +export CXXFLAGS="-gdwarf-2" export MOZ_DEBUG_SYMBOLS=1 +ac_add_options --enable-debug-symbols="-gdwarf-2" ac_add_options --enable-crashreporter diff --git a/thunderbird-path.patch b/thunderbird-path.patch deleted file mode 100644 index 75d5705..0000000 --- a/thunderbird-path.patch +++ /dev/null @@ -1,239 +0,0 @@ ---- mozilla/toolkit/xre/nsAppRunner.h.old 2007-09-25 18:01:56.000000000 +0200 -+++ mozilla/toolkit/xre/nsAppRunner.h 2007-09-25 18:02:23.000000000 +0200 -@@ -48,7 +48,8 @@ - #elif defined(CCHMAXPATH) - #define MAXPATHLEN CCHMAXPATH - #else --#define MAXPATHLEN 1024 -+#include -+#define MAXPATHLEN PATH_MAX - #endif - #endif - -diff -up mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old mozilla/toolkit/mozapps/update/src/updater/updater.cpp ---- mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old 2007-09-25 18:00:26.000000000 +0200 -+++ mozilla/toolkit/mozapps/update/src/updater/updater.cpp 2007-09-25 18:00:53.000000000 +0200 -@@ -107,7 +107,8 @@ void LaunchChild(int argc, char **argv); - # elif defined(CCHMAXPATH) - # define MAXPATHLEN CCHMAXPATH - # else --# define MAXPATHLEN 1024 -+# include -+# define MAXPATHLEN PATH_MAX - # endif - #endif - -diff -up mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp.old mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp ---- mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp.old 2007-09-25 17:58:43.000000000 +0200 -+++ mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp 2007-09-25 17:59:22.000000000 +0200 -@@ -70,7 +70,8 @@ - #elif defined(CCHMAXPATH) - #define MAXPATHLEN CCHMAXPATH - #else --#define MAXPATHLEN 1024 -+#include -+#define MAXPATHLEN PATH_MAX - #endif - #endif - -diff -up mozilla/xpcom/io/SpecialSystemDirectory.cpp.old mozilla/xpcom/io/SpecialSystemDirectory.cpp ---- mozilla/xpcom/io/SpecialSystemDirectory.cpp.old 2007-09-25 18:04:25.000000000 +0200 -+++ mozilla/xpcom/io/SpecialSystemDirectory.cpp 2007-09-25 18:04:48.000000000 +0200 -@@ -109,7 +109,8 @@ - #elif defined(CCHMAXPATH) - #define MAXPATHLEN CCHMAXPATH - #else --#define MAXPATHLEN 1024 -+#include -+#define MAXPATHLEN PATH_MAX - #endif - #endif - -diff -up mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old mozilla/xpcom/obsolete/nsFileSpecUnix.cpp ---- mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old 2006-11-28 01:18:37.000000000 +0100 -+++ mozilla/xpcom/obsolete/nsFileSpecUnix.cpp 2007-09-25 18:05:49.000000000 +0200 -@@ -79,7 +79,8 @@ - #endif - - #ifndef MAXPATHLEN --#define MAXPATHLEN 1024 /* Guessing this is okay. Works for SCO. */ -+#include -+#define MAXPATHLEN PATH_MAX /* Guessing this is okay. Works for SCO. */ - #endif - - #if defined(__QNX__) -diff -up mozilla/xpcom/build/nsXPCOMPrivate.h.old mozilla/xpcom/build/nsXPCOMPrivate.h ---- mozilla/xpcom/build/nsXPCOMPrivate.h.old 2007-09-25 18:02:58.000000000 +0200 -+++ mozilla/xpcom/build/nsXPCOMPrivate.h 2007-09-25 18:03:15.000000000 +0200 -@@ -252,7 +252,8 @@ NS_GetFrozenFunctions(XPCOMFunctions *en - #elif defined(CCHMAXPATH) - #define MAXPATHLEN CCHMAXPATH - #else --#define MAXPATHLEN 1024 -+#include -+#define MAXPATHLEN PATH_MAX - #endif - #endif - -diff -up mozilla/dbm/include/mcom_db.h.old mozilla/dbm/include/mcom_db.h ---- mozilla/dbm/include/mcom_db.h.old 2007-09-25 17:57:09.000000000 +0200 -+++ mozilla/dbm/include/mcom_db.h 2007-09-25 17:57:49.000000000 +0200 -@@ -214,7 +214,8 @@ - #endif /* __DBINTERFACE_PRIVATE */ - - #ifdef SCO --#define MAXPATHLEN 1024 -+#include -+#define MAXPATHLEN PATH_MAX - #endif - - #include -diff -up mozilla/mail/components/migration/src/nsProfileMigrator.cpp.old mozilla/mail/components/migration/src/nsProfileMigrator.cpp ---- mozilla/mail/components/migration/src/nsProfileMigrator.cpp.old 2007-09-25 17:55:11.000000000 +0200 -+++ mozilla/mail/components/migration/src/nsProfileMigrator.cpp 2007-09-25 18:07:56.000000000 +0200 -@@ -73,7 +73,8 @@ - #elif defined(CCHMAXPATH) - #define MAXPATHLEN CCHMAXPATH - #else --#define MAXPATHLEN 1024 -+#include -+#define MAXPATHLEN PATH_MAX - #endif - #endif - -diff -up mozilla/nsprpub/config/nsinstall.c.old mozilla/nsprpub/config/nsinstall.c -diff -up mozilla/js/src/jsfile.c.old mozilla/js/src/jsfile.c ---- mozilla/js/src/jsfile.c.old 2006-07-26 20:55:08.000000000 +0200 -+++ mozilla/js/src/jsfile.c 2007-09-25 18:22:52.000000000 +0200 -@@ -105,7 +105,8 @@ - #define utfstring "binary" - #define unicodestring "unicode" - --#define MAX_PATH_LENGTH 1024 -+#include -+#define MAX_PATH_LENGTH PATH_MAX - #define MODE_SIZE 256 - #define NUMBER_SIZE 32 - #define MAX_LINE_LENGTH 256 -diff -up mozilla/webshell/tests/viewer/nsViewerApp.cpp.old mozilla/webshell/tests/viewer/nsViewerApp.cpp ---- mozilla/webshell/tests/viewer/nsViewerApp.cpp.old 2007-09-25 18:34:51.000000000 +0200 -+++ mozilla/webshell/tests/viewer/nsViewerApp.cpp 2007-09-25 18:35:33.000000000 +0200 -@@ -692,7 +692,8 @@ nsViewerApp::OpenWindow(PRUint32 aNewChr - - #if !defined(XP_WIN) && !defined(XP_OS2) - #ifndef XP_MAC --#define _MAX_PATH 512 -+#include -+#define _MAX_PATH PATH_MAX - #endif - #endif - -diff -up mozilla/xpcom/typelib/xpidl/xpidl_java.c.old mozilla/xpcom/typelib/xpidl/xpidl_java.c ---- mozilla/xpcom/typelib/xpidl/xpidl_java.c.old 2007-09-25 18:38:52.000000000 +0200 -+++ mozilla/xpcom/typelib/xpidl/xpidl_java.c 2007-09-25 18:39:17.000000000 +0200 -@@ -44,6 +44,7 @@ - #include "xpidl.h" - #include - #include -+#include - - #ifdef XP_WIN - #include -diff -up mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old mozilla/widget/src/xremoteclient/XRemoteClient.cpp ---- mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old 2007-09-25 18:14:08.000000000 +0200 -+++ mozilla/widget/src/xremoteclient/XRemoteClient.cpp 2007-09-25 18:36:55.000000000 +0200 -@@ -76,7 +76,8 @@ - #endif - - #ifndef MAX_PATH --#define MAX_PATH 1024 -+#include -+#define MAX_PATH PATH_MAX - #endif - - #define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0])) -diff -up mozilla/modules/libreg/src/reg.c.old mozilla/modules/libreg/src/reg.c ---- mozilla/modules/libreg/src/reg.c.old 2007-09-25 18:25:02.000000000 +0200 -+++ mozilla/modules/libreg/src/reg.c 2007-09-25 18:27:46.000000000 +0200 -@@ -96,7 +96,8 @@ - #define MAX_PATH PATH_MAX - #elif defined(XP_UNIX) - #ifndef MAX_PATH --#define MAX_PATH 1024 -+#include -+#define MAX_PATH PATH_MAX - #endif - #elif defined(XP_OS2) - #ifndef MAX_PATH -diff -up mozilla/directory/c-sdk/config/pathsub.h.old mozilla/directory/c-sdk/config/pathsub.h ---- mozilla/directory/c-sdk/config/pathsub.h.old 2006-02-03 15:41:18.000000000 +0100 -+++ mozilla/directory/c-sdk/config/pathsub.h 2007-09-25 18:48:58.000000000 +0200 -@@ -50,7 +50,7 @@ - #endif - - #ifndef PATH_MAX --#define PATH_MAX 1024 -+#error "PATH_MAX is not defined!" - #endif - - /* -diff -up mozilla/config/pathsub.h.old mozilla/config/pathsub.h ---- mozilla/config/pathsub.h.old 2004-04-18 16:17:25.000000000 +0200 -+++ mozilla/config/pathsub.h 2007-09-25 18:48:13.000000000 +0200 -@@ -46,7 +46,7 @@ - #include - - #ifndef PATH_MAX --#define PATH_MAX 1024 -+#error "PATH_MAX is not defined!" - #endif - - /* -diff -up mozilla/modules/libjar/nsZipArchive.cpp.old mozilla/modules/libjar/nsZipArchive.cpp ---- mozilla/modules/libjar/nsZipArchive.cpp.old 2006-09-13 20:32:37.000000000 +0200 -+++ mozilla/modules/libjar/nsZipArchive.cpp 2007-09-25 18:51:00.000000000 +0200 -@@ -121,7 +121,7 @@ char * strdup(const char *src) - # define S_IFLNK 0120000 - # endif - # ifndef PATH_MAX --# define PATH_MAX 1024 -+# include - # endif - #endif /* XP_UNIX */ - -diff -up mozilla/nsprpub/config/pathsub.h.old mozilla/nsprpub/config/pathsub.h ---- mozilla/nsprpub/config/pathsub.h.old 2004-04-25 17:00:34.000000000 +0200 -+++ mozilla/nsprpub/config/pathsub.h 2007-09-25 18:57:51.000000000 +0200 -@@ -50,7 +50,7 @@ - #endif - - #ifndef PATH_MAX --#define PATH_MAX 1024 -+#error "PATH_MAX is not defined!" - #endif - - /* -diff -up mozilla/gfx/src/gtk/nsPrintdGTK.h.old mozilla/gfx/src/gtk/nsPrintdGTK.h ---- mozilla/gfx/src/gtk/nsPrintdGTK.h.old 2004-04-17 23:52:29.000000000 +0200 -+++ mozilla/gfx/src/gtk/nsPrintdGTK.h 2007-09-25 18:56:48.000000000 +0200 -@@ -63,7 +63,7 @@ PR_BEGIN_EXTERN_C - #ifdef _POSIX_PATH_MAX - #define PATH_MAX _POSIX_PATH_MAX - #else --#define PATH_MAX 256 -+#error "PATH_MAX is not defined!" - #endif - #endif - -diff -up mozilla/security/coreconf/nsinstall/pathsub.h.old mozilla/security/coreconf/nsinstall/pathsub.h ---- mozilla/security/coreconf/nsinstall/pathsub.h.old 2004-04-25 17:02:18.000000000 +0200 -+++ mozilla/security/coreconf/nsinstall/pathsub.h 2007-09-25 19:00:35.000000000 +0200 -@@ -49,7 +49,7 @@ - #endif - - #ifndef PATH_MAX --#define PATH_MAX 1024 -+#error "PATH_MAX is not defined!" - #endif - - /* diff --git a/thunderbird.desktop b/thunderbird.desktop index 81dda0f..1a4bc32 100644 --- a/thunderbird.desktop +++ b/thunderbird.desktop @@ -10,4 +10,4 @@ Terminal=false Type=Application StartupWMClass=Thunderbird-bin MimeType=message/rfc822; -StartupNotify=true \ No newline at end of file +StartupNotify=true diff --git a/thunderbird.spec b/thunderbird.spec index a312290..acce860 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,5 +1,5 @@ %define nspr_version 4.8 -%define nss_version 3.12.3.99 +%define nss_version 3.12.6 %define cairo_version 1.8.8 %define freetype_version 2.1.9 %define lcms_version 1.19 @@ -18,7 +18,7 @@ %define tarballdir comm-1.9.2 %define official_branding 1 -%define include_debuginfo 0 +%define enable_mozilla_crashreporter 0 %define version_internal 3.1 %define mozappdir %{_libdir}/%{name}-%{version_internal} @@ -26,7 +26,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 3.1.2 +Version: 3.1.3 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -41,7 +41,7 @@ Source0: %{tarball} #NoSource: 0 %if %{build_langpacks} # Language package archive is build by RH -Source1: thunderbird-langpacks-%{version}%{?relcan}-20100806.tar.bz2 +Source1: thunderbird-langpacks-%{version}%{?relcan}-20100907.tar.bz2 %endif # Config file for compilation Source10: thunderbird-mozconfig @@ -69,7 +69,6 @@ Patch2: thunderbird-shared-error.patch # Fixes gcc complain that nsFrame::delete is protected Patch4: xulrunner-1.9.2.1-build.patch # Fix missing includes for crash reporter, remove in 3.1 final -Patch5: xulrunner-missing-headers.patch Patch6: remove-static.patch %if %{official_branding} @@ -109,7 +108,8 @@ BuildRequires: libXrender-devel %if 0%{?fedora} >= 10 BuildRequires: hunspell-devel %endif -%if 0%{?fedora} >= 13 +%if 0%{?fedora} >= 15 +# Need SQLITE_SECURE_DELETE option BuildRequires: sqlite-devel >= %{sqlite_version} %endif BuildRequires: startup-notification-devel @@ -148,6 +148,11 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. echo CIBLE = %{name}-%{version}-%{release} [ -f %{SOURCE1} ] || exit 1 %setup -q -c + +sed -e "s/^Name=.*/Name=Thunderbird %{version} %{?relcan}/" \ + -e "s/thunderbird/%{name}/" \ + %{SOURCE20} | tee %{name}.desktop + cd %{tarballdir} sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ @@ -157,7 +162,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch1 -p0 -b .jemalloc %patch2 -p1 -b .shared-error %patch4 -p1 -b .protected -%patch5 -p0 -b .stat %patch6 -p1 -b .static @@ -172,7 +176,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %{__rm} -f .mozconfig cat %{SOURCE10} \ -%if %{fedora} < 13 +%if %{fedora} < 15 | grep -v system-sqlite \ %endif %if %{fedora} < 11 @@ -197,22 +201,19 @@ ac_add_options --disable-libnotify %if %{fedora} >= 11 ac_add_options --enable-system-lcms %endif -%if %{fedora} >= 13 +%if %{fedora} >= 15 ac_add_options --enable-system-sqlite %endif EOF +#{__cp} %{SOURCE10} .mozconfig %if %{official_branding} %{__cat} %{SOURCE11} >> .mozconfig %endif -%if %{include_debuginfo} +%if %{enable_mozilla_crashreporter} %{__cat} %{SOURCE13} >> .mozconfig %endif -sed -e "s/^Name=.*/Name=Thunderbird %{version} %{?relcan}/" \ - -e "s/thunderbird/%{name}/" \ - %{SOURCE20} | tee %{name}.desktop - #=============================================================================== %build @@ -241,7 +242,7 @@ export MAKE="gmake %{moz_make_flags}" make -f client.mk build # create debuginfo for crash-stats.mozilla.com -%if %{include_debuginfo} +%if %{enable_mozilla_crashreporter} cd %{moz_objdir} make buildsymbols %endif @@ -285,7 +286,7 @@ desktop-file-install --vendor mozilla \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category Network \ --add-category Email \ - %{name}.desktop + ../%{name}.desktop # set up the thunderbird start script rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird @@ -366,9 +367,9 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat # Add debuginfo for crash-stats.mozilla.com -%if %{include_debuginfo} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} -cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} +%if %{enable_mozilla_crashreporter} +mkdir -p $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{mozappdir} +cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{mozappdir} %endif # RC - provide account type @@ -469,7 +470,7 @@ fi %{_datadir}/icons/hicolor/256x256/apps/thunderbird.png %{_datadir}/icons/hicolor/32x32/apps/thunderbird.png %{_datadir}/icons/hicolor/48x48/apps/thunderbird.png -%if %{include_debuginfo} +%if %{enable_mozilla_crashreporter} %{mozappdir}/crashreporter %{mozappdir}/crashreporter.ini %{mozappdir}/Throbber-small.gif @@ -478,8 +479,11 @@ fi #=============================================================================== %changelog +* Tue Sep 07 2010 Remi Collet 3.1.3-1 +- Thunderbird 3.1.3 + * Fri Aug 06 2010 Remi Collet 3.1.2-1 -- Thunderbird 3.1.1 +- Thunderbird 3.1.2 * Fri Aug 6 2010 Jan Horak - 3.1.2-1 - Update to 3.1.2 diff --git a/xulrunner-missing-headers.patch b/xulrunner-missing-headers.patch deleted file mode 100644 index 946c35c..0000000 --- a/xulrunner-missing-headers.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc.stat mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc ---- mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc.stat 2010-06-16 15:12:57.000000000 +0200 -+++ mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc 2010-06-16 15:13:02.000000000 +0200 -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - #include - - #include -- cgit