[packages/gtk-webkit5] - last version of gtk-webkit5 copied from gtk-webkit4.spec

qboosh qboosh at pld-linux.org
Sun Jul 9 21:57:33 CEST 2023


commit 18d10157267ac61f3c33e02395b6546763a99a7d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 9 21:47:19 2023 +0200

    - last version of gtk-webkit5 copied from gtk-webkit4.spec

 gtk-webkit5-driver-version-suffix.patch |   8 +
 gtk-webkit5-gcc13.patch                 |  27 ++++
 gtk-webkit5-icu59.patch                 |  38 +++++
 gtk-webkit5-parallel-gir.patch          |  81 ++++++++++
 gtk-webkit5-x32.patch                   |  33 ++++
 gtk-webkit5.spec                        | 271 ++++++++++++++++++++++++++++++++
 6 files changed, 458 insertions(+)
---
diff --git a/gtk-webkit5.spec b/gtk-webkit5.spec
new file mode 100644
index 0000000..3febb50
--- /dev/null
+++ b/gtk-webkit5.spec
@@ -0,0 +1,271 @@
+# TODO: review configure options:
+# - FTL_JIT on !x86_64?
+# - WEB_RTC+MEDIA_STREAM (experimental; BR: openwebrtc)
+# - AVIF? (experimental; BR: libavif-devel >= 0.9.0)
+# - JPEGXL? (experimental; BR: libjxl-devel)
+# - THUNDER? (BR: Thunder + ThunderClientLibraries)
+#
+# Conditional build:
+%bcond_without	introspection	# GObject introspection
+%bcond_without	wayland		# Wayland target (requires GTK+ wayland target)
+%bcond_with	lowmem		# try to reduce build memory usage by adjusting gcc gc
+%bcond_with	lowmem2		# try to reduce build memory usage by disabling unified build (long)
+#
+# it's not possible to build this with debuginfo on 32bit archs due to
+# memory constraints during linking
+%ifarch %{ix86} x32
+%define		_enable_debug_packages		0
+%endif
+Summary:	Port of WebKit embeddable web component to GTK 4
+Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do GTK 4
+Name:		gtk-webkit5
+# 2.38.x is the last with gtk-webkit5 library
+Version:	2.38.6
+Release:	5
+License:	BSD-like
+Group:		X11/Libraries
+Source0:	https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
+# Source0-md5:	a50290fdc80842b1ae8be1e1147b5679
+Patch0:		%{name}-x32.patch
+Patch1:		%{name}-icu59.patch
+Patch2:		%{name}-parallel-gir.patch
+Patch3:		%{name}-driver-version-suffix.patch
+Patch4:		%{name}-gcc13.patch
+URL:		https://webkitgtk.org/
+BuildRequires:	/usr/bin/ld.gold
+BuildRequires:	EGL-devel
+BuildRequires:	OpenGL-GLX-devel
+BuildRequires:	OpenGLESv2-devel
+BuildRequires:	at-spi2-core-devel >= 2.5.3
+BuildRequires:	atk-devel >= 1:2.16.0
+BuildRequires:	bubblewrap >= 0.3.1
+BuildRequires:	cairo-devel >= 1.16.0
+BuildRequires:	cmake >= 3.20
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	enchant2-devel >= 2
+BuildRequires:	fontconfig-devel >= 2.13.0
+BuildRequires:	freetype-devel >= 1:2.9.0
+BuildRequires:	gcc-c++ >= 6:7.3.0
+BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
+BuildRequires:	gi-docgen
+BuildRequires:	glib2-devel >= 1:2.67.1
+BuildRequires:	glibc-misc
+%{?with_introspection:BuildRequires:	gobject-introspection-devel >= 1.32.0}
+BuildRequires:	gperf >= 3.0.1
+BuildRequires:	gstreamer-devel >= 1.14
+BuildRequires:	gstreamer-gl-devel >= 1.10.0
+# codecparsers,mpegts with -DUSE_GSTREAMER_MPEGTS=ON
+#BuildRequires:	gstreamer-plugins-bad-devel >= 1.10.0
+# app,audio,fft,pbutils,tag,video
+BuildRequires:	gstreamer-plugins-base-devel >= 1.10.0
+BuildRequires:	gtk4-devel >= 4.0
+BuildRequires:	gtk-doc >= 1.10
+BuildRequires:	harfbuzz-devel >= 1.4.2
+BuildRequires:	harfbuzz-icu-devel >= 1.4.2
+BuildRequires:	hyphen-devel
+BuildRequires:	lcms2-devel >= 2
+BuildRequires:	libgcrypt-devel >= 1.7.0
+BuildRequires:	libicu-devel >= 61.2
+BuildRequires:	libjpeg-devel
+BuildRequires:	libmanette-devel >= 0.2.4
+BuildRequires:	libnotify-devel
+BuildRequires:	libpng-devel
+BuildRequires:	libseccomp-devel
+BuildRequires:	libsecret-devel
+BuildRequires:	libsoup3-devel >= 3.0
+# -std=c++2a
+BuildRequires:	libstdc++-devel >= 6:8.3
+BuildRequires:	libtasn1-devel
+BuildRequires:	libwebp-devel
+BuildRequires:	libwpe-devel >= 1.3.0
+BuildRequires:	libxml2-devel >= 1:2.8.0
+BuildRequires:	libxslt-devel >= 1.1.7
+BuildRequires:	openjpeg2-devel >= 2.2.0
+BuildRequires:	pango-devel >= 1:1.32.0
+BuildRequires:	perl-base >= 1:5.10.0
+BuildRequires:	pkgconfig
+BuildRequires:	python >= 1:2.7.0
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.699
+BuildRequires:	ruby >= 1:1.9
+BuildRequires:	ruby-modules >= 1:1.9
+BuildRequires:	sqlite3-devel >= 3
+BuildRequires:	systemd-devel
+BuildRequires:	tar >= 1:1.22
+%if %{with wayland}
+BuildRequires:	wayland-devel
+BuildRequires:	wayland-egl-devel
+BuildRequires:	wayland-protocols >= 1.12
+%endif
+BuildRequires:	wpebackend-fdo-devel >= 1.6.0
+BuildRequires:	woff2-devel >= 1.0.2
+BuildRequires:	xdg-dbus-proxy
+BuildRequires:	xorg-lib-libICE-devel
+BuildRequires:	xorg-lib-libXcomposite-devel
+BuildRequires:	xorg-lib-libXdamage-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXrender-devel
+BuildRequires:	xorg-lib-libXt-devel
+BuildRequires:	xz
+BuildRequires:	zlib-devel
+Requires:	at-spi2-core-libs >= 2.5.3
+Requires:	atk >= 1:2.16.0
+Requires:	cairo >= 1.16.0
+Requires:	fontconfig-libs >= 2.13.0
+Requires:	freetype >= 1:2.9.0
+Requires:	glib2 >= 1:2.67.1
+Requires:	gstreamer >= 1.2.3
+Requires:	gstreamer-plugins-base >= 1.2.3
+Requires:	gtk4 >= 4.0
+Requires:	harfbuzz >= 1.4.2
+Requires:	libgcrypt >= 1.7.0
+Requires:	libsoup3 >= 3.0
+Requires:	libwpe >= 1.3.0
+Requires:	libxml2 >= 1:2.8.0
+Requires:	libxslt >= 1.1.7
+Requires:	openjpeg2 >= 2.2.0
+Requires:	pango >= 1:1.32.0
+Requires:	woff2 >= 1.0.2
+Requires:	wpebackend-fdo >= 1.6.0
+%{?with_introspection:Conflicts:	gir-repository < 0.6.5-7}
+# Source/JavaScriptCore/CMakeLists.txt /WTF_CPU_
+ExclusiveArch:	%{ix86} %{x8664} x32 %{arm} aarch64 hppa mips ppc ppc64 ppc64le s390 s390x sh4
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+# __once_call, __once_called non-function symbols from libstdc++
+%define		skip_post_check_so	lib.*gtk-4.0.*
+
+%description
+gtk-webkit5 is a port of the WebKit embeddable web component to GTK 4.
+
+%description -l pl.UTF-8
+gtk-webkit5 to port osadzalnego komponentu WWW WebKit do GTK+ 4.
+
+%package devel
+Summary:	Development files for WebKit for GTK 4
+Summary(pl.UTF-8):	Pliki programistyczne komponentu WebKit dla GTK 4
+Group:		X11/Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	glib2-devel >= 1:2.67.1
+Requires:	gtk4-devel >= 4.0
+Requires:	libsoup3-devel >= 3.0
+Requires:	libstdc++-devel >= 6:8.3
+
+%description devel
+Development files for WebKit for GTK 4.
+
+%description devel -l pl.UTF-8
+Pliki programistyczne komponentu WebKit dla GTK 4.
+
+%package apidocs
+Summary:	API documentation for WebKit GTK 4 port
+Summary(pl.UTF-8):	Dokumentacja API portu WebKitu do GTK 4
+Group:		Documentation
+Requires:	gtk-doc-common
+BuildArch:	noarch
+
+%description apidocs
+API documentation for WebKit GTK 4 port.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API portu WebKitu do GTK 4.
+
+%prep
+%setup -q -n webkitgtk-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+%build
+%if %{with lowmem}
+CXXFLAGS="%{rpmcxxflags} --param ggc-min-expand=20 --param ggc-min-heapsize=65536"
+%endif
+install -d build-gtk4
+%cmake -B build-gtk4 \
+	-DENABLE_GEOLOCATION=ON \
+	-DENABLE_GTKDOC=ON \
+	%{!?with_introspection:-DENABLE_INTROSPECTION=OFF} \
+	%{?with_lowmem2:-DENABLE_UNIFIED_BUILDS=OFF} \
+	-DENABLE_VIDEO=ON \
+	%{!?with_wayland:-DENABLE_WAYLAND_TARGET=OFF} \
+	-DENABLE_WEB_AUDIO=ON \
+	-DENABLE_WEBGL=ON \
+%ifarch x32
+	-DENABLE_C_LOOP=ON \
+	-DENABLE_JIT=OFF \
+	-DENABLE_SAMPLING_PROFILER=OFF \
+%endif
+%ifarch %{ix86} %{x8664} x32
+	-DHAVE_SSE2_EXTENSIONS=ON \
+%endif
+	-DPORT=GTK \
+	-DSHOULD_INSTALL_JS_SHELL=ON \
+	-DUSE_GTK4=ON
+
+%{__make} -C build-gtk4
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} -C build-gtk4 install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+%if "%{_gtkdocdir}" != "%{_datadir}/gtk-doc/html"
+install -d $RPM_BUILD_ROOT%{_gtkdocdir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/* $RPM_BUILD_ROOT%{_gtkdocdir}
+%endif
+
+%find_lang WebKit2GTK-5.0
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
+%files -f WebKit2GTK-5.0.lang
+%defattr(644,root,root,755)
+%doc NEWS
+%attr(755,root,root) %{_bindir}/WebKitWebDriver-5.0
+%attr(755,root,root) %{_libdir}/libwebkit2gtk-5.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwebkit2gtk-5.0.so.0
+%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-5.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libjavascriptcoregtk-5.0.so.0
+%if %{with introspection}
+%{_libdir}/girepository-1.0/JavaScriptCore-5.0.typelib
+%{_libdir}/girepository-1.0/WebKit2-5.0.typelib
+%{_libdir}/girepository-1.0/WebKit2WebExtension-5.0.typelib
+%endif
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/webkit2gtk-5.0
+%endif
+%attr(755,root,root) %{_libexecdir}/webkit2gtk-5.0/MiniBrowser
+%attr(755,root,root) %{_libexecdir}/webkit2gtk-5.0/WebKitNetworkProcess
+%attr(755,root,root) %{_libexecdir}/webkit2gtk-5.0/WebKitWebProcess
+%attr(755,root,root) %{_libexecdir}/webkit2gtk-5.0/jsc
+%dir %{_libdir}/webkit2gtk-5.0
+%dir %{_libdir}/webkit2gtk-5.0/injected-bundle
+%attr(755,root,root) %{_libdir}/webkit2gtk-5.0/injected-bundle/libwebkit2gtkinjectedbundle.so
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libwebkit2gtk-5.0.so
+%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-5.0.so
+%if %{with introspection}
+%{_datadir}/gir-1.0/JavaScriptCore-5.0.gir
+%{_datadir}/gir-1.0/WebKit2-5.0.gir
+%{_datadir}/gir-1.0/WebKit2WebExtension-5.0.gir
+%endif
+%{_includedir}/webkitgtk-5.0
+%{_pkgconfigdir}/javascriptcoregtk-5.0.pc
+%{_pkgconfigdir}/webkit2gtk-5.0.pc
+%{_pkgconfigdir}/webkit2gtk-web-extension-5.0.pc
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/javascriptcoregtk-5.0
+%{_gtkdocdir}/webkit2gtk-5.0
+%{_gtkdocdir}/webkit2gtk-web-extension-5.0
diff --git a/gtk-webkit5-driver-version-suffix.patch b/gtk-webkit5-driver-version-suffix.patch
new file mode 100644
index 0000000..04ab08c
--- /dev/null
+++ b/gtk-webkit5-driver-version-suffix.patch
@@ -0,0 +1,8 @@
+--- webkitgtk-2.38.6/Source/WebDriver/PlatformGTK.cmake.orig	2022-08-19 13:14:27.800098000 +0200
++++ webkitgtk-2.38.6/Source/WebDriver/PlatformGTK.cmake	2023-05-05 06:13:51.566790434 +0200
+@@ -1,4 +1,4 @@
+-set(WebDriver_OUTPUT_NAME WebKitWebDriver)
++set(WebDriver_OUTPUT_NAME WebKitWebDriver-${WEBKITGTK_API_VERSION})
+ 
+ add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}")
+ 
diff --git a/gtk-webkit5-gcc13.patch b/gtk-webkit5-gcc13.patch
new file mode 100644
index 0000000..13ce0e9
--- /dev/null
+++ b/gtk-webkit5-gcc13.patch
@@ -0,0 +1,27 @@
+--- webkitgtk-2.38.6/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h.orig	2022-08-19 13:14:22.903425000 +0200
++++ webkitgtk-2.38.6/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h	2023-05-05 06:11:59.781732404 +0200
+@@ -12,6 +12,7 @@
+ 
+ #include <algorithm>
+ #include <array>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- webkitgtk-2.38.6/Source/WebCore/platform/graphics/SourceBrush.cpp.orig	2022-09-20 10:13:48.250555000 +0200
++++ webkitgtk-2.38.6/Source/WebCore/platform/graphics/SourceBrush.cpp	2023-05-05 06:14:14.776532489 +0200
+@@ -65,12 +65,12 @@ Pattern* SourceBrush::pattern() const
+ 
+ void SourceBrush::setGradient(Ref<Gradient>&& gradient, const AffineTransform& spaceTransform)
+ {
+-    m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
++    m_brush = Brush { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
+ }
+ 
+ void SourceBrush::setPattern(Ref<Pattern>&& pattern)
+ {
+-    m_brush = { WTFMove(pattern) };
++    m_brush = Brush { WTFMove(pattern) };
+ }
+ 
+ WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush)
diff --git a/gtk-webkit5-icu59.patch b/gtk-webkit5-icu59.patch
new file mode 100644
index 0000000..3b7e452
--- /dev/null
+++ b/gtk-webkit5-icu59.patch
@@ -0,0 +1,38 @@
+--- webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h.orig	2017-02-20 17:20:08.000000000 +0100
++++ webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h	2017-04-22 14:35:00.926530142 +0200
+@@ -32,6 +32,7 @@
+ #include <stdbool.h>
+ #endif
+ #include <stddef.h> /* for size_t */
++#include <uchar.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -46,7 +47,7 @@
+  character. As with all scalar types, endianness depends on the underlying
+  architecture.
+ */
+-    typedef unsigned short JSChar;
++    typedef char16_t JSChar;
+ #else
+     typedef wchar_t JSChar;
+ #endif
+--- webkitgtk-2.16.1/Source/WebKit/Shared/API/c/WKString.h.orig	2017-02-20 17:20:17.000000000 +0100
++++ webkitgtk-2.16.1/Source/WebKit/Shared/API/c/WKString.h	2017-04-22 14:35:56.853196170 +0200
+@@ -28,6 +28,7 @@
+ 
+ #include <WebKit/WKBase.h>
+ #include <stddef.h>
++#include <uchar.h>
+ 
+ #ifndef __cplusplus
+ #include <stdbool.h>
+@@ -39,7 +40,7 @@
+ 
+ #if !defined(WIN32) && !defined(_WIN32) \
+     && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
+-    typedef unsigned short WKChar;
++    typedef char16_t WKChar;
+ #else
+     typedef wchar_t WKChar;
+ #endif
diff --git a/gtk-webkit5-parallel-gir.patch b/gtk-webkit5-parallel-gir.patch
new file mode 100644
index 0000000..ec5658e
--- /dev/null
+++ b/gtk-webkit5-parallel-gir.patch
@@ -0,0 +1,81 @@
+From bbe8d64377e2ff81cfe146d961d3ce3d7005d666 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus at fastmail.com>
+Date: Sat, 1 Jul 2023 14:36:09 +0200
+Subject: [PATCH] Generate GIR once to fix intermittent parallel build failures
+
+typelib, doc-check and doc targets add file dependency on generated GIR
+file. As per CMake documentation that pulls commands to generate GIR
+file in every of those targets:
+
+https://cmake.org/cmake/help/latest/command/add_custom_command.html
+
+> If any dependency is an OUTPUT of another custom command in the same
+> directory (CMakeLists.txt file), CMake automatically brings the other
+> custom command into the target in which this command is built.
+
+Meaning there will be 4 different commands in total trying to create
+same file independently without any ordering enforced between them. This
+causes intermittent failures depending on timing in which those commands
+execute when invoking parallel build.
+
+To ensure that GIR is created only once and that proper ordering is in
+place replace file dependency with dependency on target creating GIR
+file.
+
+Signed-off-by: Jan Palus <jpalus at fastmail.com>
+---
+ Source/cmake/FindGI.cmake       | 2 +-
+ Source/cmake/FindGIDocgen.cmake | 5 +++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
+index fdc56b21b148..6b636af69a28 100644
+--- a/Source/cmake/FindGI.cmake
++++ b/Source/cmake/FindGI.cmake
+@@ -265,7 +265,7 @@ function(GI_INTROSPECT namespace nsversi
+             get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
+             if (dep_gir_path)
+                 list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
+-                list(APPEND gir_deps "${dep_gir_path}")
++                list(APPEND gir_deps "gir-${dep}")
+             else ()
+                 message(AUTHOR_WARNING
+                     "Target '${dep}' listed as a dependency but it has not "
+@@ -376,7 +376,7 @@ function(GI_INTROSPECT namespace nsversion header)
+     add_custom_command(
+         OUTPUT "${typ_path}"
+         COMMENT "Generating ${gir_name}.typelib"
+-        DEPENDS "${gir_path}"
++        DEPENDS "gir-${namespace}"
+         VERBATIM
+         COMMAND "${GI_COMPILER_EXE}"
+             "--includedir=${CMAKE_BINARY_DIR}"
+diff --git a/Source/cmake/FindGIDocgen.cmake b/Source/cmake/FindGIDocgen.cmake
+index 88c90633e63f..ef560db7a2f0 100644
+--- a/Source/cmake/FindGIDocgen.cmake
++++ b/Source/cmake/FindGIDocgen.cmake
+@@ -180,7 +180,7 @@ function(GI_DOCGEN namespace toml)
+     endif ()
+     set(outdir "${CMAKE_BINARY_DIR}/Documentation/${package}")
+ 
+-    set(docdeps "${toml_path};${gir_path}")
++    set(docdeps "${toml_path};gir-${namespace}")
+     foreach (item IN LISTS opt_CONTENT_TEMPLATES)
+         get_filename_component(filename "${item}" NAME)
+         configure_file("${item}.in" "${contentdir}/${filename}" @ONLY)
+@@ -239,10 +239,11 @@ function(GI_DOCGEN namespace toml)
+     add_custom_target("doc-check-${namespace}"
+         COMMENT "Checking documentation: ${namespace}"
+         WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+-        DEPENDS "${toml_path}" "${gir_path}"
++        DEPENDS "${toml_path}"
+         VERBATIM
+         COMMAND "${GIDocgen_EXE}" check ${common_flags} "${gir_path}"
+     )
++    add_dependencies("doc-check-${namespace}" "gir-${namespace}")
+ 
+     if (NOT TARGET doc-check-all)
+         add_custom_target(doc-check-all COMMENT "Check all documentation targets")
+-- 
+2.41.0
+
diff --git a/gtk-webkit5-x32.patch b/gtk-webkit5-x32.patch
new file mode 100644
index 0000000..62cffb6
--- /dev/null
+++ b/gtk-webkit5-x32.patch
@@ -0,0 +1,33 @@
+From: Alberto Garcia <berto at igalia.com>
+Description: Use WTF_CPU_UNKNOWN when building for X32
+ WebKitGTK doesn't build on X32 even with the JIT disabled.
+ Treating the CPU as unknown is perhaps a bit severe, but it allows us
+ to get the build done until someone steps up to maintain this
+ properly.
+Forwarded: no
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk-2.30.5/Source/WTF/wtf/PlatformCPU.h.orig	2020-08-12 11:17:54.000000000 +0200
++++ webkitgtk-2.30.5/Source/WTF/wtf/PlatformCPU.h	2021-03-13 19:14:43.872248582 +0100
+@@ -105,8 +105,8 @@
+ #endif
+ 
+ /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
+-#if   defined(__x86_64__) \
+-    || defined(_M_X64)
++#if ( defined(__x86_64__) \
++    || defined(_M_X64) ) && !defined(__ILP32__)
+ #define WTF_CPU_X86_64 1
+ #define WTF_CPU_X86_SSE2 1
+ #define WTF_CPU_KNOWN 1
+--- webkitgtk-2.32.0/Source/cmake/WebKitCommon.cmake.orig	2021-02-26 10:57:17.000000000 +0100
++++ webkitgtk-2.32.0/Source/cmake/WebKitCommon.cmake	2021-03-28 07:30:53.574578782 +0200
+@@ -90,6 +90,8 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+         set(WTF_CPU_MIPS64 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+         set(WTF_CPU_MIPS 1)
++    elseif (CMAKE_CXX_COMPILER_ABI STREQUAL "ELF X32")
++        set(WTF_CPU_UNKNOWN 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
+         # FORCE_32BIT is set in the build script when --32-bit is passed
+         # on a Linux/intel 64bit host. This allows us to produce 32bit
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit5.git/commitdiff/18d10157267ac61f3c33e02395b6546763a99a7d



More information about the pld-cvs-commit mailing list