From e86220e81985348bc18074c5f1b5d151f941d872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 24 Oct 2015 16:40:27 +0200 Subject: [PATCH] gnome-online-accounts: fix for libtool>=2.4.6 Always requires gnome-introspection for autoreconf to find introspection.m4. It is disabled for cross through configure_args. --- srcpkgs/gnome-online-accounts/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index e4e2103e33..40354f7843 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,14 +1,14 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts version=3.18.1 -revision=1 +revision=2 build_style=gnu-configure -configure_args=" +configure_args="$(vopt_enable gir introspection) --enable-google --enable-kerberos --enable-flickr --enable-telepathy --enable-facebook --disable-static --enable-exchange --enable-imap-smtp --enable-owncloud --enable-windows-live --disable-twitter --enable-yahoo" hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel - $(vopt_if gir gobject-introspection) libtool" + gobject-introspection automake gettext-devel libtool" makedepends="libsoup-gnome-devel webkit2gtk-devel json-glib-devel libnotify-devel rest-devel gcr-devel libsecret-devel mit-krb5-devel dbus-glib-devel telepathy-glib-devel" depends="hicolor-icon-theme" @@ -25,7 +25,9 @@ if [ -z "$CROSS_BUILD" ]; then fi pre_configure() { - libtoolize -f + autoreconf -if + # This line generates an error (no gnome-compiler-flags.m4?) + sed -i configure -e "/GNOME_COMPILE_WARNINGS(maximum)/d" export CFLAGS+=" -I$PWD/telepathy-account-widgets" }