updated to 1.5.24

4 files changed, 84 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eee23b9e3750..4d70c73b59d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sat Jan 30 11:34:50 UTC 2016
 pkgbase = mutt-sidebar
 	pkgdesc = Small but very powerful text-based mail client
 	pkgver = 1.5.24
-	pkgrel = 2
+	pkgrel = 10
 	url = http://www.mutt.org/
 	arch = i686
 	arch = x86_64
@@ -9,35 +11,22 @@ pkgbase = mutt-sidebar
 	arch = armv7l
 	license = GPL
 	depends = gpgme
-	depends = ncurses
-	depends = openssl
-	depends = libsasl
-	depends = gdbm
+	depends = krb5
 	depends = libidn
 	depends = mime-types
-	depends = krb5
 	optdepends = smtp-forwarder: to send mail
 	provides = mutt
 	conflicts = mutt
-	backup = etc/Muttrc
-	source = http://ftp.mutt.org/pub/mutt/mutt-1.5.24.tar.gz
-	source = sidebar-compose.patch
-	source = sidebar-delimnullwide.patch
-	source = sidebar-dotpathsep.patch
-	source = sidebar-newonly.patch
-	source = sidebar-new.patch
-	source = sidebar.patch
-	source = sidebar-utf8.patch
+	source = https://bitbucket.org/mutt/mutt/downloads/mutt-1.5.24.tar.gz
 	source = trash-folder.patch
+	source = http://lunar-linux.org/~tchan/mutt/patch-1.5.24.sidebar.20151111.txt
+	source = patch-for-first-char-jf.patch
+	source = shortpath.patch
 	sha512sums = f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1
-	sha512sums = b4d330d9bad044744c6ff8e68514b58d813c1c77c91766c22b813f3a5e2471c4333bd620b845e3f708a1e6c68871b9428d8a9c5f18dc4dd51810c15bb0e8e5ea
-	sha512sums = 7888ee538fa07425f78dfc8fe098ab0f67f8def9a4c76657c7bf6e33a1590ed7ad2142b3f68663e198d87779b0e9de3229f576c6d95795255767be0311757db1
-	sha512sums = 3266a39fccdbc45562dda4d9765ca825f6dd70f7c3d19edb5eff9baf3d00b13fc103dedf83b2c022b7fd2d1d217d98c367e11b3eb86a06ae86f4fdb2b38d0545
-	sha512sums = 3026988531c312593aac5ce5842d2092998fe33b2950c8961a87bbefe9f3285e41538774261136fb1cbfae7f0e4b183899598905b60dff1ceb0231718cf33dfa
-	sha512sums = 15b92e3319c002a0c44630e11aa9394534179df4aacfd3da53e9a5c91f7e679a31d7940a6f6a08aab7b5149e97143bb4f999a85ea0af8beb61788d6b099fe855
-	sha512sums = 4c2b2901e3c6b4aefcbbdc4573d1821601c7e4ddeb14c72b9c1325dec03f8c8e1f0299a7a0f0f57305eab0c7d1d69e0f043edcbffe09278c3af655db58e8f19e
-	sha512sums = 3668d1080fa485c6a54d3a9ddc72692c58bc343a29c9f3409108768632b412b509188965c1c270abc277d4e7b732a9dbb77d9b5b601925e7933079f86cde9021
 	sha512sums = 13f2f6402d3bb407d5e0a04049f7be27c9dbc0ccb9681fe7640d060cc3c13d76a8cf9985da8daa680058603b317f9dbf1b2125aa9e103c625add0d8d530b2538
+	sha512sums = 2e622a34a1d101fe9370cc015b8253492d1649fcb593c6f9cbf6eb3b54119eaca836114dc4e3da83bc8fd9de434503c7d2295981a68dc05fd8e710925e2b1f77
+	sha512sums = 16ba918a8d5ef091cd7556e97189b43a0afdc1fc23a8bb9ece6a97281223090a5e680886233d2aa52e5340c402d19c68801b51eec13ae61cd8d301418470f11d
+	sha512sums = 9fe87a338090ac53856893f3392a6f94d5a855cff1338fb6d1a0ef8774e57b20e6a75212b43c266066fbaae7ff21978c8437aee2e601a20eaccadf6cb1425397
 
 pkgname = mutt-sidebar
 
