From fc81eaa36c4653d93b745affe1167dc1042b3c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Sat, 16 Sep 2017 23:47:53 +0200 Subject: testing/neomutt: upgrade to 20170907 --- testing/neomutt/APKBUILD | 13 ++++++++----- testing/neomutt/Makefile-am.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 testing/neomutt/Makefile-am.patch diff --git a/testing/neomutt/APKBUILD b/testing/neomutt/APKBUILD index 26f659d998..898112ee03 100644 --- a/testing/neomutt/APKBUILD +++ b/testing/neomutt/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel # Maintainer: pkgname=neomutt -pkgver=20170714 -pkgrel=1 +pkgver=20170907 +pkgrel=0 pkgdesc="Mutt with miscellaneous fixes and feature patches" url="https://www.neomutt.org/" arch="all" @@ -10,11 +10,13 @@ license="GPL2" depends="!mutt" depends_dev="" makedepends="automake autoconf cyrus-sasl-dev gdbm-dev gettext-dev - gpgme-dev libidn-dev ncurses-dev libressl-dev notmuch-dev" + gpgme-dev libidn-dev ncurses-dev libressl-dev notmuch-dev + bsd-compat-headers" install="" subpackages="$pkgname-doc $pkgname-lang" options="!check" -source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/$pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/$pkgname-$pkgver.tar.gz + Makefile-am.patch" builddir="$srcdir/$pkgname-$pkgname-$pkgver" prepare() { @@ -48,4 +50,5 @@ package() { "$pkgdir"/usr/share/doc/$pkgname/examples/Muttrc.gpg } -sha512sums="eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0 neomutt-20170714.tar.gz" +sha512sums="5dc7fca78c1f0fa16b4027a481e66cb7056e3587581f94d6681d4251fa6fc82870e0ac9cafe113e7d23ec1d8a6f7077ea38ad078c8b8e490f71bd3e90c7a89dd neomutt-20170907.tar.gz +74f38efb63d63e222d351c20624830b4beea122a4d530f8100bddf38821d56d1a6f0017330b167451f1eae5a612e23b08676371352230da28d512e99e77ffe56 Makefile-am.patch" diff --git a/testing/neomutt/Makefile-am.patch b/testing/neomutt/Makefile-am.patch new file mode 100644 index 0000000000..82b761b0c3 --- /dev/null +++ b/testing/neomutt/Makefile-am.patch @@ -0,0 +1,12 @@ +diff -upr neomutt-neomutt-20170907.orig/Makefile.am neomutt-neomutt-20170907/Makefile.am +--- neomutt-neomutt-20170907.orig/Makefile.am 2017-09-16 23:31:49.743501911 +0200 ++++ neomutt-neomutt-20170907/Makefile.am 2017-09-16 23:31:58.606864448 +0200 +@@ -97,7 +97,7 @@ EXTRA_DIST = account.h attach.h bcache.h + EXTRA_SCRIPTS = + + pgpring_SOURCES = pgppubring.c +-pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS) $(LIBMUTT) ++pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS) $(LIBMUTT) -lintl + pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS) $(LIBMUTTDEPS) + + txt2c_SOURCES = txt2c.c -- cgit v1.2.3