pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/firefox91
Module Name: pkgsrc
Committed By: abs
Date: Mon Aug 7 13:28:04 UTC 2023
Modified Files:
pkgsrc/www/firefox91: Makefile distinfo mozilla-common.mk
Added Files:
pkgsrc/www/firefox91/patches: patch-dom_base_usecounters.py
patch-python_mozbuild_mozbuild_action_process__define__files.py
patch-python_mozbuild_mozbuild_backend_base.py
patch-python_mozbuild_mozbuild_preprocessor.py
patch-python_mozbuild_mozbuild_util.py
patch-xpcom_idl-parser_xpidl_xpidl.py
Log Message:
Fix firefox91 build with python 3.{10,11}
Bump PKGREVISION
Maintainer pinged 17/7
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/firefox91/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/firefox91/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/firefox91/mozilla-common.mk
cvs rdiff -u -r0 -r1.1 \
pkgsrc/www/firefox91/patches/patch-dom_base_usecounters.py \
pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_action_process__define__files.py \
pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_backend_base.py \
pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_preprocessor.py \
pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_util.py \
pkgsrc/www/firefox91/patches/patch-xpcom_idl-parser_xpidl_xpidl.py
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/firefox91/Makefile
diff -u pkgsrc/www/firefox91/Makefile:1.33 pkgsrc/www/firefox91/Makefile:1.34
--- pkgsrc/www/firefox91/Makefile:1.33 Sat May 6 19:09:51 2023
+++ pkgsrc/www/firefox91/Makefile Mon Aug 7 13:28:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2023/05/06 19:09:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2023/08/07 13:28:04 abs Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 91.13
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR= .0esr
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox91-/}
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= www
MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
EXTRACT_SUFX= .tar.xz
Index: pkgsrc/www/firefox91/distinfo
diff -u pkgsrc/www/firefox91/distinfo:1.18 pkgsrc/www/firefox91/distinfo:1.19
--- pkgsrc/www/firefox91/distinfo:1.18 Sat Dec 10 09:25:58 2022
+++ pkgsrc/www/firefox91/distinfo Mon Aug 7 13:28:04 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2022/12/10 09:25:58 abs Exp $
+$NetBSD: distinfo,v 1.19 2023/08/07 13:28:04 abs Exp $
BLAKE2s (firefox-91.13.0esr.source.tar.xz) = a531749a2d4610eac5ec648e6d6dfbf6b990c09b03c9d2a1c252c66c8cff90b6
SHA512 (firefox-91.13.0esr.source.tar.xz) = 38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516
@@ -12,6 +12,7 @@ SHA1 (patch-build_moz.configure_rust.con
SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d88c7b1ccfdd3c6bd2dcd9530a36ad4a501d97a
SHA1 (patch-config_makefiles_rust.mk) = 72d7e9ecee3ccf7ef5f741aac8e35509b41ab7b8
SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
+SHA1 (patch-dom_base_usecounters.py) = 0ba5c19c10a70a731b32d36b1da7903a8c801b3f
SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2db2859ff7dbd01c24f6bd038bb3c9ba69821115
SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 89a9d934ef76706c552c0b81e6cbc0f45b1ffd2c
@@ -37,6 +38,10 @@ SHA1 (patch-media_webrtc_trunk_webrtc_mo
SHA1 (patch-modules_fdlibm_src_math__private.h) = 6ae3b0077b4a8c6088c35769fa1972cfc44ea9c1
SHA1 (patch-mozglue_misc_Uptime.cpp) = daefe25ef1ebc8e4d3735017b9e8ac68c4710a00
SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e5fbfc91c0
+SHA1 (patch-python_mozbuild_mozbuild_action_process__define__files.py) = 94d937f134f8414925bc07d987325536a9817a5a
+SHA1 (patch-python_mozbuild_mozbuild_backend_base.py) = 2b79d98d3da6533284f40bf391ce6adf3e8983c9
+SHA1 (patch-python_mozbuild_mozbuild_preprocessor.py) = 6b3aca7083ab800493600d5d50b9028adcb7be73
+SHA1 (patch-python_mozbuild_mozbuild_util.py) = 43f04103a7e2d9fa9a327bd23bd500fbe1822007
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
@@ -44,4 +49,5 @@ SHA1 (patch-toolkit_moz.configure) = bb6
SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662
SHA1 (patch-widget_gtk_DMABufSurface.cpp) = 72bc9554f075734df12e1748fb8965dce8318de5
SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
+SHA1 (patch-xpcom_idl-parser_xpidl_xpidl.py) = ab150b79b60e322a0fa557073e185d34489956ce
SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = f7e491c7b62a5332066473bfc815e0050672a372
Index: pkgsrc/www/firefox91/mozilla-common.mk
diff -u pkgsrc/www/firefox91/mozilla-common.mk:1.7 pkgsrc/www/firefox91/mozilla-common.mk:1.8
--- pkgsrc/www/firefox91/mozilla-common.mk:1.7 Fri Dec 9 21:28:04 2022
+++ pkgsrc/www/firefox91/mozilla-common.mk Mon Aug 7 13:28:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.7 2022/12/09 21:28:04 wiz Exp $
+# $NetBSD: mozilla-common.mk,v 1.8 2023/08/07 13:28:04 abs Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -6,7 +6,7 @@
.include "../../mk/bsd.prefs.mk"
-PYTHON_VERSIONS_INCOMPATIBLE= 27 311
+PYTHON_VERSIONS_INCOMPATIBLE= 27
PYTHON_FOR_BUILD_ONLY= tool
ALL_ENV+= PYTHON3=${PYTHONBIN}
Added files:
Index: pkgsrc/www/firefox91/patches/patch-dom_base_usecounters.py
diff -u /dev/null pkgsrc/www/firefox91/patches/patch-dom_base_usecounters.py:1.1
--- /dev/null Mon Aug 7 13:28:04 2023
+++ pkgsrc/www/firefox91/patches/patch-dom_base_usecounters.py Mon Aug 7 13:28:04 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-dom_base_usecounters.py,v 1.1 2023/08/07 13:28:04 abs Exp $
+
+Update for modern (>3.9) python open() mode
+
+--- dom/base/usecounters.py.orig 2022-08-15 18:04:32.000000000 +0000
++++ dom/base/usecounters.py
+@@ -8,7 +8,7 @@ import re
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
Index: pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_action_process__define__files.py
diff -u /dev/null pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_action_process__define__files.py:1.1
--- /dev/null Mon Aug 7 13:28:04 2023
+++ pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_action_process__define__files.py Mon Aug 7 13:28:04 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-python_mozbuild_mozbuild_action_process__define__files.py,v 1.1 2023/08/07 13:28:04 abs Exp $
+
+Update for modern (>3.9) python open() mode
+
+--- python/mozbuild/mozbuild/action/process_define_files.py.orig 2022-08-15 18:05:05.000000000 +0000
++++ python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
Index: pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_backend_base.py
diff -u /dev/null pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_backend_base.py:1.1
--- /dev/null Mon Aug 7 13:28:04 2023
+++ pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_backend_base.py Mon Aug 7 13:28:04 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-python_mozbuild_mozbuild_backend_base.py,v 1.1 2023/08/07 13:28:04 abs Exp $
+
+Update for modern (>3.9) python open() mode
+
+--- python/mozbuild/mozbuild/backend/base.py.orig 2022-08-15 18:05:01.000000000 +0000
++++ python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
Index: pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_preprocessor.py
diff -u /dev/null pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_preprocessor.py:1.1
--- /dev/null Mon Aug 7 13:28:04 2023
+++ pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_preprocessor.py Mon Aug 7 13:28:04 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-python_mozbuild_mozbuild_preprocessor.py,v 1.1 2023/08/07 13:28:04 abs Exp $
+
+Update for modern (>3.9) python open() mode
+
+--- python/mozbuild/mozbuild/preprocessor.py.orig 2022-08-15 18:04:56.000000000 +0000
++++ python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ class Preprocessor:
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ class Preprocessor:
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ class Preprocessor:
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
Index: pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_util.py
diff -u /dev/null pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_util.py:1.1
--- /dev/null Mon Aug 7 13:28:04 2023
+++ pkgsrc/www/firefox91/patches/patch-python_mozbuild_mozbuild_util.py Mon Aug 7 13:28:04 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-python_mozbuild_mozbuild_util.py,v 1.1 2023/08/07 13:28:04 abs Exp $
+
+Update for modern (>3.9) python open() mode
+
+--- python/mozbuild/mozbuild/util.py.orig 2022-08-15 18:05:01.000000000 +0000
++++ python/mozbuild/mozbuild/util.py
+@@ -225,7 +225,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+@@ -1447,7 +1447,7 @@ def patch_main():
+
+ def my_get_command_line():
+ with open(
+- os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "rU"
++ os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "r"
+ ) as fork_file:
+ fork_code = fork_file.read()
+ # Add our relevant globals.
Index: pkgsrc/www/firefox91/patches/patch-xpcom_idl-parser_xpidl_xpidl.py
diff -u /dev/null pkgsrc/www/firefox91/patches/patch-xpcom_idl-parser_xpidl_xpidl.py:1.1
--- /dev/null Mon Aug 7 13:28:04 2023
+++ pkgsrc/www/firefox91/patches/patch-xpcom_idl-parser_xpidl_xpidl.py Mon Aug 7 13:28:04 2023
@@ -0,0 +1,31 @@
+$NetBSD: patch-xpcom_idl-parser_xpidl_xpidl.py,v 1.1 2023/08/07 13:28:04 abs Exp $
+
+Update for modern (>3.9) python regex rules (taken from firefox-102)
+
+--- xpcom/idl-parser/xpidl/xpidl.py.orig 2022-08-15 18:05:58.000000000 +0000
++++ xpcom/idl-parser/xpidl/xpidl.py
+@@ -1563,13 +1563,13 @@ class IDLParser(object):
+ t_ignore = " \t"
+
+ def t_multilinecomment(self, t):
+- r"/\*(?s).*?\*/"
++ r"/\*(\n|.)*?\*/"
+ t.lexer.lineno += t.value.count("\n")
+ if t.value.startswith("/**"):
+ self._doccomments.append(t.value)
+
+ def t_singlelinecomment(self, t):
+- r"(?m)//.*?$"
++ r"//[^\n]*"
+
+ def t_IID(self, t):
+ return t
+@@ -1582,7 +1582,7 @@ class IDLParser(object):
+ return t
+
+ def t_LCDATA(self, t):
+- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?"
++ r"%\{[ ]*C\+\+[ ]*\n(?P<cdata>(\n|.)*?\n?)%\}[ ]*(C\+\+)?"
+ t.type = "CDATA"
+ t.value = t.lexer.lexmatch.group("cdata")
+ t.lexer.lineno += t.value.count("\n")
Home |
Main Index |
Thread Index |
Old Index