| 1 |
commit: 9294cc0d001280d748462a43eb38ffe2410988f7 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 30 20:59:30 2018 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 30 20:59:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9294cc0d |
| 7 |
|
| 8 |
net-irc/epic5: Fix build with glibc-2.26, bug 652738 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/652738 |
| 11 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 12 |
|
| 13 |
net-irc/epic5/epic5-1.1.10-r1.ebuild | 3 ++- |
| 14 |
net-irc/epic5/epic5-1.1.10-r2.ebuild | 11 ++++++----- |
| 15 |
net-irc/epic5/files/epic5-1.1.10-xlocale.patch | 11 +++++++++++ |
| 16 |
3 files changed, 19 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-irc/epic5/epic5-1.1.10-r1.ebuild b/net-irc/epic5/epic5-1.1.10-r1.ebuild |
| 19 |
index 97036b79137..32634a46933 100644 |
| 20 |
--- a/net-irc/epic5/epic5-1.1.10-r1.ebuild |
| 21 |
+++ b/net-irc/epic5/epic5-1.1.10-r1.ebuild |
| 22 |
@@ -49,7 +49,8 @@ src_prepare() { |
| 23 |
"${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \ |
| 24 |
"${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \ |
| 25 |
"${FILESDIR}"/${P}-without-localdir.patch \ |
| 26 |
- "${FILESDIR}"/${P}-socks5-libsocks.patch |
| 27 |
+ "${FILESDIR}"/${P}-socks5-libsocks.patch \ |
| 28 |
+ "${FILESDIR}"/${P}-xlocale.patch |
| 29 |
eautoconf |
| 30 |
} |
| 31 |
|
| 32 |
|
| 33 |
diff --git a/net-irc/epic5/epic5-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild |
| 34 |
index 289bab3402a..b2c668fcd02 100644 |
| 35 |
--- a/net-irc/epic5/epic5-1.1.10-r2.ebuild |
| 36 |
+++ b/net-irc/epic5/epic5-1.1.10-r2.ebuild |
| 37 |
@@ -31,12 +31,13 @@ DEPEND="${RDEPEND} |
| 38 |
S=${WORKDIR}/${P} |
| 39 |
|
| 40 |
PATCHES=( |
| 41 |
- "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \ |
| 42 |
- "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \ |
| 43 |
- "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \ |
| 44 |
- "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \ |
| 45 |
- "${FILESDIR}"/${P}-without-localdir.patch \ |
| 46 |
+ "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch |
| 47 |
+ "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch |
| 48 |
+ "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch |
| 49 |
+ "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch |
| 50 |
+ "${FILESDIR}"/${P}-without-localdir.patch |
| 51 |
"${FILESDIR}"/${P}-socks5-libsocks.patch |
| 52 |
+ "${FILESDIR}"/${P}-xlocale.patch |
| 53 |
) |
| 54 |
|
| 55 |
src_prepare() { |
| 56 |
|
| 57 |
diff --git a/net-irc/epic5/files/epic5-1.1.10-xlocale.patch b/net-irc/epic5/files/epic5-1.1.10-xlocale.patch |
| 58 |
new file mode 100644 |
| 59 |
index 00000000000..8c5c7e44bff |
| 60 |
--- /dev/null |
| 61 |
+++ b/net-irc/epic5/files/epic5-1.1.10-xlocale.patch |
| 62 |
@@ -0,0 +1,11 @@ |
| 63 |
+diff -ruN epic5-1.1.10.orig/source/recode.c epic5-1.1.10/source/recode.c |
| 64 |
+--- epic5-1.1.10.orig/source/recode.c 2014-04-11 17:12:26.000000000 +0200 |
| 65 |
++++ epic5-1.1.10/source/recode.c 2018-04-30 22:55:11.976293375 +0200 |
| 66 |
+@@ -41,7 +41,6 @@ |
| 67 |
+ #include <langinfo.h> |
| 68 |
+ #include <locale.h> |
| 69 |
+ #include <wctype.h> |
| 70 |
+-#include <xlocale.h> |
| 71 |
+ |
| 72 |
+ /* |
| 73 |
+ * Here's the plan... |
Archives