libwebkit2gtk41: update to 2.46.6, drop webkit2gtk
This commit is contained in:
oreo639
oreo639
parent
61b2b74dea
commit
b7ee558257
@ -1 +0,0 @@
|
||||
webkit2gtk
|
||||
@ -1 +1 @@
|
||||
webkit2gtk
|
||||
libwebkit2gtk41
|
||||
@ -1,6 +1,6 @@
|
||||
# Template file for 'webkit2gtk'
|
||||
pkgname=webkit2gtk
|
||||
version=2.44.2
|
||||
# Template file for 'libwebkit2gtk41'
|
||||
pkgname=libwebkit2gtk41
|
||||
version=2.46.6
|
||||
revision=1
|
||||
build_style=cmake
|
||||
build_helper="gir"
|
||||
@ -24,23 +24,21 @@ hostmakedepends="perl python3 pkg-config gperf flex ruby gettext glib-devel
|
||||
$(vopt_if wayland 'wayland-devel libxml2-devel')"
|
||||
makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
|
||||
harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
|
||||
libsoup-devel libsoup3-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
|
||||
libsoup3-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
|
||||
dbus-glib-devel libwebp-devel gtk+3-devel gtk4-devel libgudev-devel
|
||||
libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
|
||||
woff2-devel freetype-devel libavif-devel qt5-devel libmanette-devel
|
||||
woff2-devel freetype-devel libavif-devel qt5-devel libmanette-devel sysprof-devel
|
||||
libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
|
||||
$(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
|
||||
depends="gst-plugins-good1"
|
||||
short_desc="GTK+3 port of the WebKit browser engine"
|
||||
short_desc="GTK+3 port of the WebKit browser engine (soup3)"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="LGPL-2.1-or-later, BSD-2-Clause"
|
||||
homepage="https://webkitgtk.org/"
|
||||
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
|
||||
checksum=523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b
|
||||
checksum=f2b31de693220ba9bab76ce6ddfe5b0bfab2515cb2b0a70f3c54d4050766c32b
|
||||
make_check=no # TODO
|
||||
|
||||
replaces="webkit2gtk-common>0"
|
||||
|
||||
build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser
|
||||
clang lto gtk_doc"
|
||||
build_options_default="gir wayland x11 bubblewrap minibrowser"
|
||||
@ -151,12 +149,7 @@ pre_configure() {
|
||||
}
|
||||
|
||||
post_configure() {
|
||||
mkdir -p webkit2gtk-40 webkit2gtk-60
|
||||
(
|
||||
cd webkit2gtk-40
|
||||
configure_args="${configure_args} -DUSE_SOUP2=ON -DENABLE_WEBDRIVER=OFF" \
|
||||
do_configure
|
||||
)
|
||||
mkdir -p webkit2gtk-60
|
||||
|
||||
(
|
||||
cd webkit2gtk-60
|
||||
@ -166,12 +159,10 @@ post_configure() {
|
||||
}
|
||||
|
||||
post_build() {
|
||||
(cd webkit2gtk-40 && NINJA_STATUS="[2/3][%f/%t] " do_build)
|
||||
(cd webkit2gtk-60 && NINJA_STATUS="[3/3][%f/%t] " do_build)
|
||||
(cd webkit2gtk-60 && NINJA_STATUS="[2/2][%f/%t] " do_build)
|
||||
}
|
||||
|
||||
post_install() {
|
||||
(cd webkit2gtk-40 && do_install)
|
||||
(cd webkit2gtk-60 && do_install)
|
||||
|
||||
vlicense Source/WebCore/LICENSE-APPLE
|
||||
@ -179,42 +170,6 @@ post_install() {
|
||||
vlicense Source/WebCore/LICENSE-LGPL-2
|
||||
}
|
||||
|
||||
webkit2gtk-devel_package() {
|
||||
depends="gtk+3-devel libsoup-devel ${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include/webkitgtk-4.0
|
||||
vmove "usr/lib/pkgconfig/*-4.0.pc"
|
||||
if [ "$build_option_gir" ]; then
|
||||
vmove "usr/share/gir-1.0/*-4.0.gir"
|
||||
fi
|
||||
if [ "$build_option_gtk_doc" ]; then
|
||||
vmove "usr/share/doc/*-4.0"
|
||||
fi
|
||||
vmove "usr/lib/*-4.0.so"
|
||||
}
|
||||
}
|
||||
|
||||
libwebkit2gtk41_package() {
|
||||
depends="${_depends}"
|
||||
short_desc="GTK+3 port of the WebKit browser engine (soup3)"
|
||||
pkg_install() {
|
||||
vmove usr/bin/WebKitWebDriver
|
||||
vmove usr/libexec/webkit2gtk-4.1
|
||||
vmove usr/lib/webkit2gtk-4.1
|
||||
if [ "$build_option_gir" ]; then
|
||||
vmove "usr/lib/girepository-1.0/*-4.1.typelib"
|
||||
fi
|
||||
vmove "usr/lib/*-4.1.so.*"
|
||||
for file in $(find ${DESTDIR}/usr/share/locale -name "*-4.1.mo"); do
|
||||
vmove ${file/$DESTDIR/}
|
||||
done
|
||||
vlicense Source/WebCore/LICENSE-APPLE
|
||||
vlicense Source/WebCore/LICENSE-LGPL-2.1
|
||||
vlicense Source/WebCore/LICENSE-LGPL-2
|
||||
}
|
||||
}
|
||||
|
||||
libwebkit2gtk41-devel_package() {
|
||||
depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
|
||||
short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
|
||||
@ -1 +1 @@
|
||||
webkit2gtk
|
||||
libwebkit2gtk41
|
||||
@ -1 +1 @@
|
||||
webkit2gtk
|
||||
libwebkit2gtk41
|
||||
@ -1 +0,0 @@
|
||||
webkit2gtk
|
||||
@ -1,54 +0,0 @@
|
||||
From 3ec05c63ec38d19773c074f60eb2f9406e298b47 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garcia Campos <cgarcia@igalia.com>
|
||||
Date: Fri, 14 Jun 2024 09:56:54 +0200
|
||||
Subject: [PATCH] REGRESSION(273818@main): [GTK] Eclipse crashes when rendering
|
||||
tooltips: gdk_window_create_gl_context: assertion 'GDK_IS_WINDOW (window)'
|
||||
failed in WebKit::AcceleratedBackingStoreDMABuf::ensureGLContext
|
||||
https://bugs.webkit.org/show_bug.cgi?id=271477
|
||||
|
||||
Reviewed by NOBODY (OOPS!).
|
||||
|
||||
Update the buffer contents on prepareForRendering to make sure the view
|
||||
is already realized, which is required to create the gl context.
|
||||
|
||||
* Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp:
|
||||
(WebKit::AcceleratedBackingStoreDMABuf::frame):
|
||||
(WebKit::AcceleratedBackingStoreDMABuf::prepareForRendering):
|
||||
---
|
||||
.../gtk/AcceleratedBackingStoreDMABuf.cpp | 15 ++++++---------
|
||||
1 file changed, 6 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
|
||||
index b71fb0a8ac06..66d8a4801aba 100644
|
||||
--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
|
||||
+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
|
||||
@@ -544,12 +544,6 @@ void AcceleratedBackingStoreDMABuf::frame(uint64_t bufferID)
|
||||
return;
|
||||
}
|
||||
|
||||
- if (buffer->type() == Buffer::Type::EglImage) {
|
||||
- ensureGLContext();
|
||||
- gdk_gl_context_make_current(m_gdkGLContext.get());
|
||||
- }
|
||||
- buffer->didUpdateContents();
|
||||
-
|
||||
m_pendingBuffer = buffer;
|
||||
gtk_widget_queue_draw(m_webPage.viewWidget());
|
||||
}
|
||||
@@ -613,10 +607,13 @@ void AcceleratedBackingStoreDMABuf::update(const LayerTreeContext& context)
|
||||
|
||||
bool AcceleratedBackingStoreDMABuf::prepareForRendering()
|
||||
{
|
||||
- if (m_gdkGLContext)
|
||||
- gdk_gl_context_make_current(m_gdkGLContext.get());
|
||||
-
|
||||
if (m_pendingBuffer) {
|
||||
+ if (m_pendingBuffer->type() == Buffer::Type::EglImage) {
|
||||
+ ensureGLContext();
|
||||
+ gdk_gl_context_make_current(m_gdkGLContext.get());
|
||||
+ }
|
||||
+ m_pendingBuffer->didUpdateContents();
|
||||
+
|
||||
if (m_committedBuffer)
|
||||
m_webPage.legacyMainFrameProcess().send(Messages::AcceleratedSurfaceDMABuf::ReleaseBuffer(m_committedBuffer->id()), m_surfaceID);
|
||||
m_committedBuffer = WTFMove(m_pendingBuffer);
|
||||
@ -1,29 +0,0 @@
|
||||
--- a/Source/cmake/WebKitCompilerFlags.cmake
|
||||
+++ b/Source/cmake/WebKitCompilerFlags.cmake
|
||||
@@ -162,15 +162,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
|
||||
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-expansion-to-defined)
|
||||
endif ()
|
||||
|
||||
- # Force SSE2 fp on x86 builds.
|
||||
- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
|
||||
- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
|
||||
- include(DetectSSE2)
|
||||
- if (NOT SSE2_SUPPORT_FOUND)
|
||||
- message(FATAL_ERROR "SSE2 support is required to compile WebKit")
|
||||
- endif ()
|
||||
- endif ()
|
||||
-
|
||||
# Makes builds faster. The GCC manual warns about the possibility that the assembler being
|
||||
# used may not support input from a pipe, but in practice the toolchains we support all do.
|
||||
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-pipe)
|
||||
--- a/Source/ThirdParty/ANGLE/src/common/platform.h
|
||||
+++ b/Source/ThirdParty/ANGLE/src/common/platform.h
|
||||
@@ -102,7 +102,7 @@
|
||||
#if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
|
||||
# include <intrin.h>
|
||||
# define ANGLE_USE_SSE
|
||||
-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
|
||||
+#elif defined(__GNUC__) && defined(__x86_64__)
|
||||
# include <x86intrin.h>
|
||||
# define ANGLE_USE_SSE
|
||||
#endif
|
||||
Loading…
x
Reference in New Issue
Block a user