user/claws-mail: Bump to 3.17.5

2 files changed, 5 insertions, 110 deletions

diff --git a/user/claws-mail/APKBUILD b/user/claws-mail/APKBUILD
index f59ff40e1..880f8fafb 100644
--- a/user/claws-mail/APKBUILD
+++ b/user/claws-mail/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=claws-mail
-pkgver=3.17.4
-pkgrel=2
+pkgver=3.17.5
+pkgrel=0
 pkgdesc="User-friendly, lightweight, and fast email client"
 url="https://www.claws-mail.org/"
 arch="all"
@@ -11,16 +11,9 @@ depends="compface"
 makedepends="compface-dev curl-dev dbus-glib-dev enchant-dev gnutls-dev
 	gpgme-dev gtk+2.0-dev libcanberra-gtk2 libcanberra-dev libetpan-dev
 	libical-dev libnotify-dev librsvg-dev openldap-dev
-	startup-notification-dev autoconf automake libtool"
+	startup-notification-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz
-	etpan.patch
-	"
-
-prepare() {
-	default_prepare
-	autoreconf -vif
-}
+source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz"
 
 build() {
 	./configure \
@@ -43,5 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012  claws-mail-3.17.4.tar.xz
-39e70ba2edfad857d4c042db0fa38ac806cf188d1cf7642b92d0115e162349919df7b98ade49da822fb1b299c5ef06d221b5c600e218ed33e0e8a48c3635d0a2  etpan.patch"
+sha512sums="a1d3576eba70b83a6fe70aafead3d80681e6372d146b573f5d43fee63bdcf84b5350d4dc8a4290b11d11320381417253d893daee8169c110e294178d10ea542f  claws-mail-3.17.5.tar.xz"
diff --git a/user/claws-mail/etpan.patch b/user/claws-mail/etpan.patch
deleted file mode 100644
index 572380d2e..000000000
--- a/user/claws-mail/etpan.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 412a3f014..6a80c2a92 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -908,38 +908,62 @@ fi
- dnl Libetpan
- AC_MSG_CHECKING([whether to use libetpan])
- if test x"$enable_libetpan" = xyes; then
--	AC_MSG_RESULT(yes)
--	libetpan_result=no
--	AC_PATH_PROG(libetpanconfig, [libetpan-config])
--	if test "x$libetpanconfig" != "x"; then
--	  CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`"
--	  AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
--	  if test "x$libetpan_result" = "xyes"; then
--	    AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
--	    LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`"
--	    AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
--	    AC_MSG_RESULT([$libetpan_result])
--	  fi
--	fi
--	if test "x$libetpan_result" = "xyes"; then
--	   LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
--	   LIBETPAN_LIBS="`$libetpanconfig --libs`"
--	   LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
--	   if test "$LIBETPAN_VERSION" -lt "57"; then
--		AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
--		AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
-+    AC_MSG_RESULT(yes)
-+
-+    libetpan_config=no
-+    libetpan_result=no
-+    libetpan_versiontype=0
-+
-+    # since 1.9.4, libetpan uses pkg-config
-+    PKG_CHECK_MODULES([LIBETPAN], [libetpan >= 1.9.4],
-+    [
-+        LIBETPAN_VERSION=`pkg-config --modversion | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
-+        libetpan_config=yes
-+    ],
-+    [
-+        # before 1.9.4, libetpan uses its own libetpan-config script
-+        AC_PATH_PROG(libetpanconfig, [libetpan-config])
-+        if test "x$libetpanconfig" != "x"; then
-+            LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
-+            LIBETPAN_LIBS="`$libetpanconfig --libs`"
-+            # support libetpan version like x.x and x.x.x
-+            libetpan_versiontype=`$libetpanconfig --version | tr -dc . | wc -c`
-+            if test $libetpan_versiontype -eq 1; then
-+                LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
-+            else
-+                LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
-+            fi
-+            libetpan_config=yes
-+        fi
-+    ])
-+    if test "x$libetpan_config" = "xyes"; then
-+        CPPFLAGS="$CPPFLAGS $LIBETPAN_FLAGS"
-+        AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
-+        if test "x$libetpan_result" = "xyes"; then
-+            AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
-+            LIBS="$LIBS $LIBETPAN_LIBS"
-+            AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
-+            AC_MSG_RESULT([$libetpan_result])
-+        fi
-+    fi
-+    if test "x$libetpan_result" = "xyes"; then
-+        if test $libetpan_versiontype -eq 1; then
-+            if test "$LIBETPAN_VERSION" -lt "57"; then
-+                AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
-+                AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
-                 AC_MSG_ERROR([libetpan 0.57 not found])
--	   fi
--	   AC_SUBST(LIBETPAN_FLAGS)
--	   AC_SUBST(LIBETPAN_LIBS)
--	   AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
--	else
--	   AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
--	   AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
--           AC_MSG_ERROR([libetpan 0.57 not found])
--	fi
-+            fi
-+        fi
-+        AC_SUBST(LIBETPAN_FLAGS)
-+        AC_SUBST(LIBETPAN_LIBS)
-+        AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNit TP support.)
-+    else
-+        AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
-+        AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
-+        AC_MSG_ERROR([libetpan 0.57 not found])
-+    fi
- else
--	AC_MSG_RESULT(no)
-+    AC_MSG_RESULT(no)
- fi
- AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
-