From 2a78c2eef4c3c9f7aa2992b1e336668e931dfe16 Mon Sep 17 00:00:00 2001 From: hackbard Date: Wed, 21 Jul 2004 16:32:25 +0000 Subject: [PATCH] added patches for firefox (still not working -> removed from targets) --- doc/CHANGELOG | 1 + packages/x11/firefox/firefox | 4 +- packages/x11/firefox/freetype1.patch | 46 ++++++++++++++++++ packages/x11/firefox/freetype2.patch | 50 +++++++++++++++++++ packages/x11/firefox/freetype3.patch | 38 +++++++++++++++ packages/x11/firefox/freetype4.patch | 60 +++++++++++++++++++++++ packages/x11/firefox/freetype5.patch | 73 ++++++++++++++++++++++++++++ packages/x11/firefox/freetype6.patch | 11 +++++ targets/desktop/include | 5 +- targets/fefe/include | 5 +- targets/mobile/include | 5 +- 11 files changed, 290 insertions(+), 8 deletions(-) create mode 100644 packages/x11/firefox/freetype1.patch create mode 100644 packages/x11/firefox/freetype2.patch create mode 100644 packages/x11/firefox/freetype3.patch create mode 100644 packages/x11/firefox/freetype4.patch create mode 100644 packages/x11/firefox/freetype5.patch create mode 100644 packages/x11/firefox/freetype6.patch diff --git a/doc/CHANGELOG b/doc/CHANGELOG index efa6f9c..ce4bfed 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,5 +1,6 @@ *) 2004-07-21 +- added firefox patches (still not working, removed firefox from targets) - adapted make_tar.sh script - fixed firefox and mozilla config typo diff --git a/packages/x11/firefox/firefox b/packages/x11/firefox/firefox index 4a9835a..a7b3a4d 100644 --- a/packages/x11/firefox/firefox +++ b/packages/x11/firefox/firefox @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.9 +# [V] 0.9.2 # [S] 3-8 -# [D] firefox-0.9-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.9/ +# [D] firefox-0.9.2-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.9.2/ # [D] install_flash_player_7_linux.tar.gz http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/ srcdir=mozilla diff --git a/packages/x11/firefox/freetype1.patch b/packages/x11/firefox/freetype1.patch new file mode 100644 index 0000000..f6f4b88 --- /dev/null +++ b/packages/x11/firefox/freetype1.patch @@ -0,0 +1,46 @@ +--- ./gfx/idl/nsIFreeType2.idl.orig 2004-07-21 16:59:09.000000000 +0200 ++++ ./gfx/idl/nsIFreeType2.idl 2004-07-21 17:24:42.000000000 +0200 +@@ -76,10 +76,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); + + // #ifdef MOZ_SVG +@@ -99,7 +100,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); +@@ -115,16 +116,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); + /* #ifdef MOZ_SVG */ + void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, + in FT_Vector_p delta); diff --git a/packages/x11/firefox/freetype2.patch b/packages/x11/firefox/freetype2.patch new file mode 100644 index 0000000..856c303 --- /dev/null +++ b/packages/x11/firefox/freetype2.patch @@ -0,0 +1,50 @@ +--- ./gfx/src/freetype/nsFreeType.cpp.orig 2004-07-21 19:32:11.000000000 +0200 ++++ ./gfx/src/freetype/nsFreeType.cpp 2004-07-21 19:36:36.000000000 +0200 +@@ -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}, + // #ifdef MOZ_SVG + {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, + {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, +@@ -291,11 +291,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; + } + +@@ -320,7 +320,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); +@@ -389,7 +389,7 @@ + } + + NS_IMETHODIMP +-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) ++nsFreeType2::GetImageCache(FTC_ImageCache *aCache) + { + *aCache = mImageCache; + return NS_OK; diff --git a/packages/x11/firefox/freetype3.patch b/packages/x11/firefox/freetype3.patch new file mode 100644 index 0000000..6fda007 --- /dev/null +++ b/packages/x11/firefox/freetype3.patch @@ -0,0 +1,38 @@ +--- ./gfx/src/freetype/nsFreeType.h.orig 2004-07-21 17:32:55.000000000 +0200 ++++ ./gfx/src/freetype/nsFreeType.h 2004-07-21 17:36:36.000000000 +0200 +@@ -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*); + // #ifdef MOZ_SVG + typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); + typedef FT_Error (*FT_Get_Kerning_t) +@@ -165,7 +165,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; +@@ -213,7 +213,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/packages/x11/firefox/freetype4.patch b/packages/x11/firefox/freetype4.patch new file mode 100644 index 0000000..8f8f435 --- /dev/null +++ b/packages/x11/firefox/freetype4.patch @@ -0,0 +1,60 @@ +--- ./gfx/src/ps/nsFontMetricsPS.cpp.orig 2004-07-21 17:37:25.000000000 +0200 ++++ ./gfx/src/ps/nsFontMetricsPS.cpp 2004-07-21 17:42:15.000000000 +0200 +@@ -1141,10 +1141,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 = (void*)mEntry; ++ mImageDesc->width = mPixelSize; ++ mImageDesc->height = mPixelSize; ++ mImageDesc->flags = 0; + + nsresult rv; + mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); +@@ -1190,7 +1190,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"); +@@ -1228,8 +1228,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; +@@ -1622,16 +1622,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/packages/x11/firefox/freetype5.patch b/packages/x11/firefox/freetype5.patch new file mode 100644 index 0000000..f97d25c --- /dev/null +++ b/packages/x11/firefox/freetype5.patch @@ -0,0 +1,73 @@ +--- ./gfx/src/x11shared/nsFontFreeType.cpp.orig 2004-07-21 17:43:12.000000000 +0200 ++++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-07-21 17:46:47.000000000 +0200 +@@ -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; +@@ -723,7 +715,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; diff --git a/packages/x11/firefox/freetype6.patch b/packages/x11/firefox/freetype6.patch new file mode 100644 index 0000000..86d9b7a --- /dev/null +++ b/packages/x11/firefox/freetype6.patch @@ -0,0 +1,11 @@ +--- ./gfx/src/x11shared/nsFontFreeType.h.orig 2004-07-21 17:47:42.000000000 +0200 ++++ ./gfx/src/x11shared/nsFontFreeType.h 2004-07-21 17:48:09.000000000 +0200 +@@ -110,7 +110,7 @@ + XImage *GetXImage(PRUint32 width, PRUint32 height); + nsITrueTypeFontCatalogEntry *mFaceID; + PRUint16 mPixelSize; +- FTC_Image_Desc mImageDesc; ++ FTC_ImageType mImageDesc; + nsCOMPtr mFt2; + }; + diff --git a/targets/desktop/include b/targets/desktop/include index 7cfc982..9e14317 100644 --- a/targets/desktop/include +++ b/targets/desktop/include @@ -9,8 +9,9 @@ # [C] x11 # xfree86 replaced by xorg due to license stuff # [R] x11/xfree86 -# mozilla replaced by firefox & thunderbird -# [R] x11/mozilla +# mozilla / firefox & thunderbird +# [R] x11/firefox +# [R] x11/thunderbird # [C] security # [C] science diff --git a/targets/fefe/include b/targets/fefe/include index 9492f65..e45867f 100644 --- a/targets/fefe/include +++ b/targets/fefe/include @@ -20,8 +20,9 @@ # [C] x11 # xfree86 replaced by xorg due to license stuff # [R] x11/xfree86 -# mozilla replaced by firefox & thunderbird -# [R] x11/mozilla +# mozilla / firefox & thunderbird +# [R] x11/firefox +# [R] x11/thunderbird # [C] science # [C] soundtools diff --git a/targets/mobile/include b/targets/mobile/include index 016743f..58f24bd 100644 --- a/targets/mobile/include +++ b/targets/mobile/include @@ -9,8 +9,9 @@ # [C] x11 # xfree86 replaced by xorg due to license stuff # [R] x11/xfree86 -# mozilla replaced by firefox & thunderbird -# [R] x11/mozilla +# mozilla / firefox & thunderbird +# [R] x11/firefox +# [R] x11/thunderbird # [C] security # [C] science -- 2.20.1