CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jul  6 20:37:55 UTC 2022

Modified Files:
        pkgsrc/lang/mozjs78: Makefile
        pkgsrc/www/firefox78: mozilla-common.mk

Log Message:
mozilla packages based on firefox78 are incompatible with python 3.10
due to a change to the collections library. Right now commit a workaround
until a proper fix appears.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/mozjs78/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/firefox78/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/mozjs78/Makefile
diff -u pkgsrc/lang/mozjs78/Makefile:1.26 pkgsrc/lang/mozjs78/Makefile:1.27
--- pkgsrc/lang/mozjs78/Makefile:1.26   Tue Jun 28 11:34:14 2022
+++ pkgsrc/lang/mozjs78/Makefile        Wed Jul  6 20:37:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/06/28 11:34:14 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/07/06 20:37:55 nia Exp $
 
 DISTNAME=      mozjs78_78.15.0.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
@@ -60,7 +60,7 @@ SUBST_VARS.conf=      PREFIX
 PKGCONFIG_OVERRIDE+=   js/src/build/js.pc.in
 PKGCONFIG_OVERRIDE+=   js/src/ctypes/libffi/libffi.pc.in
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_ACCEPTED=      39 38 37
 PYTHON_FOR_BUILD_ONLY=         tool
 TOOL_DEPENDS+=                 ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 

Index: pkgsrc/www/firefox78/mozilla-common.mk
diff -u pkgsrc/www/firefox78/mozilla-common.mk:1.14 pkgsrc/www/firefox78/mozilla-common.mk:1.15
--- pkgsrc/www/firefox78/mozilla-common.mk:1.14 Wed Jan 26 12:00:18 2022
+++ pkgsrc/www/firefox78/mozilla-common.mk      Wed Jul  6 20:37:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.14 2022/01/26 12:00:18 wiz Exp $
+# $NetBSD: mozilla-common.mk,v 1.15 2022/07/06 20:37:55 nia 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
+PYTHON_VERSIONS_ACCEPTED+=     39 38 37
 PYTHON_FOR_BUILD_ONLY=         tool
 ALL_ENV+=                      PYTHON3=${PYTHONBIN}