From 48f66dfc5a1ca1c47b5a09449249a6669b1f8ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 3 Jul 2014 22:14:02 +0200
Subject: [PATCH] espeak: Add patch

---
 .../espeak/espeak-1.48.04.recipe              |  2 +
 .../espeak/patches/espeak-1.48.04.patch       | 61 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 app-accessibility/espeak/patches/espeak-1.48.04.patch

diff --git a/app-accessibility/espeak/espeak-1.48.04.recipe b/app-accessibility/espeak/espeak-1.48.04.recipe
index 90ee12915..a6bff38f5 100644
--- a/app-accessibility/espeak/espeak-1.48.04.recipe
+++ b/app-accessibility/espeak/espeak-1.48.04.recipe
@@ -35,6 +35,8 @@ BUILD_PREREQUIRES="
 
 SOURCE_DIR="${portVersionedName}-source"
 
+PATCHES="espeak-1.48.04.patch"
+
 BUILD()
 {
 	cd src
diff --git a/app-accessibility/espeak/patches/espeak-1.48.04.patch b/app-accessibility/espeak/patches/espeak-1.48.04.patch
new file mode 100644
index 000000000..a605d45e5
--- /dev/null
+++ b/app-accessibility/espeak/patches/espeak-1.48.04.patch
@@ -0,0 +1,61 @@
+From 45ab885e00990acc5da891489537f7994a9dc25d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
+Date: Thu, 3 Jul 2014 22:01:40 +0200
+Subject: [PATCH] Remove some hardcoding of libraries and flags
+
+---
+ src/Makefile | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 95fe549..085fdea 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -21,6 +21,12 @@ SONAME_OPT=-Wl,-soname,
+ # Use EXTRA_LIBS=-lm on Solaris
+ EXTRA_LIBS =
+ 
++# Default libstdc++
++LIB_STDCPP = -lstdc++
++
++# Default pthread library
++LIB_PTHREAD = -lpthread
++
+ INSTALL = install
+ LN_SF = /bin/ln -sf
+ MKDIR = mkdir -p
+@@ -83,18 +89,19 @@ libespeak_SOURCES = speak_lib.cpp compiledict.cpp dictionary.cpp intonation.cpp
+ 
+ SRCS1=$(speak_SOURCES)
+ OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
+-LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
++LIBS1=$(LIB_STDCPP) $(LIB_AUDIO) $(LIB_PTHREAD) $(EXTRA_LIBS)
+ 
+ SRCS2=$(libespeak_SOURCES)
+ OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
+-LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
++LIBS2=$(LIB_STDCPP) $(LIB_AUDIO) $(LIB_PTHREAD)
+ 
+ SRCS3 = espeak.cpp
+ OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
+-LIBS3=-lstdc++ -L . -lespeak
++LIBS3=$(LIB_STDCPP) -L . -lespeak
+ 
+ CXXFLAGS=-O2
+ 
++VISIBILITY_FLAG=-fvisibility=hidden
+ 
+ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
+ 
+@@ -110,7 +117,7 @@ $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
+ 
+ 
+ x_%.o: %.cpp
+-	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -fpic -fvisibility=hidden -pedantic \
++	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -fpic $(VISIBILITY_FLAG) -pedantic \
+ 	-I. -D LIBRARY -c -fno-exceptions  $<  -o x_$*.o
+ 
+ $(LIB_NAME): $(OBJS2)
+-- 
+1.8.3.4
+