diff options
author | taya <taya@pkgsrc.org> | 2004-06-05 10:20:55 +0000 |
---|---|---|
committer | taya <taya@pkgsrc.org> | 2004-06-05 10:20:55 +0000 |
commit | 3a93262675d2113510e75afb4fcdd04be6c10139 (patch) | |
tree | 64c2b20085e3e56d2cba61733202266ec70d57ae | |
parent | 79140d6ce4c1b67c72749c68b6204b66d86b0fd1 (diff) | |
download | pkgsrc-3a93262675d2113510e75afb4fcdd04be6c10139.tar.gz |
adopt new freetype api.
fix PR pkg/25815.
-rw-r--r-- | www/mozilla-stable/Makefile | 4 | ||||
-rw-r--r-- | www/mozilla-stable/distinfo | 9 | ||||
-rw-r--r-- | www/mozilla-stable/patches/patch-ah | 49 | ||||
-rw-r--r-- | www/mozilla-stable/patches/patch-ai | 63 | ||||
-rw-r--r-- | www/mozilla-stable/patches/patch-aj | 41 | ||||
-rw-r--r-- | www/mozilla-stable/patches/patch-ak | 62 | ||||
-rw-r--r-- | www/mozilla-stable/patches/patch-al | 23 | ||||
-rw-r--r-- | www/mozilla-stable/patches/patch-an | 14 | ||||
-rw-r--r-- | www/mozilla-stable/patches/patch-ao | 76 |
9 files changed, 338 insertions, 3 deletions
diff --git a/www/mozilla-stable/Makefile b/www/mozilla-stable/Makefile index e5581a83ab4..bdbbefb146e 100644 --- a/www/mozilla-stable/Makefile +++ b/www/mozilla-stable/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2004/04/24 02:57:07 taya Exp $ +# $NetBSD: Makefile,v 1.17 2004/06/05 10:20:55 taya Exp $ -PKGREVISION= 4 +PKGREVISION= 5 MOZILLA= mozilla-stable MOZILLA_BIN= mozilla-bin DISTNAME= mozilla-${MOZ_DIST_VER} diff --git a/www/mozilla-stable/distinfo b/www/mozilla-stable/distinfo index 7d867b797a5..817c2c66173 100644 --- a/www/mozilla-stable/distinfo +++ b/www/mozilla-stable/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2004/04/24 02:57:07 taya Exp $ +$NetBSD: distinfo,v 1.10 2004/06/05 10:20:55 taya Exp $ SHA1 (mozilla-1.4.1.tar.bz2) = e44aee7c8b3e3d13bdd2d654662694d14a0e40c3 Size (mozilla-1.4.1.tar.bz2) = 32132892 bytes @@ -10,7 +10,14 @@ SHA1 (patch-ad) = a96cc108816a064200ad5064a2070c7cfd99e88b SHA1 (patch-ae) = 7f43871b9ba696e1c6a1a8fc3746221acb4a602b SHA1 (patch-af) = 009c8c699f04bdc0deaab984ec6b946ff8acf937 SHA1 (patch-ag) = 99b1849e5c634c277c57834cb8ab7a6af4bc7357 +SHA1 (patch-ah) = 8559caee67d76a04710808fe880411abe9f661a0 +SHA1 (patch-ai) = e56bc681e5a30cf7be1cffdfb845a53478b49c55 +SHA1 (patch-aj) = c11a87177ec8ec7c96d367c4b9a8a72b4fbbc7ce +SHA1 (patch-ak) = e5e3fb956538526fd7bc3cd43e1770cc08df7455 +SHA1 (patch-al) = 23298a74a4ab5fef3c21d397227b5b266398dafe SHA1 (patch-am) = a016a23caf3ff46dd5eaeac54fec2d059f68e555 +SHA1 (patch-an) = 59c152183b14c96ea7767b0aee8bba76f4ee12e2 +SHA1 (patch-ao) = d8a524f73edf0a6b447bd5fd1fd139a61d257077 SHA1 (patch-aw) = be0e726ba8fbde4a9650786dc6f8ec04e9669c3d SHA1 (patch-ba) = 63baf096f81c96bdb7fc56c00939a07a01a672dd SHA1 (patch-bb) = c5350823464250546f95d1c0962ba7ba6a16aa2f diff --git a/www/mozilla-stable/patches/patch-ah b/www/mozilla-stable/patches/patch-ah new file mode 100644 index 00000000000..05fa23413f0 --- /dev/null +++ b/www/mozilla-stable/patches/patch-ah @@ -0,0 +1,49 @@ +$NetBSD: patch-ah,v 1.1 2004/06/05 10:20:55 taya Exp $ + +diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl +--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl 2003-02-23 09:06:55.000000000 +0900 ++++ ./gfx/idl/nsIFreeType2.idl 2004-06-05 15:49:00.000000000 +0900 +@@ -72,10 +72,11 @@ + native FT_Sfnt_Tag(FT_Sfnt_Tag); + native FT_Size(FT_Size); + +-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); ++[ptr] native FTC_ImageType_p(FTC_ImageType); + native FTC_Face_Requester(FTC_Face_Requester); + native FTC_Font(FTC_Font); +-native FTC_Image_Cache(FTC_Image_Cache); ++native FTC_FaceID(FTC_FaceID); ++native FTC_ImageCache(FTC_ImageCache); + native FTC_Manager(FTC_Manager); + + /* +@@ -87,7 +88,7 @@ + + readonly attribute FT_Library library; + readonly attribute FTC_Manager FTCacheManager; +- readonly attribute FTC_Image_Cache ImageCache; ++ readonly attribute FTC_ImageCache ImageCache; + + void doneFace(in FT_Face face); + void doneFreeType(in FT_Library lib); +@@ -103,16 +104,16 @@ + void outlineDecompose(in FT_Outline_p outline, + in const_FT_Outline_Funcs_p funcs, in voidPtr p); + void setCharmap(in FT_Face face, in FT_CharMap charmap); +- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, ++ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, + in FT_UInt gindex, out FT_Glyph glyph); +- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, +- out FT_Face face, out FT_Size size); ++ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, ++ out FT_Face face); + void managerDone(in FTC_Manager manager); + void managerNew(in FT_Library lib, in FT_UInt max_faces, + in FT_UInt max_sizes, in FT_ULong max_bytes, + in FTC_Face_Requester requester, in FT_Pointer req_data, + out FTC_Manager manager); +- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); ++ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); + + FT_ULong getFirstChar(in FT_Face face, out FT_UInt gindex); + FT_ULong getNextChar(in FT_Face face, in FT_ULong charcode, out FT_UInt gindex); diff --git a/www/mozilla-stable/patches/patch-ai b/www/mozilla-stable/patches/patch-ai new file mode 100644 index 00000000000..85872013c03 --- /dev/null +++ b/www/mozilla-stable/patches/patch-ai @@ -0,0 +1,63 @@ +$NetBSD: patch-ai,v 1.1 2004/06/05 10:20:55 taya Exp $ + +diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp +--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2003-04-23 01:25:08.000000000 +0900 ++++ ./gfx/src/ps/nsFontMetricsPS.cpp 2004-06-05 15:49:03.000000000 +0900 +@@ -1110,10 +1110,10 @@ + + mPixelSize = NSToIntRound(app2dev * mFont->size); + +- mImageDesc.font.face_id = (void*)mEntry; +- mImageDesc.font.pix_width = mPixelSize; +- mImageDesc.font.pix_height = mPixelSize; +- mImageDesc.image_type = 0; ++ mImageDesc->face_id = (FTC_FaceID)&mEntry; ++ mImageDesc->width = mPixelSize; ++ mImageDesc->height = mPixelSize; ++ mImageDesc->flags = 0; + + nsresult rv; + mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); +@@ -1159,7 +1159,7 @@ + if (!face) + return 0; + +- FTC_Image_Cache iCache; ++ FTC_ImageCache iCache; + nsresult rv = mFt2->GetImageCache(&iCache); + if (NS_FAILED(rv)) { + NS_ERROR("Failed to get Image Cache"); +@@ -1197,8 +1197,8 @@ + + FTC_Manager cManager; + mFt2->GetFTCacheManager(&cManager); +- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, +- &face, nsnull); ++ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, ++ &face); + NS_ASSERTION(rv==0, "failed to get face/size"); + if (rv) + return nsnull; +@@ -1593,16 +1593,16 @@ + mEntry->GetFamilyName(fontName); + mEntry->GetStyleName(styleName); + +- mImageDesc.font.face_id = (void*)mEntry; ++ mImageDesc->face_id = (FTC_FaceID)&mEntry; + // TT glyph has no relation to size +- mImageDesc.font.pix_width = 16; +- mImageDesc.font.pix_height = 16; +- mImageDesc.image_type = 0; ++ mImageDesc->width = 16; ++ mImageDesc->height = 16; ++ mImageDesc->flags = 0; + FT_Face face = nsnull; + FTC_Manager cManager; + mFt2->GetFTCacheManager(&cManager); +- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, +- &face, nsnull); ++ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, ++ &face); + if (NS_FAILED(rv)) + return; + diff --git a/www/mozilla-stable/patches/patch-aj b/www/mozilla-stable/patches/patch-aj new file mode 100644 index 00000000000..935cf7f2446 --- /dev/null +++ b/www/mozilla-stable/patches/patch-aj @@ -0,0 +1,41 @@ +$NetBSD: patch-aj,v 1.1 2004/06/05 10:20:55 taya Exp $ + +diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h +--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h 2003-04-23 01:25:02.000000000 +0900 ++++ ./gfx/src/freetype/nsFreeType.h 2004-06-05 15:49:06.000000000 +0900 +@@ -104,13 +104,13 @@ + typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); + typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); + typedef FT_Error (*FTC_Image_Cache_Lookup_t) +- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); +-typedef FT_Error (*FTC_Manager_Lookup_Size_t) +- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); ++ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); ++typedef FT_Error (*FTC_Manager_LookupFace_t) ++ (FTC_Manager, FTC_FaceID, FT_Face*); + typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); + typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, + FTC_Face_Requester, FT_Pointer, FTC_Manager*); +-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); ++typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); + + typedef FT_ULong (*FT_Get_First_Char_t)(FT_Face, FT_UInt*); + typedef FT_ULong (*FT_Get_Next_Char_t)(FT_Face, FT_ULong, FT_UInt*); +@@ -157,7 +157,7 @@ + FT_Outline_Decompose_t nsFT_Outline_Decompose; + FT_Set_Charmap_t nsFT_Set_Charmap; + FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; +- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; ++ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; + FTC_Manager_Done_t nsFTC_Manager_Done; + FTC_Manager_New_t nsFTC_Manager_New; + FTC_Image_Cache_New_t nsFTC_Image_Cache_New; +@@ -195,7 +195,7 @@ + PRLibrary *mSharedLib; + FT_Library mFreeTypeLibrary; + FTC_Manager mFTCacheManager; +- FTC_Image_Cache mImageCache; ++ FTC_ImageCache mImageCache; + + static nsHashtable *sFontFamilies; + static nsHashtable *sRange1CharSetNames; diff --git a/www/mozilla-stable/patches/patch-ak b/www/mozilla-stable/patches/patch-ak new file mode 100644 index 00000000000..dd2d8261f2d --- /dev/null +++ b/www/mozilla-stable/patches/patch-ak @@ -0,0 +1,62 @@ +$NetBSD: patch-ak,v 1.1 2004/06/05 10:20:55 taya Exp $ + +diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp +--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2003-02-23 09:07:04.000000000 +0900 ++++ ./gfx/src/freetype/nsFreeType.cpp 2004-06-05 15:49:08.000000000 +0900 +@@ -110,11 +110,11 @@ + {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, + {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, + {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, +- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, +- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, ++ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, ++ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, + {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, + {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, +- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, ++ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, + {"FT_Get_First_Char", NS_FT2_OFFSET(nsFT_Get_First_Char), PR_FALSE}, + {"FT_Get_Next_Char", NS_FT2_OFFSET(nsFT_Get_Next_Char), PR_FALSE}, + {nsnull, 0, 0}, +@@ -276,7 +276,7 @@ + } + + NS_IMETHODIMP +-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, ++nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, + FT_UInt glyphID, FT_Glyph *glyph) + { + // call the FreeType2 function via the function pointer +@@ -285,11 +285,11 @@ + } + + NS_IMETHODIMP +-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, +- FT_Face *face, FT_Size *size) ++nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, ++ FT_Face *face) + { + // call the FreeType2 function via the function pointer +- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); ++ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); + return error ? NS_ERROR_FAILURE : NS_OK; + } + +@@ -314,7 +314,7 @@ + } + + NS_IMETHODIMP +-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) ++nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) + { + // call the FreeType2 function via the function pointer + FT_Error error = nsFTC_Image_Cache_New(manager, cache); +@@ -345,7 +345,7 @@ + } + + NS_IMETHODIMP +-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) ++nsFreeType2::GetImageCache(FTC_ImageCache *aCache) + { + *aCache = mImageCache; + return NS_OK; diff --git a/www/mozilla-stable/patches/patch-al b/www/mozilla-stable/patches/patch-al new file mode 100644 index 00000000000..ea596596b01 --- /dev/null +++ b/www/mozilla-stable/patches/patch-al @@ -0,0 +1,23 @@ +$NetBSD: patch-al,v 1.1 2004/06/05 10:20:55 taya Exp $ + +diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h +--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h 2003-04-23 01:25:09.000000000 +0900 ++++ ./gfx/src/ps/nsFontMetricsPS.h 2004-06-05 15:49:34.000000000 +0900 +@@ -320,7 +320,7 @@ + nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; + nsCOMPtr<nsIFreeType2> mFt2; + PRUint16 mPixelSize; +- FTC_Image_Desc mImageDesc; ++ FTC_ImageType mImageDesc; + + + static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, +@@ -363,7 +363,7 @@ + protected: + nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; + nsCOMPtr<nsIFreeType2> mFt2; +- FTC_Image_Desc mImageDesc; ++ FTC_ImageType mImageDesc; + }; + #endif + diff --git a/www/mozilla-stable/patches/patch-an b/www/mozilla-stable/patches/patch-an new file mode 100644 index 00000000000..e878e991545 --- /dev/null +++ b/www/mozilla-stable/patches/patch-an @@ -0,0 +1,14 @@ +$NetBSD: patch-an,v 1.1 2004/06/05 10:20:55 taya Exp $ + +diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h +--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h 2003-04-23 01:25:13.000000000 +0900 ++++ ./gfx/src/x11shared/nsFontFreeType.h 2004-06-05 15:49:37.000000000 +0900 +@@ -110,7 +110,7 @@ + XImage *GetXImage(PRUint32 width, PRUint32 height); + nsITrueTypeFontCatalogEntry *mFaceID; + PRUint16 mPixelSize; +- FTC_Image_Desc mImageDesc; ++ FTC_ImageType mImageDesc; + nsCOMPtr<nsIFreeType2> mFt2; + }; + diff --git a/www/mozilla-stable/patches/patch-ao b/www/mozilla-stable/patches/patch-ao new file mode 100644 index 00000000000..fa058810e48 --- /dev/null +++ b/www/mozilla-stable/patches/patch-ao @@ -0,0 +1,76 @@ +$NetBSD: patch-ao,v 1.1 2004/06/05 10:20:55 taya Exp $ + +diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp +--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2003-04-23 01:25:12.000000000 +0900 ++++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-06-05 15:49:40.000000000 +0900 +@@ -177,7 +177,7 @@ + FTC_Manager mgr; + nsresult rv; + mFt2->GetFTCacheManager(&mgr); +- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); ++ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); + NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); + if (NS_FAILED(rv)) + return nsnull; +@@ -191,22 +191,15 @@ + PRBool embedded_bimap = PR_FALSE; + mFaceID = aFaceID; + mPixelSize = aPixelSize; +- mImageDesc.font.face_id = (void*)mFaceID; +- mImageDesc.font.pix_width = aPixelSize; +- mImageDesc.font.pix_height = aPixelSize; +- mImageDesc.image_type = 0; ++ mImageDesc->face_id = (FTC_FaceID)&mFaceID; ++ mImageDesc->width = aPixelSize; ++ mImageDesc->height = aPixelSize; ++ mImageDesc->flags = 0; + + if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { +- mImageDesc.image_type |= ftc_image_mono; + anti_alias = PR_FALSE; + } + +- if (nsFreeType2::gFreeType2Autohinted) +- mImageDesc.image_type |= ftc_image_flag_autohinted; +- +- if (nsFreeType2::gFreeType2Unhinted) +- mImageDesc.image_type |= ftc_image_flag_unhinted; +- + PRUint32 num_embedded_bitmaps, i; + PRInt32* embedded_bitmapheights; + mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, +@@ -218,7 +211,6 @@ + if (embedded_bitmapheights[i] == aPixelSize) { + embedded_bimap = PR_TRUE; + // unhinted must be set for embedded bitmaps to be used +- mImageDesc.image_type |= ftc_image_flag_unhinted; + break; + } + } +@@ -312,7 +304,7 @@ + if (!face) + return NS_ERROR_FAILURE; + +- FTC_Image_Cache icache; ++ FTC_ImageCache icache; + mFt2->GetImageCache(&icache); + if (!icache) + return NS_ERROR_FAILURE; +@@ -401,7 +393,7 @@ + if (!face) + return 0; + +- FTC_Image_Cache icache; ++ FTC_ImageCache icache; + mFt2->GetImageCache(&icache); + if (!icache) + return 0; +@@ -725,7 +717,7 @@ + if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); + #endif + +- FTC_Image_Cache icache; ++ FTC_ImageCache icache; + mFt2->GetImageCache(&icache); + if (!icache) + return 0; |