Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.4 grimoire by Arwed v. Merkatz (0717c2640f7138b43f26bd72e44665bcc379b8e1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.4 grimoire by Arwed v. Merkatz (0717c2640f7138b43f26bd72e44665bcc379b8e1)
  • Date: Sat, 3 Jun 2006 16:03:20 -0500

GIT changes to stable-rc-0.4 grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:

mail/thunderbird/BUILD | 4
mail/thunderbird/DEPENDS | 25 -
mail/thunderbird/DETAILS | 18 -
mail/thunderbird/HISTORY | 41 ++-
mail/thunderbird/INSTALL | 1
mail/thunderbird/PRE_BUILD | 6
mail/thunderbird/freetype.patch | 314
------------------------
mail/thunderbird/gcc4.patch | 94 -------
mail/thunderbird/security_manager_makefile.diff | 20 -
mail/thunderbird/visibility.patch | 12
10 files changed, 83 insertions(+), 452 deletions(-)

New commits:
commit 0717c2640f7138b43f26bd72e44665bcc379b8e1
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

thunderbird: 1.5.0.4 to stable-rc for bug 12583

diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index 70d983b..2fa1c8f 100755
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -23,8 +23,6 @@ if echo $LDFLAGS | grep -q '\-s'; the
OPTS="$OPTS --enable-strip"
fi &&

-mozilla_remove_nspr_nss &&
-
# Note: --enable-extensions and --enable-necko-protocols are inherited from
# mozconfig. Don't set them in ./configure unless you *really* know what
# you're doing.
@@ -49,7 +47,6 @@ # --enable-image-decoders=def
--enable-application=mail \
--enable-extensions=wallet,spellcheck,xmlextras,webservices \
--enable-crypto \
- --enable-xft \
--enable-xinerama \
--enable-optimize \
--enable-reorder \
@@ -58,7 +55,6 @@ # --enable-image-decoders=def
--enable-single-profile \
--enable-necko-protocols=http,file,jar,viewsource,res,data \
--enable-image-decoders=default,-xbm \
- --disable-freetype2 \
--disable-accessibility \
--disable-debug \
--disable-ldap \
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index 4e93c52..cc5f2cc 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -1,16 +1,15 @@
-depends g++ &&
-depends nspr '--with-system-nspr' &&
-depends nss &&
-depends zlib "--with-system-zlib" &&
-depends jpeg "--with-system-jpeg" &&
-depends libidl &&
-depends libpng "--with-system-png" &&
-depends libmng "--with-system-mng" &&
-depends perl &&
-depends freetype2 "--enable-freetype2" &&
-depends zip &&
-depends gtk+2 "--enable-xft \
- --enable-default-toolkit=gtk2" &&
+depends g++
&&
+depends nspr '--with-system-nspr'
&&
+depends nss
&&
+depends zlib '--with-system-zlib'
&&
+depends jpeg '--with-system-jpeg'
&&
+depends libidl
&&
+depends libpng '--with-system-png'
&&
+depends libmng '--with-system-mng'
&&
+depends perl
&&
+depends zip
&&
+depends gtk+2
\
+ '--enable-xft --disable-freetype2 --enable-default-toolkit=gtk2'
&&

#
# LDAP support doesn't work (fails to build)
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 20d772a..b701ba9 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,24 +1,22 @@
SPELL=thunderbird
- VERSION=1.0.8
- SECURITY_PATCH=1
+ VERSION=1.5.0.4
SOURCE=$SPELL-$VERSION-source.tar.bz2
- SOURCE2=${SOURCE}.asc
- SOURCE_GPG="mozilla.gpg:${SOURCE2}:UPSTREAM_KEY"
- SOURCE2_IGNORE=signature
+ SOURCE2=$SOURCE.asc
+ SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL}.asc
+
SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
if [ "$BUILD_ENIGMAIL" = "y" ]; then
-ENIGMAIL_VERSION=0.93.0
+ENIGMAIL_VERSION=0.93.2
IPC_VERSION=1.1.3
SOURCE3=enigmail-$ENIGMAIL_VERSION.tar.gz
SOURCE4=${SOURCE3}.asc
SOURCE4_IGNORE=signature
- SOURCE3_GPG="enigmail.gpg:${SOURCE4}:UPSTREAM_KEY"
+ SOURCE3_GPG="enigmail.gpg:$SOURCE4:UPSTREAM_KEY"
SOURCE5=ipc-$IPC_VERSION.tar.gz
SOURCE6=${SOURCE5}.asc
SOURCE6_IGNORE=signature
- SOURCE5_GPG="enigmail.gpg:${SOURCE6}:UPSTREAM_KEY"
+ SOURCE5_GPG="enigmail.gpg:$SOURCE6:UPSTREAM_KEY"
SOURCE3_URL[0]=http://downloads.mozdev.org/enigmail/src/$SOURCE3
SOURCE3_URL[1]=http://www.mozdev.org.uk/rsync/enigmail/src/$SOURCE3

