firefox: Update to 113.0.2 * Not tested under NetBSD/i386 and 9 for this commit. If you find problems, please report your failure to me. * Disable WebGL for a while to avoid runtime errors under NetBSD. * Do not pass '-j1 -j1' to cargo when MAKE_JOBS=1. * Do not restrict cargo to unconditional -j1. * Use ffmpeg6 instead of ffmpeg5. Changelog: 113.0.2 Fixed * Fixed an issue which caused Picture-in-Picture windows to not be snappable on Windows 11 or on systems with the FancyZones PowerToy installed (bug 1832331) * Fixed a video playback crash on some Windows systems with Intel graphics ( bug 1831329) * Fixed a bug which could cause Firefox to freeze on some pages when loading them with the Developer Tools Web Console open (bug 1828026) * Fixed a bug which would cause the bookmarks and history sidebars to not properly react to the browser window being vertically resized (bug 1831535) 113.0.1 Fixed * Fixed incorrect colors for Windows users with installed monitor/display color profiles, particularly on wide gamut displays (bug 1832215) * Fixed borders being visible around fullscreen windows for some configurations (bug 1830721) * Fixed an issue which may cause users in some configurations to experience tearing when watching videos in fullscreen mode (bug 1830792) 113.0 New * Say hello to enhanced Picture-in-Picture! Rewind, check video duration, and effortlessly switch to full-screen mode on the web's most popular video websites. * Firefox's address bar is already a great place to search for what you're looking for. Now you'll always be able to see your web search terms and refine them while viewing your search's results - no additional scrolling needed! Also, a new result menu has been added making it easier to remove history results and dismiss sponsored Firefox Suggest entries. Image demonstrating search terms persisting in the address bar after hitting Enter for easier editing * Private windows now protect users even better by blocking third-party cookies and storage of content trackers. * Passwords automatically generated by Firefox now include special characters, giving users more secure passwords by default. * Firefox 113 introduces a redesigned accessibility engine which significantly improves the speed, responsiveness, and stability of Firefox when used with: + Screen readers, as well as certain other accessibility software; + East Asian input methods; + Enterprise single sign-on software; and + Other applications which use accessibility frameworks to access information. * Importing bookmarks from Safari or a Chrome-based browser? The favicons for those bookmarks will now also be imported by default to make them easier to identify. * Firefox 113 now supports AV1 Image Format files containing animations (AVIS), improving support for AVIF images across the web. * The Windows GPU sandbox first shipped in the Firefox 110 release has been tightened to enhance the security benefits it provides. * A 13-year-old feature request was fulfilled and Firefox now supports files being drag-and-dropped directly from Microsoft Outlook. A special thanks to volunteer contributor Marco Spiess for helping to get this across the finish line! * Users on macOS can now access the Services sub-menu directly from Firefox context menus. * On Windows, the elastic overscroll effect has been enabled by default. When two-finger scrolling on the touchpad or scrolling on the touchscreen, you will now see a bouncing animation when scrolling past the edge of a scroll container. * Firefox is now available in the Tajik (tg) language. Fixed * Various security fixes. Changed * The long-deprecated mozRTCPeerConnection, mozRTCIceCandidate, and mozRTCSessionDescription WebRTC interfaces have been removed. Sites should utilize the non-prefixed versions instead. Security fixes: #CVE-2023-32205: Browser prompts could have been obscured by popups #CVE-2023-32206: Crash in RLBox Expat driver #CVE-2023-32207: Potential permissions request bypass via clickjacking #CVE-2023-32208: Leak of script base URL in service workers via import() #CVE-2023-32209: Persistent DoS via favicon image #CVE-2023-32210: Incorrect principal object ordering #CVE-2023-32211: Content process crash due to invalid wasm code #CVE-2023-32212: Potential spoof due to obscured address bar #CVE-2023-32213: Potential memory corruption in FileReader::DoReadData() #MFSA-TMP-2023-0002: Race condition in dav1d decoding #CVE-2023-32214: Potential DoS via exposed protocol handlers #CVE-2023-32215: Memory safety bugs fixed in Firefox 113 and Firefox ESR 102.11 #CVE-2023-32216: Memory safety bugs fixed in Firefox 113diff -r1.557 -r1.558 pkgsrc/www/firefox/Makefile
(ryoon)
@@ -1,187 +1,184 @@ | @@ -1,187 +1,184 @@ | |||
1 | # $NetBSD: Makefile,v 1.557 2023/06/02 18:47:20 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.558 2023/06/04 09:26:35 ryoon Exp $ | |
2 | 2 | |||
3 | FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} | 3 | FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} | |
4 | MOZ_BRANCH= 112.0 | 4 | MOZ_BRANCH= 113.0 | |
5 | MOZ_BRANCH_MINOR= .1 | 5 | MOZ_BRANCH_MINOR= .2 | |
6 | 6 | |||
7 | DISTNAME= firefox-${FIREFOX_VER}.source | 7 | DISTNAME= firefox-${FIREFOX_VER}.source | |
8 | PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} | 8 | PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} | |
9 | PKGREVISION= 5 | |||
10 | CATEGORIES= www | 9 | CATEGORIES= www | |
11 | MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} | 10 | MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} | |
12 | MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} | 11 | MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} | |
13 | EXTRACT_SUFX= .tar.xz | 12 | EXTRACT_SUFX= .tar.xz | |
14 | 13 | |||
15 | NODEJSKIT= nodejs-output-111.0.tgz | 14 | NODEJSKIT= nodejs-output-113.0.2.tgz | |
16 | DISTFILES= ${DEFAULT_DISTFILES} ${NODEJSKIT} | 15 | DISTFILES= ${DEFAULT_DISTFILES} ${NODEJSKIT} | |
17 | SITES.${NODEJSKIT}= ${MASTER_SITE_LOCAL} | 16 | SITES.${NODEJSKIT}= ${MASTER_SITE_LOCAL} | |
18 | 17 | |||
19 | MAINTAINER= ryoon@NetBSD.org | 18 | MAINTAINER= ryoon@NetBSD.org | |
20 | HOMEPAGE= https://www.mozilla.org/en-US/firefox/ | 19 | HOMEPAGE= https://www.mozilla.org/en-US/firefox/ | |
21 | COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:tu:C/\\.[[:digit:]\.]*//}) | 20 | COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:tu:C/\\.[[:digit:]\.]*//}) | |
22 | LICENSE= mpl-1.1 | 21 | LICENSE= mpl-1.1 | |
23 | 22 | |||
24 | # -------- BEFORE UPDATING THIS PACKAGE PLEASE READ & UNDERSTAND: ------- | 23 | # -------- BEFORE UPDATING THIS PACKAGE PLEASE READ & UNDERSTAND: ------- | |
25 | # | 24 | # | |
26 | # This package works around a (stupid) build time dependency on nodejs | 25 | # This package works around a (stupid) build time dependency on nodejs | |
27 | # (which is not available for all architectures and unnecessary for the | 26 | # (which is not available for all architectures and unnecessary for the | |
28 | # real build). To do this, it places some additional burden on the | 27 | # real build). To do this, it places some additional burden on the | |
29 | # maintainer. | 28 | # maintainer. | |
30 | # | 29 | # | |
31 | # While working on the package, please make sure you have | 30 | # While working on the package, please make sure you have | |
32 | # | 31 | # | |
33 | # FIREFOX_MAINTAINER=yes | 32 | # FIREFOX_MAINTAINER=yes | |
34 | # | 33 | # | |
35 | # set in your build environment. | 34 | # set in your build environment. | |
36 | # When the package is ready for commit (but before commit), do: | 35 | # When the package is ready for commit (but before commit), do: | |
37 | # | 36 | # | |
38 | # make maintainer-files | 37 | # make maintainer-files | |
39 | # | 38 | # | |
40 | # This will do another round (depending on state of your work dir at this | 39 | # This will do another round (depending on state of your work dir at this | |
41 | # moment) of one or two builds and generate a cache of all output that | 40 | # moment) of one or two builds and generate a cache of all output that | |
42 | # nodejs generates during a build. | 41 | # nodejs generates during a build. | |
43 | # | 42 | # | |
44 | # When this is done, just commit the results (they will be in the files/ | 43 | # When this is done, just commit the results (they will be in the files/ | |
45 | # directory). | 44 | # directory). | |
46 | # | 45 | # | |
47 | # ----------------------------------------------------------------------- | 46 | # ----------------------------------------------------------------------- | |
48 | 47 | |||
49 | UNLIMIT_RESOURCES+= datasize virtualsize | |||
50 | ||||
51 | WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:C/b.*//} | 48 | WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:C/b.*//} | |
52 | 49 | |||
53 | MOZILLA_DIR= # empty | 50 | MOZILLA_DIR= # empty | |
54 | 51 | |||
55 | # Note: In --enable-chrome-format=flat case, | 52 | # Note: In --enable-chrome-format=flat case, | |
56 | # when updating remember to conditionalise about-background.png in PLIST | 53 | # when updating remember to conditionalise about-background.png in PLIST | |
57 | CONFIGURE_ARGS+= --enable-application=browser | 54 | CONFIGURE_ARGS+= --enable-application=browser | |
58 | 55 | |||
59 | #CFLAGS+= -I${PREFIX}/include/nspr | 56 | #CFLAGS+= -I${PREFIX}/include/nspr | |
60 | # for lang/gcc6 | 57 | # for lang/gcc6 | |
61 | CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS | 58 | CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS | |
62 | CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS | 59 | CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS | |
63 | # Do not use uselocale() in third_party/pipewire. | 60 | # Do not use uselocale() in third_party/pipewire. | |
64 | CFLAGS.NetBSD+= -D__LOCALE_C_ONLY | 61 | CFLAGS.NetBSD+= -D__LOCALE_C_ONLY | |
65 | 62 | |||
66 | LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE} | 63 | LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE} | |
67 | LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib | 64 | LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib | |
68 | LDFLAGS.DragonFly+= -lplc4 -lnspr4 | 65 | LDFLAGS.DragonFly+= -lplc4 -lnspr4 | |
69 | LDFLAGS.FreeBSD+= -lplc4 -lnspr4 | 66 | LDFLAGS.FreeBSD+= -lplc4 -lnspr4 | |
70 | LDFLAGS.Linux+= -lnspr4 | 67 | LDFLAGS.Linux+= -lnspr4 | |
71 | LDFLAGS.SunOS+= -lm | 68 | LDFLAGS.SunOS+= -lm | |
72 | 69 | |||
73 | # XXX not sure how to test this! likely unnecessary | 70 | # XXX not sure how to test this! likely unnecessary | |
74 | NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/plugin-container | 71 | NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/plugin-container | |
75 | 72 | |||
76 | # Avoid ld "invalid section index" errors. | 73 | # Avoid ld "invalid section index" errors. | |
77 | BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections | 74 | BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections | |
78 | BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections | 75 | BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections | |
79 | BUILDLINK_TRANSFORM.SunOS+= rm:-pie | 76 | BUILDLINK_TRANSFORM.SunOS+= rm:-pie | |
80 | 77 | |||
81 | # Workaround for https://bugs.llvm.org/show_bug.cgi?id=46366 | 78 | # Workaround for https://bugs.llvm.org/show_bug.cgi?id=46366 | |
82 | BUILDLINK_TRANSFORM.NetBSD+= rm:-fexperimental-new-pass-manager | 79 | BUILDLINK_TRANSFORM.NetBSD+= rm:-fexperimental-new-pass-manager | |
83 | 80 | |||
84 | SUBST_CLASSES+= dfly_malloc_h | 81 | SUBST_CLASSES+= dfly_malloc_h | |
85 | SUBST_STAGE.dfly_malloc_h= pre-configure | 82 | SUBST_STAGE.dfly_malloc_h= pre-configure | |
86 | SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd | 83 | SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd | |
87 | SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g' | 84 | SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g' | |
88 | SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c | 85 | SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c | |
89 | 86 | |||
90 | .include "mozilla-common.mk" | 87 | .include "mozilla-common.mk" | |
91 | .include "options.mk" | 88 | .include "options.mk" | |
92 | 89 | |||
93 | CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/header.py | 90 | CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/header.py | |
94 | CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py | 91 | CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py | |
95 | CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py | 92 | CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py | |
96 | CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py | 93 | CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py | |
97 | 94 | |||
98 | CHECK_WRKREF_SKIP+= lib/${MOZILLA}/omni.ja | 95 | CHECK_WRKREF_SKIP+= lib/${MOZILLA}/omni.ja | |
99 | 96 | |||
100 | MOZILLA= ${PKGBASE} | 97 | MOZILLA= ${PKGBASE} | |
101 | 98 | |||
102 | .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) | 99 | .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) | |
103 | MOZILLA_NAME= Firefox | 100 | MOZILLA_NAME= Firefox | |
104 | MOZILLA_BRANDING= official | 101 | MOZILLA_BRANDING= official | |
105 | .else | 102 | .else | |
106 | MOZILLA_NAME= Browser | 103 | MOZILLA_NAME= Browser | |
107 | MOZILLA_BRANDING= unofficial | 104 | MOZILLA_BRANDING= unofficial | |
108 | .endif | 105 | .endif | |
109 | 106 | |||
110 | pre-configure: | 107 | pre-configure: | |
111 | # As of 106.0, .in template files are not patched. | 108 | # As of 106.0, .in template files are not patched. | |
112 | # cd ${WRKSRC} && autoconf | 109 | # cd ${WRKSRC} && autoconf | |
113 | # cd ${WRKSRC}/js/src && autoconf | 110 | # cd ${WRKSRC}/js/src && autoconf | |
114 | cd ${WRKSRC} && mkdir ${OBJDIR} | 111 | cd ${WRKSRC} && mkdir ${OBJDIR} | |
115 | cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars | 112 | cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars | |
116 | # Do not fetch Rust Cargo file via network during build | 113 | # Do not fetch Rust Cargo file via network during build | |
117 | .if !defined(FIREFOX_MAINTAINER) | 114 | .if !defined(FIREFOX_MAINTAINER) | |
118 | mv ${WRKDIR}/dist ${WRKSRC}/${OBJDIR} | 115 | mv ${WRKDIR}/dist ${WRKSRC}/${OBJDIR} | |
119 | .endif | 116 | .endif | |
120 | 117 | |||
121 | .if defined(FIREFOX_MAINTAINER) | 118 | .if defined(FIREFOX_MAINTAINER) | |
122 | # Create files needed only by the firefox maintainer when updating | 119 | # Create files needed only by the firefox maintainer when updating | |
123 | # the package | 120 | # the package | |
124 | # XXX - manually removing the .*_done files is wrong! | 121 | # XXX - manually removing the .*_done files is wrong! | |
125 | .PHONY: build-list | 122 | .PHONY: build-list | |
126 | build-list: | 123 | build-list: | |
127 | cd ${WRKSRC}/${OBJDIR}/dist/bin/browser/chrome && \ | 124 | cd ${WRKSRC}/${OBJDIR}/dist/bin/browser/chrome && \ | |
128 | find . -type f | sort > ${OUT:Q} | 125 | find . -type f | sort > ${OUT:Q} | |
129 | 126 | |||
130 | NODE_LIST= "${WRKDIR}/node.list" | 127 | NODE_LIST= "${WRKDIR}/node.list" | |
131 | NO_NODE_LIST= "${WRKDIR}/no-node.list" | 128 | NO_NODE_LIST= "${WRKDIR}/no-node.list" | |
132 | NODE_FILES= "${WRKDIR}/node.flist" | 129 | NODE_FILES= "${WRKDIR}/node.flist" | |
133 | 130 | |||
134 | .PHONY: maintainer-files | 131 | .PHONY: maintainer-files | |
135 | maintainer-files: | 132 | maintainer-files: | |
136 | rm -f ${FILESDIR}/node-wrapper.sh | 133 | rm -f ${FILESDIR}/node-wrapper.sh | |
137 | V=$$( node -v ) && \ | 134 | V=$$( node -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 \ | 135 | printf '#! /bin/sh\n\nVERS=%s\n\nif [ "$$1" = "-v" ] || [ "$$1" = "--version" ]; then\n\tprintf "$${VERS}\\n"\nfi\n\nexit 0\n' $$V \ | |
139 | > ${FILESDIR}/node-wrapper.sh && \ | 136 | > ${FILESDIR}/node-wrapper.sh && \ | |
140 | chmod 0755 ${FILESDIR}/node-wrapper.sh | 137 | chmod 0755 ${FILESDIR}/node-wrapper.sh | |
141 | rm -f ${WRKDIR}/.build_done ${WRKDIR}/.configure_done | 138 | rm -f ${WRKDIR}/.build_done ${WRKDIR}/.configure_done | |
142 | ${MAKE} MAINTAINER_INTERNAL=yes build | 139 | ${MAKE} MAINTAINER_INTERNAL=yes build | |
143 | ${MAKE} MAINTAINER_INTERNAL=yes OUT="${NO_NODE_LIST}" build-list | 140 | ${MAKE} MAINTAINER_INTERNAL=yes OUT="${NO_NODE_LIST}" build-list | |
144 | ${MAKE} OUT="${NODE_LIST}" build-list | 141 | ${MAKE} OUT="${NODE_LIST}" build-list | |
145 | ${DIFF} -u "${NO_NODE_LIST}" "${NODE_LIST}" | \ | 142 | ${DIFF} -u "${NO_NODE_LIST}" "${NODE_LIST}" | \ | |
146 | ${AWK} \ | 143 | ${AWK} \ | |
147 | '/^\+\.\//{ printf("dist/bin/browser/chrome/%s\n", gensub(/^\+\.\//, "", "")) }' \ | 144 | '/^\+\.\//{ printf("dist/bin/browser/chrome/%s\n", gensub(/^\+\.\//, "", "")) }' \ | |
148 | > "${NODE_FILES}" | 145 | > "${NODE_FILES}" | |
149 | cd ${WRKSRC}/${OBJDIR} && tar -c -T "${NODE_FILES}" -z \ | 146 | cd ${WRKSRC}/${OBJDIR} && tar -c -T "${NODE_FILES}" -z \ | |
150 | -f ${FILESDIR}/nodejs-output-${PKGVERSION_NOREV}.tgz | 147 | -f ${FILESDIR}/nodejs-output-${PKGVERSION_NOREV}.tgz | |
151 | .endif | 148 | .endif | |
152 | 149 | |||
153 | pre-patch: | 150 | pre-patch: | |
154 | for f in $$(find ${WRKSRC}/third_party/libwebrtc -name moz.build -type f) ; \ | 151 | for f in $$(find ${WRKSRC}/third_party/libwebrtc -name moz.build -type f) ; \ | |
155 | do \ | 152 | do \ | |
156 | ${AWK} -f ${FILESDIR}/replace-moz.build.awk $$f > $$f.new; mv $$f.new $$f ; \ | 153 | ${AWK} -f ${FILESDIR}/replace-moz.build.awk $$f > $$f.new; mv $$f.new $$f ; \ | |
157 | done | 154 | done | |
158 | 155 | |||
159 | post-build: | 156 | post-build: | |
160 | ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ | 157 | ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ | |
161 | -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ | 158 | -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ | |
162 | -e 's|@FIREFOX_ICON@|${MOZILLA}|g' \ | 159 | -e 's|@FIREFOX_ICON@|${MOZILLA}|g' \ | |
163 | < ${FILESDIR}/desktop.in \ | 160 | < ${FILESDIR}/desktop.in \ | |
164 | > ${WRKDIR}/desktop | 161 | > ${WRKDIR}/desktop | |
165 | 162 | |||
166 | INSTALLATION_DIRS+= share/applications | 163 | INSTALLATION_DIRS+= share/applications | |
167 | 164 | |||
168 | post-install: | 165 | post-install: | |
169 | .if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native" | 166 | .if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native" | |
170 | ${INSTALL_SCRIPT} ${FILESDIR}/firefox.sh ${DESTDIR}${PREFIX}/bin/${MOZILLA} | 167 | ${INSTALL_SCRIPT} ${FILESDIR}/firefox.sh ${DESTDIR}${PREFIX}/bin/${MOZILLA} | |
171 | .else | 168 | .else | |
172 | ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA} | 169 | ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA} | |
173 | ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \ | 170 | ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \ | |
174 | ${DESTDIR}${PREFIX}/bin/${MOZILLA} | 171 | ${DESTDIR}${PREFIX}/bin/${MOZILLA} | |
175 | ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA} | 172 | ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA} | |
176 | .endif | 173 | .endif | |
177 | ${INSTALL_DATA} ${WRKDIR}/desktop \ | 174 | ${INSTALL_DATA} ${WRKDIR}/desktop \ | |
178 | ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop | 175 | ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop | |
179 | .for i in 16 22 24 32 48 64 128 256 | 176 | .for i in 16 22 24 32 48 64 128 256 | |
180 | ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps | 177 | ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps | |
181 | ${INSTALL_DATA} ${WRKSRC}/browser/branding/${MOZILLA_BRANDING}/default${i}.png \ | 178 | ${INSTALL_DATA} ${WRKSRC}/browser/branding/${MOZILLA_BRANDING}/default${i}.png \ | |
182 | ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${MOZILLA}.png | 179 | ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${MOZILLA}.png | |
183 | .endfor | 180 | .endfor | |
184 | 181 | |||
185 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | 182 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | |
186 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | 183 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | |
187 | .include "../../mk/bsd.pkg.mk" | 184 | .include "../../mk/bsd.pkg.mk" |
@@ -1,48 +1,48 @@ | @@ -1,48 +1,48 @@ | |||
1 | $NetBSD: distinfo,v 1.496 2023/04/28 18:56:22 maya Exp $ | 1 | $NetBSD: distinfo,v 1.497 2023/06/04 09:26:35 ryoon Exp $ | |
2 | 2 | |||
3 | BLAKE2s (firefox-112.0.1.source.tar.xz) = e0ea6615a9eb3b64e8888527ab2b17d1ea530bbd9f98aae36981dc8f51cc7aef | 3 | BLAKE2s (firefox-113.0.2.source.tar.xz) = b9ec55cc7b6cd65a375d70a5491a255e8b01b739c42fa541f61f05c0ab17b47f | |
4 | SHA512 (firefox-112.0.1.source.tar.xz) = 23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50 | 4 | SHA512 (firefox-113.0.2.source.tar.xz) = 7b1ff7d547fda02901f54a2593e03598a830698192003d833e27b85db0e00571ff66e03ebd4089e76fa65b09df000cbb2542450beeabb0b310875910603e6743 | |
5 | Size (firefox-112.0.1.source.tar.xz) = 506649248 bytes | 5 | Size (firefox-113.0.2.source.tar.xz) = 500503164 bytes | |
6 | BLAKE2s (nodejs-output-111.0.tgz) = 5e61c766822fdb7f5ef9e358de2ed00ba1c5074a2dad1e1d491772532f2bfe09 | 6 | BLAKE2s (nodejs-output-113.0.2.tgz) = da79ce7a5ab44378ac326caaa496dc5592bfb645b24b09f11c241933dc8ebb86 | |
7 | SHA512 (nodejs-output-111.0.tgz) = 79ff7d122c48453a10312918b315acbe8dff6695042311be1b4aaa69c59fb77c7c14affc4f24fe23d9a6707d4c4dccf90c063e0f3af7de5807cdc45df5d0829e | 7 | SHA512 (nodejs-output-113.0.2.tgz) = 83c7f21ec8bd1af66aa7ffa4d0ab442c41946f470918100ae50c7792182ed94afc588161a5142cdfbc71b85049beb3c660fce22444fca736a326810cfd8c1d4b | |
8 | Size (nodejs-output-111.0.tgz) = 208870 bytes | 8 | Size (nodejs-output-113.0.2.tgz) = 216297 bytes | |
9 | SHA1 (patch-Cargo.lock) = 36e15ec468dda2102469354276cb9e46b1a734ac | 9 | SHA1 (patch-Cargo.lock) = 6cedfbc82aa0af21e99e8b1035a9d17a28be3d62 | |
10 | SHA1 (patch-Cargo.toml) = e5478a9268b5891b42573b1954ff584877c75bc1 | 10 | SHA1 (patch-Cargo.toml) = e5478a9268b5891b42573b1954ff584877c75bc1 | |
11 | SHA1 (patch-browser_app_profile_firefox.js) = 18041d7fe211d61578863cfc53349278925f8e56 | 11 | SHA1 (patch-browser_app_profile_firefox.js) = 3b01cf7e37ea39bdd358fb14de5ce382b945ae39 | |
12 | SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678 | 12 | SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678 | |
13 | SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d1f15ff487efa9202114d19ed5668b4e7aa032a | 13 | SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d1f15ff487efa9202114d19ed5668b4e7aa032a | |
14 | SHA1 (patch-config_makefiles_rust.mk) = 188178b184d79737247ed3770cc8f4370cd7f6c0 | 14 | SHA1 (patch-config_makefiles_rust.mk) = 38c613cd87a9c3f868179caaab6e8a029eafd65f | |
15 | SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 | 15 | SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 | |
16 | SHA1 (patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp) = b93b4c6367bd2fb3d1868ab7d97ca56c100be414 | |||
16 | SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 | 17 | SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 | |
17 | SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = b2adce9e65662283a11b6dcff40e95523e940045 | 18 | SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = b2adce9e65662283a11b6dcff40e95523e940045 | |
18 | SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad | 19 | SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad | |
19 | SHA1 (patch-gfx_skia_skia_src_core_SkVM.cpp) = bf556ef959bcf0ef64420fc72ecdb6dbeed90b98 | 20 | SHA1 (patch-gfx_skia_skia_src_core_SkVM.cpp) = bf556ef959bcf0ef64420fc72ecdb6dbeed90b98 | |
20 | SHA1 (patch-gfx_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb | 21 | SHA1 (patch-gfx_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb | |
21 | SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 298642a3527804115b398fb7904a3596962932e3 | 22 | SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 298642a3527804115b398fb7904a3596962932e3 | |
22 | SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658 | 23 | SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658 | |
23 | SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 6cdd0fe60455eab8f9846257c2bfea207f19478b | 24 | SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 6cdd0fe60455eab8f9846257c2bfea207f19478b | |
24 | SHA1 (patch-js_src_jit_FlushICache.cpp) = b7536050d06e87612fbedc7ce269b5f120eb0ce9 | 25 | SHA1 (patch-js_src_jit_FlushICache.cpp) = b7536050d06e87612fbedc7ce269b5f120eb0ce9 | |
25 | SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = 1e25924a29e3700b0e0e5d143f1db35029b431fb | 26 | SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = 1e25924a29e3700b0e0e5d143f1db35029b431fb | |
26 | SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba | 27 | SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba | |
27 | SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 374ffc0ce12e1c5babf2e553aba96612b0a30b1e | 28 | SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 374ffc0ce12e1c5babf2e553aba96612b0a30b1e | |
28 | SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a | 29 | SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a | |
29 | SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc | 30 | SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc | |
30 | SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f | 31 | SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f | |
31 | SHA1 (patch-modules_fdlibm_src_math__private.h) = e20b6c23011d7123cbbd64a500eb8ce8c426620e | 32 | SHA1 (patch-modules_fdlibm_src_math__private.h) = e20b6c23011d7123cbbd64a500eb8ce8c426620e | |
32 | SHA1 (patch-mozglue_misc_Uptime.cpp) = daefe25ef1ebc8e4d3735017b9e8ac68c4710a00 | |||
33 | SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = b0d1f6a6e0eb852b0fd0238ad3f8ed3166c60a50 | 33 | SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = b0d1f6a6e0eb852b0fd0238ad3f8ed3166c60a50 | |
34 | SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4 | 34 | SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4 | |
35 | SHA1 (patch-third-party_rust_authenticator_src_transport_netbsd_device.rs) = cb914efb0bd1b9a46dde1661230c7e09e49fc9e0 | |||
36 | SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4 | 35 | SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4 | |
37 | SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 455be625b5de2f6f1f4b2dbb6c8cb33ca16c2583 | 36 | SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 455be625b5de2f6f1f4b2dbb6c8cb33ca16c2583 | |
38 | SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc) = 8848fb05c1e8b45234f74db71602a8a84c0404a4 | 37 | SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc) = 8848fb05c1e8b45234f74db71602a8a84c0404a4 | |
39 | SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_video__capture__v4l2.cc) = 8111952a107eb2cd665525ddd0e27c79eee3c1cd | 38 | SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_video__capture__v4l2.cc) = 8111952a107eb2cd665525ddd0e27c79eee3c1cd | |
40 | SHA1 (patch-third__party_libwebrtc_system__wrappers_source_cpu__features__linux.cc) = b90e22b50879f7adcc1da3a993f52c0701b720f8 | 39 | SHA1 (patch-third__party_libwebrtc_system__wrappers_source_cpu__features__linux.cc) = b90e22b50879f7adcc1da3a993f52c0701b720f8 | |
41 | SHA1 (patch-third__party_wasm2c_wasm2c_wasm-rt-os-unix.c) = e63607bcad6c25b11f58b0523ed5dfacddf9c36e | 40 | SHA1 (patch-third__party_wasm2c_wasm2c_wasm-rt-os-unix.c) = e63607bcad6c25b11f58b0523ed5dfacddf9c36e | |
42 | SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e905e38ef1b88d764c695c019f15609350c1c43b | 41 | SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e905e38ef1b88d764c695c019f15609350c1c43b | |
43 | SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 2303b753066298305ccae80d72765dbc4da5e0dc | 42 | SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 2303b753066298305ccae80d72765dbc4da5e0dc | |
44 | SHA1 (patch-toolkit_moz.configure) = c183f8b1566ffed0df17bf856f693b3a288affeb | 43 | SHA1 (patch-toolkit_moz.configure) = c183f8b1566ffed0df17bf856f693b3a288affeb | |
45 | SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662 | 44 | SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662 | |
45 | SHA1 (patch-toolkit_xre_glxtest.cpp) = 8a6cf6976615130dcbf8c63d9c7d79cd47351894 | |||
46 | SHA1 (patch-widget_gtk_DMABufSurface.cpp) = b07836c49c0c9c85e7923d3297ad674453165522 | 46 | SHA1 (patch-widget_gtk_DMABufSurface.cpp) = b07836c49c0c9c85e7923d3297ad674453165522 | |
47 | SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec | 47 | SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec | |
48 | SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 81d43a046fcef6bf6717d52485686ba8e8738254 | 48 | SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 81d43a046fcef6bf6717d52485686ba8e8738254 |
@@ -1,233 +1,247 @@ | @@ -1,233 +1,247 @@ | |||
1 | # $NetBSD: mozilla-common.mk,v 1.252 2023/06/02 18:47:20 wiz Exp $ | 1 | # $NetBSD: mozilla-common.mk,v 1.253 2023/06/04 09:26:35 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 | |||
9 | PYTHON_VERSIONS_INCOMPATIBLE= 27 | 9 | PYTHON_VERSIONS_INCOMPATIBLE= 27 | |
10 | PYTHON_FOR_BUILD_ONLY= tool | 10 | PYTHON_FOR_BUILD_ONLY= tool | |
11 | ALL_ENV+= PYTHON3=${PYTHONBIN} | 11 | ALL_ENV+= PYTHON3=${PYTHONBIN} | |
12 | 12 | |||
13 | REPLACE_PYTHON= build/cargo-linker | 13 | REPLACE_PYTHON= build/cargo-linker | |
14 | 14 | |||
15 | HAS_CONFIGURE= yes | 15 | HAS_CONFIGURE= yes | |
16 | CONFIGURE_ARGS+= --prefix=${PREFIX} | 16 | CONFIGURE_ARGS+= --prefix=${PREFIX} | |
17 | USE_TOOLS+= pkg-config perl gmake gm4 unzip zip # autoconf213 | 17 | USE_TOOLS+= pkg-config perl gmake gm4 unzip zip # autoconf213 | |
18 | UNLIMIT_RESOURCES+= datasize virtualsize | 18 | UNLIMIT_RESOURCES+= datasize virtualsize | |
19 | 19 | |||
20 | USE_LANGUAGES+= c c++ | 20 | USE_LANGUAGES+= c c++ | |
21 | 21 | |||
22 | # ERROR: Only GCC 7.1 or newer is supported (found version 5.5.0). | 22 | # ERROR: Only GCC 7.1 or newer is supported (found version 5.5.0). | |
23 | GCC_REQD+= 7 | 23 | GCC_REQD+= 7 | |
24 | 24 | |||
25 | TOOL_DEPENDS+= cbindgen>=0.24.3:../../devel/cbindgen | 25 | TOOL_DEPENDS+= cbindgen>=0.24.3:../../devel/cbindgen | |
26 | 26 | |||
27 | .if defined(FIREFOX_MAINTAINER) && !defined(MAINTAINER_INTERNAL) | 27 | .if defined(FIREFOX_MAINTAINER) && !defined(MAINTAINER_INTERNAL) | |
28 | TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs | 28 | TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs | |
29 | USE_TOOLS+= diff | 29 | USE_TOOLS+= diff | |
30 | .else | 30 | .else | |
31 | CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh" | 31 | CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh" | |
32 | .endif | 32 | .endif | |
33 | 33 | |||
34 | BUILD_DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses | 34 | BUILD_DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses | |
35 | TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 | 35 | TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 | |
36 | TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat | 36 | TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat | |
37 | 37 | |||
38 | .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" | 38 | .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" | |
39 | TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm | 39 | TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm | |
40 | TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm | 40 | TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm | |
41 | CFLAGS+= -msse2 | 41 | CFLAGS+= -msse2 | |
42 | .endif | 42 | .endif | |
43 | 43 | |||
44 | # This is to work around build failures where an upstream configuration script | 44 | # This is to work around build failures where an upstream configuration script | |
45 | # is confused by having more than one approximate match to MACHINE_GNU_PLATFORM | 45 | # is confused by having more than one approximate match to MACHINE_GNU_PLATFORM | |
46 | # "i486" when attempting to select the Rust compiler target. | 46 | # "i486" when attempting to select the Rust compiler target. | |
47 | .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) | 47 | .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) | |
48 | CONFIGURE_ARGS+= --target=i586-unknown-netbsd | 48 | CONFIGURE_ARGS+= --target=i586-unknown-netbsd | |
49 | CONFIGURE_ARGS+= --host=i586-unknown-netbsd | 49 | CONFIGURE_ARGS+= --host=i586-unknown-netbsd | |
50 | .else | 50 | .else | |
51 | CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM} | 51 | CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM} | |
52 | CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} | 52 | CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} | |
53 | .endif | 53 | .endif | |
54 | 54 | |||
55 | CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \ | 55 | CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \ | |
56 | -isystem${X11BASE}/include/pixman-1" | 56 | -isystem${X11BASE}/include/pixman-1" | |
57 | 57 | |||
58 | do-test: | 58 | do-test: | |
59 | cd ${WRKSRC}/${OBJDIR}/dist/bin && \ | 59 | cd ${WRKSRC}/${OBJDIR}/dist/bin && \ | |
60 | ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey | 60 | ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey | |
61 | 61 | |||
62 | # tar(1) of OpenBSD 5.5 has no --exclude command line option. | 62 | # tar(1) of OpenBSD 5.5 has no --exclude command line option. | |
63 | .if ${OPSYS} == "OpenBSD" | 63 | .if ${OPSYS} == "OpenBSD" | |
64 | TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} | 64 | TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} | |
65 | USE_TOOLS+= bsdtar | 65 | USE_TOOLS+= bsdtar | |
66 | .else | 66 | .else | |
67 | USE_TOOLS+= tar | 67 | USE_TOOLS+= tar | |
68 | .endif | 68 | .endif | |
69 | 69 | |||
70 | .if ${MACHINE_ARCH} == "i386" | 70 | .if ${MACHINE_ARCH} == "i386" | |
71 | # This is required for SSE2 code under i386. | 71 | # This is required for SSE2 code under i386. | |
72 | CXXFLAGS+= -mstackrealign | 72 | CXXFLAGS+= -mstackrealign | |
73 | .endif | 73 | .endif | |
74 | 74 | |||
75 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/*/*.sh | 75 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/*/*.sh | |
76 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh | 76 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh | |
77 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure | 77 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure | |
78 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh | 78 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh | |
79 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh | 79 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh | |
80 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}third_party/libwebrtc/tools_webrtc/iwyu/apply-iwyu | 80 | CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}third_party/libwebrtc/tools_webrtc/iwyu/apply-iwyu | |
81 | 81 | |||
82 | CONFIGURE_ARGS+= --enable-release | 82 | CONFIGURE_ARGS+= --enable-release | |
83 | # Disable Rust SIMD option to fix build with lang/rust-1.33.0 | 83 | # Disable Rust SIMD option to fix build with lang/rust-1.33.0 | |
84 | # This should be enabled later again. | 84 | # This should be enabled later again. | |
85 | #CONFIGURE_ARGS+= --enable-rust-simd | 85 | #CONFIGURE_ARGS+= --enable-rust-simd | |
86 | CONFIGURE_ARGS+= --disable-tests | 86 | CONFIGURE_ARGS+= --disable-tests | |
87 | # Mozilla Bug 1432751 | 87 | # Mozilla Bug 1432751 | |
88 | #CONFIGURE_ARGS+= --enable-system-cairo | 88 | #CONFIGURE_ARGS+= --enable-system-cairo | |
89 | CONFIGURE_ARGS+= --enable-system-pixman | 89 | CONFIGURE_ARGS+= --enable-system-pixman | |
90 | # webrtc option requires internal libvpx | 90 | # webrtc option requires internal libvpx | |
91 | #CONFIGURE_ARGS+= --with-system-libvpx | 91 | #CONFIGURE_ARGS+= --with-system-libvpx | |
92 | CONFIGURE_ARGS+= --enable-system-ffi | 92 | CONFIGURE_ARGS+= --enable-system-ffi | |
93 | CONFIGURE_ARGS+= --with-system-icu | 93 | CONFIGURE_ARGS+= --with-system-icu | |
94 | CONFIGURE_ARGS+= --with-system-nss | 94 | CONFIGURE_ARGS+= --with-system-nss | |
95 | CONFIGURE_ARGS+= --with-system-nspr | 95 | CONFIGURE_ARGS+= --with-system-nspr | |
96 | #CONFIGURE_ARGS+= --with-system-jpeg | 96 | #CONFIGURE_ARGS+= --with-system-jpeg | |
97 | CONFIGURE_ARGS+= --with-system-zlib | 97 | CONFIGURE_ARGS+= --with-system-zlib | |
98 | CONFIGURE_ARGS+= --with-system-libevent | 98 | CONFIGURE_ARGS+= --with-system-libevent | |
99 | CONFIGURE_ARGS+= --disable-crashreporter | 99 | CONFIGURE_ARGS+= --disable-crashreporter | |
100 | CONFIGURE_ARGS+= --enable-chrome-format=omni | 100 | CONFIGURE_ARGS+= --enable-chrome-format=omni | |
101 | CONFIGURE_ARGS+= --with-system-webp | 101 | CONFIGURE_ARGS+= --with-system-webp | |
102 | 102 | |||
103 | #CONFIGURE_ARGS+= --enable-readline | 103 | #CONFIGURE_ARGS+= --enable-readline | |
104 | CONFIGURE_ARGS+= --disable-icf | 104 | CONFIGURE_ARGS+= --disable-icf | |
105 | CONFIGURE_ARGS+= --disable-updater | 105 | CONFIGURE_ARGS+= --disable-updater | |
106 | 106 | |||
107 | .include "../../mk/compiler.mk" | 107 | .include "../../mk/compiler.mk" | |
108 | 108 | |||
109 | .if empty(PKGSRC_COMPILER:Mclang) | 109 | .if empty(PKGSRC_COMPILER:Mclang) | |
110 | # Set path to "clang for cbindgen" when target compiler is not clang. | 110 | # Set path to "clang for cbindgen" when target compiler is not clang. | |
111 | CONFIGURE_ARGS+= --with-clang-path=${PREFIX}/bin/clang | 111 | CONFIGURE_ARGS+= --with-clang-path=${PREFIX}/bin/clang | |
112 | .endif | 112 | .endif | |
113 | CONFIGURE_ARGS+= --with-libclang-path=${PREFIX}/lib | 113 | CONFIGURE_ARGS+= --with-libclang-path=${PREFIX}/lib | |
114 | 114 | |||
115 | # RLBox WASM sandbox | 115 | # RLBox WASM sandbox | |
116 | .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" | 116 | .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" | |
117 | # For wasm-ld command | 117 | # For wasm-ld command | |
118 | BUILD_DEPENDS+= lld-[0-9]*:../../devel/lld | 118 | BUILD_DEPENDS+= lld-[0-9]*:../../devel/lld | |
119 | .include "../../lang/wasi-libc/buildlink3.mk" | 119 | .include "../../lang/wasi-libc/buildlink3.mk" | |
120 | .include "../../lang/wasi-libcxx/buildlink3.mk" | 120 | .include "../../lang/wasi-libcxx/buildlink3.mk" | |
121 | # NB the exact versions of the clang and wasi-compiler-rt dependencies must | 121 | # NB the exact versions of the clang and wasi-compiler-rt dependencies must | |
122 | # be kept in sync, or build failures will occur due to path mismatches. | 122 | # be kept in sync, or build failures will occur due to path mismatches. | |
123 | .include "../../lang/wasi-compiler-rt/buildlink3.mk" | 123 | .include "../../lang/wasi-compiler-rt/buildlink3.mk" | |
124 | CONFIGURE_ARGS+= --with-wasi-sysroot=${PREFIX}/wasi | 124 | CONFIGURE_ARGS+= --with-wasi-sysroot=${PREFIX}/wasi | |
125 | CONFIGURE_ENV+= WASM_CC=${PREFIX}/bin/clang | 125 | CONFIGURE_ENV+= WASM_CC=${PREFIX}/bin/clang | |
126 | CONFIGURE_ENV+= WASM_CXX=${PREFIX}/bin/clang++ | 126 | CONFIGURE_ENV+= WASM_CXX=${PREFIX}/bin/clang++ | |
127 | .else | 127 | .else | |
128 | CONFIGURE_ARGS+= --without-wasm-sandboxed-libraries | 128 | CONFIGURE_ARGS+= --without-wasm-sandboxed-libraries | |
129 | .endif | 129 | .endif | |
130 | 130 | |||
131 | .include "../../sysutils/pciutils/libname.mk" | 131 | .include "../../sysutils/pciutils/libname.mk" | |
132 | SUBST_CLASSES+= fix-libpci-soname | 132 | SUBST_CLASSES+= fix-libpci-soname | |
133 | SUBST_STAGE.fix-libpci-soname= pre-configure | 133 | SUBST_STAGE.fix-libpci-soname= pre-configure | |
134 | SUBST_MESSAGE.fix-libpci-soname= Fixing libpci soname | 134 | SUBST_MESSAGE.fix-libpci-soname= Fixing libpci soname | |
135 | SUBST_FILES.fix-libpci-soname+= ${MOZILLA_DIR}toolkit/xre/glxtest.cpp | 135 | SUBST_FILES.fix-libpci-soname+= ${MOZILLA_DIR}toolkit/xre/glxtest.cpp | |
136 | SUBST_SED.fix-libpci-soname+= -e 's,"libpci.so, "lib${PCIUTILS_LIBNAME}.so,' | 136 | SUBST_SED.fix-libpci-soname+= -e 's,"libpci.so, "lib${PCIUTILS_LIBNAME}.so,' | |
137 | 137 | |||
138 | # Do not pass '-j1 -j1' for MAKE_JOBS=1 for NetBSD 9.3 or rearlier. | |||
139 | .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090400 | |||
140 | RUST_MAKE_JOBS= # empty by default | |||
141 | . if ${MAKE_JOBS} > 1 | |||
142 | RUST_MAKE_JOBS= -j1 # for MAKE_JOBS=1, RUST_MAKE_JOBS should be empty. | |||
143 | . endif | |||
144 | .endif | |||
145 | ||||
146 | SUBST_CLASSES+= njobs | |||
147 | SUBST_STAGE.njobs= pre-configure | |||
148 | SUBST_MESSAGE.njobs= Setting MAKE_JOBS for cairo | |||
149 | SUBST_FILES.njobs+= ${MOZILLA_DIR}config/makefiles/rust.mk | |||
150 | SUBST_VARS.njobs+= RUST_MAKE_JOBS | |||
151 | ||||
138 | # Workaround for link of libxul.so as of 96.0. | 152 | # Workaround for link of libxul.so as of 96.0. | |
139 | # There are too many -ldl under third_paty/libwebrtc. | 153 | # There are too many -ldl under third_paty/libwebrtc. | |
140 | .include "../../mk/dlopen.buildlink3.mk" | 154 | .include "../../mk/dlopen.buildlink3.mk" | |
141 | BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} | 155 | BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} | |
142 | 156 | |||
143 | CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess | 157 | CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess | |
144 | CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess | 158 | CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess | |
145 | CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess | 159 | CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess | |
146 | CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess | 160 | CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess | |
147 | CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub | 161 | CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub | |
148 | CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub | 162 | CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub | |
149 | CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub | 163 | CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub | |
150 | CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub | 164 | CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub | |
151 | 165 | |||
152 | CONFIGURE_ENV+= CPP=${CPP:Q} | 166 | CONFIGURE_ENV+= CPP=${CPP:Q} | |
153 | ALL_ENV+= SHELL=${CONFIG_SHELL:Q} | 167 | ALL_ENV+= SHELL=${CONFIG_SHELL:Q} | |
154 | 168 | |||
155 | # Build outside ${WRKSRC} | 169 | # Build outside ${WRKSRC} | |
156 | # Try to avoid conflict with config/makefiles/xpidl/Makefile.in | 170 | # Try to avoid conflict with config/makefiles/xpidl/Makefile.in | |
157 | .if ${MAINTAINER_INTERNAL:Uno} == "yes" | 171 | .if ${MAINTAINER_INTERNAL:Uno} == "yes" | |
158 | OBJDIR= ../no-node-build | 172 | OBJDIR= ../no-node-build | |
159 | .else | 173 | .else | |
160 | OBJDIR= ../build | 174 | OBJDIR= ../build | |
161 | .endif | 175 | .endif | |
162 | CONFIGURE_DIRS= ${OBJDIR} | 176 | CONFIGURE_DIRS= ${OBJDIR} | |
163 | CONFIGURE_SCRIPT= ${WRKSRC}/configure | 177 | CONFIGURE_SCRIPT= ${WRKSRC}/configure | |
164 | 178 | |||
165 | PLIST_VARS+= ffvpx | 179 | PLIST_VARS+= ffvpx | |
166 | 180 | |||
167 | .if ${MACHINE_ARCH} == "aarch64" || \ | 181 | .if ${MACHINE_ARCH} == "aarch64" || \ | |
168 | ${MACHINE_ARCH:M*arm*} || \ | 182 | ${MACHINE_ARCH:M*arm*} || \ | |
169 | ${MACHINE_ARCH} == "i386" || \ | 183 | ${MACHINE_ARCH} == "i386" || \ | |
170 | ${MACHINE_ARCH} == "x86_64" | 184 | ${MACHINE_ARCH} == "x86_64" | |
171 | PLIST.ffvpx= yes # see media/ffvpx/ffvpxcommon.mozbuild | 185 | PLIST.ffvpx= yes # see media/ffvpx/ffvpxcommon.mozbuild | |
172 | .endif | 186 | .endif | |
173 | 187 | |||
174 | # See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing | 188 | # See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing | |
175 | # support is only available when the toolkit is cairo-cocoa. | 189 | # support is only available when the toolkit is cairo-cocoa. | |
176 | CONFIGURE_ARGS.Darwin+= --disable-sandbox | 190 | CONFIGURE_ARGS.Darwin+= --disable-sandbox | |
177 | 191 | |||
178 | # Makefiles sometimes call "rm -f" without more arguments. Kludge around ... | 192 | # Makefiles sometimes call "rm -f" without more arguments. Kludge around ... | |
179 | .PHONY: create-rm-wrapper | 193 | .PHONY: create-rm-wrapper | |
180 | pre-configure: create-rm-wrapper | 194 | pre-configure: create-rm-wrapper | |
181 | create-rm-wrapper: | 195 | create-rm-wrapper: | |
182 | printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \ | 196 | printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \ | |
183 | ${WRAPPER_DIR}/bin/rm | 197 | ${WRAPPER_DIR}/bin/rm | |
184 | chmod +x ${WRAPPER_DIR}/bin/rm | 198 | chmod +x ${WRAPPER_DIR}/bin/rm | |
185 | 199 | |||
186 | # The configure test for __thread succeeds, but later we end up with: | 200 | # The configure test for __thread succeeds, but later we end up with: | |
187 | # dist/bin/libxul.so: undefined reference to `__tls_get_addr' | 201 | # dist/bin/libxul.so: undefined reference to `__tls_get_addr' | |
188 | CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no | 202 | CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no | |
189 | # In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. | 203 | # In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. | |
190 | CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= | 204 | CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= | |
191 | 205 | |||
192 | .include "../../sysutils/pciutils/buildlink3.mk" | 206 | .include "../../sysutils/pciutils/buildlink3.mk" | |
193 | .include "../../mk/atomic64.mk" | 207 | .include "../../mk/atomic64.mk" | |
194 | BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 | 208 | BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 | |
195 | .include "../../devel/libevent/buildlink3.mk" | 209 | .include "../../devel/libevent/buildlink3.mk" | |
196 | .include "../../devel/libffi/buildlink3.mk" | 210 | .include "../../devel/libffi/buildlink3.mk" | |
197 | BUILDLINK_API_DEPENDS.nspr+= nspr>=4.34 | 211 | BUILDLINK_API_DEPENDS.nspr+= nspr>=4.34 | |
198 | .include "../../devel/nspr/buildlink3.mk" | 212 | .include "../../devel/nspr/buildlink3.mk" | |
199 | .include "../../textproc/icu/buildlink3.mk" | 213 | .include "../../textproc/icu/buildlink3.mk" | |
200 | BUILDLINK_API_DEPENDS.nss+= nss>=3.89 | 214 | BUILDLINK_API_DEPENDS.nss+= nss>=3.89 | |
201 | .include "../../devel/nss/buildlink3.mk" | 215 | .include "../../devel/nss/buildlink3.mk" | |
202 | .include "../../devel/zlib/buildlink3.mk" | 216 | .include "../../devel/zlib/buildlink3.mk" | |
203 | #.include "../../mk/jpeg.buildlink3.mk" | 217 | #.include "../../mk/jpeg.buildlink3.mk" | |
204 | .include "../../graphics/MesaLib/buildlink3.mk" | 218 | .include "../../graphics/MesaLib/buildlink3.mk" | |
205 | #BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 | 219 | #BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 | |
206 | #.include "../../graphics/cairo/buildlink3.mk" | 220 | #.include "../../graphics/cairo/buildlink3.mk" | |
207 | BUILDLINK_API_DEPENDS.libwebp+= libwebp>=1.0.2 | 221 | BUILDLINK_API_DEPENDS.libwebp+= libwebp>=1.0.2 | |
208 | .include "../../graphics/libwebp/buildlink3.mk" | 222 | .include "../../graphics/libwebp/buildlink3.mk" | |
209 | BUILDLINK_DEPMETHOD.clang= build | 223 | BUILDLINK_DEPMETHOD.clang= build | |
210 | .include "../../lang/clang/buildlink3.mk" | 224 | .include "../../lang/clang/buildlink3.mk" | |
211 | RUST_REQ= 1.65.0 | 225 | RUST_REQ= 1.65.0 | |
212 | .include "../../lang/rust/rust.mk" | 226 | .include "../../lang/rust/rust.mk" | |
213 | # webrtc option requires internal libvpx | 227 | # webrtc option requires internal libvpx | |
214 | #BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 | 228 | #BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 | |
215 | #.include "../../multimedia/libvpx/buildlink3.mk" | 229 | #.include "../../multimedia/libvpx/buildlink3.mk" | |
216 | .include "../../net/libIDL/buildlink3.mk" | 230 | .include "../../net/libIDL/buildlink3.mk" | |
217 | # TODO: check again, pkgsrc has hunspell 1.7 | 231 | # TODO: check again, pkgsrc has hunspell 1.7 | |
218 | # was: textproc/hunspell 1.3 is too old | 232 | # was: textproc/hunspell 1.3 is too old | |
219 | #.include "../../textproc/hunspell/buildlink3.mk" | 233 | #.include "../../textproc/hunspell/buildlink3.mk" | |
220 | .include "../../multimedia/ffmpeg6/buildlink3.mk" | 234 | .include "../../multimedia/ffmpeg6/buildlink3.mk" | |
221 | .include "../../x11/libXt/buildlink3.mk" | 235 | .include "../../x11/libXt/buildlink3.mk" | |
222 | .include "../../x11/libXtst/buildlink3.mk" | 236 | .include "../../x11/libXtst/buildlink3.mk" | |
223 | BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 | 237 | BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 | |
224 | .include "../../x11/pixman/buildlink3.mk" | 238 | .include "../../x11/pixman/buildlink3.mk" | |
225 | .include "../../x11/gtk3/buildlink3.mk" | 239 | .include "../../x11/gtk3/buildlink3.mk" | |
226 | PLIST_VARS+= wayland | 240 | PLIST_VARS+= wayland | |
227 | .if ${PKG_BUILD_OPTIONS.gtk3:Mwayland} | 241 | .if ${PKG_BUILD_OPTIONS.gtk3:Mwayland} | |
228 | CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3-x11-wayland | 242 | CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3-x11-wayland | |
229 | PLIST.wayland= yes | 243 | PLIST.wayland= yes | |
230 | .else | 244 | .else | |
231 | CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 | 245 | CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 | |
232 | .endif | 246 | .endif | |
233 | .include "../../lang/python/application.mk" | 247 | .include "../../lang/python/application.mk" |
@@ -1,9 +1,9 @@ | @@ -1,9 +1,9 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh | |
2 | 2 | |||
3 | VERS=v19.7.0 | 3 | VERS=v20.2.0 | |
4 | 4 | |||
5 | if [ "$1" = "-v" ] || [ "$1" = "--version" ]; then | 5 | if [ "$1" = "-v" ] || [ "$1" = "--version" ]; then | |
6 | printf "${VERS}\n" | 6 | printf "${VERS}\n" | |
7 | fi | 7 | fi | |
8 | 8 | |||
9 | exit 0 | 9 | exit 0 |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: patch-Cargo.lock,v 1.1 2023/04/28 18:56:22 maya Exp $ | 1 | $NetBSD: patch-Cargo.lock,v 1.2 2023/06/04 09:26:35 ryoon Exp $ | |
2 | 2 | |||
3 | Enable patching authenticator-rs | 3 | Enable patching authenticator-rs | |
4 | 4 | |||
5 | --- Cargo.lock.orig 2023-04-14 16:27:56.000000000 +0000 | 5 | --- Cargo.lock.orig 2023-04-27 21:16:08.000000000 +0000 | |
6 | +++ Cargo.lock | 6 | +++ Cargo.lock | |
7 | @@ -380,8 +380,6 @@ dependencies = [ | 7 | @@ -321,8 +321,6 @@ dependencies = [ | |
8 | [[package]] | 8 | [[package]] | |
9 | name = "authenticator" | 9 | name = "authenticator" | |
10 | version = "0.4.0-alpha.10" | 10 | version = "0.4.0-alpha.11" | |
11 | -source = "registry+https://github.com/rust-lang/crates.io-index" | 11 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
12 | -checksum = "2238116278e3a069a5148ce1efaa73d750a0d7341e011235a0ddb3e7079cb1be" | 12 | -checksum = "e73e25e6ae754b553f930c48af8f0e5ca71e641c419151e95bafd5644ff6e21b" | |
13 | dependencies = [ | 13 | dependencies = [ | |
14 | "base64", | 14 | "base64", | |
15 | "bitflags", | 15 | "bitflags 1.3.2", |
@@ -1,48 +1,51 @@ | @@ -1,48 +1,51 @@ | |||
1 | $NetBSD: patch-browser_app_profile_firefox.js,v 1.18 2023/01/07 23:36:39 ryoon Exp $ | 1 | $NetBSD: patch-browser_app_profile_firefox.js,v 1.19 2023/06/04 09:26:35 ryoon Exp $ | |
2 | 2 | |||
3 | This patch modifies default Firefox settings - see the comments above | 3 | This patch modifies default Firefox settings - see the comments above | |
4 | each one. | 4 | each one. | |
5 | 5 | |||
6 | --- browser/app/profile/firefox.js.orig 2022-12-15 22:31:34.000000000 +0000 | 6 | --- browser/app/profile/firefox.js.orig 2023-05-22 16:53:55.000000000 +0000 | |
7 | +++ browser/app/profile/firefox.js | 7 | +++ browser/app/profile/firefox.js | |
8 | @@ -2099,7 +2099,11 @@ pref("reader.pocket.ctaVersion", ""); | 8 | @@ -2120,7 +2120,11 @@ pref("reader.pocket.ctaVersion", ""); | |
9 | 9 | |||
10 | pref("view_source.tab", true); | 10 | pref("view_source.tab", true); | |
11 | 11 | |||
12 | -pref("dom.serviceWorkers.enabled", true); | 12 | -pref("dom.serviceWorkers.enabled", true); | |
13 | +// On NetBSD, many web applications (e.g. Telegram, Mastodon, Twitter) | 13 | +// On NetBSD, many web applications (e.g. Telegram, Mastodon, Twitter) | |
14 | +// will freeze until the service worker is restarted in about:serviceworkers. | 14 | +// will freeze until the service worker is restarted in about:serviceworkers. | |
15 | +// This is a workaround that makes most of these sites function. | 15 | +// This is a workaround that makes most of these sites function. | |
16 | +// The root cause of this should be investigated. | 16 | +// The root cause of this should be investigated. | |
17 | +pref("dom.serviceWorkers.enabled", false); | 17 | +pref("dom.serviceWorkers.enabled", false); | |
18 | 18 | |||
19 | // Enable Push API. | 19 | // Enable Push API. | |
20 | pref("dom.push.enabled", true); | 20 | pref("dom.push.enabled", true); | |
21 | @@ -2279,6 +2283,27 @@ pref("app.normandy.onsync_skew_sec", 600 | 21 | @@ -2329,6 +2333,30 @@ pref("app.normandy.onsync_skew_sec", 600 | |
22 | pref("toolkit.coverage.enabled", false); | 22 | pref("toolkit.coverage.enabled", false); | |
23 | pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org"); | 23 | pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org"); | |
24 | 24 | |||
25 | +// Select UI locale from LANG/LC_MESSAGE environmental variables | 25 | +// Select UI locale from LANG/LC_MESSAGE environmental variables | |
26 | +pref("intl.locale.requested", ""); | 26 | +pref("intl.locale.requested", ""); | |
27 | + | 27 | + | |
28 | +// Enable system addons, for example langpacks from www/firefox-l10n | 28 | +// Enable system addons, for example langpacks from www/firefox-l10n | |
29 | +pref("extensions.autoDisableScopes", 11); | 29 | +pref("extensions.autoDisableScopes", 11); | |
30 | + | 30 | + | |
31 | +// Firefox includes a complex mechanism for "blacklisting" GPUs that | 31 | +// Firefox includes a complex mechanism for "blacklisting" GPUs that | |
32 | +// appears to fail on a NetBSD system where the only available OpenGL | 32 | +// appears to fail on a NetBSD system where the only available OpenGL | |
33 | +// implementations are all from Mesa. WebRender was supposed to be | 33 | +// implementations are all from Mesa. WebRender was supposed to be | |
34 | +// enabled by default from Firefox 91 onwards and appears to greatly | 34 | +// enabled by default from Firefox 91 onwards and appears to greatly | |
35 | +// improve performance even with acceleration disabled at the kernel | 35 | +// improve performance even with acceleration disabled at the kernel | |
36 | +// level. | 36 | +// level. | |
37 | +pref("gfx.webrender.all", true); | 37 | +pref("gfx.webrender.all", true); | |
38 | + | 38 | + | |
39 | +// Disable Web MIDI support | 39 | +// Disable Web MIDI support | |
40 | +// NetBSD gets immediate SIGSEGV when Web MIDI is enabled. | 40 | +// NetBSD gets immediate SIGSEGV when Web MIDI is enabled. | |
41 | +pref("midi.testing", true); | 41 | +pref("midi.testing", true); | |
42 | +pref("dom.webmidi.enabled", true); | 42 | +pref("dom.webmidi.enabled", true); | |
43 | +pref("midi.prompt.testing", true); | 43 | +pref("midi.prompt.testing", true); | |
44 | +pref("media.navigator.permission.disabled", true); | 44 | +pref("media.navigator.permission.disabled", true); | |
45 | + | 45 | + | |
46 | +// DIsable WebGL for NetBSD systems | |||
47 | +pref("webgl.disabled", true); | |||
48 | + | |||
46 | // Discovery prefs | 49 | // Discovery prefs | |
47 | pref("browser.discovery.enabled", true); | 50 | pref("browser.discovery.enabled", true); | |
48 | pref("browser.discovery.containers.enabled", true); | 51 | pref("browser.discovery.containers.enabled", true); |
@@ -1,30 +1,30 @@ | @@ -1,30 +1,30 @@ | |||
1 | $NetBSD: patch-config_makefiles_rust.mk,v 1.10 2022/06/14 16:44:29 ryoon Exp $ | 1 | $NetBSD: patch-config_makefiles_rust.mk,v 1.11 2023/06/04 09:26:35 ryoon Exp $ | |
2 | 2 | |||
3 | NetBSD doesn't get along with parallel rust builds (it causes issues | 3 | NetBSD doesn't get along with parallel rust builds (it causes issues | |
4 | with ld.so) which are the default. Force -j1. | 4 | with ld.so) which are the default. Force -j1. | |
5 | 5 | |||
6 | Use less memory to fix build under NetBSD/i386. | 6 | Use less memory to fix build under NetBSD/i386. | |
7 | From: https://bugzilla.mozilla.org/show_bug.cgi?id=1644409 | 7 | From: https://bugzilla.mozilla.org/show_bug.cgi?id=1644409 | |
8 | 8 | |||
9 | --- config/makefiles/rust.mk.orig 2022-06-08 14:10:19.000000000 +0000 | 9 | --- config/makefiles/rust.mk.orig 2022-06-08 14:10:19.000000000 +0000 | |
10 | +++ config/makefiles/rust.mk | 10 | +++ config/makefiles/rust.mk | |
11 | @@ -58,6 +58,9 @@ ifdef MOZ_TSAN | 11 | @@ -58,6 +58,9 @@ ifdef MOZ_TSAN | |
12 | cargo_build_flags += -Zbuild-std=std,panic_abort | 12 | cargo_build_flags += -Zbuild-std=std,panic_abort | |
13 | RUSTFLAGS += -Zsanitizer=thread | 13 | RUSTFLAGS += -Zsanitizer=thread | |
14 | endif | 14 | endif | |
15 | +ifeq ($(OS_ARCH),NetBSD) | 15 | +ifeq ($(OS_ARCH),NetBSD) | |
16 | +cargo_build_flags += -j1 | 16 | +cargo_build_flags += @RUST_MAKE_JOBS@ | |
17 | +endif | 17 | +endif | |
18 | 18 | |||
19 | rustflags_sancov = | 19 | rustflags_sancov = | |
20 | ifdef LIBFUZZER | 20 | ifdef LIBFUZZER | |
21 | @@ -90,7 +93,8 @@ ifndef rustflags_sancov | 21 | @@ -90,7 +93,8 @@ ifndef rustflags_sancov | |
22 | # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. | 22 | # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. | |
23 | ifndef MOZ_CODE_COVERAGE | 23 | ifndef MOZ_CODE_COVERAGE | |
24 | ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) | 24 | ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) | |
25 | -cargo_rustc_flags += -Clto | 25 | -cargo_rustc_flags += -Clto | |
26 | +cargo_rustc_flags += -Clto=thin | 26 | +cargo_rustc_flags += -Clto=thin | |
27 | +export CARGO_PROFILE_RELEASE_LTO=thin | 27 | +export CARGO_PROFILE_RELEASE_LTO=thin | |
28 | endif | 28 | endif | |
29 | # We need -Cembed-bitcode=yes for all crates when using -Clto. | 29 | # We need -Cembed-bitcode=yes for all crates when using -Clto. | |
30 | RUSTFLAGS += -Cembed-bitcode=yes | 30 | RUSTFLAGS += -Cembed-bitcode=yes |
$NetBSD: patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp,v 1.1 2023/06/04 09:26:35 ryoon Exp $
--- dom/webtransport/api/WebTransportDatagramDuplexStream.cpp.orig 2023-04-23 21:17:18.000000000 +0000
+++ dom/webtransport/api/WebTransportDatagramDuplexStream.cpp
@@ -62,7 +62,7 @@ void WebTransportDatagramDuplexStream::S
ErrorResult& aRv) {
// https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-incomingmaxage
// Step 1
- if (isnan(aMaxAge) || aMaxAge < 0.) {
+ if (std::isnan(aMaxAge) || aMaxAge < 0.) {
aRv.ThrowRangeError("Invalid IncomingMaxAge");
return;
}
@@ -78,7 +78,7 @@ void WebTransportDatagramDuplexStream::S
ErrorResult& aRv) {
// https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-outgoingmaxage
// Step 1
- if (isnan(aMaxAge) || aMaxAge < 0.) {
+ if (std::isnan(aMaxAge) || aMaxAge < 0.) {
aRv.ThrowRangeError("Invalid OutgoingMaxAge");
return;
}
@@ -94,7 +94,7 @@ void WebTransportDatagramDuplexStream::S
double aWaterMark, ErrorResult& aRv) {
// https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-incominghighwatermark
// Step 1
- if (isnan(aWaterMark) || aWaterMark < 0.) {
+ if (std::isnan(aWaterMark) || aWaterMark < 0.) {
aRv.ThrowRangeError("Invalid OutgoingMaxAge");
return;
}
@@ -110,7 +110,7 @@ void WebTransportDatagramDuplexStream::S
double aWaterMark, ErrorResult& aRv) {
// https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-outgoinghighwatermark
// Step 1
- if (isnan(aWaterMark) || aWaterMark < 0.) {
+ if (std::isnan(aWaterMark) || aWaterMark < 0.) {
aRv.ThrowRangeError("Invalid OutgoingHighWaterMark");
return;
}
$NetBSD: patch-toolkit_xre_glxtest.cpp,v 1.6 2023/06/04 09:26:35 ryoon Exp $
* Do not test Linux-specific entry for non-Linux.
--- toolkit/xre/glxtest.cpp.orig 2023-04-14 16:28:10.000000000 +0000
+++ toolkit/xre/glxtest.cpp
@@ -289,11 +289,15 @@ static void close_logging() {
#define PCI_BASE_CLASS_DISPLAY 0x03
static void get_pci_status() {
+#if defined(__linux__)
if (access("/sys/bus/pci/", F_OK) != 0 &&
access("/sys/bus/pci_express/", F_OK) != 0) {
record_warning("cannot access /sys/bus/pci");
return;
}
+#else
+ return;
+#endif
void* libpci = dlopen("libpci.so.3", RTLD_LAZY);
if (!libpci) {