diff --git a/PKGBUILD b/PKGBUILD
index c8e59b3320d3..dcb4c8cdbc06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,47 +4,36 @@
 
 pkgname=mutt-sidebar
 pkgver=1.5.24
-pkgrel=2
+pkgrel=10
 pkgdesc='Small but very powerful text-based mail client'
+arch=('i686' 'x86_64' 'armv7h' 'armv7l')
 url='http://www.mutt.org/'
 license=('GPL')
-backup=('etc/Muttrc')
-arch=('i686' 'x86_64' 'armv7h' 'armv7l')
+depends=('gpgme' 'krb5' 'libidn' 'mime-types')
 optdepends=('smtp-forwarder: to send mail')
-depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5')
 conflicts=('mutt')
 provides=('mutt')
-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"
+source=("https://bitbucket.org/mutt/mutt/downloads/mutt-${pkgver}.tar.gz"
         "trash-folder.patch"
-        )
-sha512sums=('f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1'
-            'b4d330d9bad044744c6ff8e68514b58d813c1c77c91766c22b813f3a5e2471c4333bd620b845e3f708a1e6c68871b9428d8a9c5f18dc4dd51810c15bb0e8e5ea'
-            '7888ee538fa07425f78dfc8fe098ab0f67f8def9a4c76657c7bf6e33a1590ed7ad2142b3f68663e198d87779b0e9de3229f576c6d95795255767be0311757db1'
-            '3266a39fccdbc45562dda4d9765ca825f6dd70f7c3d19edb5eff9baf3d00b13fc103dedf83b2c022b7fd2d1d217d98c367e11b3eb86a06ae86f4fdb2b38d0545'
-            '3026988531c312593aac5ce5842d2092998fe33b2950c8961a87bbefe9f3285e41538774261136fb1cbfae7f0e4b183899598905b60dff1ceb0231718cf33dfa'
-            '15b92e3319c002a0c44630e11aa9394534179df4aacfd3da53e9a5c91f7e679a31d7940a6f6a08aab7b5149e97143bb4f999a85ea0af8beb61788d6b099fe855'
-            '4c2b2901e3c6b4aefcbbdc4573d1821601c7e4ddeb14c72b9c1325dec03f8c8e1f0299a7a0f0f57305eab0c7d1d69e0f043edcbffe09278c3af655db58e8f19e'
-            '3668d1080fa485c6a54d3a9ddc72692c58bc343a29c9f3409108768632b412b509188965c1c270abc277d4e7b732a9dbb77d9b5b601925e7933079f86cde9021'
-            '13f2f6402d3bb407d5e0a04049f7be27c9dbc0ccb9681fe7640d060cc3c13d76a8cf9985da8daa680058603b317f9dbf1b2125aa9e103c625add0d8d530b2538')
+        "http://lunar-linux.org/~tchan/mutt/patch-1.5.24.sidebar.20151111.txt"
+        "patch-for-first-char-jf.patch"
+        "shortpath.patch")
 
 prepare() {
   cd "$srcdir/mutt-$pkgver"
 
-  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"
+  # patch to add trash folder support
+  # patch -Np1 -i "$srcdir"/trashfolder-1.5.22.diff0
+  patch -Np1 -i "$srcdir"/trash-folder.patch
+
+  # patch to add sidebar support
+  patch -Np1 -i "$srcdir"/patch-1.5.24.sidebar.20151111.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
 
   # fix automake issue
   autoreconf -vfi
@@ -52,18 +41,12 @@ 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
 }
