diff options
-rw-r--r-- | www/firefox/Makefile | 9 | ||||
-rw-r--r-- | www/firefox/distinfo | 24 | ||||
-rw-r--r-- | www/firefox/patches/patch-config_gcc-stl-wrapper.template.h | 12 | ||||
-rw-r--r-- | www/firefox/patches/patch-gfx_cairo_cairo_src_cairo-type1-subset.c | 19 | ||||
-rw-r--r-- | www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c | 8 | ||||
-rw-r--r-- | www/firefox/patches/patch-toolkit_moz.configure | 23 |
6 files changed, 25 insertions, 70 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 99ca3fbbee1..c2effc4af74 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,17 +1,16 @@ -# $NetBSD: Makefile,v 1.494 2021/09/16 21:12:48 nia Exp $ +# $NetBSD: Makefile,v 1.495 2021/09/30 14:18:27 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 91.0 -MOZ_BRANCH_MINOR= .2 +MOZ_BRANCH= 92.0 +MOZ_BRANCH_MINOR= .1 DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} -PKGREVISION= 3 CATEGORIES= www MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} EXTRACT_SUFX= .tar.xz -DISTFILES= ${DEFAULT_DISTFILES} nodejs-output-91.0.tgz +DISTFILES= ${DEFAULT_DISTFILES} nodejs-output-92.0.tgz SITES.nodejs-output-91.0.tgz= ${MASTER_SITE_LOCAL} MAINTAINER= ryoon@NetBSD.org diff --git a/www/firefox/distinfo b/www/firefox/distinfo index de07625a307..0a26a01b7d6 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,22 +1,21 @@ -$NetBSD: distinfo,v 1.446 2021/08/29 09:36:16 taca Exp $ +$NetBSD: distinfo,v 1.447 2021/09/30 14:18:27 ryoon Exp $ -SHA1 (firefox-91.0.2.source.tar.xz) = 953eb52799ae1da9ea63e154e1b3194c10bca8ce -RMD160 (firefox-91.0.2.source.tar.xz) = 22b066a0f891aca3c9512501b01e556a6b5414e5 -SHA512 (firefox-91.0.2.source.tar.xz) = 82084799524db6661d97d9942a01ca9edec2fae6b503c9dd2d79fca78bfef4ee0a888e5f5cf4cfa2b91d9c9392658bb8218bae2b9bec0fbcacfe73a174a4dbe7 -Size (firefox-91.0.2.source.tar.xz) = 381193820 bytes -SHA1 (nodejs-output-91.0.tgz) = 4c5220054c1364ff679351c46206f5a4886c03bf -RMD160 (nodejs-output-91.0.tgz) = b21fe976a919cd891a757eaba2f4006d8e4ab747 -SHA512 (nodejs-output-91.0.tgz) = 3a457101a4aaa5ae955b77c41ba6b0d98eb5dd0ae9d6d8cc77c0c7bc0e844238a9c0d86cd1838ffb6a37ad8851f871c21e4ca1bb59d11e58fc42c5fec88c298c -Size (nodejs-output-91.0.tgz) = 201061 bytes +SHA1 (firefox-92.0.1.source.tar.xz) = 9d936577375730bae2a259fce062e7a738330ab6 +RMD160 (firefox-92.0.1.source.tar.xz) = 5f6fef29db1719e96daf1bc2f04bde7a8ebed6b1 +SHA512 (firefox-92.0.1.source.tar.xz) = 53361c231a4ac93a1808c9ccb29893d85b5e516fe939a770aac7f178abb4f43cbe3571097e5c5bf91b11fd95fc62b61f2aa215a45048357bfc9dad9eabdee9ef +Size (firefox-92.0.1.source.tar.xz) = 383567460 bytes +SHA1 (nodejs-output-92.0.tgz) = 2c1deaf9b000b4f0f9a8ce33e9d812294ad6aee7 +RMD160 (nodejs-output-92.0.tgz) = bca678f57d7d062b8087abe5189f12801985582f +SHA512 (nodejs-output-92.0.tgz) = 2e83f77667f0a48f494f46d82acc0c8fab8895f146e1be234613ef0a8bbb915570958d1ded416efe8789c7e0a506c6e4e454bf7f37597b0cc538c81d8edb968c +Size (nodejs-output-92.0.tgz) = 200659 bytes SHA1 (patch-aa) = 15b8567cee2af9853f6949c80345ffcb1fd3852a SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0 SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678 -SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d88c7b1ccfdd3c6bd2dcd9530a36ad4a501d97a +SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d1f15ff487efa9202114d19ed5668b4e7aa032a SHA1 (patch-config_makefiles_rust.mk) = 72d7e9ecee3ccf7ef5f741aac8e35509b41ab7b8 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef -SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 89a9d934ef76706c552c0b81e6cbc0f45b1ffd2c SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = f6f8996f0818a1b890698c7cc5054d49cb1e8924 SHA1 (patch-gfx_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb @@ -29,7 +28,7 @@ SHA1 (patch-js_src_jsfriendapi.h) = b5cb687dbbda314fe0f16521c1c042c105c4bbe4 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 0501fdcae11568ae4ea78e0d2f6b3750b7a67d47 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a -SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 31536f36cb33f16da309527b50eda9b721608115 +SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 2ef11da83c90c41490db4c0d9809c3e1826b488a SHA1 (patch-media_libcubeb_src_moz.build) = e4e64a1135cf4157ae5b6f7c1710ebd076953479 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f @@ -39,7 +38,6 @@ SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 1c1397f6177728cf9deb2b74708069b9d09509c3 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12 -SHA1 (patch-toolkit_moz.configure) = bb6b7a358302e254e31016c3053088e6ed089f5a SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662 SHA1 (patch-widget_gtk_DMABufSurface.cpp) = 72bc9554f075734df12e1748fb8965dce8318de5 SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec diff --git a/www/firefox/patches/patch-config_gcc-stl-wrapper.template.h b/www/firefox/patches/patch-config_gcc-stl-wrapper.template.h index 013d9a219a4..42cf75a664a 100644 --- a/www/firefox/patches/patch-config_gcc-stl-wrapper.template.h +++ b/www/firefox/patches/patch-config_gcc-stl-wrapper.template.h @@ -1,9 +1,9 @@ -$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.3 2021/04/19 13:50:07 ryoon Exp $ +$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.4 2021/09/30 14:18:28 ryoon Exp $ ---- config/gcc-stl-wrapper.template.h.orig 2021-04-08 21:20:01.000000000 +0000 +--- config/gcc-stl-wrapper.template.h.orig 2021-09-04 13:24:51.000000000 +0000 +++ config/gcc-stl-wrapper.template.h @@ -32,8 +32,8 @@ - // bug 1694575 (iosfwd). + // limits) and bug 1694575 (iosfwd). // Please be careful when adding more exceptions, especially regarding // the header not directly or indirectly including <new>. -#ifndef moz_dont_include_mozalloc_for_cstdlib @@ -12,8 +12,8 @@ $NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.3 2021/04/19 13:50:07 ryoon +# define moz_dont_include_mozalloc_for_${HEADER} #endif - #ifndef moz_dont_include_mozalloc_for_type_traits -@@ -51,7 +51,7 @@ + #ifndef moz_dont_include_mozalloc_for_cmath +@@ -55,7 +55,7 @@ // Include mozalloc after the STL header and all other headers it includes // have been preprocessed. #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \ @@ -22,7 +22,7 @@ $NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.3 2021/04/19 13:50:07 ryoon # define MOZ_INCLUDE_MOZALLOC_H # define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} #endif -@@ -80,4 +80,6 @@ +@@ -84,4 +84,6 @@ # include "mozilla/throw_gcc.h" #endif diff --git a/www/firefox/patches/patch-gfx_cairo_cairo_src_cairo-type1-subset.c b/www/firefox/patches/patch-gfx_cairo_cairo_src_cairo-type1-subset.c deleted file mode 100644 index 72ab4467ce5..00000000000 --- a/www/firefox/patches/patch-gfx_cairo_cairo_src_cairo-type1-subset.c +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-gfx_cairo_cairo_src_cairo-type1-subset.c,v 1.1 2020/05/30 08:02:52 rillig Exp $ - -Fix undefined behavior when calling <ctype.h> functions with illegal values. - -gfx/cairo/cairo/src/cairo-type1-subset.c:273:11: error: array subscript is of type 'char' [-Werror,-Wchar-subscripts] - -https://bugzilla.mozilla.org/show_bug.cgi?id=1642081 - ---- gfx/cairo/cairo/src/cairo-type1-subset.c.orig 2020-05-07 18:34:10.000000000 +0000 -+++ gfx/cairo/cairo/src/cairo-type1-subset.c -@@ -270,7 +270,7 @@ cairo_type1_font_subset_find_segments (c - font->eexec_segment = (char *) p + font->header_segment_size; - font->eexec_segment_is_ascii = TRUE; - for (i = 0; i < 4; i++) { -- if (!isxdigit(font->eexec_segment[i])) -+ if (!isxdigit((unsigned char) font->eexec_segment[i])) - font->eexec_segment_is_ascii = FALSE; - } - } diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c index f2bde4d0d8a..3b33438ab9c 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c +++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c @@ -1,6 +1,6 @@ -$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.30 2019/12/03 14:21:20 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.31 2021/09/30 14:18:28 ryoon Exp $ ---- media/libcubeb/src/cubeb_alsa.c.orig 2019-12-02 12:23:28.000000000 +0000 +--- media/libcubeb/src/cubeb_alsa.c.orig 2021-09-04 13:25:19.000000000 +0000 +++ media/libcubeb/src/cubeb_alsa.c @@ -7,6 +7,7 @@ #undef NDEBUG @@ -8,5 +8,5 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.30 2019/12/03 14:21:20 ryoon #define _BSD_SOURCE +#define _NETBSD_SOURCE #define _XOPEN_SOURCE 500 - #include <pthread.h> - #include <sys/time.h> + #include "cubeb-internal.h" + #include "cubeb/cubeb.h" diff --git a/www/firefox/patches/patch-toolkit_moz.configure b/www/firefox/patches/patch-toolkit_moz.configure deleted file mode 100644 index bb9f65c9320..00000000000 --- a/www/firefox/patches/patch-toolkit_moz.configure +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-toolkit_moz.configure,v 1.12 2020/12/17 09:53:15 ryoon Exp $ - -* skia part: support bigendian architectures - ---- toolkit/moz.configure.orig 2020-12-03 23:14:21.000000000 +0000 -+++ toolkit/moz.configure -@@ -927,11 +927,11 @@ set_config("MOZ_IPDL_TESTS", depends_if( - option("--disable-skia", help="Disable use of Skia") - - --@depends("--disable-skia") --def skia(value): -- if not value: -- die("--disable-skia is not supported anymore") -- else: -+@depends('--disable-skia', target) -+def skia(value, target): -+ if value.origin == 'default' and target.endianness == 'big': -+ return None -+ if value: - return True - - |