Sun Dec 19 15:09:49 2021 UTC ()
firefox: Update to 95.0.1

* Enable RLBox WebAssembly sandboxing for i386 and x86_64 architectures.
  Not tested for the other architectures yet.

Changelog:
95.0.1
Fixed

  * Fixed frequent MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING error
    messages when trying to connect to various microsoft.com domains (bug
    1745600)

  * Fix for a WebRender crash on some Linux/X11 systems (bug 1741956)

  * Fix for a frequent Windows shutdown crash (bug 1738984)

  * Fix websites contrast issues for some Linux users with Dark mode set at OS
    level (bug 1740518)


(ryoon)
diff -r1.505 -r1.506 pkgsrc/www/firefox/Makefile
diff -r1.455 -r1.456 pkgsrc/www/firefox/distinfo
diff -r1.213 -r1.214 pkgsrc/www/firefox/mozilla-common.mk
cvs diff -r1.505 -r1.506 pkgsrc/www/firefox/Makefile (switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2021/12/19 09:47:59 1.505
+++ pkgsrc/www/firefox/Makefile 2021/12/19 15:09:49 1.506
@@ -1,172 +1,177 @@ @@ -1,172 +1,177 @@
1# $NetBSD: Makefile,v 1.505 2021/12/19 09:47:59 maya Exp $ 1# $NetBSD: Makefile,v 1.506 2021/12/19 15:09:49 ryoon Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 95.0 4MOZ_BRANCH= 95.0.1
5MOZ_BRANCH_MINOR=  5MOZ_BRANCH_MINOR=
6PKGREVISION= 2 
7 6
8DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
9PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
10CATEGORIES= www 9CATEGORIES= www
11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
13 12
14NODEJSKIT= nodejs-output-95.0.tgz 13NODEJSKIT= nodejs-output-95.0.tgz
15DISTFILES= ${DEFAULT_DISTFILES} ${NODEJSKIT} 14DISTFILES= ${DEFAULT_DISTFILES} ${NODEJSKIT}
16SITES.${NODEJSKIT}= ${MASTER_SITE_LOCAL} 15SITES.${NODEJSKIT}= ${MASTER_SITE_LOCAL}
17 16
18MAINTAINER= ryoon@NetBSD.org 17MAINTAINER= ryoon@NetBSD.org
19HOMEPAGE= https://www.mozilla.org/en-US/firefox/ 18HOMEPAGE= https://www.mozilla.org/en-US/firefox/
20COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:tu:C/\\.[[:digit:]\.]*//}) 19COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:tu:C/\\.[[:digit:]\.]*//})
21LICENSE= mpl-1.1 20LICENSE= mpl-1.1
22 21
23# -------- BEFORE UPDATING THIS PACKAGE PLEASE READ & UNDERSTAND: ------- 22# -------- BEFORE UPDATING THIS PACKAGE PLEASE READ & UNDERSTAND: -------
24# 23#
25# This package works around a (stupid) build time dependency on nodejs 24# This package works around a (stupid) build time dependency on nodejs
26# (which is not available for all architectures and unnecessary for the 25# (which is not available for all architectures and unnecessary for the
27# real build). To do this, it places some additional burden on the 26# real build). To do this, it places some additional burden on the
28# maintainer. 27# maintainer.
29# 28#
30# While working on the package, please make sure you have 29# While working on the package, please make sure you have
31# 30#
32# FIREFOX_MAINTAINER=yes 31# FIREFOX_MAINTAINER=yes
33# 32#
34# set in your build environment. 33# set in your build environment.
35# When the package is ready for commit (but before commit), do: 34# When the package is ready for commit (but before commit), do:
36# 35#
37# make maintainer-files 36# make maintainer-files
38# 37#
39# This will do another round (depending on state of your work dir at this 38# This will do another round (depending on state of your work dir at this
40# moment) of one or two builds and generate a cache of all output that 39# moment) of one or two builds and generate a cache of all output that
41# nodejs generates during a build. 40# nodejs generates during a build.
42# 41#
43# When this is done, just commit the results (they will be in the files/ 42# When this is done, just commit the results (they will be in the files/
44# directory). 43# directory).
45# 44#
46# ----------------------------------------------------------------------- 45# -----------------------------------------------------------------------
47 46
48UNLIMIT_RESOURCES+= datasize virtualsize 47UNLIMIT_RESOURCES+= datasize virtualsize
49 48
50WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:C/b.*//} 49WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:C/b.*//}
51 50
52MOZILLA_DIR= # empty 51MOZILLA_DIR= # empty
53 52
54# Note: when updating remember to conditionalise about-background.png in PLIST 53# Note: In --enable-chrome-format=flat case,
 54# when updating remember to conditionalise about-background.png in PLIST
55CONFIGURE_ARGS+= --enable-application=browser 55CONFIGURE_ARGS+= --enable-application=browser
56 56
57#CFLAGS+= -I${PREFIX}/include/nspr 57#CFLAGS+= -I${PREFIX}/include/nspr
58# for lang/gcc6 58# for lang/gcc6
59CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS 59CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS
60CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS 60CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
61 61
62LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE} 62LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
63LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib 63LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
64LDFLAGS.DragonFly+= -lplc4 -lnspr4 64LDFLAGS.DragonFly+= -lplc4 -lnspr4
65LDFLAGS.FreeBSD+= -lplc4 -lnspr4 65LDFLAGS.FreeBSD+= -lplc4 -lnspr4
66LDFLAGS.Linux+= -lnspr4 66LDFLAGS.Linux+= -lnspr4
67LDFLAGS.SunOS+= -lm 67LDFLAGS.SunOS+= -lm
68 68
69# XXX not sure how to test this! likely unnecessary 69# XXX not sure how to test this! likely unnecessary
70NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/plugin-container 70NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/plugin-container
 71# For RLBox WASM sandbox. Sync condition with mozilla-common.mk
 72.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
 73NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/firefox
 74NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/firefox-bin
 75.endif
