pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix crash after printing caused by trying to destroy t...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bf3ca417c96e
branches: trunk
changeset: 520323:bf3ca417c96e
user: markd <markd%pkgsrc.org@localhost>
date: Thu Oct 19 10:25:17 2006 +0000
description:
Fix crash after printing caused by trying to destroy the same charset
structure multiple times. Bump PKGREVISION.
diffstat:
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(-)
diffs (truncated from 328 to 300 lines):
diff -r 5ea3f9f40b37 -r bf3ca417c96e mail/thunderbird/Makefile
--- a/mail/thunderbird/Makefile Thu Oct 19 07:52:34 2006 +0000
+++ b/mail/thunderbird/Makefile Thu Oct 19 10:25:17 2006 +0000
@@ -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 -r 5ea3f9f40b37 -r bf3ca417c96e mail/thunderbird/distinfo
--- a/mail/thunderbird/distinfo Thu Oct 19 07:52:34 2006 +0000
+++ b/mail/thunderbird/distinfo Thu Oct 19 10:25:17 2006 +0000
@@ -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-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 -r 5ea3f9f40b37 -r bf3ca417c96e mail/thunderbird/patches/patch-ai
--- a/mail/thunderbird/patches/patch-ai Thu Oct 19 07:52:34 2006 +0000
+++ b/mail/thunderbird/patches/patch-ai Thu Oct 19 10:25:17 2006 +0000
@@ -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 @@
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 @@
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 @@
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 -r 5ea3f9f40b37 -r bf3ca417c96e time/sunbird/Makefile
--- a/time/sunbird/Makefile Thu Oct 19 07:52:34 2006 +0000
+++ b/time/sunbird/Makefile Thu Oct 19 10:25:17 2006 +0000
@@ -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 -r 5ea3f9f40b37 -r bf3ca417c96e time/sunbird/distinfo
--- a/time/sunbird/distinfo Thu Oct 19 07:52:34 2006 +0000
+++ b/time/sunbird/distinfo Thu Oct 19 10:25:17 2006 +0000
@@ -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-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 -r 5ea3f9f40b37 -r bf3ca417c96e time/sunbird/patches/patch-ai
--- a/time/sunbird/patches/patch-ai Thu Oct 19 07:52:34 2006 +0000
+++ b/time/sunbird/patches/patch-ai Thu Oct 19 10:25:17 2006 +0000
@@ -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 @@
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 @@
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 @@
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 -r 5ea3f9f40b37 -r bf3ca417c96e www/firefox/Makefile
--- a/www/firefox/Makefile Thu Oct 19 07:52:34 2006 +0000
+++ b/www/firefox/Makefile Thu Oct 19 10:25:17 2006 +0000
@@ -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 -r 5ea3f9f40b37 -r bf3ca417c96e www/firefox/distinfo
--- a/www/firefox/distinfo Thu Oct 19 07:52:34 2006 +0000
+++ b/www/firefox/distinfo Thu Oct 19 10:25:17 2006 +0000
@@ -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-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 -r 5ea3f9f40b37 -r bf3ca417c96e www/firefox/patches/patch-ai
--- a/www/firefox/patches/patch-ai Thu Oct 19 07:52:34 2006 +0000
+++ b/www/firefox/patches/patch-ai Thu Oct 19 10:25:17 2006 +0000
@@ -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 @@
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 @@
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 @@
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 -r 5ea3f9f40b37 -r bf3ca417c96e www/seamonkey/Makefile
--- a/www/seamonkey/Makefile Thu Oct 19 07:52:34 2006 +0000
+++ b/www/seamonkey/Makefile Thu Oct 19 10:25:17 2006 +0000
@@ -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 -r 5ea3f9f40b37 -r bf3ca417c96e www/seamonkey/distinfo
--- a/www/seamonkey/distinfo Thu Oct 19 07:52:34 2006 +0000
+++ b/www/seamonkey/distinfo Thu Oct 19 10:25:17 2006 +0000
@@ -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-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 -r 5ea3f9f40b37 -r bf3ca417c96e www/seamonkey/patches/patch-ai
--- a/www/seamonkey/patches/patch-ai Thu Oct 19 07:52:34 2006 +0000
+++ b/www/seamonkey/patches/patch-ai Thu Oct 19 10:25:17 2006 +0000
@@ -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);
Home |
Main Index |
Thread Index |
Old Index