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 /time | |
| 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 'time')
| -rw-r--r-- | time/sunbird/Makefile | 3 | ||||
| -rw-r--r-- | time/sunbird/distinfo | 4 | ||||
| -rw-r--r-- | time/sunbird/patches/patch-ai | 21 |
3 files changed, 19 insertions, 9 deletions
diff --git a/time/sunbird/Makefile b/time/sunbird/Makefile index 428caa44698..f3769b75790 100644 --- a/time/sunbird/Makefile +++ b/time/sunbird/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2006/02/06 09:20:45 ghen Exp $ +# $NetBSD: Makefile,v 1.3 2006/10/19 10:27:06 markd Exp $ MOZILLA= sunbird +PKGREVISION= 1 COMMENT= Mozilla stand-alone calendar application diff --git a/time/sunbird/distinfo b/time/sunbird/distinfo index 38dd702571b..a99753527be 100644 --- a/time/sunbird/distinfo +++ b/time/sunbird/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2006/10/17 20:20:26 rillig Exp $ +$NetBSD: distinfo,v 1.7 2006/10/19 10:27:06 markd Exp $ SHA1 (sunbird-0.3.source.tar.bz2) = 9c498789d428b1f6a5abcb5a690a6d977553dce5 RMD160 (sunbird-0.3.source.tar.bz2) = a5b71c40be6e6739b9ad558dfac8d2b714709e3c @@ -10,7 +10,7 @@ SHA1 (patch-ad) = efca5ab6ad16fbc7a16f20ca181b23add7dd6f78 SHA1 (patch-ae) = 8e31ede283ba33528f825ab6dd794eb4e17b78d9 SHA1 (patch-af) = 601c1cc9dd94418dc6f4893c2df2fa79265bfd5f SHA1 (patch-ah) = 6d39a2f657a91741fcfe30977510244d576a1406 -SHA1 (patch-ai) = 0480ece8f321243a374c1ab42f22245eb59a1a34 +SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954 SHA1 (patch-aj) = 279b54da26dae06118856ffbac3ed2fce793d3e9 SHA1 (patch-ak) = 152e395269da7423e1eafa16f8850b3b9ed516fd SHA1 (patch-al) = 52680212e8bfc75b70dad9f76d816f13bd15a0fa diff --git a/time/sunbird/patches/patch-ai b/time/sunbird/patches/patch-ai index 46dca913c53..8be97ea2ef7 100644 --- a/time/sunbird/patches/patch-ai +++ b/time/sunbird/patches/patch-ai @@ -1,8 +1,17 @@ -$NetBSD: patch-ai,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $ +$NetBSD: patch-ai,v 1.2 2006/10/19 10:27:06 markd Exp $ ---- gfx/src/ps/nsFontMetricsPS.cpp.orig 2006-02-02 16:57:57.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.1.1.1 2006/02/05 21:56:25 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/02/05 21:56:25 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/02/05 21:56:25 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); |