From 5527ded404d8ad68366a0b10af5b556b927cb88a Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Sun, 10 Feb 2019 10:23:44 +0100 Subject: [PATCH] webkit2gtk: update to 2.22.6. * enable gir * cleanup the template [ci skip] --- .../dont-disable-gir-during-cross.patch | 10 +++ srcpkgs/webkit2gtk/template | 81 ++++++++----------- 2 files changed, 43 insertions(+), 48 deletions(-) create mode 100644 srcpkgs/webkit2gtk/patches/dont-disable-gir-during-cross.patch diff --git a/srcpkgs/webkit2gtk/patches/dont-disable-gir-during-cross.patch b/srcpkgs/webkit2gtk/patches/dont-disable-gir-during-cross.patch new file mode 100644 index 00000000000..e99b7e3238a --- /dev/null +++ b/srcpkgs/webkit2gtk/patches/dont-disable-gir-during-cross.patch @@ -0,0 +1,10 @@ +--- Source/cmake/OptionsGTK.cmake.orig 2019-02-10 18:04:07.898417778 +0100 ++++ Source/cmake/OptionsGTK.cmake 2019-02-10 18:04:36.673415569 +0100 +@@ -357,7 +357,6 @@ + # Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building. + if (CMAKE_CROSSCOMPILING) + set(ENABLE_GTKDOC OFF) +- set(ENABLE_INTROSPECTION OFF) + endif () + + # Override the cached variable, gtk-doc does not really work when building on Mac. diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 8928a797a1f..d2028037a3e 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,75 +1,60 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk -version=2.22.5 +version=2.22.6 revision=1 wrksrc="webkitgtk-${version}" build_style=cmake +build_helper="gir" configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc - -DUSE_GSTREAMER_GL=OFF" + -DUSE_GSTREAMER_GL=OFF -DRUBY_VERSION=2.6 + -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-2.6.0 + -DENABLE_INTROSPECTION=$(vopt_if gir ON OFF) + -DENABLE_WAYLAND_TARGET=$(vopt_if wayland ON OFF) + -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF) -DENABLE_JIT=$(vopt_if jit ON OFF) + -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)" +hostmakedepends="perl python pkg-config intltool gperf flex ruby glib-devel geoclue2 + $(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 enchant-devel + dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel + libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel + woff2-devel $(vopt_if x11 libXt-devel) $(vopt_if jit '' libatomic-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 " license="LGPL-2.1-or-later, BSD-2-Clause" homepage="https://webkitgtk.org/" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" -checksum=99d3863f418a7c3a3e37e5062950dbf2d91fb106ec1633459b0ef6f2d5f6cb13 +checksum=df90db9c0db0a2072b945fa3e1d45865922bd686c4659cce6cb5897ce357c85b # ETOOHUGE nodebug=1 CXXFLAGS="-Wno-expansion-to-defined" -hostmakedepends="perl python pkg-config intltool gperf flex ruby glib-devel geoclue2" -makedepends=" - at-spi2-core-devel libjpeg-turbo-devel libpng-devel sqlite-devel - harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel - libsoup-devel libxslt-devel gnutls-devel icu-devel enchant-devel - dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel - libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel - woff2-devel" - case "$XBPS_TARGET_MACHINE" in -armv[56]*|mips*|ppc|ppc-musl) configure_args+=" -DENABLE_JIT=0" - makedepends+=" libatomic-devel" - ;; -aarch64*) configure_args+=" -DUSE_LD_GOLD=0";; -esac - -case "$XBPS_TARGET_MACHINE" in -*-musl) configure_args+=" -DENABLE_SAMPLING_PROFILER=OFF";; + aarch64*) configure_args+=" -DUSE_LD_GOLD=0";; esac # Package build options -build_options="gir wayland x11" -# Disable gir for cross builds. +build_options="gir wayland x11 jit sampling_profiler" build_options_default="wayland x11" -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gir" -else - # Make cmake detect Ruby headers in cross base - configure_args+=" -DRUBY_VERSION=2.5 -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-2.5.0" -fi -if [ "$build_option_gir" ]; then - configure_args+=" -DENABLE_INTROSPECTION=1" - hostmakedepends+=" gobject-introspection" -else - configure_args+=" -DENABLE_INTROSPECTION=0" -fi +desc_option_jit="Enable JustInTime JS support" +desc_option_sampling_profiler="Toggle sampling profiler support (disabled on musl)" -if [ "$build_option_wayland" ]; then - configure_args+=" -DENABLE_WAYLAND_TARGET=1" - hostmakedepends+=" wayland-devel" - makedepends+=" MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols" -else - configure_args+=" -DENABLE_WAYLAND_TARGET=0" -fi - -if [ "$build_option_x11" ]; then - configure_args+=" -DENABLE_X11_TARGET=1" - makedepends+=" libXt-devel" -else - configure_args+=" -DENABLE_X11_TARGET=0" -fi +case "$XBPS_TARGET_MACHINE" in + x86_64-musl) build_options_default+=" gir jit" ;; + ppc-musl) ;; + mips-musl) ;; + armv[56]*-musl) ;; + *-musl) build_options_default+=" jit" ;; + armv[56]*) build_options_default+=" gir sampling_profiler" ;; + mips*) build_options_default+=" gir sampling_profiler" ;; + ppc) build_options_default+=" gir sampling_profiler" ;; + *) build_options_default+=" gir jit sampling_profiler" ;; +esac pre_configure() { case "$XBPS_TARGET_MACHINE" in