From nobody Sat Feb 01 02:53:32 2025 X-Original-To: dev-commits-ports-all@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 4YlHQ51VQqz5mSDV; Sat, 01 Feb 2025 02:53:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YlHQ50nqzz3PyJ; Sat, 01 Feb 2025 02:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738378413; 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=T7woLaA28G8T0PpA6W+fGBdwYD34EqpA1HoKDwIBz7E=; b=IILfEZtNTxjZtUhVB2k+ymK/kLl1JB4uVmVfHnNE3khV+u4+ajd/pT3XMdYChEvgud3rIP c0nIlp3k7GQWaBhLFhA0t7nQl/+g9iL+KJteFaeE1wmB9EsdbBxjDGsFNFg7SB+vj3IoBw DoD7BUAtOMjoMvl70qfl2ix0XDlgZkA0k5s+zgJNyVAPCqU7TkgOPhoA9tyl8UAHBbfCuk ntF0UBhxjDp3g+x5k5QlbhN/7CF2uvEVOfdlZNE0RCS+aq+qZ9EgrxAOEkMZbA/icGPtwr U41pm4TjB84qg5VA4uCeP+NjW8Nsbq8hzBgmb1Zsnqm3q6M0uOZ0/46gbpaMSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738378413; 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=T7woLaA28G8T0PpA6W+fGBdwYD34EqpA1HoKDwIBz7E=; b=bGA+JkkVyP0V7tc0qHPAyW2FGJQEE/O+VZWgjnZnvUOBeuFqlzn7uzsNoiWCbA5CnZbrew Ldyj/xDbTOMUqqyAERxnxbGVcWECS9rkzZSrU1qmQfBLEzuvQ9od7SuwoBpVKpw8FpW3uZ LFn2oMDZivPPwzuQeYw0+3KZHMMEHpMj3XklUz1yI3hZK30KO9w8igL7d5qK9rO5do5Pzb 7mdh8WSZmFlqi966F7IaiMi8J35j8ZQxxYkIbpqSHUUDn1Fmj1Zn6RZE9DT1tYVY6L37ne /uDchh6QCCmkhZjOyGPiqLJe4Zs/sVeB8z3J0rAHTHsIeH7QkFYJskRHnmcR3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738378413; a=rsa-sha256; cv=none; b=ULLLiWigX03rAZZ9GFkxbzd1g3zfCadnFOtZmgHyBMQky8tII/fVfF4c003C3Tcra7IIFe rsKjcojKsgXJhnHJbhSZ8sNtckRg0hVlIqNmU7/S5qk5pBTo3Lk1IuffsWKD5VshzO65AW xeUQP/INPccw4MSQnbUiKiz6TN/PHJZ5mIp7OF3q3UL7gpToKGCCoAvdwH9LeHpzJQjdKI c1YxXo88igKgYEvrJ7cr5/bdwr/YozmsvZTSngFX7wrPsIM0cJJcpFhOLDa1ZMY9tRj0Pi WPeTcmH22fqQFZFN/YRKGmuVVFZZzMk7pYxSAnsakLwvKtldUQrL8/XGzvCqEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YlHQ50Fd4zm1w; Sat, 01 Feb 2025 02:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5112rWmJ053865; Sat, 1 Feb 2025 02:53:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5112rWUd053860; Sat, 1 Feb 2025 02:53:32 GMT (envelope-from git) Date: Sat, 1 Feb 2025 02:53:32 GMT Message-Id: <202502010253.5112rWUd053860@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 1eeaaa8e0634 - main - www/webkit2-gtk: remove byteRangeSample from PlatformSample List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1eeaaa8e063450d0eb8f08df33a6ba338c348825 Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=1eeaaa8e063450d0eb8f08df33a6ba338c348825 commit 1eeaaa8e063450d0eb8f08df33a6ba338c348825 Author: Charlie Li AuthorDate: 2025-02-01 01:58:37 +0000 Commit: Charlie Li CommitDate: 2025-02-01 01:58:37 +0000 www/webkit2-gtk: remove byteRangeSample from PlatformSample The presence of this union member causes the build to fail with our libc++ because version 1 ABI's std::pair does not have a trivial copy constructor (see D35327). However this code is only used for a deprecated plugin only for macOS, and it along with supporting code like this have been removed in the main branch upstream, so this should hold in the upcoming 2.48 series. For now, only remove byteRangeSample as the complete upstream commit does not apply. This allows the port to return to using the base system toolchain, including libc++, fixing crashes from mangling libc++-built dependencies with libstdc++ webkitgtk. While here, remove some unused USE_X11 depends to save another PORTREVISION bump. Reference: https://github.com/WebKit/WebKit/commit/d0527fca8fc20cdda907dfdc293323d7283bd262 PR: 284378 Reported by: huanghwh[at]gmail[dot]com Tested by: eduardo, shamaz.mazum[at]gmail[dot]com (previous iterations) --- www/webkit2-gtk/Makefile | 5 ++--- .../files/patch-Source_WebCore_platform_MediaSample.h | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/www/webkit2-gtk/Makefile b/www/webkit2-gtk/Makefile index ec27b67877c9..e246fcc97cbe 100644 --- a/www/webkit2-gtk/Makefile +++ b/www/webkit2-gtk/Makefile @@ -1,6 +1,6 @@ PORTNAME= webkit DISTVERSION= 2.46.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk_${FLAVOR} @@ -52,9 +52,8 @@ USES= bison cmake compiler:c++23-lang cpe gettext gl gnome gperf \ USE_GNOME= cairo gdkpixbuf2 introspection:build libxml2 libxslt USE_GL= egl gbm gl glesv2 USE_LDCONFIG= yes -USE_GCC= yes USE_PERL5= build -USE_XORG= ice x11 xcomposite xdamage xext xrender xt +USE_XORG= x11 CPE_VENDOR= webkitgtk CPE_PRODUCT= webkitgtk diff --git a/www/webkit2-gtk/files/patch-Source_WebCore_platform_MediaSample.h b/www/webkit2-gtk/files/patch-Source_WebCore_platform_MediaSample.h new file mode 100644 index 000000000000..fdea480049b4 --- /dev/null +++ b/www/webkit2-gtk/files/patch-Source_WebCore_platform_MediaSample.h @@ -0,0 +1,15 @@ +Subset of: +https://bugs.webkit.org/show_bug.cgi?id=278596 +https://github.com/WebKit/WebKit/pull/32665 +https://commits.webkit.org/282704@main + +--- Source/WebCore/platform/MediaSample.h.orig 2024-08-19 06:28:39 UTC ++++ Source/WebCore/platform/MediaSample.h +@@ -63,7 +63,6 @@ struct PlatformSample { + const MockSampleBox* mockSampleBox; + CMSampleBufferRef cmSampleBuffer; + GstSample* gstSample; +- std::pair> byteRangeSample; + } sample; + }; +