cpet
/
openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to claws-mail-4.1.1

This commit is contained in:
sthen 2023-01-03 16:23:08 +00:00
parent c6c053527b
commit 3c050e5b6f
4 changed files with 15 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mail/claws-mail/Makefile
View File

@ -4,18 +4,13 @@ COMMENT-spamassassin= spamassassin plugin
COMMENT-pdfviewer= pdfviewer plugin
COMMENT-gdata= gdata plugin
V= 4.1.0
V= 4.1.1
DISTNAME= claws-mail-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-bogofilter= claws-mail-bogofilter-${V}
PKGNAME-spamassassin= claws-mail-spamassassin-${V}
PKGNAME-pdfviewer= claws-mail-pdfviewer-${V}
PKGNAME-gdata= claws-mail-gdata-${V}
REVISION-bogofilter= 1
REVISION-gdata= 1
REVISION-main= 1
REVISION-pdfviewer= 1
REVISION-spamassassin= 1
CATEGORIES= mail news
@ -40,18 +35,19 @@ RUN_DEPENDS-bogofilter= ${BUILD_PKGPATH} \
RUN_DEPENDS-spamassassin=${BUILD_PKGPATH} \
mail/p5-Mail-SpamAssassin
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 cairo cairo-gobject
WANTLIB += crypto curl etpan execinfo expat ffi fontconfig freetype
WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += graphite2 gtk-3 harfbuzz iconv intl jpeg m nghttp2 pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png pthread
WANTLIB += sasl2 ssl xcb xcb-render xcb-shm z epoxy
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
WANTLIB += cairo cairo-gobject crypto curl dbus-1 epoxy etpan execinfo
WANTLIB += expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB += gtk-3 harfbuzz iconv intl jpeg m nghttp2 nghttp3 ngtcp2
WANTLIB += ngtcp2_crypto_openssl pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre2-8 pixman-1 png sasl2 ssl xcb xcb-render xcb-shm z
WANTLIB-main = ${WANTLIB}
WANTLIB-main += ICE SM X11-xcb archive aspell assuan b2 bz2 c canberra
WANTLIB-main += canberra-gtk3 db dbus-1 dbus-glib-1 enchant-2 gmp gnutls
WANTLIB-main += canberra-gtk3 db dbus-glib-1 enchant-2 gmp gnutls
WANTLIB-main += gpg-error gpgme gthread-2.0 gumbo hogweed ical icalss
WANTLIB-main += icalvcal icudata icui18n icuuc idn2 ltdl lz4 lzma nettle
WANTLIB-main += notify ogg p11-kit perl rsvg-2 startup-notification-1
@ -112,7 +108,7 @@ USE_GMAKE= Yes
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
AUTOCONF_VERSION= 2.71
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"

4
mail/claws-mail/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (claws-mail-4.1.0.tar.gz) = U0YD1gIA8740aDDS+v2Q298LWbmzuSi8Cqf4wcIY7DE=
SIZE (claws-mail-4.1.0.tar.gz) = 12089411
SHA256 (claws-mail-4.1.1.tar.gz) = BKc6OIme4EDGfdgffDpK0LvI77066ATlzrkfqLLYYC4=
SIZE (claws-mail-4.1.1.tar.gz) = 12140702

4
mail/claws-mail/patches/patch-configure_ac
View File

@ -23,7 +23,7 @@ Index: configure.ac
AC_SUBST(ENCHANT_CFLAGS)
AC_SUBST(ENCHANT_LIBS)
fi
@@ -835,6 +827,7 @@ if test x"$enable_alternate_addressbook" = xno; then
@@ -833,6 +825,7 @@ if test x"$enable_alternate_addressbook" = xno; then
AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")
AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
@ -31,7 +31,7 @@ Index: configure.ac
AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber",,
$LDAP_LIBS)
@@ -907,7 +900,7 @@ if test x"$enable_alternate_addressbook" = xno; then
@@ -905,7 +898,7 @@ if test x"$enable_alternate_addressbook" = xno; then
AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ])
fi

128
mail/claws-mail/patches/patch-src_plugins_perl_perl_plugin_c
View File

