upgraded to 1.5.24 and used patches from mutt-patched

1 files changed, 44 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0ae10b7e57e3..9c157d783bc8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,42 +3,48 @@
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=mutt-sidebar
-pkgver=1.5.23
-pkgrel=10
+pkgver=1.5.24
+pkgrel=1
 pkgdesc='Small but very powerful text-based mail client'
-arch=('i686' 'x86_64' 'armv7h' 'armv7l')
 url='http://www.mutt.org/'
 license=('GPL')
-depends=('gpgme' 'krb5' 'libidn' 'mime-types')
+backup=('etc/Muttrc')
+arch=('i686' 'x86_64' 'armv7h' 'armv7l')
 optdepends=('smtp-forwarder: to send mail')
+depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5')
 conflicts=('mutt')
 provides=('mutt')
-source=("https://bitbucket.org/mutt/mutt/downloads/mutt-${pkgver}.tar.gz"
-        "ftp://ftp.openbsd.org/pub/OpenBSD/distfiles/mutt/trashfolder-1.5.22.diff0.gz"
-        "patch-1.5.23.sidebar.20140412.txt"
-        "patch-for-first-char-jf.patch"
-        "shortpath.patch")
-
-sha512sums=('f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e'
-            'a00075888c12ce55e5173788d9e0397f4cc65f8344328112342399b9734f041e80cceaee18ce68fe79471457e72b743b08112bf4f71d251db25f45ed5ee27ada'
-            'ac023f1ba5843a010de497b9cd85b22af6a30ceb8622c01be3c5b7e8e0761d8efe8e86e8c9b11aa96dcc405e8b1657672ec6da111b703d562bddf35ba848d34d'
-            '16ba918a8d5ef091cd7556e97189b43a0afdc1fc23a8bb9ece6a97281223090a5e680886233d2aa52e5340c402d19c68801b51eec13ae61cd8d301418470f11d'
-            '9fe87a338090ac53856893f3392a6f94d5a855cff1338fb6d1a0ef8774e57b20e6a75212b43c266066fbaae7ff21978c8437aee2e601a20eaccadf6cb1425397')
+source=("http://ftp.mutt.org/pub/mutt/mutt-${pkgver}.tar.gz"
+        "sidebar-compose.patch"
+        "sidebar-delimnullwide.patch"
+        "sidebar-dotpathsep.patch"
+        "sidebar-newonly.patch"
+        "sidebar-new.patch"
+        "sidebar.patch"
+        "sidebar-utf8.patch"
+        "trash-folder.patch"
+        )
+sha512sums=('f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1'
+            'b4d330d9bad044744c6ff8e68514b58d813c1c77c91766c22b813f3a5e2471c4333bd620b845e3f708a1e6c68871b9428d8a9c5f18dc4dd51810c15bb0e8e5ea'
+            '7888ee538fa07425f78dfc8fe098ab0f67f8def9a4c76657c7bf6e33a1590ed7ad2142b3f68663e198d87779b0e9de3229f576c6d95795255767be0311757db1'
+            '3266a39fccdbc45562dda4d9765ca825f6dd70f7c3d19edb5eff9baf3d00b13fc103dedf83b2c022b7fd2d1d217d98c367e11b3eb86a06ae86f4fdb2b38d0545'
+            '3026988531c312593aac5ce5842d2092998fe33b2950c8961a87bbefe9f3285e41538774261136fb1cbfae7f0e4b183899598905b60dff1ceb0231718cf33dfa'
+            '15b92e3319c002a0c44630e11aa9394534179df4aacfd3da53e9a5c91f7e679a31d7940a6f6a08aab7b5149e97143bb4f999a85ea0af8beb61788d6b099fe855'
+            '4c2b2901e3c6b4aefcbbdc4573d1821601c7e4ddeb14c72b9c1325dec03f8c8e1f0299a7a0f0f57305eab0c7d1d69e0f043edcbffe09278c3af655db58e8f19e'
+            '3668d1080fa485c6a54d3a9ddc72692c58bc343a29c9f3409108768632b412b509188965c1c270abc277d4e7b732a9dbb77d9b5b601925e7933079f86cde9021'
+            '13f2f6402d3bb407d5e0a04049f7be27c9dbc0ccb9681fe7640d060cc3c13d76a8cf9985da8daa680058603b317f9dbf1b2125aa9e103c625add0d8d530b2538')
 
 prepare() {
   cd "$srcdir/mutt-$pkgver"
 
-  # patch to add trash folder support
-  patch -Np1 -i "$srcdir"/trashfolder-1.5.22.diff0
-
-  # patch to add sidebar support
-  patch -Np1 -i "$srcdir"/patch-1.5.23.sidebar.20140412.txt
-
-  # patch for first char in mailboxdir
-  patch -i "$srcdir"/patch-for-first-char-jf.patch
-
-  # patch to fix shortpath
-  patch -i "$srcdir"/shortpath.patch
+  patch -Np1 -i "${srcdir}/trash-folder.patch"
+  patch -Np1 -i "${srcdir}/sidebar.patch"
+  patch -Np1 -i "${srcdir}/sidebar-dotpathsep.patch"
+  patch -Np1 -i "${srcdir}/sidebar-utf8.patch"
+  patch -Np1 -i "${srcdir}/sidebar-newonly.patch"
+  patch -Np1 -i "${srcdir}/sidebar-delimnullwide.patch"
+  patch -Np1 -i "${srcdir}/sidebar-compose.patch"
+  patch -Np1 -i "${srcdir}/sidebar-new.patch"
 
   # fix automake issue
   autoreconf -vfi
@@ -46,12 +52,18 @@ prepare() {
 
 build() {
   cd "$srcdir/mutt-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --enable-gpgme --enable-pop \
-              --enable-imap --enable-smtp \
-              --enable-hcache --with-curses=/usr \
-              --with-regex --with-gss=/usr \
-              --with-ssl=/usr --with-sasl \
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --enable-gpgme \
+              --enable-pop \
+              --enable-imap \
+              --enable-smtp \
+              --enable-hcache \
+              --with-curses=/usr \
+              --with-regex \
+              --with-gss=/usr \
+              --with-ssl=/usr \
+              --with-sasl \
               --with-idn
   make
 }