Attachment #239667 for bug #269121

View | Details | Raw Unified | Return to bug 269121
Collapse All | Expand All




PORTNAME=	tor-browser
DISTVERSION=	12.0.2
PORTREVISION=	2 # previous DISTVERSION was 12.0-2 which becomes 12.0.2 too in PKGNAME
CATEGORIES=	www net security wayland
MASTER_SITES=	https://dist.torproject.org/torbrowser/${DISTVERSION}/
DISTNAME=	src-firefox-tor-browser-102.7.0esr-${DISTVERSION:R}-1-build1

MAINTAINER=	freebsd@sysctl.cz
COMMENT=	Tor Browser for FreeBSD

		MOZ_APP_DISPLAYNAME="Tor Browser" \
		MOZ_APP_NAME="tor-browser"

MOZ_OPTIONS=	--with-tor-browser-version="${DISTVERSION}-1" \
	--enable-official-branding \
	--enable-optimize \
	--enable-rust-simd \

	--enable-verify-mar \
	--with-distribution-id=org.torproject

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}

.include <bsd.port.options.mk>


Lines 1-3 Link Here

(-)b/www/tor-browser/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1670876006	1	TIMESTAMP = 1674405921
2	SHA256 (src-firefox-tor-browser-102.5.0esr-12.0-2-build1.tar.xz) = d65013d724f6002b01473e7cd34a11728dcf5e3390bb7165018c1f42e42e82d4	2	SHA256 (src-firefox-tor-browser-102.7.0esr-12.0-1-build1.tar.xz) = da8c3a9775f4f808ea78428cadbe848d0f2fdf26a6c193b3452590e24f557bf3
3	SIZE (src-firefox-tor-browser-102.5.0esr-12.0-2-build1.tar.xz) = 512766100	3	SIZE (src-firefox-tor-browser-102.7.0esr-12.0-1-build1.tar.xz) = 511809384




In file included from Unified_cpp_accessible_html0.cpp:29:
In file included from accessible/html/HTMLImageMapAccessible.cpp:14:
In file included from layout/generic/nsImageFrame.h:17:
In file included from ../.build/dist/include/nsDisplayList.h:48:
In file included from ../.build/dist/include/nsCSSRenderingBorders.h:20:
In file included from ../.build/dist/include/gfxUtils.h:23:
In file included from ../.build/dist/include/mozilla/webrender/WebRenderTypes.h:11:
In file included from ../.build/dist/include/mozilla/webrender/webrender_ffi.h:103:
../.build/dist/include/mozilla/webrender/webrender_ffi_generated.h:24:33: error: redefinition of 'ROOT_CLIP_CHAIN'
constexpr static const uint64_t ROOT_CLIP_CHAIN = ~0;
                                ^
../.build/dist/include/mozilla/webrender/webrender_ffi.h:75:16: note: previous definition is here
const uint64_t ROOT_CLIP_CHAIN = ~0;
               ^

--- gfx/webrender_bindings/webrender_ffi.h.orig	2022-06-08 21:06:36 UTC
+++ gfx/webrender_bindings/webrender_ffi.h
@@ -72,8 +72,6 @@ using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpo
 struct WrPipelineIdAndEpoch;
 using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
 
-const uint64_t ROOT_CLIP_CHAIN = ~0;
-
 }  // namespace wr
 }  // namespace mozilla
 

Return to bug 269121

Lines 1-9 Link Here

(-)b/www/tor-browser/Makefile (-6 / +6 lines)
1	PORTNAME= tor-browser	1	PORTNAME= tor-browser
2	DISTVERSION= 12.0-2	2	DISTVERSION= 12.0.2
3	PORTREVISION= 1	3	PORTREVISION= 2 # previous DISTVERSION was 12.0-2 which becomes 12.0.2 too in PKGNAME
4	CATEGORIES= www net security wayland	4	CATEGORIES= www net security wayland
5	MASTER_SITES= https://dist.torproject.org/torbrowser/12.0/	5	MASTER_SITES= https://dist.torproject.org/torbrowser/${DISTVERSION}/
6	DISTNAME= src-firefox-tor-browser-102.5.0esr-${DISTVERSION}-build1	6	DISTNAME= src-firefox-tor-browser-102.7.0esr-${DISTVERSION:R}-1-build1
7		7
8	MAINTAINER= freebsd@sysctl.cz	8	MAINTAINER= freebsd@sysctl.cz
9	COMMENT= Tor Browser for FreeBSD	9	COMMENT= Tor Browser for FreeBSD
Lines 54-60 MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \ Link Here
54	MOZ_APP_DISPLAYNAME="Tor Browser" \	54	MOZ_APP_DISPLAYNAME="Tor Browser" \
55	MOZ_APP_NAME="tor-browser"	55	MOZ_APP_NAME="tor-browser"
56		56
57	MOZ_OPTIONS= --with-tor-browser-version=12.0-2 \	57	MOZ_OPTIONS= --with-tor-browser-version="${DISTVERSION}-1" \
58	--enable-official-branding \	58	--enable-official-branding \
59	--enable-optimize \	59	--enable-optimize \
60	--enable-rust-simd \	60	--enable-rust-simd \
Lines 71-77 MOZ_OPTIONS= --with-tor-browser-version=12.0-2 \ Link Here
71	--enable-verify-mar \	71	--enable-verify-mar \
72	--with-distribution-id=org.torproject	72	--with-distribution-id=org.torproject
73		73
74	WRKSRC= ${WRKDIR}/firefox-tor-browser-102.5.0esr-12.0-2-build1	74	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
75		75
76	.include <bsd.port.options.mk>	76	.include <bsd.port.options.mk>
77		77

Removed Link Here

(-)a/www/tor-browser/files/patch-bug1773070 (-26 lines)
1	In file included from Unified_cpp_accessible_html0.cpp:29:
2	In file included from accessible/html/HTMLImageMapAccessible.cpp:14:
3	In file included from layout/generic/nsImageFrame.h:17:
4	In file included from ../.build/dist/include/nsDisplayList.h:48:
5	In file included from ../.build/dist/include/nsCSSRenderingBorders.h:20:
6	In file included from ../.build/dist/include/gfxUtils.h:23:
7	In file included from ../.build/dist/include/mozilla/webrender/WebRenderTypes.h:11:
8	In file included from ../.build/dist/include/mozilla/webrender/webrender_ffi.h:103:
9	../.build/dist/include/mozilla/webrender/webrender_ffi_generated.h:24:33: error: redefinition of 'ROOT_CLIP_CHAIN'
10	constexpr static const uint64_t ROOT_CLIP_CHAIN = ~0;
11	^
12	../.build/dist/include/mozilla/webrender/webrender_ffi.h:75:16: note: previous definition is here
13	const uint64_t ROOT_CLIP_CHAIN = ~0;
14	^
15
16	--- gfx/webrender_bindings/webrender_ffi.h.orig 2022-06-08 21:06:36 UTC
17	+++ gfx/webrender_bindings/webrender_ffi.h
18	@@ -72,8 +72,6 @@ using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpo
19	struct WrPipelineIdAndEpoch;
20	using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
21
22	-const uint64_t ROOT_CLIP_CHAIN = ~0;
23	-
24	} // namespace wr
25	} // namespace mozilla
26