summaryrefslogtreecommitdiff
path: root/www/firefox
diff options
context:
space:
mode:
authortaya <taya@pkgsrc.org>2004-06-23 16:47:12 +0000
committertaya <taya@pkgsrc.org>2004-06-23 16:47:12 +0000
commit008eb926f27bbfb082f6e3fc81651e0bbfc62f39 (patch)
treee989bb0fb155f1e89b85409a1cd46603bea1de61 /www/firefox
parent549ed112c9e0431fee523a7259bfcce11a478f80 (diff)
downloadpkgsrc-008eb926f27bbfb082f6e3fc81651e0bbfc62f39.tar.gz
Update firefox to 0.9
Here's what's new in this release of Firefox: * New Default Theme An updated Default Theme now presents a uniform appearance across all three platforms - a new crisp, clear look for Windows users. Finetuning for GNOME will follow in future releases. * Comprehensive Data Migration Switching to Firefox has never been easier now that Firefox imports data like Favorites, History, Settings, Cookies and Passwords from Internet Explorer. Firefox can also import from Mozilla 1.x, Netscape 4.x, 6.x and 7.x, and Opera. MacOS X and Linux migrators for browsers like Safari, OmniWeb, Konqueror etc. will arrive in future releases. * Extension/Theme Manager New Extension and Theme Managers provide a convenient way to manage and update your add-ons. SmartUpdate also notifies you of updates to Firefox. * Help A new online help system is available. * Lots of bug fixes and improvements Copy Image, the ability to delete individual items from Autocomplete lists, SMB/SFTP support on GNOME via gnome-vfs, better Bookmarks, Search and many other refinements fine tune the browsing experience. For Linux/GTK2 Users * Look and Feel Updates Ongoing improvements have been made to improve the way Firefox adheres to your GTK2 themes, such as menus. * Talkback for GTK2 Help us nail down crashes by submitting talkback reports with this crash reporting tool.
Diffstat (limited to 'www/firefox')
-rw-r--r--www/firefox/Makefile13
-rw-r--r--www/firefox/PLIST162
-rw-r--r--www/firefox/distinfo62
-rw-r--r--www/firefox/patches/patch-aa22
-rw-r--r--www/firefox/patches/patch-ab38
-rw-r--r--www/firefox/patches/patch-ac13
-rw-r--r--www/firefox/patches/patch-ad4
-rw-r--r--www/firefox/patches/patch-ae4
-rw-r--r--www/firefox/patches/patch-af6
-rw-r--r--www/firefox/patches/patch-ag4
-rw-r--r--www/firefox/patches/patch-ah21
-rw-r--r--www/firefox/patches/patch-ai15
-rw-r--r--www/firefox/patches/patch-aj19
-rw-r--r--www/firefox/patches/patch-ak29
-rw-r--r--www/firefox/patches/patch-al11
-rw-r--r--www/firefox/patches/patch-am40
-rw-r--r--www/firefox/patches/patch-an9
-rw-r--r--www/firefox/patches/patch-ao19
-rw-r--r--www/firefox/patches/patch-ap14
-rw-r--r--www/firefox/patches/patch-aw8
-rw-r--r--www/firefox/patches/patch-ax9
-rw-r--r--www/firefox/patches/patch-ay14
-rw-r--r--www/firefox/patches/patch-ba4
-rw-r--r--www/firefox/patches/patch-bb4
-rw-r--r--www/firefox/patches/patch-be21
-rw-r--r--www/firefox/patches/patch-bm4
-rw-r--r--www/firefox/patches/patch-bn8
-rw-r--r--www/firefox/patches/patch-bo25
-rw-r--r--www/firefox/patches/patch-bp14
-rw-r--r--www/firefox/patches/patch-bq6
-rw-r--r--www/firefox/patches/patch-br7
-rw-r--r--www/firefox/patches/patch-bs7
-rw-r--r--www/firefox/patches/patch-bt21
-rw-r--r--www/firefox/patches/patch-bu2
-rw-r--r--www/firefox/patches/patch-bv2
-rw-r--r--www/firefox/patches/patch-bx61
-rw-r--r--www/firefox/patches/patch-by31
37 files changed, 377 insertions, 376 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index ff99c1e7044..31c029468a9 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2004/06/19 17:37:37 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/06/23 16:47:12 taya Exp $
MOZILLA= firefox
MOZILLA_BIN= firefox-bin
MOZCONFDIR= .mozilla
-MOZ_VER= 0.8
-PKGREVISION= 3
+MOZ_VER= 0.9
EXTRACT_SUFX= .tar.bz2
-DISTNAME= ${MOZILLA}-source-${MOZ_VER}
+DISTNAME= ${MOZILLA}-${MOZ_VER}-source
MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
http://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/ \
@@ -24,4 +23,10 @@ CONFIGURE_ARGS+= --enable-extensions=default,-irc
BUILD_MATHML= # defined
+post-install:
+ ${CP} -r ${WRKSRC}/dist/bin/defaults/profile/extensions \
+ ${WRKSRC}/dist/bin
+ ${MV} ${WRKSRC}/dist/bin/extensions/installed-extensions.txt \
+ ${WRKSRC}/dist/bin/extensions/installed-extensions-processed.txt
+
.include "../../www/mozilla/Makefile.common"
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 05d8aacb9ce..02556287960 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2004/06/19 17:37:37 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/06/23 16:47:12 taya Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
lib/${MOZILLA}/dirver
lib/${MOZILLA}/mangle
+lib/${MOZILLA}/mozilla-ipcd
lib/${MOZILLA}/mozilla-xremote-client
-lib/${MOZILLA}/mozipcd
lib/${MOZILLA}/nsinstall
lib/${MOZILLA}/regchrome
lib/${MOZILLA}/regxpcom
@@ -17,7 +17,7 @@ lib/${MOZILLA}/xpt_dump
lib/${MOZILLA}/xpt_link
@comment end PROGRAMS
@comment begin SCRIPTS
-lib/${MOZILLA}/mozilla-config
+lib/${MOZILLA}/firefox-config
@comment end SCRIPTS
@comment begin DSO
lib/${MOZILLA}/components/libaccessibility.${SO_SUFFIX}
@@ -44,7 +44,6 @@ lib/${MOZILLA}/components/libinspector.${SO_SUFFIX}
lib/${MOZILLA}/components/libipcdc.${SO_SUFFIX}
lib/${MOZILLA}/components/libjar50.${SO_SUFFIX}
lib/${MOZILLA}/components/libjsd.${SO_SUFFIX}
-lib/${MOZILLA}/components/libjsdom.${SO_SUFFIX}
lib/${MOZILLA}/components/libmork.${SO_SUFFIX}
lib/${MOZILLA}/components/libmozfind.${SO_SUFFIX}
lib/${MOZILLA}/components/libmozldap.${SO_SUFFIX}
@@ -106,6 +105,8 @@ lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
@comment end DSO
@comment begin DATA
+lib/${MOZILLA}/LICENSE
+lib/${MOZILLA}/README.txt
lib/${MOZILLA}/bloaturls.txt
lib/${MOZILLA}/chrome/US.jar
lib/${MOZILLA}/chrome/browser.jar
@@ -133,7 +134,6 @@ lib/${MOZILLA}/components/autoconfig.xpt
lib/${MOZILLA}/components/bookmarks.xpt
lib/${MOZILLA}/components/caps.xpt
lib/${MOZILLA}/components/chardet.xpt
-lib/${MOZILLA}/components/chrome.xpt
lib/${MOZILLA}/components/commandhandler.xpt
lib/${MOZILLA}/components/composer.xpt
lib/${MOZILLA}/components/content_base.xpt
@@ -160,6 +160,7 @@ lib/${MOZILLA}/components/dom_xul.xpt
lib/${MOZILLA}/components/downloads.xpt
lib/${MOZILLA}/components/editor.xpt
lib/${MOZILLA}/components/embed_base.xpt
+lib/${MOZILLA}/components/extensions.xpt
lib/${MOZILLA}/components/exthandler.xpt
lib/${MOZILLA}/components/filepicker.xpt
lib/${MOZILLA}/components/find.xpt
@@ -182,6 +183,7 @@ lib/${MOZILLA}/components/layout_xul.xpt
lib/${MOZILLA}/components/layout_xul_tree.xpt
lib/${MOZILLA}/components/locale.xpt
lib/${MOZILLA}/components/lwbrk.xpt
+lib/${MOZILLA}/components/migration.xpt
lib/${MOZILLA}/components/mimetype.xpt
lib/${MOZILLA}/components/mozbrwsr.xpt
lib/${MOZILLA}/components/mozfind.xpt
@@ -202,8 +204,10 @@ lib/${MOZILLA}/components/necko_res.xpt
lib/${MOZILLA}/components/necko_socket.xpt
lib/${MOZILLA}/components/necko_strconv.xpt
lib/${MOZILLA}/components/necko_viewsource.xpt
+lib/${MOZILLA}/components/nsBackgroundUpdateService.js
lib/${MOZILLA}/components/nsCloseAllWindows.js
lib/${MOZILLA}/components/nsDictionary.js
+lib/${MOZILLA}/components/nsExtensionManager.js
lib/${MOZILLA}/components/nsFilePicker.js
lib/${MOZILLA}/components/nsHelperAppDlg.js
lib/${MOZILLA}/components/nsInterfaceInfoToIDL.js
@@ -211,8 +215,8 @@ lib/${MOZILLA}/components/nsKillAll.js
lib/${MOZILLA}/components/nsProgressDialog.js
lib/${MOZILLA}/components/nsProxyAutoConfig.js
lib/${MOZILLA}/components/nsResetPref.js
+lib/${MOZILLA}/components/nsSetDefaultBrowser.js
lib/${MOZILLA}/components/nsSidebar.js
-lib/${MOZILLA}/components/nsUpdateNotifier.js
lib/${MOZILLA}/components/nsXmlRpcClient.js
lib/${MOZILLA}/components/oji.xpt
lib/${MOZILLA}/components/p3p.xpt
@@ -229,21 +233,21 @@ lib/${MOZILLA}/components/profilesharingsetup.xpt
lib/${MOZILLA}/components/progressDlg.xpt
lib/${MOZILLA}/components/proxyObjInst.xpt
lib/${MOZILLA}/components/rdf.xpt
-lib/${MOZILLA}/components/related.xpt
lib/${MOZILLA}/components/satchel.xpt
lib/${MOZILLA}/components/search.xpt
+lib/${MOZILLA}/components/shellservice.xpt
lib/${MOZILLA}/components/shistory.xpt
lib/${MOZILLA}/components/sidebar.xpt
lib/${MOZILLA}/components/signonviewer.xpt
lib/${MOZILLA}/components/spellchecker.xpt
+lib/${MOZILLA}/components/toolkitprofile.xpt
lib/${MOZILLA}/components/txmgr.xpt
lib/${MOZILLA}/components/txtsvc.xpt
lib/${MOZILLA}/components/typeaheadfind.xpt
-lib/${MOZILLA}/components/ucnative.xpt
lib/${MOZILLA}/components/uconv.xpt
lib/${MOZILLA}/components/unicharutil.xpt
+lib/${MOZILLA}/components/update.xpt
lib/${MOZILLA}/components/uriloader.xpt
-lib/${MOZILLA}/components/util.xpt
lib/${MOZILLA}/components/venkman-service.js
lib/${MOZILLA}/components/wallet.xpt
lib/${MOZILLA}/components/walleteditor.xpt
@@ -271,14 +275,8 @@ lib/${MOZILLA}/components/xuldoc.xpt
lib/${MOZILLA}/components/xultmpl.xpt
lib/${MOZILLA}/defaults/autoconfig/platform.js
lib/${MOZILLA}/defaults/autoconfig/prefcalls.js
-lib/${MOZILLA}/defaults/pref/all.js
-lib/${MOZILLA}/defaults/pref/editor.js
+lib/${MOZILLA}/defaults/pref/firefox.js
lib/${MOZILLA}/defaults/pref/inspector.js
-lib/${MOZILLA}/defaults/pref/mailnews.js
-lib/${MOZILLA}/defaults/pref/non-shared.txt
-lib/${MOZILLA}/defaults/pref/security-prefs.js
-lib/${MOZILLA}/defaults/pref/unix.js
-lib/${MOZILLA}/defaults/pref/xpinstall.js
lib/${MOZILLA}/defaults/profile/US/bookmarks.html
lib/${MOZILLA}/defaults/profile/US/chrome/userChrome-example.css
lib/${MOZILLA}/defaults/profile/US/chrome/userContent-example.css
@@ -289,6 +287,10 @@ lib/${MOZILLA}/defaults/profile/US/search.rdf
lib/${MOZILLA}/defaults/profile/bookmarks.html
lib/${MOZILLA}/defaults/profile/chrome/userChrome-example.css
lib/${MOZILLA}/defaults/profile/chrome/userContent-example.css
+lib/${MOZILLA}/defaults/profile/extensions/Extensions.rdf
+lib/${MOZILLA}/defaults/profile/extensions/installed-extensions.txt
+lib/${MOZILLA}/defaults/profile/extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/install.rdf
+lib/${MOZILLA}/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/${MOZILLA}/defaults/profile/localstore.rdf
lib/${MOZILLA}/defaults/profile/mimeTypes.rdf
lib/${MOZILLA}/defaults/profile/panels.rdf
@@ -300,8 +302,17 @@ lib/${MOZILLA}/defaults/wallet/SchemaConcat.tbl
lib/${MOZILLA}/defaults/wallet/SchemaStrings.tbl
lib/${MOZILLA}/defaults/wallet/StateSchema.tbl
lib/${MOZILLA}/defaults/wallet/VcardSchema.tbl
+lib/${MOZILLA}/extensions/Extensions.rdf
+lib/${MOZILLA}/extensions/installed-extensions-processed.txt
+lib/${MOZILLA}/extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/install.rdf
+lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+lib/${MOZILLA}/greprefs/all.js
+lib/${MOZILLA}/greprefs/non-shared.txt
+lib/${MOZILLA}/greprefs/security-prefs.js
+lib/${MOZILLA}/greprefs/xpinstall.js
lib/${MOZILLA}/icons/mozicon16.xpm
lib/${MOZILLA}/icons/mozicon50.xpm
+lib/${MOZILLA}/init.d/README
lib/${MOZILLA}/libsoftokn3.chk
lib/${MOZILLA}/res/EditorOverride.css
lib/${MOZILLA}/res/arrow.gif
@@ -364,30 +375,18 @@ lib/${MOZILLA}/res/samples/bform.css
lib/${MOZILLA}/res/samples/bg.jpg
lib/${MOZILLA}/res/samples/cform.css
lib/${MOZILLA}/res/samples/checkboxTest.xul
-lib/${MOZILLA}/res/samples/colorpicker.xul
lib/${MOZILLA}/res/samples/demoform.css
-lib/${MOZILLA}/res/samples/dexopenchrome.xul
-lib/${MOZILLA}/res/samples/dexparamdialog.html
-lib/${MOZILLA}/res/samples/dexparamdialog.xul
lib/${MOZILLA}/res/samples/find.html
lib/${MOZILLA}/res/samples/gear1.gif
-lib/${MOZILLA}/res/samples/hidetoolicon.css
-lib/${MOZILLA}/res/samples/hidetoolicon.xul
lib/${MOZILLA}/res/samples/image_props.html
lib/${MOZILLA}/res/samples/mozform.css
lib/${MOZILLA}/res/samples/printsetup.html
lib/${MOZILLA}/res/samples/raptor.jpg
lib/${MOZILLA}/res/samples/rock_gra.gif
-lib/${MOZILLA}/res/samples/sampleimages/bongo.gif
-lib/${MOZILLA}/res/samples/sampleimages/down.gif
-lib/${MOZILLA}/res/samples/sampleimages/left.gif
-lib/${MOZILLA}/res/samples/sampleimages/right.gif
-lib/${MOZILLA}/res/samples/sampleimages/up.gif
lib/${MOZILLA}/res/samples/scrollbarTest1.xul
lib/${MOZILLA}/res/samples/scrollbarTest2.xul
lib/${MOZILLA}/res/samples/sliderTest1.xul
lib/${MOZILLA}/res/samples/soundtest.html
-lib/${MOZILLA}/res/samples/tab.xul
lib/${MOZILLA}/res/samples/test.wav
lib/${MOZILLA}/res/samples/test0.html
lib/${MOZILLA}/res/samples/test1.html
@@ -422,8 +421,6 @@ lib/${MOZILLA}/res/samples/test_weight.html
lib/${MOZILLA}/res/samples/toolbarTest1.xul
lib/${MOZILLA}/res/samples/treeTest1.css
lib/${MOZILLA}/res/samples/treeTest1.xul
-lib/${MOZILLA}/res/samples/widgets.xul
-lib/${MOZILLA}/res/samples/xpmenu.xul
lib/${MOZILLA}/res/samples/xulTest.css
lib/${MOZILLA}/res/table-add-column-after-active.gif
lib/${MOZILLA}/res/table-add-column-after-hover.gif
@@ -506,7 +503,6 @@ include/${MOZILLA}/appcomps/nsCharsetMenu.h
include/${MOZILLA}/appcomps/nsFontPackageHandler.h
include/${MOZILLA}/appcomps/nsIFindService.h
include/${MOZILLA}/appcomps/nsIHTTPIndex.h
-include/${MOZILLA}/appcomps/nsIRelatedLinksHandler.h
include/${MOZILLA}/appcomps/nsISearchContext.h
include/${MOZILLA}/appcomps/nsISearchService.h
include/${MOZILLA}/appcomps/nsIWindowDataSource.h
@@ -518,7 +514,6 @@ include/${MOZILLA}/appshell/nsICmdLineService.h
include/${MOZILLA}/appshell/nsINativeAppSupport.h
include/${MOZILLA}/appshell/nsIPopupWindowManager.h
include/${MOZILLA}/appshell/nsISplashScreen.h
-include/${MOZILLA}/appshell/nsITimingService.h
include/${MOZILLA}/appshell/nsIUserInfo.h
include/${MOZILLA}/appshell/nsIWebShellWindow.h
include/${MOZILLA}/appshell/nsIWindowMediator.h
@@ -556,7 +551,6 @@ include/${MOZILLA}/chardet/nsIStringCharsetDetector.h
include/${MOZILLA}/chardet/nsIXMLEncodingService.h
include/${MOZILLA}/chardet/nsMetaCharsetCID.h
include/${MOZILLA}/chardet/nsXMLEncodingCID.h
-include/${MOZILLA}/chrome/nsIChromeRegistry.h
include/${MOZILLA}/commandhandler/nsICommandManager.h
include/${MOZILLA}/commandhandler/nsICommandParams.h
include/${MOZILLA}/commandhandler/nsIControllerCommand.h
@@ -586,12 +580,12 @@ include/${MOZILLA}/content/nsContentErrors.h
include/${MOZILLA}/content/nsContentPolicyUtils.h
include/${MOZILLA}/content/nsContentUtils.h
include/${MOZILLA}/content/nsDOMCSSDeclaration.h
+include/${MOZILLA}/content/nsFrameManager.h
+include/${MOZILLA}/content/nsFrameManagerBase.h
include/${MOZILLA}/content/nsHTMLAtomList.h
include/${MOZILLA}/content/nsHTMLAtoms.h
include/${MOZILLA}/content/nsHTMLValue.h
-include/${MOZILLA}/content/nsIAnonymousContent.h
include/${MOZILLA}/content/nsIAttribute.h
-include/${MOZILLA}/content/nsIAttributeContent.h
include/${MOZILLA}/content/nsIBindingManager.h
include/${MOZILLA}/content/nsICSSGroupRule.h
include/${MOZILLA}/content/nsICSSImportRule.h
@@ -607,6 +601,7 @@ include/${MOZILLA}/content/nsICSSStyleRule.h
include/${MOZILLA}/content/nsICSSStyleRuleDOMWrapper.h
include/${MOZILLA}/content/nsICSSStyleRuleProcessor.h
include/${MOZILLA}/content/nsICSSStyleSheet.h
+include/${MOZILLA}/content/nsIChromeRegistry.h
include/${MOZILLA}/content/nsIComputedDOMStyle.h
include/${MOZILLA}/content/nsIContent.h
include/${MOZILLA}/content/nsIContentIterator.h
@@ -630,7 +625,6 @@ include/${MOZILLA}/content/nsIFrameLoader.h
include/${MOZILLA}/content/nsIFrameSetElement.h
include/${MOZILLA}/content/nsIHTMLCSSStyleSheet.h
include/${MOZILLA}/content/nsIHTMLContent.h
-include/${MOZILLA}/content/nsIHTMLContentContainer.h
include/${MOZILLA}/content/nsIHTMLDocument.h
include/${MOZILLA}/content/nsIHTMLTableCellElement.h
include/${MOZILLA}/content/nsIHTMLTableColElement.h
@@ -676,7 +670,6 @@ include/${MOZILLA}/content/nsIStyleSheet.h
include/${MOZILLA}/content/nsIStyleSheetLinkingElement.h
include/${MOZILLA}/content/nsIStyledContent.h
include/${MOZILLA}/content/nsISyncLoadDOMService.h
-include/${MOZILLA}/content/nsITextAreaElement.h
include/${MOZILLA}/content/nsITextContent.h
include/${MOZILLA}/content/nsITextControlElement.h
include/${MOZILLA}/content/nsIWyciwygChannel.h
@@ -693,11 +686,14 @@ include/${MOZILLA}/content/nsIXSLTProcessorObsolete.h
include/${MOZILLA}/content/nsImageMapUtils.h
include/${MOZILLA}/content/nsLayoutAtomList.h
include/${MOZILLA}/content/nsLayoutAtoms.h
+include/${MOZILLA}/content/nsLayoutStylesheetCache.h
include/${MOZILLA}/content/nsMutationEvent.h
include/${MOZILLA}/content/nsRuleNode.h
include/${MOZILLA}/content/nsRuleWalker.h
+include/${MOZILLA}/content/nsStubDocumentObserver.h
include/${MOZILLA}/content/nsStyleContext.h
include/${MOZILLA}/content/nsStyleCoord.h
+include/${MOZILLA}/content/nsStyleSet.h
include/${MOZILLA}/content/nsStyleStruct.h
include/${MOZILLA}/content/nsStyleStructList.h
include/${MOZILLA}/content/nsStyleUtil.h
@@ -718,6 +714,7 @@ include/${MOZILLA}/dbm/nsres.h
include/${MOZILLA}/dbm/winfile.h
include/${MOZILLA}/docshell/nsCDefaultURIFixup.h
include/${MOZILLA}/docshell/nsCDocShell.h
+include/${MOZILLA}/docshell/nsDocShellCID.h
include/${MOZILLA}/docshell/nsIContentViewer.h
include/${MOZILLA}/docshell/nsIContentViewerEdit.h
include/${MOZILLA}/docshell/nsIContentViewerFile.h
@@ -728,6 +725,8 @@ include/${MOZILLA}/docshell/nsIDocShellTreeItem.h
include/${MOZILLA}/docshell/nsIDocShellTreeNode.h
include/${MOZILLA}/docshell/nsIDocShellTreeOwner.h
include/${MOZILLA}/docshell/nsIEditorDocShell.h
+include/${MOZILLA}/docshell/nsIGlobalHistory.h
+include/${MOZILLA}/docshell/nsIGlobalHistory2.h
include/${MOZILLA}/docshell/nsIMarkupDocumentViewer.h
include/${MOZILLA}/docshell/nsIScrollable.h
include/${MOZILLA}/docshell/nsITextScroll.h
@@ -737,6 +736,7 @@ include/${MOZILLA}/docshell/nsIWebPageDescriptor.h
include/${MOZILLA}/dom/domstubs.h
include/${MOZILLA}/dom/nsDOMCID.h
include/${MOZILLA}/dom/nsDOMError.h
+include/${MOZILLA}/dom/nsDOMString.h
include/${MOZILLA}/dom/nsIBaseDOMException.h
include/${MOZILLA}/dom/nsIDOM3Document.h
include/${MOZILLA}/dom/nsIDOM3DocumentEvent.h
@@ -953,7 +953,6 @@ include/${MOZILLA}/dom/nsIJSEventListener.h
include/${MOZILLA}/dom/nsIJSNativeInitializer.h
include/${MOZILLA}/dom/nsIScriptContext.h
include/${MOZILLA}/dom/nsIScriptContextOwner.h
-include/${MOZILLA}/dom/nsIScriptEventListener.h
include/${MOZILLA}/dom/nsIScriptExternalNameSet.h
include/${MOZILLA}/dom/nsIScriptGlobalObject.h
include/${MOZILLA}/dom/nsIScriptGlobalObjectOwner.h
@@ -990,12 +989,9 @@ include/${MOZILLA}/embed_base/nsEmbedAPI.h
include/${MOZILLA}/embed_base/nsIWindowCreator.h
include/${MOZILLA}/embed_base/nsIWindowCreator2.h
include/${MOZILLA}/embedcomponents/nsIAppStartupNotifier.h
-include/${MOZILLA}/embedstring/nsEmbedString.h
include/${MOZILLA}/expat/xmlparse.h
+include/${MOZILLA}/extensions/nsIExtensionManager.h
include/${MOZILLA}/exthandler/nsCExternalHandlerService.h
-include/${MOZILLA}/exthandler/nsExternalHelperAppService.h
-include/${MOZILLA}/exthandler/nsExternalProtocolHandler.h
-include/${MOZILLA}/exthandler/nsHelperAppRDF.h
include/${MOZILLA}/exthandler/nsIExternalHelperAppService.h
include/${MOZILLA}/exthandler/nsIExternalProtocolService.h
include/${MOZILLA}/exthandler/nsOSHelperAppService.h
@@ -1028,7 +1024,6 @@ include/${MOZILLA}/gfx/nsIFontEnumerator.h
include/${MOZILLA}/gfx/nsIFontList.h
include/${MOZILLA}/gfx/nsIFontMetrics.h
include/${MOZILLA}/gfx/nsIFreeType2.h
-include/${MOZILLA}/gfx/nsIGraphics.h
include/${MOZILLA}/gfx/nsIImage.h
include/${MOZILLA}/gfx/nsIPrintOptions.h
include/${MOZILLA}/gfx/nsIPrintSession.h
@@ -1041,11 +1036,12 @@ include/${MOZILLA}/gfx/nsIScreenManager.h
include/${MOZILLA}/gfx/nsIScriptableRegion.h
include/${MOZILLA}/gfx/nsITheme.h
include/${MOZILLA}/gfx/nsMargin.h
+include/${MOZILLA}/gfx/nsPaperPS.h
include/${MOZILLA}/gfx/nsPoint.h
-include/${MOZILLA}/gfx/nsPostScriptObj.h
include/${MOZILLA}/gfx/nsRect.h
include/${MOZILLA}/gfx/nsRegion.h
include/${MOZILLA}/gfx/nsSize.h
+include/${MOZILLA}/gfx/nsTempfilePS.h
include/${MOZILLA}/gfx/nsThemeConstants.h
include/${MOZILLA}/gfx/nsTransform2D.h
include/${MOZILLA}/gtkembedmoz/gtkmozembed.h
@@ -1054,7 +1050,6 @@ include/${MOZILLA}/gtkxtbin/gtk2xtbin.h
include/${MOZILLA}/gtkxtbin/gtkxtbin.h
include/${MOZILLA}/helperAppDlg/nsIHelperAppLauncherDialog.h
include/${MOZILLA}/history/nsIBrowserHistory.h
-include/${MOZILLA}/history/nsIGlobalHistory.h
include/${MOZILLA}/htmlparser/nsHTMLTagList.h
include/${MOZILLA}/htmlparser/nsHTMLTags.h
include/${MOZILLA}/htmlparser/nsHTMLTokens.h
@@ -1071,6 +1066,7 @@ include/${MOZILLA}/htmlparser/nsIParserService.h
include/${MOZILLA}/htmlparser/nsITokenizer.h
include/${MOZILLA}/htmlparser/nsParserCIID.h
include/${MOZILLA}/htmlparser/nsParserError.h
+include/${MOZILLA}/htmlparser/nsScannerString.h
include/${MOZILLA}/htmlparser/nsToken.h
include/${MOZILLA}/imglib2/ImageErrors.h
include/${MOZILLA}/imglib2/ImageLogging.h
@@ -1079,6 +1075,7 @@ include/${MOZILLA}/imglib2/imgIContainer.h
include/${MOZILLA}/imglib2/imgIContainerObserver.h
include/${MOZILLA}/imglib2/imgIDecoder.h
include/${MOZILLA}/imglib2/imgIDecoderObserver.h
+include/${MOZILLA}/imglib2/imgIEncoder.h
include/${MOZILLA}/imglib2/imgILoad.h
include/${MOZILLA}/imglib2/imgILoader.h
include/${MOZILLA}/imglib2/imgIRequest.h
@@ -1180,6 +1177,7 @@ include/${MOZILLA}/jsurl/nsJSProtocolHandler.h
include/${MOZILLA}/layout/nsBidi.h
include/${MOZILLA}/layout/nsBidiFrames.h
include/${MOZILLA}/layout/nsBidiPresUtils.h
+include/${MOZILLA}/layout/nsCSSFrameConstructor.h
include/${MOZILLA}/layout/nsCompatibility.h
include/${MOZILLA}/layout/nsFrameList.h
include/${MOZILLA}/layout/nsFrameTraversal.h
@@ -1199,7 +1197,6 @@ include/${MOZILLA}/layout/nsIBoxLayoutManager.h
include/${MOZILLA}/layout/nsIBoxObject.h
include/${MOZILLA}/layout/nsIBoxPaintManager.h
include/${MOZILLA}/layout/nsIBrowserBoxObject.h
-include/${MOZILLA}/layout/nsICSSFrameConstructor.h
include/${MOZILLA}/layout/nsICanvasFrame.h
include/${MOZILLA}/layout/nsICaret.h
include/${MOZILLA}/layout/nsICheckboxControlFrame.h
@@ -1213,7 +1210,6 @@ include/${MOZILLA}/layout/nsIFormSubmitObserver.h
include/${MOZILLA}/layout/nsIFrame.h
include/${MOZILLA}/layout/nsIFrameDebug.h
include/${MOZILLA}/layout/nsIFrameFrame.h
-include/${MOZILLA}/layout/nsIFrameManager.h
include/${MOZILLA}/layout/nsIFrameSelection.h
include/${MOZILLA}/layout/nsIFrameTraversal.h
include/${MOZILLA}/layout/nsIFrameUtil.h
@@ -1230,6 +1226,7 @@ include/${MOZILLA}/layout/nsIListBoxObject.h
include/${MOZILLA}/layout/nsIListControlFrame.h
include/${MOZILLA}/layout/nsIMenuBoxObject.h
include/${MOZILLA}/layout/nsIMenuFrame.h
+include/${MOZILLA}/layout/nsIMenuParent.h
include/${MOZILLA}/layout/nsIMutableStyleContext.h
include/${MOZILLA}/layout/nsIObjectFrame.h
include/${MOZILLA}/layout/nsIPageSequenceFrame.h
@@ -1250,8 +1247,6 @@ include/${MOZILLA}/layout/nsIScrollbarMediator.h
include/${MOZILLA}/layout/nsISelectControlFrame.h
include/${MOZILLA}/layout/nsISelectionImageService.h
include/${MOZILLA}/layout/nsIStatefulFrame.h
-include/${MOZILLA}/layout/nsIStyleFrameConstruction.h
-include/${MOZILLA}/layout/nsIStyleSet.h
include/${MOZILLA}/layout/nsITableCellLayout.h
include/${MOZILLA}/layout/nsITableLayout.h
include/${MOZILLA}/layout/nsITextControlFrame.h
@@ -1307,6 +1302,7 @@ include/${MOZILLA}/lwbrk/nsISemanticUnitScanner.h
include/${MOZILLA}/lwbrk/nsIWordBreaker.h
include/${MOZILLA}/lwbrk/nsIWordBreakerFactory.h
include/${MOZILLA}/lwbrk/nsLWBrkCIID.h
+include/${MOZILLA}/migration/nsIBrowserProfileMigrator.h
include/${MOZILLA}/mimetype/nsIMIMEHeaderParam.h
include/${MOZILLA}/mimetype/nsIMIMEInfo.h
include/${MOZILLA}/mimetype/nsIMIMEService.h
@@ -1616,6 +1612,7 @@ include/${MOZILLA}/pipnss/nsICertificateDialogs.h
include/${MOZILLA}/pipnss/nsICipherInfo.h
include/${MOZILLA}/pipnss/nsIClientAuthDialogs.h
include/${MOZILLA}/pipnss/nsIDOMCryptoDialogs.h
+include/${MOZILLA}/pipnss/nsIFormSigningDialog.h
include/${MOZILLA}/pipnss/nsIGenKeypairInfoDlg.h
include/${MOZILLA}/pipnss/nsIHash.h
include/${MOZILLA}/pipnss/nsIKeygenThread.h
@@ -1720,6 +1717,7 @@ include/${MOZILLA}/rdf/rdf.h
include/${MOZILLA}/rdfutil/nsRDFResource.h
include/${MOZILLA}/satchel/nsIFormFillController.h
include/${MOZILLA}/satchel/nsIFormHistory.h
+include/${MOZILLA}/shellservice/nsIShellService.h
include/${MOZILLA}/shistory/nsIHistoryEntry.h
include/${MOZILLA}/shistory/nsISHContainer.h
include/${MOZILLA}/shistory/nsISHEntry.h
@@ -1732,37 +1730,36 @@ include/${MOZILLA}/spellchecker/mozIPersonalDictionary.h
include/${MOZILLA}/spellchecker/mozISpellCheckingEngine.h
include/${MOZILLA}/spellchecker/mozISpellI18NManager.h
include/${MOZILLA}/spellchecker/mozISpellI18NUtil.h
-include/${MOZILLA}/string/nsAFlatString.h
-include/${MOZILLA}/string/nsASingleFragmentString.h
include/${MOZILLA}/string/nsAString.h
-include/${MOZILLA}/string/nsAStringGenerator.h
include/${MOZILLA}/string/nsAlgorithm.h
-include/${MOZILLA}/string/nsBufferHandle.h
-include/${MOZILLA}/string/nsBufferHandleUtils.h
include/${MOZILLA}/string/nsCharTraits.h
-include/${MOZILLA}/string/nsDependentConcatenation.h
include/${MOZILLA}/string/nsDependentString.h
include/${MOZILLA}/string/nsDependentSubstring.h
-include/${MOZILLA}/string/nsFragmentedString.h
+include/${MOZILLA}/string/nsEmbedString.h
include/${MOZILLA}/string/nsLiteralString.h
+include/${MOZILLA}/string/nsObsoleteAString.h
include/${MOZILLA}/string/nsPrintfCString.h
include/${MOZILLA}/string/nsPromiseFlatString.h
include/${MOZILLA}/string/nsReadableUtils.h
-include/${MOZILLA}/string/nsSharableString.h
-include/${MOZILLA}/string/nsSharedBufferList.h
-include/${MOZILLA}/string/nsSlidingString.h
-include/${MOZILLA}/string/nsStr.h
-include/${MOZILLA}/string/nsStrShared.h
include/${MOZILLA}/string/nsString.h
-include/${MOZILLA}/string/nsString2.h
-include/${MOZILLA}/string/nsStringDefines.h
-include/${MOZILLA}/string/nsStringFragment.h
+include/${MOZILLA}/string/nsStringAPI.h
include/${MOZILLA}/string/nsStringFwd.h
include/${MOZILLA}/string/nsStringIterator.h
-include/${MOZILLA}/string/nsStringIteratorUtils.h
-include/${MOZILLA}/string/nsStringTraits.h
+include/${MOZILLA}/string/nsSubstring.h
+include/${MOZILLA}/string/nsSubstringTuple.h
+include/${MOZILLA}/string/nsTAString.h
+include/${MOZILLA}/string/nsTDependentString.h
+include/${MOZILLA}/string/nsTDependentSubstring.h
+include/${MOZILLA}/string/nsTObsoleteAString.h
+include/${MOZILLA}/string/nsTPromiseFlatString.h
+include/${MOZILLA}/string/nsTString.h
+include/${MOZILLA}/string/nsTSubstring.h
+include/${MOZILLA}/string/nsTSubstringTuple.h
include/${MOZILLA}/string/nsUTF8Utils.h
include/${MOZILLA}/string/nsXPIDLString.h
+include/${MOZILLA}/string/string-template-def-char.h
+include/${MOZILLA}/string/string-template-def-unichar.h
+include/${MOZILLA}/string/string-template-undef.h
include/${MOZILLA}/toolkitcomps/nsToolkitCompsCID.h
include/${MOZILLA}/txmgr/nsITransaction.h
include/${MOZILLA}/txmgr/nsITransactionList.h
@@ -1775,7 +1772,6 @@ include/${MOZILLA}/txtsvc/nsITextServicesDocument.h
include/${MOZILLA}/txtsvc/nsITextServicesFilter.h
include/${MOZILLA}/txtsvc/nsTextServicesCID.h
include/${MOZILLA}/typeaheadfind/nsITypeAheadFind.h
-include/${MOZILLA}/ucnative/nsINativeUConvService.h
include/${MOZILLA}/uconv/nsEncoderDecoderUtils.h
include/${MOZILLA}/uconv/nsICharRepresentable.h
include/${MOZILLA}/uconv/nsICharsetAlias.h
@@ -1814,6 +1810,7 @@ include/${MOZILLA}/unicharutil/nsIUGenDetailCategory.h
include/${MOZILLA}/unicharutil/nsIUnicodeNormalizer.h
include/${MOZILLA}/unicharutil/nsUnicharUtilCIID.h
include/${MOZILLA}/unicharutil/nsUnicharUtils.h
+include/${MOZILLA}/update/nsIUpdateService.h
include/${MOZILLA}/uriloader/nsCURILoader.h
include/${MOZILLA}/uriloader/nsDocLoader.h
include/${MOZILLA}/uriloader/nsIContentHandler.h
@@ -1824,10 +1821,8 @@ include/${MOZILLA}/uriloader/nsIURILoader.h
include/${MOZILLA}/uriloader/nsIWebProgress.h
include/${MOZILLA}/uriloader/nsIWebProgressListener.h
include/${MOZILLA}/uriloader/nsURILoader.h
-include/${MOZILLA}/util/nsITimeRecorder.h
include/${MOZILLA}/util/nsTimer.h
include/${MOZILLA}/util/stopwatch.h
-include/${MOZILLA}/util/xp_obs.h
include/${MOZILLA}/view/nsICompositeListener.h
include/${MOZILLA}/view/nsIScrollPositionListener.h
include/${MOZILLA}/view/nsIScrollableView.h
@@ -1963,13 +1958,13 @@ include/${MOZILLA}/xpcom/nsAppDirectoryServiceDefs.h
include/${MOZILLA}/xpcom/nsArray.h
include/${MOZILLA}/xpcom/nsArrayEnumerator.h
include/${MOZILLA}/xpcom/nsAtomService.h
+include/${MOZILLA}/xpcom/nsAutoBuffer.h
include/${MOZILLA}/xpcom/nsAutoLock.h
include/${MOZILLA}/xpcom/nsAutoPtr.h
include/${MOZILLA}/xpcom/nsBaseHashtable.h
include/${MOZILLA}/xpcom/nsCOMArray.h
include/${MOZILLA}/xpcom/nsCOMPtr.h
include/${MOZILLA}/xpcom/nsCRT.h
-include/${MOZILLA}/xpcom/nsCWeakReference.h
include/${MOZILLA}/xpcom/nsCategoryManagerUtils.h
include/${MOZILLA}/xpcom/nsCheapSets.h
include/${MOZILLA}/xpcom/nsClassHashtable.h
@@ -2022,6 +2017,7 @@ include/${MOZILLA}/xpcom/nsID.h
include/${MOZILLA}/xpcom/nsIDebug.h
include/${MOZILLA}/xpcom/nsIDirectoryService.h
include/${MOZILLA}/xpcom/nsIEnumerator.h
+include/${MOZILLA}/xpcom/nsIEnvironment.h
include/${MOZILLA}/xpcom/nsIErrorService.h
include/${MOZILLA}/xpcom/nsIEventQueue.h
include/${MOZILLA}/xpcom/nsIEventQueueService.h
@@ -2071,7 +2067,6 @@ include/${MOZILLA}/xpcom/nsISimpleEnumerator.h
include/${MOZILLA}/xpcom/nsIStorageStream.h
include/${MOZILLA}/xpcom/nsIStreamBufferAccess.h
include/${MOZILLA}/xpcom/nsIStringEnumerator.h
-include/${MOZILLA}/xpcom/nsIStringService.h
include/${MOZILLA}/xpcom/nsIStringStream.h
include/${MOZILLA}/xpcom/nsISupports.h
include/${MOZILLA}/xpcom/nsISupportsArray.h
@@ -2110,6 +2105,7 @@ include/${MOZILLA}/xpcom/nsProxyEvent.h
include/${MOZILLA}/xpcom/nsProxyRelease.h
include/${MOZILLA}/xpcom/nsQuickSort.h
include/${MOZILLA}/xpcom/nsRecyclingAllocator.h
+include/${MOZILLA}/xpcom/nsRefPtrHashtable.h
include/${MOZILLA}/xpcom/nsScriptableInputStream.h
include/${MOZILLA}/xpcom/nsStaticAtom.h
include/${MOZILLA}/xpcom/nsStaticComponent.h
@@ -2129,7 +2125,6 @@ include/${MOZILLA}/xpcom/nsTraceRefcntImpl.h
include/${MOZILLA}/xpcom/nsUnitConversion.h
include/${MOZILLA}/xpcom/nsValueArray.h
include/${MOZILLA}/xpcom/nsVariant.h
-include/${MOZILLA}/xpcom/nsVector.h
include/${MOZILLA}/xpcom/nsVoidArray.h
include/${MOZILLA}/xpcom/nsWeakPtr.h
include/${MOZILLA}/xpcom/nsWeakReference.h
@@ -2140,7 +2135,6 @@ include/${MOZILLA}/xpcom/nscore.h
include/${MOZILLA}/xpcom/nsrootidl.h
include/${MOZILLA}/xpcom/pldhash.h
include/${MOZILLA}/xpcom/plevent.h
-include/${MOZILLA}/xpcom/plvector.h
include/${MOZILLA}/xpcom/xcDll.h
include/${MOZILLA}/xpcom/xpcom-config.h
include/${MOZILLA}/xpcom/xpt_arena.h
@@ -2157,6 +2151,7 @@ include/${MOZILLA}/xpcom_obsolete/nsIFileStream.h
include/${MOZILLA}/xpcom_obsolete/nsIRegistry.h
include/${MOZILLA}/xpcom_obsolete/nsIRegistryUtils.h
include/${MOZILLA}/xpcom_obsolete/nsSpecialSystemDirectory.h
+include/${MOZILLA}/xpcom_obsolete/xpcomobsolete.h
include/${MOZILLA}/xpconnect/XPCIDispatch.h
include/${MOZILLA}/xpconnect/mozIJSSubScriptLoader.h
include/${MOZILLA}/xpconnect/nsIJSContextStack.h
@@ -2178,6 +2173,7 @@ include/${MOZILLA}/xpinstall/nsISoftwareUpdate.h
include/${MOZILLA}/xpinstall/nsIXPIDialogService.h
include/${MOZILLA}/xpinstall/nsIXPINotifier.h
include/${MOZILLA}/xpinstall/nsIXPIProgressDialog.h
+include/${MOZILLA}/xpinstall/nsIXPInstallManager.h
include/${MOZILLA}/xpinstall/nsPICertNotification.h
include/${MOZILLA}/xpinstall/nsPIXPIProxy.h
include/${MOZILLA}/xpinstall/nsPIXPIStubHook.h
@@ -2187,11 +2183,15 @@ include/${MOZILLA}/xprintutil/xprintutil.h
include/${MOZILLA}/xremoteservice/nsIXRemoteService.h
include/${MOZILLA}/xul/nsIXULContent.h
include/${MOZILLA}/xul/nsIXULPopupListener.h
+include/${MOZILLA}/xulapp/nsIProfileMigrator.h
+include/${MOZILLA}/xulapp/nsIToolkitProfile.h
+include/${MOZILLA}/xulapp/nsIToolkitProfileService.h
include/${MOZILLA}/xulapp/nsXULAppAPI.h
include/${MOZILLA}/xuldoc/nsIController.h
include/${MOZILLA}/xuldoc/nsIControllers.h
include/${MOZILLA}/xuldoc/nsIXULContentSink.h
include/${MOZILLA}/xuldoc/nsIXULDocument.h
+include/${MOZILLA}/xuldoc/nsIXULOverlayProvider.h
include/${MOZILLA}/xuldoc/nsIXULPrototypeCache.h
include/${MOZILLA}/xuldoc/nsIXULPrototypeDocument.h
include/${MOZILLA}/xultmpl/nsIXULBuilderListener.h
@@ -2224,7 +2224,6 @@ include/${MOZILLA}/zlib/zlib.h
@comment begin DIRS
@dirrm lib/${MOZILLA}/searchplugins
@dirrm lib/${MOZILLA}/res/throbber
-@dirrm lib/${MOZILLA}/res/samples/sampleimages
@dirrm lib/${MOZILLA}/res/samples
@dirrm lib/${MOZILLA}/res/rdf
@dirrm lib/${MOZILLA}/res/inspector
@@ -2237,8 +2236,16 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm lib/${MOZILLA}/plugins
@dirrm lib/${MOZILLA}/ipc/modules
@dirrm lib/${MOZILLA}/ipc
+@dirrm lib/${MOZILLA}/init.d
@dirrm lib/${MOZILLA}/icons
+@dirrm lib/${MOZILLA}/greprefs
+@dirrm lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+@dirrm lib/${MOZILLA}/extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}
+@dirrm lib/${MOZILLA}/extensions
@dirrm lib/${MOZILLA}/defaults/wallet
+@dirrm lib/${MOZILLA}/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+@dirrm lib/${MOZILLA}/defaults/profile/extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}
+@dirrm lib/${MOZILLA}/defaults/profile/extensions
@dirrm lib/${MOZILLA}/defaults/profile/chrome
@dirrm lib/${MOZILLA}/defaults/profile/US/chrome
@dirrm lib/${MOZILLA}/defaults/profile/US
@@ -2275,6 +2282,7 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/view
@dirrm include/${MOZILLA}/util
@dirrm include/${MOZILLA}/uriloader
+@dirrm include/${MOZILLA}/update
@dirrm include/${MOZILLA}/unicharutil
@dirrm include/${MOZILLA}/ucvtw2
@dirrm include/${MOZILLA}/ucvtw
@@ -2285,7 +2293,6 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/ucvibm
@dirrm include/${MOZILLA}/ucvcn
@dirrm include/${MOZILLA}/uconv
-@dirrm include/${MOZILLA}/ucnative
@dirrm include/${MOZILLA}/typeaheadfind
@dirrm include/${MOZILLA}/txtsvc
@dirrm include/${MOZILLA}/txmgr
@@ -2294,6 +2301,7 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/spellchecker
@dirrm include/${MOZILLA}/sidebar
@dirrm include/${MOZILLA}/shistory
+@dirrm include/${MOZILLA}/shellservice
@dirrm include/${MOZILLA}/satchel
@dirrm include/${MOZILLA}/rdfutil
@dirrm include/${MOZILLA}/rdf
@@ -2321,6 +2329,7 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/mozldap
@dirrm include/${MOZILLA}/mork
@dirrm include/${MOZILLA}/mimetype
+@dirrm include/${MOZILLA}/migration
@dirrm include/${MOZILLA}/lwbrk
@dirrm include/${MOZILLA}/locale
@dirrm include/${MOZILLA}/liveconnect
@@ -2345,8 +2354,8 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/find
@dirrm include/${MOZILLA}/filepicker
@dirrm include/${MOZILLA}/exthandler
+@dirrm include/${MOZILLA}/extensions
@dirrm include/${MOZILLA}/expat
-@dirrm include/${MOZILLA}/embedstring
@dirrm include/${MOZILLA}/embedcomponents
@dirrm include/${MOZILLA}/embed_base
@dirrm include/${MOZILLA}/editor
@@ -2358,7 +2367,6 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/content
@dirrm include/${MOZILLA}/composer
@dirrm include/${MOZILLA}/commandhandler
-@dirrm include/${MOZILLA}/chrome
@dirrm include/${MOZILLA}/chardet
@dirrm include/${MOZILLA}/caps
@dirrm include/${MOZILLA}/browsercomps
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 6db18094719..e02182f327c 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,36 +1,34 @@
-$NetBSD: distinfo,v 1.7 2004/06/15 23:19:50 reinoud Exp $
+$NetBSD: distinfo,v 1.8 2004/06/23 16:47:12 taya Exp $
-SHA1 (firefox-source-0.8.tar.bz2) = 8282f17a8f51265a86923c03362bba629162bf05
-Size (firefox-source-0.8.tar.bz2) = 31102943 bytes
-SHA1 (patch-ab) = ddb1ba102585037100f7dd0c0c04e45caf32732d
-SHA1 (patch-ac) = d5e3f5833860cd3404030eff76c993ab48c0d8df
-SHA1 (patch-ad) = 09091d0a2ded2775ca35d1315ae9b95c506b28ef
-SHA1 (patch-ae) = 99935f034e6485e9e0d4eaf20e6ddd2b90b75ad5
-SHA1 (patch-af) = 3b6f5c71146b3a402b164b7f10fb652408712b73
-SHA1 (patch-ag) = fd8470f7ac0003797401ed68f459315170cbe9a8
-SHA1 (patch-ah) = d047cad352d83aacb76321ee499184ae81fc9b40
-SHA1 (patch-ai) = bc3f841e16ca81962cfe5d082527bc3891c7d8b2
-SHA1 (patch-aj) = e1fd4c748b344507eb580d2efab3b2be625b64e5
-SHA1 (patch-ak) = d47b4b2904e91eaf6b6042c20594db5e559d126d
-SHA1 (patch-al) = bd326a62794a5665dd929b59a96c24fbac51a1a3
-SHA1 (patch-am) = ddb7b53e5be832de9479d28735861a64ef34875f
-SHA1 (patch-an) = 78b448a64c2a46bc3a1d458bdbcb5d64be1ed9f4
-SHA1 (patch-ao) = 7048e3a06d1569e31d2350c2473887a50aa81498
-SHA1 (patch-ap) = 522eeeba2ff4fb57bb4bf6e83a1849e4849ca918
-SHA1 (patch-aw) = ba1a408cd3b44dcd2123672ec4cbcefb436e5330
-SHA1 (patch-ax) = 070c88dee0446b093ab1c2a9120dc1747642d46f
-SHA1 (patch-ay) = b9bc5ce449c6851781b12cd1e7bc43186b3654fd
-SHA1 (patch-ba) = d2e195900ed806aaf18e8a56efcf26c0bd4941ce
-SHA1 (patch-bb) = b3cedb7b6ae46749d5222ab9fd6bc087c781d459
-SHA1 (patch-be) = dd85f24f2ebb10d2435055ab4540d27178d8074d
-SHA1 (patch-bm) = 17cf1207bd3f3fffa355a81c8f803704068438a3
-SHA1 (patch-bn) = 78e6b99604049e6033985c230155dfd437c97660
-SHA1 (patch-bo) = a4fd1fc935e671aa12f30ccb24fa83787cc8f14f
-SHA1 (patch-bp) = b542833425591539a6b859be4eea55c88b7d69e8
-SHA1 (patch-bq) = 0c520287d97027da06a5aa65cbd038bf19a49dde
-SHA1 (patch-br) = 4fd94d2748a39a21791aaef27c9c8a8d2a1eadd8
-SHA1 (patch-bs) = e9434aadc52b0120dcfc80e57002152d2bd47605
-SHA1 (patch-bt) = a033b83ee633391ffc138442697fbe754ec92902
+SHA1 (firefox-0.9-source.tar.bz2) = 84336a6284a8c854c8887b0a585ec3ce964e2058
+Size (firefox-0.9-source.tar.bz2) = 32359326 bytes
+SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9
+SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369
+SHA1 (patch-ac) = e9bc27529cf595ab6f120d9021dd7d6c49112084
+SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d
+SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28
+SHA1 (patch-af) = 6addfc2bd0b3e3aaefff6cce6836384ca44baf30
+SHA1 (patch-ag) = 40bf4f3eb3b44d3a0d7c26cf955cf47fd6d22893
+SHA1 (patch-ah) = 4cd8e37475af19bcfe4530f910990f86c89ed916
+SHA1 (patch-ai) = 607e2f599ab74d7549930183f160ee9daab523e5
+SHA1 (patch-aj) = 4e7424b078afc0f4dfcf51a3857aba5a66c7c31c
+SHA1 (patch-ak) = 6fb6ed901990efbb1a25ca5666470f8f2467fa8a
+SHA1 (patch-al) = ece2c5591e3a86f80ce8257b87a802aa2fda6494
+SHA1 (patch-an) = 47bb24afbb0def95d30d466700c1983f18a14641
+SHA1 (patch-ao) = 4162763cc7af61deb1795f85fdbd96e3ef930d4d
+SHA1 (patch-aw) = e2968bcf9e1175a660dcc715d68b33cdc221ef81
+SHA1 (patch-ax) = 2421096cf84bd174cfe576db855cca2338615495
+SHA1 (patch-ba) = a0d70d713d2d4746d9128724c382b019f353f5af
+SHA1 (patch-bb) = 9ba4bcd86e581496bbc6b40b3a3f062dfd5e416f
+SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991
+SHA1 (patch-bn) = d31d2b2c3712abdd766e9fa0cee147d7c8936cd4
+SHA1 (patch-bo) = 357c4cacdc179191d6fe263b4eb62cc56b7ec25f
+SHA1 (patch-bq) = 3b8a951828b0e6906e4352027b4d36c9b1f8aaae
+SHA1 (patch-br) = aa48e974306fdbfc1e71b5fd9c1f5d18771143f5
+SHA1 (patch-bs) = 81065130c96bf966b22e6abb767a5b674dcb52cb
+SHA1 (patch-bt) = 8ee09dd2acbbc0c002283b15eafbafb4f324948a
SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8
+SHA1 (patch-bx) = 721c58f89c829ec3dfd72a311d49c211833b107c
+SHA1 (patch-by) = 5c226fb01508decdf13c0db505066623d7636a0f
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
new file mode 100644
index 00000000000..b28c29ecb29
--- /dev/null
+++ b/www/firefox/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2004/06/23 16:47:12 taya Exp $
+
+diff -ru ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in
+--- ../Orig/mozilla/config/autoconf.mk.in 2004-03-21 11:31:17.000000000 +0900
++++ ./config/autoconf.mk.in 2004-06-15 23:55:36.000000000 +0900
+@@ -31,13 +31,13 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir = @includedir@/$(MOZILLA_PKG_NAME)
+ libdir = @libdir@
+ datadir = @datadir@
+ mandir = @mandir@
+-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = @datadir@/idl/$(MOZILLA_PKG_NAME)
+
+-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++mozappdir = $(libdir)/$(MOZILLA_PKG_NAME)
+ mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+ mrelibdir = $(mredir)/lib
+
diff --git a/www/firefox/patches/patch-ab b/www/firefox/patches/patch-ab
index 36ce64320c6..42befd6df27 100644
--- a/www/firefox/patches/patch-ab
+++ b/www/firefox/patches/patch-ab
@@ -1,8 +1,9 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/29 17:44:58 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2004/06/23 16:47:12 taya Exp $
---- configure.in.orig 2004-02-27 14:24:52.000000000 +0900
-+++ configure.in 2004-02-27 14:33:42.000000000 +0900
-@@ -959,6 +959,9 @@
+diff -ru ../Orig/mozilla/configure.in ./configure.in
+--- ../Orig/mozilla/configure.in 2004-05-14 06:57:46.000000000 +0900
++++ ./configure.in 2004-06-15 23:55:39.000000000 +0900
+@@ -1017,6 +1017,9 @@
# MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
# MKSHLIB_UNFORCE_ALL=''
# fi
@@ -12,22 +13,22 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/02/29 17:44:58 xtraeme Exp $
;;
*-hpux*)
-@@ -1248,6 +1251,13 @@
+@@ -1308,6 +1311,13 @@
if test "$LIBRUNPATH"; then
DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
fi
+
+ case "${target_cpu}" in
+ alpha*)
-+ CFLAGS="$CFLAGS -mieee"
-+ CXXFLAGS="$CXXFLAGS -mieee"
++ CFLAGS="$CFLAGS -mieee"
++ CXXFLAGS="$CXXFLAGS -mieee"
+ ;;
+ esac
;;
*-nto*)
-@@ -1478,7 +1488,7 @@
- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -o $@'
+@@ -1531,7 +1541,7 @@
+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
MKSHLIB_UNFORCE_ALL=''
- DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
@@ -35,22 +36,3 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/02/29 17:44:58 xtraeme Exp $
AR_LIST="$AR t"
AR_EXTRACT="$AR x"
AR_DELETE="$AR d"
-@@ -1649,7 +1659,7 @@
- [siginfo_t* info;],
- [ac_cv_siginfo_t=true],
- [ac_cv_siginfo_t=false])])
--if test "$ac_cv_siginfo_t" = true ; then
-+if test "$OS_TARGET" != "NetBSD" -a "$ac_cv_siginfo_t" = true ; then
- AC_DEFINE(HAVE_SIGINFO_T)
- AC_MSG_RESULT(yes)
- else
-@@ -2192,9 +2202,6 @@
- CXXFLAGS="$CXXFLAGS -mt"
- fi
- ;;
-- *-*-netbsd*)
-- USE_PTHREADS=
-- _PTHREAD_LDFLAGS=
- esac
- fi
-
diff --git a/www/firefox/patches/patch-ac b/www/firefox/patches/patch-ac
index e7d7df0ab27..a0256bbbd36 100644
--- a/www/firefox/patches/patch-ac
+++ b/www/firefox/patches/patch-ac
@@ -1,7 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2004/06/02 15:09:01 taya Exp $
+$NetBSD: patch-ac,v 1.3 2004/06/23 16:47:12 taya Exp $
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2003-08-15 13:00:23.000000000 +0900
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-05-30 21:36:44.000000000 +0900
+diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-04-23 05:50:05.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-06-15 23:55:43.000000000 +0900
@@ -49,6 +49,9 @@
ifeq (86,$(findstring 86,$(OS_TEST)))
CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
@@ -12,7 +13,7 @@ $NetBSD: patch-ac,v 1.2 2004/06/02 15:09:01 taya Exp $
endif
#
# New code for Linux, et. al., with gcc
-@@ -135,7 +138,7 @@
+@@ -140,7 +143,7 @@
# NetBSD/ARM
#
ifeq ($(OS_ARCH),NetBSD)
@@ -21,7 +22,7 @@ $NetBSD: patch-ac,v 1.2 2004/06/02 15:09:01 taya Exp $
CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
endif
endif
-@@ -169,7 +172,7 @@
+@@ -174,7 +177,7 @@
# NetBSD/m68k
#
ifeq ($(OS_ARCH),NetBSD)
@@ -30,7 +31,7 @@ $NetBSD: patch-ac,v 1.2 2004/06/02 15:09:01 taya Exp $
CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
endif
endif
-@@ -295,6 +298,13 @@
+@@ -305,6 +308,13 @@
CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
endif
diff --git a/www/firefox/patches/patch-ad b/www/firefox/patches/patch-ad
index 1e1b4ca5fbf..1d7a1388f0f 100644
--- a/www/firefox/patches/patch-ad
+++ b/www/firefox/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/02/29 17:44:58 xtraeme Exp $
+$NetBSD: patch-ad,v 1.2 2004/06/23 16:47:12 taya Exp $
diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2001-09-29 05:12:51.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2003-10-20 10:17:19.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2004-06-15 23:55:46.000000000 +0900
@@ -132,6 +132,15 @@
}
}
diff --git a/www/firefox/patches/patch-ae b/www/firefox/patches/patch-ae
index 12dfc2e1927..6c9d46d1abd 100644
--- a/www/firefox/patches/patch-ae
+++ b/www/firefox/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
+$NetBSD: patch-ae,v 1.2 2004/06/23 16:47:12 taya Exp $
diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2003-10-20 10:17:21.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2004-06-15 23:55:47.000000000 +0900
@@ -123,17 +123,27 @@
}
}
diff --git a/www/firefox/patches/patch-af b/www/firefox/patches/patch-af
index 09041470e32..aa6094ed573 100644
--- a/www/firefox/patches/patch-af
+++ b/www/firefox/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
+$NetBSD: patch-af,v 1.2 2004/06/23 16:47:12 taya Exp $
diff -ru ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c ./security/nss/lib/freebl/unix_rand.c
---- ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c 2003-03-21 14:24:29.000000000 +0900
-+++ ./security/nss/lib/freebl/unix_rand.c 2003-10-20 11:07:15.000000000 +0900
+--- ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c 2003-05-31 08:31:19.000000000 +0900
++++ ./security/nss/lib/freebl/unix_rand.c 2004-06-15 23:55:49.000000000 +0900
@@ -32,6 +32,7 @@
*/
diff --git a/www/firefox/patches/patch-ag b/www/firefox/patches/patch-ag
index 9a83f9dd88b..3c72b087966 100644
--- a/www/firefox/patches/patch-ag
+++ b/www/firefox/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
+$NetBSD: patch-ag,v 1.2 2004/06/23 16:47:12 taya Exp $
diff -ru ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h
--- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2003-01-17 21:39:36.000000000 +0900
-+++ ./extensions/transformiix/source/base/ErrorObserver.h 2003-10-20 10:17:26.000000000 +0900
++++ ./extensions/transformiix/source/base/ErrorObserver.h 2004-06-15 23:55:51.000000000 +0900
@@ -28,7 +28,8 @@
#include "baseutils.h"
diff --git a/www/firefox/patches/patch-ah b/www/firefox/patches/patch-ah
index 229c0245563..be4c0e6f696 100644
--- a/www/firefox/patches/patch-ah
+++ b/www/firefox/patches/patch-ah
@@ -1,8 +1,9 @@
-$NetBSD: patch-ah,v 1.1 2004/04/29 14:13:19 adam Exp $
+$NetBSD: patch-ah,v 1.2 2004/06/23 16:47:12 taya Exp $
---- gfx/idl/nsIFreeType2.idl.orig 2004-04-29 10:46:15.000000000 +0000
-+++ gfx/idl/nsIFreeType2.idl
-@@ -72,10 +72,11 @@ native FT_Pointer(FT_Pointer);
+diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
+--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl 2004-04-16 10:09:33.000000000 +0900
++++ ./gfx/idl/nsIFreeType2.idl 2004-06-15 23:55:52.000000000 +0900
+@@ -76,10 +76,11 @@
native FT_Sfnt_Tag(FT_Sfnt_Tag);
native FT_Size(FT_Size);
@@ -15,8 +16,8 @@ $NetBSD: patch-ah,v 1.1 2004/04/29 14:13:19 adam Exp $
+native FTC_ImageCache(FTC_ImageCache);
native FTC_Manager(FTC_Manager);
- /*
-@@ -87,7 +88,7 @@ interface nsIFreeType2 : nsISupports
+ // #ifdef MOZ_SVG
+@@ -99,7 +100,7 @@
readonly attribute FT_Library library;
readonly attribute FTC_Manager FTCacheManager;
@@ -25,7 +26,7 @@ $NetBSD: patch-ah,v 1.1 2004/04/29 14:13:19 adam Exp $
void doneFace(in FT_Face face);
void doneFreeType(in FT_Library lib);
-@@ -103,16 +104,16 @@ interface nsIFreeType2 : nsISupports
+@@ -115,16 +116,16 @@
void outlineDecompose(in FT_Outline_p outline,
in const_FT_Outline_Funcs_p funcs, in voidPtr p);
void setCharmap(in FT_Face face, in FT_CharMap charmap);
@@ -43,6 +44,6 @@ $NetBSD: patch-ah,v 1.1 2004/04/29 14:13:19 adam Exp $
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);
-
- FT_ULong getFirstChar(in FT_Face face, out FT_UInt gindex);
- FT_ULong getNextChar(in FT_Face face, in FT_ULong charcode, out FT_UInt gindex);
+ /* #ifdef MOZ_SVG */
+ void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
+ in FT_Vector_p delta);
diff --git a/www/firefox/patches/patch-ai b/www/firefox/patches/patch-ai
index 48586fc76f5..d8049257d9d 100644
--- a/www/firefox/patches/patch-ai
+++ b/www/firefox/patches/patch-ai
@@ -1,8 +1,9 @@
-$NetBSD: patch-ai,v 1.1 2004/04/29 14:13:19 adam Exp $
+$NetBSD: patch-ai,v 1.2 2004/06/23 16:47:12 taya Exp $
---- gfx/src/ps/nsFontMetricsPS.cpp.orig 2004-04-29 11:18:03.000000000 +0000
-+++ gfx/src/ps/nsFontMetricsPS.cpp
-@@ -1126,10 +1126,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
+diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2004-02-05 10:57:05.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.cpp 2004-06-15 23:55:54.000000000 +0900
+@@ -1141,10 +1141,10 @@
mPixelSize = NSToIntRound(app2dev * mFont->size);
@@ -17,7 +18,7 @@ $NetBSD: patch-ai,v 1.1 2004/04/29 14:13:19 adam Exp $
nsresult rv;
mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1175,7 +1175,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
+@@ -1190,7 +1190,7 @@
if (!face)
return 0;
@@ -26,7 +27,7 @@ $NetBSD: patch-ai,v 1.1 2004/04/29 14:13:19 adam Exp $
nsresult rv = mFt2->GetImageCache(&iCache);
if (NS_FAILED(rv)) {
NS_ERROR("Failed to get Image Cache");
-@@ -1213,8 +1213,8 @@ nsFontPSFreeType::getFTFace()
+@@ -1228,8 +1228,8 @@
FTC_Manager cManager;
mFt2->GetFTCacheManager(&cManager);
@@ -37,7 +38,7 @@ $NetBSD: patch-ai,v 1.1 2004/04/29 14:13:19 adam Exp $
NS_ASSERTION(rv==0, "failed to get face/size");
if (rv)
return nsnull;
-@@ -1609,16 +1609,16 @@ void nsFT2Type8Generator::GeneratePSFont
+@@ -1622,16 +1622,16 @@
mEntry->GetFamilyName(fontName);
mEntry->GetStyleName(styleName);
diff --git a/www/firefox/patches/patch-aj b/www/firefox/patches/patch-aj
index cdf08af22c5..fb5064b01d5 100644
--- a/www/firefox/patches/patch-aj
+++ b/www/firefox/patches/patch-aj
@@ -1,8 +1,9 @@
-$NetBSD: patch-aj,v 1.1 2004/04/29 14:13:19 adam Exp $
+$NetBSD: patch-aj,v 1.2 2004/06/23 16:47:12 taya Exp $
---- gfx/src/freetype/nsFreeType.h.orig 2003-06-11 18:15:22.000000000 +0000
-+++ gfx/src/freetype/nsFreeType.h
-@@ -104,13 +104,13 @@ typedef FT_Error (*FT_Outline_Decompose_
+diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h 2004-04-17 06:31:42.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.h 2004-06-15 23:55:59.000000000 +0900
+@@ -104,13 +104,13 @@
typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap);
typedef FT_Error (*FTC_Image_Cache_Lookup_t)
@@ -17,10 +18,10 @@ $NetBSD: patch-aj,v 1.1 2004/04/29 14:13:19 adam Exp $
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*);
-
- typedef FT_ULong (*FT_Get_First_Char_t)(FT_Face, FT_UInt*);
- typedef FT_ULong (*FT_Get_Next_Char_t)(FT_Face, FT_ULong, FT_UInt*);
-@@ -157,7 +157,7 @@ protected:
+ // #ifdef MOZ_SVG
+ typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
+ typedef FT_Error (*FT_Get_Kerning_t)
+@@ -165,7 +165,7 @@
FT_Outline_Decompose_t nsFT_Outline_Decompose;
FT_Set_Charmap_t nsFT_Set_Charmap;
FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup;
@@ -29,7 +30,7 @@ $NetBSD: patch-aj,v 1.1 2004/04/29 14:13:19 adam Exp $
FTC_Manager_Done_t nsFTC_Manager_Done;
FTC_Manager_New_t nsFTC_Manager_New;
FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
-@@ -195,7 +195,7 @@ protected:
+@@ -213,7 +213,7 @@
PRLibrary *mSharedLib;
FT_Library mFreeTypeLibrary;
FTC_Manager mFTCacheManager;
diff --git a/www/firefox/patches/patch-ak b/www/firefox/patches/patch-ak
index 78d5cb89c20..5dd9e37ee75 100644
--- a/www/firefox/patches/patch-ak
+++ b/www/firefox/patches/patch-ak
@@ -1,23 +1,24 @@
-$NetBSD: patch-ak,v 1.1 2004/04/29 14:13:19 adam Exp $
+$NetBSD: patch-ak,v 1.2 2004/06/23 16:47:12 taya Exp $
---- gfx/src/freetype/nsFreeType.cpp.orig 2003-09-07 22:20:37.000000000 +0000
-+++ gfx/src/freetype/nsFreeType.cpp
-@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
+diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.cpp 2004-06-15 23:56:01.000000000 +0900
+@@ -110,11 +110,11 @@
{"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE},
{"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE},
{"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE},
- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
-+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
++ {"FTC_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},
- {"FT_Get_First_Char", NS_FT2_OFFSET(nsFT_Get_First_Char), PR_FALSE},
- {"FT_Get_Next_Char", NS_FT2_OFFSET(nsFT_Get_Next_Char), PR_FALSE},
- {nsnull, 0, 0},
-@@ -276,7 +276,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
++ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
+ // #ifdef MOZ_SVG
+ {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE},
+ {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE},
+@@ -282,7 +282,7 @@
}
NS_IMETHODIMP
@@ -26,7 +27,7 @@ $NetBSD: patch-ak,v 1.1 2004/04/29 14:13:19 adam Exp $
FT_UInt glyphID, FT_Glyph *glyph)
{
// call the FreeType2 function via the function pointer
-@@ -285,11 +285,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
+@@ -291,11 +291,11 @@
}
NS_IMETHODIMP
@@ -41,7 +42,7 @@ $NetBSD: patch-ak,v 1.1 2004/04/29 14:13:19 adam Exp $
return error ? NS_ERROR_FAILURE : NS_OK;
}
-@@ -314,7 +314,7 @@ nsFreeType2::ManagerNew(FT_Library libra
+@@ -320,7 +320,7 @@
}
NS_IMETHODIMP
@@ -50,7 +51,7 @@ $NetBSD: patch-ak,v 1.1 2004/04/29 14:13:19 adam Exp $
{
// call the FreeType2 function via the function pointer
FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -345,7 +345,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
+@@ -389,7 +389,7 @@
}
NS_IMETHODIMP
diff --git a/www/firefox/patches/patch-al b/www/firefox/patches/patch-al
index d0be0c26ab0..40febc33ca8 100644
--- a/www/firefox/patches/patch-al
+++ b/www/firefox/patches/patch-al
@@ -1,8 +1,9 @@
-$NetBSD: patch-al,v 1.1 2004/04/29 14:13:19 adam Exp $
+$NetBSD: patch-al,v 1.2 2004/06/23 16:47:12 taya Exp $
---- gfx/src/ps/nsFontMetricsPS.h.orig 2004-04-29 11:13:06.000000000 +0000
-+++ gfx/src/ps/nsFontMetricsPS.h
-@@ -320,7 +320,7 @@ protected:
+diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h 2003-04-23 01:25:09.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.h 2004-06-15 23:56:04.000000000 +0900
+@@ -320,7 +320,7 @@
nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
nsCOMPtr<nsIFreeType2> mFt2;
PRUint16 mPixelSize;
@@ -11,7 +12,7 @@ $NetBSD: patch-al,v 1.1 2004/04/29 14:13:19 adam Exp $
static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -363,7 +363,7 @@ public:
+@@ -363,7 +363,7 @@
protected:
nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
nsCOMPtr<nsIFreeType2> mFt2;
diff --git a/www/firefox/patches/patch-am b/www/firefox/patches/patch-am
deleted file mode 100644
index 1d7420631b2..00000000000
--- a/www/firefox/patches/patch-am
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
-
---- nsprpub/pr/src/pthreads/ptio.c.orig 2004-02-27 14:40:00.000000000 +0900
-+++ nsprpub/pr/src/pthreads/ptio.c 2004-02-27 14:43:11.000000000 +0900
-@@ -192,7 +192,7 @@
- #endif
- #endif
-
--#ifdef DARWIN
-+#if defined(DARWIN) || (defined(__NetBSD__) && defined(IPV6_V6ONLY))
- static PRBool _pr_ipv6_v6only_on_by_default;
- /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- #ifndef IPV6_V6ONLY
-@@ -205,7 +205,7 @@
- #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(HPUX) \
- || defined(LINUX) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \
- || defined(NTO) || defined(OPENBSD) || defined(DARWIN) \
-- || defined(UNIXWARE)
-+ || defined(UNIXWARE) || defined(NETBSD)
- #define _PRSockOptVal_t void *
- #else
- #error "Cannot determine architecture"
-@@ -1157,7 +1157,7 @@
- _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
- PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-
--#ifdef DARWIN
-+#if defined(DARWIN) || (defined(__NetBSD__) && defined(IPV6_V6ONLY))
- /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
- * is turned on by default, contrary to what RFC 3493, Section
- * 5.3 says. So we have to turn it off. Find out whether we
-@@ -3477,7 +3477,7 @@
- if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
- else
- {
--#ifdef DARWIN
-+#if defined(DARWIN) || (defined(__NetBSD__) && defined(IPV6_V6ONLY))
- if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
- {
- int on = 0;
diff --git a/www/firefox/patches/patch-an b/www/firefox/patches/patch-an
index 5cd5fdd610b..38e5b4fd395 100644
--- a/www/firefox/patches/patch-an
+++ b/www/firefox/patches/patch-an
@@ -1,8 +1,9 @@
-$NetBSD: patch-an,v 1.1 2004/04/29 14:13:19 adam Exp $
+$NetBSD: patch-an,v 1.2 2004/06/23 16:47:12 taya Exp $
---- gfx/src/x11shared/nsFontFreeType.h.orig 2004-04-29 12:34:09.000000000 +0000
-+++ gfx/src/x11shared/nsFontFreeType.h
-@@ -110,7 +110,7 @@ protected:
+diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h 2003-04-23 01:25:13.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.h 2004-06-15 23:56:10.000000000 +0900
+@@ -110,7 +110,7 @@
XImage *GetXImage(PRUint32 width, PRUint32 height);
nsITrueTypeFontCatalogEntry *mFaceID;
PRUint16 mPixelSize;
diff --git a/www/firefox/patches/patch-ao b/www/firefox/patches/patch-ao
index 33cacdfd170..9e4bca5a44d 100644
--- a/www/firefox/patches/patch-ao
+++ b/www/firefox/patches/patch-ao
@@ -1,8 +1,9 @@
-$NetBSD: patch-ao,v 1.1 2004/04/29 14:13:19 adam Exp $
+$NetBSD: patch-ao,v 1.2 2004/06/23 16:47:12 taya Exp $
---- gfx/src/x11shared/nsFontFreeType.cpp.orig 2004-04-29 12:32:42.000000000 +0000
-+++ gfx/src/x11shared/nsFontFreeType.cpp
-@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
+diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2003-12-25 17:24:52.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-06-15 23:56:14.000000000 +0900
+@@ -177,7 +177,7 @@
FTC_Manager mgr;
nsresult rv;
mFt2->GetFTCacheManager(&mgr);
@@ -11,7 +12,7 @@ $NetBSD: patch-ao,v 1.1 2004/04/29 14:13:19 adam Exp $
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
if (NS_FAILED(rv))
return nsnull;
-@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
+@@ -191,22 +191,15 @@
PRBool embedded_bimap = PR_FALSE;
mFaceID = aFaceID;
mPixelSize = aPixelSize;
@@ -38,7 +39,7 @@ $NetBSD: patch-ao,v 1.1 2004/04/29 14:13:19 adam Exp $
PRUint32 num_embedded_bitmaps, i;
PRInt32* embedded_bitmapheights;
mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
+@@ -218,7 +211,6 @@
if (embedded_bitmapheights[i] == aPixelSize) {
embedded_bimap = PR_TRUE;
// unhinted must be set for embedded bitmaps to be used
@@ -46,7 +47,7 @@ $NetBSD: patch-ao,v 1.1 2004/04/29 14:13:19 adam Exp $
break;
}
}
-@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
+@@ -312,7 +304,7 @@
if (!face)
return NS_ERROR_FAILURE;
@@ -55,7 +56,7 @@ $NetBSD: patch-ao,v 1.1 2004/04/29 14:13:19 adam Exp $
mFt2->GetImageCache(&icache);
if (!icache)
return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
+@@ -401,7 +393,7 @@
if (!face)
return 0;
@@ -64,7 +65,7 @@ $NetBSD: patch-ao,v 1.1 2004/04/29 14:13:19 adam Exp $
mFt2->GetImageCache(&icache);
if (!icache)
return 0;
-@@ -725,7 +717,7 @@ nsFreeTypeXImage::DrawString(nsRendering
+@@ -723,7 +715,7 @@
if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
#endif
diff --git a/www/firefox/patches/patch-ap b/www/firefox/patches/patch-ap
deleted file mode 100644
index ab17351c388..00000000000
--- a/www/firefox/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/04/29 16:19:36 recht Exp $
-
---- gfx/src/gtk/nsFontMetricsXft.cpp.orig 2004-01-13 00:30:58.000000000 +0100
-+++ gfx/src/gtk/nsFontMetricsXft.cpp 2004-04-29 09:36:03.000000000 +0200
-@@ -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/www/firefox/patches/patch-aw b/www/firefox/patches/patch-aw
index a03cbe8e09a..64809de5124 100644
--- a/www/firefox/patches/patch-aw
+++ b/www/firefox/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
+$NetBSD: patch-aw,v 1.2 2004/06/23 16:47:12 taya Exp $
diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in
---- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in 2003-04-19 05:14:09.000000000 +0900
-+++ ./widget/src/gtksuperwin/Makefile.in 2003-10-20 10:18:55.000000000 +0900
+--- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in 2004-01-07 22:36:54.000000000 +0900
++++ ./widget/src/gtksuperwin/Makefile.in 2004-06-15 23:56:15.000000000 +0900
@@ -25,6 +25,7 @@
MODULE = widget
LIBRARY_NAME = gtksuperwin
EXPORT_LIBRARY = 1
+MKSHLIB = $(MKCSHLIB)
+ PACKAGE_FILE = gtksuperwin.pkg
- CSRCS = \
diff --git a/www/firefox/patches/patch-ax b/www/firefox/patches/patch-ax
index 6fa5f3789c6..1cc44a26b8b 100644
--- a/www/firefox/patches/patch-ax
+++ b/www/firefox/patches/patch-ax
@@ -1,8 +1,9 @@
-$NetBSD: patch-ax,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
+$NetBSD: patch-ax,v 1.2 2004/06/23 16:47:12 taya Exp $
---- security/coreconf/SunOS5.mk.orig 2003-03-21 15:45:37.000000000 +1100
-+++ security/coreconf/SunOS5.mk
-@@ -165,6 +165,10 @@ endif
+diff -ru ../Orig/mozilla/security/coreconf/SunOS5.mk ./security/coreconf/SunOS5.mk
+--- ../Orig/mozilla/security/coreconf/SunOS5.mk 2003-05-16 04:12:10.000000000 +0900
++++ ./security/coreconf/SunOS5.mk 2004-06-15 23:56:19.000000000 +0900
+@@ -165,6 +165,10 @@
DSO_LDOPTS += -G -h $(notdir $@)
endif
diff --git a/www/firefox/patches/patch-ay b/www/firefox/patches/patch-ay
deleted file mode 100644
index ded875cf761..00000000000
--- a/www/firefox/patches/patch-ay
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ay,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
-
---- nsprpub/config/rules.mk.orig 2003-09-16 11:00:28.000000000 +0900
-+++ nsprpub/config/rules.mk 2004-02-27 14:50:13.000000000 +0900
-@@ -371,6 +371,9 @@
- ifeq ($(OS_ARCH),SunOS)
- grep -v ';-' $< | \
- sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-+ifdef LIBRUNPATH
-+DSO_LDOPTS +=-R$(LIBRUNPATH)
-+endif
- endif
- ifeq ($(OS_ARCH),OS2)
- echo LIBRARY $(LIBRARY_NAME)$(LIBRARY_VERSION) INITINSTANCE TERMINSTANCE > $@
diff --git a/www/firefox/patches/patch-ba b/www/firefox/patches/patch-ba
index ca9548990bd..62d863cfaba 100644
--- a/www/firefox/patches/patch-ba
+++ b/www/firefox/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2004/06/02 15:09:01 taya Exp $
+$NetBSD: patch-ba,v 1.3 2004/06/23 16:47:12 taya Exp $
diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2000-12-02 06:29:17.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.cfg 2004-05-30 23:39:50.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.cfg 2004-06-15 23:56:25.000000000 +0900
@@ -45,7 +45,8 @@
#define PR_AF_INET6 24 /* same as AF_INET6 */
diff --git a/www/firefox/patches/patch-bb b/www/firefox/patches/patch-bb
index 956982134e4..cc259701b50 100644
--- a/www/firefox/patches/patch-bb
+++ b/www/firefox/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.2 2004/06/02 15:09:01 taya Exp $
+$NetBSD: patch-bb,v 1.3 2004/06/23 16:47:12 taya Exp $
diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h 2003-09-12 02:24:53.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.h 2004-05-30 23:41:41.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.h 2004-06-15 23:56:27.000000000 +0900
@@ -44,16 +44,26 @@
#define _PR_SI_ARCHITECTURE "x86"
#elif defined(__alpha__)
diff --git a/www/firefox/patches/patch-be b/www/firefox/patches/patch-be
deleted file mode 100644
index 70a3be65ed2..00000000000
--- a/www/firefox/patches/patch-be
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-be,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
-
-diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prsocket.c ./nsprpub/pr/src/io/prsocket.c
---- ../Orig/mozilla/nsprpub/pr/src/io/prsocket.c 2002-06-12 05:08:07.000000000 +0900
-+++ ./nsprpub/pr/src/io/prsocket.c 2003-10-20 10:19:05.000000000 +0900
-@@ -1299,6 +1299,15 @@
- if (osfd == -1) {
- return 0;
- }
-+#if defined(__NetBSD__) && defined(_PR_INET6) && defined(IPV6_V6ONLY)
-+ if(domain == PR_AF_INET6){
-+ int opt = 0;
-+ if(setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, &opt, sizeof(opt))){
-+ close(osfd);
-+ return -1;
-+ }
-+ }
-+#endif
- if (type == SOCK_STREAM)
- fd = PR_AllocFileDesc(osfd, PR_GetTCPMethods());
- else
diff --git a/www/firefox/patches/patch-bm b/www/firefox/patches/patch-bm
index c5798c6505b..04061d5cb23 100644
--- a/www/firefox/patches/patch-bm
+++ b/www/firefox/patches/patch-bm
@@ -1,8 +1,8 @@
-$NetBSD: patch-bm,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
+$NetBSD: patch-bm,v 1.2 2004/06/23 16:47:12 taya Exp $
diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2003-10-20 10:19:13.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2004-06-15 23:56:36.000000000 +0900
@@ -118,18 +118,23 @@
* so they are contiguous with values passed on the stack, and then calls
* PrepareAndDispatch() to do the dirty work.
diff --git a/www/firefox/patches/patch-bn b/www/firefox/patches/patch-bn
index 1c1004d4ab1..1a69f90f7fb 100644
--- a/www/firefox/patches/patch-bn
+++ b/www/firefox/patches/patch-bn
@@ -1,9 +1,9 @@
-$NetBSD: patch-bn,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
+$NetBSD: patch-bn,v 1.2 2004/06/23 16:47:12 taya Exp $
diff -ru ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp ./xpcom/io/nsNativeCharsetUtils.cpp
---- ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2003-07-30 14:58:28.000000000 +0900
-+++ ./xpcom/io/nsNativeCharsetUtils.cpp 2003-10-20 10:19:15.000000000 +0900
-@@ -294,7 +294,12 @@
+--- ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2004-05-28 03:55:10.000000000 +0900
++++ ./xpcom/io/nsNativeCharsetUtils.cpp 2004-06-15 23:56:38.000000000 +0900
+@@ -295,7 +295,12 @@
{
const char *blank_list[] = { "", NULL };
const char **native_charset_list = blank_list;
diff --git a/www/firefox/patches/patch-bo b/www/firefox/patches/patch-bo
index 3a3d4b1ab4f..3c8fd5ec9d6 100644
--- a/www/firefox/patches/patch-bo
+++ b/www/firefox/patches/patch-bo
@@ -1,8 +1,9 @@
-$NetBSD: patch-bo,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
+$NetBSD: patch-bo,v 1.2 2004/06/23 16:47:12 taya Exp $
---- nsprpub/configure.in.orig 2004-02-27 15:03:10.000000000 +0900
-+++ nsprpub/configure.in 2004-02-27 15:05:21.000000000 +0900
-@@ -930,6 +930,9 @@
+diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
+--- ../Orig/mozilla/nsprpub/configure.in 2004-06-05 14:46:38.000000000 +0900
++++ ./nsprpub/configure.in 2004-06-15 23:56:41.000000000 +0900
+@@ -933,6 +933,9 @@
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
MDCPUCFG_H=_freebsd.cfg
PR_MD_CSRCS=freebsd.c
@@ -12,19 +13,3 @@ $NetBSD: patch-bo,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
;;
*-hpux*)
-@@ -2182,7 +2185,14 @@
- _PTHREAD_LDFLAGS="-lc_r"
- fi
- ;;
-- *-openbsd*|*-bsdi*|*-netbsd*)
-+ *-netbsd*)
-+ AC_DEFINE(_REENTRANT)
-+ AC_DEFINE(_THREAD_SAFE)
-+ if test "$ac_cv_have_dash_pthread" = "yes"; then
-+ _PTHREAD_LDFLAGS="-pthread"
-+ fi
-+ ;;
-+ *-openbsd*|*-bsdi*)
- AC_DEFINE(_THREAD_SAFE)
- dnl -pthread links in -lc_r, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
diff --git a/www/firefox/patches/patch-bp b/www/firefox/patches/patch-bp
deleted file mode 100644
index 0df78b06b02..00000000000
--- a/www/firefox/patches/patch-bp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bp,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
-
-diff -ru ../Orig/mozilla/other-licenses/libical/src/libical/Makefile.in ./other-licenses/libical/src/libical/Makefile.in
---- ../Orig/mozilla/other-licenses/libical/src/libical/Makefile.in 2003-01-08 13:59:28.000000000 +0900
-+++ ./other-licenses/libical/src/libical/Makefile.in 2003-10-20 10:19:54.000000000 +0900
-@@ -179,7 +179,7 @@
- $(PERL) $(ICALSCRIPTS)/mkrestrictiontable.pl -i $(srcdir)/icalrestriction.c.in \
- $(DESIGNDATA)/restrictions.csv > icalrestriction.c
-
--ifneq (,$(filter BeOS Darwin OpenVMS,$(OS_ARCH)))
-+ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
- DEFINES += -D__USE_BSD=1
- endif
-
diff --git a/www/firefox/patches/patch-bq b/www/firefox/patches/patch-bq
index 8a751845a3b..05746525cfe 100644
--- a/www/firefox/patches/patch-bq
+++ b/www/firefox/patches/patch-bq
@@ -1,8 +1,8 @@
-$NetBSD: patch-bq,v 1.2 2004/04/24 01:21:17 taya Exp $
+$NetBSD: patch-bq,v 1.3 2004/06/23 16:47:12 taya Exp $
diff -ru ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h ./xpcom/io/nsLocalFileUnix.h
---- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h 2003-07-19 07:14:16.000000000 +0900
-+++ ./xpcom/io/nsLocalFileUnix.h 2004-04-23 15:01:23.000000000 +0900
+--- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h 2004-01-15 15:14:13.000000000 +0900
++++ ./xpcom/io/nsLocalFileUnix.h 2004-06-15 23:56:45.000000000 +0900
@@ -57,7 +57,7 @@
#endif
diff --git a/www/firefox/patches/patch-br b/www/firefox/patches/patch-br
index 15e8dd37f67..93295103ed1 100644
--- a/www/firefox/patches/patch-br
+++ b/www/firefox/patches/patch-br
@@ -1,7 +1,8 @@
-$NetBSD: patch-br,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
+$NetBSD: patch-br,v 1.2 2004/06/23 16:47:12 taya Exp $
---- nsprpub/pr/src/misc/prnetdb.c.orig 2003-10-31 14:09:29.000000000 +0900
-+++ nsprpub/pr/src/misc/prnetdb.c 2004-02-27 15:09:13.000000000 +0900
+diff -ru ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c
+--- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c 2004-01-23 07:22:37.000000000 +0900
++++ ./nsprpub/pr/src/misc/prnetdb.c 2004-06-15 23:56:46.000000000 +0900
@@ -2094,7 +2094,12 @@
*/
hints.ai_socktype = SOCK_STREAM;
diff --git a/www/firefox/patches/patch-bs b/www/firefox/patches/patch-bs
index c45abed5021..e7a743f1b8d 100644
--- a/www/firefox/patches/patch-bs
+++ b/www/firefox/patches/patch-bs
@@ -1,7 +1,8 @@
-$NetBSD: patch-bs,v 1.1 2004/06/02 15:09:01 taya Exp $
+$NetBSD: patch-bs,v 1.2 2004/06/23 16:47:12 taya Exp $
---- config/mkdepend/imakemdep.h.orig 2004-05-30 11:16:09.000000000 +0900
-+++ config/mkdepend/imakemdep.h 2004-05-30 11:17:01.000000000 +0900
+diff -ru ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h
+--- ../Orig/mozilla/config/mkdepend/imakemdep.h 1998-09-05 13:22:25.000000000 +0900
++++ ./config/mkdepend/imakemdep.h 2004-06-15 23:56:48.000000000 +0900
@@ -277,6 +277,9 @@
# ifdef __i386__
"-D__i386__",
diff --git a/www/firefox/patches/patch-bt b/www/firefox/patches/patch-bt
index e3cd6905f93..5c828e99f52 100644
--- a/www/firefox/patches/patch-bt
+++ b/www/firefox/patches/patch-bt
@@ -1,16 +1,17 @@
-$NetBSD: patch-bt,v 1.1 2004/06/02 15:09:01 taya Exp $
+$NetBSD: patch-bt,v 1.2 2004/06/23 16:47:12 taya Exp $
---- nsprpub/pr/src/io/prprf.c.orig 2003-02-27 08:53:42.000000000 +0900
-+++ nsprpub/pr/src/io/prprf.c 2004-05-30 14:47:15.000000000 +0900
-@@ -51,7 +51,10 @@
- ** Note: on some platforms va_list is defined as an array,
- ** and requires array notation.
+diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c
+--- ../Orig/mozilla/nsprpub/pr/src/io/prprf.c 2004-03-09 12:18:19.000000000 +0900
++++ ./nsprpub/pr/src/io/prprf.c 2004-06-15 23:56:50.000000000 +0900
+@@ -53,6 +53,11 @@
*/
--#if (defined(LINUX) && defined(__powerpc__)) || \
-+#if defined(__amd64__)
+ #if (defined(LINUX) && defined(__x86_64__))
+ #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
++#elif (defined (__NetBSD__) && \
++ (defined(__amd64__) || \
++ (defined(__powerpc__) && __NetBSD_Version__ >= 105000000)))
+#include <stdarg.h>
+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
-+#elif (defined(LINUX) && defined(__powerpc__)) || \
+ #elif (defined(LINUX) && defined(__powerpc__)) || \
(defined(LINUX) && defined(__s390__)) || \
(defined(LINUX) && defined(__s390x__)) || \
- defined(WIN16) || defined(QNX) || \
diff --git a/www/firefox/patches/patch-bu b/www/firefox/patches/patch-bu
index 6551a2a0929..c21d212a224 100644
--- a/www/firefox/patches/patch-bu
+++ b/www/firefox/patches/patch-bu
@@ -1,4 +1,4 @@
-$NetBSD: patch-bu,v 1.1 2004/06/02 15:09:01 taya Exp $
+$NetBSD: patch-bu,v 1.2 2004/06/23 16:47:12 taya Exp $
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig 2004-05-30 21:38:13.000000000 +0900
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 2004-05-30 21:37:22.000000000 +0900
diff --git a/www/firefox/patches/patch-bv b/www/firefox/patches/patch-bv
index 6a047bba410..155c63cd791 100644
--- a/www/firefox/patches/patch-bv
+++ b/www/firefox/patches/patch-bv
@@ -1,4 +1,4 @@
-$NetBSD: patch-bv,v 1.1 2004/06/02 15:09:01 taya Exp $
+$NetBSD: patch-bv,v 1.2 2004/06/23 16:47:12 taya Exp $
--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig 2004-05-30 21:38:22.000000000 +0900
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp 2004-05-30 21:37:22.000000000 +0900
diff --git a/www/firefox/patches/patch-bx b/www/firefox/patches/patch-bx
new file mode 100644
index 00000000000..14ab725b71c
--- /dev/null
+++ b/www/firefox/patches/patch-bx
@@ -0,0 +1,61 @@
+$NetBSD: patch-bx,v 1.1 2004/06/23 16:47:12 taya Exp $
+
+diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2001-09-29 05:12:53.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2004-06-15 23:56:59.000000000 +0900
+@@ -195,6 +195,47 @@
+ // however, it's quick, dirty, and'll break when the ABI changes on
+ // us, which is what we want ;-).
+
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++// gcc-3 version
++//
++// As G++3 ABI contains the length of the functionname in the mangled
++// name, it is difficult to get a generic assembler mechanism like
++// in the G++ 2.95 case.
++// Create names would be like:
++// _ZN14nsXPTCStubBase5Stub1Ev
++// _ZN14nsXPTCStubBase6Stub12Ev
++// _ZN14nsXPTCStubBase7Stub123Ev
++// _ZN14nsXPTCStubBase8Stub1234Ev
++// etc.
++// Use assembler directives to get the names right...
++
++# define STUB_ENTRY(n) \
++__asm__ ( \
++ ".section \".text\" \n\t" \
++ ".align 2 \n\t" \
++ ".if "#n" < 10 \n\t" \
++ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
++ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \
++"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \
++ \
++ ".elseif "#n" < 100 \n\t" \
++ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \
++ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \
++"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \
++ \
++ ".elseif "#n" < 1000 \n\t" \
++ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \
++ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \
++"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \
++ \
++ ".else \n\t" \
++ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \
++ ".endif \n\t" \
++ \
++ "li 11,"#n" \n\t" \
++ "b SharedStub@local \n" \
++);
++#else
+ #define STUB_ENTRY(n) \
+ __asm__ ( \
+ ".section \".text\" \n\t" \
+@@ -206,6 +247,7 @@
+ "li 11,"#n" \n\t" \
+ "b SharedStub@local \n" \
+ );
++#endif
+
+ #define SENTINEL_ENTRY(n) \
+ nsresult nsXPTCStubBase::Sentinel##n() \
diff --git a/www/firefox/patches/patch-by b/www/firefox/patches/patch-by
new file mode 100644
index 00000000000..a232c4196f6
--- /dev/null
+++ b/www/firefox/patches/patch-by
@@ -0,0 +1,31 @@
+$NetBSD: patch-by,v 1.1 2004/06/23 16:47:12 taya Exp $
+
+diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
+--- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-03-19 10:36:16.000000000 +0900
++++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-06-15 23:57:02.000000000 +0900
+@@ -440,19 +440,19 @@
+ return;
+ }
+
+- FTC_Image_Desc imageDesc;
+- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
++ FTC_ImageType imageDesc;
++ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
+ float twipstopixel = GetTwipsToPixels();
+ float scale = GetPixelScale();
+- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
+- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
+- imageDesc.image_type |= ftc_image_grays;
++ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
++ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
++ imageDesc->flags = 0;
+
+ // get the face
+ nsresult rv;
+ FTC_Manager mgr;
+ nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
+- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
++ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
+ NS_ASSERTION(mFace, "failed to get face/size");
+ }
+