From 76ee9007095484a113d1856786b81e2d2fae8202 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 30 May 2013 01:31:58 -0700 Subject: Thu May 30 01:31:56 PDT 2013 --- community/mailutils/PKGBUILD | 30 +++++++++++++----------------- community/mailutils/build-fix.patch | 13 +++++++++++++ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 community/mailutils/build-fix.patch (limited to 'community/mailutils') diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD index 81afe7b4c..39eee461f 100644 --- a/community/mailutils/PKGBUILD +++ b/community/mailutils/PKGBUILD @@ -1,38 +1,34 @@ -# $Id: PKGBUILD 59712 2011-11-29 13:35:07Z stephane $ +# $Id: PKGBUILD 91917 2013-05-29 10:59:29Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=mailutils pkgver=2.2 -pkgrel=4 +pkgrel=5 pkgdesc="MUA command line tool (mailx)" arch=(i686 x86_64) url="http://www.gnu.org/software/mailutils/" license=('GPL') depends=('libldap' 'pam' 'gnutls' 'guile') -makedepends=('python2' 'emacs') -optdepends=('python2') +makedepends=('emacs') conflicts=('libsieve') install=mailutils.install options=(zipman !emptydirs) -source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2) -md5sums=('834d2f616b922856127ecfe6c2de7d1a') +source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2 + build-fix.patch) +md5sums=('834d2f616b922856127ecfe6c2de7d1a' + 'e83709ffdcdb257dfab443ef77c89574') -build() { +prepare() { cd "$srcdir/mailutils-$pkgver" + patch -p1 <$srcdir/build-fix.patch +} - py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2` - py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2` - - export PYTHON=/usr/bin/python2 - export PYTHON_CONFIG=/usr/bin/python2-config - export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`" - export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`" - +build() { + cd "$srcdir/mailutils-$pkgver" [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \ --libexecdir=/usr/lib/$pkgname --without-fribidi \ - --without-tcp-wrappers -# [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \; + --without-tcp-wrappers --sbindir=/usr/bin make -j1 } diff --git a/community/mailutils/build-fix.patch b/community/mailutils/build-fix.patch new file mode 100644 index 000000000..ec4afd5e3 --- /dev/null +++ b/community/mailutils/build-fix.patch @@ -0,0 +1,13 @@ +diff -wbBur mailutils-2.2/lib/Makefile.in mailutils-2.2.q/lib/Makefile.in +--- mailutils-2.2/lib/Makefile.in 2010-09-08 13:58:58.000000000 +0400 ++++ mailutils-2.2.q/lib/Makefile.in 2013-05-29 14:51:14.064888989 +0400 +@@ -1861,7 +1861,8 @@ + -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ ++ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ ++ -e 's|_GL_WARN_ON_USE (gets.*||'; \ + } > $@-t && \ + mv $@-t $@ + -- cgit v1.2.3-54-g00ecf