From 150a0414573fa113eadedd4f3dc9aef1c27839ce Mon Sep 17 00:00:00 2001
From: Freemor <freemor@freemor.ca>
Date: Thu, 23 Jan 2020 11:34:08 -0400
Subject: Bring [nonprism/sylpheed] up to date.

---
 nonprism/sylpheed/PKGBUILD | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/nonprism/sylpheed/PKGBUILD b/nonprism/sylpheed/PKGBUILD
index a8d6d9e0f..58af49746 100644
--- a/nonprism/sylpheed/PKGBUILD
+++ b/nonprism/sylpheed/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: (Arch) David Runge <dave@sleepmap.de>
 # Contributor (Arch): speps <speps at aur dot archlinux dot org>
 # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
@@ -11,29 +10,38 @@
 #  - removed gmail support
 
 pkgname=sylpheed
-pkgver=3.6.0
+pkgver=3.7.0
 pkgrel=3.nonprism1
 pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support"
 arch=('x86_64' 'i686' 'armv7h')
 url="https://sylpheed.sraoss.jp/en/"
 license=('GPL')
-depends=('compface' 'gpgme' 'gtkspell')
+depends=('compface' 'gpgme' 'gtkspell' 'libnsl')
 makedepends=('openssl')
-source=("https://sylpheed.sraoss.jp/${pkgname}/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
+source=("https://sylpheed.sraoss.jp/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
+        "Support-SNI-some-servers-imap.gmail.patch::https://sylpheed.sraoss.jp/redmine/attachments/download/145/v2-0001-libsylph-ssl.c-Support-SNI-some-servers-imap.gmai.patch"
         "nonprism.patch")
-sha512sums=('84c59e327690ed7e637e9ce60e630da6cdad771ccc278e31e490ed643da55c295fb47e999ad421fc59dbbcfed990882022b96cf478bd47253692d2e86279c591'
-            'e6cafb0ca6ef417c923817e68a6d25cc8efc824a09d38ffc944a4a44a2c52dd5549a8a95544f50bfccb0096d0e71521da1ef69572e18dd31c583cfc242425848')
+sha256sums=('eb23e6bda2c02095dfb0130668cf7c75d1f256904e3a7337815b4da5cb72eb04'
+            '2c622fa0d110d5745925d3a265d7dd953679d335f85a3ed3d1dcc699d9575d89'
+            '1e68cc016d7a62b171bb306169b24130fe20bf3cdfe2ff67ecc95e10a623098d')
 
 prepare() {
-  cd $pkgname-$pkgver
-
+  cd "$pkgname-$pkgver"
+  # patch for enchant >= 2.1.3
+  # https://www.archlinux.org/todo/enchant-221-rebuild/
+  sed -i 's,enchant/,enchant-2/,g' src/compose.c
+  sed -i 's/ enchant/ enchant-2/g' configure
+
+  # https://sylpheed.sraoss.jp/redmine/issues/306
+  patch -p1 < "$srcdir"/Support-SNI-some-servers-imap.gmail.patch
   # Remove Gmail support
   patch -Np1 -i "$srcdir/nonprism.patch"
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
   ./configure --prefix=/usr \
+              --enable-maintainer-mode \
               --enable-ldap
   make
 
@@ -42,8 +50,8 @@ build() {
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="$pkgdir/" install
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" LDFLAGS+="/usr/lib/enchant-2" install
 
   # Install Attachment-Tool Plug-in
   cd plugin/attachment_tool
-- 
cgit v1.2.3