rpms/thunderbird/devel mozilla-1.7.3-pango-render.patch, 1.3, 1.4 thunderbird.spec, 1.32, 1.33

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri May 13 15:05:47 UTC 2005 

Author: caillon

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32535

Modified Files:
	mozilla-1.7.3-pango-render.patch thunderbird.spec 
Log Message:
* Fri May 13 2005 Christopher Aillon <caillon at redhat.com> 1.0.2-5
- Update pango patche, MOZ_DISABLE_PANGO now works as advertised.


mozilla-1.7.3-pango-render.patch:
 config/autoconf.mk.in                    |    4 
 configure.in                             |   28 
 gfx/src/gtk/Makefile.in                  |   10 
 gfx/src/gtk/gfxgtk.pkg                   |    3 
 gfx/src/gtk/mozilla-decoder.cpp          |  376 +++++++
 gfx/src/gtk/mozilla-decoder.h            |   72 +
 gfx/src/gtk/nsFontMetricsGTK.cpp         |    6 
 gfx/src/gtk/nsFontMetricsGTK.h           |    2 
 gfx/src/gtk/nsFontMetricsPango.cpp       | 1662 +++++++++++++++++++++++++++++++
 gfx/src/gtk/nsFontMetricsPango.h         |  278 +++++
 gfx/src/gtk/nsFontMetricsUtils.cpp       |   28 
 gfx/src/gtk/nsFontMetricsUtils.h         |    5 
 gfx/src/gtk/nsFontMetricsXft.cpp         |   69 +
 gfx/src/gtk/nsFontMetricsXft.h           |    2 
 gfx/src/gtk/nsGCCache.cpp                |   82 -
 gfx/src/gtk/nsGfxFactoryGTK.cpp          |   23 
 gfx/src/gtk/nsIFontMetricsGTK.h          |    3 
 gfx/src/gtk/nsRenderingContextGTK.cpp    |    8 
 gfx/src/gtk/nsRenderingContextGTK.h      |    2 
 gfx/src/gtk/pangoFontEncoding.properties |  120 ++
 20 files changed, 2709 insertions(+), 74 deletions(-)

Index: mozilla-1.7.3-pango-render.patch
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/mozilla-1.7.3-pango-render.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mozilla-1.7.3-pango-render.patch	16 Dec 2004 22:21:15 -0000	1.3
+++ mozilla-1.7.3-pango-render.patch	13 May 2005 15:05:44 -0000	1.4
@@ -1,6 +1,6 @@
---- mozilla/config/autoconf.mk.in.foo	2004-10-31 00:29:54.000000000 -0400
-+++ mozilla/config/autoconf.mk.in	2004-12-03 13:30:56.000000000 -0500
-@@ -388,6 +388,10 @@
+--- mozilla/config/autoconf.mk.in.foo	2004-11-22 12:55:08.000000000 -0500
++++ mozilla/config/autoconf.mk.in	2004-11-22 12:56:21.000000000 -0500
+@@ -394,6 +394,10 @@
  MOZ_XFT_LIBS		= @MOZ_XFT_LIBS@
  MOZ_ENABLE_COREXFONTS	= @MOZ_ENABLE_COREXFONTS@
  
@@ -12,7 +12,7 @@
  
  MOZ_ENABLE_XINERAMA	= @MOZ_ENABLE_XINERAMA@
 --- mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp.foo	2003-09-07 18:20:38.000000000 -0400
-+++ mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp	2004-11-22 12:56:21.000000000 -0500
 @@ -62,6 +62,9 @@
  #ifdef NATIVE_THEME_SUPPORT
  #include "nsNativeThemeGTK.h"
@@ -71,8 +71,8 @@
  
    NS_ADDREF(result);
    nsresult rv = result->QueryInterface(aIID, aResult);
---- mozilla/gfx/src/gtk/mozilla-decoder.h.foo	2004-12-03 13:30:56.000000000 -0500
-+++ mozilla/gfx/src/gtk/mozilla-decoder.h	2004-12-03 13:30:56.000000000 -0500
+--- mozilla/gfx/src/gtk/mozilla-decoder.h.foo	2004-11-22 12:56:21.000000000 -0500
++++ mozilla/gfx/src/gtk/mozilla-decoder.h	2004-11-22 12:56:21.000000000 -0500
 @@ -0,0 +1,72 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -146,8 +146,8 @@
 +G_END_DECLS
 +
 +#endif /*_MOZILLA_DECODER_H */
---- mozilla/gfx/src/gtk/mozilla-decoder.cpp.foo	2004-12-03 13:30:56.000000000 -0500
-+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp	2004-12-03 13:30:56.000000000 -0500
+--- mozilla/gfx/src/gtk/mozilla-decoder.cpp.foo	2004-11-22 12:56:21.000000000 -0500
++++ mozilla/gfx/src/gtk/mozilla-decoder.cpp	2004-11-22 12:56:21.000000000 -0500
 @@ -0,0 +1,376 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -526,7 +526,7 @@
 +    return PANGO_FC_DECODER(decoder);
 +}
 --- mozilla/gfx/src/gtk/gfxgtk.pkg.foo	2004-01-06 20:21:35.000000000 -0500
