rpms/thunderbird/FC-6 thunderbird-1.5-profile-migrator.patch, NONE, 1.1 firefox-1.5-pango-printing.patch, 1.2, 1.3 sources, 1.19, 1.20 thunderbird.spec, 1.90, 1.91
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Dec 19 21:29:33 UTC 2006
- Previous message (by thread): rpms/virt-manager/devel virt-manager-disable-config-hvm.patch, NONE, 1.1 virt-manager-hostname-resolution-errors.patch, NONE, 1.1 vm-limit-memory.patch, NONE, 1.1 vm-non-sparse-file.patch, NONE, 1.1 vm-use-ipv4-for-console.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 virt-manager.spec, 1.13, 1.14
- Next message (by thread): rpms/eog/devel .cvsignore, 1.39, 1.40 eog.spec, 1.64, 1.65 sources, 1.39, 1.40
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caillon
Update of /cvs/dist/rpms/thunderbird/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8742
Modified Files:
firefox-1.5-pango-printing.patch sources thunderbird.spec
Added Files:
thunderbird-1.5-profile-migrator.patch
Log Message:
* Tue Dec 19 2006 Matthias Clasen <mclasen at redhat.com> 1.5.0.9-2
- Add a Requires: launchmail (#219884)
* Tue Dec 19 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.9-1
- Update to 1.5.0.9
- Take firefox's pango fixes
- Don't offer to import...nothing.
thunderbird-1.5-profile-migrator.patch:
nsProfileMigrator.cpp | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
--- NEW FILE thunderbird-1.5-profile-migrator.patch ---
Index: mozilla/mail/components/migration/src/nsProfileMigrator.cpp
===================================================================
RCS file: /cvsroot/mozilla/mail/components/migration/src/nsProfileMigrator.cpp,v
retrieving revision 1.9
diff -pu -r1.9 mozilla/mail/components/migration/src/nsProfileMigrator.cpp
--- mozilla/mail/components/migration/src/nsProfileMigrator.cpp
+++ mozilla/mail/components/migration/src/nsProfileMigrator.cpp
@@ -131,24 +131,55 @@ nsProfileMigrator::GetDefaultMailMigrato
// if we are being forced to migrate to a particular migration type, then create an instance of that migrator
// and return it.
+ NS_NAMED_LITERAL_CSTRING(migratorPrefix,
+ NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX);
+ nsCAutoString migratorID;
if (forceMigrationType.get())
{
PRBool exists = PR_FALSE;
- nsCAutoString migratorID (NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX);
+ migratorID = migratorPrefix;
migratorID.Append(forceMigrationType);
mailMigrator = do_CreateInstance(migratorID.get());
-
- if (mailMigrator)
+ if (!mailMigrator)
+ return NS_ERROR_NOT_AVAILABLE;
+
+ mailMigrator->GetSourceExists(&exists);
+ /* trying to force migration on a source which doesn't
+ * have any profiles.
+ */
+ if (!exists)
+ return NS_ERROR_NOT_AVAILABLE;
+ aKey = forceMigrationType;
+ return NS_OK;
+ }
+
+ #define MAX_SOURCE_LENGTH 10
+ const char sources[][MAX_SOURCE_LENGTH] = {
+ "seamonkey",
+ "oexpress",
+ "outlook",
+ "dogbert",
+ "eudora",
+ 0
+ };
+ for (PRUint32 i = 0; sources[i]; ++i)
+ {
+ migratorID = migratorPrefix;
+ migratorID.Append(sources[i]);
+ mailMigrator = do_CreateInstance(migratorID.get());
+ if (!mailMigrator)
+ continue;
+
+ PRBool exists = PR_FALSE;
+ mailMigrator->GetSourceExists(&exists);
+ if (exists)
{
- mailMigrator->GetSourceExists(&exists);
- if (exists)
- aKey = forceMigrationType;
- else
- rv = NS_ERROR_FAILURE; // trying to force migration on a source which does not have any profiles
+ mailMigrator = nsnull;
+ return NS_OK;
}
}
- return rv;
+ return NS_ERROR_NOT_AVAILABLE;
}
NS_IMETHODIMP
firefox-1.5-pango-printing.patch:
config/system-headers | 3
gfx/src/freetype/nsFreeType.cpp | 18
gfx/src/freetype/nsFreeType.h | 7
gfx/src/gtk/mozilla-decoder.cpp | 71 +-
gfx/src/gtk/mozilla-decoder.h | 28
gfx/src/gtk/nsDeviceContextGTK.cpp | 4
gfx/src/gtk/nsFontMetricsPango.cpp | 1226 ++++++++++++++++++++++++------------
gfx/src/gtk/nsFontMetricsPango.h | 160 +++-
gfx/src/gtk/nsFontMetricsUtils.cpp | 21
gfx/src/ps/Makefile.in | 12
gfx/src/ps/nsDeviceContextPS.cpp | 56 +
gfx/src/ps/nsFontMetricsPS.cpp | 309 ++++++++-
gfx/src/ps/nsFontMetricsPS.h | 68 +
gfx/src/ps/nsPostScriptObj.cpp | 124 +++
gfx/src/ps/nsPostScriptObj.h | 32
gfx/src/ps/nsRenderingContextPS.cpp | 206 ------
gfx/src/ps/nsRenderingContextPS.h | 11
gfx/src/ps/nsType1.cpp | 261 +++++--
gfx/src/ps/nsType1.h | 3
19 files changed, 1789 insertions(+), 831 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 firefox-1.5-pango-printing.patch
Index: firefox-1.5-pango-printing.patch
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-6/firefox-1.5-pango-printing.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- firefox-1.5-pango-printing.patch 27 Oct 2006 19:07:21 -0000 1.2
+++ firefox-1.5-pango-printing.patch 19 Dec 2006 21:29:31 -0000 1.3
@@ -1,58 +1,5 @@
-Patch for Firefox 1.5.0.7 to add support for printing via Pango.
-This also implements printing MathML via Pango, and prints bitmap
-fonts too.
-
-Authors:
- Behdad Esfahbod
- Chris Blizzard
- Akira TAGOH
-
-Index: gfx/src/freetype/nsFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
-retrieving revision 1.28
-diff -u -p -d -r1.28 nsFreeType.cpp
---- gfx/src/freetype/nsFreeType.cpp 13 Jul 2005 18:21:10 -0000 1.28
-+++ gfx/src/freetype/nsFreeType.cpp 23 Oct 2006 17:37:09 -0000
-@@ -123,6 +123,8 @@ FtFuncList nsFreeType2::FtFuncs [] = {
- // #endif
- {"FT_Get_First_Char", NS_FT2_OFFSET(nsFT_Get_First_Char), PR_FALSE},
- {"FT_Get_Next_Char", NS_FT2_OFFSET(nsFT_Get_Next_Char), PR_FALSE},
-+ {"FT_Has_PS_Glyph_Names", NS_FT2_OFFSET(nsFT_Has_PS_Glyph_Names), PR_FALSE},
-+ {"FT_Get_Glyph_Name", NS_FT2_OFFSET(nsFT_Get_Glyph_Name), PR_TRUE},
- {nsnull, 0, 0}
- };
-
-@@ -388,6 +390,22 @@ nsFreeType2::GetNextChar(FT_Face face, F
- }
-
- NS_IMETHODIMP
-+nsFreeType2::HasPSGlyphNames(FT_Face face, FT_Int *result)
-+{
-+ // call the FreeType2 function via the function pointer
-+ *result = nsFT_Has_PS_Glyph_Names(face);
-+ return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsFreeType2::GetGlyphName(FT_Face face, FT_UInt glyph_index, FT_Pointer buffer, FT_UInt buffer_max)
-+{
-+ // call the FreeType2 function via the function pointer
-+ FT_Error error = nsFT_Get_Glyph_Name(face, glyph_index, buffer, buffer_max);
-+ return error ? NS_ERROR_FAILURE : NS_OK;
-+}
-+
-+NS_IMETHODIMP
- nsFreeType2::SupportsExtFunc(PRBool *res)
- {
- *res = gHasExtFunc;
-Index: gfx/src/freetype/nsFreeType.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
-retrieving revision 1.18
-diff -u -p -d -r1.18 nsFreeType.h
---- gfx/src/freetype/nsFreeType.h 1 May 2005 17:36:19 -0000 1.18
-+++ gfx/src/freetype/nsFreeType.h 23 Oct 2006 17:37:09 -0000
+--- mozilla/gfx/src/freetype/nsFreeType.h.pango-printing 2005-05-01 13:36:19.000000000 -0400
++++ mozilla/gfx/src/freetype/nsFreeType.h 2006-12-19 15:08:21.000000000 -0500
@@ -52,6 +52,7 @@
#include FT_CACHE_H
#include FT_CACHE_IMAGE_H
@@ -61,7 +8,7 @@
#include "nsIFreeType2.h"
typedef struct FT_FaceRec_* FT_Face;
-@@ -138,6 +139,8 @@ typedef FT_Error (*FT_Glyph_To_Bitmap_t)
+@@ -138,6 +139,8 @@
typedef FT_ULong (*FT_Get_First_Char_t)(FT_Face, FT_UInt*);
typedef FT_ULong (*FT_Get_Next_Char_t)(FT_Face, FT_ULong, FT_UInt*);
@@ -70,7 +17,7 @@
class nsFreeTypeFace;
-@@ -193,11 +196,13 @@ protected:
+@@ -193,11 +196,13 @@
// #endif
FT_Get_First_Char_t nsFT_Get_First_Char;
FT_Get_Next_Char_t nsFT_Get_Next_Char;
@@ -85,1164 +32,638 @@
// #else
// static FtFuncList FtFuncs[20];
// #endif
-Index: gfx/src/ps/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/ps/Makefile.in,v
-retrieving revision 1.57
-diff -u -p -d -r1.57 Makefile.in
---- gfx/src/ps/Makefile.in 4 Mar 2005 07:39:27 -0000 1.57
-+++ gfx/src/ps/Makefile.in 23 Oct 2006 17:37:10 -0000
-@@ -98,13 +98,22 @@ EXTRA_DSO_LDOPTS = \
- $(MOZ_UNICHARUTIL_LIBS) \
- $(NULL)
+--- mozilla/gfx/src/freetype/nsFreeType.cpp.pango-printing 2005-07-13 14:21:10.000000000 -0400
++++ mozilla/gfx/src/freetype/nsFreeType.cpp 2006-12-19 15:08:21.000000000 -0500
+@@ -123,6 +123,8 @@
+ // #endif
+ {"FT_Get_First_Char", NS_FT2_OFFSET(nsFT_Get_First_Char), PR_FALSE},
+ {"FT_Get_Next_Char", NS_FT2_OFFSET(nsFT_Get_Next_Char), PR_FALSE},
++ {"FT_Has_PS_Glyph_Names", NS_FT2_OFFSET(nsFT_Has_PS_Glyph_Names), PR_FALSE},
++ {"FT_Get_Glyph_Name", NS_FT2_OFFSET(nsFT_Get_Glyph_Name), PR_TRUE},
+ {nsnull, 0, 0}
+ };
-+ifdef MOZ_ENABLE_PANGO
-+CPPSRCS += \
-+ nsFontMetricsPSPango.cpp \
-+ mozilla-ps-decoder.cpp
-+EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
-+CXXFLAGS += $(MOZ_PANGO_CFLAGS)
-+CFLAGS += $(MOZ_PANGO_CFLAGS)
-+endif
-+
- ifdef MOZ_ENABLE_XFT
- EXTRA_DSO_LDOPTS += \
- $(MOZ_XFT_LIBS) \
- $(NULL)
- endif
+@@ -388,6 +390,22 @@
+ }
--ifneq (,$(MOZ_ENABLE_FREETYPE2)$(MOZ_ENABLE_XFT))
-+ifneq (,$(MOZ_ENABLE_FREETYPE2)$(MOZ_ENABLE_XFT)$(MOZ_ENABLE_PANGO))
- CPPSRCS += \
- nsType1.cpp \
- $(NULL)
-Index: gfx/src/ps/mozilla-ps-decoder.cpp
-===================================================================
-RCS file: gfx/src/ps/mozilla-ps-decoder.cpp
-diff -N gfx/src/ps/mozilla-ps-decoder.cpp
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ gfx/src/ps/mozilla-ps-decoder.cpp 23 Oct 2006 17:37:10 -0000
-@@ -0,0 +1,376 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* vim:expandtab:shiftwidth=4:tabstop=4:
-+ */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Christopher Blizzard
-+ * <blizzard at mozilla.org>. Portions created by the Initial Developer
-+ * are Copyright (C) 2004 the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#define PANGO_ENABLE_BACKEND
-+#define PANGO_ENABLE_ENGINE
-+
-+#include "mozilla-ps-decoder.h"
-+#include <pango/pangofc-fontmap.h>
-+#include <pango/pangofc-font.h>
-+
-+#include "nsString.h"
-+#include "nsIPersistentProperties2.h"
-+#include "nsNetUtil.h"
-+#include "nsReadableUtils.h"
-+#include "nsICharsetConverterManager.h"
-+#include "nsICharRepresentable.h"
-+#include "nsCompressedCharMap.h"
-+
-+#undef DEBUG_CUSTOM_ENCODER
-+
-+G_DEFINE_TYPE (MozillaPSDecoder, mozilla_ps_decoder, PANGO_TYPE_FC_DECODER)
-+
-+MozillaPSDecoder *mozilla_ps_decoder_new (void);
-+
[...6168 lines suppressed...]
nsCAutoString fontNameBase;
FT2ToType1FontName(aFace, aWmode, fontNameBase);
PRUint32 i = 0;
@@ -4393,7 +3619,7 @@
fprintf(aFile, "%%%%BeginResource: font %s\n"
"%%!PS-AdobeFont-1.0-3.0 %s 1.0\n"
-@@ -573,9 +667,13 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
+@@ -573,9 +667,13 @@
toCS(upm, aFace->bbox.xMax),
toCS(upm, aFace->bbox.yMax));
@@ -4410,7 +3636,7 @@
if (len < 10) {
// Add a small set of characters to the subset of the user
// defined font to produce to make sure the font ends up
-@@ -584,25 +682,47 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
+@@ -584,25 +682,47 @@
// XXX : need to check if this is true of type 1 fonts as well.
// I suspect it's only the case of CID-keyed fonts (type 9) we used to
// generate.
@@ -4468,7 +3694,7 @@
}
fputs("] def\n", aFile);
-@@ -630,23 +750,21 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
+@@ -630,23 +750,21 @@
// get the maximum charstring length without actually filling up the buffer
PRInt32 charStringLen;
PRInt32 maxCharStringLen =
@@ -4499,7 +3725,7 @@
#endif
if (charStringLen > maxCharStringLen)
-@@ -666,7 +784,7 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
+@@ -666,7 +784,7 @@
len + 1).get());
// output the notdef glyph
@@ -4508,7 +3734,7 @@
charStringLen = FT2GlyphToType1CharString(aFace, 0, aWmode, aLenIV,
charString.get());
#else
-@@ -676,22 +794,20 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
+@@ -676,22 +794,20 @@
// enclose charString with "/.notdef RD ..... ND"
charStringOut(aFile, &pos, &key, NS_REINTERPRET_CAST(const char*, charString.get()),
@@ -4538,7 +3764,7 @@
}
// wrap up the encrypted part of the font definition
-@@ -753,15 +869,12 @@ void encryptAndHexOut(FILE *aFile, PRUin
+@@ -753,15 +869,12 @@
/* static */
void charStringOut(FILE* aFile, PRUint32* aPos, PRUint16* aKey,
@@ -4556,29 +3782,104 @@
if (oLen >= 30) {
NS_WARNING("buffer size exceeded. charstring will be truncated");
-Index: gfx/src/ps/nsType1.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/ps/nsType1.h,v
-retrieving revision 1.5
-diff -u -p -d -r1.5 nsType1.h
---- gfx/src/ps/nsType1.h 4 Mar 2005 07:39:27 -0000 1.5
-+++ gfx/src/ps/nsType1.h 23 Oct 2006 17:37:39 -0000
-@@ -122,8 +122,9 @@ FT_Error FT2GlyphToType1CharString(nsIFr
+--- mozilla/gfx/src/ps/nsDeviceContextPS.cpp.pango-printing 2005-05-21 11:33:08.000000000 -0400
++++ mozilla/gfx/src/ps/nsDeviceContextPS.cpp 2006-12-19 15:08:21.000000000 -0500
+@@ -58,12 +58,15 @@
+ #include "nsIPref.h"
+ #include "nsString.h"
+ #include "nsFontMetricsPS.h"
++#ifdef MOZ_ENABLE_PANGO
++#include "nsFontMetricsPango.h"
++#endif
+ #include "nsPostScriptObj.h"
+ #include "nspr.h"
+ #include "nsILanguageAtomService.h"
+ #include "nsPrintJobPS.h"
+ #include "nsPrintJobFactoryPS.h"
+-#if defined(MOZ_ENABLE_FREETYPE2) || defined(MOZ_ENABLE_XFT)
++#if defined(MOZ_ENABLE_FREETYPE2) || defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
+ #include "nsType1.h"
+ #endif
- class nsString;
- class nsCString;
-+class nsValueArray;
+@@ -223,7 +226,7 @@
+
+ nsresult rv;
+ nsCOMPtr<nsIPref> pref(do_GetService(NS_PREF_CONTRACTID, &rv));
+-#ifdef MOZ_ENABLE_XFT
++#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
+ if (NS_SUCCEEDED(rv)) {
+ rv = pref->GetBoolPref("font.FreeType2.printing", &mFTPEnable);
+ if (NS_FAILED(rv))
+@@ -469,7 +472,7 @@
+ NS_ASSERTION(submitFP, "No print job submission handle");
--PRBool FT2SubsetToType1FontSet(FT_Face aFace, const nsString& aSubset,
-+PRBool FT2SubsetToType1FontSet(FT_Face aFace, nsValueArray *aGlyphSubset,
- int aWmode, FILE *aFile);
- nsresult FT2ToType1FontName(FT_Face aFace, int aWmode,
- nsCString& aFontName);
-Index: config/system-headers
-===================================================================
---- config/system-headers 2006-10-26 12:21:39.000000000 -0400
-+++ config/system-headers 2006-10-26 12:23:29.000000000 -0400
-@@ -180,6 +180,7 @@
+ // Start writing the print job to the job handler
+-#if defined(MOZ_ENABLE_FREETYPE2) || defined(MOZ_ENABLE_XFT)
++#if defined(MOZ_ENABLE_FREETYPE2) || defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
+ mPSObj->write_prolog(submitFP, mFTPEnable);
+ #else
+ mPSObj->write_prolog(submitFP);
+@@ -550,15 +553,52 @@
+ virtual nsresult CreateFontMetricsInstance(nsIFontMetrics** aResult);
+ };
+
++#if defined(MOZ_ENABLE_PANGO)
++PRBool
++NS_IsPangoEnabled(void)
++{
++ static PRBool beenHere;
++ static PRBool pangoEnabled;
++
++ if (!beenHere) {
++ beenHere = PR_TRUE;
++
++ char *val = PR_GetEnv("MOZ_DISABLE_PANGO");
++ pangoEnabled = !(val);
++
++ if (pangoEnabled) {
++ nsCOMPtr<nsIPref> prefService = do_GetService(NS_PREF_CONTRACTID);
++ if (prefService)
++ prefService->SetDefaultCharPref("general.useragent.extra.pango",
++ "pango-text");
++ }
++ }
++
++ return pangoEnabled;
++}
++#endif
+
+ nsresult nsFontCachePS::CreateFontMetricsInstance(nsIFontMetrics** aResult)
+ {
+ NS_PRECONDITION(aResult, "null out param");
+- nsIFontMetrics *fm = new nsFontMetricsPS();
+- if (!fm)
+- return NS_ERROR_OUT_OF_MEMORY;
+- NS_ADDREF(fm);
+- *aResult = fm;
++#ifdef MOZ_ENABLE_PANGO
++ if (NS_IsPangoEnabled())
++ {
++ nsIFontMetrics *fm = new nsFontMetricsPSPango();
++ if (!fm)
++ return NS_ERROR_OUT_OF_MEMORY;
++ NS_ADDREF(fm);
++ *aResult = fm;
++ }
++ else
++#endif
++ {
++ nsIFontMetrics *fm = new nsFontMetricsPS();
++ if (!fm)
++ return NS_ERROR_OUT_OF_MEMORY;
++ NS_ADDREF(fm);
++ *aResult = fm;
++ }
+ return NS_OK;
+ }
+
+--- mozilla/config/system-headers.pango-printing 2006-11-14 16:04:44.000000000 -0500
++++ mozilla/config/system-headers 2006-12-19 15:48:24.000000000 -0500
+@@ -199,6 +199,7 @@
freetype/ftoutln.h
freetype/ttnameid.h
freetype/tttables.h
@@ -4586,7 +3887,15 @@
fribidi/fribidi.h
FSp_fopen.h
fstream.h
-@@ -484,6 +485,7 @@
+@@ -303,6 +304,7 @@
+ LaunchServices.h
+ LBroadcaster.h
+ LButton.h
++lber.h
+ lcache.h
+ LCaption.h
+ LCheckBox.h
+@@ -501,6 +503,7 @@
pango/pangofc-fontmap.h
pango/pango-fontmap.h
pango/pango.h
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-6/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 7 Nov 2006 21:38:36 -0000 1.19
+++ sources 19 Dec 2006 21:29:31 -0000 1.20
@@ -1,2 +1,2 @@
-345edba9f68c49d3e8b28eaf93210722 thunderbird-langpacks-1.5.0.8-20061105.tar.bz2
-7b60aa806e4ea1e4708b3982adef7eae thunderbird-1.5.0.8-source.tar.bz2
+bb74629a8d99a6653c5ab978cf9c6227 thunderbird-1.5.0.9-source.tar.bz2
+f38fb250f9c6946912af14930c2cc8e3 thunderbird-langpacks-1.5.0.9-20061215.tar.bz2
Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-6/thunderbird.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- thunderbird.spec 7 Nov 2006 21:34:11 -0000 1.90
+++ thunderbird.spec 19 Dec 2006 21:29:31 -0000 1.91
@@ -7,8 +7,9 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 1.5.0.8
-Release: 1%{?dist}
+Version: 1.5.0.9
+Release: 2%{?dist}
+Epoch: 0
URL: http://www.mozilla.org/projects/thunderbird/
License: MPL
Group: Applications/Internet
@@ -18,7 +19,7 @@
%define tarball thunderbird-1.5rc1-source.tar.bz2
%endif
Source0: %{tarball}
-Source1: thunderbird-langpacks-%{version}-20061105.tar.bz2
+Source1: thunderbird-langpacks-%{version}-20061215.tar.bz2
Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded
Source12: thunderbird-redhat-default-prefs.js
@@ -52,8 +53,8 @@
Patch84: firefox-1.5-pango-printing.patch
# Other
-Patch101: thunderbird-1.5-download-dir.patch
Patch102: firefox-1.5-theme-change.patch
+Patch103: thunderbird-1.5-profile-migrator.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -69,6 +70,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: nspr >= %{nspr_version}
Requires: nss >= %{nss_version}
+%if 0%{?rhel} >= 5
+Requires: launchmail
+%endif
BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: libpng-devel, libjpeg-devel, gtk2-devel
BuildRequires: zlib-devel, gzip, zip, unzip
@@ -99,7 +103,7 @@
%patch2 -p0
%patch4 -p1
-%patch5 -p1 -b .visibility
+#%patch5 -p1 -b .visibility
%patch6 -p1
%patch10 -p1 -b .psfonts
@@ -108,15 +112,24 @@
%patch25 -p0
%patch40 -p1
%patch42 -p0
-%patch81 -p1
-%patch82 -p1
-%patch83 -p1
-%patch84 -p0
-%patch101 -p0 -b .download-dir
-%patch102 -p0 -b .theme-change
+# font system fixes
+%patch81 -p1 -b .nopangoxft
+%patch82 -p1 -b .pango-mathml
+%patch83 -p1 -b .pango-cursor-position
+%patch84 -p1 -b .pango-printing
+pushd gfx/src/ps
+ # This sort of sucks, but it works for now.
+ ln -s ../gtk/nsFontMetricsPango.h .
+ ln -s ../gtk/nsFontMetricsPango.cpp .
+ ln -s ../gtk/mozilla-decoder.h .
+ ln -s ../gtk/mozilla-decoder.cpp .
+popd
+%patch102 -p0 -b .theme-change
+%patch103 -p1 -b .profile-migrator
+
%if %{official_branding}
# Required by Mozilla Corporation
@@ -137,12 +150,23 @@
#===============================================================================
%build
-export RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's/-O2/-Os/')
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$CFLAGS"
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
+
+# Build with -Os as it helps the browser; also, don't override mozilla's warning
+# level; they use -Wall but disable a few warnings that show up _everywhere_
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')
+
+export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
+export PREFIX='%{_prefix}'
+export LIBDIR='%{_libdir}'
+
+%ifarch ppc ppc64 s390 s390x
+%define moz_make_flags -j1
+%else
+%define moz_make_flags %{?_smp_mflags}
+%endif
+
export LDFLAGS="-Wl,-rpath,%{mozappdir}"
+export MAKE="gmake %{moz_make_flags}"
make -f client.mk build
#===============================================================================
@@ -244,39 +268,45 @@
#===============================================================================
%changelog
+* Tue Dec 19 2006 Matthias Clasen <mclasen at redhat.com> 1.5.0.9-2
+- Add a Requires: launchmail (#219884)
+
+* Tue Dec 19 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.9-1
+- Update to 1.5.0.9
+- Take firefox's pango fixes
+- Don't offer to import...nothing.
+
* Tue Nov 7 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.8-1
- Update to 1.5.0.8
- Allow choosing of download directory
- Take the user to the correct directory from the Download Manager.
+- Patch to add support for printing via pango from Behdad.
-* Fri Oct 27 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-5
-- Include pango printing patch from Behdad and co.
-
-* Sun Oct 8 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-4
+* Sun Oct 8 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.7-4
- Default to use of system colors
-* Wed Oct 4 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-3
+* Wed Oct 4 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.7-3
- Bring the invisible character to parity with GTK+
-* Wed Sep 27 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-2
+* Wed Sep 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.7-2
- Fix crash when changing gtk key theme
- Prevent UI freezes while changing GNOME theme
- Remove verbiage about pango; no longer required by upstream.
-* Wed Sep 13 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-1
+* Wed Sep 13 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.7-1
- Update to 1.5.0.7
-* Thu Sep 7 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.5-8
+* Thu Sep 7 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-8
- Shuffle order of the install phase around
-* Thu Sep 7 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.5-7
+* Thu Sep 7 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-7
- Let there be art for Alt+Tab again
- s/tbdir/mozappdir/g
-* Wed Sep 6 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.5-6
+* Wed Sep 6 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-6
- Fix for cursor position in editor widgets by tagoh and behdad (#198759)
-* Tue Sep 5 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.5-5
+* Tue Sep 5 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-5
- Update nopangoxft.patch
- Fix rendering of MathML thanks to Behdad Esfahbod.
- Update start page text to reflect the MathML fixes.
@@ -284,59 +314,59 @@
- Build using -rpath
- Re-enable GCC visibility
-* Thu Aug 3 2006 Kai Engert <kengert at redhat.com> 1.5.0.5-4
+* Thu Aug 3 2006 Kai Engert <kengert at redhat.com> - 1.5.0.5-4
- Fix a build failure in mailnews mime code.
-* Tue Aug 1 2006 Matthias Clasen <mclasen at redhat.com> 1.5.0.5-3
+* Tue Aug 1 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.5-3
- Rebuild
-* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.5-2
+* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-2
- Update to 1.5.0.5
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.5.0.4-2.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0.4-2.1
- rebuild
-* Mon Jun 12 2006 Kai Engert <kengert at redhat.com> 1.5.0.4-2
+* Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-2
- Update to 1.5.0.4
- Fix desktop-file-utils requires
-* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.2-2
+* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-2
- Update to 1.5.0.2
-* Thu Mar 16 2006 Christopher Aillon <caillon at redhat.com> 1.5-7
+* Thu Mar 16 2006 Christopher Aillon <caillon at redhat.com> - 1.5-7
- Bring the other arches back
-* Mon Mar 13 2006 Christopher Aillon <caillon at redhat.com> 1.5.6
+* Mon Mar 13 2006 Christopher Aillon <caillon at redhat.com> - 1.5.6
- Temporarily disable other arches that we don't ship FC5 with, for time
-* Mon Mar 13 2006 Christopher Aillon <caillon at redhat.com> 1.5-5
+* Mon Mar 13 2006 Christopher Aillon <caillon at redhat.com> - 1.5-5
- Add a notice to the mail start page denoting this is a pango enabled build.
-* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> 1.5-3
+* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 1.5-3
- Add dumpstack.patch
- Improve the langpack install stuff
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.5-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5-2.1
- rebuilt for new gcc4.1 snapshot and glibc changes
-* Fri Jan 27 2006 Christopher Aillon <caillon at redhat.com> 1.5-2
+* Fri Jan 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5-2
- Add some langpacks back in
- Stop providing MozillaThunderbird
-* Thu Jan 12 2006 Christopher Aillon <caillon at redhat.com> 1.5-1
+* Thu Jan 12 2006 Christopher Aillon <caillon at redhat.com> - 1.5-1
- Official 1.5 release is out
-* Wed Jan 11 2006 Christopher Aillon <caillon at redhat.com> 1.5-0.5.6.rc1
+* Wed Jan 11 2006 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.6.rc1
- Fix crash when deleting highlighted text while composing mail within
plaintext editor with spellcheck enabled.
-* Tue Jan 3 2006 Christopher Aillon <caillon at redhat.com> 1.5-0.5.5.rc1
+* Tue Jan 3 2006 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.5.rc1
- Looks like we can build on ppc64 again.
-* Fri Dec 16 2005 Christopher Aillon <caillon at redhat.com> 1.5-0.5.4.rc1
+* Fri Dec 16 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.4.rc1
- Rebuild
-* Fri Dec 16 2005 Christopher Aillon <caillon at redhat.com> 1.5-0.5.3.rc1
+* Fri Dec 16 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.3.rc1
- Once again, disable ppc64 because of a new issue.
See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175944
@@ -346,7 +376,7 @@
* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt
-* Mon Nov 28 2005 Christopher Aillon <caillon at redhat.com> 1.5-0.5.1.rc1
+* Mon Nov 28 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.1.rc1
- Fix issue with popup dialogs and other actions causing lockups
* Sat Nov 5 2005 Christopher Aillon <caillon at redhat.com> 1.5-0.5.0.rc1
- Previous message (by thread): rpms/virt-manager/devel virt-manager-disable-config-hvm.patch, NONE, 1.1 virt-manager-hostname-resolution-errors.patch, NONE, 1.1 vm-limit-memory.patch, NONE, 1.1 vm-non-sparse-file.patch, NONE, 1.1 vm-use-ipv4-for-console.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 virt-manager.spec, 1.13, 1.14
- Next message (by thread): rpms/eog/devel .cvsignore, 1.39, 1.40 eog.spec, 1.64, 1.65 sources, 1.39, 1.40
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list