71 76
72# Avoid ld "invalid section index" errors. 77# Avoid ld "invalid section index" errors.
73BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections 78BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections
74BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections 79BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections
75BUILDLINK_TRANSFORM.SunOS+= rm:-pie 80BUILDLINK_TRANSFORM.SunOS+= rm:-pie
76 81
77# Workaround for https://bugs.llvm.org/show_bug.cgi?id=46366 82# Workaround for https://bugs.llvm.org/show_bug.cgi?id=46366
78BUILDLINK_TRANSFORM.NetBSD+= rm:-fexperimental-new-pass-manager 83BUILDLINK_TRANSFORM.NetBSD+= rm:-fexperimental-new-pass-manager
79 84
80SUBST_CLASSES+= dfly_malloc_h 85SUBST_CLASSES+= dfly_malloc_h
81SUBST_STAGE.dfly_malloc_h= pre-configure 86SUBST_STAGE.dfly_malloc_h= pre-configure
82SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd 87SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd
83SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g' 88SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g'
84SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c 89SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c
85 90
86.include "mozilla-common.mk" 91.include "mozilla-common.mk"
87.include "options.mk" 92.include "options.mk"
88 93
89CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/header.py 94CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/header.py
90CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py 95CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py
91CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py 96CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py
92CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py 97CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py
93 98
94CHECK_WRKREF_SKIP+= lib/${MOZILLA}/omni.ja 99CHECK_WRKREF_SKIP+= lib/${MOZILLA}/omni.ja
95 100
96MOZILLA= ${PKGBASE} 101MOZILLA= ${PKGBASE}
97 102
98.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 103.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
99MOZILLA_NAME= Firefox 104MOZILLA_NAME= Firefox
100MOZILLA_BRANDING= official 105MOZILLA_BRANDING= official
101.else 106.else
102MOZILLA_NAME= Browser 107MOZILLA_NAME= Browser
103MOZILLA_BRANDING= unofficial 108MOZILLA_BRANDING= unofficial
104.endif 109.endif
105 110
106pre-configure: 111pre-configure:
107 cd ${WRKSRC} && autoconf 112 cd ${WRKSRC} && autoconf
108 cd ${WRKSRC}/js/src && autoconf 113 cd ${WRKSRC}/js/src && autoconf
109 cd ${WRKSRC} && mkdir ${OBJDIR} 114 cd ${WRKSRC} && mkdir ${OBJDIR}
110 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars 115 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
111# Do not fetch Rust Cargo file via network during build 116# Do not fetch Rust Cargo file via network during build
112.if !defined(FIREFOX_MAINTAINER) 117.if !defined(FIREFOX_MAINTAINER)
113 mv ${WRKDIR}/dist ${WRKSRC}/${OBJDIR} 118 mv ${WRKDIR}/dist ${WRKSRC}/${OBJDIR}
114.endif 119.endif
115 120
116.if defined(FIREFOX_MAINTAINER) 121.if defined(FIREFOX_MAINTAINER)
117# Create files needed only by the firefox maintainer when updating 122# Create files needed only by the firefox maintainer when updating
118# the package 123# the package
119# XXX - manually removing the .*_done files is wrong! 124# XXX - manually removing the .*_done files is wrong!
120.PHONY: build-list 125.PHONY: build-list
121build-list: 126build-list:
122 cd ${WRKSRC}/${OBJDIR}/dist/bin/browser/chrome && \ 127 cd ${WRKSRC}/${OBJDIR}/dist/bin/browser/chrome && \
123 find . -type f | sort > ${OUT:Q} 128 find . -type f | sort > ${OUT:Q}
124 129
125NODE_LIST= "${WRKDIR}/node.list" 130NODE_LIST= "${WRKDIR}/node.list"
126NO_NODE_LIST= "${WRKDIR}/no-node.list" 131NO_NODE_LIST= "${WRKDIR}/no-node.list"
127NODE_FILES= "${WRKDIR}/node.flist" 132NODE_FILES= "${WRKDIR}/node.flist"
128 133
129.PHONY: maintainer-files 134.PHONY: maintainer-files
130maintainer-files: 135maintainer-files:
131 rm -f ${FILESDIR}/node-wrapper.sh 136 rm -f ${FILESDIR}/node-wrapper.sh
132 V=$$( node -v ) && \ 137 V=$$( node -v ) && \
133 printf '#! /bin/sh\n\nVERS=%s\n\nif [ "$$1" = "-v" ] || [ "$$1" = "--version" ]; then\n\tprintf "$${VERS}\\n"\nfi\n\nexit 0\n' $$V \ 138 printf '#! /bin/sh\n\nVERS=%s\n\nif [ "$$1" = "-v" ] || [ "$$1" = "--version" ]; then\n\tprintf "$${VERS}\\n"\nfi\n\nexit 0\n' $$V \
134 > ${FILESDIR}/node-wrapper.sh && \ 139 > ${FILESDIR}/node-wrapper.sh && \
135 chmod 0755 ${FILESDIR}/node-wrapper.sh 140 chmod 0755 ${FILESDIR}/node-wrapper.sh
136 rm -f ${WRKDIR}/.build_done ${WRKDIR}/.configure_done 141 rm -f ${WRKDIR}/.build_done ${WRKDIR}/.configure_done
137 ${MAKE} MAINTAINER_INTERNAL=yes build 142 ${MAKE} MAINTAINER_INTERNAL=yes build
138 ${MAKE} MAINTAINER_INTERNAL=yes OUT="${NO_NODE_LIST}" build-list 143 ${MAKE} MAINTAINER_INTERNAL=yes OUT="${NO_NODE_LIST}" build-list
139 ${MAKE} OUT="${NODE_LIST}" build-list 144 ${MAKE} OUT="${NODE_LIST}" build-list
140 ${DIFF} -u "${NO_NODE_LIST}" "${NODE_LIST}" | \ 145 ${DIFF} -u "${NO_NODE_LIST}" "${NODE_LIST}" | \
141 ${AWK} \ 146 ${AWK} \
142 '/^\+\.\//{ printf("dist/bin/browser/chrome/%s\n", gensub(/^\+\.\//, "", "")) }' \ 147 '/^\+\.\//{ printf("dist/bin/browser/chrome/%s\n", gensub(/^\+\.\//, "", "")) }' \
143 > "${NODE_FILES}" 148 > "${NODE_FILES}"
144 cd ${WRKSRC}/${OBJDIR} && tar -c -T "${NODE_FILES}" -z \ 149 cd ${WRKSRC}/${OBJDIR} && tar -c -T "${NODE_FILES}" -z \
145 -f ${FILESDIR}/nodejs-output-${PKGVERSION_NOREV}.tgz 150 -f ${FILESDIR}/nodejs-output-${PKGVERSION_NOREV}.tgz
146.endif 151.endif
147 152
148post-build: 153post-build:
149 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 154 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
150 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 155 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
151 -e 's|@FIREFOX_ICON@|${MOZILLA}|g' \ 156 -e 's|@FIREFOX_ICON@|${MOZILLA}|g' \
152 < ${FILESDIR}/desktop.in \ 157 < ${FILESDIR}/desktop.in \
153 > ${WRKDIR}/desktop 158 > ${WRKDIR}/desktop
154 159
155INSTALLATION_DIRS+= share/applications 160INSTALLATION_DIRS+= share/applications
156 161
157post-install: 162post-install:
158 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA} 163 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
159 ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \ 164 ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \
160 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 165 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
161 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 166 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
162 ${INSTALL_DATA} ${WRKDIR}/desktop \ 167 ${INSTALL_DATA} ${WRKDIR}/desktop \
163 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop 168 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
164.for i in 16 22 24 32 48 64 128 256 169.for i in 16 22 24 32 48 64 128 256
165 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps 170 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
166 ${INSTALL_DATA} ${WRKSRC}/browser/branding/${MOZILLA_BRANDING}/default${i}.png \ 171 ${INSTALL_DATA} ${WRKSRC}/browser/branding/${MOZILLA_BRANDING}/default${i}.png \
167 ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${MOZILLA}.png 172 ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${MOZILLA}.png
168.endfor 173.endfor
169 174
170.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 175.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
171.include "../../sysutils/desktop-file-utils/desktopdb.mk" 176.include "../../sysutils/desktop-file-utils/desktopdb.mk"
172.include "../../mk/bsd.pkg.mk" 177.include "../../mk/bsd.pkg.mk"
cvs diff -r1.455 -r1.456 pkgsrc/www/firefox/distinfo (switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2021/12/11 14:10:01 1.455
+++ pkgsrc/www/firefox/distinfo 2021/12/19 15:09:49 1.456
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1$NetBSD: distinfo,v 1.455 2021/12/11 14:10:01 ryoon Exp $ 1$NetBSD: distinfo,v 1.456 2021/12/19 15:09:49 ryoon Exp $
2 2
3BLAKE2s (firefox-95.0.source.tar.xz) = 2cf104a9e2c7161ef19617214307aa8eacfa9527cde3ed0152211e448dff2ccb 3BLAKE2s (firefox-95.0.1.source.tar.xz) = 63da362545d9b746ea7076d4c68e6990725ad617cd122901bcc2895e57b80c40
4SHA512 (firefox-95.0.source.tar.xz) = 350672a2cd99195c67dafc0e71c6eaf1e23e85a5fe92775697119a054f17c34a736035e23d7f2bb404b544f0f144efef3843cfc293596a6e61d1ea36efc3a724 4SHA512 (firefox-95.0.1.source.tar.xz) = 54887c3adbf7202b835ae1ac928c3c95516ef11f9894456561dad500a1a61623f926b37f6e02fef0898e7ee0fd9147a71e5432634e6e0a2c2fecd08509799c37
5Size (firefox-95.0.source.tar.xz) = 382853940 bytes 5Size (firefox-95.0.1.source.tar.xz) = 385073408 bytes
6BLAKE2s (nodejs-output-95.0.tgz) = c44b37d3605524a49157002f01c29f568f04194b0e635bc312de7ffdeb9a74c9 6BLAKE2s (nodejs-output-95.0.tgz) = c44b37d3605524a49157002f01c29f568f04194b0e635bc312de7ffdeb9a74c9
7SHA512 (nodejs-output-95.0.tgz) = 2faf326f4e100b66f8597c365cc2eb5d0eee26aae92a7e2446891f2178041aa71ba16eae37000acacd43a657025ec11c18db73b112f5c49cc21cdb882da6d798 7SHA512 (nodejs-output-95.0.tgz) = 2faf326f4e100b66f8597c365cc2eb5d0eee26aae92a7e2446891f2178041aa71ba16eae37000acacd43a657025ec11c18db73b112f5c49cc21cdb882da6d798
8Size (nodejs-output-95.0.tgz) = 200627 bytes 8Size (nodejs-output-95.0.tgz) = 200627 bytes
9SHA1 (patch-aa) = 15b8567cee2af9853f6949c80345ffcb1fd3852a 9SHA1 (patch-aa) = 15b8567cee2af9853f6949c80345ffcb1fd3852a
10SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0 10SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0
11SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678 11SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678
12SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d1f15ff487efa9202114d19ed5668b4e7aa032a 12SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d1f15ff487efa9202114d19ed5668b4e7aa032a
13SHA1 (patch-config_makefiles_rust.mk) = fa9f0f59a179cae2562a76110fada49039490fb8 13SHA1 (patch-config_makefiles_rust.mk) = fa9f0f59a179cae2562a76110fada49039490fb8
14SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 14SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
15SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 15SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
16SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = b2adce9e65662283a11b6dcff40e95523e940045 16SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = b2adce9e65662283a11b6dcff40e95523e940045
17SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad 17SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
18SHA1 (patch-gfx_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb 18SHA1 (patch-gfx_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb
19SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c 19SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
20SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658 20SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
21SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836 21SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
22SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = fad103cc698f9828ad58f742231984ec2bc27605 22SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = fad103cc698f9828ad58f742231984ec2bc27605
23SHA1 (patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp) = fdc522e3fb626b1b8a2ebf19ad60bfc25dfa4183 23SHA1 (patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp) = fdc522e3fb626b1b8a2ebf19ad60bfc25dfa4183
24SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba 24SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
25SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 0501fdcae11568ae4ea78e0d2f6b3750b7a67d47 25SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 0501fdcae11568ae4ea78e0d2f6b3750b7a67d47
26SHA1 (patch-layout_style_extra-bindgen-flags.in) = e6c3b68d887c112dacf6c2782e776dc55723eaec 26SHA1 (patch-layout_style_extra-bindgen-flags.in) = e6c3b68d887c112dacf6c2782e776dc55723eaec
27SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a 27SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
28SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 2ef11da83c90c41490db4c0d9809c3e1826b488a 28SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 2ef11da83c90c41490db4c0d9809c3e1826b488a
29SHA1 (patch-media_libcubeb_src_moz.build) = e4e64a1135cf4157ae5b6f7c1710ebd076953479 29SHA1 (patch-media_libcubeb_src_moz.build) = e4e64a1135cf4157ae5b6f7c1710ebd076953479
30SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc 30SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
31SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f 31SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f
32SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = f495b64d33db4940c0dfe8c36ddf82aa752b25d9 32SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = f495b64d33db4940c0dfe8c36ddf82aa752b25d9
33SHA1 (patch-modules_fdlibm_src_math__private.h) = 6ae3b0077b4a8c6088c35769fa1972cfc44ea9c1 33SHA1 (patch-modules_fdlibm_src_math__private.h) = 6ae3b0077b4a8c6088c35769fa1972cfc44ea9c1
34SHA1 (patch-mozglue_misc_Uptime.cpp) = daefe25ef1ebc8e4d3735017b9e8ac68c4710a00 34SHA1 (patch-mozglue_misc_Uptime.cpp) = daefe25ef1ebc8e4d3735017b9e8ac68c4710a00
35SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e5fbfc91c0 35SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e5fbfc91c0
36SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4 36SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
37SHA1 (patch-third__party_libwebrtc_webrtc_modules_audio__processing_echo__detector_mean__variance__estimator.cc) = 5b0ccc4e8a66be37b2fe3ae30b47c40edb6aa831 37SHA1 (patch-third__party_libwebrtc_webrtc_modules_audio__processing_echo__detector_mean__variance__estimator.cc) = 5b0ccc4e8a66be37b2fe3ae30b47c40edb6aa831
38SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 1c1397f6177728cf9deb2b74708069b9d09509c3 38SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 1c1397f6177728cf9deb2b74708069b9d09509c3
39SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12 39SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12
40SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662 40SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662
41SHA1 (patch-widget_gtk_DMABufSurface.cpp) = 72bc9554f075734df12e1748fb8965dce8318de5 41SHA1 (patch-widget_gtk_DMABufSurface.cpp) = 72bc9554f075734df12e1748fb8965dce8318de5
42SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec 42SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
43SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = f7e491c7b62a5332066473bfc815e0050672a372 43SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = f7e491c7b62a5332066473bfc815e0050672a372
cvs diff -r1.213 -r1.214 pkgsrc/www/firefox/mozilla-common.mk (switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2021/12/17 20:08:42 1.213
+++ pkgsrc/www/firefox/mozilla-common.mk 2021/12/19 15:09:49 1.214
@@ -1,221 +1,229 @@ @@ -1,221 +1,229 @@
1# $NetBSD: mozilla-common.mk,v 1.213 2021/12/17 20:08:42 maya Exp $ 1# $NetBSD: mozilla-common.mk,v 1.214 2021/12/19 15:09:49 ryoon Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9PYTHON_VERSIONS_INCOMPATIBLE= 27 9PYTHON_VERSIONS_INCOMPATIBLE= 27
10PYTHON_FOR_BUILD_ONLY= tool 10PYTHON_FOR_BUILD_ONLY= tool
11ALL_ENV+= PYTHON3=${PYTHONBIN} 11ALL_ENV+= PYTHON3=${PYTHONBIN}
12 12
13HAS_CONFIGURE= yes 13HAS_CONFIGURE= yes
14CONFIGURE_ARGS+= --prefix=${PREFIX} 14CONFIGURE_ARGS+= --prefix=${PREFIX}
15USE_TOOLS+= pkg-config perl gmake autoconf213 gm4 unzip zip 15USE_TOOLS+= pkg-config perl gmake autoconf213 gm4 unzip zip
16UNLIMIT_RESOURCES+= datasize virtualsize 16UNLIMIT_RESOURCES+= datasize virtualsize
17 17
18USE_LANGUAGES+= c c++ 18USE_LANGUAGES+= c c++
19 19
20# ERROR: Only GCC 7.1 or newer is supported (found version 5.5.0). 20# ERROR: Only GCC 7.1 or newer is supported (found version 5.5.0).
21GCC_REQD+= 7 21GCC_REQD+= 7
22 22
23TOOL_DEPENDS+= cbindgen>=0.19.0:../../devel/cbindgen 23TOOL_DEPENDS+= cbindgen>=0.19.0:../../devel/cbindgen
24 24
25.if defined(FIREFOX_MAINTAINER) && !defined(MAINTAINER_INTERNAL) 25.if defined(FIREFOX_MAINTAINER) && !defined(MAINTAINER_INTERNAL)
26TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 26TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
27USE_TOOLS+= diff 27USE_TOOLS+= diff
28.else 28.else
29CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh" 29CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh"
30.endif 30.endif
31 31
32TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 32TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
33TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 33TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
34 34
35.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 35.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
36TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm 36TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm
37TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm 37TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm
38.endif 38.endif
39 39
40# This is to work around build failures where an upstream configuration script 40# This is to work around build failures where an upstream configuration script
41# is confused by having more than one approximate match to MACHINE_GNU_PLATFORM 41# is confused by having more than one approximate match to MACHINE_GNU_PLATFORM
42# "i486" when attempting to select the Rust compiler target. 42# "i486" when attempting to select the Rust compiler target.
43.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) 43.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
44CONFIGURE_ARGS+= --target=i586-unknown-netbsd 44CONFIGURE_ARGS+= --target=i586-unknown-netbsd
45CONFIGURE_ARGS+= --host=i586-unknown-netbsd 45CONFIGURE_ARGS+= --host=i586-unknown-netbsd
46.else 46.else
47CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM} 47CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM}
48CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} 48CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM}
49.endif 49.endif
50 50
51CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \ 51CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
52 -isystem${X11BASE}/include/pixman-1" 52 -isystem${X11BASE}/include/pixman-1"
53 53
54test: 54test:
55 cd ${WRKSRC}/${OBJDIR}/dist/bin && \ 55 cd ${WRKSRC}/${OBJDIR}/dist/bin && \
56 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey 56 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
57 57
58# tar(1) of OpenBSD 5.5 has no --exclude command line option. 58# tar(1) of OpenBSD 5.5 has no --exclude command line option.
59.if ${OPSYS} == "OpenBSD" 59.if ${OPSYS} == "OpenBSD"
60TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} 60TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar}
61USE_TOOLS+= bsdtar 61USE_TOOLS+= bsdtar
62.endif 62.endif
63 63
64PLIST_VARS+= i386 64PLIST_VARS+= i386
65.if ${MACHINE_ARCH} == "i386" 65.if ${MACHINE_ARCH} == "i386"
66# This is required for SSE2 code under i386. 66# This is required for SSE2 code under i386.
67CXXFLAGS+= -mstackrealign 67CXXFLAGS+= -mstackrealign
68PLIST.i386= yes 68PLIST.i386= yes
69.endif 69.endif
70 70
71CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/*/*.sh 71CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/*/*.sh
72CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh 72CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh
73CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure 73CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure
74CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 74CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
75CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 75CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
76#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh 76#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh
77 77
78CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 78CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
79CONFIGURE_ARGS+= --enable-release 79CONFIGURE_ARGS+= --enable-release
80# Disable Rust SIMD option to fix build with lang/rust-1.33.0 80# Disable Rust SIMD option to fix build with lang/rust-1.33.0
81# This should be enabled later again. 81# This should be enabled later again.
82#CONFIGURE_ARGS+= --enable-rust-simd 82#CONFIGURE_ARGS+= --enable-rust-simd
83CONFIGURE_ARGS+= --disable-tests 83CONFIGURE_ARGS+= --disable-tests
84# Mozilla Bug 1432751 84# Mozilla Bug 1432751
85#CONFIGURE_ARGS+= --enable-system-cairo 85#CONFIGURE_ARGS+= --enable-system-cairo
86CONFIGURE_ARGS+= --enable-system-pixman 86CONFIGURE_ARGS+= --enable-system-pixman
87# webrtc option requires internal libvpx 87# webrtc option requires internal libvpx
88#CONFIGURE_ARGS+= --with-system-libvpx 88#CONFIGURE_ARGS+= --with-system-libvpx
89CONFIGURE_ARGS+= --enable-system-ffi 89CONFIGURE_ARGS+= --enable-system-ffi
90CONFIGURE_ARGS+= --with-system-icu 90CONFIGURE_ARGS+= --with-system-icu
91CONFIGURE_ARGS+= --with-system-nss 91CONFIGURE_ARGS+= --with-system-nss
92CONFIGURE_ARGS+= --with-system-nspr 92CONFIGURE_ARGS+= --with-system-nspr
93#CONFIGURE_ARGS+= --with-system-jpeg 93#CONFIGURE_ARGS+= --with-system-jpeg
94CONFIGURE_ARGS+= --with-system-zlib 94CONFIGURE_ARGS+= --with-system-zlib
95CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent} 95CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent}
96CONFIGURE_ARGS+= --disable-crashreporter 96CONFIGURE_ARGS+= --disable-crashreporter
97CONFIGURE_ARGS+= --disable-necko-wifi 97CONFIGURE_ARGS+= --disable-necko-wifi
98CONFIGURE_ARGS+= --enable-chrome-format=omni 98CONFIGURE_ARGS+= --enable-chrome-format=omni
99CONFIGURE_ARGS+= --with-system-webp 99CONFIGURE_ARGS+= --with-system-webp
100 100
101#CONFIGURE_ARGS+= --enable-readline 101#CONFIGURE_ARGS+= --enable-readline
102CONFIGURE_ARGS+= --disable-icf 102CONFIGURE_ARGS+= --disable-icf
103CONFIGURE_ARGS+= --disable-updater 103CONFIGURE_ARGS+= --disable-updater
104 104
105#CONFIGURE_ARGS+= --with-libclang-path=${PREFIX}/lib 105#CONFIGURE_ARGS+= --with-libclang-path=${PREFIX}/lib
106 106
 107# RLBox WASM sandbox
 108.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
 109.include "../../lang/wasi-libc/buildlink3.mk"
 110.include "../../lang/wasi-libcxx/buildlink3.mk"
 111.include "../../lang/wasi-compiler-rt/buildlink3.mk"
 112CONFIGURE_ARGS+= --with-wasi-sysroot=${PREFIX}/wasi
 113.else
