From: hackbard Date: Sat, 24 Jul 2004 03:08:55 +0000 (+0000) Subject: removed thunderbird, added alternative mutt mail client X-Git-Url: https://hackdaworld.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58b27614b8d5b3cc89318e4cb27a4eb15ed014f5;p=hdw-linux%2Fhdw-linux.git removed thunderbird, added alternative mutt mail client --- diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 9e633cd..71c729b 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,8 @@ +*) 2004-07-24 + +- added thunderbird freetype patches (still not working) - removed from targets +- added alternative mutt console mail client + *) 2004-07-23 - replaced iv by qiv package diff --git a/packages/hackbard/mutt/mutt b/packages/hackbard/mutt/mutt new file mode 100644 index 0000000..4109e04 --- /dev/null +++ b/packages/hackbard/mutt/mutt @@ -0,0 +1,9 @@ +# hdw - linux mutt package +# +# author: hackbard@hackdaworld.dyndns.org +# +# [V] 1.4.2.1i +# [S] 3-2 +# [D] mutt-1.4.2.1i.tar.gz ftp://ftp.mutt.org/mutt/ + +confopt="$confopt --enable-imap --enable-pop --with-ssl" diff --git a/packages/x11/thunderbird/freetype1.patch b/packages/x11/thunderbird/freetype1.patch new file mode 100644 index 0000000..de2f0ae --- /dev/null +++ b/packages/x11/thunderbird/freetype1.patch @@ -0,0 +1,46 @@ +--- ./gfx/idl/nsIFreeType2.idl.orig 2004-07-24 01:30:50.000000000 +0200 ++++ ./gfx/idl/nsIFreeType2.idl 2004-07-24 01:35:19.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 +99,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 +115,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/thunderbird/freetype2.patch b/packages/x11/thunderbird/freetype2.patch new file mode 100644 index 0000000..6887a54 --- /dev/null +++ b/packages/x11/thunderbird/freetype2.patch @@ -0,0 +1,59 @@ +--- ./gfx/src/freetype/nsFreeType.cpp.orig 2004-07-24 01:37:07.000000000 +0200 ++++ ./gfx/src/freetype/nsFreeType.cpp 2004-07-24 01:43:37.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}, +@@ -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_Face 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/thunderbird/freetype3.patch b/packages/x11/thunderbird/freetype3.patch new file mode 100644 index 0000000..037adb2 --- /dev/null +++ b/packages/x11/thunderbird/freetype3.patch @@ -0,0 +1,38 @@ +--- ./gfx/src/freetype/nsFreeType.h.orig 2004-07-24 01:50:37.000000000 +0200 ++++ ./gfx/src/freetype/nsFreeType.h 2004-07-24 01:53:33.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/thunderbird/freetype4.patch b/packages/x11/thunderbird/freetype4.patch new file mode 100644 index 0000000..37f5369 --- /dev/null +++ b/packages/x11/thunderbird/freetype4.patch @@ -0,0 +1,60 @@ +--- ./gfx/src/ps/nsFontMetricsPS.cpp.orig 2004-07-24 01:55:08.000000000 +0200 ++++ ./gfx/src/ps/nsFontMetricsPS.cpp 2004-07-24 01:58:58.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/thunderbird/freetype5.patch b/packages/x11/thunderbird/freetype5.patch new file mode 100644 index 0000000..f5d1d1f --- /dev/null +++ b/packages/x11/thunderbird/freetype5.patch @@ -0,0 +1,20 @@ +--- ./gfx/src/ps/nsFontMetricsPS.h.orig 2004-07-24 02:00:15.000000000 +0200 ++++ ./gfx/src/ps/nsFontMetricsPS.h 2004-07-24 02:00:58.000000000 +0200 +@@ -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 --git a/packages/x11/thunderbird/freetype6.patch b/packages/x11/thunderbird/freetype6.patch new file mode 100644 index 0000000..5836ad8 --- /dev/null +++ b/packages/x11/thunderbird/freetype6.patch @@ -0,0 +1,73 @@ +--- ./gfx/src/x11shared/nsFontFreeType.cpp.orig 2004-07-24 02:02:30.000000000 +0200 ++++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-07-24 02:05:19.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/thunderbird/freetype7.patch b/packages/x11/thunderbird/freetype7.patch new file mode 100644 index 0000000..6251016 --- /dev/null +++ b/packages/x11/thunderbird/freetype7.patch @@ -0,0 +1,11 @@ +--- ./gfx/src/x11shared/nsFontFreeType.h.orig 2004-07-24 02:06:58.000000000 +0200 ++++ ./gfx/src/x11shared/nsFontFreeType.h 2004-07-24 02:07:28.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 cd7f2a4..304572d 100644 --- a/targets/desktop/include +++ b/targets/desktop/include @@ -11,6 +11,7 @@ # [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 790bc76..e6e98b8 100644 --- a/targets/fefe/include +++ b/targets/fefe/include @@ -22,6 +22,7 @@ # [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 5440483..4289bd9 100644 --- a/targets/mobile/include +++ b/targets/mobile/include @@ -11,6 +11,7 @@ # [R] x11/xfree86 # mozilla / firefox & thunderbird # [R] x11/mozilla +# [R] x11/thunderbird # [C] security # [C] science diff --git a/targets/router/include b/targets/router/include index f3b5401..20574f8 100644 --- a/targets/router/include +++ b/targets/router/include @@ -27,6 +27,7 @@ # [P] hackbard/openldap # [P] hackbard/pcmcia-cs # [P] hackbard/pine +# [P] hackbard/mutt # [P] hackbard/rsync # [P] hackbard/sendmail # [P] hackbard/sersniff