@@ -76,7 +59,10 @@ package() {
   rm "$pkgdir"/etc/mime.types{,.dist}
   rm "$pkgdir"/usr/bin/{flea,muttbug}
   rm "$pkgdir"/usr/share/man/man1/{flea,muttbug}.1
-
-  # install Muttrc.gpg file
-  install -D -m 644 contrib/gpg.rc "$pkgdir"/etc/Muttrc.gpg.dist
 }
+
+sha512sums=('f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1'
+            '13f2f6402d3bb407d5e0a04049f7be27c9dbc0ccb9681fe7640d060cc3c13d76a8cf9985da8daa680058603b317f9dbf1b2125aa9e103c625add0d8d530b2538'
+            '2e622a34a1d101fe9370cc015b8253492d1649fcb593c6f9cbf6eb3b54119eaca836114dc4e3da83bc8fd9de434503c7d2295981a68dc05fd8e710925e2b1f77'
+            '16ba918a8d5ef091cd7556e97189b43a0afdc1fc23a8bb9ece6a97281223090a5e680886233d2aa52e5340c402d19c68801b51eec13ae61cd8d301418470f11d'
+            '9fe87a338090ac53856893f3392a6f94d5a855cff1338fb6d1a0ef8774e57b20e6a75212b43c266066fbaae7ff21978c8437aee2e601a20eaccadf6cb1425397')
diff --git a/patch-for-first-char-jf.patch b/patch-for-first-char-jf.patch
new file mode 100644
index 000000000000..0159718db889
--- /dev/null
+++ b/patch-for-first-char-jf.patch
@@ -0,0 +1,11 @@
+--- sidebar.c.orig	2014-04-15 19:54:06.977669530 +0200
++++ sidebar.c	2014-04-15 19:54:59.739045269 +0200
+@@ -310,7 +310,7 @@
+ 		/* calculate depth of current folder and generate its display name with indented spaces */
+ 		int sidebar_folder_depth = 0;
+ 		char *sidebar_folder_name;
+-		sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + 1);
++		sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir));
+ 		if ( maildir_is_prefix && option(OPTSIDEBARFOLDERINDENT) ) {
+ 			char *tmp_folder_name;
+ 			int i;
diff --git a/shortpath.patch b/shortpath.patch
new file mode 100644
index 000000000000..f829f2c7047c
--- /dev/null
+++ b/shortpath.patch
@@ -0,0 +1,31 @@
+--- sidebar.c.orig	2014-12-18 23:35:50.589683928 +0000
++++ sidebar.c	2014-12-18 23:30:40.680566728 +0000
+@@ -313,6 +313,8 @@
+ 		sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir));
+ 		if ( maildir_is_prefix && option(OPTSIDEBARFOLDERINDENT) ) {
+ 			char *tmp_folder_name;
++			char *tmp_folder_name_dot;
++			char *tmp_folder_name_slash;
+ 			int i;
+ 			tmp_folder_name = tmp->path + strlen(Maildir) + 1;
+ 			for (i = 0; i < strlen(tmp->path) - strlen(Maildir); i++) {
+@@ -320,11 +322,15 @@
+ 			}   
+ 			if (sidebar_folder_depth > 0) {
+  				if (option(OPTSIDEBARSHORTPATH)) {
+- 					tmp_folder_name = strrchr(tmp->path, '.');
+- 					if (tmp_folder_name == NULL)
++ 					tmp_folder_name_dot = strrchr(tmp->path, '.');
++ 					tmp_folder_name_slash = strrchr(tmp->path, '/');
++
++                                        if (tmp_folder_name_dot == NULL && tmp_folder_name_slash == NULL)
+  						tmp_folder_name = mutt_basename(tmp->path);
+- 					else
+-						tmp_folder_name++;
++                                        else if (tmp_folder_name_dot > tmp_folder_name_slash)
++                                                tmp_folder_name = tmp_folder_name_dot + 1;
++                                        else
++                                                tmp_folder_name = tmp_folder_name_slash + 1;
+  				}
+  				else
+  					tmp_folder_name = tmp->path + strlen(Maildir) + 1;