[arch-commits] Commit in mailutils/trunk (PKGBUILD build-fix.patch)

[Sergej Pupykin]

    Date: Wednesday, May 29, 2013 @ 12:59:09
  Author: spupykin
Revision: 91916

upgpkg: mailutils 2.2-5

upd

Added:
  mailutils/trunk/build-fix.patch
Modified:
  mailutils/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   28 ++++++++++++----------------
 build-fix.patch |   13 +++++++++++++
 2 files changed, 25 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-29 10:32:57 UTC (rev 91915)
+++ PKGBUILD	2013-05-29 10:59:09 UTC (rev 91916)
@@ -4,35 +4,31 @@
 
 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')
 
+prepare() {
+  cd "$srcdir/mailutils-$pkgver"
+  patch -p1 <$srcdir/build-fix.patch
+}
+
 build() {
   cd "$srcdir/mailutils-$pkgver"
-
-  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`"
-
   [ -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
 }
 

Added: build-fix.patch
===================================================================
--- build-fix.patch	                        (rev 0)
+++ build-fix.patch	2013-05-29 10:59:09 UTC (rev 91916)
@@ -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 $@
+