SOURCE3_URL[2]=ftp://mozdev.secsup.org/pub/software/mozdev/enigmail/src/$SOURCE3
@@ -30,11 +28,13 @@ ENIGMAIL_VERSION=0.93.0
LICENSE[1]=MPL
LICENSE[2]=MPL
fi
+ SECURITY_PATCH=2
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
UPDATED=20050918
LICENSE[0]=MOZILLA
BUILD_API=2
+ KEYWORDS="mozilla mail"
SHORT="Mozilla Mail Client"
cat << EOF
The new mail client, based on mozilla source
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 88916ef..7db9c44 100755
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,8 +1,43 @@
-2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
- * DETAILS: security update to 1.0.8, SECURITY_PATCH=1, bug #10894
+2006-06-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: SECURITY UPDATE
+ http://www.mozilla.org/projects/security/known-vulnerabilities.html
+
+2006-04-26 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Added SECURITY_PATCH=1 (thanks Arwed)
+
+2006-04-25 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 1.5.0.2
+ Security update:
http://www.mozilla.org/projects/security/known-vulnerabilities.html#thunderbird1.5.0.2
includes fixes for:
+ MFSA 2006-28, MFSA 2006-27, MFSA 2006-26, MFSA 2006-25, MFSA 2006-24
+ MFSA 2006-22, MFSA 2006-21, MFSA 2006-20, MFSA 2006-08, MFSA 2006-07
+ MFSA 2006-06, MFSA 2006-05, MFSA 2006-04, MFSA 2006-02, MFSA 2006-01
+ Mozilla at least signed this tarball, re-adding SOURCE GPG check/URL
+ This security update can also fix security Bug #10894
+ * security_manager_makefile.diff,visibility.patch: Updated to 1.5.0.2
+ * PRE_BUILD: visibility.patch now uses -p1
+
+2006-03-21 David Kowis <dkowis AT shlrm.org>
+ * PRE_BUILD: moved the mozilla_remove_nspr function to PRE_BUILD from
BUILD
+ Added the application of the *visibility* patch makes it work under
gcc4
+ none the less
+
+2006-03-20 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: added sha512 SOURCE_HASH since the mozilla folks are
unresponsive
+ for a signed tarball
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS

2006-01-31 Eric Sandall <eric AT sandall.us>
- * DETAILS: Added UPSTREAM_KEY to SOURCE_GPGs
+ * DETAILS: Updated to 1.5
+ Updated Enigmail to 0.93.2
+ Added UPSTREAM_KEY to SOURCE_GPGs
+ * DEPENDS: Don't depend on freetype2
+ Use gtk+2 with xft, disabling freetype2
+ * PRE_BUILD, freetype.patch, gcc4.patch: Removed unused patches
+ * BUILD: Removed --enable-xft and --enable-freetype2
+ * INSTALL: Don't run non-existent ./regchrome
+ * security_manager_makefile.diff: Removed unused file

