net-irc/epic5: Fix build with glibc-2.26, bug 652738

Closes: https://bugs.gentoo.org/652738
Package-Manager: Portage-2.3.31, Repoman-2.3.9

diff --git a/net-irc/epic5/epic5-1.1.10-r1.ebuild b/net-irc/epic5/epic5-1.1.10-r1.ebuild
index 97036b79137d849efc476507db0fb6ea6a76a829..32634a469338a169f0714e20135255b7182ba3d3 100644 (file)
--- a/net-irc/epic5/epic5-1.1.10-r1.ebuild
+++ b/net-irc/epic5/epic5-1.1.10-r1.ebuild
@@ -49,7 +49,8 @@ src_prepare() {
                "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \
                "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \
                "${FILESDIR}"/${P}-without-localdir.patch \
-               "${FILESDIR}"/${P}-socks5-libsocks.patch
+               "${FILESDIR}"/${P}-socks5-libsocks.patch \
+               "${FILESDIR}"/${P}-xlocale.patch
        eautoconf
 }
 

diff --git a/net-irc/epic5/epic5-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild
index 289bab3402a812ea29c8e51b18e7b367dccb25e5..b2c668fcd02ed41a574ba98396c0838d9029e188 100644 (file)
--- a/net-irc/epic5/epic5-1.1.10-r2.ebuild
+++ b/net-irc/epic5/epic5-1.1.10-r2.ebuild
@@ -31,12 +31,13 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \
-       "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \
-       "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \
-       "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \
-       "${FILESDIR}"/${P}-without-localdir.patch \
+       "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch
+       "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch
+       "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch
+       "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch
+       "${FILESDIR}"/${P}-without-localdir.patch
        "${FILESDIR}"/${P}-socks5-libsocks.patch
+       "${FILESDIR}"/${P}-xlocale.patch
 )
 
 src_prepare() {

diff --git a/net-irc/epic5/files/epic5-1.1.10-xlocale.patch b/net-irc/epic5/files/epic5-1.1.10-xlocale.patch
new file mode 100644 (file)
index 0000000..8c5c7e4
--- /dev/null
+++ b/net-irc/epic5/files/epic5-1.1.10-xlocale.patch
@@ -0,0 +1,11 @@
+diff -ruN epic5-1.1.10.orig/source/recode.c epic5-1.1.10/source/recode.c
+--- epic5-1.1.10.orig/source/recode.c  2014-04-11 17:12:26.000000000 +0200
++++ epic5-1.1.10/source/recode.c       2018-04-30 22:55:11.976293375 +0200
+@@ -41,7 +41,6 @@
+ #include <langinfo.h>
+ #include <locale.h>
+ #include <wctype.h>
+-#include <xlocale.h>
+ 
+ /*
+  * Here's the plan...