diff options
| author | markd <markd> | 2006-10-19 10:25:17 +0000 |
|---|---|---|
| committer | markd <markd> | 2006-10-19 10:25:17 +0000 |
| commit | 58dd13d36d361696969e1a0a9e7b5014bbcdb5e5 (patch) | |
| tree | 6f6af36c3d01d4f358d6e4dbffc6bc273f2e770a /www/seamonkey | |
| parent | 30d464d00ebf37c744e7875461ccaf7f70ad95e6 (diff) | |
| download | pkgsrc-58dd13d36d361696969e1a0a9e7b5014bbcdb5e5.tar.gz | |
Fix crash after printing caused by trying to destroy the same charset
structure multiple times. Bump PKGREVISION.
Diffstat (limited to 'www/seamonkey')
| -rw-r--r-- | www/seamonkey/Makefile | 4 | ||||
| -rw-r--r-- | www/seamonkey/distinfo | 4 | ||||
| -rw-r--r-- | www/seamonkey/patches/patch-ai | 21 |
3 files changed, 19 insertions, 10 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 4691bb57153..cb468523f78 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2006/09/26 22:21:32 salo Exp $ +# $NetBSD: Makefile,v 1.11 2006/10/19 10:25:36 markd Exp $ MOZILLA= seamonkey -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= Full featured gecko-based browser diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index df532e8d470..761ae9ae8d3 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2006/09/15 15:54:04 ghen Exp $ +$NetBSD: distinfo,v 1.11 2006/10/19 10:25:36 markd Exp $ SHA1 (seamonkey-1.0.5.source.tar.bz2) = 60be0112e369a06958c0295ad2de995ab476cef1 RMD160 (seamonkey-1.0.5.source.tar.bz2) = 9f99f4a542c3a4e1c7e054e73c9ca08cd7252e63 @@ -11,7 +11,7 @@ SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e SHA1 (patch-af) = 4844013ad49c77b87be7c30931ca786f246b40f3 SHA1 (patch-ag) = eaebefa81d03b2ebc8a32465f59889d92944d750 SHA1 (patch-ah) = 8f92f4294ead04ddc5b719ff66b4aada912dcc01 -SHA1 (patch-ai) = 89b0fb6fb691a6d40e7f1a5bdc8335d63e491c7b +SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954 SHA1 (patch-aj) = 951b5ea63116d876a6fcef586256a5728a2df2cf SHA1 (patch-ak) = f867ca0973fb4d0ca325b25f83586f10f6e85e32 SHA1 (patch-al) = d916f38de2fa0ca1993ec75c457fccc60ee6d612 diff --git a/www/seamonkey/patches/patch-ai b/www/seamonkey/patches/patch-ai index d307f181584..1ea900bb8a4 100644 --- a/www/seamonkey/patches/patch-ai +++ b/www/seamonkey/patches/patch-ai @@ -1,8 +1,17 @@ -$NetBSD: patch-ai,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $ +$NetBSD: patch-ai,v 1.2 2006/10/19 10:25:36 markd Exp $ ---- gfx/src/ps/nsFontMetricsPS.cpp.orig 2005-04-28 10:04:00.000000000 +0200 +--- 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.1.1.1 2006/03/30 19:15:48 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.1.1.1 2006/03/30 19:15:48 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.1.1.1 2006/03/30 19:15:48 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); |