community/claws-mail: upgrade to 3.17.5

2 files changed, 5 insertions, 98 deletions

diff --git a/community/claws-mail/APKBUILD b/community/claws-mail/APKBUILD
index eda2043fac..b83ee3105a 100644
--- a/community/claws-mail/APKBUILD
+++ b/community/claws-mail/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Łukasz Jendrysik
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=claws-mail
-pkgver=3.17.4
-pkgrel=4
-pkgdesc="A GTK+ based e-mail client."
+pkgver=3.17.5
+pkgrel=0
+pkgdesc="GTK+ based e-mail client."
 url="https://www.claws-mail.org"
 arch="all"
 license="GPL-3.0-or-later"
@@ -188,5 +188,5 @@ _managesieve() {
 	_plugin "Manage Sieve filters on servers that support ManageSeieve" "" managesieve
 }
 
-sha512sums="ff7f1339888130443532945b49f40373ece6edc45554625fa89ceb1a52031d6d56174455167b35d301082e91019dc0aef0ae0f02b30924a0695cf155617f4e94  claws-mail-3.17.4.tar.gz
-258641c9bb4740d497db134ee21af650b74384b6766b7757c99738459ce0b24dcad970f6f7f816eb50ceb94a21eed0b3af17a008dfb49243c1a86cad2887c219  libetpan-1.9.4.patch"
+sha512sums="20495efd82a3c62752bd453fc7846efae644beeb6feb8cfdbd4211241e52222ed36a9cdb543ef04ed881cccffb601d376428a88fe119ebe6937350b20170f416  claws-mail-3.17.5.tar.gz
+02d2402d9f63547089d97d7f24b2952271018ed358004e2c740c8c5b3b0f5083d8c5b0bf3f9e77ebcdaabcefce6d096b2aa89969b862c107fdf7a0ff19184c3b  libetpan-1.9.4.patch"
diff --git a/community/claws-mail/libetpan-1.9.4.patch b/community/claws-mail/libetpan-1.9.4.patch
index fa2b5e6367..b5179ad625 100644
--- a/community/claws-mail/libetpan-1.9.4.patch
+++ b/community/claws-mail/libetpan-1.9.4.patch
@@ -12,99 +12,6 @@ diff --git a/configure.ac b/configure.ac
 index 412a3f014..663e7b892 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")
- 
 @@ -1119,6 +1143,10 @@ AC_ARG_ENABLE(vcalendar-plugin,
  		[  --disable-vcalendar-plugin      Do not build vcalendar plugin],
  		[enable_vcalendar_plugin=$enableval], [enable_vcalendar_plugin=auto])