Date: Mon, 24 Apr 2023 19:04:59 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: adbe1aa26648 - 2023Q2 - www/firefox: update to 112.0.2 (rc1) Message-ID: <202304241904.33OJ4x3I014392@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=adbe1aa2664854a8358231c0ea62776477c768ac commit adbe1aa2664854a8358231c0ea62776477c768ac Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2023-04-24 19:02:58 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2023-04-24 19:04:43 +0000 www/firefox: update to 112.0.2 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/112.0.2/releasenotes/ (cherry picked from commit c1d46995f7f87c659067f4239b6e3123e560c05e) --- www/firefox/Makefile | 3 +-- www/firefox/distinfo | 6 ++--- www/firefox/files/patch-bug1827950 | 51 -------------------------------------- 3 files changed, 4 insertions(+), 56 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 6cd9cd0d5570..bed01b91a6f0 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,6 +1,5 @@ PORTNAME= firefox -DISTVERSION= 112.0.1 -PORTREVISION= 1 +DISTVERSION= 112.0.2 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index e952c3d43dc8..1a0c012c2c19 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681495514 -SHA256 (firefox-112.0.1.source.tar.xz) = 5d2b2886812fe1bc62b7801495d375e3de94ca160a676057d1df92de87efb649 -SIZE (firefox-112.0.1.source.tar.xz) = 506649248 +TIMESTAMP = 1682357747 +SHA256 (firefox-112.0.2.source.tar.xz) = e6a4819a3b82b1ca6c45296e50e6c9ab653306eeb540e50ba8683e339565992e +SIZE (firefox-112.0.2.source.tar.xz) = 504773576 diff --git a/www/firefox/files/patch-bug1827950 b/www/firefox/files/patch-bug1827950 deleted file mode 100644 index d00147a7380e..000000000000 --- a/www/firefox/files/patch-bug1827950 +++ /dev/null @@ -1,51 +0,0 @@ -diff --git gfx/thebes/gfxFont.cpp gfx/thebes/gfxFont.cpp ---- gfx/thebes/gfxFont.cpp -+++ gfx/thebes/gfxFont.cpp -@@ -2467,11 +2467,19 @@ - fontParams.extraStrikes = 0; - } - - // Figure out the maximum extents for the font, accounting for synthetic - // oblique and bold. -- fontParams.fontExtents = GetFontEntry()->GetFontExtents(mFUnitsConvFactor); -+ if (mFUnitsConvFactor > 0.0) { -+ fontParams.fontExtents = GetFontEntry()->GetFontExtents(mFUnitsConvFactor); -+ } else { -+ // Was it not an sfnt? Maybe on Linux... use arbitrary huge extents, so we -+ // don't inadvertently clip stuff. A bit less efficient than true extents, -+ // but this should be extremely rare. -+ auto size = GetAdjustedSize(); -+ fontParams.fontExtents = Rect(-2 * size, -2 * size, 5 * size, 5 * size); -+ } - if (fontParams.obliqueSkew != 0.0f) { - gfx::Point p(fontParams.fontExtents.x, fontParams.fontExtents.y); - gfx::Matrix skew(1, 0, fontParams.obliqueSkew, 1, 0, 0); - fontParams.fontExtents = skew.TransformBounds(fontParams.fontExtents); - } -diff --git gfx/thebes/gfxFontEntry.cpp gfx/thebes/gfxFontEntry.cpp ---- gfx/thebes/gfxFontEntry.cpp -+++ gfx/thebes/gfxFontEntry.cpp -@@ -282,15 +282,18 @@ - uint32_t len; - const HeadTable* head = - reinterpret_cast<const HeadTable*>(hb_blob_get_data(headTable, &len)); - if (len >= sizeof(HeadTable)) { - mUnitsPerEm = head->unitsPerEm; -+ if (int16_t(head->xMax) > int16_t(head->xMin) && -+ int16_t(head->yMax) > int16_t(head->yMin)) { -+ mXMin = head->xMin; -+ mYMin = head->yMin; -+ mXMax = head->xMax; -+ mYMax = head->yMax; -+ } - } -- mXMin = head->xMin; -- mYMin = head->yMin; -- mXMax = head->xMax; -- mYMax = head->yMax; - } - - // if we didn't find a usable 'head' table, or if the value was - // outside the valid range, record it as invalid - if (mUnitsPerEm < kMinUPEM || mUnitsPerEm > kMaxUPEM) { -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304241904.33OJ4x3I014392>