diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2023-02-12 15:24:26 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2023-02-12 15:34:10 +0000 |
| commit | b47b8dd54f32b2335de4d3dbe6fc0680ee151de4 (patch) | |
| tree | cbb777d0b482114e3ce4450b67fea8febd1351e9 | |
| parent | 5ab09c70073a08928f4b3fc3930167dbea964845 (diff) | |
| download | ports-b47b8dd54f32b2335de4d3dbe6fc0680ee151de4.tar.gz ports-b47b8dd54f32b2335de4d3dbe6fc0680ee151de4.zip | |
www/tor-browser: update to 12.0.2
Note the PORTREVISION bump to 3, because the old 12.0-2 and the new
12.0.2 version both evaluate to 12.0.2 for PKGVERSION
Generalize Makefile a bit.
PR: 269121
Approved by: maintainer (freebsd@sysctl.cz)
| -rw-r--r-- | www/tor-browser/Makefile | 13 | ||||
| -rw-r--r-- | www/tor-browser/distinfo | 6 | ||||
| -rw-r--r-- | www/tor-browser/files/patch-bug1773070 | 26 |
3 files changed, 10 insertions, 35 deletions
diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile index db5e08df53f2..2f33c1e749cd 100644 --- a/www/tor-browser/Makefile +++ b/www/tor-browser/Makefile @@ -1,9 +1,10 @@ PORTNAME= tor-browser -DISTVERSION= 12.0-2 -PORTREVISION= 2 +DISTVERSION= 12.0.2 +PORTREVISION= 3 # previous DISTVERSION was 12.0-2 which becomes 12.0.2 too in PGKNAME CATEGORIES= www net security wayland -MASTER_SITES= https://dist.torproject.org/torbrowser/12.0/ -DISTNAME= src-firefox-tor-browser-102.5.0esr-${DISTVERSION}-build1 +MASTER_SITES= MASTER_SITE_TOR +MASTER_SITE_SUBDIR=torbrowser/${DISTVERSION} +DISTNAME= src-firefox-tor-browser-102.7.0esr-${DISTVERSION:R}-1-build1 MAINTAINER= freebsd@sysctl.cz COMMENT= Tor Browser for FreeBSD @@ -47,7 +48,7 @@ MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \ MOZ_APP_DISPLAYNAME="Tor Browser" \ MOZ_APP_NAME="tor-browser" -MOZ_OPTIONS= --with-tor-browser-version=12.0-2 \ +MOZ_OPTIONS= --with-tor-browser-version="${DISTVERSION}-1" \ --enable-official-branding \ --enable-optimize \ --enable-rust-simd \ @@ -64,7 +65,7 @@ MOZ_OPTIONS= --with-tor-browser-version=12.0-2 \ --enable-verify-mar \ --with-distribution-id=org.torproject -WRKSRC= ${WRKDIR}/firefox-tor-browser-102.5.0esr-12.0-2-build1 +WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} .include "${.CURDIR}/../../www/firefox/Makefile.options" .include <bsd.port.options.mk> diff --git a/www/tor-browser/distinfo b/www/tor-browser/distinfo index d0cf1eca7eec..decaa1298c6f 100644 --- a/www/tor-browser/distinfo +++ b/www/tor-browser/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670876006 -SHA256 (src-firefox-tor-browser-102.5.0esr-12.0-2-build1.tar.xz) = d65013d724f6002b01473e7cd34a11728dcf5e3390bb7165018c1f42e42e82d4 -SIZE (src-firefox-tor-browser-102.5.0esr-12.0-2-build1.tar.xz) = 512766100 +TIMESTAMP = 1674405921 +SHA256 (src-firefox-tor-browser-102.7.0esr-12.0-1-build1.tar.xz) = da8c3a9775f4f808ea78428cadbe848d0f2fdf26a6c193b3452590e24f557bf3 +SIZE (src-firefox-tor-browser-102.7.0esr-12.0-1-build1.tar.xz) = 511809384 diff --git a/www/tor-browser/files/patch-bug1773070 b/www/tor-browser/files/patch-bug1773070 deleted file mode 100644 index 0c1b3c4dac0e..000000000000 --- a/www/tor-browser/files/patch-bug1773070 +++ /dev/null @@ -1,26 +0,0 @@ -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 - |