diff options
| author | markd <markd@pkgsrc.org> | 2006-10-19 10:25:17 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2006-10-19 10:25:17 +0000 |
| commit | 98639647ef513bb35808be8f0c4e085e1547cea8 (patch) | |
| tree | 6f6af36c3d01d4f358d6e4dbffc6bc273f2e770a /mail | |
| parent | 96116728fc495a8bed1d60e34d3344c282f172f5 (diff) | |
| download | pkgsrc-98639647ef513bb35808be8f0c4e085e1547cea8.tar.gz | |
Fix crash after printing caused by trying to destroy the same charset
structure multiple times. Bump PKGREVISION.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/thunderbird/Makefile | 3 | ||||
| -rw-r--r-- | mail/thunderbird/distinfo | 4 | ||||
| -rw-r--r-- | mail/thunderbird/patches/patch-ai | 21 |
3 files changed, 19 insertions, 9 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 4bf9e34dc3b..d437f18165d 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2006/04/23 14:14:07 ghen Exp $ +# $NetBSD: Makefile,v 1.19 2006/10/19 10:26:14 markd Exp $ MOZILLA= thunderbird +PKGREVISION= 1 COMMENT= Mozilla mail client diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 8518d901bac..86fffa76b85 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2006/09/15 13:55:22 ghen Exp $ +$NetBSD: distinfo,v 1.28 2006/10/19 10:26:14 markd Exp $ SHA1 (thunderbird-1.5.0.7-source.tar.bz2) = 9e5acff9bd098979dd798c0111805dc8d67479ad RMD160 (thunderbird-1.5.0.7-source.tar.bz2) = b8948723e4a96e22409e6a2cb3cd1b6512bef189 @@ -11,7 +11,7 @@ SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28 SHA1 (patch-af) = 1306065f359a4acc2c2c4a0865d8401baacb7a15 SHA1 (patch-ag) = bc08dcb0f7acc4eace112c28241a31b0b6a492e3 SHA1 (patch-ah) = 4cd8e37475af19bcfe4530f910990f86c89ed916 -SHA1 (patch-ai) = 4bee22668a0af682db6ecf2480422c3aeed29063 +SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954 SHA1 (patch-aj) = 36e80c573457bb38f0bd0cb87d9aa7aed4506a0b SHA1 (patch-ak) = 6fb6ed901990efbb1a25ca5666470f8f2467fa8a SHA1 (patch-al) = 46e7986f0c803701ce9eec38620cf22a2a96ba86 diff --git a/mail/thunderbird/patches/patch-ai b/mail/thunderbird/patches/patch-ai index 4046eba7627..bd97e8a5567 100644 --- a/mail/thunderbird/patches/patch-ai +++ b/mail/thunderbird/patches/patch-ai @@ -1,8 +1,17 @@ -$NetBSD: patch-ai,v 1.3 2006/02/05 14:49:05 ghen Exp $ +$NetBSD: patch-ai,v 1.4 2006/10/19 10:26:14 markd Exp $ ---- gfx/src/ps/nsFontMetricsPS.cpp.orig 2006-02-02 13:20:15.000000000 +0100 +--- gfx/src/ps/nsFontMetricsPS.cpp.orig 2006-05-07 14:01:25.000000000 +1200 +++ gfx/src/ps/nsFontMetricsPS.cpp -@@ -1859,10 +1859,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa +@@ -993,7 +993,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, c + + fontps *fps = new fontps; + fps->entry = xftEntry; +- fps->charset = fc_charset; ++ fps->charset = FcCharSetCopy (fc_charset); + fps->fontps = nsnull; + fpi.fontps->AppendElement(fps); + } +@@ -1868,10 +1868,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa mPixelSize = NSToIntRound(app2dev * mFont->size); @@ -17,7 +26,7 @@ $NetBSD: patch-ai,v 1.3 2006/02/05 14:49:05 ghen Exp $ nsresult rv; mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1896,7 +1896,7 @@ nsFontPSFreeType::GetWidth(const PRUnich +@@ -1905,7 +1905,7 @@ nsFontPSFreeType::GetWidth(const PRUnich if (!face) return 0; @@ -26,7 +35,7 @@ $NetBSD: patch-ai,v 1.3 2006/02/05 14:49:05 ghen Exp $ nsresult rv = mFt2->GetImageCache(&iCache); if (NS_FAILED(rv)) { NS_ERROR("Failed to get Image Cache"); -@@ -1934,8 +1934,8 @@ nsFontPSFreeType::getFTFace() +@@ -1943,8 +1943,8 @@ nsFontPSFreeType::getFTFace() FTC_Manager cManager; mFt2->GetFTCacheManager(&cManager); @@ -37,7 +46,7 @@ $NetBSD: patch-ai,v 1.3 2006/02/05 14:49:05 ghen Exp $ NS_ASSERTION(rv==0, "failed to get face/size"); if (rv) return nsnull; -@@ -2379,16 +2379,16 @@ void nsFT2Type1Generator::GeneratePSFont +@@ -2388,16 +2388,16 @@ void nsFT2Type1Generator::GeneratePSFont mEntry->GetFamilyName(fontName); mEntry->GetStyleName(styleName); |