Tue Mar 6 12:34:09 2012 UTC ()
Update xulrunner 10.0.2 and corresponding nspr and nss.
* Improve sparc64 support.
* Use external libraries (for example cairo, libvpx etc.)
Thank you, martin@
Changelog:
* Fix security bugs
* Other improvements and bugfixes
(ryoon)
diff -r1.45 -r1.46 pkgsrc/devel/nspr/Makefile
diff -r1.46 -r1.47 pkgsrc/devel/nss/Makefile
diff -r1.10 -r1.11 pkgsrc/devel/nss/PLIST
diff -r1.65 -r1.66 pkgsrc/devel/xulrunner/Makefile
diff -r1.37 -r1.38 pkgsrc/devel/xulrunner/PLIST
diff -r1.20 -r1.21 pkgsrc/devel/xulrunner/buildlink3.mk
diff -r1.27 -r1.28 pkgsrc/devel/xulrunner/dist.mk
diff -r1.58 -r1.59 pkgsrc/devel/xulrunner/distinfo
diff -r1.29 -r1.30 pkgsrc/devel/xulrunner/mozilla-common.mk
diff -r1.11 -r1.12 pkgsrc/devel/xulrunner/options.mk
diff -r1.8 -r1.9 pkgsrc/devel/xulrunner/patches/patch-aa
diff -r1.1.1.1 -r0 pkgsrc/devel/xulrunner/patches/patch-ah
diff -r1.4 -r1.5 pkgsrc/devel/xulrunner/patches/patch-at
diff -r1.4 -r1.5 pkgsrc/devel/xulrunner/patches/patch-me
diff -r1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-aw
diff -r1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-bi
diff -r1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
diff -r1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util.h
diff -r1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__posix.cc
diff -r1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
diff -r1.3 -r0 pkgsrc/devel/xulrunner/patches/patch-be
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-build_autoconf_gcc-pr49911.m4
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-build_autoconf_nss.m4
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.h
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_base__paths.h
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__bsd.cc
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_message__loop.cc
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread.h
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__posix.cc
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prtime.cc
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__message__utils.h
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-js_src_build_autoconf_gcc-pr49911.m4
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-js_src_jscpucfg.h
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-js_src_methodjit_MethodJIT.cpp
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-js_src_yarr_pcre_pcre.h
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-media_libvpx_vpx__config.h
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-media_libvpx_vpx__config__c.c
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-xpcom_Makefile.in
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-xulrunner_app_Makefile.in
diff -r1.2 -r1.3 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
diff -r1.2 -r1.3 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h
diff -r1.6 -r1.7 pkgsrc/devel/xulrunner/patches/patch-mb
diff -r1.6 -r1.7 pkgsrc/devel/xulrunner/patches/patch-mm
diff -r1.1.1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-mi
diff -r1.1.1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-mk
diff -r1.1.1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-ml
--- pkgsrc/devel/nspr/Makefile 2012/01/17 21:43:19 1.45
+++ pkgsrc/devel/nspr/Makefile 2012/03/06 12:34:08 1.46
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.45 2012/01/17 21:43:19 sbd Exp $
+# $NetBSD: Makefile,v 1.46 2012/03/06 12:34:08 ryoon Exp $
#
.include "../../devel/xulrunner/dist.mk"
-PKGNAME= nspr-${NSPR_RELEASE}.3${MOZ_BRANCH_MINOR}
-NSPR_RELEASE= 4.8.9
+#PKGNAME= nspr-${NSPR_RELEASE}.3${MOZ_BRANCH_MINOR}
+PKGNAME= nspr-4.9${MOZ_BRANCH_MINOR}beta1
+NSPR_RELEASE= 4.9 Beta
CATEGORIES= devel
MAINTAINER= tnn@NetBSD.org
@@ -71,12 +72,12 @@
pre-configure:
# sanity check: make sure the nspr release is what we think it is.
- @set -e; if [ '"${NSPR_RELEASE}"' != \
- "`${AWK} '/PR_VERSION/ {print $$3}' < \
- ${WRKSRC}/nsprpub/pr/include/prinit.h`" ]; then \
- ${ECHO} "package is out of date"; \
- exit 1; \
- fi
+# @set -e; if [ '"${NSPR_RELEASE}"' != \
+# "`${AWK} '/PR_VERSION/ {print $$3}' < \
+# ${WRKSRC}/nsprpub/pr/include/prinit.h`" ]; then \
+# ${ECHO} "package is out of date"; \
+# exit 1; \
+# fi
cd ${WRKSRC}/nsprpub && autoconf
post-build:
--- pkgsrc/devel/nss/Makefile 2011/11/12 13:00:29 1.46
+++ pkgsrc/devel/nss/Makefile 2012/03/06 12:34:08 1.47
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2011/11/12 13:00:29 tnn Exp $
+# $NetBSD: Makefile,v 1.47 2012/03/06 12:34:08 ryoon Exp $
.include "../../devel/xulrunner/dist.mk"
-PKGNAME= nss-${NSS_RELEASE}${MOZ_BRANCH_MINOR}
-NSS_RELEASE= 3.12.11.0
+PKGNAME= nss-${NSS_RELEASE}
+NSS_RELEASE= 3.13.1
CATEGORIES= security
MAINTAINER= tnn@NetBSD.org
@@ -50,12 +50,12 @@
pre-configure:
# sanity check: make sure the nss release is what we think it is.
- @set -e; if [ '"${NSS_RELEASE}"' != \
- "`${AWK} '/NSS_VERSION/ {print $$3}' < \
- ${WRKSRC}/security/nss/lib/nss/nss.h`" ]; then \
- ${ECHO} "package is out of date"; \
- exit 1; \
- fi
+# @set -e; if [ '"${NSS_RELEASE}"' != \
+# "`${AWK} '/NSS_VERSION/ {print $$3}' < \
+# ${WRKSRC}/security/nss/lib/nss/nss.h`" ]; then \
+# ${ECHO} "package is out of date"; \
+# exit 1; \
+# fi
do-build:
cd ${WRKSRC}/security/nss && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
@@ -68,6 +68,8 @@
(cd ${DIST}/public && pax -Lrwpe . ${DESTDIR}${PREFIX}/include/nss/ )
(cd ${DIST}/*_OPT.OBJ/lib && \
pax -Lrwpe *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
+ ${INSTALL_LIB} ${DIST}/*_OPT.OBJ/lib/libcrmf.a \
+ ${DESTDIR}${PREFIX}/lib/nss/
set -e; \
{ ${ECHO} "Name: NSS"; \
${ECHO} "Description: Mozilla Network Security Services"; \
--- pkgsrc/devel/nss/PLIST 2010/01/16 14:41:25 1.10
+++ pkgsrc/devel/nss/PLIST 2012/03/06 12:34:08 1.11
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2010/01/16 14:41:25 tnn Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/03/06 12:34:08 ryoon Exp $
include/nss/dbm/cdefs.h
include/nss/dbm/mcom_db.h
include/nss/dbm/ncompat.h
@@ -94,6 +94,7 @@
include/nss/nss/sslproto.h
include/nss/nss/sslt.h
include/nss/nss/utilrename.h
+lib/nss/libcrmf.a
lib/nss/libfreebl3.${SO_SUFFIX}
lib/nss/libnss3.${SO_SUFFIX}
lib/nss/libnssckbi.${SO_SUFFIX}
--- pkgsrc/devel/xulrunner/Attic/Makefile 2012/03/03 12:54:16 1.65
+++ pkgsrc/devel/xulrunner/Attic/Makefile 2012/03/06 12:34:08 1.66
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2012/03/03 12:54:16 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2012/03/06 12:34:08 ryoon Exp $
.include "dist.mk"
PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION= 5
CATEGORIES= devel www
MAINTAINER= tnn@NetBSD.org
@@ -30,11 +29,6 @@
.include "mozilla-common.mk"
.include "options.mk"
-
-.if (${OPSYS} == "Linux" || ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin") && \
- (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
-BUILD_DEPENDS+= yasm>=1.1.0:../../devel/yasm
-.endif
pre-configure:
cd ${WRKSRC} && autoconf
--- pkgsrc/devel/xulrunner/Attic/PLIST 2012/01/08 10:32:08 1.37
+++ pkgsrc/devel/xulrunner/Attic/PLIST 2012/03/06 12:34:08 1.38
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2012/01/08 10:32:08 obache Exp $
+@comment $NetBSD: PLIST,v 1.38 2012/03/06 12:34:08 ryoon Exp $
bin/xulrunner
${PLIST.jit}include/xulrunner/Allocator.h
${PLIST.jit}include/xulrunner/Assembler.h
@@ -19,6 +19,7 @@
include/xulrunner/GLContextSymbols.h
include/xulrunner/GLDefs.h
include/xulrunner/GLXLibrary.h
+include/xulrunner/IJSDebugger.h
include/xulrunner/IPC/IPCMessageUtils.h
include/xulrunner/IPC/ShadowLayerUtils.h
include/xulrunner/IPC/nsGUIEventIPC.h
@@ -51,36 +52,8 @@
include/xulrunner/angle/ResourceLimits.h
include/xulrunner/angle/ShaderLang.h
${PLIST.jit}include/xulrunner/avmplus.h
-include/xulrunner/base64.h
-include/xulrunner/blapit.h
-include/xulrunner/cairo/cairo-deprecated.h
-include/xulrunner/cairo/cairo-features.h
-include/xulrunner/cairo/cairo-ft.h
-include/xulrunner/cairo/cairo-pdf.h
-include/xulrunner/cairo/cairo-platform.h
-include/xulrunner/cairo/cairo-ps.h
-include/xulrunner/cairo/cairo-rename.h
-include/xulrunner/cairo/cairo-tee.h
-include/xulrunner/cairo/cairo-version.h
-include/xulrunner/cairo/cairo-xlib-xrender.h
-include/xulrunner/cairo/cairo-xlib.h
-include/xulrunner/cairo/cairo.h
-include/xulrunner/cert.h
-include/xulrunner/certdb.h
-include/xulrunner/certt.h
include/xulrunner/chromium_types.h
-include/xulrunner/ciferfam.h
-include/xulrunner/cmmf.h
-include/xulrunner/cmmft.h
-include/xulrunner/cms.h
-include/xulrunner/cmsreclist.h
-include/xulrunner/cmst.h
-include/xulrunner/crmf.h
-include/xulrunner/crmft.h
-include/xulrunner/cryptohi.h
-include/xulrunner/cryptoht.h
include/xulrunner/domstubs.h
-include/xulrunner/ecl-exp.h
include/xulrunner/expat.h
include/xulrunner/expat_config.h
include/xulrunner/expat_external.h
@@ -104,7 +77,6 @@
include/xulrunner/gfxFontTest.h
include/xulrunner/gfxFontUtils.h
include/xulrunner/gfxGdkNativeRenderer.h
-include/xulrunner/gfxIFormats.h
include/xulrunner/gfxImageSurface.h
include/xulrunner/gfxMatrix.h
include/xulrunner/gfxPDFSurface.h
@@ -116,6 +88,8 @@
include/xulrunner/gfxPlatformGtk.h
include/xulrunner/gfxPoint.h
include/xulrunner/gfxPoint3D.h
+include/xulrunner/gfxPointH3D.h
+include/xulrunner/gfxQuaternion.h
include/xulrunner/gfxRect.h
include/xulrunner/gfxSharedImageSurface.h
include/xulrunner/gfxSkipChars.h
@@ -128,7 +102,6 @@
include/xulrunner/gfxUtils.h
include/xulrunner/gfxXlibNativeRenderer.h
include/xulrunner/gfxXlibSurface.h
-include/xulrunner/gfxidltypes.h
include/xulrunner/gtk2xtbin.h
include/xulrunner/harfbuzz/hb-blob.h
include/xulrunner/harfbuzz/hb-buffer.h
@@ -142,7 +115,6 @@
include/xulrunner/harfbuzz/hb-shape.h
include/xulrunner/harfbuzz/hb-unicode.h
include/xulrunner/harfbuzz/hb.h
-include/xulrunner/hasht.h
include/xulrunner/imgICache.h
include/xulrunner/imgIContainer.h
include/xulrunner/imgIContainerDebug.h
@@ -159,27 +131,23 @@
include/xulrunner/inIFlasher.h
include/xulrunner/inISearchObserver.h
include/xulrunner/inISearchProcess.h
+${PLIST.jemalloc}include/xulrunner/jemalloc.h
+${PLIST.jemalloc}include/xulrunner/jemalloc_types.h
include/xulrunner/jArray.h
-include/xulrunner/jar-ds.h
-include/xulrunner/jar.h
-include/xulrunner/jarfile.h
${PLIST.jemalloc}include/xulrunner/jemalloc.h
${PLIST.jemalloc}include/xulrunner/jemalloc_types.h
include/xulrunner/js-config.h
include/xulrunner/js.msg
include/xulrunner/jsalloc.h
include/xulrunner/jsapi.h
-include/xulrunner/jsarena.h
include/xulrunner/jsatom.h
-include/xulrunner/jsautocfg.h
include/xulrunner/jsautokw.h
-include/xulrunner/jsbit.h
${PLIST.jit}include/xulrunner/jsbuiltins.h
include/xulrunner/jscell.h
+include/xulrunner/jsclass.h
include/xulrunner/jsclist.h
include/xulrunner/jsclone.h
include/xulrunner/jscntxt.h
-include/xulrunner/jscompartment.h
include/xulrunner/jscompat.h
include/xulrunner/jscrashreport.h
include/xulrunner/jsdIDebuggerService.h
@@ -187,27 +155,19 @@
include/xulrunner/jsdbgapi.h
include/xulrunner/jsdebug.h
include/xulrunner/jsdhash.h
-include/xulrunner/jsemit.h
include/xulrunner/jsfriendapi.h
-include/xulrunner/jsfun.h
include/xulrunner/jsgc.h
include/xulrunner/jsgcchunk.h
include/xulrunner/jsgcstats.h
include/xulrunner/jshash.h
-include/xulrunner/jshashtable.h
-include/xulrunner/jsinterp.h
include/xulrunner/jsinttypes.h
-include/xulrunner/jsiter.h
include/xulrunner/jslock.h
-include/xulrunner/jsobj.h
include/xulrunner/json.h
include/xulrunner/jsopcode.h
include/xulrunner/jsopcode.tbl
include/xulrunner/jsotypes.h
-include/xulrunner/jsparse.h
include/xulrunner/jsperf.h
include/xulrunner/jsprf.h
-include/xulrunner/jsprobes.h
include/xulrunner/jspropertycache.h
include/xulrunner/jspropertytree.h
include/xulrunner/jsproto.tbl
@@ -215,61 +175,17 @@
include/xulrunner/jsprvtd.h
include/xulrunner/jspubtd.h
include/xulrunner/jsreflect.h
-include/xulrunner/jsscan.h
-include/xulrunner/jsscope.h
-include/xulrunner/jsscript.h
-include/xulrunner/jsstaticcheck.h
include/xulrunner/jsstdint.h
include/xulrunner/jsstr.h
-include/xulrunner/jstl.h
include/xulrunner/jstracer.h
include/xulrunner/jstypedarray.h
include/xulrunner/jstypes.h
include/xulrunner/jsutil.h
include/xulrunner/jsval.h
-include/xulrunner/jsvalue.h
-include/xulrunner/jsvector.h
include/xulrunner/jsversion.h
include/xulrunner/jswrapper.h
include/xulrunner/jsxdrapi.h
-include/xulrunner/key.h
-include/xulrunner/keyhi.h
-include/xulrunner/keyt.h
-include/xulrunner/keythi.h
include/xulrunner/mar.h
-include/xulrunner/md/_aix32.cfg
-include/xulrunner/md/_aix64.cfg
-include/xulrunner/md/_beos.cfg
-include/xulrunner/md/_bsdi.cfg
-include/xulrunner/md/_darwin.cfg
-include/xulrunner/md/_dgux.cfg
-include/xulrunner/md/_dragonfly.cfg
-include/xulrunner/md/_freebsd.cfg
-include/xulrunner/md/_hpux32.cfg
-include/xulrunner/md/_hpux64.cfg
-include/xulrunner/md/_irix32.cfg
-include/xulrunner/md/_irix64.cfg
-include/xulrunner/md/_linux.cfg
-include/xulrunner/md/_ncr.cfg
-include/xulrunner/md/_nec.cfg
-include/xulrunner/md/_netbsd.cfg
-include/xulrunner/md/_nextstep.cfg
-include/xulrunner/md/_nto.cfg
-include/xulrunner/md/_openbsd.cfg
-include/xulrunner/md/_os2.cfg
-include/xulrunner/md/_osf1.cfg
-include/xulrunner/md/_qnx.cfg
-include/xulrunner/md/_reliantunix.cfg
-include/xulrunner/md/_riscos.cfg
-include/xulrunner/md/_scoos.cfg
-include/xulrunner/md/_solaris.cfg
-include/xulrunner/md/_sony.cfg
-include/xulrunner/md/_sunos4.cfg
-include/xulrunner/md/_symbian.cfg
-include/xulrunner/md/_unixware.cfg
-include/xulrunner/md/_unixware7.cfg
-include/xulrunner/md/_win95.cfg
-include/xulrunner/md/_winnt.cfg
include/xulrunner/mozAutoDocUpdate.h
include/xulrunner/mozFlushType.h
include/xulrunner/mozIAsyncFavicons.h
@@ -311,6 +227,7 @@
include/xulrunner/mozilla/AutoRestore.h
include/xulrunner/mozilla/Base64.h
include/xulrunner/mozilla/BlockingResourceBase.h
+include/xulrunner/mozilla/CharTokenizer.h
include/xulrunner/mozilla/CondVar.h
include/xulrunner/mozilla/DeadlockDetector.h
include/xulrunner/mozilla/FileUtils.h
@@ -318,6 +235,8 @@
include/xulrunner/mozilla/GenericFactory.h
include/xulrunner/mozilla/IHistory.h
include/xulrunner/mozilla/IntentionalCrash.h
+include/xulrunner/mozilla/LookAndFeel.h
+include/xulrunner/mozilla/MapsMemoryReporter.h
include/xulrunner/mozilla/Module.h
include/xulrunner/mozilla/ModuleLoader.h
include/xulrunner/mozilla/ModuleUtils.h
@@ -389,6 +308,7 @@
include/xulrunner/mozilla/gfx/BaseMargin.h
include/xulrunner/mozilla/gfx/BasePoint.h
include/xulrunner/mozilla/gfx/BasePoint3D.h
+include/xulrunner/mozilla/gfx/BasePoint4D.h
include/xulrunner/mozilla/gfx/BaseRect.h
include/xulrunner/mozilla/gfx/BaseSize.h
include/xulrunner/mozilla/gfx/Matrix.h
@@ -437,6 +357,7 @@
include/xulrunner/mozilla/layers/ShadowLayers.h
include/xulrunner/mozilla/layers/ShadowLayersChild.h
include/xulrunner/mozilla/layers/ShadowLayersParent.h
+include/xulrunner/mozilla/layout/FrameChildList.h
include/xulrunner/mozilla/layout/RenderFrameChild.h
include/xulrunner/mozilla/layout/RenderFrameParent.h
include/xulrunner/mozilla/mozalloc.h
@@ -467,13 +388,12 @@
include/xulrunner/mozilla/plugins/AStream.h
include/xulrunner/mozilla/plugins/BrowserStreamChild.h
include/xulrunner/mozilla/plugins/BrowserStreamParent.h
-include/xulrunner/mozilla/plugins/PluginUtilsOSX.h
include/xulrunner/mozilla/plugins/ChildAsyncCall.h
include/xulrunner/mozilla/plugins/ChildTimer.h
include/xulrunner/mozilla/plugins/NPEventAndroid.h
include/xulrunner/mozilla/plugins/NPEventOSX.h
+include/xulrunner/mozilla/plugins/NPEventUnix.h
include/xulrunner/mozilla/plugins/NPEventWindows.h
-include/xulrunner/mozilla/plugins/NPEventX11.h
include/xulrunner/mozilla/plugins/PluginIdentifierChild.h
include/xulrunner/mozilla/plugins/PluginIdentifierParent.h
include/xulrunner/mozilla/plugins/PluginInstanceChild.h
@@ -489,6 +409,7 @@
include/xulrunner/mozilla/plugins/PluginScriptableObjectUtils.h
include/xulrunner/mozilla/plugins/PluginStreamChild.h
include/xulrunner/mozilla/plugins/PluginStreamParent.h
+include/xulrunner/mozilla/plugins/PluginUtilsOSX.h
include/xulrunner/mozilla/plugins/StreamNotifyChild.h
include/xulrunner/mozilla/plugins/StreamNotifyParent.h
include/xulrunner/mozilla/scache/StartupCache.h
@@ -867,7 +788,6 @@
include/xulrunner/nsICharsetResolver.h
include/xulrunner/nsIChildChannel.h
include/xulrunner/nsIChromeRegistry.h
-include/xulrunner/nsICipherInfo.h
include/xulrunner/nsIClassInfo.h
include/xulrunner/nsIClassInfoImpl.h
include/xulrunner/nsIClientAuthDialogs.h
@@ -969,6 +889,7 @@
include/xulrunner/nsIDOMCloseEvent.h
include/xulrunner/nsIDOMCommandEvent.h
include/xulrunner/nsIDOMComment.h
+include/xulrunner/nsIDOMCompositionEvent.h
include/xulrunner/nsIDOMConstructor.h
include/xulrunner/nsIDOMCounter.h
include/xulrunner/nsIDOMCrypto.h
@@ -994,7 +915,6 @@
include/xulrunner/nsIDOMElementCSSInlineStyle.h
include/xulrunner/nsIDOMElementTimeControl.h
include/xulrunner/nsIDOMEvent.h
-include/xulrunner/nsIDOMEventException.h
include/xulrunner/nsIDOMEventListener.h
include/xulrunner/nsIDOMEventTarget.h
include/xulrunner/nsIDOMFile.h
@@ -1106,15 +1026,9 @@
include/xulrunner/nsIDOMNSEditableElement.h
include/xulrunner/nsIDOMNSElement.h
include/xulrunner/nsIDOMNSEvent.h
-include/xulrunner/nsIDOMNSHTMLElement.h
-include/xulrunner/nsIDOMNSHTMLFrameElement.h
-include/xulrunner/nsIDOMNSHTMLOptionCollectn.h
-include/xulrunner/nsIDOMNSMouseEvent.h
include/xulrunner/nsIDOMNSRGBAColor.h
include/xulrunner/nsIDOMNSRange.h
-include/xulrunner/nsIDOMNSUIEvent.h
include/xulrunner/nsIDOMNSXPathExpression.h
-include/xulrunner/nsIDOMNameList.h
include/xulrunner/nsIDOMNamedNodeMap.h
include/xulrunner/nsIDOMNavigator.h
include/xulrunner/nsIDOMNavigatorDesktopNotification.h
@@ -1313,7 +1227,6 @@
include/xulrunner/nsIDocumentObserver.h
include/xulrunner/nsIDocumentStateListener.h
include/xulrunner/nsIDocumentTransformer.h
-include/xulrunner/nsIDocumentViewer.h
include/xulrunner/nsIDownload.h
include/xulrunner/nsIDownloadHistory.h
include/xulrunner/nsIDownloadManager.h
@@ -1407,7 +1320,6 @@
include/xulrunner/nsIGfxInfoDebug.h
include/xulrunner/nsIGlobalHistory.h
include/xulrunner/nsIGlobalHistory2.h
-include/xulrunner/nsIGlobalHistory3.h
include/xulrunner/nsIGnomeVFSService.h
include/xulrunner/nsIGridPart.h
include/xulrunner/nsIHTMLAbsPosEditor.h
@@ -1450,7 +1362,6 @@
include/xulrunner/nsIIDBRequest.h
include/xulrunner/nsIIDBTransaction.h
include/xulrunner/nsIIDBVersionChangeEvent.h
-include/xulrunner/nsIIDBVersionChangeRequest.h
include/xulrunner/nsIIDNService.h
include/xulrunner/nsIIFrameBoxObject.h
include/xulrunner/nsIIMEPicker.h
@@ -1467,6 +1378,7 @@
include/xulrunner/nsIImageToPixbuf.h
include/xulrunner/nsIIncrementalDownload.h
include/xulrunner/nsIIndexedDatabaseManager.h
+include/xulrunner/nsIInlineEventHandlers.h
include/xulrunner/nsIInlineSpellChecker.h
include/xulrunner/nsIInputListAutoComplete.h
include/xulrunner/nsIInputStream.h
@@ -1516,7 +1428,6 @@
include/xulrunner/nsILoginManagerPrompter.h
include/xulrunner/nsILoginManagerStorage.h
include/xulrunner/nsILoginMetaInfo.h
-include/xulrunner/nsILookAndFeel.h
include/xulrunner/nsIMIMEHeaderParam.h
include/xulrunner/nsIMIMEInfo.h
include/xulrunner/nsIMIMEInputStream.h
@@ -1709,9 +1620,6 @@
include/xulrunner/nsISSLSocketControl.h
include/xulrunner/nsISSLStatus.h
include/xulrunner/nsISSLStatusProvider.h
-include/xulrunner/nsISVGValue.h
-include/xulrunner/nsISVGValueObserver.h
-include/xulrunner/nsISVGValueUtils.h
include/xulrunner/nsISafeOutputStream.h
include/xulrunner/nsISaveAsCharset.h
include/xulrunner/nsIScreen.h
@@ -1733,7 +1641,6 @@
include/xulrunner/nsIScriptableBase64Encoder.h
include/xulrunner/nsIScriptableDateFormat.h
include/xulrunner/nsIScriptableInputStream.h
-include/xulrunner/nsIScriptableInterfaces.h
include/xulrunner/nsIScriptableRegion.h
include/xulrunner/nsIScriptableUConv.h
include/xulrunner/nsIScriptableUnescapeHTML.h
@@ -1834,7 +1741,6 @@
include/xulrunner/nsITokenDialogs.h
include/xulrunner/nsITokenPasswordDialogs.h
include/xulrunner/nsITokenizer.h
-include/xulrunner/nsIToolkit.h
include/xulrunner/nsIToolkitChromeRegistry.h
include/xulrunner/nsIToolkitProfile.h
include/xulrunner/nsIToolkitProfileService.h
@@ -1884,6 +1790,7 @@
include/xulrunner/nsIUploadChannel2.h
include/xulrunner/nsIUrlClassifierDBService.h
include/xulrunner/nsIUrlClassifierHashCompleter.h
+include/xulrunner/nsIUrlClassifierPrefixSet.h
include/xulrunner/nsIUrlClassifierStreamUpdater.h
include/xulrunner/nsIUrlClassifierUtils.h
include/xulrunner/nsIUrlListManager.h
@@ -1964,7 +1871,6 @@
include/xulrunner/nsIXULContextMenuBuilder.h
include/xulrunner/nsIXULDocument.h
include/xulrunner/nsIXULOverlayProvider.h
-include/xulrunner/nsIXULPrototypeCache.h
include/xulrunner/nsIXULRuntime.h
include/xulrunner/nsIXULSortService.h
include/xulrunner/nsIXULTemplateBuilder.h
@@ -2087,7 +1993,6 @@
include/xulrunner/nsSVGFilterInstance.h
include/xulrunner/nsSVGForeignObjectFrame.h
include/xulrunner/nsSVGIntegrationUtils.h
-include/xulrunner/nsSVGMatrix.h
include/xulrunner/nsSVGRect.h
include/xulrunner/nsSVGUtils.h
include/xulrunner/nsScannerString.h
@@ -2206,233 +2111,22 @@
include/xulrunner/nsZipArchive.h
include/xulrunner/nscore.h
include/xulrunner/nspluginroot.h
-include/xulrunner/nspr.h
-include/xulrunner/nspr/md/_aix32.cfg
-include/xulrunner/nspr/md/_aix64.cfg
-include/xulrunner/nspr/md/_beos.cfg
-include/xulrunner/nspr/md/_bsdi.cfg
-include/xulrunner/nspr/md/_darwin.cfg
-include/xulrunner/nspr/md/_dgux.cfg
-include/xulrunner/nspr/md/_dragonfly.cfg
-include/xulrunner/nspr/md/_freebsd.cfg
-include/xulrunner/nspr/md/_hpux32.cfg
-include/xulrunner/nspr/md/_hpux64.cfg
-include/xulrunner/nspr/md/_irix32.cfg
-include/xulrunner/nspr/md/_irix64.cfg
-include/xulrunner/nspr/md/_linux.cfg
-include/xulrunner/nspr/md/_ncr.cfg
-include/xulrunner/nspr/md/_nec.cfg
-include/xulrunner/nspr/md/_netbsd.cfg
-include/xulrunner/nspr/md/_nextstep.cfg
-include/xulrunner/nspr/md/_nto.cfg
-include/xulrunner/nspr/md/_openbsd.cfg
-include/xulrunner/nspr/md/_os2.cfg
-include/xulrunner/nspr/md/_osf1.cfg
-include/xulrunner/nspr/md/_qnx.cfg
-include/xulrunner/nspr/md/_reliantunix.cfg
-include/xulrunner/nspr/md/_riscos.cfg
-include/xulrunner/nspr/md/_scoos.cfg
-include/xulrunner/nspr/md/_solaris.cfg
-include/xulrunner/nspr/md/_sony.cfg
-include/xulrunner/nspr/md/_sunos4.cfg
-include/xulrunner/nspr/md/_symbian.cfg
-include/xulrunner/nspr/md/_unixware.cfg
-include/xulrunner/nspr/md/_unixware7.cfg
-include/xulrunner/nspr/md/_win95.cfg
-include/xulrunner/nspr/md/_winnt.cfg
-include/xulrunner/nspr/nspr.h
-include/xulrunner/nspr/obsolete/pralarm.h
-include/xulrunner/nspr/obsolete/probslet.h
-include/xulrunner/nspr/obsolete/protypes.h
-include/xulrunner/nspr/obsolete/prsem.h
-include/xulrunner/nspr/plarena.h
-include/xulrunner/nspr/plarenas.h
-include/xulrunner/nspr/plbase64.h
-include/xulrunner/nspr/plerror.h
-include/xulrunner/nspr/plgetopt.h
-include/xulrunner/nspr/plhash.h
-include/xulrunner/nspr/plstr.h
-include/xulrunner/nspr/pratom.h
-include/xulrunner/nspr/prbit.h
-include/xulrunner/nspr/prclist.h
-include/xulrunner/nspr/prcmon.h
-include/xulrunner/nspr/prcountr.h
-include/xulrunner/nspr/prcpucfg.h
-include/xulrunner/nspr/prcvar.h
-include/xulrunner/nspr/prdtoa.h
-include/xulrunner/nspr/prenv.h
-include/xulrunner/nspr/prerr.h
-include/xulrunner/nspr/prerror.h
-include/xulrunner/nspr/prinet.h
-include/xulrunner/nspr/prinit.h
-include/xulrunner/nspr/prinrval.h
-include/xulrunner/nspr/prio.h
-include/xulrunner/nspr/pripcsem.h
-include/xulrunner/nspr/private/pprio.h
-include/xulrunner/nspr/private/pprthred.h
-include/xulrunner/nspr/private/prpriv.h
-include/xulrunner/nspr/prlink.h
-include/xulrunner/nspr/prlock.h
-include/xulrunner/nspr/prlog.h
-include/xulrunner/nspr/prlong.h
-include/xulrunner/nspr/prmem.h
-include/xulrunner/nspr/prmon.h
-include/xulrunner/nspr/prmwait.h
-include/xulrunner/nspr/prnetdb.h
-include/xulrunner/nspr/prolock.h
-include/xulrunner/nspr/prpdce.h
-include/xulrunner/nspr/prprf.h
-include/xulrunner/nspr/prproces.h
-include/xulrunner/nspr/prrng.h
-include/xulrunner/nspr/prrwlock.h
-include/xulrunner/nspr/prshm.h
-include/xulrunner/nspr/prshma.h
-include/xulrunner/nspr/prsystem.h
-include/xulrunner/nspr/prthread.h
-include/xulrunner/nspr/prtime.h
-include/xulrunner/nspr/prtpool.h
-include/xulrunner/nspr/prtrace.h
-include/xulrunner/nspr/prtypes.h
-include/xulrunner/nspr/prvrsion.h
-include/xulrunner/nspr/prwin16.h
include/xulrunner/nsrootidl.h
-include/xulrunner/nss.h
-include/xulrunner/nssb64.h
-include/xulrunner/nssb64t.h
-include/xulrunner/nssbase.h
-include/xulrunner/nssbaset.h
-include/xulrunner/nssck.api
-include/xulrunner/nssckbi.h
-include/xulrunner/nssckepv.h
-include/xulrunner/nssckft.h
-include/xulrunner/nssckfw.h
-include/xulrunner/nssckfwc.h
-include/xulrunner/nssckfwt.h
-include/xulrunner/nssckg.h
-include/xulrunner/nssckmdt.h
-include/xulrunner/nssckt.h
-include/xulrunner/nssilckt.h
-include/xulrunner/nssilock.h
-include/xulrunner/nsslocks.h
-include/xulrunner/nssrwlk.h
-include/xulrunner/nssrwlkt.h
-include/xulrunner/nssutil.h
-include/xulrunner/obsolete/pralarm.h
-include/xulrunner/obsolete/probslet.h
-include/xulrunner/obsolete/protypes.h
-include/xulrunner/obsolete/prsem.h
-include/xulrunner/ocsp.h
-include/xulrunner/ocspt.h
include/xulrunner/ogg/config_types.h
include/xulrunner/ogg/ogg.h
include/xulrunner/ogg/os_types.h
include/xulrunner/opentype-sanitiser.h
include/xulrunner/ots-memory-stream.h
-include/xulrunner/p12.h
-include/xulrunner/p12plcy.h
-include/xulrunner/p12t.h
-include/xulrunner/pixman-version.h
-include/xulrunner/pixman.h
-include/xulrunner/pk11func.h
-include/xulrunner/pk11pqg.h
-include/xulrunner/pk11priv.h
-include/xulrunner/pk11pub.h
-include/xulrunner/pk11sdr.h
-include/xulrunner/pkcs11.h
-include/xulrunner/pkcs11f.h
-include/xulrunner/pkcs11n.h
-include/xulrunner/pkcs11p.h
-include/xulrunner/pkcs11t.h
-include/xulrunner/pkcs11u.h
-include/xulrunner/pkcs12.h
-include/xulrunner/pkcs12t.h
-include/xulrunner/pkcs7t.h
-include/xulrunner/plarena.h
-include/xulrunner/plarenas.h
-include/xulrunner/plbase64.h
include/xulrunner/pldhash.h
-include/xulrunner/plerror.h
-include/xulrunner/plgetopt.h
-include/xulrunner/plhash.h
-include/xulrunner/plstr.h
include/xulrunner/png.h
include/xulrunner/pngconf.h
-include/xulrunner/portreg.h
-include/xulrunner/pratom.h
-include/xulrunner/prbit.h
-include/xulrunner/prclist.h
-include/xulrunner/prcmon.h
-include/xulrunner/prcountr.h
-include/xulrunner/prcpucfg.h
-include/xulrunner/prcvar.h
-include/xulrunner/prdtoa.h
-include/xulrunner/preenc.h
-include/xulrunner/prenv.h
-include/xulrunner/prerr.h
-include/xulrunner/prerror.h
-include/xulrunner/prinet.h
-include/xulrunner/prinit.h
-include/xulrunner/prinrval.h
-include/xulrunner/prio.h
-include/xulrunner/pripcsem.h
-include/xulrunner/private/pprio.h
-include/xulrunner/private/pprthred.h
-include/xulrunner/private/prpriv.h
-include/xulrunner/prlink.h
-include/xulrunner/prlock.h
-include/xulrunner/prlog.h
-include/xulrunner/prlong.h
-include/xulrunner/prmem.h
include/xulrunner/prmjtime.h
-include/xulrunner/prmon.h
-include/xulrunner/prmwait.h
-include/xulrunner/prnetdb.h
-include/xulrunner/prolock.h
-include/xulrunner/prpdce.h
-include/xulrunner/prprf.h
-include/xulrunner/prproces.h
-include/xulrunner/prrng.h
-include/xulrunner/prrwlock.h
-include/xulrunner/prshm.h
-include/xulrunner/prshma.h
-include/xulrunner/prsystem.h
-include/xulrunner/prthread.h
-include/xulrunner/prtime.h
-include/xulrunner/prtpool.h
-include/xulrunner/prtrace.h
-include/xulrunner/prtypes.h
-include/xulrunner/prvrsion.h
-include/xulrunner/prwin16.h
include/xulrunner/qcms.h
include/xulrunner/qcmstypes.h
include/xulrunner/rdf.h
include/xulrunner/rdfIDataSource.h
include/xulrunner/rdfISerializer.h
include/xulrunner/rdfITripleVisitor.h
-include/xulrunner/secasn1.h
-include/xulrunner/secasn1t.h
-include/xulrunner/seccomon.h
-include/xulrunner/secder.h
-include/xulrunner/secdert.h
-include/xulrunner/secdig.h
-include/xulrunner/secdigt.h
-include/xulrunner/secerr.h
-include/xulrunner/sechash.h
-include/xulrunner/secitem.h
-include/xulrunner/secmime.h
-include/xulrunner/secmod.h
-include/xulrunner/secmodt.h
-include/xulrunner/secoid.h
-include/xulrunner/secoidt.h
-include/xulrunner/secpkcs5.h
-include/xulrunner/secpkcs7.h
-include/xulrunner/secport.h
-include/xulrunner/shsign.h
-include/xulrunner/smime.h
-include/xulrunner/ssl.h
-include/xulrunner/sslerr.h
-include/xulrunner/sslproto.h
-include/xulrunner/sslt.h
include/xulrunner/string-template-def-char.h
include/xulrunner/string-template-def-unichar.h
include/xulrunner/string-template-undef.h
@@ -2446,37 +2140,9 @@
include/xulrunner/txINodeSet.h
include/xulrunner/txIXPathObject.h
include/xulrunner/uconvutil.h
-include/xulrunner/utilrename.h
-include/xulrunner/vm/ArgumentsObject.h
-include/xulrunner/vm/GlobalObject.h
-include/xulrunner/vm/Stack.h
include/xulrunner/vm/String.h
-include/xulrunner/vm/StringObject.h
include/xulrunner/vm/Unicode.h
include/xulrunner/vorbis/codec.h
-include/xulrunner/vpx/arm.h
-include/xulrunner/vpx/config.h
-include/xulrunner/vpx/mem.h
-include/xulrunner/vpx/scale_mode.h
-include/xulrunner/vpx/vp8.h
-include/xulrunner/vpx/vp8cx.h
-include/xulrunner/vpx/vp8dx.h
-include/xulrunner/vpx/vp8e.h
-include/xulrunner/vpx/vpx_codec.h
-include/xulrunner/vpx/vpx_codec_impl_bottom.h
-include/xulrunner/vpx/vpx_codec_impl_top.h
-include/xulrunner/vpx/vpx_decoder.h
-include/xulrunner/vpx/vpx_decoder_compat.h
-include/xulrunner/vpx/vpx_encoder.h
-include/xulrunner/vpx/vpx_image.h
-include/xulrunner/vpx/vpx_integer.h
-include/xulrunner/vpx/vpx_mem.h
-include/xulrunner/vpx/vpx_mem_intrnl.h
-include/xulrunner/vpx/vpx_timer.h
-include/xulrunner/vpx/vpxscale.h
-include/xulrunner/vpx/x86.h
-include/xulrunner/vpx/yv12config.h
-include/xulrunner/vpx/yv12extend.h
include/xulrunner/xpcIJSGetFactory.h
include/xulrunner/xpcIJSModuleLoader.h
include/xulrunner/xpcIJSWeakReference.h
@@ -2500,30 +2166,22 @@
include/xulrunner/zipstruct.h
lib/pkgconfig/libxul-embedding.pc
lib/pkgconfig/libxul.pc
-lib/pkgconfig/mozilla-gtkmozembed-embedding.pc
-lib/pkgconfig/mozilla-gtkmozembed.pc
lib/pkgconfig/mozilla-js.pc
-lib/pkgconfig/mozilla-nspr.pc
-lib/pkgconfig/mozilla-nss.pc
lib/pkgconfig/mozilla-plugin.pc
lib/xulrunner-sdk/bin
lib/xulrunner-sdk/idl
lib/xulrunner-sdk/include
lib/xulrunner-sdk/lib
-lib/xulrunner-sdk/sdk/bin/nspr-config
-lib/xulrunner-sdk/sdk/bin/xpidl
+lib/xulrunner-sdk/sdk/bin/header.py
+lib/xulrunner-sdk/sdk/bin/ply/__init__.py
+lib/xulrunner-sdk/sdk/bin/ply/lex.py
+lib/xulrunner-sdk/sdk/bin/ply/yacc.py
+lib/xulrunner-sdk/sdk/bin/typelib.py
+lib/xulrunner-sdk/sdk/bin/xpidl.py
lib/xulrunner-sdk/sdk/bin/xpt.py
-lib/xulrunner-sdk/sdk/lib/libcrmf.a
lib/xulrunner-sdk/sdk/lib/libmozalloc.so
lib/xulrunner-sdk/sdk/lib/libmozreg_s.a
lib/xulrunner-sdk/sdk/lib/libmozreg_s.a.desc
-lib/xulrunner-sdk/sdk/lib/libnspr4.so
-lib/xulrunner-sdk/sdk/lib/libnss.a
-lib/xulrunner-sdk/sdk/lib/libnssutil.a
-lib/xulrunner-sdk/sdk/lib/libplc4.so
-lib/xulrunner-sdk/sdk/lib/libplds4.so
-lib/xulrunner-sdk/sdk/lib/libsmime.a
-lib/xulrunner-sdk/sdk/lib/libssl.a
lib/xulrunner-sdk/sdk/lib/libunicharutil_external_s.a
lib/xulrunner-sdk/sdk/lib/libunicharutil_external_s.a.desc
lib/xulrunner-sdk/sdk/lib/libxpcom.so
@@ -2626,7 +2284,6 @@
lib/xulrunner/chrome/en-US/locale/en-US/global/videocontrols.dtd
lib/xulrunner/chrome/en-US/locale/en-US/global/viewSource.dtd
lib/xulrunner/chrome/en-US/locale/en-US/global/viewSource.properties
-lib/xulrunner/chrome/en-US/locale/en-US/global/webConsole.dtd
lib/xulrunner/chrome/en-US/locale/en-US/global/wizard.dtd
lib/xulrunner/chrome/en-US/locale/en-US/global/wizard.properties
lib/xulrunner/chrome/en-US/locale/en-US/global/xbl.properties
@@ -3225,7 +2882,6 @@
lib/xulrunner/components/addonManager.js
lib/xulrunner/components/amContentHandler.js
lib/xulrunner/components/amWebInstallListener.js
-${PLIST.gnome}lib/xulrunner/components/components.manifest
lib/xulrunner/components/contentAreaDropListener.js
lib/xulrunner/components/contentAreaDropListener.manifest
lib/xulrunner/components/contentSecurityPolicy.js
@@ -3235,9 +2891,6 @@
lib/xulrunner/components/interfaces.manifest
lib/xulrunner/components/jsconsole-clhandler.js
lib/xulrunner/components/jsconsole-clhandler.manifest
-${PLIST.gnome}lib/xulrunner/components/libdbusservice.so
-${PLIST.gnome}lib/xulrunner/components/libmozgnome.so
-${PLIST.gnome}lib/xulrunner/components/libnkgnomevfs.so
lib/xulrunner/components/messageWakeupService.js
lib/xulrunner/components/messageWakeupService.manifest
lib/xulrunner/components/nsBadCertHandler.js
@@ -3276,8 +2929,6 @@
lib/xulrunner/components/nsSearchService.js
lib/xulrunner/components/nsSearchSuggestions.js
lib/xulrunner/components/nsTaggingService.js
-lib/xulrunner/components/nsTryToClose.js
-lib/xulrunner/components/nsTryToClose.manifest
lib/xulrunner/components/nsURLClassifier.manifest
lib/xulrunner/components/nsURLFormatter.js
lib/xulrunner/components/nsURLFormatter.manifest
@@ -3333,8 +2984,10 @@
lib/xulrunner/hyphenation/hyph_gl.dic
lib/xulrunner/hyphenation/hyph_hr.dic
lib/xulrunner/hyphenation/hyph_hsb.dic
+lib/xulrunner/hyphenation/hyph_hu.dic
lib/xulrunner/hyphenation/hyph_ia.dic
lib/xulrunner/hyphenation/hyph_is.dic
+lib/xulrunner/hyphenation/hyph_it.dic
lib/xulrunner/hyphenation/hyph_kmr.dic
lib/xulrunner/hyphenation/hyph_la.dic
lib/xulrunner/hyphenation/hyph_lt.dic
@@ -3347,23 +3000,10 @@
lib/xulrunner/hyphenation/hyph_sh.dic
lib/xulrunner/hyphenation/hyph_sl.dic
lib/xulrunner/hyphenation/hyph_sv.dic
+lib/xulrunner/hyphenation/hyph_tr.dic
lib/xulrunner/hyphenation/hyph_uk.dic
lib/xulrunner/icons/updater.png
-lib/xulrunner/libfreebl3.chk
-lib/xulrunner/libfreebl3.so
lib/xulrunner/libmozalloc.so
-lib/xulrunner/libnspr4.so
-lib/xulrunner/libnss3.so
-lib/xulrunner/libnssckbi.so
-lib/xulrunner/libnssdbm3.chk
-lib/xulrunner/libnssdbm3.so
-lib/xulrunner/libnssutil3.so
-lib/xulrunner/libplc4.so
-lib/xulrunner/libplds4.so
-lib/xulrunner/libsmime3.so
-lib/xulrunner/libsoftokn3.chk
-lib/xulrunner/libsoftokn3.so
-lib/xulrunner/libssl3.so
lib/xulrunner/libunicharutil_external_s.a
lib/xulrunner/libxpcom.so
lib/xulrunner/libxpcomglue.a
@@ -3376,6 +3016,7 @@
lib/xulrunner/modules/CSPUtils.jsm
lib/xulrunner/modules/CertUtils.jsm
lib/xulrunner/modules/CommonDialog.jsm
+lib/xulrunner/modules/ConsoleAPIStorage.jsm
lib/xulrunner/modules/Dict.jsm
lib/xulrunner/modules/DownloadLastDir.jsm
lib/xulrunner/modules/DownloadPaths.jsm
@@ -3401,6 +3042,7 @@
lib/xulrunner/modules/XPIProvider.jsm
lib/xulrunner/modules/ctypes.jsm
lib/xulrunner/modules/debug.js
+lib/xulrunner/modules/jsdebugger.jsm
lib/xulrunner/modules/nsFormAutoCompleteResult.jsm
lib/xulrunner/modules/reflect.jsm
lib/xulrunner/modules/utils.js
@@ -3451,17 +3093,15 @@
lib/xulrunner/update.locale
lib/xulrunner/updater
lib/xulrunner/xpcshell
-lib/xulrunner/xpidl
lib/xulrunner/xulrunner
lib/xulrunner/xulrunner-bin
lib/xulrunner/xulrunner-stub
+share/idl/xulrunner/IJSDebugger.idl
share/idl/xulrunner/amIInstallTrigger.idl
share/idl/xulrunner/amIWebInstallListener.idl
share/idl/xulrunner/amIWebInstaller.idl
share/idl/xulrunner/domstubs.idl
share/idl/xulrunner/extIApplication.idl
-share/idl/xulrunner/gfxIFormats.idl
-share/idl/xulrunner/gfxidltypes.idl
share/idl/xulrunner/imgICache.idl
share/idl/xulrunner/imgIContainer.idl
share/idl/xulrunner/imgIContainerDebug.idl
@@ -3616,7 +3256,6 @@
share/idl/xulrunner/nsICharsetResolver.idl
share/idl/xulrunner/nsIChildChannel.idl
share/idl/xulrunner/nsIChromeRegistry.idl
-share/idl/xulrunner/nsICipherInfo.idl
share/idl/xulrunner/nsIClassInfo.idl
share/idl/xulrunner/nsIClientAuthDialogs.idl
share/idl/xulrunner/nsIClipboard.idl
@@ -3709,6 +3348,7 @@
share/idl/xulrunner/nsIDOMCloseEvent.idl
share/idl/xulrunner/nsIDOMCommandEvent.idl
share/idl/xulrunner/nsIDOMComment.idl
+share/idl/xulrunner/nsIDOMCompositionEvent.idl
share/idl/xulrunner/nsIDOMConstructor.idl
share/idl/xulrunner/nsIDOMCounter.idl
share/idl/xulrunner/nsIDOMCrypto.idl
@@ -3734,7 +3374,6 @@
share/idl/xulrunner/nsIDOMElementCSSInlineStyle.idl
share/idl/xulrunner/nsIDOMElementTimeControl.idl
share/idl/xulrunner/nsIDOMEvent.idl
-share/idl/xulrunner/nsIDOMEventException.idl
share/idl/xulrunner/nsIDOMEventListener.idl
share/idl/xulrunner/nsIDOMEventTarget.idl
share/idl/xulrunner/nsIDOMFile.idl
@@ -3846,15 +3485,9 @@
share/idl/xulrunner/nsIDOMNSEditableElement.idl
share/idl/xulrunner/nsIDOMNSElement.idl
share/idl/xulrunner/nsIDOMNSEvent.idl
-share/idl/xulrunner/nsIDOMNSHTMLElement.idl
-share/idl/xulrunner/nsIDOMNSHTMLFrameElement.idl
-share/idl/xulrunner/nsIDOMNSHTMLOptionCollectn.idl
-share/idl/xulrunner/nsIDOMNSMouseEvent.idl
share/idl/xulrunner/nsIDOMNSRGBAColor.idl
share/idl/xulrunner/nsIDOMNSRange.idl
-share/idl/xulrunner/nsIDOMNSUIEvent.idl
share/idl/xulrunner/nsIDOMNSXPathExpression.idl
-share/idl/xulrunner/nsIDOMNameList.idl
share/idl/xulrunner/nsIDOMNamedNodeMap.idl
share/idl/xulrunner/nsIDOMNavigator.idl
share/idl/xulrunner/nsIDOMNavigatorDesktopNotification.idl
@@ -4129,7 +3762,6 @@
share/idl/xulrunner/nsIGfxInfoDebug.idl
share/idl/xulrunner/nsIGlobalHistory.idl
share/idl/xulrunner/nsIGlobalHistory2.idl
-share/idl/xulrunner/nsIGlobalHistory3.idl
share/idl/xulrunner/nsIGnomeVFSService.idl
share/idl/xulrunner/nsIHTMLAbsPosEditor.idl
share/idl/xulrunner/nsIHTMLEditor.idl
@@ -4166,7 +3798,6 @@
share/idl/xulrunner/nsIIDBRequest.idl
share/idl/xulrunner/nsIIDBTransaction.idl
share/idl/xulrunner/nsIIDBVersionChangeEvent.idl
-share/idl/xulrunner/nsIIDBVersionChangeRequest.idl
share/idl/xulrunner/nsIIDNService.idl
share/idl/xulrunner/nsIIFrameBoxObject.idl
share/idl/xulrunner/nsIIMEPicker.idl
@@ -4182,6 +3813,7 @@
share/idl/xulrunner/nsIImageLoadingContent.idl
share/idl/xulrunner/nsIIncrementalDownload.idl
share/idl/xulrunner/nsIIndexedDatabaseManager.idl
+share/idl/xulrunner/nsIInlineEventHandlers.idl
share/idl/xulrunner/nsIInlineSpellChecker.idl
share/idl/xulrunner/nsIInputListAutoComplete.idl
share/idl/xulrunner/nsIInputStream.idl
@@ -4387,7 +4019,6 @@
share/idl/xulrunner/nsIScriptableBase64Encoder.idl
share/idl/xulrunner/nsIScriptableDateFormat.idl
share/idl/xulrunner/nsIScriptableInputStream.idl
-share/idl/xulrunner/nsIScriptableInterfaces.idl
share/idl/xulrunner/nsIScriptableRegion.idl
share/idl/xulrunner/nsIScriptableUConv.idl
share/idl/xulrunner/nsIScriptableUnescapeHTML.idl
@@ -4465,7 +4096,6 @@
share/idl/xulrunner/nsITimer.idl
share/idl/xulrunner/nsITokenDialogs.idl
share/idl/xulrunner/nsITokenPasswordDialogs.idl
-share/idl/xulrunner/nsIToolkit.idl
share/idl/xulrunner/nsIToolkitChromeRegistry.idl
share/idl/xulrunner/nsIToolkitProfile.idl
share/idl/xulrunner/nsIToolkitProfileService.idl
@@ -4511,6 +4141,7 @@
share/idl/xulrunner/nsIUploadChannel2.idl
share/idl/xulrunner/nsIUrlClassifierDBService.idl
share/idl/xulrunner/nsIUrlClassifierHashCompleter.idl
+share/idl/xulrunner/nsIUrlClassifierPrefixSet.idl
share/idl/xulrunner/nsIUrlClassifierStreamUpdater.idl
share/idl/xulrunner/nsIUrlClassifierUtils.idl
share/idl/xulrunner/nsIUrlListManager.idl
@@ -4610,5 +4241,42 @@
share/idl/xulrunner/xpccomponents.idl
share/idl/xulrunner/xpcexception.idl
share/idl/xulrunner/xpcjsid.idl
-@pkgdir lib/xulrunner/plugins
+include/xulrunner/LayerSorter.h
-@pkgdir include/xulrunner/nss
+include/xulrunner/dombindings_gen.h
+include/xulrunner/ds/BitArray.h
+include/xulrunner/ds/LifoAlloc.h
+include/xulrunner/gc/Statistics.h
+include/xulrunner/gfxLineSegment.h
+include/xulrunner/gfxQuad.h
+include/xulrunner/js/HashTable.h
+include/xulrunner/js/TemplateLib.h
+include/xulrunner/js/Utility.h
+include/xulrunner/js/Vector.h
+include/xulrunner/jscpucfg.h
+include/xulrunner/mozilla/Hal.h
+include/xulrunner/mozilla/HalImpl.h
+include/xulrunner/mozilla/HalSandbox.h
+include/xulrunner/mozilla/Observer.h
+include/xulrunner/mozilla/a11y/FocusManager.h
+include/xulrunner/mozilla/dom/TabMessageUtils.h
+include/xulrunner/mozilla/dom/battery/Constants.h
+include/xulrunner/mozilla/dom/battery/Types.h
+include/xulrunner/mozilla/gfx/PathHelpers.h
+include/xulrunner/mozilla/places/Database.h
+include/xulrunner/nsHtml5DependentUTF16Buffer.h
+include/xulrunner/nsHtml5OwningUTF16Buffer.h
+include/xulrunner/nsIDOMBatteryManager.h
+include/xulrunner/nsIDOMNavigatorBattery.h
+include/xulrunner/nsIIDBOpenDBRequest.h
+include/xulrunner/sampler.h
+include/xulrunner/sps_sampler.h
+include/xulrunner/vm/StackSpace.h
+lib/xulrunner/chrome/en-US/locale/en-US/global/layout/htmlparser.properties
+lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png
+lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric-16.png
+lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png
+lib/xulrunner/modules/ChromeManifestParser.jsm
+lib/xulrunner/modules/SpellCheckDictionaryBootstrap.js
+share/idl/xulrunner/nsIDOMBatteryManager.idl
+share/idl/xulrunner/nsIDOMNavigatorBattery.idl
+share/idl/xulrunner/nsIIDBOpenDBRequest.idl
--- pkgsrc/devel/xulrunner/Attic/buildlink3.mk 2012/03/03 00:12:15 1.20
+++ pkgsrc/devel/xulrunner/Attic/buildlink3.mk 2012/03/06 12:34:08 1.21
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2012/03/03 00:12:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2012/03/06 12:34:08 ryoon Exp $
BUILDLINK_TREE+= xulrunner
@@ -6,8 +6,15 @@
XULRUNNER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=6.0
-BUILDLINK_ABI_DEPENDS.xulrunner?= xulrunner>=8.0nb5
+BUILDLINK_ABI_DEPENDS.xulrunner?= xulrunner>=8.0nb2
BUILDLINK_PKGSRCDIR.xulrunner?= ../../devel/xulrunner
+
+BUILDLINK_INCDIRS.xulrunner+= lib/xulrunner-sdk/include
+BUILDLINK_INCDIRS.xulrunner+= include/xulrunner
+BUILDLINK_FILES.xulrunner+= lib/xulrunner-sdk/include/*.h
+
+BUILDLINK_LIBDIRS.xulrunner+= lib/xulrunner-sdk/lib
+BUILDLINK_FILES.xulrunner+= lib/xulrunner-sdk/lib/*.so
pkgbase := xulrunner
.include "../../mk/pkg-build-options.mk"
--- pkgsrc/devel/xulrunner/Attic/dist.mk 2011/11/12 12:45:04 1.27
+++ pkgsrc/devel/xulrunner/Attic/dist.mk 2012/03/06 12:34:08 1.28
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.27 2011/11/12 12:45:04 tnn Exp $
+# $NetBSD: dist.mk,v 1.28 2012/03/06 12:34:08 ryoon Exp $
#
# used by devel/nspr/Makefile
# used by devel/nss/Makefile
@@ -7,8 +7,8 @@
DISTNAME= firefox-${FIREFOX_VER}.source
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH= 8.0
-MOZ_BRANCH_MINOR= #
+MOZ_BRANCH= 10.0
+MOZ_BRANCH_MINOR= .2
MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
EXTRACT_SUFX= .tar.bz2
--- pkgsrc/devel/xulrunner/Attic/distinfo 2012/02/09 17:18:12 1.58
+++ pkgsrc/devel/xulrunner/Attic/distinfo 2012/03/06 12:34:08 1.59
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.58 2012/02/09 17:18:12 cheusov Exp $
+$NetBSD: distinfo,v 1.59 2012/03/06 12:34:08 ryoon Exp $
-SHA1 (firefox-8.0.source.tar.bz2) = 843cf4ad70d2fc4b16654c3ff9b080d3eb357452
-RMD160 (firefox-8.0.source.tar.bz2) = f87ec7668b2dcc1bb581b97e1dbe85e4b97cb31c
-Size (firefox-8.0.source.tar.bz2) = 70377448 bytes
-SHA1 (patch-aa) = 3905ddf598c66758fe5c8862baaf029f32f8950e
+SHA1 (firefox-10.0.2.source.tar.bz2) = d9b459d915d4638a48b3e249fcbaf7cafc27e834
+RMD160 (firefox-10.0.2.source.tar.bz2) = 50c45cf2d561290ecfdfeea3fefae22cbae9ce85
+Size (firefox-10.0.2.source.tar.bz2) = 75540089 bytes
+SHA1 (patch-aa) = 93efde3dab747f80a575cd7c10c045967531bb53
SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997
SHA1 (patch-ac) = 6aa120769b63efa5869029655f50af901edb9129
SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
SHA1 (patch-ae) = 470d64f32fe1e619a101486a4bec45d2a06b6cab
SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df
SHA1 (patch-ag) = a924296e6a569eba4229d661fbe5290eeeb999e0
-SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac
SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
SHA1 (patch-aj) = 78803641532203f878fc99ead9a440b8bf425aeb
SHA1 (patch-ak) = 748dfb52230f384d58a9ed725d786f536a5c1a3f
@@ -19,40 +18,62 @@
SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7
SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3
SHA1 (patch-as) = 3f51422d828d0ec6e280381a831d8603b88508c7
-SHA1 (patch-at) = 4b07a03183c7a64f8779574c4768a7b4a366c740
+SHA1 (patch-at) = d5e820c9ad87feb1827c948a1471127bc21fbd1b
SHA1 (patch-au) = e59d5c28c676e03fb8bb38e28c06a4fd4d44ab55
SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771
-SHA1 (patch-aw) = eed2f98b732fa776d2ca64d2b82e88677a207657
+SHA1 (patch-aw) = 0772c244636f7973171c274c126fa8bfbbcf1acb
SHA1 (patch-ax) = 777ed7921d939e6f7a4a3c23cb92e5489e454601
SHA1 (patch-ay) = 81c3de4bee86ceab7927a49bcd79d980b06ad6f0
SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4
SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d
SHA1 (patch-bd) = e09718d6492739a66dc5e21d3ed2cc1a404acd30
-SHA1 (patch-be) = 723d74807830632ecd3b88e8271d91d73ac81be4
SHA1 (patch-bf) = ef6d6ccbbfee2c72aef76c70695b202e346c5038
SHA1 (patch-bg) = 85d82348c43257eded6426ac84af9815619eb759
-SHA1 (patch-bi) = a79369cf0c7370a8655fe414cdb7c8ddb4c2d495
-SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = fcb4313d2a77c73df717138e33a3bc74841f06c4
-SHA1 (patch-ipc_chromium_src_base_file__util.h) = 1385e427cc8c0c14cd67763aea85d78b99901de7
-SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = f3e0891320d2658db2bf33b57e6287f4380c855e
+SHA1 (patch-bi) = b190a1c338550b70b65c02f29639338708295075
+SHA1 (patch-build_autoconf_gcc-pr49911.m4) = 252dbdf1c319e17455b5225254281b656dbb397b
+SHA1 (patch-build_autoconf_nss.m4) = 2cd3f2d824273fe58c1a1f0a4b05605430ed3471
+SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = b4ce48ef10635feef8ac48017e03737f4a259d95
+SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = b036f543f2e8502c216164e80aafe7844ae4de54
+SHA1 (patch-ipc_chromium_Makefile.in) = 050bfd7911f72b677c12e6f51ba0783a3356a367
+SHA1 (patch-ipc_chromium_chromium-config.mk) = 00810dd00ebaf4a36448b84559035d6990a1514f
+SHA1 (patch-ipc_chromium_src_base_base__paths.h) = de42f64a1484ab6570637643ee79ec2e60d9ea01
+SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 4707d1753f5c951efa1d0ecb3e6e17dd200745aa
+SHA1 (patch-ipc_chromium_src_base_file__util.h) = 9cdf3cad35412a65bc1f8ebbfb7d27ad2e8f6c49
+SHA1 (patch-ipc_chromium_src_base_file__util__bsd.cc) = e512d59c6cf9947532317678d009d03c575473bf
+SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 73768c9d4fa0729c92d9a4d3f835f89852065359
+SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = 43c2c98273ebab9417e3101069cc567234dfd3b9
SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = eb6c8003375c047602fbe5d52497257f0bcdaa4d
-SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 5a7fa054bb12cc1e7474aedcaa133869023e6a95
+SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 2463d67e22ea6debe211511e43547fea351012d1
+SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = ca70558dda0166bf898d3c1ccbb58d06212568ca
+SHA1 (patch-ipc_chromium_src_base_process__util.h) = c08790eaf22b41e64067ab8d29d0c3a125355622
+SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = e0a2e91a461917c075b66e4778415b1301801ffb
+SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 73b6de35552b97957442d69be25ace53faa6aae2
SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = de14044b7e2a0085afa6b603bc76f59b6f24c47f
-SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 15b35884249077eb879371b8b63d2f8aa4ee68b5
-SHA1 (patch-ipc_chromium_src_build_build__config.h) = 54d78c212c07f5fcd8c54d7570e713a6cf8e692f
+SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = d5cd70bdc680f04120c58ec576227affd403c992
+SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prtime.cc) = 1143a8abfb69d0c236963037aa09d90e6fd6493a
+SHA1 (patch-ipc_chromium_src_build_build__config.h) = 8e43063b693d69bac425705d02f9214778814f79
SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 27ac2b7dbe1b325ad833ffc2bf17003a5f6a6f88
+SHA1 (patch-ipc_chromium_src_chrome_common_ipc__message__utils.h) = fb31bc5e58615d0297c714e8ba500e51fd2813bc
+SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = b55156f1cb5a115a3dcec2d22195fc8763c97e00
+SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 18a5d9f0b2e2d1f3d96e69e39de5447c9534eca9
+SHA1 (patch-js_src_build_autoconf_gcc-pr49911.m4) = 28d546bd51cc9fe556a6f92365bdafd335629fb1
+SHA1 (patch-js_src_jscpucfg.h) = d6e54c26608c29697ee310bc4b5fc08e21fdf2b7
+SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = aec956a2cb35ce4dffb87fded52b8436781dab85
+SHA1 (patch-js_src_yarr_pcre_pcre.h) = cf86b885ac222854a62c6ab98dad338bd76cd7d1
SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
-SHA1 (patch-mb) = 131abc07f378cefcc8c2871e4fd20f306e3af61a
+SHA1 (patch-mb) = 82d8243d7f7aadfad77a14df0f57c39bc93ced8a
SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
-SHA1 (patch-me) = da6324dd21a40dd3cc7b7b9321a18bd11a3434fd
+SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2
+SHA1 (patch-media_libvpx_vpx__config.h) = 2be4f01b6a603a8cf8c1d5e31e98b3ee404702b6
+SHA1 (patch-media_libvpx_vpx__config__c.c) = 03be90f07f98b743b61048ad3f7390dcce77e89d
SHA1 (patch-mf) = de2d47132013a1f6fd12a0893d21eb34dd843b3e
SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8
SHA1 (patch-mh) = 0318566ecddafd00d4abd22a08ccab3eb72eabe3
-SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
+SHA1 (patch-mi) = 1a031ea9be110822995094c84f77c3c68f5c2a39
SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
-SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9
-SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00
-SHA1 (patch-mm) = f103ec94a9d4c6c910eb9da9cc3df486b8294415
+SHA1 (patch-mk) = 5020178423260e37aa736f4fa4d5ec46ed48b7ea
+SHA1 (patch-ml) = ffec4dcae4a4e3683eebfc3e8aaafe15fa27443e
+SHA1 (patch-mm) = 53c4816eefd64b2da460c7b38175e05401559e95
SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203
SHA1 (patch-mp) = 18d2490b6bcd4f017cbf2734a920c3830bfe8856
SHA1 (patch-nsprpub_pr_include_md__dragonfly.cfg) = 9888fa5070d2201a8912be33a32ae32f1d26f8ce
@@ -82,4 +103,6 @@
SHA1 (patch-xm) = 072240b71e4738e96d258fcd481698464623735e
SHA1 (patch-xn) = b0d0943b2bc39d8395055550c0fedfa447a5de01
SHA1 (patch-xo) = 437cbc7e0ed8777ae2313165f8754759d8eee01d
+SHA1 (patch-xpcom_Makefile.in) = ad9c0ed4347b0ed4f51a6f0f34ac48c65d2152c8
SHA1 (patch-xpcom_idl-parser_header.py) = cd14f4056a31f15066aebb85e5c14fba2aa37f13
+SHA1 (patch-xulrunner_app_Makefile.in) = 488485373747f79a73393a06c797ed1141e69759
--- pkgsrc/devel/xulrunner/Attic/mozilla-common.mk 2012/01/14 02:09:35 1.29
+++ pkgsrc/devel/xulrunner/Attic/mozilla-common.mk 2012/03/06 12:34:08 1.30
@@ -1,7 +1,7 @@
-# $NetBSD: mozilla-common.mk,v 1.29 2012/01/14 02:09:35 hans Exp $
+# $NetBSD: mozilla-common.mk,v 1.30 2012/03/06 12:34:08 ryoon Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
-#
+#
# used by devel/xulrunner/Makefile
# used by mail/thunderbird/Makefile
# used by www/firefox/Makefile
@@ -16,7 +16,6 @@
CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
CHECK_INTERPRETER_SKIP+=lib/xulrunner-sdk/sdk/bin/xpt.py
-PRIVILEGED_STAGES+= clean
CONFIGURE_ARGS+= --disable-tests --disable-pedantic
CONFIGURE_ARGS+= --enable-crypto
@@ -24,9 +23,13 @@
CONFIGURE_ARGS+= --disable-javaxpcom
CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
CONFIGURE_ARGS+= --enable-svg --enable-mathml
-# Needs tee and subpixel functions which are not shipped in stable cairo (yet?)
-CONFIGURE_ARGS+= --disable-system-cairo
-CONFIGURE_ARGS+= --disable-system-pixman
+CONFIGURE_ARGS+= --enable-system-cairo
+CONFIGURE_ARGS+= --enable-system-pixman
+CONFIGURE_ARGS+= --with-system-libvpx=${BUILDLINK_PREFIX.libvpx}
+CONFIGURE_ARGS+= --enable-system-hunspell
+CONFIGURE_ARGS+= --enable-system-ffi
+CONFIGURE_ARGS+= --with-system-nss
+CONFIGURE_ARGS+= --with-system-nspr
CONFIGURE_ARGS+= --with-system-jpeg
CONFIGURE_ARGS+= --with-system-zlib --with-system-bz2
CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent}
@@ -52,6 +55,9 @@
CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
+# workround for link of xulrunner-bin etc.
+LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/xulrunner
+
PYTHON_FOR_BUILD_ONLY= yes
.include "../../lang/python/application.mk"
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
@@ -86,10 +92,17 @@
.include "../../databases/sqlite3/buildlink3.mk"
BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
.include "../../devel/libevent/buildlink3.mk"
+.include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/nspr/buildlink3.mk"
+.include "../../devel/nss/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../multimedia/libvpx/buildlink3.mk"
.include "../../net/libIDL/buildlink3.mk"
+.include "../../textproc/hunspell/buildlink3.mk"
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
--- pkgsrc/devel/xulrunner/Attic/options.mk 2012/01/05 07:53:49 1.11
+++ pkgsrc/devel/xulrunner/Attic/options.mk 2012/03/06 12:34:08 1.12
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2012/01/05 07:53:49 sbd Exp $
+# $NetBSD: options.mk,v 1.12 2012/03/06 12:34:08 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xulrunner
PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome pulseaudio
@@ -9,13 +9,14 @@
PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc
.endif
-.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \
+.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc*) || \
!empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64)
PKG_SUPPORTED_OPTIONS+= mozilla-jit
PKG_SUGGESTED_OPTIONS+= mozilla-jit
NANOJIT_ARCH.i386= i386
NANOJIT_ARCH.arm= ARM
NANOJIT_ARCH.sparc= Sparc
+NANOJIT_ARCH.sparc64= Sparc
NANOJIT_ARCH.x86_64= X64
.endif
--- pkgsrc/devel/xulrunner/patches/Attic/patch-aa 2011/11/12 12:45:04 1.8
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-aa 2012/03/06 12:34:08 1.9
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2011/11/12 12:45:04 tnn Exp $
+$NetBSD: patch-aa,v 1.9 2012/03/06 12:34:08 ryoon Exp $
---- configure.in.orig 2011-11-04 21:33:54.000000000 +0000
+--- configure.in.orig 2012-02-16 06:40:25.000000000 +0000
+++ configure.in
-@@ -2137,7 +2137,7 @@ case "$target" in
+@@ -2328,7 +2328,7 @@ case "$target" in
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
;;
@@ -11,17 +11,17 @@
if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
DLL_SUFFIX=".so.1.0"
DSO_LDOPTS="-shared"
-@@ -2145,6 +2145,9 @@ case "$target" in
+@@ -2336,6 +2336,9 @@ case "$target" in
if test ! "$GNU_CC"; then
DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
fi
+ if test "$LIBRUNPATH"; then
-+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
++ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
+ fi
- ;;
+ ;;
ia64*-hpux*)
-@@ -3312,6 +3315,9 @@ dnl ====================================
+@@ -3377,6 +3380,9 @@ dnl ====================================
case $target in
*-hpux11.*)
;;
@@ -31,7 +31,7 @@
*)
AC_CHECK_LIB(c_r, gethostbyname_r)
;;
-@@ -4520,6 +4526,14 @@ if test -n "$YASM"; then
+@@ -4330,6 +4336,14 @@ if test -n "$YASM"; then
_YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
fi
@@ -46,16 +46,57 @@
if test -z "$SKIP_LIBRARY_CHECKS"; then
dnl system JPEG support
dnl ========================================================
-@@ -7439,7 +7453,7 @@ else
- *-mingw*)
- AC_DEFINE(MOZ_MEMORY_WINDOWS)
- AC_MSG_CHECKING([for VC2005/2008++ CRT source])
-- if test "$CC_VERSION" == "14.00.50727.762" -o "$CC_VERSION" == "15.00.30729.01"; then
-+ if test "$CC_VERSION" = "14.00.50727.762" -o "$CC_VERSION" = "15.00.30729.01"; then
- if test -z "$WIN32_CRT_SRC_DIR" -a -n "$VCINSTALLDIR"; then
- WIN32_CRT_SRC_DIR="$VCINSTALLDIR\crt\src"
- fi
-@@ -9516,6 +9530,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -5616,20 +5630,20 @@ if test -n "$MOZ_WEBM"; then
+ [MOZ_NATIVE_LIBVPX_DEC_TEST=1],
+ ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found]))
+ if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
+- AC_MSG_CHECKING([for libvpx version >= v0.9.7])
+- dnl We need at least v0.9.7 to fix several crash bugs (for which we
+- dnl had local patches prior to v0.9.7).
++ AC_MSG_CHECKING([for libvpx version >= v1.0.0])
++ dnl We need at least v1.0.0 to fix several crash bugs (for which we
++ dnl had local patches prior to v1.0.0).
+ dnl
+ dnl This is a terrible test for the library version, but we don't
+ dnl have a good one. There is no version number in a public header,
+ dnl and testing the headers still doesn't guarantee we link against
+ dnl the right version. While we could call vpx_codec_version() at
+ dnl run-time, that would break cross-compiling. There are no
+- dnl additional exported symbols between the v0.9.7 release and the
+- dnl v0.9.6 one to check for.
++ dnl additional exported decoder symbols between the v1.0.0 release
++ dnl and the v0.9.7 one to check for.
+ AC_TRY_COMPILE([
+ #include <vpx/vpx_decoder.h>
+- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
+ #error "test failed."
+ #endif
+ ],
+@@ -5639,7 +5653,7 @@ if test -n "$MOZ_WEBM"; then
+ MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
+ MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"],
+ [AC_MSG_RESULT([no])
+- AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])])
++ AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])])
+ fi
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+@@ -5673,11 +5687,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+
+ dnl See if we have assembly on this platform.
+ case "$OS_ARCH:$CPU_ARCH" in
+- Linux:x86)
++ Linux:x86|DragonFly:x86|*BSD:i386)
+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+ VPX_X86_ASM=1
+ ;;
+- Linux:x86_64)
++ Linux:x86_64|DragonFly:x86_64|*BSD:x86_64)
+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+ ;;
+@@ -8915,6 +8929,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
if test "$OS_ARCH" != "WINNT"; then
NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
--- pkgsrc/devel/xulrunner/patches/Attic/patch-at 2011/08/21 23:21:33 1.4
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-at 2012/03/06 12:34:08 1.5
@@ -1,8 +1,6 @@
-$NetBSD: patch-at,v 1.4 2011/08/21 23:21:33 tnn Exp $
+$NetBSD: patch-at,v 1.5 2012/03/06 12:34:08 ryoon Exp $
-Avoid silly redefinitions of standard types on NetBSD.
-
---- gfx/qcms/qcmstypes.h.orig 2010-11-04 19:20:39.000000000 +0000
+--- gfx/qcms/qcmstypes.h.orig 2011-12-20 23:28:18.000000000 +0000
+++ gfx/qcms/qcmstypes.h
@@ -10,6 +10,8 @@
#if defined (__SVR4) && defined (__sun)
@@ -12,4 +10,4 @@
+#include <stdint.h>
#elif defined (_AIX)
#include <sys/types.h>
- #elif !defined(ANDROID)
+ #elif defined(__OpenBSD__)
--- pkgsrc/devel/xulrunner/patches/Attic/patch-me 2012/02/09 17:18:12 1.4
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-me 2012/03/06 12:34:09 1.5
@@ -1,22 +1,10 @@
-$NetBSD: patch-me,v 1.4 2012/02/09 17:18:12 cheusov Exp $
+$NetBSD: patch-me,v 1.5 2012/03/06 12:34:09 ryoon Exp $
Add DragonFly support.
-Disable assembly routines in freebl on Linux (PR pkg/43146)
---- security/nss/lib/freebl/Makefile.orig 2010-04-13 22:22:54.000000000 +0000
+--- security/nss/lib/freebl/Makefile.orig 2009-06-29 18:15:13.000000000 +0200
+++ security/nss/lib/freebl/Makefile
-@@ -154,7 +154,9 @@ ifeq ($(USE_N32),1)
- endif
- endif
-
--ifeq ($(OS_TARGET),Linux)
-+# pkgsrc PR pkg/43146
-+#ifeq ($(OS_TARGET),Linux)
-+ifeq (true, false)
- ifeq ($(CPU_ARCH),x86_64)
- ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s
- ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
-@@ -224,7 +226,7 @@ endif
+@@ -212,7 +212,7 @@ endif
# to bind the blapi function references in FREEBLVector vector
# (ldvector.c) to the blapi functions defined in the freebl
# shared libraries.
--- pkgsrc/devel/xulrunner/patches/Attic/patch-aw 2009/09/13 20:02:36 1.1
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-aw 2012/03/06 12:34:08 1.2
@@ -1,40 +1,45 @@
-$NetBSD: patch-aw,v 1.1 2009/09/13 20:02:36 tnn Exp $
+$NetBSD: patch-aw,v 1.2 2012/03/06 12:34:08 ryoon Exp $
--- xulrunner/stub/nsXULStub.cpp.orig 2009-08-24 17:53:30.000000000 +0200
+++ xulrunner/stub/nsXULStub.cpp
-@@ -44,6 +44,27 @@
+@@ -44,6 +44,29 @@
#include "nsILocalFile.h"
#include <stdarg.h>
++#if defined(__NetBSD__)
+#include <sys/resource.h>
+/*
+ * On netbsd-4, ulimit -n is 64 by default; too few for us.
+ */
+static void netbsd_fixrlimit(void) {
-+ struct rlimit rlp;
-+ if (getrlimit(RLIMIT_NOFILE, &rlp) == -1) {
-+ fprintf(stderr, "warning: getrlimit failed\n");
-+ return;
-+ }
-+ if (rlp.rlim_cur >= 512)
-+ return;
-+ if (rlp.rlim_max < 512) {
-+ fprintf(stderr, "warning: hard limit of 'ulimit -n' too low\n");
-+ rlp.rlim_cur = rlp.rlim_max;
-+ }
-+ else
-+ rlp.rlim_cur = 512;
-+ if (setrlimit(RLIMIT_NOFILE, &rlp) == -1)
-+ fprintf(stderr, "warning: setrlimit failed\n");
++ struct rlimit rlp;
++ if (getrlimit(RLIMIT_NOFILE, &rlp) == -1) {
++ fprintf(stderr, "warning: getrlimit failed\n");
++ return;
++ }
++ if (rlp.rlim_cur >= 512)
++ return;
++ if (rlp.rlim_max < 512) {
++ fprintf(stderr, "warning: hard limit of 'ulimit -n' too low\n");
++ rlp.rlim_cur = rlp.rlim_max;
++ }
++ else
++ rlp.rlim_cur = 512;
++ if (setrlimit(RLIMIT_NOFILE, &rlp) == -1)
++ fprintf(stderr, "warning: setrlimit failed\n");
+}
++#endif
#ifdef XP_WIN
#include <windows.h>
-@@ -205,6 +226,7 @@ main(int argc, char **argv)
- char tmpPath[MAXPATHLEN];
+@@ -202,7 +225,9 @@
char greDir[MAXPATHLEN];
- PRBool greFound = PR_FALSE;
-+ netbsd_fixrlimit();
+ bool greFound = false;
- #if defined(XP_MACOSX)
+-#if defined(XP_MACOSX)
++#if defined(__NetBSD__)
++ netbsd_fixrlimit();
++#elif defined(XP_MACOSX)
CFBundleRef appBundle = CFBundleGetMainBundle();
+ if (!appBundle)
+ return 1;
--- pkgsrc/devel/xulrunner/patches/Attic/patch-bi 2011/04/26 14:16:37 1.1
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-bi 2012/03/06 12:34:09 1.2
@@ -1,13 +1,12 @@
-$NetBSD: patch-bi,v 1.1 2011/04/26 14:16:37 tnn Exp $
+$NetBSD: patch-bi,v 1.2 2012/03/06 12:34:09 ryoon Exp $
---- gfx/angle/src/compiler/osinclude.h.orig 2010-12-15 01:02:57.000000000 +0000
+--- gfx/angle/src/compiler/osinclude.h.orig 2011-12-20 23:28:17.000000000 +0000
+++ gfx/angle/src/compiler/osinclude.h
-@@ -16,7 +16,7 @@
+@@ -16,6 +16,7 @@
#define ANGLE_OS_WIN
#elif defined(__APPLE__) || defined(__linux__) || \
defined(__FreeBSD__) || defined(__OpenBSD__) || \
-- defined(__sun)
-+ defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__)
++ defined(__NetBSD__) || defined(__DragonFly__) || \
+ defined(__sun) || defined(ANDROID)
#define ANGLE_OS_POSIX
#else
- #error Unsupported platform.
--- pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_debug__util__posic.cc 2011/07/11 12:46:14 1.1
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_debug__util__posic.cc 2012/03/06 12:34:09 1.2
@@ -1,35 +1,47 @@
-$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.1 2011/07/11 12:46:14 tnn Exp $
+$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $
---- ipc/chromium/src/base/debug_util_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000
+--- ipc/chromium/src/base/debug_util_posix.cc.orig 2012-02-16 06:40:33.000000000 +0000
+++ ipc/chromium/src/base/debug_util_posix.cc
-@@ -11,10 +11,10 @@
- #include <sys/stat.h>
- #include <sys/types.h>
+@@ -5,7 +5,7 @@
+ #include "build/build_config.h"
+ #include "base/debug_util.h"
+
+-#define MOZ_HAVE_EXECINFO_H (!defined(ANDROID) && !defined(__OpenBSD__))
++#define MOZ_HAVE_EXECINFO_H (defined(__linux__) && !defined(ANDROID))
+
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -17,8 +17,11 @@
#include <unistd.h>
--#ifndef ANDROID
-+#ifdef __linux__
+ #if MOZ_HAVE_EXECINFO_H
#include <execinfo.h>
-#include <sys/sysctl.h>
#endif
++#if defined(OS_DRAGONFLY)
++#include <sys/user.h>
++#endif
+#include <sys/sysctl.h>
#include "base/basictypes.h"
#include "base/eintr_wrapper.h"
-@@ -119,7 +119,7 @@ StackTrace::StackTrace() {
- const int kMaxCallers = 256;
+@@ -32,7 +35,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
+ return false;
+ }
- void* callers[kMaxCallers];
--#ifndef ANDROID
-+#ifdef __GLIBC__
- int count = backtrace(callers, kMaxCallers);
- #else
- int count = 0;
-@@ -138,7 +138,7 @@ StackTrace::StackTrace() {
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
- void StackTrace::PrintBacktrace() {
- fflush(stderr);
--#ifndef ANDROID
-+#ifdef __GLIBC__
- backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
- #endif
+ // Based on Apple's recommended method as described in
+ // http://developer.apple.com/qa/qa2004/qa1361.html
+@@ -71,7 +74,11 @@ bool DebugUtil::BeingDebugged() {
+
+ // This process is being debugged if the P_TRACED flag is set.
+ is_set = true;
++#if defined(__DragonFly__)
++ being_debugged = (info.kp_flags & P_TRACED) != 0;
++#else
+ being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
++#endif
+ return being_debugged;
}
+
--- pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_file__util.h 2011/07/11 12:46:14 1.1
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_file__util.h 2012/03/06 12:34:09 1.2
@@ -1,13 +1,12 @@
-$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.1 2011/07/11 12:46:14 tnn Exp $
+$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $
---- ipc/chromium/src/base/file_util.h.orig 2011-06-15 21:57:27.000000000 +0000
+--- ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/chromium/src/base/file_util.h
-@@ -15,8 +15,9 @@
- #elif defined(ANDROID)
+@@ -16,8 +16,8 @@
#include <sys/stat.h>
#elif defined(OS_POSIX)
+ #include <sys/types.h>
-#include <fts.h>
-+#include <sys/types.h>
#include <sys/stat.h>
+#include <fts.h>
#endif
--- pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_file__util__posix.cc 2011/07/11 12:46:14 1.1
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_file__util__posix.cc 2012/03/06 12:34:09 1.2
@@ -1,14 +1,13 @@
-$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.1 2011/07/11 12:46:14 tnn Exp $
+$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $
---- ipc/chromium/src/base/file_util_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000
+--- ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/chromium/src/base/file_util_posix.cc
-@@ -30,6 +30,9 @@
- #include "base/string_util.h"
+@@ -31,7 +31,7 @@
#include "base/time.h"
+ // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine
+-#if defined(OS_FREEBSD) || defined(OS_OPENBSD)
+#ifndef __linux__
-+#define stat64 stat
-+#endif
- namespace file_util {
+ #define stat64 stat
+ #endif
- #if defined(GOOGLE_CHROME_BUILD)
--- pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h 2011/07/11 12:46:14 1.1
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h 2012/03/06 12:34:09 1.2
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.1 2011/07/11 12:46:14 tnn Exp $
+$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $
---- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-06-15 21:57:27.000000000 +0000
+--- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h
@@ -34,7 +34,7 @@
#include "base/third_party/nspr/prcpucfg_win.h"
@@ -9,5 +9,5 @@
-#elif defined(__linux__) || defined(ANDROID)
+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__DragonFly__)
#include "base/third_party/nspr/prcpucfg_linux.h"
- #else
+ #elif defined(__OpenBSD__)
- #error Provide a prcpucfg.h appropriate for your platform
+ #include "base/third_party/nspr/prcpucfg_openbsd.h"
$NetBSD: patch-build_autoconf_gcc-pr49911.m4,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- build/autoconf/gcc-pr49911.m4.orig 2011-12-20 23:28:11.000000000 +0000
+++ build/autoconf/gcc-pr49911.m4
@@ -56,7 +56,7 @@ CXXFLAGS="$_SAVE_CXXFLAGS"
AC_LANG_RESTORE
-if test "$ac_have_gcc_pr49911" == "yes"; then
+if test "$ac_have_gcc_pr49911" = "yes"; then
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -fno-tree-vrp"
CXXFLAGS="$CXXFLAGS -fno-tree-vrp"
$NetBSD: patch-build_autoconf_nss.m4,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- build/autoconf/nss.m4.orig 2012-02-16 06:40:24.000000000 +0000
+++ build/autoconf/nss.m4
@@ -22,18 +22,18 @@ AC_ARG_WITH(nss-exec-prefix,
if test -n "$nss_config_exec_prefix"; then
nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
if test -z "$NSS_CONFIG"; then
- NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
+ NSS_CONFIG=$nss_config_exec_prefix/bin/pkg-config
fi
fi
if test -n "$nss_config_prefix"; then
nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
if test -z "$NSS_CONFIG"; then
- NSS_CONFIG=$nss_config_prefix/bin/nss-config
+ NSS_CONFIG=$nss_config_prefix/bin/pkg-config
fi
fi
unset ac_cv_path_NSS_CONFIG
- AC_PATH_PROG(NSS_CONFIG, nss-config, no)
+ AC_PATH_PROG(NSS_CONFIG, pkg-config, no)
min_nss_version=ifelse([$1], ,3.0.0,$1)
AC_MSG_CHECKING(for NSS - version >= $min_nss_version)
@@ -41,14 +41,14 @@ AC_ARG_WITH(nss-exec-prefix,
if test "$NSS_CONFIG" = "no"; then
no_nss="yes"
else
- NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
- NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+ NSS_CFLAGS=`$NSS_CONFIG $nss_config_args nss --cflags`
+ NSS_LIBS=`$NSS_CONFIG $nss_config_args nss --libs`
- nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
+ nss_config_major_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
+ nss_config_minor_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
+ nss_config_micro_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
min_nss_major_version=`echo $min_nss_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000
+++ dom/plugins/ipc/PluginModuleChild.cpp
@@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin
// TODO: use PluginPRLibrary here
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
mShutdownFunc =
(NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
@@ -1790,7 +1790,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
PLUGIN_LOG_DEBUG_METHOD;
AssertPluginThread();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
return true;
#elif defined(OS_WIN) || defined(OS_MACOSX)
*_retval = mGetEntryPointsFunc(&mFunctions);
@@ -1823,7 +1823,7 @@ PluginModuleChild::AnswerNP_Initialize(N
SendBackUpXResources(FileDescriptor(xSocketFd, false/*don't close*/));
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
*_retval = mInitializeFunc(&sBrowserFuncs, &mFunctions);
return true;
#elif defined(OS_WIN) || defined(OS_MACOSX)
$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- dom/plugins/ipc/PluginModuleChild.h.orig 2011-12-20 23:28:14.000000000 +0000
+++ dom/plugins/ipc/PluginModuleChild.h
@@ -340,7 +340,7 @@ private:
// we get this from the plugin
NP_PLUGINSHUTDOWN mShutdownFunc;
-#ifdef OS_LINUX
+#if defined(OS_LINUX) || defined(OS_BSD)
NP_PLUGINUNIXINIT mInitializeFunc;
#elif defined(OS_WIN) || defined(OS_MACOSX)
NP_PLUGININIT mInitializeFunc;
$NetBSD: patch-ipc_chromium_Makefile.in,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/Makefile.in.orig 2012-02-16 06:40:33.000000000 +0000
+++ ipc/chromium/Makefile.in
@@ -278,6 +278,34 @@ endif
endif # } OS_LINUX
+ifdef OS_BSD # {
+
+CPPSRCS += \
+ atomicops_internals_x86_gcc.cc \
+ file_util_bsd.cc \
+ process_util_bsd.cc \
+ time_posix.cc \
+ $(NULL)
+
+ifdef MOZ_ENABLE_GTK2
+CPPSRCS += \
+ message_pump_glib.cc \
+ $(NULL)
+endif
+
+ifdef MOZ_ENABLE_QT
+MOCSRCS = \
+ moc_message_pump_qt.cc \
+ $(NULL)
+
+CPPSRCS += \
+ $(MOCSRCS) \
+ message_pump_qt.cc \
+ $(NULL)
+endif
+
+endif # } OS_BSD
+
# libevent
ifndef MOZ_NATIVE_LIBEVENT # {
$NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/chromium-config.mk.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/chromium/chromium-config.mk
@@ -56,17 +56,6 @@
-I$(DEPTH)/ipc/ipdl/_ipdlheaders \
$(NULL)
-ifeq ($(OS_ARCH),Darwin) # {
-
-OS_MACOSX = 1
-OS_POSIX = 1
-
-DEFINES += \
- -DOS_MACOSX=1 \
- -DOS_POSIX=1 \
- $(NULL)
-
-else # } {
ifeq ($(OS_ARCH),WINNT) # {
OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp)
@@ -93,13 +82,62 @@
endif
else # } {
-
-OS_LINUX = 1
OS_POSIX = 1
+DEFINES += -DOS_POSIX=1
+
+ifeq ($(OS_ARCH),Darwin) # {
+
+OS_MACOSX = 1
+DEFINES += \
+ -DOS_MACOSX=1 \
+ $(NULL)
+
+else # } {
+ifeq ($(OS_ARCH),DragonFly) # {
+
+OS_DRAGONFLY = 1
+OS_BSD = 1
+DEFINES += \
+ -DOS_DRAGONFLY=1 \
+ -DOS_BSD=1 \
+ $(NULL)
+
+else # } {
+ifeq ($(OS_ARCH),FreeBSD) # {
+
+OS_FREEBSD = 1
+OS_BSD = 1
+DEFINES += \
+ -DOS_FREEBSD=1 \
+ -DOS_BSD=1 \
+ $(NULL)
+else # } {
+ifeq ($(OS_ARCH),NetBSD) # {
+
+OS_NETBSD = 1
+OS_BSD = 1
+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
+DEFINES += \
+ -DOS_NETBSD=1 \
+ -DOS_BSD=1 \
+ $(NULL)
+
+else # } {
+ifeq ($(OS_ARCH),OpenBSD) # {
+
+OS_OPENBSD = 1
+OS_BSD = 1
+DEFINES += \
+ -DOS_OPENBSD=1 \
+ -DOS_BSD=1 \
+ $(NULL)
+
+else # } {
+
+OS_LINUX = 1
DEFINES += \
-DOS_LINUX=1 \
- -DOS_POSIX=1 \
$(NULL)
# NB: to stop gcc warnings about exporting template instantiation
@@ -107,4 +145,8 @@
endif # }
endif # }
+endif # }
+endif # }
+endif # }
+endif # }
$NetBSD: patch-ipc_chromium_src_base_base__paths.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/base/base_paths.h.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/chromium/src/base/base_paths.h
@@ -13,7 +13,7 @@
#include "base/base_paths_win.h"
#elif defined(OS_MACOSX)
#include "base/base_paths_mac.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#include "base/base_paths_linux.h"
#endif
#include "base/path_service.h"
$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000
+++ ipc/chromium/src/base/file_util_bsd.cc
@@ -0,0 +1,79 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// this is a derivative of file_util_linux.cc
+
+#include "base/file_util.h"
+
+#include <fcntl.h>
+
+#include <string>
+#include <vector>
+
+#include "base/eintr_wrapper.h"
+#include "base/file_path.h"
+#include "base/string_util.h"
+
+namespace file_util {
+
+bool GetTempDir(FilePath* path) {
+ const char* tmp = getenv("TMPDIR");
+ if (tmp)
+ *path = FilePath(tmp);
+ else
+ *path = FilePath("/tmp");
+ return true;
+}
+
+bool GetShmemTempDir(FilePath* path) {
+ return GetTempDir(path);
+}
+
+bool CopyFile(const FilePath& from_path, const FilePath& to_path) {
+ int infile = open(from_path.value().c_str(), O_RDONLY);
+ if (infile < 0)
+ return false;
+
+ int outfile = creat(to_path.value().c_str(), 0666);
+ if (outfile < 0) {
+ close(infile);
+ return false;
+ }
+
+ const size_t kBufferSize = 32768;
+ std::vector<char> buffer(kBufferSize);
+ bool result = true;
+
+ while (result) {
+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size()));
+ if (bytes_read < 0) {
+ result = false;
+ break;
+ }
+ if (bytes_read == 0)
+ break;
+ // Allow for partial writes
+ ssize_t bytes_written_per_read = 0;
+ do {
+ ssize_t bytes_written_partial = HANDLE_EINTR(write(
+ outfile,
+ &buffer[bytes_written_per_read],
+ bytes_read - bytes_written_per_read));
+ if (bytes_written_partial < 0) {
+ result = false;
+ break;
+ }
+ bytes_written_per_read += bytes_written_partial;
+ } while (bytes_written_per_read < bytes_read);
+ }
+
+ if (HANDLE_EINTR(close(infile)) < 0)
+ result = false;
+ if (HANDLE_EINTR(close(outfile)) < 0)
+ result = false;
+
+ return result;
+}
+
+} // namespace file_util
$NetBSD: patch-ipc_chromium_src_base_message__loop.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/base/message_loop.cc.orig 2012-02-16 07:40:33.000000000 +0100
+++ ipc/chromium/src/base/message_loop.cc 2012-02-21 21:24:41.000000000 +0100
@@ -19,7 +19,7 @@
#if defined(OS_POSIX)
#include "base/message_pump_libevent.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#ifdef MOZ_WIDGET_GTK2
#include "base/message_pump_glib.h"
#endif
@@ -119,7 +119,7 @@
if (type_ == TYPE_UI) {
#if defined(OS_MACOSX)
pump_ = base::MessagePumpMac::Create();
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
pump_ = new base::MessagePumpForUI();
#endif // OS_LINUX
} else if (type_ == TYPE_IO) {
$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/chromium/src/base/platform_thread.h
@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle;
#if defined(OS_LINUX)
#include <unistd.h>
typedef pid_t PlatformThreadId;
+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD)
+typedef lwpid_t PlatformThreadId;
#elif defined(OS_MACOSX)
#include <mach/mach.h>
typedef mach_port_t PlatformThreadId;
$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100
+++ ipc/chromium/src/base/process_util.h 2012-01-31 13:14:54.000000000 +0100
@@ -14,7 +14,6 @@
#include <windows.h>
#include <tlhelp32.h>
#elif defined(OS_LINUX)
-#include <dirent.h>
#include <limits.h>
#include <sys/types.h>
#elif defined(OS_MACOSX)
@@ -280,6 +279,7 @@
const ProcessEntry* NextProcessEntry();
private:
+#if !defined(OS_BSD)
// Determines whether there's another process (regardless of executable)
// left in the list of all processes. Returns true and sets entry_ to
// that process's info if there is one, false otherwise.
@@ -292,18 +292,24 @@
void InitProcessEntry(ProcessEntry* entry);
std::wstring executable_name_;
+#endif
#if defined(OS_WIN)
HANDLE snapshot_;
bool started_iteration_;
#elif defined(OS_LINUX)
DIR *procfs_dir_;
+#elif defined(OS_BSD)
+ std::vector<ProcessEntry> content;
+ size_t nextEntry;
#elif defined(OS_MACOSX)
std::vector<kinfo_proc> kinfo_procs_;
size_t index_of_kinfo_proc_;
#endif
+#if !defined(OS_BSD)
ProcessEntry entry_;
const ProcessFilter* filter_;
+#endif
DISALLOW_EVIL_CONSTRUCTORS(NamedProcessIterator);
};
$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-02-24 09:52:40.581943000 +0000
+++ ipc/chromium/src/base/process_util_bsd.cc
@@ -0,0 +1,298 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// derived from process_util_linux.cc and process_util_mac.cc
+
+// TODO: - add code for FreeBSD/DragonFly/MirBSD (?) to use kvm_getprocx
+
+#include "base/process_util.h"
+
+#include <ctype.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string>
+#include <kvm.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#if defined(OS_DRAGONFLY)
+#include <sys/user.h>
+#endif
+
+#include "base/debug_util.h"
+#include "base/eintr_wrapper.h"
+#include "base/file_util.h"
+#include "base/logging.h"
+#include "base/string_tokenizer.h"
+#include "base/string_util.h"
+
+#ifdef __NetBSD__
+#include <sys/param.h>
+#if __NetBSD_Version__ >= 600000000
+#define HAVE_POSIX_SPAWN 1
+#endif
+#endif
+
+#ifdef HAVE_POSIX_SPAWN
+#include <spawn.h>
+extern "C" char **environ __dso_public;
+#endif
+
+namespace {
+
+enum ParsingState {
+ KEY_NAME,
+ KEY_VALUE
+};
+
+static mozilla::EnvironmentLog gProcessLog("MOZ_PROCESS_LOG");
+
+} // namespace
+
+namespace base {
+
+#ifdef HAVE_POSIX_SPAWN
+
+void FreeEnvVarsArray(char* array[], int length)
+{
+ for (int i = 0; i < length; i++) {
+ free(array[i]);
+ }
+ delete[] array;
+}
+
+bool LaunchApp(const std::vector<std::string>& argv,
+ const file_handle_mapping_vector& fds_to_remap,
+ bool wait, ProcessHandle* process_handle) {
+ return LaunchApp(argv, fds_to_remap, environment_map(),
+ wait, process_handle);
+}
+
+bool LaunchApp(const std::vector<std::string>& argv,
+ const file_handle_mapping_vector& fds_to_remap,
+ const environment_map& env_vars_to_set,
+ bool wait, ProcessHandle* process_handle,
+ ProcessArchitecture arch) {
+ bool retval = true;
+
+ char* argv_copy[argv.size() + 1];
+ for (size_t i = 0; i < argv.size(); i++) {
+ argv_copy[i] = const_cast<char*>(argv[i].c_str());
+ }
+ argv_copy[argv.size()] = NULL;
+
+ // Make sure we don't leak any FDs to the child process by marking all FDs
+ // as close-on-exec.
+ SetAllFDsToCloseOnExec();
+
+ // Copy environment to a new char array and add the variables
+ // in env_vars_to_set.
+ // Existing variables are overwritten by env_vars_to_set.
+ int pos = 0;
+ environment_map combined_env_vars = env_vars_to_set;
+ while(environ[pos] != NULL) {
+ std::string varString = environ[pos];
+ std::string varName = varString.substr(0, varString.find_first_of('='));
+ std::string varValue = varString.substr(varString.find_first_of('=') + 1);
+ if (combined_env_vars.find(varName) == combined_env_vars.end()) {
+ combined_env_vars[varName] = varValue;
+ }
+ pos++;
+ }
+ int varsLen = combined_env_vars.size() + 1;
+
+ char** vars = new char*[varsLen];
+ int i = 0;
+ for (environment_map::const_iterator it = combined_env_vars.begin();
+ it != combined_env_vars.end(); ++it) {
+ std::string entry(it->first);
+ entry += "=";
+ entry += it->second;
+ vars[i] = strdup(entry.c_str());
+ i++;
+ }
+ vars[i] = NULL;
+
+ posix_spawn_file_actions_t file_actions;
+ if (posix_spawn_file_actions_init(&file_actions) != 0) {
+ FreeEnvVarsArray(vars, varsLen);
+ return false;
+ }
+
+ // Turn fds_to_remap array into a set of dup2 calls.
+ for (file_handle_mapping_vector::const_iterator it = fds_to_remap.begin();
+ it != fds_to_remap.end();
+ ++it) {
+ int src_fd = it->first;
+ int dest_fd = it->second;
+
+ if (src_fd == dest_fd) {
+ int flags = fcntl(src_fd, F_GETFD);
+ if (flags != -1) {
+ fcntl(src_fd, F_SETFD, flags & ~FD_CLOEXEC);
+ }
+ } else {
+ if (posix_spawn_file_actions_adddup2(&file_actions, src_fd, dest_fd) != 0) {
+ posix_spawn_file_actions_destroy(&file_actions);
+ FreeEnvVarsArray(vars, varsLen);
+ return false;
+ }
+ }
+ }
+
+ pid_t pid = 0;
+ int spawn_succeeded = (posix_spawnp(&pid,
+ argv_copy[0],
+ &file_actions,
+ NULL,
+ argv_copy,
+ vars) == 0);
+
+ FreeEnvVarsArray(vars, varsLen);
+
+ posix_spawn_file_actions_destroy(&file_actions);
+
+ bool process_handle_valid = pid > 0;
+ if (!spawn_succeeded || !process_handle_valid) {
+ retval = false;
+ } else {
+ if (wait)
+ HANDLE_EINTR(waitpid(pid, 0, 0));
+
+ if (process_handle)
+ *process_handle = pid;
+ }
+
+ return retval;
+}
+
+bool LaunchApp(const CommandLine& cl,
+ bool wait, bool start_hidden, ProcessHandle* process_handle) {
+ // TODO(playmobil): Do we need to respect the start_hidden flag?
+ file_handle_mapping_vector no_files;
+ return LaunchApp(cl.argv(), no_files, wait, process_handle);
+}
+
+#else // no posix_spawn, use fork/exec
+
+bool LaunchApp(const std::vector<std::string>& argv,
+ const file_handle_mapping_vector& fds_to_remap,
+ bool wait, ProcessHandle* process_handle) {
+ return LaunchApp(argv, fds_to_remap, environment_map(),
+ wait, process_handle);
+}
+
+bool LaunchApp(const std::vector<std::string>& argv,
+ const file_handle_mapping_vector& fds_to_remap,
+ const environment_map& env_vars_to_set,
+ bool wait, ProcessHandle* process_handle,
+ ProcessArchitecture arch) {
+ scoped_array<char*> argv_cstr(new char*[argv.size() + 1]);
+ // Illegal to allocate memory after fork and before execvp
+ InjectiveMultimap fd_shuffle1, fd_shuffle2;
+ fd_shuffle1.reserve(fds_to_remap.size());
+ fd_shuffle2.reserve(fds_to_remap.size());
+
+ pid_t pid = fork();
+ if (pid < 0)
+ return false;
+
+ if (pid == 0) {
+ for (file_handle_mapping_vector::const_iterator
+ it = fds_to_remap.begin(); it != fds_to_remap.end(); ++it) {
+ fd_shuffle1.push_back(InjectionArc(it->first, it->second, false));
+ fd_shuffle2.push_back(InjectionArc(it->first, it->second, false));
+ }
+
+ if (!ShuffleFileDescriptors(&fd_shuffle1))
+ _exit(127);
+
+ CloseSuperfluousFds(fd_shuffle2);
+
+ for (environment_map::const_iterator it = env_vars_to_set.begin();
+ it != env_vars_to_set.end(); ++it) {
+ if (setenv(it->first.c_str(), it->second.c_str(), 1/*overwrite*/))
+ _exit(127);
+ }
+
+ for (size_t i = 0; i < argv.size(); i++)
+ argv_cstr[i] = const_cast<char*>(argv[i].c_str());
+ argv_cstr[argv.size()] = NULL;
+ execvp(argv_cstr[0], argv_cstr.get());
+ // if we get here, we're in serious trouble and should complain loudly
+ DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0];
+ exit(127);
+ } else {
+ gProcessLog.print("==> process %d launched child process %d\n",
+ GetCurrentProcId(), pid);
+ if (wait)
+ HANDLE_EINTR(waitpid(pid, 0, 0));
+
+ if (process_handle)
+ *process_handle = pid;
+ }
+
+ return true;
+}
+
+bool LaunchApp(const CommandLine& cl,
+ bool wait, bool start_hidden,
+ ProcessHandle* process_handle) {
+ file_handle_mapping_vector no_files;
+ return LaunchApp(cl.argv(), no_files, wait, process_handle);
+}
+
+#endif
+
+NamedProcessIterator::NamedProcessIterator(const std::wstring& executable_name,
+ const ProcessFilter* filter)
+{
+ int numEntries;
+ kvm_t *kvm;
+ std::string exe(WideToASCII(executable_name));
+
+#if defined(OS_DRAGONFLY)
+ kvm = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
+ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), &numEntries);
+ if (procs != NULL && numEntries > 0) {
+ for (int i = 0; i < numEntries; i++) {
+ if (exe != procs[i].kp_comm) continue;
+ if (filter && !filter->Includes(procs[i].kp_pid, procs[i].kp_ppid)) continue;
+ ProcessEntry e;
+ e.pid = procs[i].kp_pid;
+ e.ppid = procs[i].kp_ppid;
+ strlcpy(e.szExeFile, procs[i].kp_comm, sizeof e.szExeFile);
+ content.push_back(e);
+#else
+ kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
+ struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries);
+ if (procs != NULL && numEntries > 0) {
+ for (int i = 0; i < numEntries; i++) {
+ if (exe != procs[i].p_comm) continue;
+ if (filter && !filter->Includes(procs[i].p_pid, procs[i].p_ppid)) continue;
+ ProcessEntry e;
+ e.pid = procs[i].p_pid;
+ e.ppid = procs[i].p_ppid;
+ strlcpy(e.szExeFile, procs[i].p_comm, sizeof e.szExeFile);
+ content.push_back(e);
+#endif
+ }
+ }
+ nextEntry = 0;
+ kvm_close(kvm);
+}
+
+NamedProcessIterator::~NamedProcessIterator() {
+}
+
+const ProcessEntry* NamedProcessIterator::NextProcessEntry() {
+ if (nextEntry >= content.size()) return NULL;
+ return &content[nextEntry++];
+}
+
+bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
+ return false;
+}
+
+} // namespace base
$NetBSD: patch-ipc_chromium_src_base_process__util__posix.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/base/process_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/chromium/src/base/process_util_posix.cc
@@ -116,6 +116,11 @@ void CloseSuperfluousFds(const base::Inj
#elif defined(OS_MACOSX)
static const rlim_t kSystemDefaultMaxFds = 256;
static const char kFDDir[] = "/dev/fd";
+#elif defined(OS_BSD)
+ // the getrlimit below should never fail, so whatever ..
+ static const rlim_t kSystemDefaultMaxFds = 1024;
+ // at least /dev/fd will exist
+ static const char kFDDir[] = "/dev/fd";
#endif
// Get the maximum number of FDs possible.
@@ -199,7 +204,7 @@ void CloseSuperfluousFds(const base::Inj
void SetAllFDsToCloseOnExec() {
#if defined(OS_LINUX)
const char fd_dir[] = "/proc/self/fd";
-#elif defined(OS_MACOSX)
+#elif defined(OS_MACOSX) || defined(OS_BSD)
const char fd_dir[] = "/dev/fd";
#endif
ScopedDIR dir_closer(opendir(fd_dir));
$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/chromium/src/base/third_party/nspr/prtime.cc
@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp
LL_ADD(retVal, retVal, temp);
return retVal;
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_DRAGONFLY)
struct tm exp_tm = {0};
exp_tm.tm_sec = exploded->tm_sec;
exp_tm.tm_min = exploded->tm_min;
@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp
result *= kSecondsToMicroseconds;
result += exploded->tm_usec;
return result;
+#elif defined(OS_FREEBSD) || defined(OS_NETBSD)
+ struct tm exp_tm = {0};
+ exp_tm.tm_sec = exploded->tm_sec;
+ exp_tm.tm_min = exploded->tm_min;
+ exp_tm.tm_hour = exploded->tm_hour;
+ exp_tm.tm_mday = exploded->tm_mday;
+ exp_tm.tm_mon = exploded->tm_month;
+ exp_tm.tm_year = exploded->tm_year - 1900;
+
+ // time_t is 64bit
+ time_t absolute_time = timegm(&exp_tm);
+
+ PRTime result = static_cast<PRTime>(absolute_time);
+ result -= exploded->tm_params.tp_gmt_offset +
+ exploded->tm_params.tp_dst_offset;
+ result *= kSecondsToMicroseconds;
+ result += exploded->tm_usec;
+ return result;
#else
#error No PR_ImplodeTime implemented on your platform.
#endif
$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/chrome/common/ipc_message_utils.h.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/chromium/src/chrome/common/ipc_message_utils.h
@@ -195,7 +195,7 @@
};
#endif
-#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390))
+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390))
// There size_t is a synonym for |unsigned long| ...
template <>
struct ParamTraits<size_t> {
@@ -248,7 +248,7 @@
};
#endif // defined(OS_MACOSX)
-#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS))
+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS))
// int64 is |long int| on 64-bit systems, uint64 is |unsigned long|
template <>
struct ParamTraits<int64> {
$NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/chrome/common/transport_dib.h.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/chromium/src/chrome/common/transport_dib.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
-#if defined(OS_WIN) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
#include "base/shared_memory.h"
#endif
@@ -66,7 +66,7 @@ class TransportDIB {
uint32 sequence_num;
};
typedef HandleAndSequenceNum Id;
-#elif defined(OS_MACOSX)
+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
typedef base::SharedMemoryHandle Handle;
// On Mac, the inode number of the backing file is used as an id.
typedef base::SharedMemoryId Id;
@@ -108,7 +108,7 @@ class TransportDIB {
private:
TransportDIB();
-#if defined(OS_WIN) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
explicit TransportDIB(base::SharedMemoryHandle dib);
base::SharedMemory shared_memory_;
uint32 sequence_num_;
$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/glue/GeckoChildProcessHost.cpp
@@ -430,7 +430,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
// and passing wstrings from one config to the other is unsafe. So
// we split the logic here.
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
base::environment_map newEnvVars;
// XPCOM may not be initialized in some subprocesses. We don't want
// to initialize XPCOM just for the directory service, especially
@@ -445,8 +445,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
if (NS_SUCCEEDED(rv)) {
nsCString path;
greDir->GetNativePath(path);
-# ifdef OS_LINUX
-# ifdef ANDROID
+# if defined(OS_LINUX) || defined(OS_BSD)
+# if defined(ANDROID) || defined(OS_BSD)
path += "/lib";
# endif // ANDROID
const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
@@ -557,7 +557,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
childArgv.push_back(pidstring);
#if defined(MOZ_CRASHREPORTER)
-# if defined(OS_LINUX)
+# if defined(OS_LINUX) || defined(OS_BSD)
int childCrashFd, childCrashRemapFd;
if (!CrashReporter::CreateNotificationPipeForChild(
&childCrashFd, &childCrashRemapFd))
@@ -594,7 +594,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
#endif
base::LaunchApp(childArgv, mFileMap,
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
newEnvVars,
#endif
false, &process, arch);
$NetBSD: patch-js_src_build_autoconf_gcc-pr49911.m4,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- js/src/build/autoconf/gcc-pr49911.m4.orig 2011-12-20 23:28:21.000000000 +0000
+++ js/src/build/autoconf/gcc-pr49911.m4
@@ -56,7 +56,7 @@ CXXFLAGS="$_SAVE_CXXFLAGS"
AC_LANG_RESTORE
-if test "$ac_have_gcc_pr49911" == "yes"; then
+if test "$ac_have_gcc_pr49911" = "yes"; then
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -fno-tree-vrp"
CXXFLAGS="$CXXFLAGS -fno-tree-vrp"
$NetBSD: patch-js_src_jscpucfg.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- js/src/jscpucfg.h.orig 2012-01-29 11:24:34.000000000 +0100
+++ js/src/jscpucfg.h 2012-02-08 12:35:20.000000000 +0100
@@ -77,6 +77,21 @@
#define IS_BIG_ENDIAN 1
#endif
+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__MirBSD__) || defined(__DragonFly__)
+#include <sys/endian.h>
+
+#if defined(_BYTE_ORDER)
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+#define IS_LITTLE_ENDIAN 1
+#undef IS_BIG_ENDIAN
+#elif _BYTE_ORDER == _BIG_ENDIAN
+#undef IS_LITTLE_ENDIAN
+#define IS_BIG_ENDIAN 1
+#endif
+#else /* !defined(_BYTE_ORDER) */
+#error "sys/endian.h does not define _BYTE_ORDER. Cannot determine endianness."
+#endif
+
#elif defined(JS_HAVE_ENDIAN_H)
#include <endian.h>
$NetBSD: patch-js_src_methodjit_MethodJIT.cpp,v 1.1 2012/03/06 12:34:09 ryoon Exp $
# This does not only apply to linux, but all ELF platforms (otherwise the
# generated code will not be PIC)
--- js/src/methodjit/MethodJIT.cpp.orig 2012-01-29 11:24:34.000000000 +0100
+++ js/src/methodjit/MethodJIT.cpp 2012-02-11 01:13:30.000000000 +0100
@@ -171,7 +171,7 @@
JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0);
-#if defined(__linux__) && defined(JS_CPU_X64)
+#if defined(__ELF__) && defined(JS_CPU_X64)
# define SYMBOL_STRING_RELOC(name) #name "@plt"
#else
# define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name)
$NetBSD: patch-js_src_yarr_pcre_pcre.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- js/src/yarr/pcre/pcre.h.orig 2012-01-29 11:24:38.000000000 +0100
+++ js/src/yarr/pcre/pcre.h 2012-02-20 16:50:06.000000000 +0100
@@ -46,7 +46,9 @@
#include "assembler/wtf/Platform.h"
#include "jsstr.h"
#include "jsprvtd.h"
+#if ENABLE_ASSEMBLER
#include "jstl.h"
+#endif
typedef jschar UChar;
typedef JSLinearString UString;
$NetBSD: patch-media_libvpx_vpx__config.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- media/libvpx/vpx_config.h.orig 2012-01-29 11:24:47.000000000 +0100
+++ media/libvpx/vpx_config.h 2012-02-09 15:07:24.000000000 +0100
@@ -12,12 +12,12 @@
/* 32 bit MacOS. */
#include "vpx_config_x86-darwin9-gcc.h"
-#elif defined(__linux__) && defined(__i386__)
-/* 32 bit Linux. */
+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__i386__)
+/* 32 bit Linux or some BSD. */
#include "vpx_config_x86-linux-gcc.h"
-#elif defined(__linux__) && defined(__x86_64__)
-/* 64 bit Linux. */
+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__x86_64__)
+/* 64 bit Linux or some BSD. */
#include "vpx_config_x86_64-linux-gcc.h"
#elif defined(__sun) && defined(__i386)
$NetBSD: patch-media_libvpx_vpx__config__c.c,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- media/libvpx/vpx_config_c.c.orig 2012-01-29 11:24:47.000000000 +0100
+++ media/libvpx/vpx_config_c.c 2012-02-09 15:10:30.000000000 +0100
@@ -12,12 +12,12 @@
/* 32 bit MacOS. */
#include "vpx_config_x86-darwin9-gcc.c"
-#elif defined(__linux__) && defined(__i386__)
-/* 32 bit Linux. */
+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__i386__)
+/* 32 bit Linux or BSD. */
#include "vpx_config_x86-linux-gcc.c"
-#elif defined(__linux__) && defined(__x86_64__)
-/* 64 bit Linux. */
+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__x86_64__)
+/* 64 bit Linux or BSD. */
#include "vpx_config_x86_64-linux-gcc.c"
#elif defined(__sun) && defined(__i386)
$NetBSD: patch-xpcom_Makefile.in,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- xpcom/Makefile.in.orig 2012-02-16 06:40:56.000000000 +0000
+++ xpcom/Makefile.in
@@ -68,6 +68,10 @@ DIRS += windbgdlg
endif
endif
+ifeq ($(OS_ARCH),NetBSD)
+EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/xulrunner-sdk/sdk/lib
+endif
+
ifdef ENABLE_TESTS
TOOL_DIRS += \
tests \
$NetBSD: patch-xulrunner_app_Makefile.in,v 1.1 2012/03/06 12:34:09 ryoon Exp $
--- xulrunner/app/Makefile.in.orig 2011-12-21 00:28:44.000000000 +0100
+++ xulrunner/app/Makefile.in 2012-01-30 11:24:22.000000000 +0100
@@ -130,6 +130,10 @@
RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
endif
+ifeq ($(OS_ARCH),NetBSD)
+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
+endif
+
include $(topsrcdir)/config/rules.mk
DEFINES += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
--- pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_platform__thread__posix.cc 2011/08/01 08:17:17 1.2
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_platform__thread__posix.cc 2012/03/06 12:34:09 1.3
--- pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_build_build__config.h 2011/08/18 18:31:10 1.2
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_build_build__config.h 2012/03/06 12:34:09 1.3
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.2 2011/08/18 18:31:10 tnn Exp $
+$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.3 2012/03/06 12:34:09 ryoon Exp $
---- ipc/chromium/src/build/build_config.h.orig 2011-08-11 21:41:01.000000000 +0000
+--- ipc/chromium/src/build/build_config.h.orig 2011-12-20 23:28:19.000000000 +0000
+++ ipc/chromium/src/build/build_config.h
@@ -19,6 +19,10 @@
#define OS_MACOSX 1
@@ -10,25 +10,15 @@
+#define OS_NETBSD 1
+#elif defined(__DragonFly__)
+#define OS_DRAGONFLY 1
+ #elif defined(__OpenBSD__)
+ #define OS_OPENBSD 1
#elif defined(_WIN32)
- #define OS_WIN 1
- #else
-@@ -27,7 +31,7 @@
+@@ -29,7 +33,7 @@
// For access to standard POSIX features, use OS_POSIX instead of a more
// specific macro.
--#if defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DRAGONFLY)
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
#define OS_POSIX 1
#endif
-@@ -60,6 +64,9 @@
- #elif defined(__ppc__) || defined(__powerpc__)
- #define ARCH_CPU_PPC 1
- #define ARCH_CPU_32_BITS 1
-+#elif defined(__sparc64__)
-+#define ARCH_CPU_SPARC 1
-+#define ARCH_CPU_64_BITS 1
- #else
- #error Please add support for your architecture in build/build_config.h
- #endif
--- pkgsrc/devel/xulrunner/patches/Attic/patch-mb 2011/07/11 12:46:14 1.6
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-mb 2012/03/06 12:34:09 1.7
@@ -1,26 +1,26 @@
-$NetBSD: patch-mb,v 1.6 2011/07/11 12:46:14 tnn Exp $
+$NetBSD: patch-mb,v 1.7 2012/03/06 12:34:09 ryoon Exp $
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-06-15 21:58:01.000000000 +0000
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-12-20 23:28:44.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -97,7 +97,7 @@ endif
+@@ -84,7 +84,7 @@ endif
endif
endif
-ifneq (,$(filter NetBSD OpenBSD BSD_OS GNU,$(OS_ARCH)))
+ifneq (,$(filter BSD_OS GNU,$(OS_ARCH)))
ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
+ CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
endif
-@@ -106,7 +106,7 @@ endif
+@@ -93,7 +93,7 @@ endif
# New code for Linux, et. al., with gcc
# Migrate other platforms here after testing
#
-ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH)))
-+ifneq (,$(filter Linux NetBSD DragonFly FreeBSD OpenBSD GNU_%,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD DragonFly NetBSD OpenBSD GNU_%,$(OS_ARCH)))
# Linux/x86-64
ifeq (x86_64,$(OS_TEST))
CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
-@@ -124,12 +124,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin
+@@ -111,12 +111,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin
endif
endif
#
@@ -33,7 +33,7 @@
# Neutrino/Intel (uses the same unixish_x86 code)
#
ifeq ($(OS_TARGET),NTO)
-@@ -212,7 +206,7 @@ endif
+@@ -192,7 +186,7 @@ endif
# NetBSD/ARM
#
ifeq ($(OS_ARCH),NetBSD)
@@ -42,7 +42,7 @@
CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
endif
endif
-@@ -269,7 +263,7 @@ endif
+@@ -249,7 +243,7 @@ endif
# NetBSD/m68k
#
ifeq ($(OS_ARCH),NetBSD)
@@ -51,7 +51,7 @@
CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
endif
endif
-@@ -359,9 +353,10 @@ endif
+@@ -321,9 +315,10 @@ endif
#
# NetBSD/PPC
#
@@ -63,15 +63,15 @@
endif
#
-@@ -433,6 +428,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c
+@@ -396,6 +391,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c
ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
endif
#
+# NetBSD/SPARC64
+#
+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
-+CPPSRCS := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
-+ASFILES := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
++CPPSRCS := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
++ASFILES := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
+endif
+#
# Solaris/SPARC
--- pkgsrc/devel/xulrunner/patches/Attic/patch-mm 2011/07/11 12:46:14 1.6
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-mm 2012/03/06 12:34:09 1.7
@@ -1,11 +1,15 @@
-$NetBSD: patch-mm,v 1.6 2011/07/11 12:46:14 tnn Exp $
+$NetBSD: patch-mm,v 1.7 2012/03/06 12:34:09 ryoon Exp $
---- toolkit/library/Makefile.in.orig 2011-06-15 21:58:10.000000000 +0000
+--- toolkit/library/Makefile.in.orig 2012-02-16 06:40:54.000000000 +0000
+++ toolkit/library/Makefile.in
-@@ -216,6 +216,13 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -209,6 +209,17 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
endif
++ifeq ($(OS_ARCH),DragonFly)
++OS_LIBS += $(call EXPAND_LIBNAME,kvm)
++endif
++
+ifeq ($(OS_ARCH),NetBSD)
+EXTRA_DSO_LDOPTS += -lossaudio
+endif
--- pkgsrc/devel/xulrunner/patches/Attic/patch-mi 2009/08/05 02:59:48 1.1.1.1
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-mi 2012/03/06 12:34:09 1.2
@@ -1,15 +1,13 @@
-$NetBSD: patch-mi,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $
+$NetBSD: patch-mi,v 1.2 2012/03/06 12:34:09 ryoon Exp $
-Add DragonFly support.
-
---- config/config.mk.orig 2009-06-29 18:14:41.000000000 +0200
+--- config/config.mk.orig 2011-12-20 23:28:11.000000000 +0000
+++ config/config.mk
-@@ -133,7 +133,7 @@ endif
+@@ -129,7 +129,7 @@ endif
# but save the version to allow multiple versions of the same base
# platform to be built in the same tree.
#
--ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
-+ifneq (,$(filter DragonFly FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
+-ifneq (,$(filter FreeBSD HP-UX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
++ifneq (,$(filter DragonFly FreeBSD HP-UX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
OS_RELEASE := $(basename $(OS_RELEASE))
# Allow the user to ignore the OS_VERSION, which is usually irrelevant.
--- pkgsrc/devel/xulrunner/patches/Attic/patch-mk 2009/08/05 02:59:48 1.1.1.1
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-mk 2012/03/06 12:34:09 1.2
@@ -1,10 +1,8 @@
-$NetBSD: patch-mk,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $
+$NetBSD: patch-mk,v 1.2 2012/03/06 12:34:09 ryoon Exp $
-Treat DragonFly like FreeBSD.
-
---- config/rules.mk.orig 2009-06-29 18:14:41.000000000 +0200
+--- config/rules.mk.orig 2012-02-16 06:40:24.000000000 +0000
+++ config/rules.mk
-@@ -592,6 +592,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+@@ -580,6 +580,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
endif
endif
@@ -17,3 +15,14 @@
ifeq ($(OS_ARCH),NetBSD)
ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
ifeq ($(MODULE),layout)
+@@ -589,6 +595,10 @@ endif
+ endif
+ endif
+
++ifeq ($(OS_ARCH),NetBSD)
++EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/xulrunner
++endif
++
+ #
+ # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
+ # which uses internal symbols first
--- pkgsrc/devel/xulrunner/patches/Attic/patch-ml 2009/08/05 02:59:48 1.1.1.1
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-ml 2012/03/06 12:34:09 1.2
@@ -1,16 +1,14 @@
-$NetBSD: patch-ml,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $
+$NetBSD: patch-ml,v 1.2 2012/03/06 12:34:09 ryoon Exp $
-Treat DragonFly like FreeBSD.
-
---- js/src/Makefile.in.orig 2009-06-29 18:14:51.000000000 +0200
+--- js/src/Makefile.in.orig 2011-12-20 23:28:21.000000000 +0000
+++ js/src/Makefile.in
-@@ -429,6 +429,9 @@ endif # WINNT
+@@ -809,6 +809,9 @@
ifeq ($(OS_ARCH),FreeBSD)
EXTRA_LIBS += -pthread
endif
+ifeq ($(OS_ARCH),DragonFly)
+EXTRA_LIBS += -pthread
+endif
- ifeq ($(OS_ARCH),IRIX)
+ ifeq ($(OS_ARCH),Linux)
- ifdef USE_N32
+ EXTRA_LIBS += -ldl
- DASH_R += -n32
+ endif