From owner-freebsd-gecko@FreeBSD.ORG Sun Dec 6 11:51:42 2009 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64F67106566C for ; Sun, 6 Dec 2009 11:51:42 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 190848FC19 for ; Sun, 6 Dec 2009 11:51:40 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id nB6Bpd5Q029329 for ; Sun, 6 Dec 2009 11:51:39 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id nB6BpYZJ023820 for freebsd-gecko@freebsd.org; Sun, 6 Dec 2009 11:51:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 6 Dec 2009 11:51:34 GMT Message-Id: <200912061151.nB6BpYZJ023820@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r183 - in branches/experimental/deskutils/sunbird: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2009 11:51:42 -0000 Author: beat Date: Sun Dec 6 11:51:33 2009 New Revision: 183 Log: - Update to 1.0b1 build3 candidate. Port already compiles but fails to install. Added: branches/experimental/deskutils/sunbird/files/liboggplay_oss branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-config-config.mk branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-config-mkdepend-Makefile.in branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-configure.in branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-jsnum.cpp branches/experimental/deskutils/sunbird/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h branches/experimental/deskutils/sunbird/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp branches/experimental/deskutils/sunbird/files/releng6_pulseaudio Deleted: branches/experimental/deskutils/sunbird/files/patch-Makefile.in branches/experimental/deskutils/sunbird/files/patch-bugzilla149334 branches/experimental/deskutils/sunbird/files/patch-calendar_libical_src_libical_icalrecur.c branches/experimental/deskutils/sunbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp branches/experimental/deskutils/sunbird/files/patch-nothreads-sqlite branches/experimental/deskutils/sunbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp Modified: branches/experimental/deskutils/sunbird/Makefile branches/experimental/deskutils/sunbird/distinfo branches/experimental/deskutils/sunbird/files/patch-config-mkdepend-imakemdep.h branches/experimental/deskutils/sunbird/files/patch-config_autoconf.mk.in branches/experimental/deskutils/sunbird/files/patch-config_mkdepend_Makefile.in branches/experimental/deskutils/sunbird/files/patch-security_coreconf_FreeBSD.mk branches/experimental/deskutils/sunbird/files/patch-sysnss branches/experimental/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc branches/experimental/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in branches/experimental/deskutils/sunbird/files/patch-xptcall-alpha branches/experimental/deskutils/sunbird/files/patch-xptcall-amd64 branches/experimental/deskutils/sunbird/files/patch-xptcall-ia64 branches/experimental/deskutils/sunbird/files/patch-xptcall-sparc64 Modified: branches/experimental/deskutils/sunbird/Makefile ============================================================================== --- branches/experimental/deskutils/sunbird/Makefile Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/Makefile Sun Dec 6 11:51:33 2009 (r183) @@ -2,28 +2,32 @@ # Date created: 2005-02-26 # Whom: Michael Johnson # -# $FreeBSD: ports/deskutils/sunbird/Makefile,v 1.25 2009/05/04 19:23:42 miwi Exp $ +# $FreeBSD: ports/deskutils/sunbird/Makefile,v 1.28 2009/11/27 09:09:07 beat Exp $ # PORTNAME= sunbird -PORTVERSION= 0.9 +DISTVERSION= 1.0b1 PORTEPOCH= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR= calendar/sunbird/releases/${DISTVERSION}/source -DISTNAME= lightning-${PORTNAME}-${DISTVERSION}-source +MASTER_SITE_SUBDIR= calendar/sunbird/nightly/${DISTVERSION}-candidates/build3/source +DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gecko@FreeBSD.org COMMENT= Redesign of the Mozilla Calendar with XUL interface -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} +MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" HAS_CONFIGURE= yes USE_GMAKE= yes USE_BZIP2= yes +USE_GECKO= gecko WANT_GNOME= yes WANT_PERL= yes +USE_MOZILLA= -png -dbm -jpeg -xft +MOZ_TOOLKIT= cairo-gtk2 SUNBIRD= ${PORTNAME} SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/chrome/icons/default/default.xpm SUNBIRD_ICON= ${PORTNAME}.xpm @@ -32,7 +36,6 @@ PKGCONFIG_FILES= ${MOZ_PKG_CONFIG_FILES} MOZ_OPTIONS= --enable-application=calendar \ --enable-system-cairo \ - --with-system-nss \ --enable-canvas MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar @@ -42,22 +45,53 @@ .include .include .include -.include "${PORTSDIR}/www/mozilla/Makefile.common" -.if ${ARCH}=="sparc64" -BROKEN= does not build +WRKSRC= ${WRKDIR}/comm-1.9.1 +MOZSRC:= ${WRKSRC}/mozilla + +.if ${OSVERSION} < 700000 +LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio +.else +EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss +.endif + +GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} + +.if ${HAVE_GNOME:Mlibgnomeui}!="" +USE_GNOME+= libgnomeui +MOZ_OPTIONS+= --enable-gnomeui +.else +MOZ_OPTIONS+= --disable-gnomeui +.endif + +.if defined(WITHOUT_DBUS) +MOZ_OPTIONS+= --disable-dbus +.else +LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib .endif post-patch: + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${MOZSRC}/storage/build/Makefile.in \ + ${MOZSRC}/db/sqlite3/src/Makefile.in @${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \ ${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/security/manager/ssl/src/Makefile.in + ${MOZSRC}/security/manager/ssl/src/Makefile.in \ + ${MOZSRC}/js/src/config/mkdepend/Makefile.in \ + ${MOZSRC}/js/src/config/config.mk @${REINPLACE_CMD} -e 's|%%LIB_BZ2%%|${LIBBZ2}|' \ - ${WRKSRC}/toolkit/mozapps/update/src/updater/Makefile.in + ${MOZSRC}/toolkit/mozapps/update/src/updater/Makefile.in + @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ + s|-lpthread|${PTHREAD_LIBS}|g ; \ + s|echo aout|echo elf|g ; \ + s|/usr/X11R6|${LOCALBASE}|g' \ + ${MOZSRC}/js/src/configure \ + ${MOZSRC}/configure post-build: - @(cd ${WRKSRC}/xpfe/components/autocomplete/src && ${GMAKE}) + @(cd ${MOZSRC}/xpfe/components/autocomplete/src && ${GMAKE}) pre-install: ${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST} Modified: branches/experimental/deskutils/sunbird/distinfo ============================================================================== --- branches/experimental/deskutils/sunbird/distinfo Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/distinfo Sun Dec 6 11:51:33 2009 (r183) @@ -1,3 +1,3 @@ -MD5 (lightning-sunbird-0.9-source.tar.bz2) = 7757ffefd4a30bcc1497b93b3dc6c0ce -SHA256 (lightning-sunbird-0.9-source.tar.bz2) = 329b256bd463a76527c255cd5b8141ffb6df077ce8d63efdffad6516f0b90f64 -SIZE (lightning-sunbird-0.9-source.tar.bz2) = 43121977 +MD5 (sunbird-1.0b1.source.tar.bz2) = 029d77e24b5882f8454b024eec622982 +SHA256 (sunbird-1.0b1.source.tar.bz2) = 574b7257bab08a998deeb455c657c1f7c9d3cf34effc6cff15c1c852150b72f8 +SIZE (sunbird-1.0b1.source.tar.bz2) = 60207043 Added: branches/experimental/deskutils/sunbird/files/liboggplay_oss ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/deskutils/sunbird/files/liboggplay_oss Sun Dec 6 11:51:33 2009 (r183) @@ -0,0 +1,15 @@ +--- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200 ++++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200 +@@ -45,6 +45,12 @@ + LIBRARY_NAME = sydneyaudio + FORCE_STATIC_LIB= 1 + ++ifeq ($(OS_ARCH),FreeBSD) ++CSRCS = \ ++ sydney_audio_oss.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),Linux) + CSRCS = \ + sydney_audio_alsa.c \ Deleted: branches/experimental/deskutils/sunbird/files/patch-Makefile.in ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-Makefile.in Sun Dec 6 11:51:33 2009 (r182) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,18 +0,0 @@ ---- Makefile.in.orig Mon Jul 2 06:19:35 2007 -+++ Makefile.in Mon Jul 2 06:19:47 2007 -@@ -91,7 +91,6 @@ - # - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm - - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg -@@ -107,7 +106,6 @@ - endif - - ifdef MOZ_UPDATER --tier_1_dirs += modules/libbz2 - tier_1_dirs += modules/libmar - endif - Deleted: branches/experimental/deskutils/sunbird/files/patch-bugzilla149334 ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-bugzilla149334 Sun Dec 6 11:51:33 2009 (r182) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,328 +0,0 @@ -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 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 mEntry; - nsCOMPtr mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif // MOZ_ENABLE_FREETYPE2 - #endif // MOZ_ENABLE_XFT Deleted: branches/experimental/deskutils/sunbird/files/patch-calendar_libical_src_libical_icalrecur.c ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-calendar_libical_src_libical_icalrecur.c Sun Dec 6 11:51:33 2009 (r182) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- 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 --#endif -+#include - - #ifndef HAVE_INTPTR_T - #ifdef WIN32 Modified: branches/experimental/deskutils/sunbird/files/patch-config-mkdepend-imakemdep.h ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-config-mkdepend-imakemdep.h Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/files/patch-config-mkdepend-imakemdep.h Sun Dec 6 11:51:33 2009 (r183) @@ -1,10 +1,13 @@ ---- 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 @@ +--- mozilla/config/mkdepend/imakemdep.h.orig 2009-12-05 15:43:09.000000000 +0100 ++++ mozilla/config/mkdepend/imakemdep.h 2009-12-05 15:44:00.000000000 +0100 +@@ -277,8 +277,8 @@ + # ifdef __i386__ "-D__i386__", # endif -+# if defined(__amd64__) || defined(__x86_64__) +-# ifdef __x86_64__ +- "-D__x86_64__", ++# ifdef defined(__amd64__) || defined(__x86_64__) + "-D__amd64__ -D__x86_64__", -+# endif + # endif # ifdef __GNUC__ "-traditional", Modified: branches/experimental/deskutils/sunbird/files/patch-config_autoconf.mk.in ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-config_autoconf.mk.in Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/files/patch-config_autoconf.mk.in Sun Dec 6 11:51:33 2009 (r183) @@ -1,6 +1,6 @@ ---- 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 @@ +--- config/autoconf.mk.in.orig 2009-12-03 08:16:42.000000000 +0100 ++++ config/autoconf.mk.in 2009-12-05 15:47:48.000000000 +0100 +@@ -62,14 +62,14 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ @@ -9,10 +9,12 @@ libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + 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 +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + MOZDEPTH = $(DEPTH)/mozilla + DIST = $(MOZDEPTH)/dist Modified: branches/experimental/deskutils/sunbird/files/patch-config_mkdepend_Makefile.in ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-config_mkdepend_Makefile.in Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/files/patch-config_mkdepend_Makefile.in Sun Dec 6 11:51:33 2009 (r183) @@ -1,6 +1,6 @@ ---- 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 @@ +--- mozilla/config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004 ++++ mozilla/config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004 +@@ -57,6 +57,7 @@ include $(topsrcdir)/config/rules.mk HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" Deleted: branches/experimental/deskutils/sunbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Sun Dec 6 11:51:33 2009 (r182) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- 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 - #include --#include -+#include -+#include FT_FREETYPE_H - - #define FORCE_PR_LOG - #include "prlog.h" Added: branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-config-config.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-config-config.mk Sun Dec 6 11:51:33 2009 (r183) @@ -0,0 +1,11 @@ +--- mozilla/js/src/config/config.mk.orgi 2009-04-21 15:12:51.000000000 +0200 ++++ mozilla/js/src/config/config.mk 2009-04-21 15:15:37.000000000 +0200 +@@ -490,7 +490,7 @@ + INCLUDES = $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES) + + ifndef MOZILLA_INTERNAL_API +-INCLUDES += -I$(LIBXUL_DIST)/sdk/include ++INCLUDES += -I$(LIBXUL_DIST)/sdk/include -I%%LOCALBASE%%/include + endif + + include $(topsrcdir)/config/static-checking-config.mk Added: branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-config-mkdepend-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-config-mkdepend-Makefile.in Sun Dec 6 11:51:33 2009 (r183) @@ -0,0 +1,11 @@ +--- mozilla/js/src/config/mkdepend/Makefile.in.orig 2009-03-05 22:31:53.000000000 +0100 ++++ mozilla/js/src/config/mkdepend/Makefile.in 2009-04-21 14:10:27.000000000 +0200 +@@ -72,7 +72,7 @@ + + include $(topsrcdir)/config/rules.mk + +-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" ++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" + + ifdef GNU_CC + _GCCDIR = $(shell $(CC) -print-file-name=include) Added: branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-configure.in Sun Dec 6 11:51:33 2009 (r183) @@ -0,0 +1,13 @@ +--- mozilla/js/src/configure.in.orig 2009-09-17 11:09:10.000000000 +0200 ++++ mozilla/js/src/configure.in 2009-09-17 11:09:33.000000000 +0200 +@@ -2467,10 +2467,6 @@ + ENABLE_JIT=1 + NANOJIT_ARCH=ARM + ;; +-sparc*-*) +- ENABLE_JIT=1 +- NANOJIT_ARCH=Sparc +- ;; + esac + + MOZ_ARG_DISABLE_BOOL(jit, Added: branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-jsnum.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/deskutils/sunbird/files/patch-mozilla-js-src-jsnum.cpp Sun Dec 6 11:51:33 2009 (r183) @@ -0,0 +1,28 @@ +--- mozilla/js/src/jsnum.cpp.orig Sun Nov 5 18:37:07 2006 ++++ mozilla/js/src/jsnum.cpp Sun Nov 5 18:42:31 2006 +@@ -45,6 +45,9 @@ + #if defined(XP_WIN) || defined(XP_OS2) + #include + #endif ++#if defined(__FreeBSD__) ++#include ++#endif + #include + #include + #include +@@ -532,7 +535,15 @@ static jsdouble NaN; + + #else + ++#if defined(__FreeBSD__) && __FreeBSD_version >= 601000 ++#include ++#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT)) ++ ++#else ++ + #define FIX_FPU() ((void)0) ++ ++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ + + #endif + Added: branches/experimental/deskutils/sunbird/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/deskutils/sunbird/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h Sun Dec 6 11:51:33 2009 (r183) @@ -0,0 +1,11 @@ +--- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2009-09-16 02:56:44.000000000 +0200 ++++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h 2009-09-24 13:04:49.000000000 +0200 +@@ -59,7 +59,7 @@ + + #include + +-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) ++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (__FreeBSD__) + typedef off_t oggz_off_t; + #else + typedef loff_t oggz_off_t; Added: branches/experimental/deskutils/sunbird/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/deskutils/sunbird/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp Sun Dec 6 11:51:33 2009 (r183) @@ -0,0 +1,10 @@ +--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 ++++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 +@@ -110,6 +110,7 @@ + #include "nss.h" + #include "pk11func.h" + #include "ssl.h" ++#define NSS_ENABLE_ECC 1 + #include "sslproto.h" + #include "secmod.h" + #include "sechash.h" Deleted: branches/experimental/deskutils/sunbird/files/patch-nothreads-sqlite ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-nothreads-sqlite Sun Dec 6 11:51:33 2009 (r182) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006 -+++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006 -@@ -99,7 +99,8 @@ - # REFEF_IO allows us to override IO functions, which is used in the AsyncIO - # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we - # don't have to vacuum to make sure the data is not visible in the file. --DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1 -+DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -+# -DTHREADSAFE=1 - - ifdef ENABLE_TESTS - ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) Modified: branches/experimental/deskutils/sunbird/files/patch-security_coreconf_FreeBSD.mk ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-security_coreconf_FreeBSD.mk Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/files/patch-security_coreconf_FreeBSD.mk Sun Dec 6 11:51:33 2009 (r183) @@ -1,5 +1,5 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 +--- mozilla/security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 ++++ mozilla/security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 @@ -35,16 +35,18 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk Modified: branches/experimental/deskutils/sunbird/files/patch-sysnss ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-sysnss Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/files/patch-sysnss Sun Dec 6 11:51:33 2009 (r183) @@ -1,5 +1,5 @@ ---- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 -+++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 +--- mozilla/security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 ++++ mozilla/security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 @@ -124,19 +124,19 @@ pipboot \ $(NULL) @@ -22,32 +22,27 @@ $(NULL) include $(topsrcdir)/config/rules.mk ---- security/manager/Makefile.in.orig 2008-11-23 09:08:49.000000000 +1000 -+++ security/manager/Makefile.in 2008-11-23 09:11:24.000000000 +1000 -@@ -54,22 +54,14 @@ - SSL3_LIB \ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_LIBS \ - HAVE_FREEBL_LIBS_32 \ - HAVE_FREEBL_LIBS_32INT64 \ - HAVE_FREEBL_LIBS_64 \ - $(NULL) +--- mozilla/security/manager/Makefile.in.orig 2009-12-03 08:19:28.000000000 +0100 ++++ mozilla/security/manager/Makefile.in 2009-12-05 16:08:10.000000000 +0100 +@@ -45,17 +45,6 @@ --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - endif + MODULE = psm +-ifndef MOZ_NATIVE_NSS +-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) +-endif +- -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) +-NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(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 - - # Default - HAVE_FREEBL_LIBS = 1 - -@@ -217,13 +209,6 @@ + ifndef NSS_DISABLE_DBM + NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX) + NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk +@@ -255,13 +244,6 @@ .nss.cleaned: .nss.checkout ifndef MOZ_NATIVE_NSS @@ -60,31 +55,27 @@ - touch $@ endif - .nss.checkout: -@@ -240,113 +225,14 @@ + GARBAGE += .nss.cleaned +@@ -280,78 +262,6 @@ endif libs:: -ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) +-ifndef NSS_DISABLE_DBM +- $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) -endif --ifeq ($(OS_ARCH),WINNT) -- cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --else -- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) +-ifdef ENABLE_TESTS +- # Need certutil binary for mochitest certificates generation +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS) +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS) -endif --ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/nss/lib/util $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib $(DEFAULT_GMAKE_FLAGS) export -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) libs -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/freebl $(DEFAULT_GMAKE_FLAGS) libs -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean -- # In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h. -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins" -ifndef SKIP_CHK +-ifndef ENABLE_TESTS # Just avoid secondary compile - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) +-endif - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) -endif - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin @@ -92,9 +83,17 @@ - $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin -endif - $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin +-ifndef NSS_DISABLE_DBM +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin +-endif - $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin - $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin - $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib -ifdef HAVE_FREEBL_LIBS -ifndef SKIP_CHK - $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin @@ -124,12 +123,20 @@ - $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin -endif -endif +-ifndef MOZ_NATIVE_NSS +-# NSS installs headers to dist/public and we want them in dist/include +- $(NSINSTALL) -D $(DIST)/include/nss +- (cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \ +- (cd $(DIST)/include/nss && tar -xf -) +- (cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \ +- (cd $(DIST)/sdk/include && tar -xf -) +-endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ + $(MAKE) -C ssl $@ $(MAKE) -C locales $@ ifdef MOZ_XUL - $(MAKE) -C pki $@ - endif +@@ -362,50 +272,6 @@ + $(MAKE) -C ssl $@ install:: -ifndef MOZ_NATIVE_NSS @@ -138,7 +145,12 @@ - $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) -endif - $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) -ifdef HAVE_FREEBL_LIBS @@ -171,11 +183,10 @@ -endif -endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ + $(MAKE) -C ssl $@ $(MAKE) -C locales $@ ifdef MOZ_XUL - $(MAKE) -C pki $@ -@@ -360,12 +244,6 @@ +@@ -420,12 +286,6 @@ $(MAKE) -C pki $@ endif ifndef MOZ_NATIVE_NSS @@ -188,18 +199,18 @@ endif echo-requires-recursive:: ---- toolkit/mozapps/update/src/updater/Makefile.in.orig Mon Jul 2 07:59:59 2007 -+++ toolkit/mozapps/update/src/updater/Makefile.in Mon Jul 2 08:00:21 2007 -@@ -52,11 +52,11 @@ - - PROGRAM = updater$(BIN_SUFFIX) - --REQUIRES = libmar libbz2 -+REQUIRES = libmar +--- mozilla/toolkit/mozapps/update/src/updater/Makefile.in.orig 2009-12-03 08:19:47.000000000 +0100 ++++ mozilla/toolkit/mozapps/update/src/updater/Makefile.in 2009-12-05 16:10:00.000000000 +0100 +@@ -55,12 +55,11 @@ + + REQUIRES = \ + libmar \ +- $(BZ2_REQUIRES) \ + $(NULL) LIBS += \ - $(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \ + $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \ +- $(BZ2_LIBS) \ + %%LIB_BZ2%% \ $(NULL) Deleted: branches/experimental/deskutils/sunbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp Sun Dec 6 11:51:33 2009 (r182) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,29 +0,0 @@ ---- 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); Modified: branches/experimental/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc Sun Dec 6 11:51:33 2009 (r183) @@ -1,5 +1,5 @@ ---- 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 +--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 ++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 @@ -8,7 +8,7 @@ * 1 is AddRef * 2 is Release Modified: branches/experimental/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sun Dec 6 11:51:33 2009 (r183) @@ -1,5 +1,5 @@ ---- 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 +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 ++++ mozilla/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 Modified: branches/experimental/deskutils/sunbird/files/patch-xptcall-alpha ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-xptcall-alpha Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/files/patch-xptcall-alpha Sun Dec 6 11:51:33 2009 (r183) @@ -1,5 +1,5 @@ ---- 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 +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 ++++ mozilla/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 ***** @@ -185,8 +185,8 @@ + ".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 +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 ++++ mozilla/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 ***** Modified: branches/experimental/deskutils/sunbird/files/patch-xptcall-amd64 ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-xptcall-amd64 Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/files/patch-xptcall-amd64 Sun Dec 6 11:51:33 2009 (r183) @@ -1,5 +1,5 @@ --- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 @@ -0,0 +1,174 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +// Platform specific code to invoke XPCOM methods on native objects @@ -176,7 +176,7 @@ + return result; +} --- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 @@ -0,0 +1,206 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + Modified: branches/experimental/deskutils/sunbird/files/patch-xptcall-ia64 ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-xptcall-ia64 Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/files/patch-xptcall-ia64 Sun Dec 6 11:51:33 2009 (r183) @@ -1,5 +1,5 @@ ---- 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 +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 ++++ mozilla/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" Modified: branches/experimental/deskutils/sunbird/files/patch-xptcall-sparc64 ============================================================================== --- branches/experimental/deskutils/sunbird/files/patch-xptcall-sparc64 Wed Dec 2 16:52:53 2009 (r182) +++ branches/experimental/deskutils/sunbird/files/patch-xptcall-sparc64 Sun Dec 6 11:51:33 2009 (r183) @@ -1,5 +1,5 @@ --- /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 ++++ mozilla/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 -*- + * @@ -125,7 +125,7 @@ + +#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 ++++ mozilla/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 -*- + * @@ -232,7 +232,7 @@ + + .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 ++++ mozilla/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 -*- + * Added: branches/experimental/deskutils/sunbird/files/releng6_pulseaudio ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/deskutils/sunbird/files/releng6_pulseaudio Sun Dec 6 11:51:33 2009 (r183) @@ -0,0 +1,66 @@ +--- mozilla/media/libsydneyaudio/src/Makefile.in.orig 2009-08-20 21:43:41.000000000 +0200 ++++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-08-20 21:44:17.000000000 +0200 +@@ -45,6 +45,12 @@ + LIBRARY_NAME = sydneyaudio + FORCE_STATIC_LIB= 1 + ++ifeq ($(OS_ARCH),FreeBSD) ++CSRCS = \ ++ sydney_audio_pulseaudio.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),Linux) + CSRCS = \ + sydney_audio_alsa.c \ +--- mozilla/toolkit/library/Makefile.in.orig 2009-08-20 21:45:20.000000000 +0200 ++++ mozilla/toolkit/library/Makefile.in 2009-08-20 21:46:25.000000000 +0200 +@@ -228,12 +228,12 @@ + endif + + ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) +-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 ++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc + EXTRA_DSO_LDOPTS += $(FT2_LIBS) + endif + + ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) +-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 ++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc + EXTRA_DSO_LDOPTS += $(FT2_LIBS) + endif + +--- mozilla/js/src/Makefile.in.orig 2009-08-21 00:34:43.000000000 +0200 ++++ mozilla/js/src/Makefile.in 2009-08-21 00:36:59.000000000 +0200 +@@ -427,7 +427,7 @@ + endif # WINNT + + ifeq ($(OS_ARCH),FreeBSD) +-EXTRA_LIBS += -pthread ++EXTRA_LIBS += -pthread -lpulse -lc + endif + ifeq ($(OS_ARCH),IRIX) + ifdef USE_N32 +--- config/rules.mk.orig 2009-08-22 15:30:16.000000000 +0200 ++++ config/rules.mk 2009-08-22 15:30:46.000000000 +0200 +@@ -583,6 +583,7 @@ + ifdef IS_COMPONENT + EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic + endif ++EXTRA_LIBS += -pthread -lpulse -lc + endif + + ifeq ($(OS_ARCH),NetBSD) +--- mozilla/layout/build/Makefile.in.orig 2009-08-22 01:00:21.000000000 +0200 ++++ mozilla/layout/build/Makefile.in 2009-08-22 01:00:57.000000000 +0200 +@@ -269,6 +269,10 @@ + endif + endif + ++ifeq ($(OS_ARCH),FreeBSD) ++EXTRA_LIBS += -lpulse ++endif ++ + include $(topsrcdir)/config/rules.mk + + LOCAL_INCLUDES += -I$(srcdir)/../base \