commit:     9294cc0d001280d748462a43eb38ffe2410988f7
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 20:59:30 2018 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 20:59:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9294cc0d

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

 net-irc/epic5/epic5-1.1.10-r1.ebuild           |  3 ++-
 net-irc/epic5/epic5-1.1.10-r2.ebuild           | 11 ++++++-----
 net-irc/epic5/files/epic5-1.1.10-xlocale.patch | 11 +++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/net-irc/epic5/epic5-1.1.10-r1.ebuild 
b/net-irc/epic5/epic5-1.1.10-r1.ebuild
index 97036b79137..32634a46933 100644
--- 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 289bab3402a..b2c668fcd02 100644
--- 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
index 00000000000..8c5c7e44bff
--- /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...

Reply via email to