Make package look more like the one in main repos

3 files changed, 59 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cdf055fc2bcf..fe62aa685fa9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = neomutt-git
 	pkgdesc = A version of mutt with added features - development branch
-	pkgver = 20211029.r144.gb77af0218
+	pkgver = 20220408.r12.gccde81231
 	pkgrel = 1
 	url = http://www.neomutt.org/
 	arch = i686
@@ -11,15 +11,31 @@ pkgbase = neomutt-git
 	makedepends = libxslt
 	makedepends = docbook-xsl
 	makedepends = w3m
-	depends = lua
-	depends = perl
+	depends = glibc
+	depends = gpgme
+	depends = lua53
 	depends = notmuch-runtime
+	depends = krb5
+	depends = gnutls
+	depends = sqlite
+	depends = libsasl
+	depends = ncurses
+	depends = libidn2
 	depends = lmdb
+	depends = gdbm
 	depends = kyotocabinet
-	depends = python
+	depends = lz4
+	depends = zlib
+	depends = zstd
+	depends = db
+	optdepends = python: keybase.py
+	optdepends = perl: smime_keys
+	optdepends = ca-certificates: default CA certificates
 	provides = neomutt
 	conflicts = neomutt
 	source = git+https://github.com/neomutt/neomutt.git#branch=master
+	source = default-ca-certificates.patch
 	sha256sums = SKIP
+	sha256sums = 571716b8979e9b43328416c3c56eff228b6c58355d7c080b8987ea89c6360776
 
 pkgname = neomutt-git
diff --git a/PKGBUILD b/PKGBUILD
index 33b10bb26d66..f71372529cd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,16 +4,23 @@
 # Contributor: Chris Salzberg <chris@dejimata.com>
 _pkgname=neomutt
 pkgname=neomutt-git
-pkgver=20211029.r144.gb77af0218
+pkgver=20220408.r12.gccde81231
 pkgrel=1
 pkgdesc='A version of mutt with added features - development branch'
 url='http://www.neomutt.org/'
 license=('GPL')
-source=('git+https://github.com/neomutt/neomutt.git#branch=master')
-sha256sums=('SKIP')
 arch=('i686' 'x86_64')
-depends=('lua' 'perl' 'notmuch-runtime' 'lmdb' 'kyotocabinet' 'python')
+depends=('glibc' 'gpgme' 'lua53' 'notmuch-runtime' 'krb5' 'gnutls' 'sqlite'
+         'libsasl' 'ncurses' 'libidn2' 'lmdb' 'gdbm' 'kyotocabinet'
+         'lz4' 'zlib' 'zstd' 'db')
+optdepends=('python: keybase.py'
+            'perl: smime_keys'
+            'ca-certificates: default CA certificates')
 makedepends=('git' 'gnupg' 'libxslt' 'docbook-xsl' 'w3m')
+source=("git+https://github.com/neomutt/neomutt.git#branch=master"
+        "default-ca-certificates.patch")
+sha256sums=('SKIP'
+            '571716b8979e9b43328416c3c56eff228b6c58355d7c080b8987ea89c6360776')
 conflicts=('neomutt')
 provides=('neomutt')
 
@@ -22,6 +29,11 @@ pkgver() {
     git describe --long --tags | sed -r 's/(.*)-(.*)-/\1.r\2./; s/-//g'
 }
 
+prepare() {
+    cd "$_pkgname"
+    patch -Np1 -i "$srcdir/default-ca-certificates.patch"
+}
+
 build() {
     cd "$_pkgname"
     ./configure \
@@ -29,18 +41,24 @@ build() {
         --sysconfdir=/etc \
         --libexecdir=/usr/lib \
         --gpgme \
-        --enable-lua \
+        --sqlite \
+        --autocrypt \
+        --lua \
         --notmuch \
         --gss \
-        --ssl \
+        --gnutls \
         --sasl \
         --with-ui=ncurses \
         --with-idn2=/usr \
-        --idn=0 \
-        --idn2=1 \
+        --disable-idn \
+        --idn2 \
+        --bdb \
         --lmdb \
         --kyotocabinet \
-        --gdbm
+        --gdbm \
+        --lz4 \
+        --zlib \
+        --zstd
     make
 }
 
diff --git a/default-ca-certificates.patch b/default-ca-certificates.patch
new file mode 100644
index 000000000000..d74509a5b3be
--- /dev/null
+++ b/default-ca-certificates.patch
@@ -0,0 +1,12 @@
+--- a/docs/neomuttrc.head
++++ b/docs/neomuttrc.head.new
+@@ -48,6 +48,9 @@ bind browser y exit
+ # be undone with unmime_lookup.
+ mime_lookup application/octet-stream
+
++# System-wide CA file managed by the ca-certificates package
++set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
++
+ ##
+ ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***
+ ##