Hi,
Below is a diff that updates Tor Browser to 12.0.1. Tested on amd64.
Diff for 7.2-stable to follow.
Comments or OKs?
Caspar
Index: meta/tor-browser/Makefile
===================================================================
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- meta/tor-browser/Makefile 13 Dec 2022 19:35:35 -0000 1.64
+++ meta/tor-browser/Makefile 17 Dec 2022 20:01:20 -0000
@@ -2,10 +2,10 @@ COMMENT= Tor Browser meta package
MAINTAINER= Caspar Schutijser <cas...@schutijser.com>
-PKGNAME= tor-browser-12.0
+PKGNAME= tor-browser-12.0.1
ONLY_FOR_ARCHS = amd64
-RUN_DEPENDS= www/tor-browser/browser>=12.0 \
+RUN_DEPENDS= www/tor-browser/browser>=12.0.1 \
www/tor-browser/noscript>=11.4.13 \
net/tor>=0.4.7.12
Index: www/tor-browser/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile.inc
--- www/tor-browser/Makefile.inc 13 Dec 2022 19:35:35 -0000 1.62
+++ www/tor-browser/Makefile.inc 17 Dec 2022 20:01:20 -0000
@@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
PERMIT_PACKAGE ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
-TB_VERSION = 12.0
+TB_VERSION = 12.0.1
TB_PREFIX = tb
# keep meta/tor-browser in sync
Index: www/tor-browser/browser/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- www/tor-browser/browser/Makefile 13 Dec 2022 19:35:35 -0000 1.98
+++ www/tor-browser/browser/Makefile 17 Dec 2022 20:01:20 -0000
@@ -12,7 +12,7 @@ EXTRACT_SUFX = .tar.xz
PATCHORIG = .pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION:S/a/alpha/}
-DISTNAME = src-firefox-tor-browser-102.5.0esr-12.0-2-build1
+DISTNAME = src-firefox-tor-browser-102.6.0esr-12.0-1-build2
FIX_EXTRACT_PERMISSIONS = Yes
DISTFILES += ${DISTNAME}.tar.xz \
Index: www/tor-browser/browser/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.59
diff -u -p -r1.59 distinfo
--- www/tor-browser/browser/distinfo 13 Dec 2022 19:35:35 -0000 1.59
+++ www/tor-browser/browser/distinfo 17 Dec 2022 20:01:20 -0000
@@ -1,4 +1,4 @@
-SHA256 (mozilla/src-firefox-tor-browser-102.5.0esr-12.0-2-build1.tar.xz) =
1lAT1yT2ACsBRz5800oRco3PXjOQu3FlAYwfQuQugtQ=
-SHA256 (mozilla/tor-browser-linux64-12.0_ALL.tar.xz) =
hQzmAdgVusY+T1k3ZG0rSXFzviiyezCnUm67lGpFmHQ=
-SIZE (mozilla/src-firefox-tor-browser-102.5.0esr-12.0-2-build1.tar.xz) =
512766100
-SIZE (mozilla/tor-browser-linux64-12.0_ALL.tar.xz) = 105202872
+SHA256 (mozilla/src-firefox-tor-browser-102.6.0esr-12.0-1-build2.tar.xz) =
3hcAm81t5G57LV94qFSck/s8T02gkVmf+/tns5KobWA=
+SHA256 (mozilla/tor-browser-linux64-12.0.1_ALL.tar.xz) =
kaHfdedtSaIGe1N6jSlUrz6QDBEfxoBbe3/M91A2ds8=
+SIZE (mozilla/src-firefox-tor-browser-102.6.0esr-12.0-1-build2.tar.xz) =
512895940
+SIZE (mozilla/tor-browser-linux64-12.0.1_ALL.tar.xz) = 105644596
Index:
www/tor-browser/browser/patches/patch-gfx_webrender_bindings_webrender_ffi_h
===================================================================
RCS file:
www/tor-browser/browser/patches/patch-gfx_webrender_bindings_webrender_ffi_h
diff -N
www/tor-browser/browser/patches/patch-gfx_webrender_bindings_webrender_ffi_h
---
www/tor-browser/browser/patches/patch-gfx_webrender_bindings_webrender_ffi_h
27 Oct 2022 17:37:13 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-Workaround for "error: redefinition of 'ROOT_CLIP_CHAIN'" with newer cbindgen.
-
-https://hg.mozilla.org/mozilla-central/diff/51947744ce12247f378a1db2379ffaad3fcd18c3/gfx/webrender_bindings/webrender_ffi.h
-https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
-https://github.com/eqrion/cbindgen/issues/767#issuecomment-1153125949
-
-Index: gfx/webrender_bindings/webrender_ffi.h
---- gfx/webrender_bindings/webrender_ffi.h.orig
-+++ gfx/webrender_bindings/webrender_ffi.h
-@@ -73,8 +73,6 @@ struct WrPipelineInfo;
- struct WrPipelineIdAndEpoch;
- using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
-
--const uint64_t ROOT_CLIP_CHAIN = ~0;
--
- } // namespace wr
- } // namespace mozilla
-
