From 62bff925e4458b8d1d939fd0f27f694876581cd2 Mon Sep 17 00:00:00 2001 From: wilfried Date: Tue, 1 Jul 2003 11:10:36 +0000 Subject: [PATCH] update to 1.4 --- www/mozilla/Makefile | 4 +- www/mozilla/distinfo | 6 +- ...ch-xpcom_components_nsComponentManager_cpp | 16 ++-- www/mozilla/pkg/PFRAG.shared | 6 +- www/mozilla/pkg/PFRAG.shared-devel | 77 ++++++++++++++++++- www/mozilla/pkg/PLIST | 4 +- www/mozilla/pkg/PLIST-devel | 27 ++++--- 7 files changed, 111 insertions(+), 29 deletions(-) diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 61d9e8b956c..520babc822d 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.52 2003/07/01 02:34:36 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.53 2003/07/01 11:10:36 wilfried Exp $ NOT_FOR_ARCHS= vax m68k hppa COMMENT= "open source version of the Netscape browser" COMMENT-devel= "devel files for Gecko" -VER= 1.4b +VER= 1.4 DISTNAME= mozilla PKGNAME= mozilla-${VER} DISTFILES= mozilla-source-${VER}.tar.bz2 diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index ab4d6f0f5fa..34dc02ac671 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,3 +1,3 @@ -MD5 (mozilla-source-1.4b.tar.bz2) = 63c591ea36ed3864a1ccd4cc4f59d009 -RMD160 (mozilla-source-1.4b.tar.bz2) = 896917baa3e8e82dafa51db67bd1814ebc614ccb -SHA1 (mozilla-source-1.4b.tar.bz2) = e461ab1b8864db6ff15c0b2600b183eeff6a39aa +MD5 (mozilla-source-1.4.tar.bz2) = a4644caeeeb323d0d8b59758b67d4454 +RMD160 (mozilla-source-1.4.tar.bz2) = b00ea88c28dbdb15b3624cc27687e9c1c312c95c +SHA1 (mozilla-source-1.4.tar.bz2) = cf81a42afe52bf2464687d68f4384ae7c6ad18a3 diff --git a/www/mozilla/patches/patch-xpcom_components_nsComponentManager_cpp b/www/mozilla/patches/patch-xpcom_components_nsComponentManager_cpp index 21e063d22d7..9b8e571d77f 100644 --- a/www/mozilla/patches/patch-xpcom_components_nsComponentManager_cpp +++ b/www/mozilla/patches/patch-xpcom_components_nsComponentManager_cpp @@ -1,11 +1,11 @@ -$OpenBSD: patch-xpcom_components_nsComponentManager_cpp,v 1.2 2003/05/22 12:04:49 wilfried Exp $ ---- xpcom/components/nsComponentManager.cpp.orig Wed May 7 20:39:47 2003 -+++ xpcom/components/nsComponentManager.cpp Thu May 22 13:17:40 2003 -@@ -2403,9 +2403,12 @@ nsComponentManagerImpl::GetServiceByCont +$OpenBSD: patch-xpcom_components_nsComponentManager_cpp,v 1.3 2003/07/01 11:10:36 wilfried Exp $ +--- xpcom/components/nsComponentManager.cpp.orig Wed May 14 00:50:02 2003 ++++ xpcom/components/nsComponentManager.cpp Tue Jul 1 10:59:32 2003 +@@ -2411,9 +2411,12 @@ nsComponentManagerImpl::GetServiceByCont } #ifdef XPCOM_CHECK_PENDING_CIDS -- rv = AddPendingCID(entry->cid); +- rv = AddPendingCID(entry->mCid); - if (NS_FAILED(rv)) - return rv; + if (entry && entry != kNonExistentContractID) @@ -17,13 +17,13 @@ $OpenBSD: patch-xpcom_components_nsComponentManager_cpp,v 1.2 2003/05/22 12:04:4 #endif nsCOMPtr service; // We need to not be holding the service manager's monitor while calling -@@ -2418,7 +2421,8 @@ nsComponentManagerImpl::GetServiceByCont +@@ -2426,7 +2429,8 @@ nsComponentManagerImpl::GetServiceByCont mon.Enter(); #ifdef XPCOM_CHECK_PENDING_CIDS -- RemovePendingCID(entry->cid); +- RemovePendingCID(entry->mCid); + if (entry && entry != kNonExistentContractID) -+ RemovePendingCID(entry->cid); ++ RemovePendingCID(entry->mCid); #endif if (NS_FAILED(rv)) diff --git a/www/mozilla/pkg/PFRAG.shared b/www/mozilla/pkg/PFRAG.shared index 531f5f99a92..54aa2fd3b27 100644 --- a/www/mozilla/pkg/PFRAG.shared +++ b/www/mozilla/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1 2003/05/23 10:09:17 wilfried Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.2 2003/07/01 11:10:36 wilfried Exp $ mozilla/components/libaccessibility.so.1.0 mozilla/components/libaddrbook.so.1.0 mozilla/components/libappcomps.so.1.0 @@ -55,7 +55,6 @@ mozilla/components/libpref.so.1.0 mozilla/components/libprofile.so.1.0 mozilla/components/librdf.so.1.0 mozilla/components/libtransformiix.so.1.0 -mozilla/components/libtransmngr_client.so.1.0 mozilla/components/libtxmgr.so.1.0 mozilla/components/libtypeaheadfind.so.1.0 mozilla/components/libuconv.so.1.0 @@ -93,3 +92,6 @@ mozilla/libxpcom.so.1.0 mozilla/libxpcom_compat.so.1.0 mozilla/libxpistub.so.1.0 mozilla/plugins/libnullplugin.so.1.0 +@comment NEWDYNLIBDIR(%D/mozilla/components) +@comment NEWDYNLIBDIR(%D/mozilla) +@comment NEWDYNLIBDIR(%D/mozilla/plugins) diff --git a/www/mozilla/pkg/PFRAG.shared-devel b/www/mozilla/pkg/PFRAG.shared-devel index afc595d0628..e112b8b2345 100644 --- a/www/mozilla/pkg/PFRAG.shared-devel +++ b/www/mozilla/pkg/PFRAG.shared-devel @@ -1,4 +1,77 @@ -@comment $OpenBSD: PFRAG.shared-devel,v 1.1 2003/05/23 10:09:17 wilfried Exp $ +@comment $OpenBSD: PFRAG.shared-devel,v 1.2 2003/07/01 11:10:36 wilfried Exp $ +@comment mozilla/lib/components/libaccessibility.so.1.0 +@comment mozilla/lib/components/libaddrbook.so.1.0 +@comment mozilla/lib/components/libappcomps.so.1.0 +@comment mozilla/lib/components/libautoconfig.so.1.0 +@comment mozilla/lib/components/libbayesflt.so.1.0 +@comment mozilla/lib/components/libcaps.so.1.0 +@comment mozilla/lib/components/libchrome.so.1.0 +@comment mozilla/lib/components/libcomposer.so.1.0 +@comment mozilla/lib/components/libcookie.so.1.0 +@comment mozilla/lib/components/libdocshell.so.1.0 +@comment mozilla/lib/components/libeditor.so.1.0 +@comment mozilla/lib/components/libembedcomponents.so.1.0 +@comment mozilla/lib/components/libfileview.so.1.0 +@comment mozilla/lib/components/libgfx_gtk.so.1.0 +@comment mozilla/lib/components/libgfxps.so.1.0 +@comment mozilla/lib/components/libgfxxprint.so.1.0 +@comment mozilla/lib/components/libgklayout.so.1.0 +@comment mozilla/lib/components/libgkplugin.so.1.0 +@comment mozilla/lib/components/libhtmlpars.so.1.0 +@comment mozilla/lib/components/libi18n.so.1.0 +@comment mozilla/lib/components/libimglib2.so.1.0 +@comment mozilla/lib/components/libimgmng.so.1.0 +@comment mozilla/lib/components/libimpComm4xMail.so.1.0 +@comment mozilla/lib/components/libimpText.so.1.0 +@comment mozilla/lib/components/libimport.so.1.0 +@comment mozilla/lib/components/libinspector.so.1.0 +@comment mozilla/lib/components/libipcdc.so.1.0 +@comment mozilla/lib/components/libjar50.so.1.0 +@comment mozilla/lib/components/libjsd.so.1.0 +@comment mozilla/lib/components/libjsdom.so.1.0 +@comment mozilla/lib/components/liblocalmail.so.1.0 +@comment mozilla/lib/components/libmailnews.so.1.0 +@comment mozilla/lib/components/libmailview.so.1.0 +@comment mozilla/lib/components/libmime.so.1.0 +@comment mozilla/lib/components/libmimeemitter.so.1.0 +@comment mozilla/lib/components/libmork.so.1.0 +@comment mozilla/lib/components/libmozfind.so.1.0 +@comment mozilla/lib/components/libmsgcompose.so.1.0 +@comment mozilla/lib/components/libmsgdb.so.1.0 +@comment mozilla/lib/components/libmsgimap.so.1.0 +@comment mozilla/lib/components/libmsgmdn.so.1.0 +@comment mozilla/lib/components/libmsgnews.so.1.0 +@comment mozilla/lib/components/libmsgsmime.so.1.0 +@comment mozilla/lib/components/libnecko.so.1.0 +@comment mozilla/lib/components/libnecko2.so.1.0 +@comment mozilla/lib/components/libnsappshell.so.1.0 +@comment mozilla/lib/components/libnsprefm.so.1.0 +@comment mozilla/lib/components/liboji.so.1.0 +@comment mozilla/lib/components/libp3p.so.1.0 +@comment mozilla/lib/components/libpipboot.so.1.0 +@comment mozilla/lib/components/libpipnss.so.1.0 +@comment mozilla/lib/components/libpippki.so.1.0 +@comment mozilla/lib/components/libpref.so.1.0 +@comment mozilla/lib/components/libprofile.so.1.0 +@comment mozilla/lib/components/librdf.so.1.0 +@comment mozilla/lib/components/libtransformiix.so.1.0 +@comment mozilla/lib/components/libtxmgr.so.1.0 +@comment mozilla/lib/components/libtypeaheadfind.so.1.0 +@comment mozilla/lib/components/libuconv.so.1.0 +@comment mozilla/lib/components/libucvmath.so.1.0 +@comment mozilla/lib/components/libuniversalchardet.so.1.0 +@comment mozilla/lib/components/libvcard.so.1.0 +@comment mozilla/lib/components/libwallet.so.1.0 +@comment mozilla/lib/components/libwalletviewers.so.1.0 +@comment mozilla/lib/components/libwebbrwsr.so.1.0 +@comment mozilla/lib/components/libwebsrvcs.so.1.0 +@comment mozilla/lib/components/libwidget_gtk.so.1.0 +@comment mozilla/lib/components/libxmlextras.so.1.0 +@comment mozilla/lib/components/libxpcom_compat_c.so.1.0 +@comment mozilla/lib/components/libxpconnect.so.1.0 +@comment mozilla/lib/components/libxpinstall.so.1.0 +@comment mozilla/lib/components/libxremote_client.so.1.0 +@comment mozilla/lib/components/libxremoteservice.so.1.0 mozilla/lib/libfort.so.1.0 mozilla/lib/libgkgfx.so.1.0 mozilla/lib/libgtkembedmoz.so.1.0 @@ -20,3 +93,5 @@ mozilla/lib/libxlibrgb.so.1.0 mozilla/lib/libxpcom.so.1.0 mozilla/lib/libxpcom_compat.so.1.0 mozilla/lib/libxpistub.so.1.0 +@comment NEWDYNLIBDIR(%D/mozilla/lib) +@comment NEWDYNLIBDIR(%D/mozilla/lib/components) diff --git a/www/mozilla/pkg/PLIST b/www/mozilla/pkg/PLIST index 07cc150612b..1a06da37d3d 100644 --- a/www/mozilla/pkg/PLIST +++ b/www/mozilla/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.20 2003/06/25 12:01:16 wilfried Exp $ +@comment $OpenBSD: PLIST,v 1.21 2003/07/01 11:10:36 wilfried Exp $ bin/mozilla mozilla/LICENSE mozilla/chrome/US.jar @@ -101,6 +101,7 @@ mozilla/components/htmlparser.xpt mozilla/components/imglib2.xpt mozilla/components/impComm4xMail.xpt mozilla/components/import.xpt +mozilla/components/inspector-cmdline.js mozilla/components/inspector.xpt mozilla/components/intl.xpt mozilla/components/ipcd.xpt @@ -177,7 +178,6 @@ mozilla/components/sidebar.xpt mozilla/components/signonviewer.xpt mozilla/components/smime-service.js mozilla/components/timebomb.xpt -mozilla/components/transmngr.xpt mozilla/components/txmgr.xpt mozilla/components/txtsvc.xpt mozilla/components/typeaheadfind.xpt diff --git a/www/mozilla/pkg/PLIST-devel b/www/mozilla/pkg/PLIST-devel index f69f03f5b08..18252d2d006 100644 --- a/www/mozilla/pkg/PLIST-devel +++ b/www/mozilla/pkg/PLIST-devel @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-devel,v 1.1 2003/05/23 10:09:17 wilfried Exp $ +@comment $OpenBSD: PLIST-devel,v 1.2 2003/07/01 11:10:36 wilfried Exp $ mozilla/include/accessibility/nsAccessNode.h mozilla/include/accessibility/nsAccessNodeWrap.h mozilla/include/accessibility/nsAccessibleEventData.h @@ -14,6 +14,7 @@ mozilla/include/accessibility/nsIAccessibleProvider.h mozilla/include/accessibility/nsIAccessibleSelectable.h mozilla/include/accessibility/nsRootAccessible.h mozilla/include/accessibility/nsRootAccessibleWrap.h +mozilla/include/accessibility/nsTextAccessibleWrap.h mozilla/include/addrbook/nsAbAddressCollecter.h mozilla/include/addrbook/nsAbAutoCompleteSession.h mozilla/include/addrbook/nsAbBSDirectory.h @@ -616,7 +617,6 @@ mozilla/include/gfx/nsRegion.h mozilla/include/gfx/nsSize.h mozilla/include/gfx/nsThemeConstants.h mozilla/include/gfx/nsTransform2D.h -mozilla/include/gfx/xprintutil.h mozilla/include/gtkembedmoz/gtkmozembed.h mozilla/include/gtkembedmoz/gtkmozembed_internal.h mozilla/include/gtkxtbin/gtk2xtbin.h @@ -675,10 +675,14 @@ mozilla/include/inspector/inISearchObserver.h mozilla/include/inspector/inISearchProcess.h mozilla/include/intl/nsIStringBundle.h mozilla/include/intl/nsIStringBundleOverride.h -mozilla/include/ipcd/ipcCID.h +mozilla/include/ipcd/ipcIClientObserver.h +mozilla/include/ipcd/ipcIClientQueryHandler.h +mozilla/include/ipcd/ipcILockNotify.h mozilla/include/ipcd/ipcILockService.h +mozilla/include/ipcd/ipcIMessageObserver.h mozilla/include/ipcd/ipcIService.h -mozilla/include/ipcd/ipcLockCID.h +mozilla/include/ipcd/ipcITransactionObserver.h +mozilla/include/ipcd/ipcITransactionService.h mozilla/include/ipcd/ipcMessageReader.h mozilla/include/ipcd/ipcMessageWriter.h mozilla/include/ipcd/ipcModule.h @@ -1472,7 +1476,6 @@ mozilla/include/oji/nsIThreadManager.h mozilla/include/oji/nsJVMManager.h mozilla/include/oji/nsJVMPluginTagInfo.h mozilla/include/oji/nsjvm.h -mozilla/include/p3p/nsIP3PService.h mozilla/include/p3p/nsIPolicyListener.h mozilla/include/p3p/nsIPolicyReference.h mozilla/include/p3p/nsIPolicyTarget.h @@ -1588,6 +1591,7 @@ mozilla/include/rdf/nsIRDFInMemoryDataSource.h mozilla/include/rdf/nsIRDFLiteral.h mozilla/include/rdf/nsIRDFNode.h mozilla/include/rdf/nsIRDFObserver.h +mozilla/include/rdf/nsIRDFPropagatableDataSource.h mozilla/include/rdf/nsIRDFPurgeableDataSource.h mozilla/include/rdf/nsIRDFRemoteDataSource.h mozilla/include/rdf/nsIRDFResource.h @@ -1636,12 +1640,8 @@ mozilla/include/string/nsStringFwd.h mozilla/include/string/nsStringIterator.h mozilla/include/string/nsStringIteratorUtils.h mozilla/include/string/nsStringTraits.h +mozilla/include/string/nsUTF8Utils.h mozilla/include/string/nsXPIDLString.h -mozilla/include/transmngr/tmCID.h -mozilla/include/transmngr/tmITransactionService.h -mozilla/include/transmngr/tmTransaction.h -mozilla/include/transmngr/tmUtils.h -mozilla/include/transmngr/tmVector.h mozilla/include/txmgr/nsITransaction.h mozilla/include/txmgr/nsITransactionList.h mozilla/include/txmgr/nsITransactionListener.h @@ -2058,6 +2058,7 @@ mozilla/include/xpinstall/nsPIXPIProxy.h mozilla/include/xpinstall/nsPIXPIStubHook.h mozilla/include/xpinstall/nsSoftwareUpdateIIDs.h mozilla/include/xpinstall/nsXPITriggerInfo.h +mozilla/include/xprintutil/xprintutil.h mozilla/include/xremoteservice/nsIXRemoteService.h mozilla/include/xul/nsIXULContent.h mozilla/include/xul/nsIXULPopupListener.h @@ -2067,8 +2068,10 @@ mozilla/include/xuldoc/nsIXULContentSink.h mozilla/include/xuldoc/nsIXULDocument.h mozilla/include/xuldoc/nsIXULPrototypeCache.h mozilla/include/xuldoc/nsIXULPrototypeDocument.h +mozilla/include/xultmpl/nsIXULBuilderListener.h mozilla/include/xultmpl/nsIXULSortService.h mozilla/include/xultmpl/nsIXULTemplateBuilder.h +mozilla/lib/components/libtexteditor_s.a mozilla/lib/libaccessibility_base_s.a mozilla/lib/libaccessibility_html_s.a mozilla/lib/libaccessibility_toolkit_s.a @@ -2259,17 +2262,20 @@ mozilla/lib/libxpcomglue_s.a mozilla/lib/libxpcomio_s.a mozilla/lib/libxpcomproxy_s.a mozilla/lib/libxpcomthreads_s.a +mozilla/lib/libxprintutil.a mozilla/lib/libxpt.a mozilla/lib/libxptcall.a mozilla/lib/libxptcmd.a mozilla/lib/libxptinfo.a mozilla/lib/libxpwidgets_s.a %%SHARED%% +@dirrm mozilla/lib/components @dirrm mozilla/lib @dirrm mozilla/include/xultmpl @dirrm mozilla/include/xuldoc @dirrm mozilla/include/xul @dirrm mozilla/include/xremoteservice +@dirrm mozilla/include/xprintutil @dirrm mozilla/include/xpinstall @dirrm mozilla/include/xpconnect @dirrm mozilla/include/xpcom_obsolete @@ -2302,7 +2308,6 @@ mozilla/lib/libxpwidgets_s.a @dirrm mozilla/include/typeaheadfind @dirrm mozilla/include/txtsvc @dirrm mozilla/include/txmgr -@dirrm mozilla/include/transmngr @dirrm mozilla/include/string @dirrm mozilla/include/sidebar @dirrm mozilla/include/shistory