From 664f4d7ea8cefdd12958b36b4a10e41a2d4c990c Mon Sep 17 00:00:00 2001 From: hackbard Date: Mon, 2 Aug 2004 15:51:04 +0000 Subject: [PATCH] updated firefox --- doc/CHANGELOG | 4 ++ packages/x11/firefox/firefox | 9 ++-- packages/x11/firefox/lfs.patch | 99 ++++++++++++++++++---------------- 3 files changed, 62 insertions(+), 50 deletions(-) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 22676bb..aa9c36d 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,7 @@ +*) 2004-08-02 + +- updated firefox (still crashing, imho due to freetype2 issue) + *) 2004-07-31 ## last 0.3 fixes ## diff --git a/packages/x11/firefox/firefox b/packages/x11/firefox/firefox index a7abb99..149c214 100644 --- a/packages/x11/firefox/firefox +++ b/packages/x11/firefox/firefox @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.8 +# [V] 0.9.2 # [S] 3-8 -# [D] firefox-source-0.8.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.8/ +# [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 @@ -24,11 +24,12 @@ confopt="$confopt --enable-xft --enable-crypto --enable-xinerama" confopt="$confopt --disable-tests --disable-debug --disable-dtd-debug" confopt="$confopt --disable-pedantic --disable-logging --disable-accessibility" confopt="$confopt --enable-strip --enable-strip-libs --enable-extensions=all" -confopt="$confopt --enable-optimize='$optimize'" +confopt="$confopt --enable-optimize='$optimize' --enable-cpp-rtti" +confopt="$confopt --enable-single-profile --disable-profilesharing " confopt="$confopt --disable-mailnews --disable-ldap" post_install() { - cd $prefix/lib/mozilla-* + cd $prefix/lib/firefox-* export MOZILLA_FIVE_HOME=$PWD LD_LIBRARY_PATH=. ./regxpcom LD_LIBRARY_PATH=. ./regchrome diff --git a/packages/x11/firefox/lfs.patch b/packages/x11/firefox/lfs.patch index 5412df1..a4e3243 100644 --- a/packages/x11/firefox/lfs.patch +++ b/packages/x11/firefox/lfs.patch @@ -1,13 +1,14 @@ Submitted By: Igor Zivkovic -Date: 2004-07-10 +Date: 2004-07-15 Initial Package Version: 0.8 Upstream Status: Submitted (http://bugzilla.mozilla.org/show_bug.cgi?id=234035). Origin: Peter Kovar's 0.9 patch. Description: Fixes compilation against freetype >= 2.1.8. ---- mozilla/gfx/idl/nsIFreeType2.idl.orig 2004-07-10 18:21:23.000000000 +0000 -+++ mozilla/gfx/idl/nsIFreeType2.idl 2004-07-10 18:27:25.000000000 +0000 -@@ -72,10 +72,11 @@ +diff -Naur mozilla-orig/gfx/idl/nsIFreeType2.idl mozilla/gfx/idl/nsIFreeType2.idl +--- mozilla-orig/gfx/idl/nsIFreeType2.idl 2004-07-15 11:24:14.000000000 +0000 ++++ mozilla/gfx/idl/nsIFreeType2.idl 2004-07-15 11:28:26.000000000 +0000 +@@ -76,10 +76,11 @@ native FT_Sfnt_Tag(FT_Sfnt_Tag); native FT_Size(FT_Size); @@ -20,8 +21,8 @@ Description: Fixes compilation against freetype >= 2.1.8. +native FTC_ImageCache(FTC_ImageCache); native FTC_Manager(FTC_Manager); - /* -@@ -87,7 +88,7 @@ + // #ifdef MOZ_SVG +@@ -99,7 +100,7 @@ readonly attribute FT_Library library; readonly attribute FTC_Manager FTCacheManager; @@ -30,7 +31,7 @@ Description: Fixes compilation against freetype >= 2.1.8. void doneFace(in FT_Face face); void doneFreeType(in FT_Library lib); -@@ -103,16 +104,16 @@ +@@ -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); @@ -48,11 +49,12 @@ Description: Fixes compilation against freetype >= 2.1.8. 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); ---- mozilla/gfx/src/freetype/nsFreeType.cpp.orig 2004-07-10 18:29:59.000000000 +0000 -+++ mozilla/gfx/src/freetype/nsFreeType.cpp 2004-07-10 18:42:26.000000000 +0000 + /* #ifdef MOZ_SVG */ + void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, + in FT_Vector_p delta); +diff -Naur mozilla-orig/gfx/src/freetype/nsFreeType.cpp mozilla/gfx/src/freetype/nsFreeType.cpp +--- mozilla-orig/gfx/src/freetype/nsFreeType.cpp 2004-07-15 11:24:14.000000000 +0000 ++++ mozilla/gfx/src/freetype/nsFreeType.cpp 2004-07-15 11:28:26.000000000 +0000 @@ -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}, @@ -65,10 +67,10 @@ Description: Fixes compilation against freetype >= 2.1.8. {"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 @@ + // #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}, +@@ -282,7 +282,7 @@ } NS_IMETHODIMP @@ -77,7 +79,7 @@ Description: Fixes compilation against freetype >= 2.1.8. FT_UInt glyphID, FT_Glyph *glyph) { // call the FreeType2 function via the function pointer -@@ -285,11 +285,11 @@ +@@ -291,11 +291,11 @@ } NS_IMETHODIMP @@ -92,7 +94,7 @@ Description: Fixes compilation against freetype >= 2.1.8. return error ? NS_ERROR_FAILURE : NS_OK; } -@@ -314,7 +314,7 @@ +@@ -320,7 +320,7 @@ } NS_IMETHODIMP @@ -101,7 +103,7 @@ Description: Fixes compilation against freetype >= 2.1.8. { // call the FreeType2 function via the function pointer FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -345,7 +345,7 @@ +@@ -389,7 +389,7 @@ } NS_IMETHODIMP @@ -110,8 +112,9 @@ Description: Fixes compilation against freetype >= 2.1.8. { *aCache = mImageCache; return NS_OK; ---- mozilla/gfx/src/freetype/nsFreeType.h.orig 2004-07-10 18:43:11.000000000 +0000 -+++ mozilla/gfx/src/freetype/nsFreeType.h 2004-07-10 18:47:12.000000000 +0000 +diff -Naur mozilla-orig/gfx/src/freetype/nsFreeType.h mozilla/gfx/src/freetype/nsFreeType.h +--- mozilla-orig/gfx/src/freetype/nsFreeType.h 2004-07-15 11:24:14.000000000 +0000 ++++ mozilla/gfx/src/freetype/nsFreeType.h 2004-07-15 11:28:26.000000000 +0000 @@ -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); @@ -127,10 +130,10 @@ Description: Fixes compilation against freetype >= 2.1.8. 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 @@ + // #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; @@ -139,7 +142,7 @@ Description: Fixes compilation against freetype >= 2.1.8. 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 @@ +@@ -213,7 +213,7 @@ PRLibrary *mSharedLib; FT_Library mFreeTypeLibrary; FTC_Manager mFTCacheManager; @@ -148,9 +151,10 @@ Description: Fixes compilation against freetype >= 2.1.8. static nsHashtable *sFontFamilies; static nsHashtable *sRange1CharSetNames; ---- mozilla/gfx/src/ps/nsFontMetricsPS.cpp.orig 2004-07-10 18:48:23.000000000 +0000 -+++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2004-07-10 18:57:02.000000000 +0000 -@@ -1126,10 +1126,10 @@ +diff -Naur mozilla-orig/gfx/src/ps/nsFontMetricsPS.cpp mozilla/gfx/src/ps/nsFontMetricsPS.cpp +--- mozilla-orig/gfx/src/ps/nsFontMetricsPS.cpp 2004-07-15 11:24:14.000000000 +0000 ++++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2004-07-15 11:28:26.000000000 +0000 +@@ -1141,10 +1141,10 @@ mPixelSize = NSToIntRound(app2dev * mFont->size); @@ -159,13 +163,13 @@ Description: Fixes compilation against freetype >= 2.1.8. - mImageDesc.font.pix_height = mPixelSize; - mImageDesc.image_type = 0; + mImageDesc->face_id = (FTC_FaceID)&mEntry; -+ mImageDesc->width = mPixelSize; -+ mImageDesc->height = mPixelSize; -+ mImageDesc->flags = 0; ++ mImageDesc->width = mPixelSize; ++ mImageDesc->height = mPixelSize; ++ mImageDesc->flags = 0; nsresult rv; mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1175,7 +1175,7 @@ +@@ -1190,7 +1190,7 @@ if (!face) return 0; @@ -174,7 +178,7 @@ Description: Fixes compilation against freetype >= 2.1.8. nsresult rv = mFt2->GetImageCache(&iCache); if (NS_FAILED(rv)) { NS_ERROR("Failed to get Image Cache"); -@@ -1213,8 +1213,8 @@ +@@ -1228,8 +1228,8 @@ FTC_Manager cManager; mFt2->GetFTCacheManager(&cManager); @@ -185,7 +189,7 @@ Description: Fixes compilation against freetype >= 2.1.8. NS_ASSERTION(rv==0, "failed to get face/size"); if (rv) return nsnull; -@@ -1609,16 +1609,16 @@ +@@ -1622,16 +1622,16 @@ mEntry->GetFamilyName(fontName); mEntry->GetStyleName(styleName); @@ -208,8 +212,9 @@ Description: Fixes compilation against freetype >= 2.1.8. if (NS_FAILED(rv)) return; ---- mozilla/gfx/src/ps/nsFontMetricsPS.h.orig 2004-07-10 18:58:54.000000000 +0000 -+++ mozilla/gfx/src/ps/nsFontMetricsPS.h 2004-07-10 19:00:11.000000000 +0000 +diff -Naur mozilla-orig/gfx/src/ps/nsFontMetricsPS.h mozilla/gfx/src/ps/nsFontMetricsPS.h +--- mozilla-orig/gfx/src/ps/nsFontMetricsPS.h 2004-07-15 11:24:14.000000000 +0000 ++++ mozilla/gfx/src/ps/nsFontMetricsPS.h 2004-07-15 11:28:26.000000000 +0000 @@ -320,7 +320,7 @@ nsCOMPtr mFaceID; nsCOMPtr mFt2; @@ -224,12 +229,13 @@ Description: Fixes compilation against freetype >= 2.1.8. nsCOMPtr mEntry; nsCOMPtr mFt2; - FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; ++ FTC_ImageType mImageDesc; }; #endif ---- mozilla/gfx/src/x11shared/nsFontFreeType.cpp.orig 2004-07-10 19:01:13.000000000 +0000 -+++ mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2004-07-10 19:05:19.000000000 +0000 +diff -Naur mozilla-orig/gfx/src/x11shared/nsFontFreeType.cpp mozilla/gfx/src/x11shared/nsFontFreeType.cpp +--- mozilla-orig/gfx/src/x11shared/nsFontFreeType.cpp 2004-07-15 11:24:14.000000000 +0000 ++++ mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2004-07-15 11:28:26.000000000 +0000 @@ -177,7 +177,7 @@ FTC_Manager mgr; nsresult rv; @@ -248,9 +254,9 @@ Description: Fixes compilation against freetype >= 2.1.8. - mImageDesc.font.pix_height = aPixelSize; - mImageDesc.image_type = 0; + mImageDesc->face_id = (FTC_FaceID)&mFaceID; -+ mImageDesc->width = aPixelSize; -+ mImageDesc->height = aPixelSize; -+ mImageDesc->flags = 0; ++ mImageDesc->width = aPixelSize; ++ mImageDesc->height = aPixelSize; ++ mImageDesc->flags = 0; if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { - mImageDesc.image_type |= ftc_image_mono; @@ -292,7 +298,7 @@ Description: Fixes compilation against freetype >= 2.1.8. mFt2->GetImageCache(&icache); if (!icache) return 0; -@@ -725,7 +717,7 @@ +@@ -723,7 +715,7 @@ if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); #endif @@ -301,8 +307,9 @@ Description: Fixes compilation against freetype >= 2.1.8. mFt2->GetImageCache(&icache); if (!icache) return 0; ---- mozilla/gfx/src/x11shared/nsFontFreeType.h.orig 2004-07-10 19:05:31.000000000 +0000 -+++ mozilla/gfx/src/x11shared/nsFontFreeType.h 2004-07-10 19:05:59.000000000 +0000 +diff -Naur mozilla-orig/gfx/src/x11shared/nsFontFreeType.h mozilla/gfx/src/x11shared/nsFontFreeType.h +--- mozilla-orig/gfx/src/x11shared/nsFontFreeType.h 2004-07-15 11:24:14.000000000 +0000 ++++ mozilla/gfx/src/x11shared/nsFontFreeType.h 2004-07-15 11:28:26.000000000 +0000 @@ -110,7 +110,7 @@ XImage *GetXImage(PRUint32 width, PRUint32 height); nsITrueTypeFontCatalogEntry *mFaceID; -- 2.39.2