@ -1,128 +0,0 @@
stop trying to use XSRETURN as an expression
Index: src/plugins/perl/perl_plugin.c
--- src/plugins/perl/perl_plugin.c.orig
+++ src/plugins/perl/perl_plugin.c
@@ -577,47 +577,50 @@ static XS(XS_ClawsMail_filter_init)
/* msginfo */
case 1:
- msginfo->size ? XSRETURN_UV(msginfo->size) : XSRETURN_UNDEF;
+ if (msginfo->size) XSRETURN_UV(msginfo->size); else XSRETURN_UNDEF;
case 2:
- msginfo->date ? XSRETURN_PV(msginfo->date) : XSRETURN_UNDEF;
+ if (msginfo->date) XSRETURN_PV(msginfo->date); else XSRETURN_UNDEF;
case 3:
- msginfo->from ? XSRETURN_PV(msginfo->from) : XSRETURN_UNDEF;
+ if (msginfo->from) XSRETURN_PV(msginfo->from); else XSRETURN_UNDEF;
case 4:
- msginfo->to ? XSRETURN_PV(msginfo->to) : XSRETURN_UNDEF;
+ if (msginfo->to) XSRETURN_PV(msginfo->to); else XSRETURN_UNDEF;
case 5:
- msginfo->cc ? XSRETURN_PV(msginfo->cc) : XSRETURN_UNDEF;
+ if (msginfo->cc) XSRETURN_PV(msginfo->cc); else XSRETURN_UNDEF;
case 6:
- msginfo->newsgroups ? XSRETURN_PV(msginfo->newsgroups) : XSRETURN_UNDEF;
+ if (msginfo->newsgroups) XSRETURN_PV(msginfo->newsgroups); else XSRETURN_UNDEF;
case 7:
- msginfo->subject ? XSRETURN_PV(msginfo->subject) : XSRETURN_UNDEF;
+ if (msginfo->subject) XSRETURN_PV(msginfo->subject); else XSRETURN_UNDEF;
case 8:
- msginfo->msgid ? XSRETURN_PV(msginfo->msgid) : XSRETURN_UNDEF;
+ if (msginfo->msgid) XSRETURN_PV(msginfo->msgid); else XSRETURN_UNDEF;
case 9:
- msginfo->inreplyto ? XSRETURN_PV(msginfo->inreplyto) : XSRETURN_UNDEF;
+ if (msginfo->inreplyto) XSRETURN_PV(msginfo->inreplyto); else XSRETURN_UNDEF;
case 10:
- msginfo->xref ? XSRETURN_PV(msginfo->xref) : XSRETURN_UNDEF;
+ if (msginfo->xref) XSRETURN_PV(msginfo->xref); else XSRETURN_UNDEF;
case 11:
xface = procmsg_msginfo_get_avatar(msginfo, AVATAR_XFACE);
- xface ? XSRETURN_PV(xface) : XSRETURN_UNDEF;
+ if (xface) XSRETURN_PV(xface); else XSRETURN_UNDEF;
case 12:
- (msginfo->extradata && msginfo->extradata->dispositionnotificationto) ?
- XSRETURN_PV(msginfo->extradata->dispositionnotificationto) : XSRETURN_UNDEF;
+ if (msginfo->extradata && msginfo->extradata->dispositionnotificationto)
+ XSRETURN_PV(msginfo->extradata->dispositionnotificationto);
+ else
+ XSRETURN_UNDEF;
case 13:
- (msginfo->extradata && msginfo->extradata->returnreceiptto) ?
- XSRETURN_PV(msginfo->extradata->returnreceiptto) : XSRETURN_UNDEF;
+ if (msginfo->extradata && msginfo->extradata->returnreceiptto)
+ XSRETURN_PV(msginfo->extradata->returnreceiptto);
+ else
+ XSRETURN_UNDEF;
case 14:
EXTEND(SP, g_slist_length(msginfo->references));
ii = 0;
for(walk = msginfo->references; walk != NULL; walk = g_slist_next(walk))
XST_mPV(ii++,walk->data ? (gchar*) walk->data: "");
- ii ? XSRETURN(ii) : XSRETURN_UNDEF;
+ if (ii) XSRETURN(ii); else XSRETURN_UNDEF;
case 15:
- msginfo->score ? XSRETURN_IV(msginfo->score) : XSRETURN_UNDEF;
+ if (msginfo->score) XSRETURN_IV(msginfo->score); else XSRETURN_UNDEF;
case 17:
- msginfo->plaintext_file ?
- XSRETURN_PV(msginfo->plaintext_file) : XSRETURN_UNDEF;
+ if (msginfo->plaintext_file) XSRETURN_PV(msginfo->plaintext_file); else XSRETURN_UNDEF;
case 19:
- msginfo->hidden ? XSRETURN_IV(msginfo->hidden) : XSRETURN_UNDEF;
+ if (msginfo->hidden) XSRETURN_IV(msginfo->hidden); else XSRETURN_UNDEF;
case 20:
if((charp = procmsg_get_message_file_path(msginfo)) != NULL) {
strncpy2(buf,charp,sizeof(buf));
@@ -627,19 +630,30 @@ static XS(XS_ClawsMail_filter_init)
else
XSRETURN_UNDEF;
case 21:
- (msginfo->extradata && msginfo->extradata->partial_recv) ?
- XSRETURN_PV(msginfo->extradata->partial_recv) : XSRETURN_UNDEF;
+ if (msginfo->extradata && msginfo->extradata->partial_recv)
+ XSRETURN_PV(msginfo->extradata->partial_recv);
+ else
+ XSRETURN_UNDEF;
case 22:
- msginfo->total_size ? XSRETURN_IV(msginfo->total_size) : XSRETURN_UNDEF;
+ if (msginfo->total_size)
+ XSRETURN_IV(msginfo->total_size);
+ else
+ XSRETURN_UNDEF;
case 23:
- (msginfo->extradata && msginfo->extradata->account_server) ?
- XSRETURN_PV(msginfo->extradata->account_server) : XSRETURN_UNDEF;
+ if (msginfo->extradata && msginfo->extradata->account_server)
+ XSRETURN_PV(msginfo->extradata->account_server);
+ else
+ XSRETURN_UNDEF;
case 24:
- (msginfo->extradata && msginfo->extradata->account_login) ?
- XSRETURN_PV(msginfo->extradata->account_login) : XSRETURN_UNDEF;
+ if (msginfo->extradata && msginfo->extradata->account_login)
+ XSRETURN_PV(msginfo->extradata->account_login);
+ else
+ XSRETURN_UNDEF;
case 25:
- msginfo->planned_download ?
- XSRETURN_IV(msginfo->planned_download) : XSRETURN_UNDEF;
+ if (msginfo->planned_download)
+ XSRETURN_IV(msginfo->planned_download);
+ else
+ XSRETURN_UNDEF;
/* general */
case 100:
@@ -900,7 +914,10 @@ static XS(XS_ClawsMail_tagged)
XSRETURN_UNDEF;
}
- return msginfo->tags ? XSRETURN_YES : XSRETURN_NO;
+ if (msginfo->tags)
+ XSRETURN_YES;
+ else
+ XSRETURN_NO;
}
/* ClawsMail::C::get_tags() */