mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
www/tor-browser: Update 14.0.3 → 14.0.4
Changelog: https://blog.torproject.org/new-release-tor-browser-1404/ PR: 283930 MFH: 2025Q1
This commit is contained in:
Martin Filla
Vladimir Druzenko
parent
08ee0152e8
commit
6cf5a7cea0
6 changed files with 84 additions and 81 deletions
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= tor-browser
|
||||
DISTVERSION= 14.0.3
|
||||
DISTVERSION= 14.0.4
|
||||
CATEGORIES= www net security wayland
|
||||
MASTER_SITES= TOR \
|
||||
https://build-sources.tbb.torproject.org/:source1 \
|
||||
|
|
@ -7,8 +7,8 @@ MASTER_SITES= TOR \
|
|||
https://secure.informaction.com/%SUBDIR%/:source3
|
||||
MASTER_SITE_SUBDIR= torbrowser/${DISTVERSION}/:DEFAULT \
|
||||
download/releases/:source3
|
||||
DISTNAME= src-firefox-tor-browser-128.5.0esr-14.0-1-build2
|
||||
NOSCRIPT= noscript-11.5.2.xpi
|
||||
DISTNAME= src-firefox-tor-browser-128.6.0esr-14.0-1-build1
|
||||
NOSCRIPT= noscript-12.1.1.xpi
|
||||
DISTFILES= ${DISTNAME}.tar.xz \
|
||||
manual_215922.zip:source1 \
|
||||
fonts-3--4348e1.tar.zst:source2 \
|
||||
|
|
@ -22,14 +22,14 @@ LICENSE= MPL20
|
|||
LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
|
||||
BUILD_DEPENDS= nspr>=4.32:devel/nspr \
|
||||
nss>=3.94:security/nss \
|
||||
nss>=3.101:security/nss \
|
||||
icu>=73.1:devel/icu \
|
||||
libevent>=2.1.8:devel/libevent \
|
||||
harfbuzz>=8.2.2:print/harfbuzz \
|
||||
harfbuzz>=8.5.0:print/harfbuzz \
|
||||
graphite2>=1.3.14:graphics/graphite2 \
|
||||
png>=1.6.39:graphics/png \
|
||||
png>=1.6.43:graphics/png \
|
||||
dav1d>=1.0.0:multimedia/dav1d \
|
||||
libvpx>=1.13.1:multimedia/libvpx \
|
||||
libvpx>=1.14:multimedia/libvpx \
|
||||
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
|
||||
v4l_compat>0:multimedia/v4l_compat \
|
||||
autoconf2.13:devel/autoconf2.13 \
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
TIMESTAMP = 1733043195
|
||||
SHA256 (src-firefox-tor-browser-128.5.0esr-14.0-1-build2.tar.xz) = e2b0c7f43d1159064d9b1875d5dc378f1176048dea4900e331d776b4cdafdada
|
||||
SIZE (src-firefox-tor-browser-128.5.0esr-14.0-1-build2.tar.xz) = 610942584
|
||||
TIMESTAMP = 1736350323
|
||||
SHA256 (src-firefox-tor-browser-128.6.0esr-14.0-1-build1.tar.xz) = e3f9bc9102131754cfb819640d355375a2f25a66252afd57e051f1d6568ffe9b
|
||||
SIZE (src-firefox-tor-browser-128.6.0esr-14.0-1-build1.tar.xz) = 610905384
|
||||
SHA256 (manual_215922.zip) = b5ed703f54d52e9f197320f3698e936d585a3fed23cc4f9fbf59edce2869f885
|
||||
SIZE (manual_215922.zip) = 28305786
|
||||
SHA256 (fonts-3--4348e1.tar.zst) = 7fbbecece6de777f196982f6eb567970a6d8e7ac2bf5b1ad6b90e1ea36374032
|
||||
SIZE (fonts-3--4348e1.tar.zst) = 27441580
|
||||
SHA256 (noscript-11.5.2.xpi) = 460aaa6484bf8422415dfe08260e8536866e3731ed5b8b7913cf4b7b1333493a
|
||||
SIZE (noscript-11.5.2.xpi) = 959788
|
||||
SHA256 (noscript-12.1.1.xpi) = f9639e63ffcfc352036de00e4ff6694bb0ca65a0bb8fbd103bd08f32dc1ff31a
|
||||
SIZE (noscript-12.1.1.xpi) = 980626
|
||||
SHA256 (mozilla-l10n-firefox-l10n-f75c1e6a305e68161037337767ece88e9de940b9_GH0.tar.gz) = 16760cc32c79ed1a52e3a7c19050004a4eee871cfe236f1f96418899a42dbc2b
|
||||
SIZE (mozilla-l10n-firefox-l10n-f75c1e6a305e68161037337767ece88e9de940b9_GH0.tar.gz) = 66268851
|
||||
SHA256 (tpo-translation-caa431bbea1a76d7ad61eeda94086a1513762605_GL0.tar.gz) = f9ceb52d163979cd07fb66012a2c5d58a25218f5d3b5a2ffa4e42099739e7147
|
||||
|
|
|
|||
|
|
@ -9,10 +9,11 @@ https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096
|
|||
# Parent 9cd90914846f667f18babc491a74c164ae5d6e9f
|
||||
imported patch decoder_workaround.patch
|
||||
|
||||
diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
|
||||
--- image/decoders/nsGIFDecoder2.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ image/decoders/nsGIFDecoder2.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
@@ -422,6 +422,9 @@
|
||||
diff --git image/decoders/nsGIFDecoder2.cpp image/decoders/nsGIFDecoder2.cpp
|
||||
index ebb0b7d..d52ef47 100644
|
||||
--- image/decoders/nsGIFDecoder2.cpp
|
||||
+++ image/decoders/nsGIFDecoder2.cpp
|
||||
@@ -422,6 +422,9 @@ void nsGIFDecoder2::ConvertColormap(uint32_t* aColormap, uint32_t aColors) {
|
||||
MOZ_ASSERT(mSwizzleFn);
|
||||
uint8_t* data = reinterpret_cast<uint8_t*>(aColormap);
|
||||
mSwizzleFn(data, data, aColors);
|
||||
|
|
@ -22,10 +23,11 @@ diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
|
|||
}
|
||||
|
||||
LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator,
|
||||
diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
|
||||
--- image/decoders/nsJPEGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ image/decoders/nsJPEGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
@@ -263,6 +263,9 @@
|
||||
diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp
|
||||
index 9ea4403..d82772c 100644
|
||||
--- image/decoders/nsJPEGDecoder.cpp
|
||||
+++ image/decoders/nsJPEGDecoder.cpp
|
||||
@@ -257,6 +257,9 @@ LexerTransition<nsJPEGDecoder::State> nsJPEGDecoder::ReadJPEGData(
|
||||
case JCS_YCbCr:
|
||||
// By default, we will output directly to BGRA. If we need to apply
|
||||
// special color transforms, this may change.
|
||||
|
|
@ -35,7 +37,7 @@ diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
|
|||
switch (SurfaceFormat::OS_RGBX) {
|
||||
case SurfaceFormat::B8G8R8X8:
|
||||
mInfo.out_color_space = JCS_EXT_BGRX;
|
||||
@@ -277,6 +280,7 @@
|
||||
@@ -271,6 +274,7 @@ LexerTransition<nsJPEGDecoder::State> nsJPEGDecoder::ReadJPEGData(
|
||||
mState = JPEG_ERROR;
|
||||
return Transition::TerminateFailure();
|
||||
}
|
||||
|
|
@ -43,10 +45,11 @@ diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
|
|||
break;
|
||||
case JCS_CMYK:
|
||||
case JCS_YCCK:
|
||||
diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
|
||||
--- image/decoders/nsPNGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ image/decoders/nsPNGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
@@ -361,7 +361,7 @@
|
||||
diff --git image/decoders/nsPNGDecoder.cpp image/decoders/nsPNGDecoder.cpp
|
||||
index e3e4ef4..3cc7315 100644
|
||||
--- image/decoders/nsPNGDecoder.cpp
|
||||
+++ image/decoders/nsPNGDecoder.cpp
|
||||
@@ -356,7 +356,7 @@ LexerResult nsPNGDecoder::DoDecode(SourceBufferIterator& aIterator,
|
||||
IResumable* aOnResume) {
|
||||
MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!");
|
||||
|
||||
|
|
@ -55,7 +58,7 @@ diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
|
|||
[=](State aState, const char* aData, size_t aLength) {
|
||||
switch (aState) {
|
||||
case State::PNG_DATA:
|
||||
@@ -371,6 +371,14 @@
|
||||
@@ -366,6 +366,14 @@ LexerResult nsPNGDecoder::DoDecode(SourceBufferIterator& aIterator,
|
||||
}
|
||||
MOZ_CRASH("Unknown State");
|
||||
});
|
||||
|
|
@ -70,10 +73,11 @@ diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
|
|||
}
|
||||
|
||||
LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData(
|
||||
diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp
|
||||
--- image/decoders/nsWebPDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ image/decoders/nsWebPDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
@@ -237,7 +237,12 @@
|
||||
diff --git image/decoders/nsWebPDecoder.cpp image/decoders/nsWebPDecoder.cpp
|
||||
index e58ca92..2056ebb 100644
|
||||
--- image/decoders/nsWebPDecoder.cpp
|
||||
+++ image/decoders/nsWebPDecoder.cpp
|
||||
@@ -247,7 +247,12 @@ nsresult nsWebPDecoder::CreateFrame(const OrientedIntRect& aFrameRect) {
|
||||
// WebP doesn't guarantee that the alpha generated matches the hint in the
|
||||
// header, so we always need to claim the input is BGRA. If the output is
|
||||
// BGRX, swizzling will mask off the alpha channel.
|
||||
|
|
|
|||
23
www/tor-browser/files/patch-bug1876366
Normal file
23
www/tor-browser/files/patch-bug1876366
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
commit 46a89fb0319d673b3139a068e3d89aed9f44fc16
|
||||
Author: Christoph Moench-Tegeder <cmt@burggraben.net>
|
||||
|
||||
use gdk legacy cursor interface by default
|
||||
|
||||
Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=1876366#c16
|
||||
hints that we could re-test this once we have GTK 3.24.42 (with the
|
||||
now-current gtk3-3.24.41 the original problem is still reproducable,
|
||||
but toggling this flag does fix it for me)
|
||||
|
||||
diff --git modules/libpref/init/StaticPrefList.yaml modules/libpref/init/StaticPrefList.yaml
|
||||
index 835450712a12..f2249006c36d 100644
|
||||
--- modules/libpref/init/StaticPrefList.yaml
|
||||
+++ modules/libpref/init/StaticPrefList.yaml
|
||||
@@ -16070,7 +16070,7 @@
|
||||
# Whether to use gtk legacy cursor API.
|
||||
- name: widget.gtk.legacy-cursors.enabled
|
||||
type: bool
|
||||
- value: false
|
||||
+ value: true
|
||||
mirror: always
|
||||
|
||||
# Whether to use gtk high contrast themes to disable content styling like on
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
commit 0a4dfe06e072222335bff7724b64a1f479e56569
|
||||
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
|
||||
|
||||
flag WEBRTC_USE_PIPEWIRE just as on Linux
|
||||
|
||||
diff --git dom/media/webrtc/third_party_build/webrtc.mozbuild dom/media/webrtc/third_party_build/webrtc.mozbuild
|
||||
index 940420e3f8c4..08e07f77056f 100644
|
||||
--- dom/media/webrtc/third_party_build/webrtc.mozbuild
|
||||
+++ dom/media/webrtc/third_party_build/webrtc.mozbuild
|
||||
@@ -40,6 +40,17 @@ if CONFIG["MOZ_WEBRTC"]:
|
||||
DEFINES["HAVE_WINSOCK2_H"] = True
|
||||
elif CONFIG["OS_TARGET"] in ("DragonFly", "FreeBSD", "NetBSD", "OpenBSD"):
|
||||
DEFINES["WEBRTC_BSD"] = True
|
||||
+ if (
|
||||
+ CONFIG["TARGET_CPU"] == "x86"
|
||||
+ or CONFIG["TARGET_CPU"] == "x86_64"
|
||||
+ or CONFIG["TARGET_CPU"] == "arm"
|
||||
+ or CONFIG["TARGET_CPU"] == "aarch64"
|
||||
+ or (
|
||||
+ CONFIG["TARGET_ENDIANNESS"] == "little"
|
||||
+ and CONFIG["TARGET_CPU"].startswith("mips")
|
||||
+ )
|
||||
+ ):
|
||||
+ DEFINES["WEBRTC_USE_PIPEWIRE"] = True
|
||||
elif CONFIG["OS_TARGET"] == "Android":
|
||||
DEFINES["WEBRTC_LINUX"] = True
|
||||
DEFINES["WEBRTC_ANDROID"] = True
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
commit 45a7951cb6a9b1735b9b6cec89db69b5933715c7
|
||||
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
|
||||
Date: Mon Mar 28 21:54:35 2022 +0200
|
||||
|
||||
FreeBSD can use sched_getcpu() from 1400046/1300524 on
|
||||
|
||||
diff --git tools/profiler/core/platform.cpp tools/profiler/core/platform.cpp
|
||||
index 92bcc1100687..2f17a88942a8 100644
|
||||
--- tools/profiler/core/platform.cpp
|
||||
+++ tools/profiler/core/platform.cpp
|
||||
@@ -111,6 +111,20 @@
|
||||
# include <cpuid.h>
|
||||
#endif
|
||||
|
||||
+#if defined(GP_OS_freebsd)
|
||||
+#include <sys/param.h>
|
||||
+// "after making CPU_SET macros compatible with glibc"
|
||||
+# if __FreeBSD_version > 1400045 || (__FreeBSD_version > 1300523 && __FreeBSD_version < 1400000)
|
||||
+# include <sched.h>
|
||||
+# else
|
||||
+# if __x86_64__ || __i386__
|
||||
+// similar cpuid_count() trick as on Darwin, using LLVM
|
||||
+// but not for all CPUs
|
||||
+# include <cpuid.h>
|
||||
+# endif
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
#if defined(GP_OS_windows)
|
||||
# include <processthreadsapi.h>
|
||||
|
||||
@@ -6368,6 +6382,19 @@ void profiler_mark_thread_awake() {
|
||||
cpuId = ebx >> 24;
|
||||
}
|
||||
# endif
|
||||
+#elif defined(GP_OS_freebsd)
|
||||
+# if __FreeBSD_version > 1400045 || (__FreeBSD_version > 1300523 && __FreeBSD_version < 1400000)
|
||||
+ cpuId = sched_getcpu();
|
||||
+# elif defined(__amd64__)
|
||||
+ unsigned int eax, ebx, ecx, edx;
|
||||
+ __cpuid_count(1, 0, eax, ebx, ecx, edx);
|
||||
+ // Check if we have an APIC.
|
||||
+ if ((edx & (1 << 9))) {
|
||||
+ // APIC ID is bits 24-31 of EBX
|
||||
+ cpuId = ebx >> 24;
|
||||
+ }
|
||||
+# endif
|
||||
+// the fallthrough is cpuID = 0
|
||||
#else
|
||||
cpuId = sched_getcpu();
|
||||
#endif
|
||||
Loading…
Add table
Reference in a new issue