From 98639647ef513bb35808be8f0c4e085e1547cea8 Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 19 Oct 2006 10:25:17 +0000 Subject: Fix crash after printing caused by trying to destroy the same charset structure multiple times. Bump PKGREVISION. --- mail/thunderbird/Makefile | 3 ++- mail/thunderbird/distinfo | 4 ++-- mail/thunderbird/patches/patch-ai | 21 +++++++++++++++------ time/sunbird/Makefile | 3 ++- time/sunbird/distinfo | 4 ++-- time/sunbird/patches/patch-ai | 21 +++++++++++++++------ www/firefox/Makefile | 4 +++- www/firefox/distinfo | 4 ++-- www/firefox/patches/patch-ai | 24 ++++++++++++++++-------- www/seamonkey/Makefile | 4 ++-- www/seamonkey/distinfo | 4 ++-- www/seamonkey/patches/patch-ai | 21 +++++++++++++++------ 12 files changed, 78 insertions(+), 39 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); 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); diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 47663a54d6e..a3ec745b697 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2006/09/15 12:26:56 ghen Exp $ +# $NetBSD: Makefile,v 1.37 2006/10/19 10:25:17 markd Exp $ MOZILLA= firefox +PKGREVISION= 1 + COMMENT= Lightweight gecko-based web browser MOZILLA_USE_GTK2= # yes diff --git a/www/firefox/distinfo b/www/firefox/distinfo index dbaedc8bf11..440fca2db2e 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.55 2006/10/16 12:09:13 seb Exp $ +$NetBSD: distinfo,v 1.56 2006/10/19 10:25:17 markd Exp $ SHA1 (firefox-1.5.0.7-source.tar.bz2) = f10d57af87bddc1b929ec5321688ac0efa880960 RMD160 (firefox-1.5.0.7-source.tar.bz2) = 156a73842949d4fcd401dfaa54afc6cac3aa66c2 @@ -11,7 +11,7 @@ SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d SHA1 (patch-af) = 01e10664fbf20dffa53ecb94be24a421c39b838b SHA1 (patch-ag) = 1266333a482483f786d5f00e92e641e282266442 SHA1 (patch-ah) = c737519c8ab8a66993d4892a6efac73e2da979f5 -SHA1 (patch-ai) = 58d7d87295cfbcaeba3e6a27457e15533d4b8e78 +SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954 SHA1 (patch-aj) = 84a5e3630c7dd9532bbb20e7444ff9582631ea24 SHA1 (patch-ak) = aa54e2c4d2f1c0d40bbbfcd6e3e55b44c3c549ff SHA1 (patch-al) = e5fc425630a5363807bf1cc2c648d5eb31d0e40e diff --git a/www/firefox/patches/patch-ai b/www/firefox/patches/patch-ai index 5ced0003483..333155fd14e 100644 --- a/www/firefox/patches/patch-ai +++ b/www/firefox/patches/patch-ai @@ -1,9 +1,17 @@ -$NetBSD: patch-ai,v 1.4 2005/12/10 13:47:22 taya Exp $ +$NetBSD: patch-ai,v 1.5 2006/10/19 10:25:17 markd Exp $ -diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp ---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2005-04-28 17:04:00.000000000 +0900 -+++ ./gfx/src/ps/nsFontMetricsPS.cpp 2005-12-04 19:06:07.000000000 +0900 -@@ -1859,10 +1859,10 @@ +--- gfx/src/ps/nsFontMetricsPS.cpp.orig 2006-05-07 14:01:25.000000000 +1200 ++++ gfx/src/ps/nsFontMetricsPS.cpp +@@ -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); @@ -18,7 +26,7 @@ diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetr nsresult rv; mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1896,7 +1896,7 @@ +@@ -1905,7 +1905,7 @@ nsFontPSFreeType::GetWidth(const PRUnich if (!face) return 0; @@ -27,7 +35,7 @@ diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetr nsresult rv = mFt2->GetImageCache(&iCache); if (NS_FAILED(rv)) { NS_ERROR("Failed to get Image Cache"); -@@ -1934,8 +1934,8 @@ +@@ -1943,8 +1943,8 @@ nsFontPSFreeType::getFTFace() FTC_Manager cManager; mFt2->GetFTCacheManager(&cManager); @@ -38,7 +46,7 @@ diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetr NS_ASSERTION(rv==0, "failed to get face/size"); if (rv) return nsnull; -@@ -2379,16 +2379,16 @@ +@@ -2388,16 +2388,16 @@ void nsFT2Type1Generator::GeneratePSFont mEntry->GetFamilyName(fontName); mEntry->GetStyleName(styleName); 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); -- cgit v1.2.3