From nobody Mon Apr 24 19:03:39 2023 X-Original-To: dev-commits-ports-main@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 4Q4vfz4y5pz47DTv; Mon, 24 Apr 2023 19:03:39 +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 4Q4vfz46R7z3HqP; Mon, 24 Apr 2023 19:03:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682363019; 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=JIpvmFCoQOYzYqENg5IPTjHzR9iTNqYdRWyApvdcjk0=; b=ec4xL4b9pa4ji9YN739QEOxRW0k7ieQP69xs9y0R6TiUfKbMB2Co47D3GICUGkf3PRhQ3q DjJSVzFhnzJOlSHVNsPCORxmjpGDuWvUrmqmATiXZqszOxesHKw+oEzKO7ZItY7ikA3EBs ddh/ISucISnvvpMW7DTsUJQjyE39jCS9isyiLRswhVki/zVx8m/c4Gbja3TyM6Tsv4edtg OscmPdedBvtJluGwYbZZljvVK7DVn4/fx9otFvGIt+44SVcYYy377/sOG+LeCq3mZw8Dnh m8G2VUiyxJUWQnGL5844pXaem5rDqBKBFSDmuCsyfAcbeA9MzE51A2AIxf4/eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682363019; 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=JIpvmFCoQOYzYqENg5IPTjHzR9iTNqYdRWyApvdcjk0=; b=oA0xrGq4Pdk/OqIh1r90u0j+fmjLfFoat8KdXPJFnqX8suyRr1qzJK2zoxDCpMNJh/Y8hF FGE4qCoFwrlDzr+k7WmTj/1G3kKBV3GHqjXMI4xT0EZGI86TBWuXJNQeIly1I1jlyl0kha xdnYh4+x90saLqyWk1ah6adhC8jTC166FvZpExt/5+q6Hea3tRN6Y9OvWdh0r8boov8WhC AwccM3IkziuIkDnZQWTHohRaEEdknusuJhYypNbgodJUgs8UG7M6dmcr78x2enEcROl+Vu p8veF8WnMCCoxtP6kGIbHGR8YL/H2rs+oTY47tny92CNTokHGBcFCP8jmXLjZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682363019; a=rsa-sha256; cv=none; b=SxOM7Yvui3ycaWAKabsjbgNwn7B5jb6qtPV38Rzuz2mfhmQPvMW4Dt9KNB1hYHdF+R1Cly 1DQduG9wMVdRG7ccFEhrWWiaKo52qxN+sYK165zlgho6evEW2n1LDoQ7iHnFTaBdEKYIRv aSqsamv889wk9bSBbadyRsM30UUQOZGlGjHf1xF3HD+yCniZccz47lEB9DnQwO4JjSbIuN bzqxKYlVWRVgAICdldVvvmagQ50J5TKzEiOMLwtkol6xdNhiiF4ZCwhfiPsneICV13Ro9v AxVuGZ2WGeB0ys12+f4prVkEX/ZewCE/JR//MrB3gZwtkFW4FcqMPjgvZMlpEA== 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 4Q4vfz38qgzcVV; Mon, 24 Apr 2023 19:03:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33OJ3dOR014134; Mon, 24 Apr 2023 19:03:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OJ3dW8014133; Mon, 24 Apr 2023 19:03:39 GMT (envelope-from git) Date: Mon, 24 Apr 2023 19:03:39 GMT Message-Id: <202304241903.33OJ3dW8014133@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: c1d46995f7f8 - main - www/firefox: update to 112.0.2 (rc1) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: c1d46995f7f87c659067f4239b6e3123e560c05e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1d46995f7f87c659067f4239b6e3123e560c05e commit c1d46995f7f87c659067f4239b6e3123e560c05e Author: Christoph Moench-Tegeder AuthorDate: 2023-04-24 19:02:58 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-04-24 19:02:58 +0000 www/firefox: update to 112.0.2 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/112.0.2/releasenotes/ --- 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 95e4e9b97526..bed01b91a6f0 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,6 +1,5 @@ PORTNAME= firefox -DISTVERSION= 112.0.1 -PORTREVISION= 2 +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(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) { -