diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 32cdbf7..90bf000 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 2 11:40:59 CEST 2009 - wr@rosenauer.org + +- Fixed build issue for gcc 4.4 (mozilla-gcc44.patch) + ------------------------------------------------------------------- Wed Mar 18 14:52:14 CET 2009 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index afb325a..89587dd 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -1,6 +1,7 @@ # # spec file for package MozillaThunderbird (Version 2.0.0.21) # +# Copyright (c) 2006-2009 Wolfgang Rosenauer # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties @@ -38,7 +39,7 @@ BuildRequires: gnome-vfs2 libgnome libgnomeui pkgconfig %endif License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Version: 2.0.0.21 -Release: 1 +Release: 2 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -70,6 +71,7 @@ Patch16: list-replyto-clobber.patch Patch17: mozilla-path_len.patch Patch18: mozldap-charray_strdup.patch Patch19: mozilla-shared-nss-db.patch +Patch20: mozilla-gcc44.patch Patch22: cjk-postscript-fonts.dif Patch25: postscript.patch Patch26: cups-paper.patch @@ -200,6 +202,7 @@ cd $RPM_BUILD_DIR/mozilla %patch16 %patch17 -p1 %patch18 +%patch20 %patch22 %patch25 %patch26 @@ -695,6 +698,8 @@ exit 0 %{_bindir}/thunderbird-config %changelog +* Tue Jun 02 2009 wr@rosenauer.org +- Fixed build issue for gcc 4.4 (mozilla-gcc44.patch) * Wed Mar 18 2009 wr@rosenauer.org - security update to version 2.0.0.21 (bnc#484321) * MFSA 2009-07/CVE-2009-0771, CVE-2009-0772, CVE-2009-0773 @@ -823,7 +828,7 @@ exit 0 - recommend gpg instead of requireing a fixed path * Wed Sep 12 2007 maw@suse.de - Added gpg/pinentry requirements (#309160). -* Mon Sep 03 2007 maw@suse.de +* Tue Sep 04 2007 maw@suse.de - Don't run %%fdupes on directories where multiple partitions are liable to be mounted. * Mon Sep 03 2007 maw@suse.de @@ -1118,7 +1123,7 @@ exit 0 - removing relocation of TEMP directory (#34391) * Fri Mar 26 2004 uli@suse.de - fixed hang during build on s390* (bug #35440) -* Sun Mar 07 2004 ro@suse.de +* Mon Mar 08 2004 ro@suse.de - match function declaration in enigmail mimedummy.cpp * Fri Mar 05 2004 stark@suse.de - more fixes for #35179 diff --git a/mozilla-gcc44.patch b/mozilla-gcc44.patch new file mode 100644 index 0000000..ba8f026 --- /dev/null +++ b/mozilla-gcc44.patch @@ -0,0 +1,22 @@ +Index: ./toolkit/xre/nsAppRunner.cpp +=================================================================== +RCS file: /cvsroot/mozilla/toolkit/xre/nsAppRunner.cpp,v +retrieving revision 1.215 +diff -u -p -6 -r1.215 nsAppRunner.cpp +--- ./toolkit/xre/nsAppRunner.cpp 17 Nov 2008 14:36:43 -0000 1.215 ++++ ./toolkit/xre/nsAppRunner.cpp 27 Apr 2009 18:24:19 -0000 +@@ -1456,13 +1456,13 @@ XRE_GetBinaryPath(const char* argv0, nsI + + rv = NS_NewNativeLocalFile(nsDependentCString(info.name), PR_TRUE, + getter_AddRefs(lf)); + if (NS_FAILED(rv)) + return rv; + +-#elif ++#else + #error Oops, you need platform-specific code here + #endif + + NS_ADDREF(*aResult = lf); + return NS_OK; + }