webkitgtk: 2.46.3 -> 2.46.4

This commit is contained in:
Tim Biermann 2024-12-03 17:05:41 +01:00
parent 59fb9aedec
commit ab48f278c4
Signed by: tb
GPG Key ID: 42F8B4E30B673606
4 changed files with 37 additions and 13 deletions

View File

@ -104,11 +104,11 @@ drwxr-xr-x root/root usr/lib/girepository-1.0/
-rw-r--r-- root/root usr/lib/girepository-1.0/WebKit-6.0.typelib
-rw-r--r-- root/root usr/lib/girepository-1.0/WebKitWebProcessExtension-6.0.typelib
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-6.0.so -> libjavascriptcoregtk-6.0.so.1
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-6.0.so.1 -> libjavascriptcoregtk-6.0.so.1.3.12
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-6.0.so.1.3.12
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-6.0.so.1 -> libjavascriptcoregtk-6.0.so.1.3.13
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-6.0.so.1.3.13
lrwxrwxrwx root/root usr/lib/libwebkitgtk-6.0.so -> libwebkitgtk-6.0.so.4
lrwxrwxrwx root/root usr/lib/libwebkitgtk-6.0.so.4 -> libwebkitgtk-6.0.so.4.10.5
-rwxr-xr-x root/root usr/lib/libwebkitgtk-6.0.so.4.10.5
lrwxrwxrwx root/root usr/lib/libwebkitgtk-6.0.so.4 -> libwebkitgtk-6.0.so.4.10.6
-rwxr-xr-x root/root usr/lib/libwebkitgtk-6.0.so.4.10.6
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/javascriptcoregtk-6.0.pc
-rw-r--r-- root/root usr/lib/pkgconfig/webkitgtk-6.0.pc

View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/bBSwwvXeImUjGYb8lNKxYPvY9F1j6hw0mKMZosoWwNpQgp/q/4yRViXRkzyba+YZOdSTq1kzyQJ0M27LVCTAA4=
SHA256 (Pkgfile) = 1d5c66b86fbde25cc39b771206a09c0e5a24ee365c928bcfe078ecad706ddcfd
SHA256 (.footprint) = b16fbf9d4eeb4687d1facb0877068ba75ed5619ee8cb8c1a96a8d62452979692
SHA256 (webkitgtk-2.46.3.tar.xz) = 85e09fa6ff9fea49678ba9975dbc64ea3242833f8f8a7d6a8937b2f292fcb28d
RWSE3ohX2g5d/aV/PgYMsMrnichZAWNZBuLc4apy+ITtJOZDh6SFS8BUapxv6vM7w+9xU7k+8YnKBF7205qAWGZ+BsqStJqN6Q8=
SHA256 (Pkgfile) = 6a81adb9a987fb3c0197169233aef28ce76061381dc624f7e16e5d8af736ba0c
SHA256 (.footprint) = 2fe998c3d03283d31ce9a7c03d87083b94dced2168c3dd377e0b89febba90b87
SHA256 (webkitgtk-2.46.4.tar.xz) = 0eff5f0ab0a2872ec87df62bc32e3289c8af625716ac71e94b298d74e0374176
SHA256 (1cfbdd74e97ea29636ce442322b5399b43937401.patch) = b40f7fc36ab44424ca2f66b82807dc0217c5dbef7f6356da89e9f6208aefdb88

View File

@ -0,0 +1,20 @@
diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h
index be2d7df04665f..11addcb96ab9c 100644
--- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h
+++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h
@@ -93,13 +93,14 @@ class MediaSourcePrivateGStreamer final : public MediaSourcePrivate
#if !RELEASE_LOG_DISABLED
Ref<const Logger> m_logger;
const void* m_logIdentifier;
+#endif
+
uint64_t m_nextSourceBufferID { 0 };
// Stores known track IDs, so we can work around ID collisions between multiple source buffers.
// The registry is placed here to enforce ID uniqueness specifically by player, not by process,
// since its not an issue if multiple players use the same ID, and we want to preserve IDs as much as possible.
HashSet<TrackID, WTF::IntHash<TrackID>, WTF::UnsignedWithZeroKeyHashTraits<TrackID>> m_trackIdRegistry;
-#endif
};
} // namespace WebCore

View File

@ -5,9 +5,10 @@
# Optional: bubblewrap enchant geoclue gst-plugins-bad libavif libmanette libnotify openjpeg2 wpebackend-fdo xdg-dbus-proxy
name=webkitgtk
version=2.46.3
version=2.46.4
release=1
source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz)
source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz
1cfbdd74e97ea29636ce442322b5399b43937401.patch)
build() {
# fail the build if dependencies are not met
@ -27,14 +28,15 @@ build() {
prt-get isinst libavif || PKGMK_WEBKITGTK+=' -DUSE_AVIF=OFF'
prt-get isinst gst_plugins-bad || PKGMK_WEBKITGTK+=' -DUSE_GSTREAMER_TRANSCODER=OFF'
patch -Np1 -d webkitgtk-$version -i $SRC/1cfbdd74e97ea29636ce442322b5399b43937401.patch
cmake -S webkitgtk-$version -B build -G Ninja ${PKGMK_WEBKITGTK} \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_INSTALL_LIBDIR=/usr/lib \
-D CMAKE_INSTALL_LIBEXECDIR=/usr/lib \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -DNDEBUG -ffat-lto-objects" \
-D CMAKE_C_FLAGS_RELEASE="${CFLAGS} -DNDEBUG -ffat-lto-objects" \
-D CMAKE_EXE_LINKER_FLAGS="${LDFLAGS} -Wl,-fuse-ld=gold" \
-D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -DNDEBUG -ffat-lto-objects -fcf-protection=none" \
-D CMAKE_C_FLAGS_RELEASE="${CFLAGS} -DNDEBUG -ffat-lto-objects -fcf-protection=none" \
-D CMAKE_SKIP_RPATH=ON \
-D PORT=GTK \
-D ENABLE_MINIBROWSER=ON \
@ -42,6 +44,7 @@ build() {
-D ENABLE_DOCUMENTATION=OFF \
-D USE_LIBBACKTRACE=OFF \
-D USE_JPEGXL=OFF \
-D USE_GOLD=OFF \
-D USE_SYSTEM_SYSPROF_CAPTURE=NO \
-Wno-dev