-+++ mozilla/gfx/src/gtk/gfxgtk.pkg	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/gfxgtk.pkg	2004-11-22 12:56:21.000000000 -0500
 @@ -7,3 +7,6 @@
  #if MOZ_ENABLE_XFT
  dist/bin/res/fonts/fontEncoding.properties
@@ -535,7 +535,7 @@
 +dist/bin/res/fonts/pangoFontEncoding.properties
 +#endif
 --- mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.foo	2004-10-14 16:36:14.000000000 -0400
-+++ mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	2004-11-22 12:56:21.000000000 -0500
 @@ -238,7 +238,7 @@
  
  static int      CalculateSlant   (PRUint8  aStyle);
@@ -683,7 +683,7 @@
  nsFontMetricsXft::GetHints(void)
  {
 --- mozilla/gfx/src/gtk/Makefile.in.foo	2003-11-10 07:24:51.000000000 -0500
-+++ mozilla/gfx/src/gtk/Makefile.in	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/Makefile.in	2004-11-22 12:56:21.000000000 -0500
 @@ -102,6 +102,12 @@
  		nsFontMetricsXft.cpp
  endif
@@ -710,8 +710,8 @@
  	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/fonts
  endif
  
---- mozilla/gfx/src/gtk/pangoFontEncoding.properties.foo	2004-12-03 13:30:56.000000000 -0500
-+++ mozilla/gfx/src/gtk/pangoFontEncoding.properties	2004-12-03 13:30:56.000000000 -0500
+--- mozilla/gfx/src/gtk/pangoFontEncoding.properties.foo	2004-11-22 12:56:21.000000000 -0500
++++ mozilla/gfx/src/gtk/pangoFontEncoding.properties	2004-11-22 12:56:21.000000000 -0500
 @@ -0,0 +1,120 @@
 +# ***** BEGIN LICENSE BLOCK *****
 +# Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -834,7 +834,7 @@
 +encoding.mtextra.ftcmap = mac_roman
 +
 --- mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp.foo	2002-10-11 22:03:32.000000000 -0400
-+++ mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp	2004-12-03 13:32:21.000000000 -0500
++++ mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp	2004-11-22 12:57:33.000000000 -0500
 @@ -50,11 +50,20 @@
  #include "nsFontMetricsGTK.h"
  #endif
@@ -878,16 +878,16 @@
 +PRBool
 +NS_IsPangoEnabled(void)
 +{
-+    char *val = PR_GetEnv("MOZ_ENABLE_PANGO");
++    char *val = PR_GetEnv("MOZ_DISABLE_PANGO");
 +    if (val)
-+        return TRUE;
++        return FALSE;
 +
-+    return FALSE;
++    return TRUE;
 +}
 +
 +#endif
---- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.foo	2004-12-03 13:30:56.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2004-12-03 13:30:56.000000000 -0500
+--- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.foo	2004-11-22 12:56:21.000000000 -0500
++++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2004-11-22 12:56:21.000000000 -0500
 @@ -0,0 +1,1662 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -2552,7 +2552,7 @@
 +    return NS_OK;
 +}
 --- mozilla/gfx/src/gtk/nsRenderingContextGTK.h.foo	2003-02-24 21:38:34.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsRenderingContextGTK.h	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/nsRenderingContextGTK.h	2004-11-22 12:56:21.000000000 -0500
 @@ -194,6 +194,8 @@
                                 const nsRect &aDestBounds, PRUint32 aCopyFlags);
    NS_IMETHOD RetrieveCurrentNativeGraphicData(PRUint32 * ngd);
@@ -2562,8 +2562,8 @@
    NS_IMETHOD DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint);
    NS_IMETHOD DrawScaledImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsRect * aDestRect);
  
---- mozilla/gfx/src/gtk/nsFontMetricsPango.h.foo	2004-12-03 13:30:56.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsFontMetricsPango.h	2004-12-03 13:30:56.000000000 -0500
+--- mozilla/gfx/src/gtk/nsFontMetricsPango.h.foo	2004-11-22 12:56:21.000000000 -0500
++++ mozilla/gfx/src/gtk/nsFontMetricsPango.h	2004-11-22 12:56:21.000000000 -0500
 @@ -0,0 +1,278 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -2844,7 +2844,7 @@
 +    NS_DECL_NSIFONTENUMERATOR
 +};
 --- mozilla/gfx/src/gtk/nsFontMetricsUtils.h.foo	2002-10-11 22:03:32.000000000 -0400
