From 7bbbdc4dc69466181872519abffa1a8ab2dd47ba Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 8 Jan 2015 11:55:21 +0100 Subject: [PATCH] webkitgtk: unbreak build: disable wayland option for now. ... otherwise the build will fail because PluginViewNone.cpp (wayland-target) provides the same symbols than PluginViewGtk.cpp (x11-target). --- srcpkgs/webkitgtk/template | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template index 819f60e6430..bd865362c86 100644 --- a/srcpkgs/webkitgtk/template +++ b/srcpkgs/webkitgtk/template @@ -3,7 +3,9 @@ pkgname=webkitgtk version=2.4.8 revision=1 build_style=gnu-configure -configure_args="--disable-gtk-doc --with-gtk=3.0 --disable-schemas-compile --enable-accelerated-compositing" +configure_args="--disable-gtk-doc --with-gtk=3.0 --disable-schemas-compile + --enable-accelerated-compositing $(vopt_enable gir introspection) + $(vopt_enable wayland wayland-target) $(vopt_enable x11 x11-target)" short_desc="GTK+3 port of the WebKit browser engine" maintainer="Juan RP " homepage="http://webkitgtk.org/" @@ -13,45 +15,25 @@ checksum=68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23 # ETOOHUGE nodebug=1 -broken="http://build.voidlinux.eu/builders/x86_64_builder/builds/8652/steps/shell_3/logs/stdio" hostmakedepends="automake libtool perl python pkg-config intltool gperf flex - ruby glib-devel geoclue2 gtk-doc" + ruby glib-devel geoclue2 gtk-doc $(vopt_if gir gobject-introspection)" makedepends=" at-spi2-core-devel libjpeg-turbo-devel libpng-devel>=1.6 sqlite-devel harfbuzz-devel>=0.9.19 gst-plugins-base1-devel libsoup-devel libxslt-devel icu-devel>=54 enchant-devel dbus-glib-devel libwebp-devel>=0.4.0 - gtk+-devel gtk+3-devel libgudev-devel libsecret-devel geoclue2" + gtk+-devel gtk+3-devel libgudev-devel libsecret-devel geoclue2 + $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel') + $(vopt_if x11 libXt-devel)" # Package build options build_options="gir wayland x11" # Disable gir for cross builds. -build_options_default="wayland x11" +build_options_default="x11" if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" fi -if [ "$build_option_gir" ]; then - configure_args+=" --enable-introspection" - hostmakedepends+=" gobject-introspection" -else - configure_args+=" --disable-introspection" -fi - -if [ "$build_option_wayland" ]; then - configure_args+=" --enable-wayland-target" - makedepends+=" MesaLib-devel libxkbcommon-devel wayland-devel" -else - configure_args+=" --disable-wayland-target" -fi - -if [ "$build_option_x11" ]; then - configure_args+=" --enable-x11-target" - makedepends+=" libXt-devel" -else - configure_args+=" --disable-x11-target" -fi - pre_configure() { autoreconf -fi }