From c7687543803ef7a468f64792e8b8bf57d77efb8e Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 8 Nov 2018 18:17:06 -0200 Subject: [PATCH] claws-mail: switch to enchant-2 --- srcpkgs/claws-mail/template | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template index 359f4f8a885..51a14988ef3 100644 --- a/srcpkgs/claws-mail/template +++ b/srcpkgs/claws-mail/template @@ -4,10 +4,10 @@ version=3.17.1 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-python-plugin --disable-perl-plugin" -hostmakedepends="pkg-config python-devel" +hostmakedepends="pkg-config python-devel automake libtool gettext-devel" makedepends="poppler-glib-devel libarchive-devel libSM-devel libnotify-devel libcanberra-devel gpgme-devel gnutls-devel - enchant-devel dbus-devel libetpan-devel libldap-devel + enchant2-devel dbus-devel libetpan-devel libldap-devel libsoup-gnome-devel startup-notification-devel" short_desc="The user-friendly, lightweight, and fast email client" maintainer="Jakub Skrzypnik " @@ -17,6 +17,14 @@ distfiles="http://www.claws-mail.org/download.php?file=releases/claws-mail-${ver checksum=757b5f4163fb44f772b1453d1cc0b83387bb6b67ad55cc0694bdd4eff9ea76f2 nocross=yes +pre_configure() { + # fix new versioned enchant pkgconfig detection + sed -i "s:PKG_CHECK_MODULES(ENCHANT, enchant >= 1.4.0:PKG_CHECK_MODULES(ENCHANT, enchant-2 >= 1.4.0:" configure.ac + sed -i "s:--cflags enchant:--cflags enchant-2:" configure.ac + + autoreconf -fi +} + # TODO(dominikh): claws-mail is a mess. If we don't have python # installed at all, the build process will fail, even if we don't want # the python plugin. If we do have python installed, cross-compilation