From 861db39326aed18785bc37d9bf10de831701ad90 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 21:29:45 +0200 Subject: [PATCH] webkit2gtk: update to 2.30.0 --- .../patches/dont-disable-gir-during-cross.patch | 10 ---------- srcpkgs/webkit2gtk/template | 14 ++++++++------ 2 files changed, 8 insertions(+), 16 deletions(-) delete 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 deleted file mode 100644 index e99b7e3238..0000000000 --- a/srcpkgs/webkit2gtk/patches/dont-disable-gir-during-cross.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 f4ffefa237..481c6522f2 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,6 +1,6 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk -version=2.28.3 +version=2.30.0 revision=1 wrksrc="webkitgtk-${version}" build_style=cmake @@ -14,6 +14,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc -DRUBY_VERSION=2.7 + -DUSE_SYSTEMD=OFF -DENABLE_GTKDOC=OFF -DUSE_GSTREAMER_GL=OFF -DUSE_WPE_RENDERER=OFF -DENABLE_MINIBROWSER=$(vopt_if minibrowser ON OFF) -DENABLE_JIT=$(vopt_if jit ON OFF) @@ -23,8 +24,8 @@ 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)" -hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel geoclue2 - $(vopt_if wayland wayland-devel)" +hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel + geoclue2 libharfbuzz $(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 @@ -38,7 +39,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later, BSD-2-Clause" homepage="https://webkitgtk.org/" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" -checksum=f0898ac072c220e13a4aee819408421a6cb56a6eb89170ceafe52468b0903522 +checksum=caf3dbf2d2383072614e34281f2fffb6331faf92f4ecf215f6f6a5a57f755d11 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser" build_options_default="gir wayland x11 bubblewrap minibrowser" @@ -48,8 +49,9 @@ desc_option_jit="JavaScript JIT (Only some architectures)" desc_option_sampling_profiler="Sampling profiler support (JIT + glibc only)" desc_option_minibrowser="Build the minibrowser" -makedepends+=" libharfbuzz" -hostmakedepends+=" libharfbuzz" +do_check() { + : +} # detection + runtime if [ "$build_option_bubblewrap" ]; then