-+++ mozilla/gfx/src/gtk/nsFontMetricsUtils.h	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/nsFontMetricsUtils.h	2004-11-22 12:56:21.000000000 -0500
 @@ -42,9 +42,12 @@
  extern PRUint32 NS_FontMetricsGetHints    (void);
  extern nsresult NS_FontMetricsFamilyExists(nsIDeviceContext *aDevice,
@@ -2860,7 +2860,7 @@
 +
  #endif /* __nsFontMetricsUtils_h */
 --- mozilla/gfx/src/gtk/nsIFontMetricsGTK.h.foo	2002-10-11 23:00:17.000000000 -0400
-+++ mozilla/gfx/src/gtk/nsIFontMetricsGTK.h	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/nsIFontMetricsGTK.h	2004-11-22 12:56:21.000000000 -0500
 @@ -121,6 +121,9 @@
      // particular handle.
      virtual GdkFont* GetCurrentGDKFont(void) = 0;
@@ -2872,7 +2872,7 @@
  
  #endif /* __nsIFontMetricsGTK_h */
 --- mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp.foo	2004-02-12 11:52:22.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp	2004-11-22 12:56:21.000000000 -0500
 @@ -524,6 +524,9 @@
  
    values.foreground.pixel =
@@ -2896,7 +2896,7 @@
  {
    UpdateGC();
 --- mozilla/gfx/src/gtk/nsGCCache.cpp.foo	2002-02-02 22:47:15.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsGCCache.cpp	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/nsGCCache.cpp	2004-11-22 12:56:21.000000000 -0500
 @@ -232,98 +232,42 @@
    // We have old GC, reuse it and check what
    // we have to change
@@ -3010,7 +3010,7 @@
    entry->gcv = *gcv;
  }
 --- mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp.foo	2004-03-09 09:14:54.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp	2004-11-22 12:56:21.000000000 -0500
 @@ -4600,6 +4600,12 @@
    return mCurrentFont->GetGDKFont();
  }
@@ -3025,7 +3025,7 @@
  static int
  CompareSizes(const void* aArg1, const void* aArg2, void *data)
 --- mozilla/gfx/src/gtk/nsFontMetricsXft.h.foo	2004-02-23 16:38:52.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsFontMetricsXft.h	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/nsFontMetricsXft.h	2004-11-22 12:56:21.000000000 -0500
 @@ -202,6 +202,8 @@
  
      virtual GdkFont* GetCurrentGDKFont(void);
@@ -3036,7 +3036,7 @@
      static PRUint32    GetHints  (void);
  
 --- mozilla/gfx/src/gtk/nsFontMetricsGTK.h.foo	2004-02-04 20:57:03.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsFontMetricsGTK.h	2004-12-03 13:30:56.000000000 -0500
++++ mozilla/gfx/src/gtk/nsFontMetricsGTK.h	2004-11-22 12:56:21.000000000 -0500
 @@ -344,6 +344,8 @@
  
    virtual GdkFont* GetCurrentGDKFont(void);
@@ -3046,9 +3046,9 @@
    static nsresult FamilyExists(nsIDeviceContext *aDevice, const nsString& aName);
    static PRUint32 GetHints(void);
  
---- mozilla/configure.in.foo	2004-10-31 02:17:58.000000000 -0500
-+++ mozilla/configure.in	2004-12-03 13:30:56.000000000 -0500
-@@ -3475,6 +3475,34 @@
+--- mozilla/configure.in.foo	2004-11-22 12:55:08.000000000 -0500
++++ mozilla/configure.in	2004-11-22 12:56:21.000000000 -0500
+@@ -3476,6 +3476,34 @@
  AC_SUBST(MOZ_XFT_LIBS)
  
  dnl ========================================================


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- thunderbird.spec	9 May 2005 17:51:27 -0000	1.32
+++ thunderbird.spec	13 May 2005 15:05:44 -0000	1.33
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	1.0.2
-Release:	4
+Release:	5
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -169,8 +169,12 @@
 
 cd $RPM_BUILD_ROOT/%{tbdir}
 export MOZ_DISABLE_GNOME=1
-HOME=%{_tmppath} ./thunderbird -register
-%{__rm} -rf %{_tmppath}/.mozilla
+
+# munge HOME for now, since XPCOM creates $HOME/.mozilla
+MOZTMP=`mktemp -d`
+HOME=$MOZTMP %{tbdir}/thunderbird -register
+%{__rm} -rf $MOZTMP/.mozilla
+
 cd -
 
 %{__rm} -rf $RPM_BUILD_ROOT/%{tbdir}/chrome/{classic,comm,embed-sample,en-{mac,win},help,messenger}
@@ -194,6 +198,9 @@
 #===============================================================================
 
 %changelog
+* Fri May 13 2005 Christopher Aillon <caillon at redhat.com> 1.0.2-5
+- Update pango patche, MOZ_DISABLE_PANGO now works as advertised.
+
 * Mon May  9 2005 Christopher Aillon <caillon at redhat.com> 1.0.2-4
 - Add temporary workaround to not create files in the user's $HOME (#149664)

More information about the fedora-cvs-commits mailing list