webkit2gtk: disable sse2 on i686
- be nice with ccache - also switch maintainer (added by q66)
This commit is contained in:
parent
7cd7a19e8f
commit
804794958f
2 changed files with 40 additions and 3 deletions
19
srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
Normal file
19
srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
Normal file
|
@ -0,0 +1,19 @@
|
|||
Source: Debian
|
||||
--- Source/cmake/WebKitCompilerFlags.cmake.orig 2020-12-15 15:29:50.240722972 +0700
|
||||
+++ Source/cmake/WebKitCompilerFlags.cmake 2020-12-15 15:29:59.659853014 +0700
|
||||
@@ -138,15 +138,6 @@
|
||||
if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
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 ()
|
||||
endif ()
|
||||
|
||||
if (COMPILER_IS_GCC_OR_CLANG AND NOT MSVC)
|
|
@ -1,7 +1,8 @@
|
|||
# Template file for 'webkit2gtk'
|
||||
# ping q66 before touching this
|
||||
pkgname=webkit2gtk
|
||||
version=2.30.4
|
||||
revision=3
|
||||
revision=4
|
||||
wrksrc="webkitgtk-${version}"
|
||||
build_style=cmake
|
||||
build_helper="gir"
|
||||
|
@ -24,8 +25,10 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
|
|||
-DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
|
||||
-DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
|
||||
-DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)"
|
||||
# Don't remove which from hostmakedepends
|
||||
# Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
|
||||
hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
|
||||
geoclue2 libharfbuzz $(vopt_if wayland wayland-devel)"
|
||||
geoclue2 libharfbuzz which $(vopt_if wayland wayland-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 libxslt-devel gnutls-devel icu-devel enchant2-devel
|
||||
|
@ -35,7 +38,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
|
|||
qt5-devel $(vopt_if x11 libXt-devel)
|
||||
$(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
|
||||
short_desc="GTK+3 port of the WebKit2 browser engine"
|
||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||
maintainer="q66 <daniel@octaforge.org>"
|
||||
license="LGPL-2.1-or-later, BSD-2-Clause"
|
||||
homepage="https://webkitgtk.org/"
|
||||
distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
|
||||
|
@ -53,6 +56,21 @@ desc_option_minibrowser="Build the minibrowser"
|
|||
export CFLAGS="-D__WORDSIZE=${XBPS_TARGET_WORDSIZE}"
|
||||
export CXXFLAGS="$CFLAGS"
|
||||
|
||||
# WebKitCCache.cmake set this variable
|
||||
# include_file_mtime was not enabled to avoid a race,
|
||||
# but this is run under our control
|
||||
export CCACHE_SLOPPINESS=time_macros,include_file_mtime
|
||||
|
||||
post_patch() {
|
||||
# Reproducible build
|
||||
# At least, be nice with ccache
|
||||
vsed -i -e '/foreach my.*(keys/s/(keys/(sort keys/' \
|
||||
Source/WebCore/bindings/scripts/CodeGenerator.pm \
|
||||
Source/WebCore/bindings/scripts/CodeGeneratorJS.pm \
|
||||
Source/WebCore/css/makeprop.pl \
|
||||
Source/cmake/tools/scripts/version-stamp.pl
|
||||
}
|
||||
|
||||
do_check() {
|
||||
:
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue