Skip to content

Commit 1eeaaa8

Browse files
committed
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: WebKit/WebKit@d0527fc PR: 284378 Reported by: huanghwh[at]gmail[dot]com Tested by: eduardo, shamaz.mazum[at]gmail[dot]com (previous iterations)
1 parent 67f6dad commit 1eeaaa8

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

‎www/webkit2-gtk/Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= webkit
22
DISTVERSION= 2.46.5
3-
PORTREVISION= 1
3+
PORTREVISION= 2
44
CATEGORIES= www
55
MASTER_SITES= https://webkitgtk.org/releases/
66
PKGNAMESUFFIX= 2-gtk_${FLAVOR}
@@ -52,9 +52,8 @@ USES= bison cmake compiler:c++23-lang cpe gettext gl gnome gperf \
5252
USE_GNOME= cairo gdkpixbuf2 introspection:build libxml2 libxslt
5353
USE_GL= egl gbm gl glesv2
5454
USE_LDCONFIG= yes
55-
USE_GCC= yes
5655
USE_PERL5= build
57-
USE_XORG= ice x11 xcomposite xdamage xext xrender xt
56+
USE_XORG= x11
5857

5958
CPE_VENDOR= webkitgtk
6059
CPE_PRODUCT= webkitgtk
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Subset of:
2+
https://bugs.webkit.org/show_bug.cgi?id=278596
3+
https://github.com/WebKit/WebKit/pull/32665
4+
https://commits.webkit.org/282704@main
5+
6+
--- Source/WebCore/platform/MediaSample.h.orig 2024-08-19 06:28:39 UTC
7+
+++ Source/WebCore/platform/MediaSample.h
8+
@@ -63,7 +63,6 @@ struct PlatformSample {
9+
const MockSampleBox* mockSampleBox;
10+
CMSampleBufferRef cmSampleBuffer;
11+
GstSample* gstSample;
12+
- std::pair<MTPluginByteSourceRef, std::reference_wrapper<const TrackInfo>> byteRangeSample;
13+
} sample;
14+
};
15+

0 commit comments

Comments
 (0)