From bbbc75cda699f97855f998280b71ad76c9b346b7 Mon Sep 17 00:00:00 2001 From: sobomax <sobomax@FreeBSD.org> Date: Tue, 19 Mar 2002 08:41:44 +0000 Subject: Fix displaying of bold/italic truetype fonts. Bump PORTREVISION. PR: 36049 Submitted by: Joe Kelsey <joe@zircon.seattle.wa.us> Obtained from: Mozilla cvs --- www/mozilla-vendor/Makefile | 2 +- .../patch-gfx::src::x11shared::nsFreeType.cpp | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 www/mozilla-vendor/files/patch-gfx::src::x11shared::nsFreeType.cpp (limited to 'www/mozilla-vendor') diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile index ecbdd978d48c..0d5c55d9acd0 100644 --- a/www/mozilla-vendor/Makefile +++ b/www/mozilla-vendor/Makefile @@ -7,7 +7,7 @@ PORTNAME= mozilla PORTVERSION= 0.9.9 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ diff --git a/www/mozilla-vendor/files/patch-gfx::src::x11shared::nsFreeType.cpp b/www/mozilla-vendor/files/patch-gfx::src::x11shared::nsFreeType.cpp new file mode 100644 index 000000000000..6a3b2827c5f3 --- /dev/null +++ b/www/mozilla-vendor/files/patch-gfx::src::x11shared::nsFreeType.cpp @@ -0,0 +1,28 @@ + +$FreeBSD$ + +--- gfx/src/x11shared/nsFreeType.cpp.orig Fri Mar 1 00:37:13 2002 ++++ gfx/src/x11shared/nsFreeType.cpp Mon Mar 18 21:11:36 2002 +@@ -1340,12 +1340,20 @@ + nsFreeTypeFace * + nsFreeTypeGetFaceID(nsFontCatalogEntry *aFce) + { +- // in this hash each ttc face has a unique key +- nsCStringKey key(nsFT2FontCatalog::GetFamilyName(aFce)); ++ // We need to have separate keys for the different faces in a ttc file. ++ // We append a slash and the face index to the file name to give us a ++ // unique key for each ttc face. ++ nsCAutoString key_str(nsFT2FontCatalog::GetFileName(aFce)); ++ char buf[20]; ++ sprintf(buf, "/%d", nsFT2FontCatalog::GetFaceIndex(aFce)); ++ key_str.Append(buf); ++ nsCStringKey key(key_str); + nsFreeTypeFace *face = (nsFreeTypeFace *)gFreeTypeFaces->Get(&key); + if (!face) { + face = new nsFreeTypeFace(aFce); + NS_ASSERTION(face, "memory error while creating nsFreeTypeFace"); ++ if (!face) ++ return nsnull; + gFreeTypeFaces->Put(&key, face); + } + return face; -- cgit