Wed Jan 26 12:00:18 2022 UTC ()
tor-browser: use python 3.9 or older for building

the next version will support 3.10

(Only relevant if you set your default to python 3.10)


(wiz)
diff -r1.101 -r1.102 pkgsrc/security/tor-browser/Makefile
diff -r1.13 -r1.14 pkgsrc/www/firefox78/mozilla-common.mk
cvs diff -r1.101 -r1.102 pkgsrc/security/tor-browser/Makefile (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/Makefile 2021/12/08 16:06:24 1.101
+++ pkgsrc/security/tor-browser/Makefile 2022/01/26 12:00:18 1.102
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.101 2021/12/08 16:06:24 adam Exp $ 1# $NetBSD: Makefile,v 1.102 2022/01/26 12:00:18 wiz Exp $
2# 2#
3# How to update this package: 3# How to update this package:
4# 4#
5# replace all patches with the one from the correspoding www/firefox${ESR_RELEASE} 5# replace all patches with the one from the correspoding www/firefox${ESR_RELEASE}
6# compare e.g. the output of 6# compare e.g. the output of
7# diff -r -I NetBSD . ../../www/firefox78 7# diff -r -I NetBSD . ../../www/firefox78
8# BUT keep: 8# BUT keep:
9# patch-.mozconfig (if still necessary) 9# patch-.mozconfig (if still necessary)
10# patch-browser_app_profile_000-tor-browser.js 10# patch-browser_app_profile_000-tor-browser.js
11# patch-toolkit_moz.configure (second chunk) 11# patch-toolkit_moz.configure (second chunk)
12# patch-xpcom_io_TorFileUtils.cpp 12# patch-xpcom_io_TorFileUtils.cpp
13# make the patches apply 13# make the patches apply
14# 14#
@@ -24,26 +24,29 @@ EXTRACT_SUFX= .tar.xz @@ -24,26 +24,29 @@ EXTRACT_SUFX= .tar.xz
24DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 24DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
25DISTFILES+= tor-browser-linux64-${PKGVERSION_NOREV}_en-US${EXTRACT_SUFX} 25DISTFILES+= tor-browser-linux64-${PKGVERSION_NOREV}_en-US${EXTRACT_SUFX}
26#DISTFILES+= src-tor-launcher-0.2.30${EXTRACT_SUFX} 26#DISTFILES+= src-tor-launcher-0.2.30${EXTRACT_SUFX}
27 27
28MAINTAINER= wiz@NetBSD.org 28MAINTAINER= wiz@NetBSD.org
29HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en 29HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en
30COMMENT= Tor Browser based on Firefox 30COMMENT= Tor Browser based on Firefox
31LICENSE= mpl-1.1 31LICENSE= mpl-1.1
32 32
33UNLIMIT_RESOURCES+= datasize virtualsize 33UNLIMIT_RESOURCES+= datasize virtualsize
34 34
35WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} 35WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
36 36
 37# as of 10.5.10, 11.x is fine with python 3.10
 38PYTHON_VERSIONS_INCOMPATIBLE= 310
 39
37MOZILLA_DIR= # empty 40MOZILLA_DIR= # empty
38 41
39DEPENDS+= tor-[0-9]*:../../net/tor 42DEPENDS+= tor-[0-9]*:../../net/tor
40DEPENDS+= tor-browser-https-everywhere>=2020.5.20:../../security/tor-browser-https-everywhere 43DEPENDS+= tor-browser-https-everywhere>=2020.5.20:../../security/tor-browser-https-everywhere
41DEPENDS+= tor-browser-noscript>=11.0.32:../../security/tor-browser-noscript 44DEPENDS+= tor-browser-noscript>=11.0.32:../../security/tor-browser-noscript
42 45
43.include "../../mk/bsd.prefs.mk" 46.include "../../mk/bsd.prefs.mk"
44 47
45CONFIGURE_ARGS+= --enable-tor-browser-data-outside-app-dir 48CONFIGURE_ARGS+= --enable-tor-browser-data-outside-app-dir
46CONFIGURE_ARGS+= --with-tor-browser-version=${PKGVERSION_NOREV} 49CONFIGURE_ARGS+= --with-tor-browser-version=${PKGVERSION_NOREV}
47CFLAGS+= -DTOR_BROWSER_DATA_IN_HOME_DIR=1 50CFLAGS+= -DTOR_BROWSER_DATA_IN_HOME_DIR=1
48CFLAGS+= -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1 51CFLAGS+= -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1
49CFLAGS+= -fPIC 52CFLAGS+= -fPIC
cvs diff -r1.13 -r1.14 pkgsrc/www/firefox78/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox78/Attic/mozilla-common.mk 2021/11/13 23:51:01 1.13
+++ pkgsrc/www/firefox78/Attic/mozilla-common.mk 2022/01/26 12:00:18 1.14
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: mozilla-common.mk,v 1.13 2021/11/13 23:51:01 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.14 2022/01/26 12:00:18 wiz 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 mail/thunderbird/Makefile 5# used by mail/thunderbird/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 unzip zip 15USE_TOOLS+= pkg-config perl gmake autoconf213 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