rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update the pango patch

Browse Source
This commit is contained in:
blizzard 2004-10-19 03:33:04 +00:00
parent 29015ec0c9
commit 95d655caef
3 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firefox-PR1-gnome-vfs-default-app.patch Normal file
View File

@ -0,0 +1,14 @@
--- mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp.foo 2004-03-06 09:41:00.000000000 -0500
+++ mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp 2004-10-18 18:55:55.000000000 -0400
@@ -283,6 +283,11 @@
gchar *nativeCommand = g_filename_from_utf8(handlerApp->command,
-1, NULL, NULL, NULL);
+
+ // Some versions of the mime stuff will add whitespace to the end or
+ // beginning of the command
+ nativeCommand = g_strstrip(nativeCommand);
+
if (!nativeCommand) {
NS_ERROR("Could not convert helper app command to filesystem encoding");
_gnome_vfs_mime_application_free(handlerApp);

61
mozilla-1.7.3-pango-render.patch
View File

@ -1,5 +1,5 @@
--- mozilla/config/autoconf.mk.in.foo 2004-03-20 21:31:17.000000000 -0500 --- mozilla/config/autoconf.mk.in.foo 2004-03-20 21:31:17.000000000 -0500
+++ mozilla/config/autoconf.mk.in 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/config/autoconf.mk.in 2004-10-18 22:49:40.000000000 -0400
@@ -376,6 +376,10 @@ @@ -376,6 +376,10 @@
MOZ_XFT_LIBS = @MOZ_XFT_LIBS@ MOZ_XFT_LIBS = @MOZ_XFT_LIBS@
MOZ_ENABLE_COREXFONTS = @MOZ_ENABLE_COREXFONTS@ MOZ_ENABLE_COREXFONTS = @MOZ_ENABLE_COREXFONTS@
@ -12,7 +12,7 @@
MOZ_ENABLE_XINERAMA = @MOZ_ENABLE_XINERAMA@ 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.foo 2003-09-07 18:20:38.000000000 -0400
+++ mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp 2004-10-18 22:49:40.000000000 -0400
@@ -62,6 +62,9 @@ @@ -62,6 +62,9 @@
#ifdef NATIVE_THEME_SUPPORT #ifdef NATIVE_THEME_SUPPORT
#include "nsNativeThemeGTK.h" #include "nsNativeThemeGTK.h"
@ -71,8 +71,8 @@
NS_ADDREF(result); NS_ADDREF(result);
nsresult rv = result->QueryInterface(aIID, aResult); nsresult rv = result->QueryInterface(aIID, aResult);
--- mozilla/gfx/src/gtk/mozilla-decoder.h.foo 2004-10-13 11:17:00.000000000 -0400 --- /dev/null 2004-02-18 10:26:44.000000000 -0500
+++ mozilla/gfx/src/gtk/mozilla-decoder.h 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/mozilla-decoder.h 2004-10-18 22:49:40.000000000 -0400
@@ -0,0 +1,72 @@ @@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: +/* vim:expandtab:shiftwidth=4:tabstop=4:
@ -146,8 +146,8 @@
+G_END_DECLS +G_END_DECLS
+ +
+#endif /*_MOZILLA_DECODER_H */ +#endif /*_MOZILLA_DECODER_H */
--- mozilla/gfx/src/gtk/mozilla-decoder.cpp.foo 2004-10-13 11:17:00.000000000 -0400 --- /dev/null 2004-02-18 10:26:44.000000000 -0500
+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2004-10-18 22:49:40.000000000 -0400
@@ -0,0 +1,376 @@ @@ -0,0 +1,376 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: +/* vim:expandtab:shiftwidth=4:tabstop=4:
@ -526,7 +526,7 @@
+ return PANGO_FC_DECODER(decoder); + 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.foo 2004-01-06 20:21:35.000000000 -0500
+++ mozilla/gfx/src/gtk/gfxgtk.pkg 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/gfxgtk.pkg 2004-10-18 22:49:40.000000000 -0400
@@ -7,3 +7,6 @@ @@ -7,3 +7,6 @@
#if MOZ_ENABLE_XFT #if MOZ_ENABLE_XFT
dist/bin/res/fonts/fontEncoding.properties dist/bin/res/fonts/fontEncoding.properties
@ -535,7 +535,7 @@
+dist/bin/res/fonts/pangoFontEncoding.properties +dist/bin/res/fonts/pangoFontEncoding.properties
+#endif +#endif
--- mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.foo 2004-04-05 15:18:43.000000000 -0400 --- mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.foo 2004-04-05 15:18:43.000000000 -0400
+++ mozilla/gfx/src/gtk/nsFontMetricsXft.cpp 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsFontMetricsXft.cpp 2004-10-18 22:49:40.000000000 -0400
@@ -238,7 +238,7 @@ @@ -238,7 +238,7 @@
static int CalculateSlant (PRUint8 aStyle); static int CalculateSlant (PRUint8 aStyle);
@ -683,7 +683,7 @@
nsFontMetricsXft::GetHints(void) nsFontMetricsXft::GetHints(void)
{ {
--- mozilla/gfx/src/gtk/Makefile.in.foo 2003-11-10 07:24:51.000000000 -0500 --- mozilla/gfx/src/gtk/Makefile.in.foo 2003-11-10 07:24:51.000000000 -0500
+++ mozilla/gfx/src/gtk/Makefile.in 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/Makefile.in 2004-10-18 22:51:01.000000000 -0400
@@ -102,6 +102,12 @@ @@ -102,6 +102,12 @@
nsFontMetricsXft.cpp nsFontMetricsXft.cpp
endif endif
@ -710,13 +710,8 @@
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/fonts $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/fonts
endif endif
@@ -225,3 +231,4 @@ --- /dev/null 2004-02-18 10:26:44.000000000 -0500
$(INSTALL) $^ . +++ mozilla/gfx/src/gtk/pangoFontEncoding.properties 2004-10-18 22:49:40.000000000 -0400
endif
+MOZ_OPTIMIZE_FLAGS=-g
--- mozilla/gfx/src/gtk/pangoFontEncoding.properties.foo 2004-10-13 11:17:00.000000000 -0400
+++ mozilla/gfx/src/gtk/pangoFontEncoding.properties 2004-10-13 11:17:00.000000000 -0400
@@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
+# ***** BEGIN LICENSE BLOCK ***** +# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# Version: MPL 1.1/GPL 2.0/LGPL 2.1
@ -839,7 +834,7 @@
+encoding.mtextra.ftcmap = mac_roman +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.foo 2002-10-11 22:03:32.000000000 -0400
+++ mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp 2004-10-13 11:17:36.000000000 -0400 +++ mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp 2004-10-18 22:51:32.000000000 -0400
@@ -50,11 +50,20 @@ @@ -50,11 +50,20 @@
#include "nsFontMetricsGTK.h" #include "nsFontMetricsGTK.h"
#endif #endif
@ -883,16 +878,16 @@
+PRBool +PRBool
+NS_IsPangoEnabled(void) +NS_IsPangoEnabled(void)
+{ +{
+ char *val = PR_GetEnv("MOZ_DISABLE_PANGO"); + char *val = PR_GetEnv("MOZ_ENABLE_PANGO");
+ if (val) + if (val)
+ return FALSE; + return TRUE;
+ +
+ return TRUE; + return FALSE;
+} +}
+ +
+#endif +#endif
--- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.foo 2004-10-13 11:17:00.000000000 -0400 --- /dev/null 2004-02-18 10:26:44.000000000 -0500
+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2004-10-18 22:49:40.000000000 -0400
@@ -0,0 +1,1662 @@ @@ -0,0 +1,1662 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: +/* vim:expandtab:shiftwidth=4:tabstop=4:
@ -2557,7 +2552,7 @@
+ return NS_OK; + return NS_OK;
+} +}
--- mozilla/gfx/src/gtk/nsRenderingContextGTK.h.foo 2003-02-24 21:38:34.000000000 -0500 --- mozilla/gfx/src/gtk/nsRenderingContextGTK.h.foo 2003-02-24 21:38:34.000000000 -0500
+++ mozilla/gfx/src/gtk/nsRenderingContextGTK.h 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsRenderingContextGTK.h 2004-10-18 22:49:40.000000000 -0400
@@ -194,6 +194,8 @@ @@ -194,6 +194,8 @@
const nsRect &aDestBounds, PRUint32 aCopyFlags); const nsRect &aDestBounds, PRUint32 aCopyFlags);
NS_IMETHOD RetrieveCurrentNativeGraphicData(PRUint32 * ngd); NS_IMETHOD RetrieveCurrentNativeGraphicData(PRUint32 * ngd);
@ -2567,8 +2562,8 @@
NS_IMETHOD DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint); NS_IMETHOD DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint);
NS_IMETHOD DrawScaledImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsRect * aDestRect); NS_IMETHOD DrawScaledImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsRect * aDestRect);
--- mozilla/gfx/src/gtk/nsFontMetricsPango.h.foo 2004-10-13 11:17:00.000000000 -0400 --- /dev/null 2004-02-18 10:26:44.000000000 -0500
+++ mozilla/gfx/src/gtk/nsFontMetricsPango.h 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsFontMetricsPango.h 2004-10-18 22:49:40.000000000 -0400
@@ -0,0 +1,278 @@ @@ -0,0 +1,278 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: +/* vim:expandtab:shiftwidth=4:tabstop=4:
@ -2849,7 +2844,7 @@
+ NS_DECL_NSIFONTENUMERATOR + NS_DECL_NSIFONTENUMERATOR
+}; +};
--- mozilla/gfx/src/gtk/nsFontMetricsUtils.h.foo 2002-10-11 22:03:32.000000000 -0400 --- mozilla/gfx/src/gtk/nsFontMetricsUtils.h.foo 2002-10-11 22:03:32.000000000 -0400
+++ mozilla/gfx/src/gtk/nsFontMetricsUtils.h 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsFontMetricsUtils.h 2004-10-18 22:49:40.000000000 -0400
@@ -42,9 +42,12 @@ @@ -42,9 +42,12 @@
extern PRUint32 NS_FontMetricsGetHints (void); extern PRUint32 NS_FontMetricsGetHints (void);
extern nsresult NS_FontMetricsFamilyExists(nsIDeviceContext *aDevice, extern nsresult NS_FontMetricsFamilyExists(nsIDeviceContext *aDevice,
@ -2865,7 +2860,7 @@
+ +
#endif /* __nsFontMetricsUtils_h */ #endif /* __nsFontMetricsUtils_h */
--- mozilla/gfx/src/gtk/nsIFontMetricsGTK.h.foo 2002-10-11 23:00:17.000000000 -0400 --- mozilla/gfx/src/gtk/nsIFontMetricsGTK.h.foo 2002-10-11 23:00:17.000000000 -0400
+++ mozilla/gfx/src/gtk/nsIFontMetricsGTK.h 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsIFontMetricsGTK.h 2004-10-18 22:49:40.000000000 -0400
@@ -121,6 +121,9 @@ @@ -121,6 +121,9 @@
// particular handle. // particular handle.
virtual GdkFont* GetCurrentGDKFont(void) = 0; virtual GdkFont* GetCurrentGDKFont(void) = 0;
@ -2877,7 +2872,7 @@
#endif /* __nsIFontMetricsGTK_h */ #endif /* __nsIFontMetricsGTK_h */
--- mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp.foo 2004-02-12 11:52:22.000000000 -0500 --- mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp.foo 2004-02-12 11:52:22.000000000 -0500
+++ mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp 2004-10-18 22:49:40.000000000 -0400
@@ -524,6 +524,9 @@ @@ -524,6 +524,9 @@
values.foreground.pixel = values.foreground.pixel =
@ -2901,7 +2896,7 @@
{ {
UpdateGC(); UpdateGC();
--- mozilla/gfx/src/gtk/nsGCCache.cpp.foo 2002-02-02 22:47:15.000000000 -0500 --- mozilla/gfx/src/gtk/nsGCCache.cpp.foo 2002-02-02 22:47:15.000000000 -0500
+++ mozilla/gfx/src/gtk/nsGCCache.cpp 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsGCCache.cpp 2004-10-18 22:49:40.000000000 -0400
@@ -232,98 +232,42 @@ @@ -232,98 +232,42 @@
// We have old GC, reuse it and check what // We have old GC, reuse it and check what
// we have to change // we have to change
@ -3015,7 +3010,7 @@
entry->gcv = *gcv; entry->gcv = *gcv;
} }
--- mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp.foo 2004-03-09 09:14:54.000000000 -0500 --- mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp.foo 2004-03-09 09:14:54.000000000 -0500
+++ mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp 2004-10-18 22:49:40.000000000 -0400
@@ -4600,6 +4600,12 @@ @@ -4600,6 +4600,12 @@
return mCurrentFont->GetGDKFont(); return mCurrentFont->GetGDKFont();
} }
@ -3030,7 +3025,7 @@
static int static int
CompareSizes(const void* aArg1, const void* aArg2, void *data) 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.foo 2004-02-23 16:38:52.000000000 -0500
+++ mozilla/gfx/src/gtk/nsFontMetricsXft.h 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsFontMetricsXft.h 2004-10-18 22:49:40.000000000 -0400
@@ -202,6 +202,8 @@ @@ -202,6 +202,8 @@
virtual GdkFont* GetCurrentGDKFont(void); virtual GdkFont* GetCurrentGDKFont(void);
@ -3041,7 +3036,7 @@
static PRUint32 GetHints (void); 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.foo 2004-02-04 20:57:03.000000000 -0500
+++ mozilla/gfx/src/gtk/nsFontMetricsGTK.h 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/gfx/src/gtk/nsFontMetricsGTK.h 2004-10-18 22:49:40.000000000 -0400
@@ -344,6 +344,8 @@ @@ -344,6 +344,8 @@
virtual GdkFont* GetCurrentGDKFont(void); virtual GdkFont* GetCurrentGDKFont(void);
@ -3052,7 +3047,7 @@
static PRUint32 GetHints(void); static PRUint32 GetHints(void);
--- mozilla/configure.in.foo 2004-05-25 22:25:16.000000000 -0400 --- mozilla/configure.in.foo 2004-05-25 22:25:16.000000000 -0400
+++ mozilla/configure.in 2004-10-13 11:17:00.000000000 -0400 +++ mozilla/configure.in 2004-10-18 22:49:40.000000000 -0400
@@ -3429,6 +3429,34 @@ @@ -3429,6 +3429,34 @@
AC_SUBST(MOZ_XFT_LIBS) AC_SUBST(MOZ_XFT_LIBS)

3
thunderbird.spec
View File

@ -171,6 +171,9 @@ rm -rf %{buildroot}/%{tbdir}/chrome/{classic,comm,embed-sample,en-{mac,win},help
#=============================================================================== #===============================================================================
%changelog %changelog
* Mon Oct 18 2004 Christopher Blizzard <blizzard@redhat.com> 0.8.0-8
- Update the pango patch
* Mon Oct 18 2004 Christopher Blizzard <blizzard@redhat.com> 0.8.0-8 * Mon Oct 18 2004 Christopher Blizzard <blizzard@redhat.com> 0.8.0-8
- Pull over patches from firefox build: - Pull over patches from firefox build:
- disable default application dialog - disable default application dialog