From fa07f65de49f0d94502414eedc376b34f15d45e7 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Mon, 31 Dec 2018 14:16:46 -0200
Subject: [PATCH] espeak: fix narrowing error and template style

---
 srcpkgs/espeak/patches/fix-narrowing.patch | 12 +++++++++
 srcpkgs/espeak/template                    | 31 ++++++++++------------
 2 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch

diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
new file mode 100644
index 00000000000..20ffb58d8d1
--- /dev/null
+++ b/srcpkgs/espeak/patches/fix-narrowing.patch
@@ -0,0 +1,12 @@
+--- src/tr_languages.cpp
++++ src/tr_languages.cpp
+@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
+ 	0x200d,  1, // zero width joiner
+ 	0, 0 };
+ 
+-const char string_ordinal[] = {0xc2,0xba,0};  // masculine ordinal character, UTF-8
++const char string_ordinal[] = {(char)0xc2,(char)0xba,0};  // masculine ordinal character, UTF-8
+ 
+ 
+ static Translator* NewTranslator(void)
+
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
index 69c100e60ab..354ae5d6988 100644
--- a/srcpkgs/espeak/template
+++ b/srcpkgs/espeak/template
@@ -1,26 +1,23 @@
 # Template file for 'espeak'
-pkgname="espeak"
-version="1.48.04"
-revision=4
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
+pkgname=espeak
+version=1.48.04
+revision=5
+wrksrc="${pkgname}-${version}-source"
+build_wrksrc=src
+build_style=gnu-makefile
 hostmakedepends="unzip"
 makedepends="pulseaudio-devel portaudio-devel"
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc="src"
-checksum="bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659"
-build_style="gnu-makefile"
-
-if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
-	CXXFLAGS="-Wno-error=narrowing"
-fi
+short_desc="Text to Speech engine"
+maintainer="Martin Riese <grauehaare@gmx.de>"
+license="GPL-3.0-or-later"
+homepage="http://espeak.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
+checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
 
 pre_configure() {
 	cp portaudio19.h portaudio.h
 }
+
 do_build() {
 	make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
 }
@@ -37,7 +34,7 @@ libespeak-devel_package() {
 	depends="${makedepends} libespeak>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmove "usr/include"
+		vmove usr/include
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}