From 9faf0f7f8e54984eeaca64885efaef4e5354100b Mon Sep 17 00:00:00 2001 From: hackbard Date: Tue, 21 Dec 2004 23:38:49 +0000 Subject: [PATCH] fixed/updated thunderbird & firefox + added thunderbird to targets --- doc/CHANGELOG | 5 + packages/x11/firefox/firefox | 35 ++- packages/x11/firefox/lfs.patch | 321 ------------------------ packages/x11/thunderbird/freetype.patch | 307 ---------------------- packages/x11/thunderbird/thunderbird | 35 ++- targets/default/include | 4 +- targets/desktop/include | 1 - targets/fefe/include | 1 - targets/mobile/include | 1 - 9 files changed, 50 insertions(+), 660 deletions(-) delete mode 100644 packages/x11/firefox/lfs.patch delete mode 100644 packages/x11/thunderbird/freetype.patch diff --git a/doc/CHANGELOG b/doc/CHANGELOG index f2dcd34..5419c2c 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,8 @@ +*) 2004-12-22 + +- fixed / updated firefox & thunderbird package +- added thunderbird to targets + *) 2004-12-12 - removed broken dns from resolv.conf file diff --git a/packages/x11/firefox/firefox b/packages/x11/firefox/firefox index eb2a561..ed155d9 100644 --- a/packages/x11/firefox/firefox +++ b/packages/x11/firefox/firefox @@ -2,36 +2,45 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.9.2 +# [V] 1.0 # [S] 3-8 -# [D] firefox-0.9.2-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.9.2/ +# [D] firefox-1.0-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/source/ # [D] install_flash_player_7_linux.tar.gz http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/ srcdir=mozilla optimize="`echo $hdw_cflags | awk '{ print $1 }'`" -#export PKG_CONFIG_PATH="/usr/X11R6/lib/pkgconfig" +#export PKG_CONFIG_PATH="$prefix/X11R6/lib/pkgconfig" pre_install() { export MOZILLA_OFFICIAL=1 BUILD_OFFICIAL=1 MOZ_PHOENIX=1 - #sed "s,0000000000,hdw-linux -- ${hdw_version}," \ - # xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new - #mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in + export MOZILLA_FIVE_HOME=$prefix/lib/firefox-$ver + sed "s,0000000000,hdw-linux -- ${hdw_version}," \ + xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new + mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in } confopt="$confopt --enable-default-toolkit=gtk2 --with-x --with-system-zlib" confopt="$confopt --with-system-jpeg --with-system-png --with-extensions" -#confopt="$confopt --enable-xft --enable-crypto --enable-xinerama" -confopt="$confopt --enable-crypto --enable-xinerama" -confopt="$confopt --disable-tests --disable-debug --disable-dtd-debug" -confopt="$confopt --disable-pedantic --disable-logging --disable-accessibility" +confopt="$confopt --with-default-mozilla-five-home=$MOZILLA_FIVE_HOME" +confopt="$confopt --with-user-appdir=.firefox" +confopt="$confopt --enable-xft --enable-crypto --enable-xinerama" confopt="$confopt --enable-strip --enable-strip-libs --enable-extensions=all" +confopt="$confopt --enable-application=browser" confopt="$confopt --enable-optimize='$optimize' --enable-cpp-rtti" confopt="$confopt --enable-single-profile --disable-profilesharing " -confopt="$confopt --disable-mailnews --disable-ldap" +confopt="$confopt --disable-mailnews --disable-ldap --disable-freetype2" +confopt="$confopt --disable-tests --disable-debug --disable-composer" +confopt="$confopt --disable-pedantic --disable-logging --disable-accessibility" +confopt="$confopt --disable-installer --disable-dtd-debug" post_install() { - cd $prefix/lib/firefox-* - export MOZILLA_FIVE_HOME=$PWD + install -d $prefix/include/firefox-$ver/nss + cp -vLf dist/private/nss/*.h dist/public/nss/*.h \ + $prefix/include/firefox-$ver/nss + ln -sfv firefox-$ver $prefix/lib/firefox + ln -sfv firefox-$ver $prefix/include/firefox + + cd $prefix/lib/firefox-$ver LD_LIBRARY_PATH=. ./regxpcom LD_LIBRARY_PATH=. ./regchrome touch `find $PWD -name *.rdf` diff --git a/packages/x11/firefox/lfs.patch b/packages/x11/firefox/lfs.patch deleted file mode 100644 index a4e3243..0000000 --- a/packages/x11/firefox/lfs.patch +++ /dev/null @@ -1,321 +0,0 @@ -Submitted By: Igor Zivkovic -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. - -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); - --[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 -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}, - {"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}, -@@ -282,7 +282,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 -@@ -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 -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); - 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 -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); - -- 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); -@@ -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 -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; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -363,7 +363,7 @@ - protected: - nsCOMPtr mEntry; - nsCOMPtr mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif - -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; - 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 -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; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr mFt2; - }; - diff --git a/packages/x11/thunderbird/freetype.patch b/packages/x11/thunderbird/freetype.patch deleted file mode 100644 index 172e16b..0000000 --- a/packages/x11/thunderbird/freetype.patch +++ /dev/null @@ -1,307 +0,0 @@ ---- 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); - --[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); ---- 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}, - {"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}, -@@ -282,7 +282,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 -@@ -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; ---- 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); - 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; ---- 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); - -- 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); -@@ -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; - ---- 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; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -363,7 +363,7 @@ - protected: - nsCOMPtr mEntry; - nsCOMPtr mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif - ---- 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; - 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; ---- 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; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr mFt2; - }; - diff --git a/packages/x11/thunderbird/thunderbird b/packages/x11/thunderbird/thunderbird index 8bad8ec..30bf5bf 100644 --- a/packages/x11/thunderbird/thunderbird +++ b/packages/x11/thunderbird/thunderbird @@ -2,34 +2,43 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.8 +# [V] 1.0 # [S] 3-8 -# [D] thunderbird-source-0.8.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/0.8/ +# [D] thunderbird-1.0-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.0/source/ srcdir=mozilla optimize="`echo $hdw_cflags | awk '{ print $1 }'`" -export PKG_CONFIG_PATH="/usr/X11R6/lib/pkgconfig" +export PKG_CONFIG_PATH="$prefix/X11R6/lib/pkgconfig" pre_install() { export MOZILLA_OFFICIAL=1 BUILD_OFFICIAL=1 MOZ_THUNDERBIRD=1 - export MOZ_PHOENIX=1 - #sed "s,0000000000,hdw-linux -- ${hdw_version}," \ - # xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new - #mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in + export MOZILLA_FIVE_HOME=$prefix/lib/thunderbird-$ver + sed "s,0000000000,hdw-linux -- ${hdw_version}," \ + xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new + mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in } confopt="$confopt --enable-default-toolkit=gtk2 --with-x --with-system-zlib" -confopt="$confopt --with-system-jpeg --with-system-png --with-extensions" +confopt="$confopt --with-system-jpeg --with-system-png" +confopt="$confopt --with-default-mozilla-five-home=$MOZILLA_FIVE_HOME" confopt="$confopt --enable-xft --enable-crypto --enable-xinerama" -confopt="$confopt --disable-tests --disable-debug --disable-dtd-debug" +confopt="$confopt --enable-application=mail --enable-strip --enable-strip-libs" +confopt="$confopt --enable-reorder --enable-cpp-rtti --enable-extensions=all" +confopt="$confopt --disable-tests --disable-debug --disable-extensions" confopt="$confopt --disable-pedantic --disable-logging --disable-accessibility" -confopt="$confopt --enable-strip --enable-strip-libs --enable-extensions=all" -confopt="$confopt --disable-profilesharing" +confopt="$confopt --disable-freetype2 --disable-installer --disable-mathml" +confopt="$confopt --disable-profilesharing --enable-single-profile" +confopt="$confopt --disable-oji --disable-plugins --disable-necko-disk-cache" confopt="$confopt --enable-optimize='$optimize'" post_install() { - cd $prefix/lib/mozilla-* - export MOZILLA_FIVE_HOME=$PWD + install -d $prefix/include/thunderbird-$ver/nss + cp -vLf dist/private/nss/*.h dist/public/nss/*.h \ + $prefix/include/thunderbird-$ver/nss + ln -sfv thunderbird-$ver $prefix/lib/thunderbird + ln -sfv thunderbird-$ver $prefix/include/thunderbird + + cd $prefix/lib/thunderbird-$ver LD_LIBRARY_PATH=. ./regxpcom LD_LIBRARY_PATH=. ./regchrome touch `find $PWD -name *.rdf` diff --git a/targets/default/include b/targets/default/include index a8f4891..e3cacc5 100644 --- a/targets/default/include +++ b/targets/default/include @@ -1,6 +1,4 @@ -# hdw-linux target default, lists of categories and packages included -# -# damn, this is still hardcoded! but once packages have to be chosen! +# hdw-linux target default # # author: hackbard # diff --git a/targets/desktop/include b/targets/desktop/include index 453234d..d4aa943 100644 --- a/targets/desktop/include +++ b/targets/desktop/include @@ -11,7 +11,6 @@ # [R] x11/xfree86 # mozilla / firefox & thunderbird # [R] x11/mozilla -# [R] x11/thunderbird # [C] security # [C] science diff --git a/targets/fefe/include b/targets/fefe/include index 908cc8d..279e6c9 100644 --- a/targets/fefe/include +++ b/targets/fefe/include @@ -29,7 +29,6 @@ # [R] x11/xfree86 # mozilla / firefox & thunderbird # [R] x11/mozilla -# [R] x11/thunderbird # [C] science # [C] soundtools diff --git a/targets/mobile/include b/targets/mobile/include index 4c805ed..a245608 100644 --- a/targets/mobile/include +++ b/targets/mobile/include @@ -11,7 +11,6 @@ # [R] x11/xfree86 # mozilla / firefox & thunderbird # [R] x11/mozilla -# [R] x11/thunderbird # [C] security # [C] science -- 2.20.1