107CONFIGURE_ARGS+= --without-wasm-sandboxed-libraries 114CONFIGURE_ARGS+= --without-wasm-sandboxed-libraries
 115.endif
108 116
109SUBST_CLASSES+= fix-paths 117SUBST_CLASSES+= fix-paths
110SUBST_STAGE.fix-paths= pre-configure 118SUBST_STAGE.fix-paths= pre-configure
111SUBST_MESSAGE.fix-paths= Fixing absolute paths. 119SUBST_MESSAGE.fix-paths= Fixing absolute paths.
112SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp 120SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
113SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g' 121SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
114 122
115.include "../../sysutils/pciutils/libname.mk" 123.include "../../sysutils/pciutils/libname.mk"
116SUBST_CLASSES+= fix-libpci-soname 124SUBST_CLASSES+= fix-libpci-soname
117SUBST_STAGE.fix-libpci-soname= pre-configure 125SUBST_STAGE.fix-libpci-soname= pre-configure
118SUBST_MESSAGE.fix-libpci-soname= Fixing libpci soname 126SUBST_MESSAGE.fix-libpci-soname= Fixing libpci soname
119SUBST_FILES.fix-libpci-soname+= ${MOZILLA_DIR}toolkit/xre/glxtest.cpp 127SUBST_FILES.fix-libpci-soname+= ${MOZILLA_DIR}toolkit/xre/glxtest.cpp
120SUBST_SED.fix-libpci-soname+= -e 's,libpci.so,lib${PCIUTILS_LIBNAME}.so,' 128SUBST_SED.fix-libpci-soname+= -e 's,libpci.so,lib${PCIUTILS_LIBNAME}.so,'
121 129
122CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess 130CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess
123CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess 131CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess
124CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess 132CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
125CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess 133CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess
126CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub 134CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub
127CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub 135CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub
128CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub 136CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
129CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub 137CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
130 138
131CONFIGURE_ENV+= CPP=${CPP:Q} 139CONFIGURE_ENV+= CPP=${CPP:Q}
132ALL_ENV+= SHELL=${CONFIG_SHELL:Q} 140ALL_ENV+= SHELL=${CONFIG_SHELL:Q}
133 141
134# Build outside ${WRKSRC} 142# Build outside ${WRKSRC}
135# Try to avoid conflict with config/makefiles/xpidl/Makefile.in 143# Try to avoid conflict with config/makefiles/xpidl/Makefile.in
136.if ${MAINTAINER_INTERNAL:Uno} == "yes 144.if ${MAINTAINER_INTERNAL:Uno} == "yes
137OBJDIR= ../no-node-build 145OBJDIR= ../no-node-build
138.else 146.else
139OBJDIR= ../build 147OBJDIR= ../build
140.endif 148.endif
141CONFIGURE_DIRS= ${OBJDIR} 149CONFIGURE_DIRS= ${OBJDIR}
142CONFIGURE_SCRIPT= ${WRKSRC}/configure 150CONFIGURE_SCRIPT= ${WRKSRC}/configure
143 151
144PLIST_VARS+= ffvpx 152PLIST_VARS+= ffvpx
145 153
146.if ${MACHINE_ARCH} == "aarch64" || \ 154.if ${MACHINE_ARCH} == "aarch64" || \
147 !empty(MACHINE_ARCH:M*arm*) || \ 155 !empty(MACHINE_ARCH:M*arm*) || \
148 ${MACHINE_ARCH} == "i386" || \ 156 ${MACHINE_ARCH} == "i386" || \
149 ${MACHINE_ARCH} == "x86_64" 157 ${MACHINE_ARCH} == "x86_64"
150PLIST.ffvpx= yes # see media/ffvpx/ffvpxcommon.mozbuild 158PLIST.ffvpx= yes # see media/ffvpx/ffvpxcommon.mozbuild
151.endif 159.endif
152 160
153# See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing 161# See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing
154# support is only available when the toolkit is cairo-cocoa. 162# support is only available when the toolkit is cairo-cocoa.
155CONFIGURE_ARGS.Darwin+= --disable-sandbox 163CONFIGURE_ARGS.Darwin+= --disable-sandbox
156 164
157# Makefiles sometimes call "rm -f" without more arguments. Kludge around ... 165# Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
158.PHONY: create-rm-wrapper 166.PHONY: create-rm-wrapper
159pre-configure: create-rm-wrapper 167pre-configure: create-rm-wrapper
160create-rm-wrapper: 168create-rm-wrapper:
161 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \ 169 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
162 ${WRAPPER_DIR}/bin/rm 170 ${WRAPPER_DIR}/bin/rm
163 chmod +x ${WRAPPER_DIR}/bin/rm 171 chmod +x ${WRAPPER_DIR}/bin/rm
164 172
165.PHONY: fix-clang-wrapper 173.PHONY: fix-clang-wrapper
166pre-configure: fix-clang-wrapper 174pre-configure: fix-clang-wrapper
167fix-clang-wrapper: 175fix-clang-wrapper:
168.if empty(PKGSRC_COMPILER:M*clang*) 176.if empty(PKGSRC_COMPILER:M*clang*)
169# Firefox requires Clang during the build, even when building with GCC. 177# Firefox requires Clang during the build, even when building with GCC.
170# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc. 178# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc.
171# This breaks the build. 179# This breaks the build.
172# PR pkg/55647 https://gnats.netbsd.org/55647 180# PR pkg/55647 https://gnats.netbsd.org/55647
173 ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang 181 ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang
174 ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++ 182 ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++
175 ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp 183 ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp
176.endif 184.endif
177 185
178# The configure test for __thread succeeds, but later we end up with: 186# The configure test for __thread succeeds, but later we end up with:
179# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 187# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
180CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 188CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
181# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. 189# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
182CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= 190CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic=
183 191
184.include "../../sysutils/pciutils/buildlink3.mk" 192.include "../../sysutils/pciutils/buildlink3.mk"
185.include "../../mk/atomic64.mk" 193.include "../../mk/atomic64.mk"
186BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 194BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
187.include "../../devel/libevent/buildlink3.mk" 195.include "../../devel/libevent/buildlink3.mk"
188.include "../../devel/libffi/buildlink3.mk" 196.include "../../devel/libffi/buildlink3.mk"
189BUILDLINK_API_DEPENDS.nspr+= nspr>=4.32 197BUILDLINK_API_DEPENDS.nspr+= nspr>=4.32
190.include "../../devel/nspr/buildlink3.mk" 198.include "../../devel/nspr/buildlink3.mk"
191.include "../../textproc/icu/buildlink3.mk" 199.include "../../textproc/icu/buildlink3.mk"
192BUILDLINK_API_DEPENDS.nss+= nss>=3.71 200BUILDLINK_API_DEPENDS.nss+= nss>=3.71
193.include "../../devel/nss/buildlink3.mk" 201.include "../../devel/nss/buildlink3.mk"
194.include "../../devel/zlib/buildlink3.mk" 202.include "../../devel/zlib/buildlink3.mk"
195#.include "../../mk/jpeg.buildlink3.mk" 203#.include "../../mk/jpeg.buildlink3.mk"
196.include "../../graphics/MesaLib/buildlink3.mk" 204.include "../../graphics/MesaLib/buildlink3.mk"
197#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 205#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
198#.include "../../graphics/cairo/buildlink3.mk" 206#.include "../../graphics/cairo/buildlink3.mk"
199BUILDLINK_API_DEPENDS.libwebp+= libwebp>=1.0.2 207BUILDLINK_API_DEPENDS.libwebp+= libwebp>=1.0.2
200.include "../../graphics/libwebp/buildlink3.mk" 208.include "../../graphics/libwebp/buildlink3.mk"
201BUILDLINK_DEPMETHOD.clang= build 209BUILDLINK_DEPMETHOD.clang= build
202.include "../../lang/clang/buildlink3.mk" 210.include "../../lang/clang/buildlink3.mk"
203RUST_REQ= 1.53.0 211RUST_REQ= 1.53.0
204.include "../../lang/rust/rust.mk" 212.include "../../lang/rust/rust.mk"
205# webrtc option requires internal libvpx 213# webrtc option requires internal libvpx
206#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 214#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
207#.include "../../multimedia/libvpx/buildlink3.mk" 215#.include "../../multimedia/libvpx/buildlink3.mk"
208.include "../../net/libIDL/buildlink3.mk" 216.include "../../net/libIDL/buildlink3.mk"
209# textproc/hunspell 1.3 is too old 217# textproc/hunspell 1.3 is too old
210#.include "../../textproc/hunspell/buildlink3.mk" 218#.include "../../textproc/hunspell/buildlink3.mk"
211.include "../../multimedia/ffmpeg4/buildlink3.mk" 219.include "../../multimedia/ffmpeg4/buildlink3.mk"
212.include "../../x11/libXt/buildlink3.mk" 220.include "../../x11/libXt/buildlink3.mk"
213BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 221BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
214.include "../../x11/pixman/buildlink3.mk" 222.include "../../x11/pixman/buildlink3.mk"
215.include "../../x11/gtk2/buildlink3.mk" 223.include "../../x11/gtk2/buildlink3.mk"
216.include "../../x11/gtk3/buildlink3.mk" 224.include "../../x11/gtk3/buildlink3.mk"
217PLIST_VARS+= wayland 225PLIST_VARS+= wayland
218.if ${PKG_BUILD_OPTIONS.gtk3:Mwayland} 226.if ${PKG_BUILD_OPTIONS.gtk3:Mwayland}
219PLIST.wayland= yes 227PLIST.wayland= yes
220.endif 228.endif
221.include "../../lang/python/pyversion.mk" 229.include "../../lang/python/pyversion.mk"