Skip to content

Commit 5b6a443

Browse files
committed
net-mail/mailutils: Fix building with GCC 10
Bug: https://bugs.gentoo.org/709274 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: David Seifert <[email protected]>
1 parent 935560c commit 5b6a443

5 files changed

+47
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/lib/tcpwrap.h
2+
+++ b/lib/tcpwrap.h
3+
@@ -18,7 +18,7 @@
4+
#include <mailutils/types.h>
5+
6+
extern int mu_tcp_wrapper_enable;
7+
-const char *mu_tcp_wrapper_daemon;
8+
+extern const char *mu_tcp_wrapper_daemon;
9+
extern int mu_tcpwrapper_access (int fd);
10+
extern void mu_tcpwrapper_cfg_init (void);
11+
extern int mu_tcp_wrapper_prefork (int fd,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- a/imap4d/imap4d.h
2+
+++ b/imap4d/imap4d.h
3+
@@ -229,8 +229,6 @@ extern struct mu_tls_config global_tls_conf;
4+
extern int test_mode;
5+
extern int silent_expunge;
6+
7+
-int tls_available;
8+
-
9+
/* Input functions */
10+
extern mu_stream_t iostream;
11+
extern int io_untagged_response (int, const char *, ...) MU_PRINTFLIKE(2,3);
12+
--- a/lib/tcpwrap.h
13+
+++ b/lib/tcpwrap.h
14+
@@ -17,7 +17,7 @@
15+
#include <mailutils/types.h>
16+
17+
extern int mu_tcp_wrapper_enable;
18+
-const char *mu_tcp_wrapper_daemon;
19+
+extern const char *mu_tcp_wrapper_daemon;
20+
extern int mu_tcpwrapper_access (int fd);
21+
extern void mu_tcpwrapper_cfg_init (void);
22+
extern int mu_tcp_wrapper_prefork (int fd,

net-mail/mailutils/mailutils-3.4-r3.ebuild

+4-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ pkg_setup() {
5656
src_prepare() {
5757
# Disable bytecompilation of Python modules.
5858
echo "#!/bin/sh" > build-aux/py-compile
59-
eapply "${FILESDIR}/${P}-MH-testsuite.patch" \
60-
"${FILESDIR}/${P}-fix-endianness.patch"
59+
eapply \
60+
"${FILESDIR}"/${P}-MH-testsuite.patch \
61+
"${FILESDIR}"/${P}-fix-endianness.patch \
62+
"${FILESDIR}"/${PN}-3.4-fno-common.patch
6163
# add missing tests so that make check doesn't fail
6264
cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
6365
if use mysql; then

net-mail/mailutils/mailutils-3.7.ebuild

+5-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
5151
servers? ( tcpd ldap )"
5252

5353
DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
54-
PATCHES=( "${FILESDIR}/${PN}-3.5-add-include.patch" \
55-
"${FILESDIR}/${PN}-3.6-underlinking.patch" )
54+
PATCHES=(
55+
"${FILESDIR}"/${PN}-3.5-add-include.patch
56+
"${FILESDIR}"/${PN}-3.6-underlinking.patch
57+
"${FILESDIR}"/${PN}-3.8-fno-common.patch
58+
)
5659

5760
pkg_setup() {
5861
use python && python-single-r1_pkg_setup

net-mail/mailutils/mailutils-3.8.ebuild

+5-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
5252

5353
DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
5454
PATCHES=(
55-
"${FILESDIR}/${PN}-3.5-add-include.patch" \
56-
"${FILESDIR}/${PN}-3.6-underlinking.patch" \
57-
"${FILESDIR}/${PN}-3.8-fix-tests.patch" \
58-
)
55+
"${FILESDIR}"/${PN}-3.5-add-include.patch
56+
"${FILESDIR}"/${PN}-3.6-underlinking.patch
57+
"${FILESDIR}"/${PN}-3.8-fix-tests.patch
58+
"${FILESDIR}"/${PN}-3.8-fno-common.patch
59+
)
5960

6061
pkg_setup() {
6162
use python && python-single-r1_pkg_setup

0 commit comments

Comments
 (0)