diff --git a/package/x11/firefox/MOZ_PLUGIN_PATH.patch b/package/x11/firefox/MOZ_PLUGIN_PATH.patch deleted file mode 100644 index 92b1003b7..000000000 --- a/package/x11/firefox/MOZ_PLUGIN_PATH.patch +++ /dev/null @@ -1,35 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../firefox/MOZ_PLUGIN_PATH.patch -# Copyright (C) 2004 - 2005 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- ---- ./xpfe/bootstrap/mozilla.in.vanilla 2005-09-21 12:45:56.000000000 +0200 -+++ ./xpfe/bootstrap/mozilla.in 2005-09-21 12:48:39.000000000 +0200 -@@ -119,6 +119,17 @@ - fi - fi - -+# -+## Make sure that we set the plugin path for backwards compatibility -+## -+if [ "$MOZ_PLUGIN_PATH" ] -+then -+ MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:/usr/lib/mozilla/plugins -+else -+ MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins -+fi -+export MOZ_PLUGIN_PATH -+ - script_args="" - moreargs="" - debugging=0 diff --git a/package/x11/firefox/firefox.conf b/package/x11/firefox/firefox.conf index cc478e03c..1d63c7d39 100644 --- a/package/x11/firefox/firefox.conf +++ b/package/x11/firefox/firefox.conf @@ -48,7 +48,7 @@ mk_add_options MOZ_PHOENIX=1 ac_add_options --disable-mailnews ac_add_options --disable-composer -ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs,negotiateauth +ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs ac_add_options --enable-mathml ac_add_options --enable-crypto ac_add_options --enable-module=psm diff --git a/package/x11/firefox/firefox.desc b/package/x11/firefox/firefox.desc index 7dbbe1c93..09794de79 100644 --- a/package/x11/firefox/firefox.desc +++ b/package/x11/firefox/firefox.desc @@ -36,8 +36,8 @@ [L] MPL [S] Beta -[V] 1.0.7 +[V] 1.5 [P] X -?---5---9 209.500 -[D] 3837259835 firefox-1.0.7-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.7/source/ +[D] 260379158 firefox-1.5-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.5/source/ diff --git a/package/x11/firefox/freetype.patch b/package/x11/firefox/freetype.patch deleted file mode 100644 index ffbf686f0..000000000 --- a/package/x11/firefox/freetype.patch +++ /dev/null @@ -1,329 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../firefox/freetype.patch -# Copyright (C) 2004 - 2005 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- -diff -Naur mozilla_orig/gfx/idl/nsIFreeType2.idl mozilla/gfx/idl/nsIFreeType2.idl ---- mozilla_orig/gfx/idl/nsIFreeType2.idl 2004-04-16 03:09:33.000000000 +0200 -+++ mozilla/gfx/idl/nsIFreeType2.idl 2005-09-10 11:45:04.739957520 +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 -Naur mozilla_orig/gfx/src/freetype/nsFreeType.cpp mozilla/gfx/src/freetype/nsFreeType.cpp ---- mozilla_orig/gfx/src/freetype/nsFreeType.cpp 2004-02-07 16:22:30.000000000 +0100 -+++ mozilla/gfx/src/freetype/nsFreeType.cpp 2005-09-10 11:45:04.741957216 +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_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-04-16 23:31:42.000000000 +0200 -+++ mozilla/gfx/src/freetype/nsFreeType.h 2005-09-10 11:45:04.744956760 +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 -Naur mozilla_orig/gfx/src/ps/nsFontMetricsPS.cpp mozilla/gfx/src/ps/nsFontMetricsPS.cpp ---- mozilla_orig/gfx/src/ps/nsFontMetricsPS.cpp 2004-02-05 02:57:05.000000000 +0100 -+++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2005-09-10 11:45:04.747956304 +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 = (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 2003-04-22 18:25:09.000000000 +0200 -+++ mozilla/gfx/src/ps/nsFontMetricsPS.h 2005-09-10 11:45:04.748956152 +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 -Naur mozilla_orig/gfx/src/x11shared/nsFontFreeType.cpp mozilla/gfx/src/x11shared/nsFontFreeType.cpp ---- mozilla_orig/gfx/src/x11shared/nsFontFreeType.cpp 2003-12-25 09:24:52.000000000 +0100 -+++ mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2005-09-10 11:45:04.749956000 +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 -Naur mozilla_orig/gfx/src/x11shared/nsFontFreeType.h mozilla/gfx/src/x11shared/nsFontFreeType.h ---- mozilla_orig/gfx/src/x11shared/nsFontFreeType.h 2003-04-22 18:25:13.000000000 +0200 -+++ mozilla/gfx/src/x11shared/nsFontFreeType.h 2005-09-10 11:45:04.750955848 +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/package/x11/firefox/gcc-4.0.patch b/package/x11/firefox/gcc-4.0.patch deleted file mode 100644 index 1308f39d6..000000000 --- a/package/x11/firefox/gcc-4.0.patch +++ /dev/null @@ -1,146 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../firefox/gcc-4.0.patch -# Copyright (C) 2004 - 2005 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -diff -Naur mozilla_orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h ---- mozilla_orig/security/nss/lib/pki1/oiddata.h 2002-01-04 06:22:07.000000000 +0100 -+++ mozilla/security/nss/lib/pki1/oiddata.h 2005-09-10 13:12:13.984991440 +0200 -@@ -43,8 +43,8 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -+/*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;*/ -diff -Naur mozilla_orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl ---- mozilla_orig/security/nss/lib/pki1/oidgen.perl 2001-11-08 01:15:25.000000000 +0100 -+++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-09-10 13:13:26.613950160 +0200 -@@ -233,9 +233,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;*/ - -diff -Naur mozilla_orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h ---- mozilla_orig/security/nss/lib/pki1/pki1.h 2001-07-19 22:40:42.000000000 +0200 -+++ mozilla/security/nss/lib/pki1/pki1.h 2005-09-10 13:15:07.648590560 +0200 -@@ -56,6 +56,8 @@ - PR_BEGIN_EXTERN_C - - /* fgmr 19990505 moved these here from oiddata.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; - - -Imported from Fedora Core. - - - Rene Rebe - -Index: netwerk/protocol/http/src/nsHttpConnectionMgr.cpp -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp,v -retrieving revision 1.7.20.1 -diff -u -r1.7.20.1 nsHttpConnectionMgr.cpp ---- ./netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 1 Sep 2004 23:31:03 -0000 1.7.20.1 -+++ ./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: -Index: widget/src/gtk2/nsDragService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v -retrieving revision 1.5 -diff -u -r1.5 nsDragService.cpp ---- ./widget/src/gtk2/nsDragService.cpp 30 Oct 2003 01:48:41 -0000 1.5 -+++ ./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)); - -And last, but not least, a fix for 64bit systems. - - - Rene Rebe - ---- mozilla/gfx/src/freetype/nsFreeType.cpp.vanilla 2005-09-11 13:44:37.000000000 +0200 -+++ mozilla/gfx/src/freetype/nsFreeType.cpp 2005-09-11 13:38:49.000000000 +0200 -@@ -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) (size_t)&((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}, diff --git a/package/x11/firefox/hotfix-binutils-gcc.patch b/package/x11/firefox/hotfix-binutils-gcc.patch deleted file mode 100644 index ea3b747d4..000000000 --- a/package/x11/firefox/hotfix-binutils-gcc.patch +++ /dev/null @@ -1,73 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/x11/firefox/hotfix-binutils-gcc.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -Hotfix needed for new binutils (bug is in gcc) -(see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=16625) - ---- ./content/html/style/src/nsROCSSPrimitiveValue.h.orig 2004-08-13 11:50:44.000000000 +0200 -+++ ./content/html/style/src/nsROCSSPrimitiveValue.h 2004-08-13 11:57:20.000000000 +0200 -@@ -191,27 +191,37 @@ - - void Reset(void) - { -- switch (mType) { -- case CSS_IDENT: -+ // --- see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=16625 --- -+ // -+ // we can't make a switch statement here because the compiler will create a -+ // jump-table in .ro_data for it and cause a link error such as: -+ // -+ // # .L1035' referenced in section `.rodata' of -+ // # ../../dist/lib/libgkconhtmlstyle_s.a(nsROCSSPrimitiveValue.o): defined in -+ // # discarded section `.gnu.linkonce.t._ZN21nsROCSSPrimitiveValue5ResetEv' of -+ // # ../../dist/lib/libgkconhtmlstyle_s.a(nsROCSSPrimitiveValue.o) -+ // -+ // - clifford (2004-08-13) -+ // -+ if (mType == CSS_IDENT) { - NS_ASSERTION(mValue.mAtom, "Null atom should never happen"); - NS_RELEASE(mValue.mAtom); -- break; -- case CSS_STRING: -+ } -+ if (mType == CSS_STRING) { - NS_ASSERTION(mValue.mString, "Null string should never happen"); - nsMemory::Free(mValue.mString); - mValue.mString = nsnull; -- break; -- case CSS_URI: -+ } -+ if (mType == CSS_URI) { - NS_IF_RELEASE(mValue.mURI); -- break; -- case CSS_RECT: -+ } -+ if (mType == CSS_RECT) { - NS_ASSERTION(mValue.mRect, "Null Rect should never happen"); - NS_RELEASE(mValue.mRect); -- break; -- case CSS_RGBCOLOR: -+ } -+ if (mType == CSS_RGBCOLOR) { - NS_ASSERTION(mValue.mColor, "Null RGBColor should never happen"); - NS_RELEASE(mValue.mColor); -- break; - } - } -