[gentoo-commits] repo/gentoo:master commit in: games-board/polyglot/, games-board/polyglot/files/

[gentoo-commits] repo/gentoo:master commit in: games-board/polyglot/, games-board/polyglot/files/

[Ulrich Müller]

commit:     49476d85047c707e6f0812f0abf72cd5cb41c730
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 10:26:47 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 10:27:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49476d85

games-board/polyglot: Fix compilation with musl libc.

Closes: https://bugs.gentoo.org/715560
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../polyglot/files/polyglot-1.4.70b-musl.patch     | 30 ++++++++++++++++++++++
 games-board/polyglot/polyglot-1.4.70b-r3.ebuild    |  5 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/games-board/polyglot/files/polyglot-1.4.70b-musl.patch b/games-board/polyglot/files/polyglot-1.4.70b-musl.patch
new file mode 100644
index 00000000000..5ccbdea4a43
--- /dev/null
+++ b/games-board/polyglot/files/polyglot-1.4.70b-musl.patch
@@ -0,0 +1,30 @@
+Rename uint64_t to uint64 (same as in util.h) to avoid a name collision.
+https://bugs.gentoo.org/715560
+
+--- polyglot-1.4.70b-orig/pgheader.c
++++ polyglot-1.4.70b/pgheader.c
+@@ -49,12 +49,12 @@
+ #endif
+ 
+ #ifdef _MSC_VER
+-  typedef unsigned __int64 uint64_t;
++  typedef unsigned __int64 uint64;
+ #else
+-  typedef unsigned long long int uint64_t;
++  typedef unsigned long long int uint64;
+ #endif
+ 
+-static int int_from_file(FILE *f, int l, uint64_t *r){
++static int int_from_file(FILE *f, int l, uint64 *r){
+     int i,c;
+     for(i=0;i<l;i++){
+         c=fgetc(f);
+@@ -69,7 +69,7 @@
+ 
+ int pgheader_detect(const char *infile){
+     FILE *fin;
+-    uint64_t r0,r1,r2;
++    uint64 r0,r1,r2;
+     int i;
+ 
+     fin=fopen(infile,"rb");

diff --git a/games-board/polyglot/polyglot-1.4.70b-r3.ebuild b/games-board/polyglot/polyglot-1.4.70b-r3.ebuild
index 23043395c45..a69460e036c 100644
--- a/games-board/polyglot/polyglot-1.4.70b-r3.ebuild
+++ b/games-board/polyglot/polyglot-1.4.70b-r3.ebuild
@@ -12,5 +12,8 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-PATCHES=( "${FILESDIR}"/${P}-no-common.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-no-common.patch
+	"${FILESDIR}"/${P}-musl.patch
+)
 DOCS="AUTHORS ChangeLog TODO" # README* installed by build system