[gentoo-commits] repo/gentoo:master commit in: net-p2p/gtk-gnutella/files/, net-p2p/gtk-gnutella/

[Hans de Graaff]

commit:     7473325883667c2f6021c2c583dbb990c8ec29ec
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 07:47:45 2019 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 07:47:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74733258

net-p2p/gtk-gnutella: fix compilation with glibc 2.28

Fixes: https://bugs.gentoo.org/669606
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../files/gtk-gnutella-1.1.14-statx.patch          | 38 ++++++++++++++++++++++
 net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild    |  4 ++-
 net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild    |  8 +++--
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch
new file mode 100644
index 00000000000..5d455887c04
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch
@@ -0,0 +1,38 @@
+diff --git a/src/lib/stats.c b/src/lib/stats.c
+index 8d0d87b8b..725986268 100644
+--- a/src/lib/stats.c
++++ b/src/lib/stats.c
+@@ -50,7 +50,7 @@ enum statx_magic { STATX_MAGIC = 0x560044e5 };
+ /**
+  * A one-dimension container (x).
+  */
+-struct statx {
++struct statistics {
+ 	enum statx_magic magic;	/**< Magic number */
+ 	elist_t data;			/**< Data points */
+ 	long n;					/**< Amount of data points */
+@@ -60,7 +60,7 @@ struct statx {
+ };
+ 
+ static inline void
+-statx_check(const struct statx * const sx)
++statx_check(const struct statistics * const sx)
+ {
+ 	g_assert(sx != NULL);
+ 	g_assert(STATX_MAGIC == sx->magic);
+diff --git a/src/lib/stats.h b/src/lib/stats.h
+index ba876467c..2a67952e2 100644
+--- a/src/lib/stats.h
++++ b/src/lib/stats.h
+@@ -40,9 +40,9 @@
+  * One dimension statistics.
+  */
+ 
+-struct statx;
++struct statistics;
+ 
+-typedef struct statx statx_t;
++typedef struct statistics statx_t;
+ 
+ statx_t *statx_make(void);
+ statx_t *statx_make_nodata(void);

diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
index 6dc93535b3c..0d716e9f88d 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.1.14-statx.patch"
+
 	strip-linguas -i po
 
 	echo "# Gentoo-selected LINGUAS" > po/LINGUAS

diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
index 7e55b5198d1..61b7b1fcdeb 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# strip-linguas
-inherit eutils
+# eutils: strip-linguas
+inherit eutils toolchain-funcs
 
 IUSE="nls dbus ssl +gtk"
 
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	eapply "${FILESDIR}/${P}-statx.patch"
+
 	strip-linguas -i po
 
 	echo "# Gentoo-selected LINGUAS" > po/LINGUAS