Fix build on i686

Related: RHEL-3960
This commit is contained in:
Michael Catanzaro 2023-09-19 12:16:33 -05:00
parent 510e8a4db3
commit f1a1a54f5a
2 changed files with 16 additions and 0 deletions

13
eglnativepixmaptype.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/Source/WebCore/platform/graphics/egl/GLContextX11.cpp b/Source/WebCore/platform/graphics/egl/GLContextX11.cpp
index 5caefa950dad..92e8ead31211 100644
--- a/Source/WebCore/platform/graphics/egl/GLContextX11.cpp
+++ b/Source/WebCore/platform/graphics/egl/GLContextX11.cpp
@@ -86,7 +86,7 @@ std::unique_ptr<GLContext> GLContext::createPixmapContext(PlatformDisplay& platf
// swap buffers. So, we use a custom XError handler here that ignores BadDrawable errors and only warns about any other
// errors without aborting in any case.
XErrorTrapper trapper(x11Display, XErrorTrapper::Policy::Warn, { BadDrawable });
- EGLSurface surface = eglCreatePixmapSurface(display, config, reinterpret_cast<EGLNativePixmapType>(pixmap.get()), 0);
+ EGLSurface surface = eglCreatePixmapSurface(display, config, (EGLNativePixmapType)(pixmap.get()), 0);
if (surface == EGL_NO_SURFACE) {
eglDestroyContext(display, context);
return nullptr;

View File

@ -24,6 +24,9 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
Source2: webkitgtk-keys.gpg
# https://github.com/WebKit/WebKit/pull/17923
Patch: eglnativepixmaptype.patch
BuildRequires: bison
BuildRequires: bubblewrap
BuildRequires: cmake