From nobody Sun Feb 12 15:34:31 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PFBNR4qHtz3px9l; Sun, 12 Feb 2023 15:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PFBNR4DtXz3FWB; Sun, 12 Feb 2023 15:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676216071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hp+VumN1k+Ln3AmZGnNo/gvj3XXQi4VUgOc+3h/DvBA=; b=P+79noRzU7y4/T6G55g6eeJa4PN6r0pDlqrIMmu7JaScd04LZ0LVC4Rtt7zqUJutSOr9Df lJOKuGn5NSApmO/mengB11Azcf6knXzj2OYBfy5bsnJeox25KDdLFo5QHXYjcfiWuUtTz7 tNSVsd+6J7itRK59+GKRfke6bG3Uq4N+c9kpUKGB0KgBlE9MNCnHXorf63npV9FWGgmslC hmz8UVPbOHPUr8AjgZfp3PfPluvyUaCbUKNlz3TwRsyajy45dDZyB+D6DJDTgtNVfI5JmR KkIfMJJKM+HR+zcrKkJ5IQtSr9gJ0A9nzB9cYduSmmw6Npl5zZysxXtUbui0qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676216071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hp+VumN1k+Ln3AmZGnNo/gvj3XXQi4VUgOc+3h/DvBA=; b=Hzdh0r7frbrQVlKyyJC6IDUWOzMP+zhlI0F/fNKCOkmBwUJfp8QLYBjt9vioR/1jC4jEQ/ suZAMgxmYYVyqQKLeXmWfVVBZToZlfk07j9i5AMwKPwepz0Cu275cal6xBnb/BqOMeZ98w Nx6uPYbQK5hgRLLTVs/iouAVKMvIvGY25210dvvgN8YzE2+Gi1/ex1Y35CqGj+t+8mDPOP cL1sT98rlX4at7H+9GBXDf52zMWXMYaJMRrfoxiBSuOlURsv1cc7fAZs7mMnhOW/AEmrNe cmwWVEKGVN+6lHvYV5qeLT+g8E3gjjTv3UWIOeDLIpMSfbY1MgOW7jC7B2bWAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676216071; a=rsa-sha256; cv=none; b=MbLcC78Wx+meWkhmTHuo2JZs8/Qs++scp7Okbey2J1A/hoLJFRUfqBkmxM1fRdfQtlvajY hxh0W5X6PWJWb0rDPvXpllHIuDHkz9DSN+p3VRfKBmJwM0Wl+1T/92HE9aXqDcTB58IzQi 0aqnUU3O0cyg3Z4gssCEfT12LkYb+LiUoIQ7vnO/zkCjGUjNwQfw7C/XD3i4mXvnTX0QhN kBEu11ERcUiY0Z/9xfZEUe1jAjSzTVFeCKUevAV0Jg5np0+E7DZr+RyEHPau5LSKG7cB62 2rIaQgIvo5zyl+uh0WfWk9Ack3QrftvxBwnLcMLGZlMU0t2pVAvMWuKpwD/C7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PFBNR3BhFzjlf; Sun, 12 Feb 2023 15:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31CFYVIs025036; Sun, 12 Feb 2023 15:34:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31CFYVGF025035; Sun, 12 Feb 2023 15:34:31 GMT (envelope-from git) Date: Sun, 12 Feb 2023 15:34:31 GMT Message-Id: <202302121534.31CFYVGF025035@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: b47b8dd54f32 - main - www/tor-browser: update to 12.0.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b47b8dd54f32b2335de4d3dbe6fc0680ee151de4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=b47b8dd54f32b2335de4d3dbe6fc0680ee151de4 commit b47b8dd54f32b2335de4d3dbe6fc0680ee151de4 Author: Rene Ladan AuthorDate: 2023-02-12 15:24:26 +0000 Commit: Rene Ladan CommitDate: 2023-02-12 15:34:10 +0000 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) --- www/tor-browser/Makefile | 13 +++++++------ www/tor-browser/distinfo | 6 +++--- 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 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; - --const uint64_t ROOT_CLIP_CHAIN = ~0; -- - } // namespace wr - } // namespace mozilla -