From nobody Tue Apr 09 21:45:30 2024 X-Original-To: dev-commits-ports-branches@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 4VDfdk221Cz5G4pK; Tue, 9 Apr 2024 21:45:30 +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 4VDfdk1V53z56LF; Tue, 9 Apr 2024 21:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712699130; 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=bRBvPZKa9OYAgjeyzkqAIJXNeOsOZns/jmhQthjZPUw=; b=LVsJ7dImlcKbLkTDu+lY+fBryaxWDuxS+ug7DxUck8BSuzRDA4LehreflibEjp4XPqVG2V qgM0LX06dhcIE4yZtVs6Pb069sXLAMBIKtcPykmqiVsLFi79/9uWwhuVepwBek0xLlYq0i 1CJ+B/bjhPVBXILmQtYonoUUoSyX20BktXS3M28I29GZE2ovtJfq+Ookn+cpiFJ78lbNvA /XL18J5cy8qYyc5kLiLBD4PrRPcbc60BlnKriDHdNu2eW/p8nrsb4qfJAbjW5gBsiN3yLi OOY2kVkbxk8dlNR/fA/BeGuG6sRT5uxw6YN1F3KLoYc51U6oXsDiB4K9dimJUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712699130; a=rsa-sha256; cv=none; b=tnJg8xJAr+aj+y/iYfpIWfU2UKK1ni4EcMiRQ23F3FJShUng3bFkiWpmYSfRPsYRh6LRvG liV+m9SJZpzx4wJ+duyetOWrp1X88IyM9/Urbh6QeQek1Xp2KmbvxnjgKEbHvHmWALKhZH e0Zdb1bQRI5jqx+3226f2LCMyI5vfYWz8Ztpe0+8w9N0CmjA7YcUVmKMohcxRxpKMS1Qp8 wS9bTjiJDAcVmH3pKbQMSnFm2MZprh+pKlMN6Cwuluya6zbnDN2u+vKamuF2Yyw6CYS5oy YbKjc4+C9YZthBDvMGcdw77LEf7EIbY6MynrAhOfSlKYC3UUKUhjXpPQLVbzAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712699130; 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=bRBvPZKa9OYAgjeyzkqAIJXNeOsOZns/jmhQthjZPUw=; b=gICD5PjHMwyY8g3qLjnmbyg26ZQgK+9Rh7PAgdcGYJ+qpLgbP3uoNmuWZfe8comz4eSTHz quFPheAApljw1gQCTi4Sq3cJT+/fi11ApEpRiDSaonujZE2PxcmmcmCCE3GSOOsP/Vwewu bthPKArPL+n/fpkMQ4OiM1SPeYM4CbuXLG9U90GaBsTQVGXsXn/pfwdzhBJ1Di/KX65Z8v yPQBQ44Y2HFOq7dA4nqIFk9Oeyx1w4SINlBA5f+nSY3kw6cukMWGo7JpWxrB9BFPiU6uyo uaegaGDE8FF2DKRyNJCGwYAQF92aGKLXrJ8iNmY5Llel53F6qE3gK8oVUXudVw== 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 4VDfdk15KWz19xt; Tue, 9 Apr 2024 21:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 439LjUbG014635; Tue, 9 Apr 2024 21:45:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 439LjUDL014632; Tue, 9 Apr 2024 21:45:30 GMT (envelope-from git) Date: Tue, 9 Apr 2024 21:45:30 GMT Message-Id: <202404092145.439LjUDL014632@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: fef77c354113 - 2024Q2 - www/firefox: fix runtime when LIBPROXY=on List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-ports-branches+owner@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: fef77c354113e5c257ac9bc71b9ad8997825ad7c Auto-Submitted: auto-generated The branch 2024Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=fef77c354113e5c257ac9bc71b9ad8997825ad7c commit fef77c354113e5c257ac9bc71b9ad8997825ad7c Author: Christoph Moench-Tegeder AuthorDate: 2024-04-09 21:44:05 +0000 Commit: Christoph Moench-Tegeder 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 +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(); + }