git: 5ab09c70073a - main - www/tor-browser: various improvements

From: Rene Ladan <rene_at_FreeBSD.org>
Date: Sun, 12 Feb 2023 15:34:30 UTC
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5ab09c70073a08928f4b3fc3930167dbea964845

commit 5ab09c70073a08928f4b3fc3930167dbea964845
Author:     Jesper Schmitz Mouridsen <jsm@FreeBSD.org>
AuthorDate: 2023-02-12 15:06:41 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2023-02-12 15:34:10 +0000

    www/tor-browser: various improvements
    
    - use a dedicated directory [1]
    - enable building without PulseAudio, use Gecko framework more [2]
    
    No PORTREVISION bump because the next commit will update the port
    to a new version.
    PR:             268584 [1]
    PR:             268245 [2] (attachment 3)
    Approved by:    maintainer timeout (freebsd@sysctl.cz, 6 weeks)
---
 www/tor-browser/Makefile                                   |  8 +-------
 .../files/patch-toolkit_xre_nsXREDirPRovider.cpp           | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile
index 13e9b0a9206c..db5e08df53f2 100644
--- a/www/tor-browser/Makefile
+++ b/www/tor-browser/Makefile
@@ -24,13 +24,6 @@ BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
-LIB_DEPENDS=	libgconf-2.so:devel/gconf2 \
-		libgtk-x11-2.0.so:x11-toolkits/gtk20 \
-		libpangocairo-1.0.so:x11-toolkits/pango \
-		libpulse.so:audio/pulseaudio \
-		libXt.so:x11-toolkits/libXt \
-		libIDL-2.so:devel/libIDL \
-		libnspr4.so:devel/nspr
 RUN_DEPENDS=	tor:security/tor \
 		obfs4proxy:security/obfs4proxy-tor
 
@@ -73,6 +66,7 @@ MOZ_OPTIONS=	--with-tor-browser-version=12.0-2 \
 
 WRKSRC=		${WRKDIR}/firefox-tor-browser-102.5.0esr-12.0-2-build1
 
+.include	"${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
diff --git a/www/tor-browser/files/patch-toolkit_xre_nsXREDirPRovider.cpp b/www/tor-browser/files/patch-toolkit_xre_nsXREDirPRovider.cpp
new file mode 100644
index 000000000000..b57ba700fbdc
--- /dev/null
+++ b/www/tor-browser/files/patch-toolkit_xre_nsXREDirPRovider.cpp
@@ -0,0 +1,14 @@
+--- toolkit/xre/nsXREDirProvider.cpp.orig	2023-01-15 10:55:50.058634000 +0100
++++ toolkit/xre/nsXREDirProvider.cpp	2023-01-15 10:56:48.735300000 +0100
+@@ -1653,7 +1653,11 @@
+     ToLowerCase(folder);
+ 
+     rv = AppendProfileString(aFile, folder.BeginReading());
++  } else {
++    nsAutoCString folder(".tor-browser-profiles");
++    rv = aFile->AppendNative(folder);
+   }
++
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+ #else