Commits

Perry E. Metzger authored e65cfab05f3
claws-mail: add patch to build with libetpan 1.9.4
No tags

mail/claws-mail/files/patch-libetpan-1.9.4.diff

Added
1 +diff --git configure.ac configure.ac
2 +index 412a3f014..6a80c2a92 100644
3 +--- configure.ac
4 ++++ configure.ac
5 +@@ -908,38 +908,62 @@ fi
6 + dnl Libetpan
7 + AC_MSG_CHECKING([whether to use libetpan])
8 + if test x"$enable_libetpan" = xyes; then
9 +- AC_MSG_RESULT(yes)
10 +- libetpan_result=no
11 +- AC_PATH_PROG(libetpanconfig, [libetpan-config])
12 +- if test "x$libetpanconfig" != "x"; then
13 +- CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`"
14 +- AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
15 +- if test "x$libetpan_result" = "xyes"; then
16 +- AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
17 +- LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`"
18 +- AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
19 +- AC_MSG_RESULT([$libetpan_result])
20 +- fi
21 +- fi
22 +- if test "x$libetpan_result" = "xyes"; then
23 +- LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
24 +- LIBETPAN_LIBS="`$libetpanconfig --libs`"
25 +- LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
26 +- if test "$LIBETPAN_VERSION" -lt "57"; then
27 +- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
28 +- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
29 ++ AC_MSG_RESULT(yes)
30 ++
31 ++ libetpan_config=no
32 ++ libetpan_result=no
33 ++ libetpan_versiontype=0
34 ++
35 ++ # since 1.9.4, libetpan uses pkg-config
36 ++ PKG_CHECK_MODULES([LIBETPAN], [libetpan >= 1.9.4],
37 ++ [
38 ++ LIBETPAN_VERSION=`pkg-config --modversion | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
39 ++ libetpan_config=yes
40 ++ ],
41 ++ [
42 ++ # before 1.9.4, libetpan uses its own libetpan-config script
43 ++ AC_PATH_PROG(libetpanconfig, [libetpan-config])
44 ++ if test "x$libetpanconfig" != "x"; then
45 ++ LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
46 ++ LIBETPAN_LIBS="`$libetpanconfig --libs`"
47 ++ # support libetpan version like x.x and x.x.x
48 ++ libetpan_versiontype=`$libetpanconfig --version | tr -dc . | wc -c`
49 ++ if test $libetpan_versiontype -eq 1; then
50 ++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
51 ++ else
52 ++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
53 ++ fi
54 ++ libetpan_config=yes
55 ++ fi
56 ++ ])
57 ++ if test "x$libetpan_config" = "xyes"; then
58 ++ CPPFLAGS="$CPPFLAGS $LIBETPAN_FLAGS"
59 ++ AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
60 ++ if test "x$libetpan_result" = "xyes"; then
61 ++ AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
62 ++ LIBS="$LIBS $LIBETPAN_LIBS"
63 ++ AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
64 ++ AC_MSG_RESULT([$libetpan_result])
65 ++ fi
66 ++ fi
67 ++ if test "x$libetpan_result" = "xyes"; then
68 ++ if test $libetpan_versiontype -eq 1; then
69 ++ if test "$LIBETPAN_VERSION" -lt "57"; then
70 ++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
71 ++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
72 + AC_MSG_ERROR([libetpan 0.57 not found])
73 +- fi
74 +- AC_SUBST(LIBETPAN_FLAGS)
75 +- AC_SUBST(LIBETPAN_LIBS)
76 +- AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
77 +- else
78 +- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
79 +- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
80 +- AC_MSG_ERROR([libetpan 0.57 not found])
81 +- fi
82 ++ fi
83 ++ fi
84 ++ AC_SUBST(LIBETPAN_FLAGS)
85 ++ AC_SUBST(LIBETPAN_LIBS)
86 ++ AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNit TP support.)
87 ++ else
88 ++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
89 ++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
90 ++ AC_MSG_ERROR([libetpan 0.57 not found])
91 ++ fi
92 + else
93 +- AC_MSG_RESULT(no)
94 ++ AC_MSG_RESULT(no)
95 + fi
96 + AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
97 +

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut