diff options
author | Michael Johnson <ahze@FreeBSD.org> | 2005-11-30 00:52:24 +0000 |
---|---|---|
committer | Michael Johnson <ahze@FreeBSD.org> | 2005-11-30 00:52:24 +0000 |
commit | 2769f0eabcca687c1930f449b1136e79e1ce4bca (patch) | |
tree | 4dfacb46d2c8ba9f6177f06da87686f3a8ce058b /deskutils | |
parent | 58cfbc4b9735a4c19a93cc8055c120b53fb25e15 (diff) | |
download | ports-2769f0eabcca687c1930f449b1136e79e1ce4bca.tar.gz ports-2769f0eabcca687c1930f449b1136e79e1ce4bca.zip |
Notes
Diffstat (limited to 'deskutils')
70 files changed, 4999 insertions, 0 deletions
diff --git a/deskutils/Makefile b/deskutils/Makefile index 63ee104cb48d..b2aa0e0233f3 100644 --- a/deskutils/Makefile +++ b/deskutils/Makefile @@ -132,6 +132,7 @@ SUBDIR += sliderule SUBDIR += splashsetter SUBDIR += sugarcrm + SUBDIR += sunbird SUBDIR += superkaramba SUBDIR += taskjuggler SUBDIR += teapot diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile new file mode 100644 index 000000000000..737666f93e32 --- /dev/null +++ b/deskutils/lightning-thunderbird/Makefile @@ -0,0 +1,67 @@ +# New ports collection makefile for: sunbird +# Date created: 2005-02-26 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/deskutils/sunbird/Makefile,v 1.13 2005/11/23 04:54:57 ahze Exp $ +# + +PORTNAME= sunbird +PORTVERSION= 0.3a1 +CATEGORIES= deskutils +MASTER_SITES= ${MASTER_SITE_MOZILLA} +MASTER_SITE_SUBDIR= sunbird/new-directory/releases/${DISTVERSION}/source +DISTNAME= ${PORTNAME}-${DISTVERSION}-source + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Redesign of the Mozilla Calendar with XUL interface + +USE_GCC= 3.4+ +ALL_TARGET= default +CONFIGURE_ENV= LOCALBASE=${LOCALBASE} +HAS_CONFIGURE= yes +USE_GMAKE= yes +USE_BZIP2= yes +WANT_GNOME= yes +USE_X_PREFIX= yes +SUNBIRD= ${PORTNAME} +SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm +SUNBIRD_ICON= ${PORTNAME}.xpm + +MOZ_PROTOCOLS= about,http,ftp,file,jar,res +MOZ_OPTIONS= --enable-application=calendar \ + --enable-plaintext-editor-only \ + --disable-plugins --disable-cookies +MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar + +.include <bsd.port.pre.mk> +.include "${.CURDIR}/../../www/mozilla/Makefile.common" + +.if ${PERL_LEVEL} < 500600 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl +.endif + +post-extract:: + @${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \ + ${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop + +post-patch: +.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ + embedding/minimo + @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ + /dom.disable_window_open_feature.toolbar/s/false/true/' \ + ${WRKSRC}/${ii}/all.js +.endfor + +pre-install: + ${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST} + ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} + ${ECHO_CMD} '@unexec ${RMDIR} %D/share/pixmaps 2>/dev/null || ${TRUE}' >> ${PLIST} + +do-install: + ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKDIR}/sunbird.desktop ${PREFIX}/share/applications + ${LN} -sf ${SUNBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${SUNBIRD_ICON} + +.include <bsd.port.post.mk> diff --git a/deskutils/lightning-thunderbird/distinfo b/deskutils/lightning-thunderbird/distinfo new file mode 100644 index 000000000000..9a9b0708a6aa --- /dev/null +++ b/deskutils/lightning-thunderbird/distinfo @@ -0,0 +1,3 @@ +MD5 (sunbird-0.3a1-source.tar.bz2) = f449ed2feb6acf4b9d1a5a2571f6e9c3 +SHA256 (sunbird-0.3a1-source.tar.bz2) = 7d3e3a09217feccc53a699385e0eff138002bff80d57c63cb25ea0cd9465bcda +SIZE (sunbird-0.3a1-source.tar.bz2) = 34623798 diff --git a/deskutils/lightning-thunderbird/files/extra-patch-config_make-jars.pl b/deskutils/lightning-thunderbird/files/extra-patch-config_make-jars.pl new file mode 100644 index 000000000000..a558607ca459 --- /dev/null +++ b/deskutils/lightning-thunderbird/files/extra-patch-config_make-jars.pl @@ -0,0 +1,10 @@ +--- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 ++++ config/make-jars.pl Wed Oct 13 16:17:07 2004 +@@ -40,6 +40,7 @@ + last if ($arg eq "--"); + } + my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); ++splice @ARGV, $ddindex, $#ARGV; + + getopts("d:s:t:f:avlD:o:p:xz:"); + diff --git a/deskutils/lightning-thunderbird/files/patch-Makefile.in b/deskutils/lightning-thunderbird/files/patch-Makefile.in new file mode 100644 index 000000000000..b09d564958c6 --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-Makefile.in @@ -0,0 +1,22 @@ +--- Makefile.in.orig Thu Oct 21 19:25:55 2004 ++++ Makefile.in Thu Oct 21 19:26:46 2004 +@@ -80,8 +80,7 @@ + $(tier_1_dirs) \ + $(tier_2_dirs) \ + $(tier_9_dirs) \ +- $(tier_50_dirs) \ +- $(NULL) ++ $(tier_50_dirs) + + ifdef GC_LEAK_DETECTOR + DIRS += gc/boehm +@@ -100,7 +99,8 @@ + DIRS += $(tier_98_dirs) + endif + +-DIRS += $(tier_99_dirs) ++DIRS += $(tier_99_dirs) \ ++ $(NULL) + + # + # tier 0 - base build config dirs diff --git a/deskutils/lightning-thunderbird/files/patch-bugzilla149334 b/deskutils/lightning-thunderbird/files/patch-bugzilla149334 new file mode 100644 index 000000000000..4bdb765228eb --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-bugzilla149334 @@ -0,0 +1,328 @@ +Index: gfx/idl/nsIFreeType2.idl +=================================================================== +RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v +retrieving revision 1.10 +diff -u -3 -p -r1.10 nsIFreeType2.idl +--- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 ++++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 +@@ -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); +Index: gfx/src/freetype/nsFreeType.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v +retrieving revision 1.25 +diff -u -3 -p -r1.25 nsFreeType.cpp +--- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 ++++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 +@@ -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; +Index: gfx/src/freetype/nsFreeType.h +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v +retrieving revision 1.17 +diff -u -3 -p -r1.17 nsFreeType.h +--- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 ++++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 +@@ -120,13 +120,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) +@@ -181,7 +181,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; +@@ -229,7 +229,7 @@ protected: + PRLibrary *mSharedLib; + FT_Library mFreeTypeLibrary; + FTC_Manager mFTCacheManager; +- FTC_Image_Cache mImageCache; ++ FTC_ImageCache mImageCache; + + static nsHashtable *sFontFamilies; + static nsHashtable *sRange1CharSetNames; +Index: gfx/src/ps/nsFontMetricsPS.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v +retrieving revision 1.43 +diff -u -3 -p -r1.43 nsFontMetricsPS.cpp +--- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 ++++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 +@@ -1140,10 +1140,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); +@@ -1189,7 +1189,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"); +@@ -1227,8 +1227,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; +@@ -1621,16 +1621,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; + +Index: gfx/src/x11shared/nsFontFreeType.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v +retrieving revision 1.14 +diff -u -3 -p -r1.14 nsFontFreeType.cpp +--- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 ++++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 +@@ -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; +Index: gfx/src/x11shared/nsFontFreeType.h +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v +retrieving revision 1.10 +diff -u -3 -p -r1.10 nsFontFreeType.h +--- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 ++++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 +@@ -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; + }; + +--- gfx/src/ps/nsFontMetricsPS.h.orig Fri Mar 4 15:41:55 2005 ++++ gfx/src/ps/nsFontMetricsPS.h Thu Mar 17 05:16:50 2005 +@@ -492,7 +492,7 @@ + protected: + nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; + nsCOMPtr<nsIFreeType2> mFt2; +- FTC_Image_Desc mImageDesc; ++ FTC_ImageType mImageDesc; + }; + #endif // MOZ_ENABLE_FREETYPE2 + #endif // MOZ_ENABLE_XFT diff --git a/deskutils/lightning-thunderbird/files/patch-calendar_libical_src_libical_icalrecur.c b/deskutils/lightning-thunderbird/files/patch-calendar_libical_src_libical_icalrecur.c new file mode 100644 index 000000000000..17812d705942 --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-calendar_libical_src_libical_icalrecur.c @@ -0,0 +1,13 @@ +--- calendar/libical/src/libical/icalrecur.c.orig Thu Mar 17 07:13:54 2005 ++++ calendar/libical/src/libical/icalrecur.c Thu Mar 17 07:14:30 2005 +@@ -134,9 +134,7 @@ + #include "config.h" + #endif + +-#ifdef HAVE_STDINT_H +-#include <stdint.h> +-#endif ++#include <inttypes.h> + + #ifndef HAVE_INTPTR_T + #ifdef WIN32 diff --git a/deskutils/lightning-thunderbird/files/patch-config-mkdepend-imakemdep.h b/deskutils/lightning-thunderbird/files/patch-config-mkdepend-imakemdep.h new file mode 100644 index 000000000000..b688e664475d --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-config-mkdepend-imakemdep.h @@ -0,0 +1,10 @@ +--- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 ++++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 +@@ -278,4 +278,7 @@ + "-D__i386__", + # endif ++# if defined(__amd64__) || defined(__x86_64__) ++ "-D__amd64__ -D__x86_64__", ++# endif + # ifdef __GNUC__ + "-traditional", diff --git a/deskutils/lightning-thunderbird/files/patch-config_autoconf.mk.in b/deskutils/lightning-thunderbird/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..c4fa0b516d1d --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 ++++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 +@@ -31,13 +31,13 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/%%MOZILLA%% + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ + idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++mozappdir = $(libdir)/%%MOZILLA%% + mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) + mrelibdir = $(mredir)/lib + diff --git a/deskutils/lightning-thunderbird/files/patch-config_mkdepend_Makefile.in b/deskutils/lightning-thunderbird/files/patch-config_mkdepend_Makefile.in new file mode 100644 index 000000000000..8da7e48ab0df --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-config_mkdepend_Makefile.in @@ -0,0 +1,10 @@ +--- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 ++++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 +@@ -73,6 +73,7 @@ + include $(topsrcdir)/config/rules.mk + + HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" ++HOST_CFLAGS += $(XCFLAGS) + + ifdef GNU_CC + _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/deskutils/lightning-thunderbird/files/patch-config_rules.mk b/deskutils/lightning-thunderbird/files/patch-config_rules.mk new file mode 100644 index 000000000000..16cb6ae1192e --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-config_rules.mk @@ -0,0 +1,14 @@ +--- config/rules.mk.orig Sun May 18 16:10:18 2003 ++++ config/rules.mk Sun Jul 20 18:07:26 2003 +@@ -448,7 +448,11 @@ + + ifeq ($(OS_ARCH),FreeBSD) + ifdef IS_COMPONENT ++ifneq (,$(filter alpha ia64,$(OS_TEST))) ++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc ++else + EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic ++endif + endif + endif + diff --git a/deskutils/lightning-thunderbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/deskutils/lightning-thunderbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -0,0 +1,12 @@ +--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004 ++++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004 +@@ -65,7 +65,8 @@ + + #include <gdk/gdkx.h> + #include <freetype/tttables.h> +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + + #define FORCE_PR_LOG + #include "prlog.h" diff --git a/deskutils/lightning-thunderbird/files/patch-libm b/deskutils/lightning-thunderbird/files/patch-libm new file mode 100644 index 000000000000..7de64b2a5068 --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-libm @@ -0,0 +1,25 @@ +--- js/src/Makefile.in Thu Aug 4 22:26:52 2005 ++++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 +@@ -148,5 +148,4 @@ + endif + +-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) + JSMATH_PRELINK = jsmathtemp.o + JS_SAFE_ARENA = 1 +@@ -320,7 +319,4 @@ + endif + @$(RM) -f $(JSMATH_PRELINK) +-else +-# Create dependency so we build fdlibm +-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in + endif + +--- js/Makefile.in Sun Mar 23 14:36:00 2003 ++++ js/Makefile.in Thu Aug 4 23:08:06 2005 +@@ -46,5 +46,5 @@ + # + +-DIRS = src/fdlibm src ++DIRS = src + + include $(topsrcdir)/config/rules.mk diff --git a/deskutils/lightning-thunderbird/files/patch-security_coreconf_FreeBSD.mk b/deskutils/lightning-thunderbird/files/patch-security_coreconf_FreeBSD.mk new file mode 100644 index 000000000000..5c76b5af5ebf --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-security_coreconf_FreeBSD.mk @@ -0,0 +1,37 @@ +--- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 ++++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 +@@ -35,16 +35,18 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + +-DEFAULT_COMPILER = gcc +-CC = gcc +-CCC = g++ ++CCC = ${CXX} + RANLIB = ranlib + + ifeq ($(OS_TEST),alpha) + CPU_ARCH = alpha + else ++ifeq ($(OS_TEST),amd64) ++CPU_ARCH = amd64 ++else + CPU_ARCH = x86 + endif ++endif + + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + +@@ -71,7 +73,11 @@ + DLL_SUFFIX = so.1.0 + endif + +-MKSHLIB = $(CC) $(DSO_LDOPTS) ++ifneq (,$(filter alpha ia64,$(OS_TEST))) ++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++else ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ++endif + ifdef MAPFILE + # Add LD options to restrict exported symbols to those in the map file + endif diff --git a/deskutils/lightning-thunderbird/files/patch-sysnss b/deskutils/lightning-thunderbird/files/patch-sysnss new file mode 100644 index 000000000000..a9154ce9a292 --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-sysnss @@ -0,0 +1,156 @@ +--- Makefile.in Tue Sep 14 16:59:40 2004 ++++ Makefile.in Tue Aug 2 08:26:55 2005 +@@ -102,6 +102,4 @@ + # tier 1 - 3rd party individual libraries + # +-tier_1_dirs += dbm +- + ifndef MOZ_NATIVE_JPEG + tier_1_dirs += jpeg +--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 ++++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 +@@ -117,5 +117,5 @@ + # Use local includes because they are inserted before INCLUDES + # so that Mozilla's nss.h is used, not glibc's +-LOCAL_INCLUDES += -I$(DIST)/public/nss \ ++LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ + $(NULL) + +--- config/config.mk Tue Oct 12 00:11:11 2004 ++++ config/config.mk Tue Aug 2 09:19:18 2005 +@@ -170,5 +170,4 @@ + NSS_LIBS = \ + $(LIBS_DIR) \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + -lsmime3 \ + -lssl3 \ +@@ -189,11 +188,5 @@ + endif + +-NSS_DEP_LIBS = \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ +- $(NULL) ++NSS_DEP_LIBS = + + MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) +--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 ++++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 +@@ -88,4 +88,8 @@ + } + ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <errno.h> ++ + #ifdef PR_LOGGING + PRLogModuleInfo* gPIPNSSLog = nsnull; +@@ -406,4 +410,5 @@ + const char *possible_ckbi_locations[] = { + NS_GRE_DIR, ++ NS_UNIX_LIB_DIR, + NS_XPCOM_CURRENT_PROCESS_DIR + }; +@@ -419,5 +424,5 @@ + } + +- char *fullModuleName = nsnull; ++ char *fullModuleName; + #ifdef XP_MAC + nsCAutoString nativePath; +@@ -431,4 +436,12 @@ + fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); + #endif ++ if (fullModuleName == nsnull) ++ continue; ++ struct stat sb; ++ if (stat(fullModuleName, &sb)) { ++ if (errno != ENOENT) ++ perror(fullModuleName); ++ continue; ++ } + /* If a module exists with the same name, delete it. */ + NS_ConvertUCS2toUTF8 modNameUTF8(modName); +--- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005 ++++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005 +@@ -52,18 +52,9 @@ + SSL3_LIB \ + SOFTOKEN3_LIB \ + SOFTOKEN3_CHK \ +- LOADABLE_ROOT_MODULE \ + HAVE_FREEBL_MODULES \ + $(NULL) + +-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) +- +-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) +-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) +-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) +-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) +-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk +- + ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) + ifeq (,$(filter i86pc ia64,$(OS_TEST))) + ifndef HAVE_64BIT_OS +@@ -151,11 +142,6 @@ + + .nss.cleaned: .nss.checkout + $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean +-ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +-endif + touch $@ + + .nss.checkout: +@@ -176,10 +162,10 @@ + else + cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) + endif +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) ++# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) + ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) ++# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) ++# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) + endif + $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin + ifndef SKIP_CHK +@@ -203,20 +189,6 @@ + endif + + install:: +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) +-ifdef HAVE_FREEBL_MODULES +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) +-endif + $(MAKE) -C boot $@ + $(MAKE) -C ssl $@ + $(MAKE) -C locales $@ +@@ -232,11 +204,6 @@ + $(MAKE) -C pki $@ + endif + $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean +-ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +-endif + + echo-requires-recursive:: + $(MAKE) -C boot $@ diff --git a/deskutils/lightning-thunderbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/deskutils/lightning-thunderbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp new file mode 100644 index 000000000000..7f8e55f536df --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp @@ -0,0 +1,29 @@ +--- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 ++++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 +@@ -143,7 +143,7 @@ + PR_END_MACRO + + // Attempt to open libgconf +- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); ++ gconfLib = PR_LoadLibrary("libgconf-2.so"); + ENSURE_LIB(gconfLib); + + GET_LIB_FUNCTION(gconf, gconf_client_get_default); +@@ -151,7 +151,7 @@ + GET_LIB_FUNCTION(gconf, gconf_client_get_bool); + + // Attempt to open libgnome +- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); ++ gnomeLib = PR_LoadLibrary("libgnome-2.so"); + ENSURE_LIB(gnomeLib); + + GET_LIB_FUNCTION(gnome, gnome_url_show); +@@ -160,7 +160,7 @@ + GET_LIB_FUNCTION(gnome, gnome_program_get); + + // Attempt to open libgnomevfs +- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); ++ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); + ENSURE_LIB(vfsLib); + + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc new file mode 100644 index 000000000000..ebe5474ca275 --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc @@ -0,0 +1,11 @@ +--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 ++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) + NS_IMETHOD Stub3(); + NS_IMETHOD Stub4(); + NS_IMETHOD Stub5(); diff --git a/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in new file mode 100644 index 000000000000..dbdc47b6f8e4 --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in @@ -0,0 +1,56 @@ +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 +@@ -49,6 +49,9 @@ + ifeq (86,$(findstring 86,$(OS_TEST))) + CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp + endif ++ifeq (amd64,$(OS_TEST)) ++CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp ++endif + endif + # + # New code for Linux, et. al., with gcc +@@ -59,8 +62,8 @@ + CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp + endif + endif +-# IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++# IA64 Linux & FreeBSD ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -106,9 +109,15 @@ + ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s + endif + # ++# FreeBSD/Alpha ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp ++endif ++# + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -294,6 +303,15 @@ + ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) + CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp + ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s ++endif ++# ++# FreeBSD/SPARC64 ++# ++ifeq ($(OS_ARCH),FreeBSD) ++ifneq (,$(findstring sparc,$(OS_TEST))) ++CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s ++endif + endif + # + # Solaris/SPARC diff --git a/deskutils/lightning-thunderbird/files/patch-xptcall-alpha b/deskutils/lightning-thunderbird/files/patch-xptcall-alpha new file mode 100644 index 000000000000..29631a98e61e --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-xptcall-alpha @@ -0,0 +1,459 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 +@@ -0,0 +1,184 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Netscape Public License ++ * Version 1.1 (the "License"); you may not use this file except in ++ * compliance with the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/NPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1998 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the NPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the NPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++/* Platform specific code to invoke XPCOM methods on native objects */ ++ ++/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ ++ ++#include "xptcprivate.h" ++ ++/* Prototype specifies unmangled function name and disables unused warning */ ++static void ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) ++__asm__("invoke_copy_to_stack") __attribute__((unused)); ++ ++static void ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) ++{ ++ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer ++ ++ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) ++ { ++ if(s->IsPtrData()) ++ { ++ *d = (PRUint64)s->ptr; ++ continue; ++ } ++ switch(s->type) ++ { ++ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; ++ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; ++ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; ++ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; ++ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; ++ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; ++ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; ++ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; ++ case nsXPTType::T_FLOAT : ++ if(i < NUM_ARG_REGS) ++ { ++ // convert floats to doubles if they are to be passed ++ // via registers so we can just deal with doubles later ++ union { PRUint64 u64; double d; } t; ++ t.d = (double)s->val.f; ++ *d = t.u64; ++ } ++ else ++ // otherwise copy to stack normally ++ *d = (PRUint64)s->val.u32; ++ break; ++ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; ++ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; ++ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; ++ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; ++ default: ++ // all the others are plain pointer types ++ *d = (PRUint64)s->val.p; ++ break; ++ } ++ } ++} ++ ++/* ++ * XPTC_PUBLIC_API(nsresult) ++ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, ++ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) ++ */ ++__asm__( ++ "#### XPTC_InvokeByIndex ####\n" ++".text\n\t" ++ ".align 5\n\t" ++ ".globl XPTC_InvokeByIndex\n\t" ++ ".ent XPTC_InvokeByIndex\n" ++"XPTC_InvokeByIndex:\n\t" ++ ".frame $15,32,$26,0\n\t" ++ ".mask 0x4008000,-32\n\t" ++ "ldgp $29,0($27)\n" ++"$XPTC_InvokeByIndex..ng:\n\t" ++ "subq $30,32,$30\n\t" ++ "stq $26,0($30)\n\t" ++ "stq $15,8($30)\n\t" ++ "bis $30,$30,$15\n\t" ++ ".prologue 1\n\t" ++ ++ /* ++ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 ++ * parameters. (+1 for "this" pointer) Room for at least 6 parameters ++ * is required for storage of those passed via registers. ++ */ ++ ++ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ ++ "cmplt $2,$18,$1\n\t" ++ "cmovne $1,$18,$2\n\t" ++ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ ++ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ ++ "subq $30,$1,$30\n\t" ++ ++ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ ++ "stq $17,16($15)\n\t" /* save "methodIndex" */ ++ ++ "addq $30,8,$16\n\t" /* pass stack pointer */ ++ "bis $18,$18,$17\n\t" /* pass "paramCount" */ ++ "bis $19,$19,$18\n\t" /* pass "params" */ ++ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ ++ ++ /* ++ * Copy the first 6 parameters to registers and remove from stack frame. ++ * Both the integer and floating point registers are set for each parameter ++ * except the first which is the "this" pointer. (integer only) ++ * The floating point registers are all set as doubles since the ++ * invoke_copy_to_stack function should have converted the floats. ++ */ ++ "ldq $16,0($30)\n\t" /* integer registers */ ++ "ldq $17,8($30)\n\t" ++ "ldq $18,16($30)\n\t" ++ "ldq $19,24($30)\n\t" ++ "ldq $20,32($30)\n\t" ++ "ldq $21,40($30)\n\t" ++ "ldt $f17,8($30)\n\t" /* floating point registers */ ++ "ldt $f18,16($30)\n\t" ++ "ldt $f19,24($30)\n\t" ++ "ldt $f20,32($30)\n\t" ++ "ldt $f21,40($30)\n\t" ++ ++ "addq $30,48,$30\n\t" /* remove params from stack */ ++ ++ /* ++ * Call the virtual function with the constructed stack frame. ++ */ ++ "bis $16,$16,$1\n\t" /* load "this" */ ++ "ldq $2,16($15)\n\t" /* load "methodIndex" */ ++ "ldq $1,0($1)\n\t" /* load vtable */ ++#if 0 ++ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ ++#else ++ "mulq $2, 8, $2\n\t" ++ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ ++#endif ++ "addq $1,$2,$1\n\t" ++ "ldq $27,0($1)\n\t" /* load address of function */ ++ "jsr $26,($27),0\n\t" /* call virtual function */ ++ "ldgp $29,0($26)\n\t" ++ ++ "bis $15,$15,$30\n\t" ++ "ldq $26,0($30)\n\t" ++ "ldq $15,8($30)\n\t" ++ "addq $30,32,$30\n\t" ++ "ret $31,($26),1\n\t" ++ ".end XPTC_InvokeByIndex" ++ ); ++ +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 +@@ -0,0 +1,269 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Netscape Public License ++ * Version 1.1 (the "License"); you may not use this file except in ++ * compliance with the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/NPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1999 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the NPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the NPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++/* Implement shared vtbl methods. */ ++ ++/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ ++ ++#include <sys/types.h> ++#include <machine/cpu.h> ++#include "xptcprivate.h" ++ ++/* Prototype specifies unmangled function name and disables unused warning */ ++static nsresult ++PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) ++__asm__("PrepareAndDispatch") __attribute__((unused)); ++ ++static nsresult ++PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) ++{ ++ const PRUint8 PARAM_BUFFER_COUNT = 16; ++ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer ++ ++ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; ++ nsXPTCMiniVariant* dispatchParams = NULL; ++ nsIInterfaceInfo* iface_info = NULL; ++ const nsXPTMethodInfo* info; ++ PRUint8 paramCount; ++ PRUint8 i; ++ nsresult result = NS_ERROR_FAILURE; ++ ++ NS_ASSERTION(self,"no self"); ++ ++ self->GetInterfaceInfo(&iface_info); ++ NS_ASSERTION(iface_info,"no interface info"); ++ ++ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); ++ NS_ASSERTION(info,"no interface info"); ++ ++ paramCount = info->GetParamCount(); ++ ++ // setup variant array pointer ++ if(paramCount > PARAM_BUFFER_COUNT) ++ dispatchParams = new nsXPTCMiniVariant[paramCount]; ++ else ++ dispatchParams = paramBuffer; ++ NS_ASSERTION(dispatchParams,"no place for params"); ++ ++ // args[0] to args[NUM_ARG_REGS] hold floating point register values ++ PRUint64* ap = args + NUM_ARG_REGS; ++ for(i = 0; i < paramCount; i++, ap++) ++ { ++ const nsXPTParamInfo& param = info->GetParam(i); ++ const nsXPTType& type = param.GetType(); ++ nsXPTCMiniVariant* dp = &dispatchParams[i]; ++ ++ if(param.IsOut() || !type.IsArithmetic()) ++ { ++ dp->val.p = (void*) *ap; ++ continue; ++ } ++ // else ++ switch(type) ++ { ++ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; ++ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; ++ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; ++ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; ++ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; ++ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; ++ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; ++ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; ++ case nsXPTType::T_FLOAT : ++ if(i < NUM_ARG_REGS) ++ { ++ // floats passed via registers are stored as doubles ++ // in the first NUM_ARG_REGS entries in args ++ dp->val.u64 = (PRUint64) args[i]; ++ dp->val.f = (float) dp->val.d; // convert double to float ++ } ++ else ++ dp->val.u32 = (PRUint32) *ap; ++ break; ++ case nsXPTType::T_DOUBLE : ++ // doubles passed via registers are also stored ++ // in the first NUM_ARG_REGS entries in args ++ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; ++ break; ++ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; ++ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; ++ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; ++ default: ++ NS_ASSERTION(0, "bad type"); ++ break; ++ } ++ } ++ ++ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); ++ ++ NS_RELEASE(iface_info); ++ ++ if(dispatchParams != paramBuffer) ++ delete [] dispatchParams; ++ ++ return result; ++} ++ ++/* ++ * SharedStub() ++ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is ++ * passed to this function via $1 to preserve the argument registers. ++ */ ++__asm__( ++ "#### SharedStub ####\n" ++".text\n\t" ++ ".align 5\n\t" ++ ".ent SharedStub\n" ++"SharedStub:\n\t" ++ ".frame $30,96,$26,0\n\t" ++ ".mask 0x4000000,-96\n\t" ++ "ldgp $29,0($27)\n" ++"$SharedStub..ng:\n\t" ++ "subq $30,96,$30\n\t" ++ "stq $26,0($30)\n\t" ++ ".prologue 1\n\t" ++ ++ /* ++ * Store arguments passed via registers to the stack. ++ * Floating point registers are stored as doubles and converted ++ * to floats in PrepareAndDispatch if necessary. ++ */ ++ "stt $f17,16($30)\n\t" /* floating point registers */ ++ "stt $f18,24($30)\n\t" ++ "stt $f19,32($30)\n\t" ++ "stt $f20,40($30)\n\t" ++ "stt $f21,48($30)\n\t" ++ "stq $17,56($30)\n\t" /* integer registers */ ++ "stq $18,64($30)\n\t" ++ "stq $19,72($30)\n\t" ++ "stq $20,80($30)\n\t" ++ "stq $21,88($30)\n\t" ++ ++ /* ++ * Call PrepareAndDispatch function. ++ */ ++ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ ++ "addq $30,16,$18\n\t" /* pass "args" */ ++ "bsr $26,$PrepareAndDispatch..ng\n\t" ++ ++ "ldq $26,0($30)\n\t" ++ "addq $30,96,$30\n\t" ++ "ret $31,($26),1\n\t" ++ ".end SharedStub" ++ ); ++ ++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ ++/* ++ * nsresult nsXPTCStubBase::Stub##n() ++ * Sets register $1 to "methodIndex" and jumps to SharedStub. ++ */ ++#define STUB_ENTRY(n) \ ++__asm__( \ ++ "#### Stub"#n" ####\n" \ ++".text\n\t" \ ++ ".align 5\n\t" \ ++ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ ++ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ ++ ".frame $30,0,$26,0\n\t" \ ++ "ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ ++ ".prologue 1\n\t" \ ++ "lda $1,"#n"\n\t" \ ++ "br $31,$SharedStub..ng\n\t" \ ++ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ ++ ); \ ++__asm__( \ ++ "#### Stub"#n" ####\n" \ ++".text\n\t" \ ++ ".align 5\n\t" \ ++ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ ++ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ ++ ".frame $30,0,$26,0\n\t" \ ++ "ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ ++ ".prologue 1\n\t" \ ++ "lda $1,"#n"\n\t" \ ++ "br $31,$SharedStub..ng\n\t" \ ++ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ ++ ); \ ++__asm__( \ ++ "#### Stub"#n" ####\n" \ ++".text\n\t" \ ++ ".align 5\n\t" \ ++ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ ++ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ ++ ".frame $30,0,$26,0\n\t" \ ++ "ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ ++ ".prologue 1\n\t" \ ++ "lda $1,"#n"\n\t" \ ++ "br $31,$SharedStub..ng\n\t" \ ++ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ ++ ); ++#else ++/* ++ * nsresult nsXPTCStubBase::Stub##n() ++ * Sets register $1 to "methodIndex" and jumps to SharedStub. ++ */ ++#define STUB_ENTRY(n) \ ++nsresult nsXPTCStubBase::Stub##n() \ ++{ \ ++ nsresult result; \ ++__asm__ __volatile__( \ ++ "ldah $29,0($27)\n\t" \ ++ "lda $29,0($29)\n\t" \ ++ "lda $1, "#n"\n\t" \ ++ "br $31, $SharedStub..ng\n\t" \ ++ "mov $0, %0\n\t" \ ++ : "=r" (result) \ ++ ); \ ++ return result; \ ++} ++#endif ++ ++#define SENTINEL_ENTRY(n) \ ++nsresult nsXPTCStubBase::Sentinel##n() \ ++{ \ ++ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ ++ return NS_ERROR_NOT_IMPLEMENTED; \ ++} ++ ++#include "xptcstubsdef.inc" ++ diff --git a/deskutils/lightning-thunderbird/files/patch-xptcall-ia64 b/deskutils/lightning-thunderbird/files/patch-xptcall-ia64 new file mode 100644 index 000000000000..3e05a5c704b3 --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-xptcall-ia64 @@ -0,0 +1,19 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Mon Nov 7 23:10:28 2005 +@@ -6,6 +6,7 @@ + // Section has executable code + .section .text, "ax","progbits" + // procedure named 'SharedStub' ++ .global SharedStub + .proc SharedStub + // manual bundling + .explicit +@@ -14,7 +15,7 @@ + // .exclass PrepareAndDispatch, @fullyvisible + .type PrepareAndDispatch,@function + +-SharedStub:: ++SharedStub: + // 10 arguments, first 8 are the input arguments of previous + // function call. The 9th one is methodIndex and the 10th is the + // pointer to the remaining input arguments. The last two arguments diff --git a/deskutils/lightning-thunderbird/files/patch-xptcall-sparc64 b/deskutils/lightning-thunderbird/files/patch-xptcall-sparc64 new file mode 100644 index 000000000000..9599a8a71336 --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-xptcall-sparc64 @@ -0,0 +1,327 @@ +--- /dev/null Mon May 26 13:22:00 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 +@@ -0,0 +1,123 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- ++ * ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is Netscape ++ * Communications Corporation. Portions created by Netscape are ++ * Copyright (C) 2001 Netscape Communications Corporation. All ++ * Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter <pavlov@netscape.com> ++ */ ++ ++/* Implement shared vtbl methods. */ ++ ++#include "xptcprivate.h" ++ ++#if defined(sparc) || defined(__sparc__) ++ ++extern "C" nsresult ++PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) ++{ ++ ++#define PARAM_BUFFER_COUNT 16 ++ ++ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; ++ nsXPTCMiniVariant* dispatchParams = NULL; ++ nsIInterfaceInfo* iface_info = NULL; ++ const nsXPTMethodInfo* info; ++ PRUint8 paramCount; ++ PRUint8 i; ++ nsresult result = NS_ERROR_FAILURE; ++ ++ NS_ASSERTION(self,"no self"); ++ ++ self->GetInterfaceInfo(&iface_info); ++ NS_ASSERTION(iface_info,"no interface info"); ++ ++ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); ++ NS_ASSERTION(info,"no interface info"); ++ ++ paramCount = info->GetParamCount(); ++ ++ // setup variant array pointer ++ if(paramCount > PARAM_BUFFER_COUNT) ++ dispatchParams = new nsXPTCMiniVariant[paramCount]; ++ else ++ dispatchParams = paramBuffer; ++ NS_ASSERTION(dispatchParams,"no place for params"); ++ ++ PRUint64* ap = args; ++ for(i = 0; i < paramCount; i++, ap++) ++ { ++ const nsXPTParamInfo& param = info->GetParam(i); ++ const nsXPTType& type = param.GetType(); ++ nsXPTCMiniVariant* dp = &dispatchParams[i]; ++ ++ if(param.IsOut() || !type.IsArithmetic()) ++ { ++ dp->val.p = (void*) *ap; ++ continue; ++ } ++ // else ++ switch(type) ++ { ++ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; ++ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; ++ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; ++ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; ++ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; ++ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; ++ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; ++ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; ++ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; ++ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; ++ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; ++ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; ++ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; ++ default: ++ NS_ASSERTION(0, "bad type"); ++ break; ++ } ++ } ++ ++ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); ++ ++ NS_RELEASE(iface_info); ++ ++ if(dispatchParams != paramBuffer) ++ delete [] dispatchParams; ++ ++ return result; ++} ++ ++extern "C" int SharedStub(int, int*); ++ ++#define STUB_ENTRY(n) \ ++nsresult nsXPTCStubBase::Stub##n() \ ++{ \ ++ int dummy; /* defeat tail-call optimization */ \ ++ return SharedStub(n, &dummy); \ ++} ++ ++#define SENTINEL_ENTRY(n) \ ++nsresult nsXPTCStubBase::Sentinel##n() \ ++{ \ ++ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ ++ return NS_ERROR_NOT_IMPLEMENTED; \ ++} ++ ++#include "xptcstubsdef.inc" ++ ++#endif /* sparc || __sparc__ */ +--- /dev/null Mon May 26 13:22:00 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 +@@ -0,0 +1,104 @@ ++/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- ++ * ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is Netscape ++ * Communications Corporation. Portions created by Netscape are ++ * Copyright (C) 2001 Netscape Communications Corporation. All ++ * Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter <pavlov@netscape.com> ++ * Chris Seawood <cls@seawood.org> ++ */ ++ ++/* ++ Platform specific code to invoke XPCOM methods on native objects ++ for sparcv9 Solaris. ++ ++ See the SPARC Compliance Definition (SCD) Chapter 3 ++ for more information about what is going on here, including ++ the use of BIAS (0x7ff). ++ The SCD is available from http://www.sparc.com/. ++*/ ++ ++ .global XPTC_InvokeByIndex ++ .type XPTC_InvokeByIndex, #function ++ ++/* ++ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, ++ PRUint32 paramCount, nsXPTCVariant* params); ++ ++*/ ++XPTC_InvokeByIndex: ++ save %sp,-(128 + 64),%sp ! room for the register window and ++ ! struct pointer, rounded up to 0 % 64 ++ sll %i2,4,%l0 ! assume the worst case ++ ! paramCount * 2 * 8 bytes ++ cmp %l0, 0 ! are there any args? If not, ++ be .invoke ! no need to copy args to stack ++ nop ++ ++ sub %sp,%l0,%sp ! create the additional stack space ++ add %sp,0x7ff+136,%o0 ! step past the register window, the ++ ! struct result pointer and the 'this' slot ++ mov %i2,%o1 ! paramCount ++ call invoke_copy_to_stack ++ mov %i3,%o2 ! params ++ ++! ++! load arguments from stack into the outgoing registers ++! BIAS is 0x7ff (2047) ++! ++ ++! load the %o1..5 64bit (extended word) output registers registers ++ ldx [%sp + 0x7ff + 136],%o1 ! %i1 ++ ldx [%sp + 0x7ff + 144],%o2 ! %i2 ++ ldx [%sp + 0x7ff + 152],%o3 ! %i3 ++ ldx [%sp + 0x7ff + 160],%o4 ! %i4 ++ ldx [%sp + 0x7ff + 168],%o5 ! %i5 ++ ++! load the even number double registers starting with %d2 ++ ldd [%sp + 0x7ff + 136],%f2 ++ ldd [%sp + 0x7ff + 144],%f4 ++ ldd [%sp + 0x7ff + 152],%f6 ++ ldd [%sp + 0x7ff + 160],%f8 ++ ldd [%sp + 0x7ff + 168],%f10 ++ ldd [%sp + 0x7ff + 176],%f12 ++ ldd [%sp + 0x7ff + 184],%f14 ++ ldd [%sp + 0x7ff + 192],%f16 ++ ldd [%sp + 0x7ff + 200],%f18 ++ ldd [%sp + 0x7ff + 208],%f20 ++ ldd [%sp + 0x7ff + 216],%f22 ++ ldd [%sp + 0x7ff + 224],%f24 ++ ldd [%sp + 0x7ff + 232],%f26 ++ ldd [%sp + 0x7ff + 240],%f28 ++ ldd [%sp + 0x7ff + 248],%f30 ++ ++! ++! calculate the target address from the vtable ++! ++.invoke: ++ sll %i1,3,%l0 ! index *= 8 ++! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) ++ ldx [%i0],%l1 ! *that --> address of vtable ++ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address ++ ++ jmpl %l0,%o7 ! call the routine ++ mov %i0,%o0 ! move 'this' pointer to out register ++ ++ mov %o0,%i0 ! propagate return value ++ ret ++ restore ++ ++ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex +--- /dev/null Mon May 26 14:00:00 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 +@@ -0,0 +1,91 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- ++ * ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is Netscape ++ * Communications Corporation. Portions created by Netscape are ++ * Copyright (C) 2001 Netscape Communications Corporation. All ++ * Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter <pavlov@netscape.com> ++ * Chris Seawood <cls@seawood.org> ++ */ ++ ++ ++/* Platform specific code to invoke XPCOM methods on native objects */ ++ ++#include "xptcprivate.h" ++ ++#if !defined(__sparc) && !defined(__sparc__) ++#error "This code is for Sparc only" ++#endif ++ ++/* Prototype specifies unmangled function name */ ++extern "C" PRUint64 ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); ++ ++extern "C" PRUint64 ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) ++{ ++ /* ++ We need to copy the parameters for this function to locals and use them ++ from there since the parameters occupy the same stack space as the stack ++ we're trying to populate. ++ */ ++ PRUint64 *l_d = d; ++ nsXPTCVariant *l_s = s; ++ PRUint64 l_paramCount = paramCount; ++ PRUint64 regCount = 0; // return the number of registers to load from the stack ++ ++ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) ++ { ++ if (regCount < 5) regCount++; ++ ++ if (l_s->IsPtrData()) ++ { ++ *l_d = (PRUint64)l_s->ptr; ++ continue; ++ } ++ switch (l_s->type) ++ { ++ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; ++ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; ++ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; ++ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; ++ ++ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; ++ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; ++ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; ++ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; ++ ++ /* in the case of floats, we want to put the bits in to the ++ 64bit space right justified... floats in the paramter array on ++ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip ++ the space that would be occupied by %f0, %f2, etc. ++ */ ++ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; ++ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; ++ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; ++ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; ++ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; ++ ++ default: ++ // all the others are plain pointer types ++ *((void**)l_d) = l_s->val.p; ++ break; ++ } ++ } ++ ++ return regCount; ++} diff --git a/deskutils/lightning-thunderbird/files/sunbird.desktop.in b/deskutils/lightning-thunderbird/files/sunbird.desktop.in new file mode 100644 index 000000000000..e371a93f2cc5 --- /dev/null +++ b/deskutils/lightning-thunderbird/files/sunbird.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Mozilla Calendar +Comment=Mozilla Sunbird Calendar +Icon=@SUNBIRD_ICON@ +Exec=sunbird +Terminal=false +Type=Application +Categories=Application;Office; diff --git a/deskutils/lightning-thunderbird/pkg-deinstall.in b/deskutils/lightning-thunderbird/pkg-deinstall.in new file mode 100644 index 000000000000..7f1a7aece040 --- /dev/null +++ b/deskutils/lightning-thunderbird/pkg-deinstall.in @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# $MCom: ports/deskutils/sunbird/pkg-deinstall.in,v 1.4 2005/11/22 21:29:13 ahze Exp $ +# +# Date created: Mon Nov 29, 2003 +# Whom: Thierry Thomas (<thierry@pompo.net>) +# Fix the chrome registry. + +umask 022 +PATH=/bin:/usr/bin + +[ "x$1" = "x" ] && exit 1 +[ "x$2" != "xDEINSTALL" ] && exit 0 + +MOZDIR=%%MOZDIR%% + +rm -rf ${MOZDIR}/chrome/overlayinfo +rm -rf ${MOZDIR}/extensions +rm -rf ${MOZDIR}/updates +rm -f ${MOZDIR}/chrome/app-chrome.manifest +rm -f ${MOZDIR}/chrome/*.rdf +rm -f ${MOZDIR}/component.reg +rm -f ${MOZDIR}/components/*.dat + +exit 0 diff --git a/deskutils/lightning-thunderbird/pkg-descr b/deskutils/lightning-thunderbird/pkg-descr new file mode 100644 index 000000000000..f9995c9a993c --- /dev/null +++ b/deskutils/lightning-thunderbird/pkg-descr @@ -0,0 +1,5 @@ +The Sunbird Project is a redesign of the Mozilla Calendar component. The goal +is to produce a cross platform standalone calendar application based on +Mozilla's XUL user interface language. + +WWW: http://www.mozilla.org/projects/calendar/sunbird.html diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile new file mode 100644 index 000000000000..737666f93e32 --- /dev/null +++ b/deskutils/lightning/Makefile @@ -0,0 +1,67 @@ +# New ports collection makefile for: sunbird +# Date created: 2005-02-26 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/deskutils/sunbird/Makefile,v 1.13 2005/11/23 04:54:57 ahze Exp $ +# + +PORTNAME= sunbird +PORTVERSION= 0.3a1 +CATEGORIES= deskutils +MASTER_SITES= ${MASTER_SITE_MOZILLA} +MASTER_SITE_SUBDIR= sunbird/new-directory/releases/${DISTVERSION}/source +DISTNAME= ${PORTNAME}-${DISTVERSION}-source + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Redesign of the Mozilla Calendar with XUL interface + +USE_GCC= 3.4+ +ALL_TARGET= default +CONFIGURE_ENV= LOCALBASE=${LOCALBASE} +HAS_CONFIGURE= yes +USE_GMAKE= yes +USE_BZIP2= yes +WANT_GNOME= yes +USE_X_PREFIX= yes +SUNBIRD= ${PORTNAME} +SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm +SUNBIRD_ICON= ${PORTNAME}.xpm + +MOZ_PROTOCOLS= about,http,ftp,file,jar,res +MOZ_OPTIONS= --enable-application=calendar \ + --enable-plaintext-editor-only \ + --disable-plugins --disable-cookies +MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar + +.include <bsd.port.pre.mk> +.include "${.CURDIR}/../../www/mozilla/Makefile.common" + +.if ${PERL_LEVEL} < 500600 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl +.endif + +post-extract:: + @${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \ + ${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop + +post-patch: +.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ + embedding/minimo + @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ + /dom.disable_window_open_feature.toolbar/s/false/true/' \ + ${WRKSRC}/${ii}/all.js +.endfor + +pre-install: + ${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST} + ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} + ${ECHO_CMD} '@unexec ${RMDIR} %D/share/pixmaps 2>/dev/null || ${TRUE}' >> ${PLIST} + +do-install: + ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKDIR}/sunbird.desktop ${PREFIX}/share/applications + ${LN} -sf ${SUNBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${SUNBIRD_ICON} + +.include <bsd.port.post.mk> diff --git a/deskutils/lightning/distinfo b/deskutils/lightning/distinfo new file mode 100644 index 000000000000..9a9b0708a6aa --- /dev/null +++ b/deskutils/lightning/distinfo @@ -0,0 +1,3 @@ +MD5 (sunbird-0.3a1-source.tar.bz2) = f449ed2feb6acf4b9d1a5a2571f6e9c3 +SHA256 (sunbird-0.3a1-source.tar.bz2) = 7d3e3a09217feccc53a699385e0eff138002bff80d57c63cb25ea0cd9465bcda +SIZE (sunbird-0.3a1-source.tar.bz2) = 34623798 diff --git a/deskutils/lightning/files/extra-patch-config_make-jars.pl b/deskutils/lightning/files/extra-patch-config_make-jars.pl new file mode 100644 index 000000000000..a558607ca459 --- /dev/null +++ b/deskutils/lightning/files/extra-patch-config_make-jars.pl @@ -0,0 +1,10 @@ +--- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 ++++ config/make-jars.pl Wed Oct 13 16:17:07 2004 +@@ -40,6 +40,7 @@ + last if ($arg eq "--"); + } + my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); ++splice @ARGV, $ddindex, $#ARGV; + + getopts("d:s:t:f:avlD:o:p:xz:"); + diff --git a/deskutils/lightning/files/patch-Makefile.in b/deskutils/lightning/files/patch-Makefile.in new file mode 100644 index 000000000000..b09d564958c6 --- /dev/null +++ b/deskutils/lightning/files/patch-Makefile.in @@ -0,0 +1,22 @@ +--- Makefile.in.orig Thu Oct 21 19:25:55 2004 ++++ Makefile.in Thu Oct 21 19:26:46 2004 +@@ -80,8 +80,7 @@ + $(tier_1_dirs) \ + $(tier_2_dirs) \ + $(tier_9_dirs) \ +- $(tier_50_dirs) \ +- $(NULL) ++ $(tier_50_dirs) + + ifdef GC_LEAK_DETECTOR + DIRS += gc/boehm +@@ -100,7 +99,8 @@ + DIRS += $(tier_98_dirs) + endif + +-DIRS += $(tier_99_dirs) ++DIRS += $(tier_99_dirs) \ ++ $(NULL) + + # + # tier 0 - base build config dirs diff --git a/deskutils/lightning/files/patch-bugzilla149334 b/deskutils/lightning/files/patch-bugzilla149334 new file mode 100644 index 000000000000..4bdb765228eb --- /dev/null +++ b/deskutils/lightning/files/patch-bugzilla149334 @@ -0,0 +1,328 @@ +Index: gfx/idl/nsIFreeType2.idl +=================================================================== +RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v +retrieving revision 1.10 +diff -u -3 -p -r1.10 nsIFreeType2.idl +--- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 ++++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 +@@ -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); +Index: gfx/src/freetype/nsFreeType.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v +retrieving revision 1.25 +diff -u -3 -p -r1.25 nsFreeType.cpp +--- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 ++++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 +@@ -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; +Index: gfx/src/freetype/nsFreeType.h +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v +retrieving revision 1.17 +diff -u -3 -p -r1.17 nsFreeType.h +--- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 ++++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 +@@ -120,13 +120,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) +@@ -181,7 +181,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; +@@ -229,7 +229,7 @@ protected: + PRLibrary *mSharedLib; + FT_Library mFreeTypeLibrary; + FTC_Manager mFTCacheManager; +- FTC_Image_Cache mImageCache; ++ FTC_ImageCache mImageCache; + + static nsHashtable *sFontFamilies; + static nsHashtable *sRange1CharSetNames; +Index: gfx/src/ps/nsFontMetricsPS.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v +retrieving revision 1.43 +diff -u -3 -p -r1.43 nsFontMetricsPS.cpp +--- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 ++++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 +@@ -1140,10 +1140,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); +@@ -1189,7 +1189,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"); +@@ -1227,8 +1227,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; +@@ -1621,16 +1621,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; + +Index: gfx/src/x11shared/nsFontFreeType.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v +retrieving revision 1.14 +diff -u -3 -p -r1.14 nsFontFreeType.cpp +--- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 ++++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 +@@ -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; +Index: gfx/src/x11shared/nsFontFreeType.h +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v +retrieving revision 1.10 +diff -u -3 -p -r1.10 nsFontFreeType.h +--- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 ++++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 +@@ -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; + }; + +--- gfx/src/ps/nsFontMetricsPS.h.orig Fri Mar 4 15:41:55 2005 ++++ gfx/src/ps/nsFontMetricsPS.h Thu Mar 17 05:16:50 2005 +@@ -492,7 +492,7 @@ + protected: + nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; + nsCOMPtr<nsIFreeType2> mFt2; +- FTC_Image_Desc mImageDesc; ++ FTC_ImageType mImageDesc; + }; + #endif // MOZ_ENABLE_FREETYPE2 + #endif // MOZ_ENABLE_XFT diff --git a/deskutils/lightning/files/patch-calendar_libical_src_libical_icalrecur.c b/deskutils/lightning/files/patch-calendar_libical_src_libical_icalrecur.c new file mode 100644 index 000000000000..17812d705942 --- /dev/null +++ b/deskutils/lightning/files/patch-calendar_libical_src_libical_icalrecur.c @@ -0,0 +1,13 @@ +--- calendar/libical/src/libical/icalrecur.c.orig Thu Mar 17 07:13:54 2005 ++++ calendar/libical/src/libical/icalrecur.c Thu Mar 17 07:14:30 2005 +@@ -134,9 +134,7 @@ + #include "config.h" + #endif + +-#ifdef HAVE_STDINT_H +-#include <stdint.h> +-#endif ++#include <inttypes.h> + + #ifndef HAVE_INTPTR_T + #ifdef WIN32 diff --git a/deskutils/lightning/files/patch-config-mkdepend-imakemdep.h b/deskutils/lightning/files/patch-config-mkdepend-imakemdep.h new file mode 100644 index 000000000000..b688e664475d --- /dev/null +++ b/deskutils/lightning/files/patch-config-mkdepend-imakemdep.h @@ -0,0 +1,10 @@ +--- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 ++++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 +@@ -278,4 +278,7 @@ + "-D__i386__", + # endif ++# if defined(__amd64__) || defined(__x86_64__) ++ "-D__amd64__ -D__x86_64__", ++# endif + # ifdef __GNUC__ + "-traditional", diff --git a/deskutils/lightning/files/patch-config_autoconf.mk.in b/deskutils/lightning/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..c4fa0b516d1d --- /dev/null +++ b/deskutils/lightning/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 ++++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 +@@ -31,13 +31,13 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/%%MOZILLA%% + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ + idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++mozappdir = $(libdir)/%%MOZILLA%% + mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) + mrelibdir = $(mredir)/lib + diff --git a/deskutils/lightning/files/patch-config_mkdepend_Makefile.in b/deskutils/lightning/files/patch-config_mkdepend_Makefile.in new file mode 100644 index 000000000000..8da7e48ab0df --- /dev/null +++ b/deskutils/lightning/files/patch-config_mkdepend_Makefile.in @@ -0,0 +1,10 @@ +--- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 ++++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 +@@ -73,6 +73,7 @@ + include $(topsrcdir)/config/rules.mk + + HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" ++HOST_CFLAGS += $(XCFLAGS) + + ifdef GNU_CC + _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/deskutils/lightning/files/patch-config_rules.mk b/deskutils/lightning/files/patch-config_rules.mk new file mode 100644 index 000000000000..16cb6ae1192e --- /dev/null +++ b/deskutils/lightning/files/patch-config_rules.mk @@ -0,0 +1,14 @@ +--- config/rules.mk.orig Sun May 18 16:10:18 2003 ++++ config/rules.mk Sun Jul 20 18:07:26 2003 +@@ -448,7 +448,11 @@ + + ifeq ($(OS_ARCH),FreeBSD) + ifdef IS_COMPONENT ++ifneq (,$(filter alpha ia64,$(OS_TEST))) ++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc ++else + EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic ++endif + endif + endif + diff --git a/deskutils/lightning/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/deskutils/lightning/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/deskutils/lightning/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -0,0 +1,12 @@ +--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004 ++++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004 +@@ -65,7 +65,8 @@ + + #include <gdk/gdkx.h> + #include <freetype/tttables.h> +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + + #define FORCE_PR_LOG + #include "prlog.h" diff --git a/deskutils/lightning/files/patch-libm b/deskutils/lightning/files/patch-libm new file mode 100644 index 000000000000..7de64b2a5068 --- /dev/null +++ b/deskutils/lightning/files/patch-libm @@ -0,0 +1,25 @@ +--- js/src/Makefile.in Thu Aug 4 22:26:52 2005 ++++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 +@@ -148,5 +148,4 @@ + endif + +-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) + JSMATH_PRELINK = jsmathtemp.o + JS_SAFE_ARENA = 1 +@@ -320,7 +319,4 @@ + endif + @$(RM) -f $(JSMATH_PRELINK) +-else +-# Create dependency so we build fdlibm +-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in + endif + +--- js/Makefile.in Sun Mar 23 14:36:00 2003 ++++ js/Makefile.in Thu Aug 4 23:08:06 2005 +@@ -46,5 +46,5 @@ + # + +-DIRS = src/fdlibm src ++DIRS = src + + include $(topsrcdir)/config/rules.mk diff --git a/deskutils/lightning/files/patch-security_coreconf_FreeBSD.mk b/deskutils/lightning/files/patch-security_coreconf_FreeBSD.mk new file mode 100644 index 000000000000..5c76b5af5ebf --- /dev/null +++ b/deskutils/lightning/files/patch-security_coreconf_FreeBSD.mk @@ -0,0 +1,37 @@ +--- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 ++++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 +@@ -35,16 +35,18 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + +-DEFAULT_COMPILER = gcc +-CC = gcc +-CCC = g++ ++CCC = ${CXX} + RANLIB = ranlib + + ifeq ($(OS_TEST),alpha) + CPU_ARCH = alpha + else ++ifeq ($(OS_TEST),amd64) ++CPU_ARCH = amd64 ++else + CPU_ARCH = x86 + endif ++endif + + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + +@@ -71,7 +73,11 @@ + DLL_SUFFIX = so.1.0 + endif + +-MKSHLIB = $(CC) $(DSO_LDOPTS) ++ifneq (,$(filter alpha ia64,$(OS_TEST))) ++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++else ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ++endif + ifdef MAPFILE + # Add LD options to restrict exported symbols to those in the map file + endif diff --git a/deskutils/lightning/files/patch-sysnss b/deskutils/lightning/files/patch-sysnss new file mode 100644 index 000000000000..a9154ce9a292 --- /dev/null +++ b/deskutils/lightning/files/patch-sysnss @@ -0,0 +1,156 @@ +--- Makefile.in Tue Sep 14 16:59:40 2004 ++++ Makefile.in Tue Aug 2 08:26:55 2005 +@@ -102,6 +102,4 @@ + # tier 1 - 3rd party individual libraries + # +-tier_1_dirs += dbm +- + ifndef MOZ_NATIVE_JPEG + tier_1_dirs += jpeg +--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 ++++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 +@@ -117,5 +117,5 @@ + # Use local includes because they are inserted before INCLUDES + # so that Mozilla's nss.h is used, not glibc's +-LOCAL_INCLUDES += -I$(DIST)/public/nss \ ++LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ + $(NULL) + +--- config/config.mk Tue Oct 12 00:11:11 2004 ++++ config/config.mk Tue Aug 2 09:19:18 2005 +@@ -170,5 +170,4 @@ + NSS_LIBS = \ + $(LIBS_DIR) \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + -lsmime3 \ + -lssl3 \ +@@ -189,11 +188,5 @@ + endif + +-NSS_DEP_LIBS = \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ +- $(NULL) ++NSS_DEP_LIBS = + + MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) +--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 ++++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 +@@ -88,4 +88,8 @@ + } + ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <errno.h> ++ + #ifdef PR_LOGGING + PRLogModuleInfo* gPIPNSSLog = nsnull; +@@ -406,4 +410,5 @@ + const char *possible_ckbi_locations[] = { + NS_GRE_DIR, ++ NS_UNIX_LIB_DIR, + NS_XPCOM_CURRENT_PROCESS_DIR + }; +@@ -419,5 +424,5 @@ + } + +- char *fullModuleName = nsnull; ++ char *fullModuleName; + #ifdef XP_MAC + nsCAutoString nativePath; +@@ -431,4 +436,12 @@ + fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); + #endif ++ if (fullModuleName == nsnull) ++ continue; ++ struct stat sb; ++ if (stat(fullModuleName, &sb)) { ++ if (errno != ENOENT) ++ perror(fullModuleName); ++ continue; ++ } + /* If a module exists with the same name, delete it. */ + NS_ConvertUCS2toUTF8 modNameUTF8(modName); +--- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005 ++++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005 +@@ -52,18 +52,9 @@ + SSL3_LIB \ + SOFTOKEN3_LIB \ + SOFTOKEN3_CHK \ +- LOADABLE_ROOT_MODULE \ + HAVE_FREEBL_MODULES \ + $(NULL) + +-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) +- +-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) +-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) +-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) +-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) +-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk +- + ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) + ifeq (,$(filter i86pc ia64,$(OS_TEST))) + ifndef HAVE_64BIT_OS +@@ -151,11 +142,6 @@ + + .nss.cleaned: .nss.checkout + $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean +-ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +-endif + touch $@ + + .nss.checkout: +@@ -176,10 +162,10 @@ + else + cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) + endif +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) ++# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) + ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) ++# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) ++# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) + endif + $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin + ifndef SKIP_CHK +@@ -203,20 +189,6 @@ + endif + + install:: +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) +-ifdef HAVE_FREEBL_MODULES +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) +-endif + $(MAKE) -C boot $@ + $(MAKE) -C ssl $@ + $(MAKE) -C locales $@ +@@ -232,11 +204,6 @@ + $(MAKE) -C pki $@ + endif + $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean +-ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +-endif + + echo-requires-recursive:: + $(MAKE) -C boot $@ diff --git a/deskutils/lightning/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/deskutils/lightning/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp new file mode 100644 index 000000000000..7f8e55f536df --- /dev/null +++ b/deskutils/lightning/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp @@ -0,0 +1,29 @@ +--- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 ++++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 +@@ -143,7 +143,7 @@ + PR_END_MACRO + + // Attempt to open libgconf +- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); ++ gconfLib = PR_LoadLibrary("libgconf-2.so"); + ENSURE_LIB(gconfLib); + + GET_LIB_FUNCTION(gconf, gconf_client_get_default); +@@ -151,7 +151,7 @@ + GET_LIB_FUNCTION(gconf, gconf_client_get_bool); + + // Attempt to open libgnome +- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); ++ gnomeLib = PR_LoadLibrary("libgnome-2.so"); + ENSURE_LIB(gnomeLib); + + GET_LIB_FUNCTION(gnome, gnome_url_show); +@@ -160,7 +160,7 @@ + GET_LIB_FUNCTION(gnome, gnome_program_get); + + // Attempt to open libgnomevfs +- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); ++ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); + ENSURE_LIB(vfsLib); + + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/deskutils/lightning/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/deskutils/lightning/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc new file mode 100644 index 000000000000..ebe5474ca275 --- /dev/null +++ b/deskutils/lightning/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc @@ -0,0 +1,11 @@ +--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 ++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) + NS_IMETHOD Stub3(); + NS_IMETHOD Stub4(); + NS_IMETHOD Stub5(); diff --git a/deskutils/lightning/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/deskutils/lightning/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in new file mode 100644 index 000000000000..dbdc47b6f8e4 --- /dev/null +++ b/deskutils/lightning/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in @@ -0,0 +1,56 @@ +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 +@@ -49,6 +49,9 @@ + ifeq (86,$(findstring 86,$(OS_TEST))) + CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp + endif ++ifeq (amd64,$(OS_TEST)) ++CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp ++endif + endif + # + # New code for Linux, et. al., with gcc +@@ -59,8 +62,8 @@ + CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp + endif + endif +-# IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++# IA64 Linux & FreeBSD ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -106,9 +109,15 @@ + ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s + endif + # ++# FreeBSD/Alpha ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp ++endif ++# + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -294,6 +303,15 @@ + ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) + CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp + ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s ++endif ++# ++# FreeBSD/SPARC64 ++# ++ifeq ($(OS_ARCH),FreeBSD) ++ifneq (,$(findstring sparc,$(OS_TEST))) ++CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s ++endif + endif + # + # Solaris/SPARC diff --git a/deskutils/lightning/files/patch-xptcall-alpha b/deskutils/lightning/files/patch-xptcall-alpha new file mode 100644 index 000000000000..29631a98e61e --- /dev/null +++ b/deskutils/lightning/files/patch-xptcall-alpha @@ -0,0 +1,459 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 +@@ -0,0 +1,184 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Netscape Public License ++ * Version 1.1 (the "License"); you may not use this file except in ++ * compliance with the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/NPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1998 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the NPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the NPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++/* Platform specific code to invoke XPCOM methods on native objects */ ++ ++/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ ++ ++#include "xptcprivate.h" ++ ++/* Prototype specifies unmangled function name and disables unused warning */ ++static void ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) ++__asm__("invoke_copy_to_stack") __attribute__((unused)); ++ ++static void ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) ++{ ++ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer ++ ++ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) ++ { ++ if(s->IsPtrData()) ++ { ++ *d = (PRUint64)s->ptr; ++ continue; ++ } ++ switch(s->type) ++ { ++ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; ++ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; ++ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; ++ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; ++ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; ++ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; ++ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; ++ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; ++ case nsXPTType::T_FLOAT : ++ if(i < NUM_ARG_REGS) ++ { ++ // convert floats to doubles if they are to be passed ++ // via registers so we can just deal with doubles later ++ union { PRUint64 u64; double d; } t; ++ t.d = (double)s->val.f; ++ *d = t.u64; ++ } ++ else ++ // otherwise copy to stack normally ++ *d = (PRUint64)s->val.u32; ++ break; ++ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; ++ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; ++ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; ++ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; ++ default: ++ // all the others are plain pointer types ++ *d = (PRUint64)s->val.p; ++ break; ++ } ++ } ++} ++ ++/* ++ * XPTC_PUBLIC_API(nsresult) ++ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, ++ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) ++ */ ++__asm__( ++ "#### XPTC_InvokeByIndex ####\n" ++".text\n\t" ++ ".align 5\n\t" ++ ".globl XPTC_InvokeByIndex\n\t" ++ ".ent XPTC_InvokeByIndex\n" ++"XPTC_InvokeByIndex:\n\t" ++ ".frame $15,32,$26,0\n\t" ++ ".mask 0x4008000,-32\n\t" ++ "ldgp $29,0($27)\n" ++"$XPTC_InvokeByIndex..ng:\n\t" ++ "subq $30,32,$30\n\t" ++ "stq $26,0($30)\n\t" ++ "stq $15,8($30)\n\t" ++ "bis $30,$30,$15\n\t" ++ ".prologue 1\n\t" ++ ++ /* ++ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 ++ * parameters. (+1 for "this" pointer) Room for at least 6 parameters ++ * is required for storage of those passed via registers. ++ */ ++ ++ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ ++ "cmplt $2,$18,$1\n\t" ++ "cmovne $1,$18,$2\n\t" ++ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ ++ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ ++ "subq $30,$1,$30\n\t" ++ ++ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ ++ "stq $17,16($15)\n\t" /* save "methodIndex" */ ++ ++ "addq $30,8,$16\n\t" /* pass stack pointer */ ++ "bis $18,$18,$17\n\t" /* pass "paramCount" */ ++ "bis $19,$19,$18\n\t" /* pass "params" */ ++ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ ++ ++ /* ++ * Copy the first 6 parameters to registers and remove from stack frame. ++ * Both the integer and floating point registers are set for each parameter ++ * except the first which is the "this" pointer. (integer only) ++ * The floating point registers are all set as doubles since the ++ * invoke_copy_to_stack function should have converted the floats. ++ */ ++ "ldq $16,0($30)\n\t" /* integer registers */ ++ "ldq $17,8($30)\n\t" ++ "ldq $18,16($30)\n\t" ++ "ldq $19,24($30)\n\t" ++ "ldq $20,32($30)\n\t" ++ "ldq $21,40($30)\n\t" ++ "ldt $f17,8($30)\n\t" /* floating point registers */ ++ "ldt $f18,16($30)\n\t" ++ "ldt $f19,24($30)\n\t" ++ "ldt $f20,32($30)\n\t" ++ "ldt $f21,40($30)\n\t" ++ ++ "addq $30,48,$30\n\t" /* remove params from stack */ ++ ++ /* ++ * Call the virtual function with the constructed stack frame. ++ */ ++ "bis $16,$16,$1\n\t" /* load "this" */ ++ "ldq $2,16($15)\n\t" /* load "methodIndex" */ ++ "ldq $1,0($1)\n\t" /* load vtable */ ++#if 0 ++ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ ++#else ++ "mulq $2, 8, $2\n\t" ++ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ ++#endif ++ "addq $1,$2,$1\n\t" ++ "ldq $27,0($1)\n\t" /* load address of function */ ++ "jsr $26,($27),0\n\t" /* call virtual function */ ++ "ldgp $29,0($26)\n\t" ++ ++ "bis $15,$15,$30\n\t" ++ "ldq $26,0($30)\n\t" ++ "ldq $15,8($30)\n\t" ++ "addq $30,32,$30\n\t" ++ "ret $31,($26),1\n\t" ++ ".end XPTC_InvokeByIndex" ++ ); ++ +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 +@@ -0,0 +1,269 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Netscape Public License ++ * Version 1.1 (the "License"); you may not use this file except in ++ * compliance with the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/NPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1999 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the NPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the NPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++/* Implement shared vtbl methods. */ ++ ++/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ ++ ++#include <sys/types.h> ++#include <machine/cpu.h> ++#include "xptcprivate.h" ++ ++/* Prototype specifies unmangled function name and disables unused warning */ ++static nsresult ++PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) ++__asm__("PrepareAndDispatch") __attribute__((unused)); ++ ++static nsresult ++PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) ++{ ++ const PRUint8 PARAM_BUFFER_COUNT = 16; ++ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer ++ ++ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; ++ nsXPTCMiniVariant* dispatchParams = NULL; ++ nsIInterfaceInfo* iface_info = NULL; ++ const nsXPTMethodInfo* info; ++ PRUint8 paramCount; ++ PRUint8 i; ++ nsresult result = NS_ERROR_FAILURE; ++ ++ NS_ASSERTION(self,"no self"); ++ ++ self->GetInterfaceInfo(&iface_info); ++ NS_ASSERTION(iface_info,"no interface info"); ++ ++ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); ++ NS_ASSERTION(info,"no interface info"); ++ ++ paramCount = info->GetParamCount(); ++ ++ // setup variant array pointer ++ if(paramCount > PARAM_BUFFER_COUNT) ++ dispatchParams = new nsXPTCMiniVariant[paramCount]; ++ else ++ dispatchParams = paramBuffer; ++ NS_ASSERTION(dispatchParams,"no place for params"); ++ ++ // args[0] to args[NUM_ARG_REGS] hold floating point register values ++ PRUint64* ap = args + NUM_ARG_REGS; ++ for(i = 0; i < paramCount; i++, ap++) ++ { ++ const nsXPTParamInfo& param = info->GetParam(i); ++ const nsXPTType& type = param.GetType(); ++ nsXPTCMiniVariant* dp = &dispatchParams[i]; ++ ++ if(param.IsOut() || !type.IsArithmetic()) ++ { ++ dp->val.p = (void*) *ap; ++ continue; ++ } ++ // else ++ switch(type) ++ { ++ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; ++ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; ++ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; ++ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; ++ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; ++ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; ++ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; ++ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; ++ case nsXPTType::T_FLOAT : ++ if(i < NUM_ARG_REGS) ++ { ++ // floats passed via registers are stored as doubles ++ // in the first NUM_ARG_REGS entries in args ++ dp->val.u64 = (PRUint64) args[i]; ++ dp->val.f = (float) dp->val.d; // convert double to float ++ } ++ else ++ dp->val.u32 = (PRUint32) *ap; ++ break; ++ case nsXPTType::T_DOUBLE : ++ // doubles passed via registers are also stored ++ // in the first NUM_ARG_REGS entries in args ++ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; ++ break; ++ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; ++ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; ++ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; ++ default: ++ NS_ASSERTION(0, "bad type"); ++ break; ++ } ++ } ++ ++ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); ++ ++ NS_RELEASE(iface_info); ++ ++ if(dispatchParams != paramBuffer) ++ delete [] dispatchParams; ++ ++ return result; ++} ++ ++/* ++ * SharedStub() ++ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is ++ * passed to this function via $1 to preserve the argument registers. ++ */ ++__asm__( ++ "#### SharedStub ####\n" ++".text\n\t" ++ ".align 5\n\t" ++ ".ent SharedStub\n" ++"SharedStub:\n\t" ++ ".frame $30,96,$26,0\n\t" ++ ".mask 0x4000000,-96\n\t" ++ "ldgp $29,0($27)\n" ++"$SharedStub..ng:\n\t" ++ "subq $30,96,$30\n\t" ++ "stq $26,0($30)\n\t" ++ ".prologue 1\n\t" ++ ++ /* ++ * Store arguments passed via registers to the stack. ++ * Floating point registers are stored as doubles and converted ++ * to floats in PrepareAndDispatch if necessary. ++ */ ++ "stt $f17,16($30)\n\t" /* floating point registers */ ++ "stt $f18,24($30)\n\t" ++ "stt $f19,32($30)\n\t" ++ "stt $f20,40($30)\n\t" ++ "stt $f21,48($30)\n\t" ++ "stq $17,56($30)\n\t" /* integer registers */ ++ "stq $18,64($30)\n\t" ++ "stq $19,72($30)\n\t" ++ "stq $20,80($30)\n\t" ++ "stq $21,88($30)\n\t" ++ ++ /* ++ * Call PrepareAndDispatch function. ++ */ ++ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ ++ "addq $30,16,$18\n\t" /* pass "args" */ ++ "bsr $26,$PrepareAndDispatch..ng\n\t" ++ ++ "ldq $26,0($30)\n\t" ++ "addq $30,96,$30\n\t" ++ "ret $31,($26),1\n\t" ++ ".end SharedStub" ++ ); ++ ++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ ++/* ++ * nsresult nsXPTCStubBase::Stub##n() ++ * Sets register $1 to "methodIndex" and jumps to SharedStub. ++ */ ++#define STUB_ENTRY(n) \ ++__asm__( \ ++ "#### Stub"#n" ####\n" \ ++".text\n\t" \ ++ ".align 5\n\t" \ ++ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ ++ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ ++ ".frame $30,0,$26,0\n\t" \ ++ "ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ ++ ".prologue 1\n\t" \ ++ "lda $1,"#n"\n\t" \ ++ "br $31,$SharedStub..ng\n\t" \ ++ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ ++ ); \ ++__asm__( \ ++ "#### Stub"#n" ####\n" \ ++".text\n\t" \ ++ ".align 5\n\t" \ ++ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ ++ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ ++ ".frame $30,0,$26,0\n\t" \ ++ "ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ ++ ".prologue 1\n\t" \ ++ "lda $1,"#n"\n\t" \ ++ "br $31,$SharedStub..ng\n\t" \ ++ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ ++ ); \ ++__asm__( \ ++ "#### Stub"#n" ####\n" \ ++".text\n\t" \ ++ ".align 5\n\t" \ ++ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ ++ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ ++ ".frame $30,0,$26,0\n\t" \ ++ "ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ ++ ".prologue 1\n\t" \ ++ "lda $1,"#n"\n\t" \ ++ "br $31,$SharedStub..ng\n\t" \ ++ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ ++ ); ++#else ++/* ++ * nsresult nsXPTCStubBase::Stub##n() ++ * Sets register $1 to "methodIndex" and jumps to SharedStub. ++ */ ++#define STUB_ENTRY(n) \ ++nsresult nsXPTCStubBase::Stub##n() \ ++{ \ ++ nsresult result; \ ++__asm__ __volatile__( \ ++ "ldah $29,0($27)\n\t" \ ++ "lda $29,0($29)\n\t" \ ++ "lda $1, "#n"\n\t" \ ++ "br $31, $SharedStub..ng\n\t" \ ++ "mov $0, %0\n\t" \ ++ : "=r" (result) \ ++ ); \ ++ return result; \ ++} ++#endif ++ ++#define SENTINEL_ENTRY(n) \ ++nsresult nsXPTCStubBase::Sentinel##n() \ ++{ \ ++ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ ++ return NS_ERROR_NOT_IMPLEMENTED; \ ++} ++ ++#include "xptcstubsdef.inc" ++ diff --git a/deskutils/lightning/files/patch-xptcall-ia64 b/deskutils/lightning/files/patch-xptcall-ia64 new file mode 100644 index 000000000000..3e05a5c704b3 --- /dev/null +++ b/deskutils/lightning/files/patch-xptcall-ia64 @@ -0,0 +1,19 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Mon Nov 7 23:10:28 2005 +@@ -6,6 +6,7 @@ + // Section has executable code + .section .text, "ax","progbits" + // procedure named 'SharedStub' ++ .global SharedStub + .proc SharedStub + // manual bundling + .explicit +@@ -14,7 +15,7 @@ + // .exclass PrepareAndDispatch, @fullyvisible + .type PrepareAndDispatch,@function + +-SharedStub:: ++SharedStub: + // 10 arguments, first 8 are the input arguments of previous + // function call. The 9th one is methodIndex and the 10th is the + // pointer to the remaining input arguments. The last two arguments diff --git a/deskutils/lightning/files/patch-xptcall-sparc64 b/deskutils/lightning/files/patch-xptcall-sparc64 new file mode 100644 index 000000000000..9599a8a71336 --- /dev/null +++ b/deskutils/lightning/files/patch-xptcall-sparc64 @@ -0,0 +1,327 @@ +--- /dev/null Mon May 26 13:22:00 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 +@@ -0,0 +1,123 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- ++ * ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is Netscape ++ * Communications Corporation. Portions created by Netscape are ++ * Copyright (C) 2001 Netscape Communications Corporation. All ++ * Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter <pavlov@netscape.com> ++ */ ++ ++/* Implement shared vtbl methods. */ ++ ++#include "xptcprivate.h" ++ ++#if defined(sparc) || defined(__sparc__) ++ ++extern "C" nsresult ++PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) ++{ ++ ++#define PARAM_BUFFER_COUNT 16 ++ ++ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; ++ nsXPTCMiniVariant* dispatchParams = NULL; ++ nsIInterfaceInfo* iface_info = NULL; ++ const nsXPTMethodInfo* info; ++ PRUint8 paramCount; ++ PRUint8 i; ++ nsresult result = NS_ERROR_FAILURE; ++ ++ NS_ASSERTION(self,"no self"); ++ ++ self->GetInterfaceInfo(&iface_info); ++ NS_ASSERTION(iface_info,"no interface info"); ++ ++ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); ++ NS_ASSERTION(info,"no interface info"); ++ ++ paramCount = info->GetParamCount(); ++ ++ // setup variant array pointer ++ if(paramCount > PARAM_BUFFER_COUNT) ++ dispatchParams = new nsXPTCMiniVariant[paramCount]; ++ else ++ dispatchParams = paramBuffer; ++ NS_ASSERTION(dispatchParams,"no place for params"); ++ ++ PRUint64* ap = args; ++ for(i = 0; i < paramCount; i++, ap++) ++ { ++ const nsXPTParamInfo& param = info->GetParam(i); ++ const nsXPTType& type = param.GetType(); ++ nsXPTCMiniVariant* dp = &dispatchParams[i]; ++ ++ if(param.IsOut() || !type.IsArithmetic()) ++ { ++ dp->val.p = (void*) *ap; ++ continue; ++ } ++ // else ++ switch(type) ++ { ++ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; ++ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; ++ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; ++ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; ++ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; ++ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; ++ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; ++ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; ++ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; ++ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; ++ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; ++ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; ++ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; ++ default: ++ NS_ASSERTION(0, "bad type"); ++ break; ++ } ++ } ++ ++ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); ++ ++ NS_RELEASE(iface_info); ++ ++ if(dispatchParams != paramBuffer) ++ delete [] dispatchParams; ++ ++ return result; ++} ++ ++extern "C" int SharedStub(int, int*); ++ ++#define STUB_ENTRY(n) \ ++nsresult nsXPTCStubBase::Stub##n() \ ++{ \ ++ int dummy; /* defeat tail-call optimization */ \ ++ return SharedStub(n, &dummy); \ ++} ++ ++#define SENTINEL_ENTRY(n) \ ++nsresult nsXPTCStubBase::Sentinel##n() \ ++{ \ ++ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ ++ return NS_ERROR_NOT_IMPLEMENTED; \ ++} ++ ++#include "xptcstubsdef.inc" ++ ++#endif /* sparc || __sparc__ */ +--- /dev/null Mon May 26 13:22:00 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 +@@ -0,0 +1,104 @@ ++/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- ++ * ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is Netscape ++ * Communications Corporation. Portions created by Netscape are ++ * Copyright (C) 2001 Netscape Communications Corporation. All ++ * Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter <pavlov@netscape.com> ++ * Chris Seawood <cls@seawood.org> ++ */ ++ ++/* ++ Platform specific code to invoke XPCOM methods on native objects ++ for sparcv9 Solaris. ++ ++ See the SPARC Compliance Definition (SCD) Chapter 3 ++ for more information about what is going on here, including ++ the use of BIAS (0x7ff). ++ The SCD is available from http://www.sparc.com/. ++*/ ++ ++ .global XPTC_InvokeByIndex ++ .type XPTC_InvokeByIndex, #function ++ ++/* ++ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, ++ PRUint32 paramCount, nsXPTCVariant* params); ++ ++*/ ++XPTC_InvokeByIndex: ++ save %sp,-(128 + 64),%sp ! room for the register window and ++ ! struct pointer, rounded up to 0 % 64 ++ sll %i2,4,%l0 ! assume the worst case ++ ! paramCount * 2 * 8 bytes ++ cmp %l0, 0 ! are there any args? If not, ++ be .invoke ! no need to copy args to stack ++ nop ++ ++ sub %sp,%l0,%sp ! create the additional stack space ++ add %sp,0x7ff+136,%o0 ! step past the register window, the ++ ! struct result pointer and the 'this' slot ++ mov %i2,%o1 ! paramCount ++ call invoke_copy_to_stack ++ mov %i3,%o2 ! params ++ ++! ++! load arguments from stack into the outgoing registers ++! BIAS is 0x7ff (2047) ++! ++ ++! load the %o1..5 64bit (extended word) output registers registers ++ ldx [%sp + 0x7ff + 136],%o1 ! %i1 ++ ldx [%sp + 0x7ff + 144],%o2 ! %i2 ++ ldx [%sp + 0x7ff + 152],%o3 ! %i3 ++ ldx [%sp + 0x7ff + 160],%o4 ! %i4 ++ ldx [%sp + 0x7ff + 168],%o5 ! %i5 ++ ++! load the even number double registers starting with %d2 ++ ldd [%sp + 0x7ff + 136],%f2 ++ ldd [%sp + 0x7ff + 144],%f4 ++ ldd [%sp + 0x7ff + 152],%f6 ++ ldd [%sp + 0x7ff + 160],%f8 ++ ldd [%sp + 0x7ff + 168],%f10 ++ ldd [%sp + 0x7ff + 176],%f12 ++ ldd [%sp + 0x7ff + 184],%f14 ++ ldd [%sp + 0x7ff + 192],%f16 ++ ldd [%sp + 0x7ff + 200],%f18 ++ ldd [%sp + 0x7ff + 208],%f20 ++ ldd [%sp + 0x7ff + 216],%f22 ++ ldd [%sp + 0x7ff + 224],%f24 ++ ldd [%sp + 0x7ff + 232],%f26 ++ ldd [%sp + 0x7ff + 240],%f28 ++ ldd [%sp + 0x7ff + 248],%f30 ++ ++! ++! calculate the target address from the vtable ++! ++.invoke: ++ sll %i1,3,%l0 ! index *= 8 ++! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) ++ ldx [%i0],%l1 ! *that --> address of vtable ++ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address ++ ++ jmpl %l0,%o7 ! call the routine ++ mov %i0,%o0 ! move 'this' pointer to out register ++ ++ mov %o0,%i0 ! propagate return value ++ ret ++ restore ++ ++ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex +--- /dev/null Mon May 26 14:00:00 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 +@@ -0,0 +1,91 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- ++ * ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is Netscape ++ * Communications Corporation. Portions created by Netscape are ++ * Copyright (C) 2001 Netscape Communications Corporation. All ++ * Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter <pavlov@netscape.com> ++ * Chris Seawood <cls@seawood.org> ++ */ ++ ++ ++/* Platform specific code to invoke XPCOM methods on native objects */ ++ ++#include "xptcprivate.h" ++ ++#if !defined(__sparc) && !defined(__sparc__) ++#error "This code is for Sparc only" ++#endif ++ ++/* Prototype specifies unmangled function name */ ++extern "C" PRUint64 ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); ++ ++extern "C" PRUint64 ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) ++{ ++ /* ++ We need to copy the parameters for this function to locals and use them ++ from there since the parameters occupy the same stack space as the stack ++ we're trying to populate. ++ */ ++ PRUint64 *l_d = d; ++ nsXPTCVariant *l_s = s; ++ PRUint64 l_paramCount = paramCount; ++ PRUint64 regCount = 0; // return the number of registers to load from the stack ++ ++ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) ++ { ++ if (regCount < 5) regCount++; ++ ++ if (l_s->IsPtrData()) ++ { ++ *l_d = (PRUint64)l_s->ptr; ++ continue; ++ } ++ switch (l_s->type) ++ { ++ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; ++ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; ++ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; ++ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; ++ ++ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; ++ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; ++ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; ++ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; ++ ++ /* in the case of floats, we want to put the bits in to the ++ 64bit space right justified... floats in the paramter array on ++ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip ++ the space that would be occupied by %f0, %f2, etc. ++ */ ++ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; ++ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; ++ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; ++ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; ++ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; ++ ++ default: ++ // all the others are plain pointer types ++ *((void**)l_d) = l_s->val.p; ++ break; ++ } ++ } ++ ++ return regCount; ++} diff --git a/deskutils/lightning/files/sunbird.desktop.in b/deskutils/lightning/files/sunbird.desktop.in new file mode 100644 index 000000000000..e371a93f2cc5 --- /dev/null +++ b/deskutils/lightning/files/sunbird.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Mozilla Calendar +Comment=Mozilla Sunbird Calendar +Icon=@SUNBIRD_ICON@ +Exec=sunbird +Terminal=false +Type=Application +Categories=Application;Office; diff --git a/deskutils/lightning/pkg-deinstall.in b/deskutils/lightning/pkg-deinstall.in new file mode 100644 index 000000000000..7f1a7aece040 --- /dev/null +++ b/deskutils/lightning/pkg-deinstall.in @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# $MCom: ports/deskutils/sunbird/pkg-deinstall.in,v 1.4 2005/11/22 21:29:13 ahze Exp $ +# +# Date created: Mon Nov 29, 2003 +# Whom: Thierry Thomas (<thierry@pompo.net>) +# Fix the chrome registry. + +umask 022 +PATH=/bin:/usr/bin + +[ "x$1" = "x" ] && exit 1 +[ "x$2" != "xDEINSTALL" ] && exit 0 + +MOZDIR=%%MOZDIR%% + +rm -rf ${MOZDIR}/chrome/overlayinfo +rm -rf ${MOZDIR}/extensions +rm -rf ${MOZDIR}/updates +rm -f ${MOZDIR}/chrome/app-chrome.manifest +rm -f ${MOZDIR}/chrome/*.rdf +rm -f ${MOZDIR}/component.reg +rm -f ${MOZDIR}/components/*.dat + +exit 0 diff --git a/deskutils/lightning/pkg-descr b/deskutils/lightning/pkg-descr new file mode 100644 index 000000000000..f9995c9a993c --- /dev/null +++ b/deskutils/lightning/pkg-descr @@ -0,0 +1,5 @@ +The Sunbird Project is a redesign of the Mozilla Calendar component. The goal +is to produce a cross platform standalone calendar application based on +Mozilla's XUL user interface language. + +WWW: http://www.mozilla.org/projects/calendar/sunbird.html diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile new file mode 100644 index 000000000000..737666f93e32 --- /dev/null +++ b/deskutils/sunbird/Makefile @@ -0,0 +1,67 @@ +# New ports collection makefile for: sunbird +# Date created: 2005-02-26 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/deskutils/sunbird/Makefile,v 1.13 2005/11/23 04:54:57 ahze Exp $ +# + +PORTNAME= sunbird +PORTVERSION= 0.3a1 +CATEGORIES= deskutils +MASTER_SITES= ${MASTER_SITE_MOZILLA} +MASTER_SITE_SUBDIR= sunbird/new-directory/releases/${DISTVERSION}/source +DISTNAME= ${PORTNAME}-${DISTVERSION}-source + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Redesign of the Mozilla Calendar with XUL interface + +USE_GCC= 3.4+ +ALL_TARGET= default +CONFIGURE_ENV= LOCALBASE=${LOCALBASE} +HAS_CONFIGURE= yes +USE_GMAKE= yes +USE_BZIP2= yes +WANT_GNOME= yes +USE_X_PREFIX= yes +SUNBIRD= ${PORTNAME} +SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm +SUNBIRD_ICON= ${PORTNAME}.xpm + +MOZ_PROTOCOLS= about,http,ftp,file,jar,res +MOZ_OPTIONS= --enable-application=calendar \ + --enable-plaintext-editor-only \ + --disable-plugins --disable-cookies +MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar + +.include <bsd.port.pre.mk> +.include "${.CURDIR}/../../www/mozilla/Makefile.common" + +.if ${PERL_LEVEL} < 500600 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl +.endif + +post-extract:: + @${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \ + ${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop + +post-patch: +.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ + embedding/minimo + @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ + /dom.disable_window_open_feature.toolbar/s/false/true/' \ + ${WRKSRC}/${ii}/all.js +.endfor + +pre-install: + ${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST} + ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} + ${ECHO_CMD} '@unexec ${RMDIR} %D/share/pixmaps 2>/dev/null || ${TRUE}' >> ${PLIST} + +do-install: + ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKDIR}/sunbird.desktop ${PREFIX}/share/applications + ${LN} -sf ${SUNBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${SUNBIRD_ICON} + +.include <bsd.port.post.mk> diff --git a/deskutils/sunbird/distinfo b/deskutils/sunbird/distinfo new file mode 100644 index 000000000000..9a9b0708a6aa --- /dev/null +++ b/deskutils/sunbird/distinfo @@ -0,0 +1,3 @@ +MD5 (sunbird-0.3a1-source.tar.bz2) = f449ed2feb6acf4b9d1a5a2571f6e9c3 +SHA256 (sunbird-0.3a1-source.tar.bz2) = 7d3e3a09217feccc53a699385e0eff138002bff80d57c63cb25ea0cd9465bcda +SIZE (sunbird-0.3a1-source.tar.bz2) = 34623798 diff --git a/deskutils/sunbird/files/extra-patch-config_make-jars.pl b/deskutils/sunbird/files/extra-patch-config_make-jars.pl new file mode 100644 index 000000000000..a558607ca459 --- /dev/null +++ b/deskutils/sunbird/files/extra-patch-config_make-jars.pl @@ -0,0 +1,10 @@ +--- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 ++++ config/make-jars.pl Wed Oct 13 16:17:07 2004 +@@ -40,6 +40,7 @@ + last if ($arg eq "--"); + } + my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); ++splice @ARGV, $ddindex, $#ARGV; + + getopts("d:s:t:f:avlD:o:p:xz:"); + diff --git a/deskutils/sunbird/files/patch-Makefile.in b/deskutils/sunbird/files/patch-Makefile.in new file mode 100644 index 000000000000..b09d564958c6 --- /dev/null +++ b/deskutils/sunbird/files/patch-Makefile.in @@ -0,0 +1,22 @@ +--- Makefile.in.orig Thu Oct 21 19:25:55 2004 ++++ Makefile.in Thu Oct 21 19:26:46 2004 +@@ -80,8 +80,7 @@ + $(tier_1_dirs) \ + $(tier_2_dirs) \ + $(tier_9_dirs) \ +- $(tier_50_dirs) \ +- $(NULL) ++ $(tier_50_dirs) + + ifdef GC_LEAK_DETECTOR + DIRS += gc/boehm +@@ -100,7 +99,8 @@ + DIRS += $(tier_98_dirs) + endif + +-DIRS += $(tier_99_dirs) ++DIRS += $(tier_99_dirs) \ ++ $(NULL) + + # + # tier 0 - base build config dirs diff --git a/deskutils/sunbird/files/patch-bugzilla149334 b/deskutils/sunbird/files/patch-bugzilla149334 new file mode 100644 index 000000000000..4bdb765228eb --- /dev/null +++ b/deskutils/sunbird/files/patch-bugzilla149334 @@ -0,0 +1,328 @@ +Index: gfx/idl/nsIFreeType2.idl +=================================================================== +RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v +retrieving revision 1.10 +diff -u -3 -p -r1.10 nsIFreeType2.idl +--- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 ++++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 +@@ -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); +Index: gfx/src/freetype/nsFreeType.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v +retrieving revision 1.25 +diff -u -3 -p -r1.25 nsFreeType.cpp +--- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 ++++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 +@@ -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; +Index: gfx/src/freetype/nsFreeType.h +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v +retrieving revision 1.17 +diff -u -3 -p -r1.17 nsFreeType.h +--- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 ++++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 +@@ -120,13 +120,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) +@@ -181,7 +181,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; +@@ -229,7 +229,7 @@ protected: + PRLibrary *mSharedLib; + FT_Library mFreeTypeLibrary; + FTC_Manager mFTCacheManager; +- FTC_Image_Cache mImageCache; ++ FTC_ImageCache mImageCache; + + static nsHashtable *sFontFamilies; + static nsHashtable *sRange1CharSetNames; +Index: gfx/src/ps/nsFontMetricsPS.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v +retrieving revision 1.43 +diff -u -3 -p -r1.43 nsFontMetricsPS.cpp +--- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 ++++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 +@@ -1140,10 +1140,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); +@@ -1189,7 +1189,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"); +@@ -1227,8 +1227,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; +@@ -1621,16 +1621,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; + +Index: gfx/src/x11shared/nsFontFreeType.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v +retrieving revision 1.14 +diff -u -3 -p -r1.14 nsFontFreeType.cpp +--- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 ++++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 +@@ -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; +Index: gfx/src/x11shared/nsFontFreeType.h +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v +retrieving revision 1.10 +diff -u -3 -p -r1.10 nsFontFreeType.h +--- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 ++++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 +@@ -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; + }; + +--- gfx/src/ps/nsFontMetricsPS.h.orig Fri Mar 4 15:41:55 2005 ++++ gfx/src/ps/nsFontMetricsPS.h Thu Mar 17 05:16:50 2005 +@@ -492,7 +492,7 @@ + protected: + nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; + nsCOMPtr<nsIFreeType2> mFt2; +- FTC_Image_Desc mImageDesc; ++ FTC_ImageType mImageDesc; + }; + #endif // MOZ_ENABLE_FREETYPE2 + #endif // MOZ_ENABLE_XFT diff --git a/deskutils/sunbird/files/patch-calendar_libical_src_libical_icalrecur.c b/deskutils/sunbird/files/patch-calendar_libical_src_libical_icalrecur.c new file mode 100644 index 000000000000..17812d705942 --- /dev/null +++ b/deskutils/sunbird/files/patch-calendar_libical_src_libical_icalrecur.c @@ -0,0 +1,13 @@ +--- calendar/libical/src/libical/icalrecur.c.orig Thu Mar 17 07:13:54 2005 ++++ calendar/libical/src/libical/icalrecur.c Thu Mar 17 07:14:30 2005 +@@ -134,9 +134,7 @@ + #include "config.h" + #endif + +-#ifdef HAVE_STDINT_H +-#include <stdint.h> +-#endif ++#include <inttypes.h> + + #ifndef HAVE_INTPTR_T + #ifdef WIN32 diff --git a/deskutils/sunbird/files/patch-config-mkdepend-imakemdep.h b/deskutils/sunbird/files/patch-config-mkdepend-imakemdep.h new file mode 100644 index 000000000000..b688e664475d --- /dev/null +++ b/deskutils/sunbird/files/patch-config-mkdepend-imakemdep.h @@ -0,0 +1,10 @@ +--- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 ++++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 +@@ -278,4 +278,7 @@ + "-D__i386__", + # endif ++# if defined(__amd64__) || defined(__x86_64__) ++ "-D__amd64__ -D__x86_64__", ++# endif + # ifdef __GNUC__ + "-traditional", diff --git a/deskutils/sunbird/files/patch-config_autoconf.mk.in b/deskutils/sunbird/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..c4fa0b516d1d --- /dev/null +++ b/deskutils/sunbird/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 ++++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 +@@ -31,13 +31,13 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/%%MOZILLA%% + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ + idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++mozappdir = $(libdir)/%%MOZILLA%% + mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) + mrelibdir = $(mredir)/lib + diff --git a/deskutils/sunbird/files/patch-config_mkdepend_Makefile.in b/deskutils/sunbird/files/patch-config_mkdepend_Makefile.in new file mode 100644 index 000000000000..8da7e48ab0df --- /dev/null +++ b/deskutils/sunbird/files/patch-config_mkdepend_Makefile.in @@ -0,0 +1,10 @@ +--- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 ++++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 +@@ -73,6 +73,7 @@ + include $(topsrcdir)/config/rules.mk + + HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" ++HOST_CFLAGS += $(XCFLAGS) + + ifdef GNU_CC + _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/deskutils/sunbird/files/patch-config_rules.mk b/deskutils/sunbird/files/patch-config_rules.mk new file mode 100644 index 000000000000..16cb6ae1192e --- /dev/null +++ b/deskutils/sunbird/files/patch-config_rules.mk @@ -0,0 +1,14 @@ +--- config/rules.mk.orig Sun May 18 16:10:18 2003 ++++ config/rules.mk Sun Jul 20 18:07:26 2003 +@@ -448,7 +448,11 @@ + + ifeq ($(OS_ARCH),FreeBSD) + ifdef IS_COMPONENT ++ifneq (,$(filter alpha ia64,$(OS_TEST))) ++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc ++else + EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic ++endif + endif + endif + diff --git a/deskutils/sunbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/deskutils/sunbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..bc141062f7c6 --- /dev/null +++ b/deskutils/sunbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -0,0 +1,12 @@ +--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004 ++++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004 +@@ -65,7 +65,8 @@ + + #include <gdk/gdkx.h> + #include <freetype/tttables.h> +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + + #define FORCE_PR_LOG + #include "prlog.h" diff --git a/deskutils/sunbird/files/patch-libm b/deskutils/sunbird/files/patch-libm new file mode 100644 index 000000000000..7de64b2a5068 --- /dev/null +++ b/deskutils/sunbird/files/patch-libm @@ -0,0 +1,25 @@ +--- js/src/Makefile.in Thu Aug 4 22:26:52 2005 ++++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 +@@ -148,5 +148,4 @@ + endif + +-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) + JSMATH_PRELINK = jsmathtemp.o + JS_SAFE_ARENA = 1 +@@ -320,7 +319,4 @@ + endif + @$(RM) -f $(JSMATH_PRELINK) +-else +-# Create dependency so we build fdlibm +-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in + endif + +--- js/Makefile.in Sun Mar 23 14:36:00 2003 ++++ js/Makefile.in Thu Aug 4 23:08:06 2005 +@@ -46,5 +46,5 @@ + # + +-DIRS = src/fdlibm src ++DIRS = src + + include $(topsrcdir)/config/rules.mk diff --git a/deskutils/sunbird/files/patch-security_coreconf_FreeBSD.mk b/deskutils/sunbird/files/patch-security_coreconf_FreeBSD.mk new file mode 100644 index 000000000000..5c76b5af5ebf --- /dev/null +++ b/deskutils/sunbird/files/patch-security_coreconf_FreeBSD.mk @@ -0,0 +1,37 @@ +--- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 ++++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 +@@ -35,16 +35,18 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + +-DEFAULT_COMPILER = gcc +-CC = gcc +-CCC = g++ ++CCC = ${CXX} + RANLIB = ranlib + + ifeq ($(OS_TEST),alpha) + CPU_ARCH = alpha + else ++ifeq ($(OS_TEST),amd64) ++CPU_ARCH = amd64 ++else + CPU_ARCH = x86 + endif ++endif + + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + +@@ -71,7 +73,11 @@ + DLL_SUFFIX = so.1.0 + endif + +-MKSHLIB = $(CC) $(DSO_LDOPTS) ++ifneq (,$(filter alpha ia64,$(OS_TEST))) ++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++else ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ++endif + ifdef MAPFILE + # Add LD options to restrict exported symbols to those in the map file + endif diff --git a/deskutils/sunbird/files/patch-sysnss b/deskutils/sunbird/files/patch-sysnss new file mode 100644 index 000000000000..a9154ce9a292 --- /dev/null +++ b/deskutils/sunbird/files/patch-sysnss @@ -0,0 +1,156 @@ +--- Makefile.in Tue Sep 14 16:59:40 2004 ++++ Makefile.in Tue Aug 2 08:26:55 2005 +@@ -102,6 +102,4 @@ + # tier 1 - 3rd party individual libraries + # +-tier_1_dirs += dbm +- + ifndef MOZ_NATIVE_JPEG + tier_1_dirs += jpeg +--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 ++++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 +@@ -117,5 +117,5 @@ + # Use local includes because they are inserted before INCLUDES + # so that Mozilla's nss.h is used, not glibc's +-LOCAL_INCLUDES += -I$(DIST)/public/nss \ ++LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ + $(NULL) + +--- config/config.mk Tue Oct 12 00:11:11 2004 ++++ config/config.mk Tue Aug 2 09:19:18 2005 +@@ -170,5 +170,4 @@ + NSS_LIBS = \ + $(LIBS_DIR) \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + -lsmime3 \ + -lssl3 \ +@@ -189,11 +188,5 @@ + endif + +-NSS_DEP_LIBS = \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ +- $(NULL) ++NSS_DEP_LIBS = + + MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) +--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 ++++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 +@@ -88,4 +88,8 @@ + } + ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <errno.h> ++ + #ifdef PR_LOGGING + PRLogModuleInfo* gPIPNSSLog = nsnull; +@@ -406,4 +410,5 @@ + const char *possible_ckbi_locations[] = { + NS_GRE_DIR, ++ NS_UNIX_LIB_DIR, + NS_XPCOM_CURRENT_PROCESS_DIR + }; +@@ -419,5 +424,5 @@ + } + +- char *fullModuleName = nsnull; ++ char *fullModuleName; + #ifdef XP_MAC + nsCAutoString nativePath; +@@ -431,4 +436,12 @@ + fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); + #endif ++ if (fullModuleName == nsnull) ++ continue; ++ struct stat sb; ++ if (stat(fullModuleName, &sb)) { ++ if (errno != ENOENT) ++ perror(fullModuleName); ++ continue; ++ } + /* If a module exists with the same name, delete it. */ + NS_ConvertUCS2toUTF8 modNameUTF8(modName); +--- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005 ++++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005 +@@ -52,18 +52,9 @@ + SSL3_LIB \ + SOFTOKEN3_LIB \ + SOFTOKEN3_CHK \ +- LOADABLE_ROOT_MODULE \ + HAVE_FREEBL_MODULES \ + $(NULL) + +-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) +- +-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) +-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) +-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) +-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) +-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk +- + ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) + ifeq (,$(filter i86pc ia64,$(OS_TEST))) + ifndef HAVE_64BIT_OS +@@ -151,11 +142,6 @@ + + .nss.cleaned: .nss.checkout + $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean +-ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +-endif + touch $@ + + .nss.checkout: +@@ -176,10 +162,10 @@ + else + cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) + endif +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) ++# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) + ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) ++# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) ++# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) + endif + $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin + ifndef SKIP_CHK +@@ -203,20 +189,6 @@ + endif + + install:: +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) +-ifdef HAVE_FREEBL_MODULES +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) +-endif + $(MAKE) -C boot $@ + $(MAKE) -C ssl $@ + $(MAKE) -C locales $@ +@@ -232,11 +204,6 @@ + $(MAKE) -C pki $@ + endif + $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean +-ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +-endif + + echo-requires-recursive:: + $(MAKE) -C boot $@ diff --git a/deskutils/sunbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/deskutils/sunbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp new file mode 100644 index 000000000000..7f8e55f536df --- /dev/null +++ b/deskutils/sunbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp @@ -0,0 +1,29 @@ +--- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 ++++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 +@@ -143,7 +143,7 @@ + PR_END_MACRO + + // Attempt to open libgconf +- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); ++ gconfLib = PR_LoadLibrary("libgconf-2.so"); + ENSURE_LIB(gconfLib); + + GET_LIB_FUNCTION(gconf, gconf_client_get_default); +@@ -151,7 +151,7 @@ + GET_LIB_FUNCTION(gconf, gconf_client_get_bool); + + // Attempt to open libgnome +- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); ++ gnomeLib = PR_LoadLibrary("libgnome-2.so"); + ENSURE_LIB(gnomeLib); + + GET_LIB_FUNCTION(gnome, gnome_url_show); +@@ -160,7 +160,7 @@ + GET_LIB_FUNCTION(gnome, gnome_program_get); + + // Attempt to open libgnomevfs +- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); ++ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); + ENSURE_LIB(vfsLib); + + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc new file mode 100644 index 000000000000..ebe5474ca275 --- /dev/null +++ b/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc @@ -0,0 +1,11 @@ +--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 ++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) + NS_IMETHOD Stub3(); + NS_IMETHOD Stub4(); + NS_IMETHOD Stub5(); diff --git a/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in new file mode 100644 index 000000000000..dbdc47b6f8e4 --- /dev/null +++ b/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in @@ -0,0 +1,56 @@ +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 +@@ -49,6 +49,9 @@ + ifeq (86,$(findstring 86,$(OS_TEST))) + CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp + endif ++ifeq (amd64,$(OS_TEST)) ++CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp ++endif + endif + # + # New code for Linux, et. al., with gcc +@@ -59,8 +62,8 @@ + CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp + endif + endif +-# IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++# IA64 Linux & FreeBSD ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -106,9 +109,15 @@ + ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s + endif + # ++# FreeBSD/Alpha ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp ++endif ++# + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -294,6 +303,15 @@ + ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) + CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp + ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s ++endif ++# ++# FreeBSD/SPARC64 ++# ++ifeq ($(OS_ARCH),FreeBSD) ++ifneq (,$(findstring sparc,$(OS_TEST))) ++CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s ++endif + endif + # + # Solaris/SPARC diff --git a/deskutils/sunbird/files/patch-xptcall-alpha b/deskutils/sunbird/files/patch-xptcall-alpha new file mode 100644 index 000000000000..29631a98e61e --- /dev/null +++ b/deskutils/sunbird/files/patch-xptcall-alpha @@ -0,0 +1,459 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 +@@ -0,0 +1,184 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Netscape Public License ++ * Version 1.1 (the "License"); you may not use this file except in ++ * compliance with the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/NPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1998 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the NPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the NPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++/* Platform specific code to invoke XPCOM methods on native objects */ ++ ++/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ ++ ++#include "xptcprivate.h" ++ ++/* Prototype specifies unmangled function name and disables unused warning */ ++static void ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) ++__asm__("invoke_copy_to_stack") __attribute__((unused)); ++ ++static void ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) ++{ ++ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer ++ ++ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) ++ { ++ if(s->IsPtrData()) ++ { ++ *d = (PRUint64)s->ptr; ++ continue; ++ } ++ switch(s->type) ++ { ++ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; ++ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; ++ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; ++ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; ++ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; ++ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; ++ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; ++ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; ++ case nsXPTType::T_FLOAT : ++ if(i < NUM_ARG_REGS) ++ { ++ // convert floats to doubles if they are to be passed ++ // via registers so we can just deal with doubles later ++ union { PRUint64 u64; double d; } t; ++ t.d = (double)s->val.f; ++ *d = t.u64; ++ } ++ else ++ // otherwise copy to stack normally ++ *d = (PRUint64)s->val.u32; ++ break; ++ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; ++ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; ++ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; ++ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; ++ default: ++ // all the others are plain pointer types ++ *d = (PRUint64)s->val.p; ++ break; ++ } ++ } ++} ++ ++/* ++ * XPTC_PUBLIC_API(nsresult) ++ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, ++ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) ++ */ ++__asm__( ++ "#### XPTC_InvokeByIndex ####\n" ++".text\n\t" ++ ".align 5\n\t" ++ ".globl XPTC_InvokeByIndex\n\t" ++ ".ent XPTC_InvokeByIndex\n" ++"XPTC_InvokeByIndex:\n\t" ++ ".frame $15,32,$26,0\n\t" ++ ".mask 0x4008000,-32\n\t" ++ "ldgp $29,0($27)\n" ++"$XPTC_InvokeByIndex..ng:\n\t" ++ "subq $30,32,$30\n\t" ++ "stq $26,0($30)\n\t" ++ "stq $15,8($30)\n\t" ++ "bis $30,$30,$15\n\t" ++ ".prologue 1\n\t" ++ ++ /* ++ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 ++ * parameters. (+1 for "this" pointer) Room for at least 6 parameters ++ * is required for storage of those passed via registers. ++ */ ++ ++ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ ++ "cmplt $2,$18,$1\n\t" ++ "cmovne $1,$18,$2\n\t" ++ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ ++ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ ++ "subq $30,$1,$30\n\t" ++ ++ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ ++ "stq $17,16($15)\n\t" /* save "methodIndex" */ ++ ++ "addq $30,8,$16\n\t" /* pass stack pointer */ ++ "bis $18,$18,$17\n\t" /* pass "paramCount" */ ++ "bis $19,$19,$18\n\t" /* pass "params" */ ++ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ ++ ++ /* ++ * Copy the first 6 parameters to registers and remove from stack frame. ++ * Both the integer and floating point registers are set for each parameter ++ * except the first which is the "this" pointer. (integer only) ++ * The floating point registers are all set as doubles since the ++ * invoke_copy_to_stack function should have converted the floats. ++ */ ++ "ldq $16,0($30)\n\t" /* integer registers */ ++ "ldq $17,8($30)\n\t" ++ "ldq $18,16($30)\n\t" ++ "ldq $19,24($30)\n\t" ++ "ldq $20,32($30)\n\t" ++ "ldq $21,40($30)\n\t" ++ "ldt $f17,8($30)\n\t" /* floating point registers */ ++ "ldt $f18,16($30)\n\t" ++ "ldt $f19,24($30)\n\t" ++ "ldt $f20,32($30)\n\t" ++ "ldt $f21,40($30)\n\t" ++ ++ "addq $30,48,$30\n\t" /* remove params from stack */ ++ ++ /* ++ * Call the virtual function with the constructed stack frame. ++ */ ++ "bis $16,$16,$1\n\t" /* load "this" */ ++ "ldq $2,16($15)\n\t" /* load "methodIndex" */ ++ "ldq $1,0($1)\n\t" /* load vtable */ ++#if 0 ++ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ ++#else ++ "mulq $2, 8, $2\n\t" ++ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ ++#endif ++ "addq $1,$2,$1\n\t" ++ "ldq $27,0($1)\n\t" /* load address of function */ ++ "jsr $26,($27),0\n\t" /* call virtual function */ ++ "ldgp $29,0($26)\n\t" ++ ++ "bis $15,$15,$30\n\t" ++ "ldq $26,0($30)\n\t" ++ "ldq $15,8($30)\n\t" ++ "addq $30,32,$30\n\t" ++ "ret $31,($26),1\n\t" ++ ".end XPTC_InvokeByIndex" ++ ); ++ +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 +@@ -0,0 +1,269 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Netscape Public License ++ * Version 1.1 (the "License"); you may not use this file except in ++ * compliance with the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/NPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1999 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the NPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the NPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++/* Implement shared vtbl methods. */ ++ ++/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ ++ ++#include <sys/types.h> ++#include <machine/cpu.h> ++#include "xptcprivate.h" ++ ++/* Prototype specifies unmangled function name and disables unused warning */ ++static nsresult ++PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) ++__asm__("PrepareAndDispatch") __attribute__((unused)); ++ ++static nsresult ++PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) ++{ ++ const PRUint8 PARAM_BUFFER_COUNT = 16; ++ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer ++ ++ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; ++ nsXPTCMiniVariant* dispatchParams = NULL; ++ nsIInterfaceInfo* iface_info = NULL; ++ const nsXPTMethodInfo* info; ++ PRUint8 paramCount; ++ PRUint8 i; ++ nsresult result = NS_ERROR_FAILURE; ++ ++ NS_ASSERTION(self,"no self"); ++ ++ self->GetInterfaceInfo(&iface_info); ++ NS_ASSERTION(iface_info,"no interface info"); ++ ++ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); ++ NS_ASSERTION(info,"no interface info"); ++ ++ paramCount = info->GetParamCount(); ++ ++ // setup variant array pointer ++ if(paramCount > PARAM_BUFFER_COUNT) ++ dispatchParams = new nsXPTCMiniVariant[paramCount]; ++ else ++ dispatchParams = paramBuffer; ++ NS_ASSERTION(dispatchParams,"no place for params"); ++ ++ // args[0] to args[NUM_ARG_REGS] hold floating point register values ++ PRUint64* ap = args + NUM_ARG_REGS; ++ for(i = 0; i < paramCount; i++, ap++) ++ { ++ const nsXPTParamInfo& param = info->GetParam(i); ++ const nsXPTType& type = param.GetType(); ++ nsXPTCMiniVariant* dp = &dispatchParams[i]; ++ ++ if(param.IsOut() || !type.IsArithmetic()) ++ { ++ dp->val.p = (void*) *ap; ++ continue; ++ } ++ // else ++ switch(type) ++ { ++ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; ++ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; ++ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; ++ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; ++ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; ++ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; ++ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; ++ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; ++ case nsXPTType::T_FLOAT : ++ if(i < NUM_ARG_REGS) ++ { ++ // floats passed via registers are stored as doubles ++ // in the first NUM_ARG_REGS entries in args ++ dp->val.u64 = (PRUint64) args[i]; ++ dp->val.f = (float) dp->val.d; // convert double to float ++ } ++ else ++ dp->val.u32 = (PRUint32) *ap; ++ break; ++ case nsXPTType::T_DOUBLE : ++ // doubles passed via registers are also stored ++ // in the first NUM_ARG_REGS entries in args ++ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; ++ break; ++ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; ++ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; ++ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; ++ default: ++ NS_ASSERTION(0, "bad type"); ++ break; ++ } ++ } ++ ++ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); ++ ++ NS_RELEASE(iface_info); ++ ++ if(dispatchParams != paramBuffer) ++ delete [] dispatchParams; ++ ++ return result; ++} ++ ++/* ++ * SharedStub() ++ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is ++ * passed to this function via $1 to preserve the argument registers. ++ */ ++__asm__( ++ "#### SharedStub ####\n" ++".text\n\t" ++ ".align 5\n\t" ++ ".ent SharedStub\n" ++"SharedStub:\n\t" ++ ".frame $30,96,$26,0\n\t" ++ ".mask 0x4000000,-96\n\t" ++ "ldgp $29,0($27)\n" ++"$SharedStub..ng:\n\t" ++ "subq $30,96,$30\n\t" ++ "stq $26,0($30)\n\t" ++ ".prologue 1\n\t" ++ ++ /* ++ * Store arguments passed via registers to the stack. ++ * Floating point registers are stored as doubles and converted ++ * to floats in PrepareAndDispatch if necessary. ++ */ ++ "stt $f17,16($30)\n\t" /* floating point registers */ ++ "stt $f18,24($30)\n\t" ++ "stt $f19,32($30)\n\t" ++ "stt $f20,40($30)\n\t" ++ "stt $f21,48($30)\n\t" ++ "stq $17,56($30)\n\t" /* integer registers */ ++ "stq $18,64($30)\n\t" ++ "stq $19,72($30)\n\t" ++ "stq $20,80($30)\n\t" ++ "stq $21,88($30)\n\t" ++ ++ /* ++ * Call PrepareAndDispatch function. ++ */ ++ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ ++ "addq $30,16,$18\n\t" /* pass "args" */ ++ "bsr $26,$PrepareAndDispatch..ng\n\t" ++ ++ "ldq $26,0($30)\n\t" ++ "addq $30,96,$30\n\t" ++ "ret $31,($26),1\n\t" ++ ".end SharedStub" ++ ); ++ ++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ ++/* ++ * nsresult nsXPTCStubBase::Stub##n() ++ * Sets register $1 to "methodIndex" and jumps to SharedStub. ++ */ ++#define STUB_ENTRY(n) \ ++__asm__( \ ++ "#### Stub"#n" ####\n" \ ++".text\n\t" \ ++ ".align 5\n\t" \ ++ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ ++ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ ++ ".frame $30,0,$26,0\n\t" \ ++ "ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ ++ ".prologue 1\n\t" \ ++ "lda $1,"#n"\n\t" \ ++ "br $31,$SharedStub..ng\n\t" \ ++ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ ++ ); \ ++__asm__( \ ++ "#### Stub"#n" ####\n" \ ++".text\n\t" \ ++ ".align 5\n\t" \ ++ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ ++ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ ++ ".frame $30,0,$26,0\n\t" \ ++ "ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ ++ ".prologue 1\n\t" \ ++ "lda $1,"#n"\n\t" \ ++ "br $31,$SharedStub..ng\n\t" \ ++ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ ++ ); \ ++__asm__( \ ++ "#### Stub"#n" ####\n" \ ++".text\n\t" \ ++ ".align 5\n\t" \ ++ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ ++ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ ++ ".frame $30,0,$26,0\n\t" \ ++ "ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ ++ ".prologue 1\n\t" \ ++ "lda $1,"#n"\n\t" \ ++ "br $31,$SharedStub..ng\n\t" \ ++ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ ++ ); ++#else ++/* ++ * nsresult nsXPTCStubBase::Stub##n() ++ * Sets register $1 to "methodIndex" and jumps to SharedStub. ++ */ ++#define STUB_ENTRY(n) \ ++nsresult nsXPTCStubBase::Stub##n() \ ++{ \ ++ nsresult result; \ ++__asm__ __volatile__( \ ++ "ldah $29,0($27)\n\t" \ ++ "lda $29,0($29)\n\t" \ ++ "lda $1, "#n"\n\t" \ ++ "br $31, $SharedStub..ng\n\t" \ ++ "mov $0, %0\n\t" \ ++ : "=r" (result) \ ++ ); \ ++ return result; \ ++} ++#endif ++ ++#define SENTINEL_ENTRY(n) \ ++nsresult nsXPTCStubBase::Sentinel##n() \ ++{ \ ++ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ ++ return NS_ERROR_NOT_IMPLEMENTED; \ ++} ++ ++#include "xptcstubsdef.inc" ++ diff --git a/deskutils/sunbird/files/patch-xptcall-ia64 b/deskutils/sunbird/files/patch-xptcall-ia64 new file mode 100644 index 000000000000..3e05a5c704b3 --- /dev/null +++ b/deskutils/sunbird/files/patch-xptcall-ia64 @@ -0,0 +1,19 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Mon Nov 7 23:10:28 2005 +@@ -6,6 +6,7 @@ + // Section has executable code + .section .text, "ax","progbits" + // procedure named 'SharedStub' ++ .global SharedStub + .proc SharedStub + // manual bundling + .explicit +@@ -14,7 +15,7 @@ + // .exclass PrepareAndDispatch, @fullyvisible + .type PrepareAndDispatch,@function + +-SharedStub:: ++SharedStub: + // 10 arguments, first 8 are the input arguments of previous + // function call. The 9th one is methodIndex and the 10th is the + // pointer to the remaining input arguments. The last two arguments diff --git a/deskutils/sunbird/files/patch-xptcall-sparc64 b/deskutils/sunbird/files/patch-xptcall-sparc64 new file mode 100644 index 000000000000..9599a8a71336 --- /dev/null +++ b/deskutils/sunbird/files/patch-xptcall-sparc64 @@ -0,0 +1,327 @@ +--- /dev/null Mon May 26 13:22:00 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 +@@ -0,0 +1,123 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- ++ * ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is Netscape ++ * Communications Corporation. Portions created by Netscape are ++ * Copyright (C) 2001 Netscape Communications Corporation. All ++ * Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter <pavlov@netscape.com> ++ */ ++ ++/* Implement shared vtbl methods. */ ++ ++#include "xptcprivate.h" ++ ++#if defined(sparc) || defined(__sparc__) ++ ++extern "C" nsresult ++PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) ++{ ++ ++#define PARAM_BUFFER_COUNT 16 ++ ++ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; ++ nsXPTCMiniVariant* dispatchParams = NULL; ++ nsIInterfaceInfo* iface_info = NULL; ++ const nsXPTMethodInfo* info; ++ PRUint8 paramCount; ++ PRUint8 i; ++ nsresult result = NS_ERROR_FAILURE; ++ ++ NS_ASSERTION(self,"no self"); ++ ++ self->GetInterfaceInfo(&iface_info); ++ NS_ASSERTION(iface_info,"no interface info"); ++ ++ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); ++ NS_ASSERTION(info,"no interface info"); ++ ++ paramCount = info->GetParamCount(); ++ ++ // setup variant array pointer ++ if(paramCount > PARAM_BUFFER_COUNT) ++ dispatchParams = new nsXPTCMiniVariant[paramCount]; ++ else ++ dispatchParams = paramBuffer; ++ NS_ASSERTION(dispatchParams,"no place for params"); ++ ++ PRUint64* ap = args; ++ for(i = 0; i < paramCount; i++, ap++) ++ { ++ const nsXPTParamInfo& param = info->GetParam(i); ++ const nsXPTType& type = param.GetType(); ++ nsXPTCMiniVariant* dp = &dispatchParams[i]; ++ ++ if(param.IsOut() || !type.IsArithmetic()) ++ { ++ dp->val.p = (void*) *ap; ++ continue; ++ } ++ // else ++ switch(type) ++ { ++ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; ++ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; ++ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; ++ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; ++ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; ++ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; ++ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; ++ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; ++ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; ++ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; ++ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; ++ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; ++ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; ++ default: ++ NS_ASSERTION(0, "bad type"); ++ break; ++ } ++ } ++ ++ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); ++ ++ NS_RELEASE(iface_info); ++ ++ if(dispatchParams != paramBuffer) ++ delete [] dispatchParams; ++ ++ return result; ++} ++ ++extern "C" int SharedStub(int, int*); ++ ++#define STUB_ENTRY(n) \ ++nsresult nsXPTCStubBase::Stub##n() \ ++{ \ ++ int dummy; /* defeat tail-call optimization */ \ ++ return SharedStub(n, &dummy); \ ++} ++ ++#define SENTINEL_ENTRY(n) \ ++nsresult nsXPTCStubBase::Sentinel##n() \ ++{ \ ++ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ ++ return NS_ERROR_NOT_IMPLEMENTED; \ ++} ++ ++#include "xptcstubsdef.inc" ++ ++#endif /* sparc || __sparc__ */ +--- /dev/null Mon May 26 13:22:00 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 +@@ -0,0 +1,104 @@ ++/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- ++ * ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is Netscape ++ * Communications Corporation. Portions created by Netscape are ++ * Copyright (C) 2001 Netscape Communications Corporation. All ++ * Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter <pavlov@netscape.com> ++ * Chris Seawood <cls@seawood.org> ++ */ ++ ++/* ++ Platform specific code to invoke XPCOM methods on native objects ++ for sparcv9 Solaris. ++ ++ See the SPARC Compliance Definition (SCD) Chapter 3 ++ for more information about what is going on here, including ++ the use of BIAS (0x7ff). ++ The SCD is available from http://www.sparc.com/. ++*/ ++ ++ .global XPTC_InvokeByIndex ++ .type XPTC_InvokeByIndex, #function ++ ++/* ++ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, ++ PRUint32 paramCount, nsXPTCVariant* params); ++ ++*/ ++XPTC_InvokeByIndex: ++ save %sp,-(128 + 64),%sp ! room for the register window and ++ ! struct pointer, rounded up to 0 % 64 ++ sll %i2,4,%l0 ! assume the worst case ++ ! paramCount * 2 * 8 bytes ++ cmp %l0, 0 ! are there any args? If not, ++ be .invoke ! no need to copy args to stack ++ nop ++ ++ sub %sp,%l0,%sp ! create the additional stack space ++ add %sp,0x7ff+136,%o0 ! step past the register window, the ++ ! struct result pointer and the 'this' slot ++ mov %i2,%o1 ! paramCount ++ call invoke_copy_to_stack ++ mov %i3,%o2 ! params ++ ++! ++! load arguments from stack into the outgoing registers ++! BIAS is 0x7ff (2047) ++! ++ ++! load the %o1..5 64bit (extended word) output registers registers ++ ldx [%sp + 0x7ff + 136],%o1 ! %i1 ++ ldx [%sp + 0x7ff + 144],%o2 ! %i2 ++ ldx [%sp + 0x7ff + 152],%o3 ! %i3 ++ ldx [%sp + 0x7ff + 160],%o4 ! %i4 ++ ldx [%sp + 0x7ff + 168],%o5 ! %i5 ++ ++! load the even number double registers starting with %d2 ++ ldd [%sp + 0x7ff + 136],%f2 ++ ldd [%sp + 0x7ff + 144],%f4 ++ ldd [%sp + 0x7ff + 152],%f6 ++ ldd [%sp + 0x7ff + 160],%f8 ++ ldd [%sp + 0x7ff + 168],%f10 ++ ldd [%sp + 0x7ff + 176],%f12 ++ ldd [%sp + 0x7ff + 184],%f14 ++ ldd [%sp + 0x7ff + 192],%f16 ++ ldd [%sp + 0x7ff + 200],%f18 ++ ldd [%sp + 0x7ff + 208],%f20 ++ ldd [%sp + 0x7ff + 216],%f22 ++ ldd [%sp + 0x7ff + 224],%f24 ++ ldd [%sp + 0x7ff + 232],%f26 ++ ldd [%sp + 0x7ff + 240],%f28 ++ ldd [%sp + 0x7ff + 248],%f30 ++ ++! ++! calculate the target address from the vtable ++! ++.invoke: ++ sll %i1,3,%l0 ! index *= 8 ++! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) ++ ldx [%i0],%l1 ! *that --> address of vtable ++ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address ++ ++ jmpl %l0,%o7 ! call the routine ++ mov %i0,%o0 ! move 'this' pointer to out register ++ ++ mov %o0,%i0 ! propagate return value ++ ret ++ restore ++ ++ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex +--- /dev/null Mon May 26 14:00:00 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 +@@ -0,0 +1,91 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- ++ * ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is Netscape ++ * Communications Corporation. Portions created by Netscape are ++ * Copyright (C) 2001 Netscape Communications Corporation. All ++ * Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter <pavlov@netscape.com> ++ * Chris Seawood <cls@seawood.org> ++ */ ++ ++ ++/* Platform specific code to invoke XPCOM methods on native objects */ ++ ++#include "xptcprivate.h" ++ ++#if !defined(__sparc) && !defined(__sparc__) ++#error "This code is for Sparc only" ++#endif ++ ++/* Prototype specifies unmangled function name */ ++extern "C" PRUint64 ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); ++ ++extern "C" PRUint64 ++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) ++{ ++ /* ++ We need to copy the parameters for this function to locals and use them ++ from there since the parameters occupy the same stack space as the stack ++ we're trying to populate. ++ */ ++ PRUint64 *l_d = d; ++ nsXPTCVariant *l_s = s; ++ PRUint64 l_paramCount = paramCount; ++ PRUint64 regCount = 0; // return the number of registers to load from the stack ++ ++ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) ++ { ++ if (regCount < 5) regCount++; ++ ++ if (l_s->IsPtrData()) ++ { ++ *l_d = (PRUint64)l_s->ptr; ++ continue; ++ } ++ switch (l_s->type) ++ { ++ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; ++ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; ++ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; ++ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; ++ ++ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; ++ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; ++ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; ++ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; ++ ++ /* in the case of floats, we want to put the bits in to the ++ 64bit space right justified... floats in the paramter array on ++ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip ++ the space that would be occupied by %f0, %f2, etc. ++ */ ++ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; ++ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; ++ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; ++ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; ++ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; ++ ++ default: ++ // all the others are plain pointer types ++ *((void**)l_d) = l_s->val.p; ++ break; ++ } ++ } ++ ++ return regCount; ++} diff --git a/deskutils/sunbird/files/sunbird.desktop.in b/deskutils/sunbird/files/sunbird.desktop.in new file mode 100644 index 000000000000..e371a93f2cc5 --- /dev/null +++ b/deskutils/sunbird/files/sunbird.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Mozilla Calendar +Comment=Mozilla Sunbird Calendar +Icon=@SUNBIRD_ICON@ +Exec=sunbird +Terminal=false +Type=Application +Categories=Application;Office; diff --git a/deskutils/sunbird/pkg-deinstall.in b/deskutils/sunbird/pkg-deinstall.in new file mode 100644 index 000000000000..7f1a7aece040 --- /dev/null +++ b/deskutils/sunbird/pkg-deinstall.in @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# $MCom: ports/deskutils/sunbird/pkg-deinstall.in,v 1.4 2005/11/22 21:29:13 ahze Exp $ +# +# Date created: Mon Nov 29, 2003 +# Whom: Thierry Thomas (<thierry@pompo.net>) +# Fix the chrome registry. + +umask 022 +PATH=/bin:/usr/bin + +[ "x$1" = "x" ] && exit 1 +[ "x$2" != "xDEINSTALL" ] && exit 0 + +MOZDIR=%%MOZDIR%% + +rm -rf ${MOZDIR}/chrome/overlayinfo +rm -rf ${MOZDIR}/extensions +rm -rf ${MOZDIR}/updates +rm -f ${MOZDIR}/chrome/app-chrome.manifest +rm -f ${MOZDIR}/chrome/*.rdf +rm -f ${MOZDIR}/component.reg +rm -f ${MOZDIR}/components/*.dat + +exit 0 diff --git a/deskutils/sunbird/pkg-descr b/deskutils/sunbird/pkg-descr new file mode 100644 index 000000000000..f9995c9a993c --- /dev/null +++ b/deskutils/sunbird/pkg-descr @@ -0,0 +1,5 @@ +The Sunbird Project is a redesign of the Mozilla Calendar component. The goal +is to produce a cross platform standalone calendar application based on +Mozilla's XUL user interface language. + +WWW: http://www.mozilla.org/projects/calendar/sunbird.html |