Date: Tue, 12 Nov 2024 15:08:34 GMT From: Jesper Schmitz Mouridsen <jsm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e1f70209b0eb - main - www/tor-browser: Update to 14.0.1 Message-ID: <202411121508.4ACF8YNw075959@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jsm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1f70209b0eb5b5d6fb3b75f9dc257fc5c9a77b8 commit e1f70209b0eb5b5d6fb3b75f9dc257fc5c9a77b8 Author: Jesper Schmitz Mouridsen <jsm@FreeBSD.org> AuthorDate: 2024-11-12 14:51:06 +0000 Commit: Jesper Schmitz Mouridsen <jsm@FreeBSD.org> CommitDate: 2024-11-12 15:08:10 +0000 www/tor-browser: Update to 14.0.1 Remove webrtc patches since webrtc is disabled. PR: 281551 Approved by: Martin Filla <freebsd@sysctl.cz> (maintainer) Co-authored-by: Martin Filla <freebsd@sysctl.cz> --- www/tor-browser/Makefile | 94 +- www/tor-browser/distinfo | 26 +- www/tor-browser/files/fonts.conf.in | 182 + www/tor-browser/files/patch-addon-search | 20 +- .../files/patch-browser-app-nsBrowserApp.cpp | 16 +- www/tor-browser/files/patch-browser-base-jar.mn | 345 +- www/tor-browser/files/patch-bug1427152 | 10 - www/tor-browser/files/patch-bug1559213 | 104 +- www/tor-browser/files/patch-bug1628567 | 32 - www/tor-browser/files/patch-bug1680982 | 388 - www/tor-browser/files/patch-bug1841919 | 75 - www/tor-browser/files/patch-bug1873379 | 34 - www/tor-browser/files/patch-bug847568 | 100 +- .../files/patch-dom_media_flac_FlacDecoder.cpp | 23 - .../files/patch-gfx_skia_skia_src_base_SkEndian.h | 24 +- .../files/patch-gfx_skia_skia_src_core_SkCpu.cpp | 32 - ...patch-gfx_skia_skia_src_core_SkRasterPipeline.h | 14 +- www/tor-browser/files/patch-libwebrtc-generated | 95952 ------------------- www/tor-browser/files/patch-libwebrtc-powerpc64 | 264 - www/tor-browser/files/patch-llvm18 | 199 - www/tor-browser/files/patch-mozglue_misc_SSE.h | 84 + www/tor-browser/files/patch-pipewire_init | 33 +- ...patch-python_mozbuild_mozbuild_gn__processor.py | 17 +- www/tor-browser/files/patch-rust-1.78.0 | 3582 - ...rd__party_libwebrtc_build_config_BUILDCONFIG.gn | 116 +- ..._desktop__capture_linux_wayland__egl__dmabuf.cc | 26 + .../files/patch-toolkit_xre_glxtest.cpp | 17 - www/tor-browser/files/tor-browser.desktop.in | 2 +- www/tor-browser/files/torrc-defaults.in | 5 + www/tor-browser/pkg-descr | 3 +- 30 files changed, 767 insertions(+), 101052 deletions(-) diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile index 5c7e7374eee0..7dd4f1dcfab7 100644 --- a/www/tor-browser/Makefile +++ b/www/tor-browser/Makefile @@ -1,15 +1,19 @@ PORTNAME= tor-browser -DISTVERSION= 13.5a9 -PORTREVISION= 6 +DISTVERSION= 14.0.1 CATEGORIES= www net security wayland MASTER_SITES= TOR \ https://build-sources.tbb.torproject.org/:source1 \ - LOCAL/jsm:source2 -MASTER_SITE_SUBDIR= torbrowser/${DISTVERSION} -DISTNAME= src-firefox-tor-browser-115.12.0esr-13.5-1-build2 + LOCAL/jsm:source2 \ + https://secure.informaction.com/%SUBDIR%/:source3 + DISTFILES= ${DISTNAME}.tar.xz \ - manual_112141.zip:source1 \ - firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar:source2 + manual_215922.zip:source1 \ + fonts-3--4348e1.tar.zst:source2 \ + noscript-11.4.42.xpi:source3 +MASTER_SITE_SUBDIR= torbrowser/${DISTVERSION}/:DEFAULT \ + download/releases/:source3 + +DISTNAME= src-firefox-tor-browser-128.4.0esr-14.0-1-build2 MAINTAINER= freebsd@sysctl.cz COMMENT= Tor Browser for FreeBSD WWW= https://www.torproject.org/ @@ -32,13 +36,17 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip + +USE_GITHUB=nodefault +GH_TUPLE= mozilla-l10n:firefox-l10n:878fe6f256d52c7e5b0205b07b061829ccde4f17:ffl10n USE_GITLAB=nodefault GL_SITE= https://gitlab.torproject.org/ GL_ACCOUNT= tpo GL_PROJECT= translation:basebrowser translation:torbrowser -GL_TAGNAME= 3faf7dcd545109f7bbd8a6374838e139ca422d6c:basebrowser 51bc08246d73990d461f747fb3c8cc7b6f66c1f4:torbrowser +GL_TAGNAME= 3b1be2065b54939ed019d94174f137847bcf3c66:basebrowser ba63bd165f3fd4bdd472815c9761413d4671cfb7:torbrowser RUN_DEPENDS= tor:security/tor \ - obfs4proxy:security/obfs4proxy-tor + obfs4proxy:security/obfs4proxy-tor \ + snowflake-client:security/snowflake-tor USES= compiler:c++11-lib libtool \ perl5 pkgconfig python shebangfix localbase:ldflags tar:xz python:3 @@ -46,23 +54,25 @@ USE_GECKO= gecko SSP_UNSAFE= yes -SUB_FILES= torrc-defaults tor-browser.desktop +SUB_FILES= torrc-defaults tor-browser.desktop fonts.conf BUNDLE_LIBS= yes USE_MOZILLA= -sqlite -MOZILLA_VER=115.4.0 +MOZILLA_VER=128.4.0 CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" \ - MOZ_CHROME_MULTILOCALE="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US" -MAKE_ENV+= AB_CD="multi" \ - LOCALES="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US" + MOZ_CHROME_MULTILOCALE="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW" + +MAKE_ENV+= LOCALES="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW" + MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \ MOZILLA_OFFICIAL="1" \ MOZ_OFFICIAL_BRANDING="1" \ MOZ_APP_DISPLAYNAME="Tor Browser" \ MOZ_APP_NAME="tor-browser" \ - MOZ_CHROME_MULTILOCALE="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US" -MOZ_OPTIONS= --with-base-browser-version=${DISTVERSION} \ + MOZ_CHROME_MULTILOCALE="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW" + +MOZ_OPTIONS=--with-base-browser-version=14.0.1 \ --enable-official-branding \ --enable-optimize \ --enable-bundled-fonts \ @@ -78,7 +88,7 @@ MOZ_OPTIONS= --with-base-browser-version=${DISTVERSION} \ --with-branding=browser/branding/tb-release WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} -SHEBANG_FILES+= mach + .include "${.CURDIR}/../../www/firefox/Makefile.options" .include <bsd.port.options.mk> @@ -96,31 +106,47 @@ MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif post-patch: @${REINPLACE_CMD} 's|LOCALBASE|${LOCALBASE}|g' "${WRKSRC}/browser/app/profile/000-tor-browser.js" + @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/browser/app/nsBrowserApp.cpp ${MKDIR} ${WRKSRC}/tmp-manual - unzip -d ${WRKSRC}/tmp-manual ${DISTDIR}/manual_112141.zip - ${MKDIR} ${WRKSRC}/tmp-l10n-central - tar -C ${WRKSRC}/tmp-l10n-central -xf ${DISTDIR}/firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar + unzip -d ${WRKSRC}/tmp-manual ${DISTDIR}/manual_215922.zip pre-configure: @${REINPLACE_CMD} 's|export MOZ_GOOGLE_.*||g' ${WRKSRC}/.mozconfig ${PYTHON_CMD} ${FILESDIR}/packagemanual.py ${WRKSRC}/tmp-manual/public ${WRKSRC}/browser/base/content/manual -post-build: - ${MKDIR} -p ${WRKSRC}/../.mozbuild/l10n-central - find ${WRKSRC}/tmp-l10n-central -name "*.tar.xz" -exec tar -C ${WRKSRC}/../.mozbuild/l10n-central -xvf {} \; - cd ${WRKSRC}/../.build/ && MOZBUILD_STATE_PATH=${WRKSRC}/../.mozbuild MOZ_AUTOMATION="1" ${WRKSRC}/mach package-multi-locale --locales ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW +post-configure: + ${MKDIR} ${WRKDIR}/.mozbuild/l10n-central + ${CP} -r ${WRKDIR}/firefox-l10n-878fe6f256d52c7e5b0205b07b061829ccde4f17/* ${WRKDIR}/.mozbuild/l10n-central + .for i in ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW - ${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/base-browser.ftl ${WRKDIR}/.build/dist/bin/browser/localization/${i}/browser/base-browser.ftl - ${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/newIdentity.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/newIdentity.properties - ${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/securityLevel.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/securityLevel.properties - ${MKDIR} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/browser - test -f ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/tor-browser.ftl && ${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/tor-browser.ftl ${WRKDIR}/.build/dist/bin/browser/localization/${i}/browser/tor-browser.ftl - ${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/cryptoSafetyPrompt.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/cryptoSafetyPrompt.properties -.for j in brand.dtd aboutDialog.dtd aboutTBUpdate.dtd torbutton.dtd onboarding.properties brand.properties torlauncher.properties branding/brand.ftl rulesets.properties settings.properties torConnect.properties onionLocation.properties aboutTor.dtd torbutton.properties browserOnboarding.properties - ${MKDIR} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/branding - ${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/${j} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/${j} -.endfor + ${CP} ${WRKDIR}/translation-3b1be2065b54939ed019d94174f137847bcf3c66/${i}/base-browser.ftl ${WRKDIR}/.mozbuild/l10n-central/${i}/toolkit/toolkit/global/ + ${CP} ${WRKDIR}/translation-3b1be2065b54939ed019d94174f137847bcf3c66/${i}/newIdentity.properties ${WRKDIR}/.mozbuild/l10n-central/${i}/browser/chrome/browser/ + ${CP} ${WRKDIR}/translation-3b1be2065b54939ed019d94174f137847bcf3c66/${i}/securityLevel.properties ${WRKDIR}/.mozbuild/l10n-central/${i}/browser/chrome/browser/ + ${CP} ${WRKDIR}/translation-ba63bd165f3fd4bdd472815c9761413d4671cfb7/${i}/tor-browser.ftl ${WRKDIR}/.mozbuild/l10n-central/${i}/toolkit/toolkit/global/ + ${MKDIR} ${WRKSRC}/toolkit/torbutton/chrome/locale/${i}/ +.for j in aboutTBUpdate.dtd brand.properties onionLocation.properties torbutton.properties torlauncher.properties brand.dtd settings.properties torbutton.dtd torConnect.properties + ${CP} ${WRKDIR}/translation-ba63bd165f3fd4bdd472815c9761413d4671cfb7/${i}/${j} ${WRKSRC}/toolkit/torbutton/chrome/locale/${i}/ + .endfor + ${CP} -r ${WRKDIR}/translation-ba63bd165f3fd4bdd472815c9761413d4671cfb7/${i}/branding ${WRKSRC}/toolkit/torbutton/chrome/locale/${i} +.endfor + +post-build: + MOZBUILD_STATE_PATH=${WRKDIR}/.mozbuild AB_CD="multi" MOZ_AUTOMATION="1" PATH="`find ${WRKRDIR}/.mozbuild/srcdirs -name build -type d -print`/bin:${PATH}" ${WRKSRC}/mach package-multi-locale --locales ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW + post-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKDIR}/torrc-defaults ${STAGEDIR}${DATADIR}/torrc-defaults ${INSTALL_DATA} ${WRKDIR}/tor-browser.desktop ${STAGEDIR}${PREFIX}/share/applications/tor-browser.desktop + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts + ${INSTALL_DATA} ${WRKDIR}/fonts.conf ${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig/fonts.conf + ${CP} ${WRKDIR}/fonts/*.ttf ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts/ + ${CP} ${WRKDIR}/fonts/*.otf ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts/ + ${CHMOD} 0744 ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts + ${CHMOD} 0744 ${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig/ + ${CHMOD} 0644 ${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig/fonts.conf + ${CHMOD} 0644 ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts/*.ttf + ${CHMOD} 0644 ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts/*.otf + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/distribution/extensions + ${CP} ${DISTDIR}/noscript-11.4.42.xpi "${STAGEDIR}${PREFIX}/lib/tor-browser/distribution/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" + .include <bsd.port.mk> diff --git a/www/tor-browser/distinfo b/www/tor-browser/distinfo index f8dded9a07c7..66284fc76e5c 100644 --- a/www/tor-browser/distinfo +++ b/www/tor-browser/distinfo @@ -1,11 +1,15 @@ -TIMESTAMP = 1718132378 -SHA256 (src-firefox-tor-browser-115.12.0esr-13.5-1-build2.tar.xz) = 989d7c6f829ba33b7d908ecb74b437b423da8193c45f5e23050500810da8756c -SIZE (src-firefox-tor-browser-115.12.0esr-13.5-1-build2.tar.xz) = 552055468 -SHA256 (manual_112141.zip) = f767bc5f655f1263623b7af588cfb045d3e41ee019dc7ecd713decc5c1a0ea9b -SIZE (manual_112141.zip) = 26293073 -SHA256 (firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar) = bbd290cd134e3a114241077ba82582617ab6c5117ff2226381943c504bd09775 -SIZE (firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar) = 18848768 -SHA256 (tpo-translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c_GL0.tar.gz) = e6fdc79f74d2c438a44e5ffb6404e3d64bab879cf146e88a170ccdcef3596d9b -SIZE (tpo-translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c_GL0.tar.gz) = 108057 -SHA256 (tpo-translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4_GL0.tar.gz) = a57dd8210d347ca69f5731cd768862673d692c0a5a3364f411cc5fa1fb88c98e -SIZE (tpo-translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4_GL0.tar.gz) = 1059523 +TIMESTAMP = 1731099792 +SHA256 (src-firefox-tor-browser-128.4.0esr-14.0-1-build2.tar.xz) = 702e17c7c594ec3933a7d48a4a64ad454c7d1d733e92aea2f0fef6532cc47689 +SIZE (src-firefox-tor-browser-128.4.0esr-14.0-1-build2.tar.xz) = 610752052 +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.4.42.xpi) = fd2d420afd93829bb6fe30ec6f8ba926d3d54d7583b8bbd822053b8cd13c0472 +SIZE (noscript-11.4.42.xpi) = 965445 +SHA256 (mozilla-l10n-firefox-l10n-878fe6f256d52c7e5b0205b07b061829ccde4f17_GH0.tar.gz) = 4f48ed9ff675862c6970ca3bffaae0d0e83a150be2f49b6a82715f2d78ccc836 +SIZE (mozilla-l10n-firefox-l10n-878fe6f256d52c7e5b0205b07b061829ccde4f17_GH0.tar.gz) = 66074065 +SHA256 (tpo-translation-3b1be2065b54939ed019d94174f137847bcf3c66_GL0.tar.gz) = b749d3b8704e00e279b7b8f8f7cab897a01a33f82da0dd9507271068f3039767 +SIZE (tpo-translation-3b1be2065b54939ed019d94174f137847bcf3c66_GL0.tar.gz) = 767917 +SHA256 (tpo-translation-ba63bd165f3fd4bdd472815c9761413d4671cfb7_GL0.tar.gz) = 04fe71468e6abcc3596f2c6783ac45369bb28fcf22a265fd0db55f7c0d2dacc5 +SIZE (tpo-translation-ba63bd165f3fd4bdd472815c9761413d4671cfb7_GL0.tar.gz) = 2580246 diff --git a/www/tor-browser/files/fonts.conf.in b/www/tor-browser/files/fonts.conf.in new file mode 100644 index 000000000000..644d0d9122a2 --- /dev/null +++ b/www/tor-browser/files/fonts.conf.in @@ -0,0 +1,182 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<!-- +**DO NOT EDIT THIS FILE!** +This file sets Tor Browser's bundled fonts as the only available system fonts +and standardizes rendering settings. +Any changes might deanonymize you, or expose you to fingerprinting vectors. +--> +<!-- +Derived from fonts.conf.in of Fontconfig. + +Copyright © 2000,2001,2002,2003,2004,2006,2007 Keith Packard +Copyright © 2005 Patrick Lam +Copyright © 2009 Roozbeh Pournader +Copyright © 2008,2009 Red Hat, Inc. +Copyright © 2008 Danilo Šegan +Copyright © 2012 Google, Inc. + + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of the author(s) not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. The authors make no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. +--> +<fontconfig> + +<!-- Font directory list --> + <dir>%%LOCALBASE%%/lib/tor-browser/fonts</dir> + +<!-- + Accept deprecated 'mono' alias, replacing it with 'monospace' +--> + <match target="pattern"> + <test qual="any" name="family"> + <string>mono</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>monospace</string> + </edit> + </match> + +<!-- + Accept alternate 'sans serif' spelling, replacing it with 'sans-serif' +--> + <match target="pattern"> + <test qual="any" name="family"> + <string>sans serif</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>sans-serif</string> + </edit> + </match> + +<!-- + Accept deprecated 'sans' alias, replacing it with 'sans-serif' +--> + <match target="pattern"> + <test qual="any" name="family"> + <string>sans</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>sans-serif</string> + </edit> + </match> + +<!-- + Set our default generic families. +--> + <match target="pattern"> + <test qual="any" name="family"> + <string>sans-serif</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>Arimo</string> + </edit> + </match> + <match target="pattern"> + <test qual="any" name="family"> + <string>serif</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>Tinos</string> + </edit> + </match> + <match target="pattern"> + <test qual="any" name="family"> + <string>monospace</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>Cousine</string> + </edit> + </match> + +<!-- + tor-browser#41799, tor-browser-build#41237: Add some aliases for + compatibility. +--> + <match target="pattern"> + <test qual="any" name="family"> + <string>Arial</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>Arimo</string> + </edit> + </match> + <match target="pattern"> + <test qual="any" name="family"> + <string>Times New Roman</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>Tinos</string> + </edit> + </match> + <match target="pattern"> + <test qual="any" name="family"> + <string>Courier New</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>Cousine</string> + </edit> + </match> + <match target="pattern"> + <test qual="any" name="family"> + <string>Helvetica</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>Arimo</string> + </edit> + </match> + <match target="pattern"> + <test qual="any" name="family"> + <string>Times</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>Tinos</string> + </edit> + </match> + <match target="pattern"> + <test qual="any" name="family"> + <string>Courier</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>Cousine</string> + </edit> + </match> + +<!-- Font cache directory list --> + + <cachedir prefix="xdg">fontconfig</cachedir> + + <config> +<!-- + Rescan configuration every 30 seconds when FcFontSetList is called + --> + <rescan> + <int>30</int> + </rescan> + </config> + + <!-- Standardize rendering settings. --> + <match target="pattern"> + <edit name="antialias" mode="assign"><bool>true</bool></edit> + <edit name="autohint" mode="assign"><bool>false</bool></edit> + <edit name="hinting" mode="assign"><bool>true</bool></edit> + <edit name="hintstyle" mode="assign"><const>hintfull</const></edit> + <edit name="lcdfilter" mode="assign"><const>lcddefault</const></edit> + <edit name="rgba" mode="assign"><const>none</const></edit> + </match> +</fontconfig> diff --git a/www/tor-browser/files/patch-addon-search b/www/tor-browser/files/patch-addon-search index b6dbf7924b43..a0adc808c9fa 100644 --- a/www/tor-browser/files/patch-addon-search +++ b/www/tor-browser/files/patch-addon-search @@ -2,10 +2,10 @@ https://github.com/mozilla/addons/issues/708 https://github.com/mozilla/addons-frontend/issues/4610 diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js -index 621900f90fc1..401ef9074bd0 100644 +index 5964d40ca3a3..ed81b06af8d5 100644 --- browser/app/profile/firefox.js +++ browser/app/profile/firefox.js -@@ -38,7 +38,7 @@ pref("extensions.postDownloadThirdPartyPrompt", true); +@@ -39,7 +39,7 @@ pref("extensions.postDownloadThirdPartyPrompt", true); // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v4/addons/search/?guid=%IDS%&lang=%LOCALE%"); @@ -14,7 +14,7 @@ index 621900f90fc1..401ef9074bd0 100644 pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/"); pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v4/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%"); pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%"); -@@ -204,8 +204,8 @@ pref("app.update.langpack.enabled", true); +@@ -214,8 +214,8 @@ pref("app.update.langpack.enabled", true); // .. etc .. // pref("extensions.update.enabled", true); @@ -26,10 +26,10 @@ index 621900f90fc1..401ef9074bd0 100644 // Themes every day diff --git toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs -index f906f244b658..7bb2eb6697c6 100644 +index e854e04b3ce2..27e8247eb886 100644 --- toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs +++ toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs -@@ -596,7 +596,7 @@ export var AddonRepository = { +@@ -715,7 +715,7 @@ export var AddonRepository = { addon.version = String(aEntry.current_version.version); if (Array.isArray(aEntry.current_version.files)) { for (let file of aEntry.current_version.files) { @@ -38,11 +38,11 @@ index f906f244b658..7bb2eb6697c6 100644 if (file.url) { addon.sourceURI = lazy.NetUtil.newURI(file.url); } -diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm -index 03186dad43a4..4053fc6f2702 100644 ---- toolkit/mozapps/extensions/internal/XPIDatabase.jsm -+++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm -@@ -634,7 +634,7 @@ class AddonInternal { +diff --git toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs +index 5d1d2c19706b..4dcba06a95f4 100644 +--- toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs ++++ toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs +@@ -632,7 +632,7 @@ export class AddonInternal { // Something is causing errors in here try { for (let platform of this.targetPlatforms) { diff --git a/www/tor-browser/files/patch-browser-app-nsBrowserApp.cpp b/www/tor-browser/files/patch-browser-app-nsBrowserApp.cpp index 68cb778b95a7..35b248c345fc 100644 --- a/www/tor-browser/files/patch-browser-app-nsBrowserApp.cpp +++ b/www/tor-browser/files/patch-browser-app-nsBrowserApp.cpp @@ -1,12 +1,14 @@ ---- browser/app/nsBrowserApp.cpp.orig 2016-09-19 16:19:28 UTC -+++ browser/app/nsBrowserApp.cpp -@@ -324,6 +324,9 @@ int main(int argc, char* argv[], char* e - { - mozilla::TimeStamp start = mozilla::TimeStamp::Now(); +--- browser/app/nsBrowserApp.cpp.orig 2024-10-21 21:51:41.000000000 +0200 ++++ browser/app/nsBrowserApp.cpp 2024-11-07 21:47:05.301097000 +0100 +@@ -391,6 +391,11 @@ + // Register an external module to report on otherwise uncatchable exceptions. + CrashReporter::RegisterRuntimeExceptionModule(); + setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); ++ setenv("FONTCONFIG_PATH", "%%LOCALBASE%%/lib/tor-browser/fontconfig/", 1); ++ setenv("FONTCONFIG_FILE", "fonts.conf", 1); + #ifdef HAS_DLL_BLOCKLIST - DllBlocklist_Initialize(); - + DllBlocklist_Initialize(gBlocklistInitFlags); + #endif diff --git a/www/tor-browser/files/patch-browser-base-jar.mn b/www/tor-browser/files/patch-browser-base-jar.mn index 0dbfd0224b11..17fbe9ed3c57 100644 --- a/www/tor-browser/files/patch-browser-base-jar.mn +++ b/www/tor-browser/files/patch-browser-base-jar.mn @@ -1,227 +1,120 @@ ---- browser/base/jar.mn.orig 2023-10-21 13:09:52.025195000 +0000 -+++ browser/base/jar.mn 2023-10-21 13:10:04.930188000 +0000 -@@ -112,3 +112,224 @@ - * content/browser/default-bookmarks.html (content/default-bookmarks.html) +--- browser/base/jar.mn.orig 2024-10-23 21:35:24 UTC ++++ browser/base/jar.mn +@@ -106,3 +106,117 @@ browser.jar: + * content/browser/default-bookmarks.html (content/default-bookmarks.html) - content/browser/languageNotification.js (content/languageNotification.js) -+ content/browser/manual/ar.html (content/manual/ar.html) -+ content/browser/manual/bn.html (content/manual/bn.html) -+ content/browser/manual/ca.html (content/manual/ca.html) -+ content/browser/manual/de.html (content/manual/de.html) -+ content/browser/manual/el.html (content/manual/el.html) -+ content/browser/manual/en.html (content/manual/en.html) -+ content/browser/manual/es.html (content/manual/es.html) -+ content/browser/manual/fa.html (content/manual/fa.html) -+ content/browser/manual/fi.html (content/manual/fi.html) -+ content/browser/manual/fr.html (content/manual/fr.html) -+ content/browser/manual/ga.html (content/manual/ga.html) -+ content/browser/manual/he.html (content/manual/he.html) -+ content/browser/manual/hu.html (content/manual/hu.html) -+ content/browser/manual/id.html (content/manual/id.html) -+ content/browser/manual/is.html (content/manual/is.html) -+ content/browser/manual/it.html (content/manual/it.html) -+ content/browser/manual/ka.html (content/manual/ka.html) -+ content/browser/manual/km.html (content/manual/km.html) -+ content/browser/manual/ko.html (content/manual/ko.html) -+ content/browser/manual/lt.html (content/manual/lt.html) -+ content/browser/manual/mk.html (content/manual/mk.html) -+ content/browser/manual/my.html (content/manual/my.html) -+ content/browser/manual/pl.html (content/manual/pl.html) -+ content/browser/manual/pt-BR.html (content/manual/pt-BR.html) -+ content/browser/manual/pt-PT.html (content/manual/pt-PT.html) -+ content/browser/manual/ro.html (content/manual/ro.html) -+ content/browser/manual/ru.html (content/manual/ru.html) -+ content/browser/manual/sq.html (content/manual/sq.html) -+ content/browser/manual/static/collapse.min.js (content/manual/static/collapse.min.js) -+ content/browser/manual/static/css/bootstrap-grid.css (content/manual/static/css/bootstrap-grid.css) -+ content/browser/manual/static/css/bootstrap-reboot.css (content/manual/static/css/bootstrap-reboot.css) -+ content/browser/manual/static/css/bootstrap.css (content/manual/static/css/bootstrap.css) -+ content/browser/manual/static/fonts/Corben/Corben-Bold.ttf (content/manual/static/fonts/Corben/Corben-Bold.ttf) -+ content/browser/manual/static/fonts/Corben/Corben.ttf (content/manual/static/fonts/Corben/Corben.ttf) -+ content/browser/manual/static/fonts/Hanuman/Hanuman-Black.ttf (content/manual/static/fonts/Hanuman/Hanuman-Black.ttf) -+ content/browser/manual/static/fonts/Hanuman/Hanuman-Bold.ttf (content/manual/static/fonts/Hanuman/Hanuman-Bold.ttf) -+ content/browser/manual/static/fonts/Hanuman/Hanuman-Light.ttf (content/manual/static/fonts/Hanuman/Hanuman-Light.ttf) -+ content/browser/manual/static/fonts/Hanuman/Hanuman-Regular.ttf (content/manual/static/fonts/Hanuman/Hanuman-Regular.ttf) -+ content/browser/manual/static/fonts/Hanuman/Hanuman-Thin.ttf (content/manual/static/fonts/Hanuman/Hanuman-Thin.ttf) -+ content/browser/manual/static/fonts/Hanuman/OFL.txt (content/manual/static/fonts/Hanuman/OFL.txt) -+ content/browser/manual/static/fonts/Kanit/kanit.woff2 (content/manual/static/fonts/Kanit/kanit.woff2) -+ content/browser/manual/static/fonts/LeagueGothic/LeagueGothic-Italic.otf (content/manual/static/fonts/LeagueGothic/LeagueGothic-Italic.otf) -+ content/browser/manual/static/fonts/LeagueGothic/League_Gothic_Regular.woff (content/manual/static/fonts/LeagueGothic/League_Gothic_Regular.woff) -+ content/browser/manual/static/fonts/SourceCodePro/OFL.txt (content/manual/static/fonts/SourceCodePro/OFL.txt) -+ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Black.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Black.ttf) -+ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Bold.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Bold.ttf) -+ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-ExtraLight.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-ExtraLight.ttf) -+ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Light.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Light.ttf) -+ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Medium.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Medium.ttf) -+ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Regular.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Regular.ttf) -+ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Semibold.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Semibold.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/OFL.txt (content/manual/static/fonts/SourceSansPro/OFL.txt) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-Black.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-Black.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-BlackItalic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-BlackItalic.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-Bold.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-Bold.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-BoldItalic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-BoldItalic.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-ExtraLight.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-ExtraLight.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-ExtraLightItalic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-ExtraLightItalic.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-Italic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-Italic.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-Light.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-Light.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-LightItalic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-LightItalic.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-Regular.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-Regular.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-SemiBold.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-SemiBold.ttf) -+ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-SemiBoldItalic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-SemiBoldItalic.ttf) -+ content/browser/manual/static/fonts/SourceSerifPro/OFL.txt (content/manual/static/fonts/SourceSerifPro/OFL.txt) -+ content/browser/manual/static/fonts/SourceSerifPro/SourceSerifPro-Bold.ttf (content/manual/static/fonts/SourceSerifPro/SourceSerifPro-Bold.ttf) -+ content/browser/manual/static/fonts/SourceSerifPro/SourceSerifPro-Regular.ttf (content/manual/static/fonts/SourceSerifPro/SourceSerifPro-Regular.ttf) -+ content/browser/manual/static/fonts/SourceSerifPro/SourceSerifPro-Semibold.ttf (content/manual/static/fonts/SourceSerifPro/SourceSerifPro-Semibold.ttf) -+ content/browser/manual/static/fonts/TorIcons/tor-icons.eot (content/manual/static/fonts/TorIcons/tor-icons.eot) -+ content/browser/manual/static/fonts/TorIcons/tor-icons.svg (content/manual/static/fonts/TorIcons/tor-icons.svg) -+ content/browser/manual/static/fonts/TorIcons/tor-icons.ttf (content/manual/static/fonts/TorIcons/tor-icons.ttf) -+ content/browser/manual/static/fonts/TorIcons/tor-icons.woff (content/manual/static/fonts/TorIcons/tor-icons.woff) -+ content/browser/manual/static/fonts/TorIcons/tor-icons.woff2 (content/manual/static/fonts/TorIcons/tor-icons.woff2) -+ content/browser/manual/static/fonts/WhiteonBlack/WhiteOnBlack.ttf (content/manual/static/fonts/WhiteonBlack/WhiteOnBlack.ttf) -+ content/browser/manual/static/fonts/fontawesome/LICENSE.txt (content/manual/static/fonts/fontawesome/LICENSE.txt) -+ content/browser/manual/static/fonts/fontawesome/css/all.css (content/manual/static/fonts/fontawesome/css/all.css) -+ content/browser/manual/static/fonts/fontawesome/css/all.min.css (content/manual/static/fonts/fontawesome/css/all.min.css) -+ content/browser/manual/static/fonts/fontawesome/css/brands.css (content/manual/static/fonts/fontawesome/css/brands.css) -+ content/browser/manual/static/fonts/fontawesome/css/brands.min.css (content/manual/static/fonts/fontawesome/css/brands.min.css) -+ content/browser/manual/static/fonts/fontawesome/css/fontawesome.css (content/manual/static/fonts/fontawesome/css/fontawesome.css) -+ content/browser/manual/static/fonts/fontawesome/css/fontawesome.min.css (content/manual/static/fonts/fontawesome/css/fontawesome.min.css) -+ content/browser/manual/static/fonts/fontawesome/css/regular.css (content/manual/static/fonts/fontawesome/css/regular.css) -+ content/browser/manual/static/fonts/fontawesome/css/regular.min.css (content/manual/static/fonts/fontawesome/css/regular.min.css) -+ content/browser/manual/static/fonts/fontawesome/css/solid.css (content/manual/static/fonts/fontawesome/css/solid.css) -+ content/browser/manual/static/fonts/fontawesome/css/solid.min.css (content/manual/static/fonts/fontawesome/css/solid.min.css) -+ content/browser/manual/static/fonts/fontawesome/css/svg-with-js.css (content/manual/static/fonts/fontawesome/css/svg-with-js.css) -+ content/browser/manual/static/fonts/fontawesome/css/svg-with-js.min.css (content/manual/static/fonts/fontawesome/css/svg-with-js.min.css) -+ content/browser/manual/static/fonts/fontawesome/css/v4-shims.css (content/manual/static/fonts/fontawesome/css/v4-shims.css) -+ content/browser/manual/static/fonts/fontawesome/css/v4-shims.min.css (content/manual/static/fonts/fontawesome/css/v4-shims.min.css) -+ content/browser/manual/static/fonts/fontawesome/png/dark/solid/arrow-down.png (content/manual/static/fonts/fontawesome/png/dark/solid/arrow-down.png) -+ content/browser/manual/static/fonts/fontawesome/png/dark/solid/language.png (content/manual/static/fonts/fontawesome/png/dark/solid/language.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/brands/facebook.png (content/manual/static/fonts/fontawesome/png/primary/brands/facebook.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/brands/instagram.png (content/manual/static/fonts/fontawesome/png/primary/brands/instagram.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/brands/linkedin.png (content/manual/static/fonts/fontawesome/png/primary/brands/linkedin.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/brands/mastodon.png (content/manual/static/fonts/fontawesome/png/primary/brands/mastodon.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/brands/telegram.png (content/manual/static/fonts/fontawesome/png/primary/brands/telegram.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/brands/twitter.png (content/manual/static/fonts/fontawesome/png/primary/brands/twitter.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/brands/youtube.png (content/manual/static/fonts/fontawesome/png/primary/brands/youtube.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/regular/file-alt.png (content/manual/static/fonts/fontawesome/png/primary/regular/file-alt.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/arrow-down.png (content/manual/static/fonts/fontawesome/png/primary/solid/arrow-down.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/arrow-right.png (content/manual/static/fonts/fontawesome/png/primary/solid/arrow-right.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/comments.png (content/manual/static/fonts/fontawesome/png/primary/solid/comments.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/cube.png (content/manual/static/fonts/fontawesome/png/primary/solid/cube.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/flag.png (content/manual/static/fonts/fontawesome/png/primary/solid/flag.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/folder-open.png (content/manual/static/fonts/fontawesome/png/primary/solid/folder-open.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/hands-helping.png (content/manual/static/fonts/fontawesome/png/primary/solid/hands-helping.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/key.png (content/manual/static/fonts/fontawesome/png/primary/solid/key.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/language.png (content/manual/static/fonts/fontawesome/png/primary/solid/language.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/life-ring.png (content/manual/static/fonts/fontawesome/png/primary/solid/life-ring.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/lock.png (content/manual/static/fonts/fontawesome/png/primary/solid/lock.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/magnifying-glass.png (content/manual/static/fonts/fontawesome/png/primary/solid/magnifying-glass.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/paper-plane.png (content/manual/static/fonts/fontawesome/png/primary/solid/paper-plane.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/signature.png (content/manual/static/fonts/fontawesome/png/primary/solid/signature.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/spider.png (content/manual/static/fonts/fontawesome/png/primary/solid/spider.png) -+ content/browser/manual/static/fonts/fontawesome/png/primary/solid/table-tennis.png (content/manual/static/fonts/fontawesome/png/primary/solid/table-tennis.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/brands/android.png (content/manual/static/fonts/fontawesome/png/white/brands/android.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/brands/apple.png (content/manual/static/fonts/fontawesome/png/white/brands/apple.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/brands/facebook.png (content/manual/static/fonts/fontawesome/png/white/brands/facebook.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/brands/github.png (content/manual/static/fonts/fontawesome/png/white/brands/github.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/brands/instagram.png (content/manual/static/fonts/fontawesome/png/white/brands/instagram.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/brands/linkedin.png (content/manual/static/fonts/fontawesome/png/white/brands/linkedin.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/brands/linux.png (content/manual/static/fonts/fontawesome/png/white/brands/linux.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/brands/mastodon.png (content/manual/static/fonts/fontawesome/png/white/brands/mastodon.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/brands/twitter.png (content/manual/static/fonts/fontawesome/png/white/brands/twitter.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/brands/windows.png (content/manual/static/fonts/fontawesome/png/white/brands/windows.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/solid/arrow-down.png (content/manual/static/fonts/fontawesome/png/white/solid/arrow-down.png) -+ content/browser/manual/static/fonts/fontawesome/png/white/solid/arrow-right.png (content/manual/static/fonts/fontawesome/png/white/solid/arrow-right.png) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-brands-400.eot (content/manual/static/fonts/fontawesome/webfonts/fa-brands-400.eot) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-brands-400.svg (content/manual/static/fonts/fontawesome/webfonts/fa-brands-400.svg) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-brands-400.ttf (content/manual/static/fonts/fontawesome/webfonts/fa-brands-400.ttf) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-brands-400.woff (content/manual/static/fonts/fontawesome/webfonts/fa-brands-400.woff) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-brands-400.woff2 (content/manual/static/fonts/fontawesome/webfonts/fa-brands-400.woff2) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-regular-400.eot (content/manual/static/fonts/fontawesome/webfonts/fa-regular-400.eot) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-regular-400.svg (content/manual/static/fonts/fontawesome/webfonts/fa-regular-400.svg) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-regular-400.ttf (content/manual/static/fonts/fontawesome/webfonts/fa-regular-400.ttf) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-regular-400.woff (content/manual/static/fonts/fontawesome/webfonts/fa-regular-400.woff) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-regular-400.woff2 (content/manual/static/fonts/fontawesome/webfonts/fa-regular-400.woff2) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-solid-900.eot (content/manual/static/fonts/fontawesome/webfonts/fa-solid-900.eot) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-solid-900.svg (content/manual/static/fonts/fontawesome/webfonts/fa-solid-900.svg) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-solid-900.ttf (content/manual/static/fonts/fontawesome/webfonts/fa-solid-900.ttf) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-solid-900.woff (content/manual/static/fonts/fontawesome/webfonts/fa-solid-900.woff) -+ content/browser/manual/static/fonts/fontawesome/webfonts/fa-solid-900.woff2 (content/manual/static/fonts/fontawesome/webfonts/fa-solid-900.woff2) -+ content/browser/manual/static/fonts/grotesque/terminal-grotesque_open.otf (content/manual/static/fonts/grotesque/terminal-grotesque_open.otf) -+ content/browser/manual/static/images/android-censored.png (content/manual/static/images/android-censored.png) -+ content/browser/manual/static/images/android-configure.png (content/manual/static/images/android-configure.png) -+ content/browser/manual/static/images/android-connect.png (content/manual/static/images/android-connect.png) -+ content/browser/manual/static/images/android-new-identity.png (content/manual/static/images/android-new-identity.png) -+ content/browser/manual/static/images/android-provide-a-bridge.png (content/manual/static/images/android-provide-a-bridge.png) -+ content/browser/manual/static/images/android-provided-a-bridge.png (content/manual/static/images/android-provided-a-bridge.png) -+ content/browser/manual/static/images/android-security-settings.gif (content/manual/static/images/android-security-settings.gif) -+ content/browser/manual/static/images/android-select-a-bridge.png (content/manual/static/images/android-select-a-bridge.png) -+ content/browser/manual/static/images/android-selected-a-bridge.png (content/manual/static/images/android-selected-a-bridge.png) -+ content/browser/manual/static/images/android-uninstall-device-settings.png (content/manual/static/images/android-uninstall-device-settings.png) -+ content/browser/manual/static/images/android-uninstall-f-droid.png (content/manual/static/images/android-uninstall-f-droid.png) -+ content/browser/manual/static/images/android-uninstall-google-play.png (content/manual/static/images/android-uninstall-google-play.png) -+ content/browser/manual/static/images/android-update-f-droid.png (content/manual/static/images/android-update-f-droid.png) -+ content/browser/manual/static/images/android-update-google-play.png (content/manual/static/images/android-update-google-play.png) -+ content/browser/manual/static/images/android-view-logs.gif (content/manual/static/images/android-view-logs.gif) -+ content/browser/manual/static/images/bridge-qr.png (content/manual/static/images/bridge-qr.png) -+ content/browser/manual/static/images/bridgemoji.png (content/manual/static/images/bridgemoji.png) -+ content/browser/manual/static/images/built-in-bridge.png (content/manual/static/images/built-in-bridge.png) -+ content/browser/manual/static/images/circuit_full.png (content/manual/static/images/circuit_full.png) -+ content/browser/manual/static/images/client-auth.png (content/manual/static/images/client-auth.png) -+ content/browser/manual/static/images/configure.png (content/manual/static/images/configure.png) -+ content/browser/manual/static/images/connect.png (content/manual/static/images/connect.png) -+ content/browser/manual/static/images/connection-assist-auto.png (content/manual/static/images/connection-assist-auto.png) -+ content/browser/manual/static/images/connection-assist-offline.png (content/manual/static/images/connection-assist-offline.png) -+ content/browser/manual/static/images/connection-assist-select.png (content/manual/static/images/connection-assist-select.png) -+ content/browser/manual/static/images/connection-assist-test.png (content/manual/static/images/connection-assist-test.png) -+ content/browser/manual/static/images/connection-test-failure.png (content/manual/static/images/connection-test-failure.png) -+ content/browser/manual/static/images/connection-test-success.png (content/manual/static/images/connection-test-success.png) -+ content/browser/manual/static/images/gettor-bot-telegram.png (content/manual/static/images/gettor-bot-telegram.png) -+ content/browser/manual/static/images/how-tor-works.png (content/manual/static/images/how-tor-works.png) -+ content/browser/manual/static/images/http-website-error.png (content/manual/static/images/http-website-error.png) -+ content/browser/manual/static/images/https-only-mode.png (content/manual/static/images/https-only-mode.png) -+ content/browser/manual/static/images/linux-make-desktop-file-executable.png (content/manual/static/images/linux-make-desktop-file-executable.png) -+ content/browser/manual/static/images/macos-go-to-folder-menu.png (content/manual/static/images/macos-go-to-folder-menu.png) -+ content/browser/manual/static/images/macos-go-to-folder-window.png (content/manual/static/images/macos-go-to-folder-window.png) -+ content/browser/manual/static/images/new_identity.png (content/manual/static/images/new_identity.png) -+ content/browser/manual/static/images/onion-location.png (content/manual/static/images/onion-location.png) -+ content/browser/manual/static/images/pluggable-transport.png (content/manual/static/images/pluggable-transport.png) -+ content/browser/manual/static/images/provide-bridge.png (content/manual/static/images/provide-bridge.png) -+ content/browser/manual/static/images/proxy.png (content/manual/static/images/proxy.png) -+ content/browser/manual/static/images/quickstart.png (content/manual/static/images/quickstart.png) -+ content/browser/manual/static/images/request-a-bridge.png (content/manual/static/images/request-a-bridge.png) -+ content/browser/manual/static/images/security-settings-anim.gif (content/manual/static/images/security-settings-anim.gif) -+ content/browser/manual/static/images/security-settings-safest.png (content/manual/static/images/security-settings-safest.png) -+ content/browser/manual/static/images/tor-https-0.png (content/manual/static/images/tor-https-0.png) -+ content/browser/manual/static/images/tor-https-1.png (content/manual/static/images/tor-https-1.png) -+ content/browser/manual/static/images/tor-https-2.png (content/manual/static/images/tor-https-2.png) -+ content/browser/manual/static/images/tor-https-3.png (content/manual/static/images/tor-https-3.png) -+ content/browser/manual/static/images/update1.png (content/manual/static/images/update1.png) -+ content/browser/manual/static/images/update4.png (content/manual/static/images/update4.png) -+ content/browser/manual/static/js/anchor.min.js (content/manual/static/js/anchor.min.js) -+ content/browser/manual/static/js/bootstrap.bundle.js (content/manual/static/js/bootstrap.bundle.js) -+ content/browser/manual/static/js/bootstrap.bundle.js.map (content/manual/static/js/bootstrap.bundle.js.map) -+ content/browser/manual/static/js/bootstrap.bundle.min.js (content/manual/static/js/bootstrap.bundle.min.js) -+ content/browser/manual/static/js/bootstrap.bundle.min.js.map (content/manual/static/js/bootstrap.bundle.min.js.map) -+ content/browser/manual/static/js/bootstrap.js (content/manual/static/js/bootstrap.js) -+ content/browser/manual/static/js/bootstrap.js.map (content/manual/static/js/bootstrap.js.map) -+ content/browser/manual/static/js/bootstrap.min.js (content/manual/static/js/bootstrap.min.js) -+ content/browser/manual/static/js/bootstrap.min.js.map (content/manual/static/js/bootstrap.min.js.map) -+ content/browser/manual/static/js/clipboard.min.js (content/manual/static/js/clipboard.min.js) -+ content/browser/manual/static/js/collapse.min.js (content/manual/static/js/collapse.min.js) -+ content/browser/manual/static/js/download.js (content/manual/static/js/download.js) -+ content/browser/manual/static/js/errors.js (content/manual/static/js/errors.js) -+ content/browser/manual/static/js/fallback.js (content/manual/static/js/fallback.js) -+ content/browser/manual/static/js/holder.min.js (content/manual/static/js/holder.min.js) -+ content/browser/manual/static/js/jquery-3.2.1.min.js (content/manual/static/js/jquery-3.2.1.min.js) -+ content/browser/manual/static/js/jquery-slim.min.js (content/manual/static/js/jquery-slim.min.js) -+ content/browser/manual/static/js/modernizr.js (content/manual/static/js/modernizr.js) -+ content/browser/manual/static/js/popper.min.js (content/manual/static/js/popper.min.js) -+ content/browser/manual/static/js/scrollspy.min.js (content/manual/static/js/scrollspy.min.js) -+ content/browser/manual/static/js/util.min.js (content/manual/static/js/util.min.js) -+ content/browser/manual/sw.html (content/manual/sw.html) -+ content/browser/manual/th.html (content/manual/th.html) -+ content/browser/manual/tr.html (content/manual/tr.html) -+ content/browser/manual/uk.html (content/manual/uk.html) -+ content/browser/manual/vi.html (content/manual/vi.html) -+ content/browser/manual/zh-CN.html (content/manual/zh-CN.html) -+ content/browser/manual/zh-TW.html (content/manual/zh-TW.html) + content/browser/languageNotification.js (content/languageNotification.js) ++ ++ ++ content/browser/manual/pl.html (content/manual/pl.html) ++ content/browser/manual/my.html (content/manual/my.html) ++ content/browser/manual/fa.html (content/manual/fa.html) ++ content/browser/manual/ja.html (content/manual/ja.html) ++ content/browser/manual/ca.html (content/manual/ca.html) ++ content/browser/manual/ga.html (content/manual/ga.html) ++ content/browser/manual/en.html (content/manual/en.html) ++ content/browser/manual/vi.html (content/manual/vi.html) ++ content/browser/manual/he.html (content/manual/he.html) ++ content/browser/manual/ro.html (content/manual/ro.html) ++ content/browser/manual/fr.html (content/manual/fr.html) ++ content/browser/manual/it.html (content/manual/it.html) ++ content/browser/manual/ar.html (content/manual/ar.html) ++ content/browser/manual/bg.html (content/manual/bg.html) ++ content/browser/manual/pt-BR.html (content/manual/pt-BR.html) ++ content/browser/manual/hu.html (content/manual/hu.html) ++ content/browser/manual/de.html (content/manual/de.html) ++ content/browser/manual/es.html (content/manual/es.html) ++ content/browser/manual/ka.html (content/manual/ka.html) ++ content/browser/manual/ru.html (content/manual/ru.html) ++ content/browser/manual/be.html (content/manual/be.html) ++ content/browser/manual/lt.html (content/manual/lt.html) ++ content/browser/manual/zh-CN.html (content/manual/zh-CN.html) ++ content/browser/manual/km.html (content/manual/km.html) ++ content/browser/manual/tk.html (content/manual/tk.html) ++ content/browser/manual/tr.html (content/manual/tr.html) ++ content/browser/manual/th.html (content/manual/th.html) ++ content/browser/manual/pt-PT.html (content/manual/pt-PT.html) ++ content/browser/manual/static/collapse.min.js (content/manual/static/collapse.min.js) ++ content/browser/manual/static/js/bootstrap.min.js (content/manual/static/js/bootstrap.min.js) ++ content/browser/manual/static/js/bootstrap.js (content/manual/static/js/bootstrap.js) ++ content/browser/manual/static/js/anchor.min.js (content/manual/static/js/anchor.min.js) ++ content/browser/manual/static/js/bootstrap.bundle.min.js (content/manual/static/js/bootstrap.bundle.min.js) ++ content/browser/manual/static/js/holder.min.js (content/manual/static/js/holder.min.js) ++ content/browser/manual/static/js/util.min.js (content/manual/static/js/util.min.js) ++ content/browser/manual/static/js/clipboard.min.js (content/manual/static/js/clipboard.min.js) ++ content/browser/manual/static/js/jquery-3.2.1.min.js (content/manual/static/js/jquery-3.2.1.min.js) ++ content/browser/manual/static/js/fallback.js (content/manual/static/js/fallback.js) ++ content/browser/manual/static/js/scrollspy.min.js (content/manual/static/js/scrollspy.min.js) ++ content/browser/manual/static/js/bootstrap.bundle.js (content/manual/static/js/bootstrap.bundle.js) ++ content/browser/manual/static/js/errors.js (content/manual/static/js/errors.js) ++ content/browser/manual/static/js/popper.min.js (content/manual/static/js/popper.min.js) ++ content/browser/manual/static/js/modernizr.js (content/manual/static/js/modernizr.js) ++ content/browser/manual/static/js/jquery-slim.min.js (content/manual/static/js/jquery-slim.min.js) ++ content/browser/manual/static/js/download.js (content/manual/static/js/download.js) ++ content/browser/manual/static/js/collapse.min.js (content/manual/static/js/collapse.min.js) ++ content/browser/manual/static/images/macos-go-to-folder-window.png (content/manual/static/images/macos-go-to-folder-window.png) ++ content/browser/manual/static/images/android-uninstall-google-play.png (content/manual/static/images/android-uninstall-google-play.png) ++ content/browser/manual/static/images/connect.png (content/manual/static/images/connect.png) ++ content/browser/manual/static/images/macos-go-to-folder-menu.png (content/manual/static/images/macos-go-to-folder-menu.png) ++ content/browser/manual/static/images/how-tor-works.png (content/manual/static/images/how-tor-works.png) ++ content/browser/manual/static/images/android-update-f-droid.png (content/manual/static/images/android-update-f-droid.png) ++ content/browser/manual/static/images/security-settings-anim.gif (content/manual/static/images/security-settings-anim.gif) ++ content/browser/manual/static/images/connection-assist-offline.png (content/manual/static/images/connection-assist-offline.png) ++ content/browser/manual/static/images/configure.png (content/manual/static/images/configure.png) ++ content/browser/manual/static/images/https-only-mode.png (content/manual/static/images/https-only-mode.png) ++ content/browser/manual/static/images/android-security-settings.gif (content/manual/static/images/android-security-settings.gif) ++ content/browser/manual/static/images/gettor-bot-telegram.png (content/manual/static/images/gettor-bot-telegram.png) ++ content/browser/manual/static/images/http-website-error.png (content/manual/static/images/http-website-error.png) ++ content/browser/manual/static/images/request-a-bridge.png (content/manual/static/images/request-a-bridge.png) ++ content/browser/manual/static/images/proxy.png (content/manual/static/images/proxy.png) ++ content/browser/manual/static/images/cryptocurrency-safety.png (content/manual/static/images/cryptocurrency-safety.png) ++ content/browser/manual/static/images/onion-location.png (content/manual/static/images/onion-location.png) ++ content/browser/manual/static/images/update4.png (content/manual/static/images/update4.png) ++ content/browser/manual/static/images/android-provide-a-bridge.png (content/manual/static/images/android-provide-a-bridge.png) ++ content/browser/manual/static/images/connection-test-success.png (content/manual/static/images/connection-test-success.png) ++ content/browser/manual/static/images/built-in-bridge.png (content/manual/static/images/built-in-bridge.png) ++ content/browser/manual/static/images/circuit_full.png (content/manual/static/images/circuit_full.png) ++ content/browser/manual/static/images/connection-assist-test.png (content/manual/static/images/connection-assist-test.png) ++ content/browser/manual/static/images/android-configure.png (content/manual/static/images/android-configure.png) ++ content/browser/manual/static/images/android-new-identity.png (content/manual/static/images/android-new-identity.png) ++ content/browser/manual/static/images/connection-assist-auto.png (content/manual/static/images/connection-assist-auto.png) ++ content/browser/manual/static/images/bridgemoji.png (content/manual/static/images/bridgemoji.png) ++ content/browser/manual/static/images/android-connect.png (content/manual/static/images/android-connect.png) ++ content/browser/manual/static/images/provide-bridge.png (content/manual/static/images/provide-bridge.png) ++ content/browser/manual/static/images/android-update-google-play.png (content/manual/static/images/android-update-google-play.png) ++ content/browser/manual/static/images/security-settings-safest.png (content/manual/static/images/security-settings-safest.png) ++ content/browser/manual/static/images/tor-https-3.png (content/manual/static/images/tor-https-3.png) ++ content/browser/manual/static/images/bridge-qr.png (content/manual/static/images/bridge-qr.png) ++ content/browser/manual/static/images/android-select-a-bridge.png (content/manual/static/images/android-select-a-bridge.png) ++ content/browser/manual/static/images/letterboxing.png (content/manual/static/images/letterboxing.png) ++ content/browser/manual/static/images/quickstart.png (content/manual/static/images/quickstart.png) ++ content/browser/manual/static/images/android-view-logs.png (content/manual/static/images/android-view-logs.png) ++ content/browser/manual/static/images/android-provided-a-bridge.png (content/manual/static/images/android-provided-a-bridge.png) ++ content/browser/manual/static/images/update1.png (content/manual/static/images/update1.png) ++ content/browser/manual/static/images/android-uninstall-f-droid.png (content/manual/static/images/android-uninstall-f-droid.png) ++ content/browser/manual/static/images/new_identity.png (content/manual/static/images/new_identity.png) ++ content/browser/manual/static/images/connection-test-failure.png (content/manual/static/images/connection-test-failure.png) ++ content/browser/manual/static/images/android-uninstall-device-settings.png (content/manual/static/images/android-uninstall-device-settings.png) ++ content/browser/manual/static/images/pluggable-transport.png (content/manual/static/images/pluggable-transport.png) ++ content/browser/manual/static/images/connection-assist-select.png (content/manual/static/images/connection-assist-select.png) ++ content/browser/manual/static/images/client-auth.png (content/manual/static/images/client-auth.png) ++ content/browser/manual/static/images/tor-https-2.png (content/manual/static/images/tor-https-2.png) ++ content/browser/manual/static/images/tor-https-0.png (content/manual/static/images/tor-https-0.png) ++ content/browser/manual/static/images/tor-https-1.png (content/manual/static/images/tor-https-1.png) ++ content/browser/manual/static/images/android-selected-a-bridge.png (content/manual/static/images/android-selected-a-bridge.png) ++ content/browser/manual/static/css/bootstrap.css (content/manual/static/css/bootstrap.css) ++ content/browser/manual/static/css/bootstrap-reboot.css (content/manual/static/css/bootstrap-reboot.css) ++ content/browser/manual/static/css/bootstrap-grid.css (content/manual/static/css/bootstrap-grid.css) ++ content/browser/manual/ps.html (content/manual/ps.html) ++ content/browser/manual/zh-TW.html (content/manual/zh-TW.html) ++ content/browser/manual/fi.html (content/manual/fi.html) ++ content/browser/manual/bn.html (content/manual/bn.html) ++ content/browser/manual/sq.html (content/manual/sq.html) ++ content/browser/manual/id.html (content/manual/id.html) ++ content/browser/manual/wo.html (content/manual/wo.html) ++ content/browser/manual/ko.html (content/manual/ko.html) ++ content/browser/manual/sw.html (content/manual/sw.html) ++ content/browser/manual/mk.html (content/manual/mk.html) ++ content/browser/manual/is.html (content/manual/is.html) ++ content/browser/manual/uk.html (content/manual/uk.html) ++ content/browser/manual/el.html (content/manual/el.html) diff --git a/www/tor-browser/files/patch-bug1427152 b/www/tor-browser/files/patch-bug1427152 deleted file mode 100644 index 49bd5a581ac8..000000000000 --- a/www/tor-browser/files/patch-bug1427152 +++ /dev/null @@ -1,10 +0,0 @@ ---- modules/libpref/Preferences.cpp.orig 2023-05-11 21:42:41 UTC -+++ modules/libpref/Preferences.cpp -@@ -6126,6 +6126,7 @@ static const PrefListEntry sDynamicPrefOverrideList[]{ - PREF_LIST_ENTRY("logging.config.LOG_FILE"), - PREF_LIST_ENTRY("media.audio_loopback_dev"), - PREF_LIST_ENTRY("media.decoder-doctor."), -+ PREF_LIST_ENTRY("media.cubeb.backend"), - PREF_LIST_ENTRY("media.cubeb.output_device"), - PREF_LIST_ENTRY("media.getusermedia.fake-camera-name"), - PREF_LIST_ENTRY("media.hls.server.url"), diff --git a/www/tor-browser/files/patch-bug1559213 b/www/tor-browser/files/patch-bug1559213 index 49bbb0fb05ff..ead3425fa70b 100644 --- a/www/tor-browser/files/patch-bug1559213 +++ b/www/tor-browser/files/patch-bug1559213 @@ -1,20 +1,19 @@ -commit 717bba28411c -Author: Jory A. Pratt <anarchy@gentoo.org> -Date: Thu Jun 13 11:53:00 2019 -0700 +commit 25a5572d5cd137aa6d893e09a00bd39908a59a18 +Author: Christoph Moench-Tegeder <cmt@burggraben.net> +Date: Tue Sep 10 22:23:32 2024 +0200 - Bug 1559213 - Allow to use system av1 libs instead of bundled. ---- - config/external/moz.build | 5 +++-- - config/system-headers.mozbuild | 8 ++++++++ - dom/media/platforms/moz.build | 5 +++++ - toolkit/moz.configure | 19 ++++++++++++++++++- - 4 files changed, 34 insertions(+), 3 deletions(-) + based on: + commit 717bba28411c + Author: Jory A. Pratt <anarchy@gentoo.org> + Date: Thu Jun 13 11:53:00 2019 -0700 + + Bug 1559213 - Allow to use system av1 libs instead of bundled. diff --git config/external/moz.build config/external/moz.build -index ab77121..75595d9 100644 +index a24b470396cf..547f5f5c9e04 100644 --- config/external/moz.build +++ config/external/moz.build -@@ -49,8 +49,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]: +@@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]: external_dirs += ["media/libvpx"] if CONFIG["MOZ_AV1"]: @@ -26,30 +25,11 @@ index ab77121..75595d9 100644 if not CONFIG["MOZ_SYSTEM_PNG"]: external_dirs += ["media/libpng"] -diff --git config/system-headers.mozbuild config/system-headers.mozbuild -index a1b58eb..65729f9 100644 ---- config/system-headers.mozbuild -+++ config/system-headers.mozbuild -@@ -1289,6 +1289,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']: - 'proxy.h', - ] - -+if CONFIG['MOZ_SYSTEM_AV1']: -+ system_headers += [ -+ 'aom/aom_decoder.h', -+ 'aom/aomdx.h', -+ 'aom/aom_image.h', -+ 'dav1d/dav1d.h', -+ ] -+ - if CONFIG['MOZ_SYSTEM_LIBVPX']: - system_headers += [ - 'vpx_mem/vpx_mem.h', diff --git dom/media/platforms/moz.build dom/media/platforms/moz.build -index 8509aec..eb6f129 100644 +index 61536cc6e225..29cf635bbb44 100644 --- dom/media/platforms/moz.build +++ dom/media/platforms/moz.build -@@ -78,6 +78,11 @@ if CONFIG["MOZ_AV1"]: +@@ -71,6 +71,11 @@ if CONFIG["MOZ_AV1"]: "agnostic/AOMDecoder.cpp", "agnostic/DAV1DDecoder.cpp", ] @@ -62,33 +42,61 @@ index 8509aec..eb6f129 100644 if CONFIG["MOZ_OMX"]: EXPORTS += [ diff --git media/ffvpx/libavcodec/moz.build media/ffvpx/libavcodec/moz.build -index 0069865..e806fc8 100644 ---- media/ffvpx/libavcodec/moz.build.orig +index 6f09049a6068..90a82a19a9d1 100644 +--- media/ffvpx/libavcodec/moz.build +++ media/ffvpx/libavcodec/moz.build -@@ -108,10 +108,14 @@ - 'vp9prob.c', - 'vp9recon.c' +@@ -119,10 +119,16 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: + 'vp9recon.c', + 'vpx_rac.c', ] - USE_LIBS += [ - 'dav1d', - 'media_libdav1d_asm', - ] + if CONFIG["MOZ_SYSTEM_AV1"]: -+ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS'] -+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS'] ++ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS'] ++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS'] ++ CFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS'] ++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS'] + else: -+ USE_LIBS += [ -+ 'dav1d', -+ 'media_libdav1d_asm', -+ ] - if CONFIG['MOZ_WAYLAND']: ++ USE_LIBS += [ ++ 'dav1d', ++ 'media_libdav1d_asm', ++ ] + if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": LOCAL_INCLUDES += ['/media/mozva'] SOURCES += [ +diff --git media/libopus/moz.build media/libopus/moz.build *** 101433 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411121508.4ACF8YNw075959>