pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/mozilla-stable adopt new freetype api.
details: https://anonhg.NetBSD.org/pkgsrc/rev/2284a3faaee1
branches: trunk
changeset: 476205:2284a3faaee1
user: taya <taya%pkgsrc.org@localhost>
date: Sat Jun 05 10:20:55 2004 +0000
description:
adopt new freetype api.
fix PR pkg/25815.
diffstat:
www/mozilla-stable/Makefile | 4 +-
www/mozilla-stable/distinfo | 9 +++-
www/mozilla-stable/patches/patch-ah | 49 +++++++++++++++++++++++
www/mozilla-stable/patches/patch-ai | 63 ++++++++++++++++++++++++++++++
www/mozilla-stable/patches/patch-aj | 41 +++++++++++++++++++
www/mozilla-stable/patches/patch-ak | 62 ++++++++++++++++++++++++++++++
www/mozilla-stable/patches/patch-al | 23 +++++++++++
www/mozilla-stable/patches/patch-an | 14 ++++++
www/mozilla-stable/patches/patch-ao | 76 +++++++++++++++++++++++++++++++++++++
9 files changed, 338 insertions(+), 3 deletions(-)
diffs (truncated from 392 to 300 lines):
diff -r 6c4ab6215dda -r 2284a3faaee1 www/mozilla-stable/Makefile
--- a/www/mozilla-stable/Makefile Sat Jun 05 10:20:48 2004 +0000
+++ b/www/mozilla-stable/Makefile Sat Jun 05 10:20:55 2004 +0000
@@ -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 -r 6c4ab6215dda -r 2284a3faaee1 www/mozilla-stable/distinfo
--- a/www/mozilla-stable/distinfo Sat Jun 05 10:20:48 2004 +0000
+++ b/www/mozilla-stable/distinfo Sat Jun 05 10:20:55 2004 +0000
@@ -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-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 -r 6c4ab6215dda -r 2284a3faaee1 www/mozilla-stable/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla-stable/patches/patch-ah Sat Jun 05 10:20:55 2004 +0000
@@ -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 -r 6c4ab6215dda -r 2284a3faaee1 www/mozilla-stable/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla-stable/patches/patch-ai Sat Jun 05 10:20:55 2004 +0000
@@ -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 -r 6c4ab6215dda -r 2284a3faaee1 www/mozilla-stable/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla-stable/patches/patch-aj Sat Jun 05 10:20:55 2004 +0000
@@ -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 -r 6c4ab6215dda -r 2284a3faaee1 www/mozilla-stable/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla-stable/patches/patch-ak Sat Jun 05 10:20:55 2004 +0000
@@ -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 -r 6c4ab6215dda -r 2284a3faaee1 www/mozilla-stable/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla-stable/patches/patch-al Sat Jun 05 10:20:55 2004 +0000
@@ -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 -r 6c4ab6215dda -r 2284a3faaee1 www/mozilla-stable/patches/patch-an
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla-stable/patches/patch-an Sat Jun 05 10:20:55 2004 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.1 2004/06/05 10:20:55 taya Exp $
+
Home |
Main Index |
Thread Index |
Old Index