2005-11-25 Thomas Houssin <Thomas.Houssin AT sourcemage.org>
* DETAILS: fixed gpg checking for enigmail
diff --git a/mail/thunderbird/INSTALL b/mail/thunderbird/INSTALL
index 9a9f376..5cb06ef 100755
--- a/mail/thunderbird/INSTALL
+++ b/mail/thunderbird/INSTALL
@@ -13,7 +13,6 @@ cd ${INSTALL_ROOT}/usr/lib/thunderbird &
export LD_LIBRARY_PATH="$THUNDERBIRD_HOME" &&
export MOZILLA_FIVE_HOME="$THUNDERBIRD_HOME" &&
./regxpcom &&
-./regchrome &&
touch `find . -name *.rdf` &&

#
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index 533c60f..7169515 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -1,10 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < ${SCRIPT_DIRECTORY}/freetype.patch &&
+mozilla_remove_nspr_nss &&
+patch -p1 < $SCRIPT_DIRECTORY/visibility.patch &&

-if use_gcc ^4; then
- patch -p1 < $SCRIPT_DIRECTORY/gcc4.patch
-fi &&

if [ "$BUILD_ENIGMAIL" = "y" ]; then
cd $SOURCE_DIRECTORY/extensions &&
diff --git a/mail/thunderbird/freetype.patch b/mail/thunderbird/freetype.patch
deleted file mode 100644
index 0626165..0000000
--- a/mail/thunderbird/freetype.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-diff -urpN mozilla.orig/gfx/idl/nsIFreeType2.idl
mozilla/gfx/idl/nsIFreeType2.idl
---- mozilla.orig/gfx/idl/nsIFreeType2.idl 2004-11-07 12:29:17.209124512
-0800
-+++ mozilla/gfx/idl/nsIFreeType2.idl 2004-11-07 12:29:52.417771984 -0800
-@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
- 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 @@ interface nsIFreeType2 : nsISupports
-
- 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 @@ interface nsIFreeType2 : nsISupports
- 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 -urpN mozilla.orig/gfx/src/freetype/nsFreeType.cpp
mozilla/gfx/src/freetype/nsFreeType.cpp
---- mozilla.orig/gfx/src/freetype/nsFreeType.cpp 2004-11-07
12:29:18.239967800 -0800
-+++ mozilla/gfx/src/freetype/nsFreeType.cpp 2004-11-07 12:29:52.472763624
-0800
-@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
- {"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 @@ nsFreeType2::SetCharmap(FT_Face face, FT
- }
-
- 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 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
- }
-
- 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 @@ nsFreeType2::ManagerNew(FT_Library libra
- }
-
- 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 @@ nsFreeType2::SupportsExtFunc(PRBool *res
- }
-
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
- *aCache = mImageCache;
- return NS_OK;
-diff -urpN mozilla.orig/gfx/src/freetype/nsFreeType.h
mozilla/gfx/src/freetype/nsFreeType.h
---- mozilla.orig/gfx/src/freetype/nsFreeType.h 2004-11-07 12:29:18.239967800
-0800
-+++ mozilla/gfx/src/freetype/nsFreeType.h 2004-11-07 12:29:52.455766208
-0800
-@@ -104,13 +104,13 @@ typedef FT_Error (*FT_Outline_Decompose_
- 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 @@ protected:
- 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 @@ protected:
- PRLibrary *mSharedLib;
- FT_Library mFreeTypeLibrary;
- FTC_Manager mFTCacheManager;
-- FTC_Image_Cache mImageCache;
-+ FTC_ImageCache mImageCache;
-
- static nsHashtable *sFontFamilies;
- static nsHashtable *sRange1CharSetNames;
-diff -urpN mozilla.orig/gfx/src/ps/nsFontMetricsPS.cpp
mozilla/gfx/src/ps/nsFontMetricsPS.cpp
---- mozilla.orig/gfx/src/ps/nsFontMetricsPS.cpp 2004-11-07
12:29:18.681900616 -0800
-+++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2004-11-07 12:29:52.440768488
-0800
-@@ -1141,10 +1141,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
-
- 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 @@ nsFontPSFreeType::GetWidth(const PRUnich
- 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 @@ nsFontPSFreeType::getFTFace()
-
- 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 @@ void nsFT2Type8Generator::GeneratePSFont
- 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 -urpN mozilla.orig/gfx/src/ps/nsFontMetricsPS.h
mozilla/gfx/src/ps/nsFontMetricsPS.h
---- mozilla.orig/gfx/src/ps/nsFontMetricsPS.h 2004-11-07 12:29:18.681900616
-0800
-+++ mozilla/gfx/src/ps/nsFontMetricsPS.h 2004-11-07 12:29:52.475763168
-0800
-@@ -320,7 +320,7 @@ protected:
- 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 @@ public:
- protected:
- nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
- nsCOMPtr<nsIFreeType2> mFt2;
-- FTC_Image_Desc mImageDesc;
-+ FTC_ImageType mImageDesc;
- };
- #endif
-
-diff -urpN mozilla.orig/gfx/src/x11shared/nsFontFreeType.cpp
mozilla/gfx/src/x11shared/nsFontFreeType.cpp
---- mozilla.orig/gfx/src/x11shared/nsFontFreeType.cpp 2004-11-07
12:29:18.697898184 -0800
-+++ mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2004-11-07
12:29:52.505758608 -0800
-@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
- 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 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
- 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 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
- 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 @@ nsFreeTypeFont::doGetBoundingMetrics(con
- 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 @@ nsFreeTypeFont::GetWidth(const PRUnichar
- if (!face)
- return 0;
-
-- FTC_Image_Cache icache;
-+ FTC_ImageCache icache;
- mFt2->GetImageCache(&icache);
- if (!icache)
- return 0;
-@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
- 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 -urpN mozilla.orig/gfx/src/x11shared/nsFontFreeType.h
mozilla/gfx/src/x11shared/nsFontFreeType.h
---- mozilla.orig/gfx/src/x11shared/nsFontFreeType.h 2004-11-07
12:29:18.697898184 -0800
-+++ mozilla/gfx/src/x11shared/nsFontFreeType.h 2004-11-07 12:29:52.500759368
-0800
-@@ -110,7 +110,7 @@ protected:
- XImage *GetXImage(PRUint32 width, PRUint32 height);
- nsITrueTypeFontCatalogEntry *mFaceID;
- PRUint16 mPixelSize;
-- FTC_Image_Desc mImageDesc;
-+ FTC_ImageType mImageDesc;
- nsCOMPtr<nsIFreeType2> mFt2;
- };
-
diff --git a/mail/thunderbird/gcc4.patch b/mail/thunderbird/gcc4.patch
deleted file mode 100644
index 963a703..0000000
--- a/mail/thunderbird/gcc4.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- gfx/src/freetype/nsFreeType.cpp 7 Feb 2004 15:22:30 -0000 1.24
-+++ mozilla/gfx/src/freetype/nsFreeType.cpp 4 Mar 2005 19:59:53 -0000
-@@ -96,7 +96,7 @@
- // Define the FreeType2 functions we resolve at run time.
- // see the comment near nsFreeType2::DoneFace() for more info
- //
--#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
-+#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
- FtFuncList nsFreeType2::FtFuncs [] = {
- {"FT_Done_Face", NS_FT2_OFFSET(nsFT_Done_Face),
PR_TRUE},
- {"FT_Done_FreeType", NS_FT2_OFFSET(nsFT_Done_FreeType),
PR_TRUE},
---- netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 1 Sep 2004 23:31:03
-0000 1.7.20.1
-+++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 4 Mar 2005
19:59:57 -0000
-@@ -834,8 +834,8 @@
- void
- nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
- {
-- PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16;
-- PRUint16 value = PRUint32(param) & 0x0000FFFF;
-+ PRUint16 name = (NS_PTR_TO_INT32(param) & 0xFFFF0000) >> 16;
-+ PRUint16 value = NS_PTR_TO_INT32(param) & 0x0000FFFF;
-
- switch (name) {
- case MAX_CONNECTIONS:
---- security/nss/lib/pki1/oiddata.h 4 Jan 2002 05:22:07 -0000 1.1
-+++ mozilla/security/nss/lib/pki1/oiddata.h 4 Mar 2005 19:59:58 -0000
-@@ -43,9 +43,6 @@
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
-
--extern const NSSOID nss_builtin_oids[];
--extern const PRUint32 nss_builtin_oid_count;
--
- /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
- /*extern const PRUint32 nss_attribute_type_alias_count;*/
-
---- security/nss/lib/pki1/pki1.h 19 Jul 2001 20:40:42 -0000 1.2
-+++ mozilla/security/nss/lib/pki1/pki1.h 4 Mar 2005 19:59:59 -0000
-@@ -58,6 +58,8 @@
- /* fgmr 19990505 moved these here from oiddata.h */
- extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
- extern const PRUint32 nss_attribute_type_alias_count;
-+extern const NSSOID nss_builtin_oids[];
-+extern const PRUint32 nss_builtin_oid_count;
-
- /*
- * NSSOID
---- widget/src/gtk2/nsDragService.cpp 30 Oct 2003 01:48:41 -0000 1.5
-+++ mozilla/widget/src/gtk2/nsDragService.cpp 4 Mar 2005 20:00:01 -0000
-@@ -838,7 +838,7 @@
- (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
- listTarget->target = g_strdup(gMimeListType);
- listTarget->flags = 0;
-- listTarget->info = (guint)listAtom;
-+ listTarget->info = (guint)(NS_PTR_TO_INT32(listAtom));
- PR_LOG(sDragLm, PR_LOG_DEBUG,
- ("automatically adding target %s with id %ld\n",
- listTarget->target, listAtom));
-@@ -877,7 +877,7 @@
- (GtkTargetEntry
*)g_malloc(sizeof(GtkTargetEntry));
- listTarget->target = g_strdup(gTextUriListType);
- listTarget->flags = 0;
-- listTarget->info = (guint)listAtom;
-+ listTarget->info =
(guint)NS_PTR_TO_INT32(listAtom);
- PR_LOG(sDragLm, PR_LOG_DEBUG,
- ("automatically adding target %s with \
- id %ld\n", listTarget->target,
listAtom));
-@@ -914,7 +914,7 @@
- (GtkTargetEntry
*)g_malloc(sizeof(GtkTargetEntry));
- target->target = g_strdup(flavorStr);
- target->flags = 0;
-- target->info = (guint)atom;
-+ target->info = (guint)NS_PTR_TO_INT32(atom);
- PR_LOG(sDragLm, PR_LOG_DEBUG,
- ("adding target %s with id %ld\n",
- target->target, atom));
-@@ -931,7 +931,7 @@
- (GtkTargetEntry
*)g_malloc(sizeof(GtkTargetEntry));
- plainTarget->target = g_strdup(kTextMime);
- plainTarget->flags = 0;
-- plainTarget->info = (guint)plainAtom;
-+ plainTarget->info =
(guint)NS_PTR_TO_INT32(plainAtom);
- PR_LOG(sDragLm, PR_LOG_DEBUG,
- ("automatically adding target %s with \
- id %ld\n", plainTarget->target,
plainAtom));
-@@ -948,7 +948,7 @@
- (GtkTargetEntry
*)g_malloc(sizeof(GtkTargetEntry));
- urlTarget->target = g_strdup(gMozUrlType);
- urlTarget->flags = 0;
-- urlTarget->info = (guint)urlAtom;
-+ urlTarget->info =
(guint)NS_PTR_TO_INT32(urlAtom);
- PR_LOG(sDragLm, PR_LOG_DEBUG,
- ("automatically adding target %s with \
- id %ld\n", urlTarget->target, urlAtom));
diff --git a/mail/thunderbird/security_manager_makefile.diff
b/mail/thunderbird/security_manager_makefile.diff
index ba06ebb..afe1875 100644
--- a/mail/thunderbird/security_manager_makefile.diff
+++ b/mail/thunderbird/security_manager_makefile.diff
@@ -1,7 +1,7 @@
-diff -purN firefox-1.0.4/security/manager/Makefile.in
firefox/security/manager/Makefile.in
---- firefox-1.0.4/security/manager/Makefile.in 2005-03-28 19:56:36.000000000
-0500
-+++ firefox/security/manager/Makefile.in 2005-05-16 16:43:42.000000000
-0400
-@@ -30,35 +30,6 @@ include $(DEPTH)/config/autoconf.mk
+diff -Naur mozilla.orig/security/manager/Makefile.in
mozilla/security/manager/Makefile.in
+--- mozilla.orig/security/manager/Makefile.in 2006-04-25 13:40:14.858946488
-0700
++++ mozilla/security/manager/Makefile.in 2006-04-25 13:40:24.939414024
-0700
+@@ -46,35 +46,6 @@
MODULE = psm

PACKAGE_FILE = psm.pkg
@@ -37,7 +37,7 @@ diff -purN firefox-1.0.4/security/manage

# NSS makefiles are not safe for parallel execution.
DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
-@@ -127,19 +98,7 @@ SUBMAKEFILES = boot/Makefile ssl/Makefil
+@@ -147,19 +118,7 @@
include $(topsrcdir)/config/rules.mk

# Attempt to properly handle NSS' refusal to implement a dependency system
@@ -58,7 +58,7 @@ diff -purN firefox-1.0.4/security/manage

dependclean export packages chrome::
$(MAKE) -C boot $@
-@@ -150,48 +109,6 @@ endif
+@@ -171,48 +130,6 @@

libs::
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
@@ -106,8 +106,8 @@ diff -purN firefox-1.0.4/security/manage
-endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
- ifdef MOZ_XUL
-@@ -199,20 +116,6 @@ ifdef MOZ_XUL
+ $(MAKE) -C locales $@
+@@ -221,20 +138,6 @@
endif

install::
@@ -127,8 +127,8 @@ diff -purN firefox-1.0.4/security/manage
-endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
- ifdef MOZ_XUL
-@@ -226,11 +129,6 @@ ifdef MOZ_XUL
+ $(MAKE) -C locales $@
+@@ -250,11 +153,6 @@
$(MAKE) -C pki $@
endif
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
diff --git a/mail/thunderbird/visibility.patch
b/mail/thunderbird/visibility.patch
new file mode 100644
index 0000000..5b0b561
--- /dev/null
+++ b/mail/thunderbird/visibility.patch
@@ -0,0 +1,12 @@
+diff -Naur mozilla.orig/configure mozilla/configure
+--- mozilla.orig/configure 2006-04-25 13:40:12.593290920 -0700
++++ mozilla/configure 2006-04-25 13:41:41.698744832 -0700
+@@ -7650,7 +7650,7 @@
+ if ${CC-cc} -Werror -S conftest.c -o conftest.s
>/dev/null 2>&1; then
+ if grep '\.hidden.*foo_hidden' conftest.s
>/dev/null; then
+ if ! grep '\.hidden.*foo_default' conftest.s >
/dev/null; then
+- ac_cv_visibility_pragma=yes
++ ac_cv_visibility_pragma=no
+ fi
+ fi
+ fi



  • [SM-Commit] GIT changes to stable-rc-0.4 grimoire by Arwed v. Merkatz (0717c2640f7138b43f26bd72e44665bcc379b8e1), Arwed v. Merkatz, 06/03/2006

Archive powered by MHonArc 2.6.24.

Top of Page