Date: Tue, 9 Apr 2024 21:45:30 GMT From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: fef77c354113 - 2024Q2 - www/firefox: fix runtime when LIBPROXY=on Message-ID: <202404092145.439LjUDL014632@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=fef77c354113e5c257ac9bc71b9ad8997825ad7c commit fef77c354113e5c257ac9bc71b9ad8997825ad7c Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2024-04-09 21:44:05 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2024-04-09 21:45:17 +0000 www/firefox: fix runtime when LIBPROXY=on this is a preliminary fix for an upstream regression. (cherry picked from commit 14fdc59d457ec32b8e623636b02f47bcf2c68737) --- www/firefox/files/patch-bug1890593 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/www/firefox/files/patch-bug1890593 b/www/firefox/files/patch-bug1890593 new file mode 100644 index 000000000000..75a4da270e1a --- /dev/null +++ b/www/firefox/files/patch-bug1890593 @@ -0,0 +1,28 @@ +commit 9ef1582be54a8ff301336b397130e4d313fa3371 +Author: Christoph Moench-Tegeder <cmt@burggraben.net> +Date: Tue Apr 9 21:27:21 2024 +0200 + + bug 1890593 - GetSystemWPADSetting for libproxy-enabled builds + + In #621429 a call to nsUnixSystemProxySettings::GetSystemWPADSetting() + was added, but that function is not available for builds with + MOZ_ENABLE_LIBPROXY. The funtion is trivial enough to just + copy it across - else there'd more boilerplate than actual code. + +diff --git toolkit/system/unixproxy/nsLibProxySettings.cpp toolkit/system/unixproxy/nsLibProxySettings.cpp +index 4f6f43fb76e9..f2c782455426 100644 +--- toolkit/system/unixproxy/nsLibProxySettings.cpp ++++ toolkit/system/unixproxy/nsLibProxySettings.cpp +@@ -99,6 +99,12 @@ nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, + return NS_OK; + } + ++NS_IMETHODIMP ++nsUnixSystemProxySettings::GetSystemWPADSetting(bool* aSystemWPADSetting) { ++ *aSystemWPADSetting = false; ++ return NS_OK; ++} ++ + NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) { + return do_AddRef(new nsUnixSystemProxySettings()).downcast<nsISupports>(); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404092145.439LjUDL014632>