mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
Panagiotis Vasilopoulos
committed by
Schrijvers Luc
Schrijvers Luc
parent
f21c709326
commit
2cc2710b77
@@ -1,115 +0,0 @@
|
||||
SUMMARY="A light-weight text-to-speech engine"
|
||||
DESCRIPTION="Flite is a text-to-speech engine developed by the Carnegie \
|
||||
Mellon University. As a light-weight alternative to the Festival engine, it \
|
||||
is desinged to fit into small embedded machines as well as large-scale \
|
||||
servers. In addition to its native format flite supports voices generated by \
|
||||
the FestVox project as well."
|
||||
HOMEPAGE="http://www.festvox.org/flite/"
|
||||
COPYRIGHT="1986 University of Toronto
|
||||
1992, 1995 Markus Mummert
|
||||
1996-2004 University of Edinburgh, UK
|
||||
1999-2014 Language Technologies Institute, Carnegie Mellon University
|
||||
2001 Cepstral, LLC
|
||||
2001 Sun Microsystems, Inc.
|
||||
2003-2004 Nagoya Institute of Technology
|
||||
2003-2004 Nara Institute of Science and Technology
|
||||
2008-2012 University of Illinois at Urbana-Champaign"
|
||||
# Although individually many files have different licenses, as a whole this
|
||||
# license covers all the files.
|
||||
LICENSE="Flite"
|
||||
REVISION="3"
|
||||
SOURCE_URI="http://www.festvox.org/flite/packed/flite-2.0/flite-${portVersion}-release.tar.bz2"
|
||||
CHECKSUM_SHA256="678c3860fd539402b5d1699b921239072af6acb4e72dc4720494112807cae411"
|
||||
SOURCE_DIR="flite-${portVersion}-release"
|
||||
PATCHES="flite-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
|
||||
|
||||
PROVIDES="
|
||||
flite$secondaryArchSuffix = $portVersion
|
||||
flite_tools = $portVersion
|
||||
cmd:flite$secondaryArchSuffix = $portVersion
|
||||
cmd:flite_cmu_time_awb = $portVersion
|
||||
cmd:flite_cmu_us_awb = $portVersion
|
||||
cmd:flite_cmu_us_kal = $portVersion
|
||||
cmd:flite_cmu_us_kal16 = $portVersion
|
||||
cmd:flite_cmu_us_rms = $portVersion
|
||||
cmd:flite_cmu_us_slt = $portVersion
|
||||
cmd:flite_time$secondaryArchSuffix = $portVersion
|
||||
lib:libflite$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_cmu_grapheme_lang$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_cmu_grapheme_lex$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_cmu_indic_lang$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_cmu_indic_lex$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_cmu_time_awb$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_cmu_us_awb$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_cmu_us_kal$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_cmu_us_kal16$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_cmu_us_rms$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_cmu_us_slt$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_cmulex$secondaryArchSuffix = $portVersion compat >= 2
|
||||
lib:libflite_usenglish$secondaryArchSuffix = $portVersion compat >= 2
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
flite${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libflite$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_cmu_grapheme_lang$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_cmu_grapheme_lex$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_cmu_indic_lang$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_cmu_indic_lex$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_cmu_time_awb$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_cmu_us_awb$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_cmu_us_kal$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_cmu_us_kal16$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_cmu_us_rms$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_cmu_us_slt$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_cmulex$secondaryArchSuffix = $portVersion compat >= 2
|
||||
devel:libflite_usenglish$secondaryArchSuffix = $portVersion compat >= 2
|
||||
"
|
||||
REQUIRES_devel="
|
||||
flite$secondaryArchSuffix == $portVersion base
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
makefile_engine
|
||||
cmd:autoconf
|
||||
cmd:awk
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoconf
|
||||
runConfigure ./configure --enable-shared
|
||||
make # Parallel builds not working
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
prepareInstalledDevelLibs \
|
||||
libflite \
|
||||
libflite_cmu_grapheme_lang \
|
||||
libflite_cmu_grapheme_lex \
|
||||
libflite_cmu_indic_lang \
|
||||
libflite_cmu_indic_lex \
|
||||
libflite_cmu_time_awb \
|
||||
libflite_cmu_us_awb \
|
||||
libflite_cmu_us_kal \
|
||||
libflite_cmu_us_kal16 \
|
||||
libflite_cmu_us_rms \
|
||||
libflite_cmu_us_slt \
|
||||
libflite_cmulex \
|
||||
libflite_usenglish
|
||||
packageEntries devel $developDir
|
||||
}
|
||||
144
app-accessibility/flite/flite-2.1.recipe
Normal file
144
app-accessibility/flite/flite-2.1.recipe
Normal file
@@ -0,0 +1,144 @@
|
||||
SUMMARY="A light-weight text-to-speech engine"
|
||||
DESCRIPTION="Flite is a text-to-speech engine developed by the Carnegie \
|
||||
Mellon University. As a light-weight alternative to the Festival engine, it \
|
||||
is desinged to fit into small embedded machines as well as large-scale \
|
||||
servers. In addition to its native format flite supports voices generated by \
|
||||
the FestVox project as well."
|
||||
HOMEPAGE="http://www.festvox.org/flite/
|
||||
https://github.com/festvox/flite"
|
||||
COPYRIGHT="1986 University of Toronto
|
||||
1992, 1995 Markus Mummert
|
||||
1996-2004 University of Edinburgh, UK
|
||||
1999-2014 Language Technologies Institute, Carnegie Mellon University
|
||||
2001 Cepstral, LLC
|
||||
2001 Sun Microsystems, Inc.
|
||||
2003-2004 Nagoya Institute of Technology
|
||||
2003-2004 Nara Institute of Science and Technology
|
||||
2008-2012 University of Illinois at Urbana-Champaign"
|
||||
# Although individually many files have different licenses, as a whole this
|
||||
# license covers all the files.
|
||||
LICENSE="Flite"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://www.festvox.org/flite/packed/flite-${portVersion}/flite-${portVersion}-release.tar.bz2"
|
||||
CHECKSUM_SHA256="c73c3f6a2ea764977d6eaf0a287722d1e2066b4697088c552e342c790f3d2b85"
|
||||
SOURCE_DIR="flite-${portVersion}-release"
|
||||
PATCHES="flite-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="?x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
|
||||
|
||||
commandBinDir=$binDir
|
||||
commandSuffix=$secondaryArchSuffix
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandSuffix=
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
|
||||
libVersion="$portVersion"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
flite$secondaryArchSuffix = $portVersion
|
||||
flite_tools$secondaryArchSuffix = $portVersion
|
||||
cmd:flite$commandSuffix = $portVersion
|
||||
cmd:flite_cmu_time_awb$commandSuffix = $portVersion
|
||||
cmd:flite_cmu_us_awb$commandSuffix = $portVersion
|
||||
cmd:flite_cmu_us_kal$commandSuffix = $portVersion
|
||||
cmd:flite_cmu_us_kal16$commandSuffix = $portVersion
|
||||
cmd:flite_cmu_us_rms$commandSuffix = $portVersion
|
||||
cmd:flite_cmu_us_slt$commandSuffix = $portVersion
|
||||
cmd:flite_time$commandSuffix = $portVersion
|
||||
lib:libflite$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_cmu_grapheme_lang$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_cmu_grapheme_lex$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_cmu_indic_lang$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_cmu_indic_lex$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_cmu_time_awb$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_cmu_us_awb$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_cmu_us_kal$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_cmu_us_kal16$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_cmu_us_rms$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_cmu_us_slt$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_cmulex$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libflite_usenglish$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
flite${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libflite$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_cmu_grapheme_lang$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_cmu_grapheme_lex$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_cmu_indic_lang$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_cmu_indic_lex$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_cmu_time_awb$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_cmu_us_awb$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_cmu_us_kal$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_cmu_us_kal16$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_cmu_us_rms$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_cmu_us_slt$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_cmulex$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libflite_usenglish$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
flite$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:awk
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
defineDebugInfoPackage flite$secondaryArchSuffix \
|
||||
$commandBinDir/flite_cmu_time_awb \
|
||||
$commandBinDir/flite_cmu_us_awb \
|
||||
$commandBinDir/flite_cmu_us_kal \
|
||||
$commandBinDir/flite_cmu_us_kal16 \
|
||||
$commandBinDir/flite_cmu_us_rms \
|
||||
$commandBinDir/flite_cmu_us_slt \
|
||||
$commandBinDir/flite_time \
|
||||
$libDir/libflite.so.$libVersion \
|
||||
$libDir/libflite_cmu_indic_lang.so.$libVersion \
|
||||
$libDir/libflite_cmu_indic_lex.so.$libVersion \
|
||||
$libDir/libflite_cmu_time_awb.so.$libVersion \
|
||||
$libDir/libflite_cmu_us_awb.so.$libVersion \
|
||||
$libDir/libflite_cmu_us_kal16.so.$libVersion \
|
||||
$libDir/libflite_cmu_us_slt.so.$libVersion \
|
||||
$libDir/libflite_cmulex.so.$libVersion \
|
||||
$libDir/libflite_usenglish.so.$libVersion
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoconf
|
||||
runConfigure --omit-dirs "binDir" ./configure \
|
||||
--bindir="$commandBinDir" \
|
||||
--enable-shared
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
prepareInstalledDevelLibs \
|
||||
libflite \
|
||||
libflite_cmu_grapheme_lang \
|
||||
libflite_cmu_grapheme_lex \
|
||||
libflite_cmu_indic_lang \
|
||||
libflite_cmu_indic_lex \
|
||||
libflite_cmu_time_awb \
|
||||
libflite_cmu_us_awb \
|
||||
libflite_cmu_us_kal \
|
||||
libflite_cmu_us_kal16 \
|
||||
libflite_cmu_us_rms \
|
||||
libflite_cmu_us_slt \
|
||||
libflite_cmulex \
|
||||
libflite_usenglish
|
||||
packageEntries devel $developDir
|
||||
}
|
||||
@@ -1,102 +0,0 @@
|
||||
From b21c80cf33debb37b6638ab2be8d188c5a14eafb Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Gu <timothygu99@gmail.com>
|
||||
Date: Wed, 24 Dec 2014 22:37:15 +0000
|
||||
Subject: Support shared libraries on Haiku
|
||||
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 972d818..c2472a6 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -265,6 +265,10 @@ fi
|
||||
|
||||
if test "$shared" = true; then
|
||||
case "$target_os" in
|
||||
+ haiku*)
|
||||
+ SHFLAGS="-fPIC"
|
||||
+ OTHERLIBS="-lnetwork"
|
||||
+ ;;
|
||||
linux*|k*bsd*-gnu|gnu*)
|
||||
SHFLAGS="-fPIC"
|
||||
;;
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 95e4aff793bbef466ed151897d71585bcb7e0321 Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Gu <timothygu99@gmail.com>
|
||||
Date: Wed, 24 Dec 2014 22:38:03 +0000
|
||||
Subject: Do not unconditionally add `-lm` to linking commands
|
||||
|
||||
TODO: make this more platform-independent.
|
||||
|
||||
diff --git a/config/common_make_rules b/config/common_make_rules
|
||||
index 7a03785..0dacbb6 100644
|
||||
--- a/config/common_make_rules
|
||||
+++ b/config/common_make_rules
|
||||
@@ -68,7 +68,7 @@ BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR)
|
||||
|
||||
FLITELIBS = $(BUILDDIR)/lib/libflite.a
|
||||
FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite
|
||||
-LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS)
|
||||
+LDFLAGS += $(AUDIOLIBS) $(OTHERLIBS)
|
||||
|
||||
FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
|
||||
ifdef SHFLAGS
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 96416a919c8ea1fcafd457502ee2bc6fd3ef107f Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Gu <timothygu99@gmail.com>
|
||||
Date: Wed, 24 Dec 2014 22:39:36 +0000
|
||||
Subject: cmu_indic_lex: Separate code and declaration
|
||||
|
||||
|
||||
diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c
|
||||
index 3c586cb..ee682d6 100644
|
||||
--- a/lang/cmu_indic_lex/cmu_indic_lex.c
|
||||
+++ b/lang/cmu_indic_lex/cmu_indic_lex.c
|
||||
@@ -334,6 +334,9 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords,
|
||||
int cur_char_type = 0;
|
||||
int next_char_type = 0;
|
||||
|
||||
+ const cst_val *v, *vx;
|
||||
+ cst_val *ph;
|
||||
+
|
||||
// Ignore chars (filter)
|
||||
in_ords = cmu_indic_lex_remove_ignore_chars(ords);
|
||||
|
||||
@@ -431,8 +434,6 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords,
|
||||
}
|
||||
}
|
||||
|
||||
- const cst_val *v, *vx;
|
||||
- cst_val *ph;
|
||||
for(v=out_phone_strings; v; v=val_cdr(v)) {
|
||||
ph = val_readlist_string(val_string(val_car(v)));
|
||||
for(vx=ph; vx; vx=val_cdr(vx)) {
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 8b998ca76f21a8bb7cf240fd7ed40627eafbc2d8 Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Gu <timothygu99@gmail.com>
|
||||
Date: Wed, 24 Dec 2014 23:44:02 +0000
|
||||
Subject: Bump shlib version to libflite.so.2
|
||||
|
||||
This way it is consistent with libflite.so.2.0.0
|
||||
|
||||
diff --git a/config/project.mak b/config/project.mak
|
||||
index f42ee12..252f22a 100644
|
||||
--- a/config/project.mak
|
||||
+++ b/config/project.mak
|
||||
@@ -40,4 +40,4 @@ PROJECT_VERSION = 2.0.0
|
||||
PROJECT_DATE = Dec 2014
|
||||
PROJECT_STATE = release
|
||||
|
||||
-PROJECT_SHLIB_VERSION = 1
|
||||
+PROJECT_SHLIB_VERSION = 2
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
123
app-accessibility/flite/patches/flite-2.1.patchset
Normal file
123
app-accessibility/flite/patches/flite-2.1.patchset
Normal file
@@ -0,0 +1,123 @@
|
||||
From a85d0966e3b57f5df919fa4814b2503fb2c180c3 Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Gu <timothygu99@gmail.com>
|
||||
Date: Wed, 24 Dec 2014 22:37:15 +0000
|
||||
Subject: Support shared libraries on Haiku
|
||||
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 54a782d..65df51b 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -266,6 +266,10 @@ fi
|
||||
|
||||
if test "$shared" = true; then
|
||||
case "$target_os" in
|
||||
+ haiku*)
|
||||
+ SHFLAGS="-fPIC"
|
||||
+ OTHERLIBS="-lnetwork"
|
||||
+ ;;
|
||||
linux*|k*bsd*-gnu|gnu*)
|
||||
SHFLAGS="-fPIC"
|
||||
;;
|
||||
--
|
||||
2.19.0
|
||||
|
||||
|
||||
From 93527d24ecb02fe5a5c9e4ef30d76ea45a484007 Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Gu <timothygu99@gmail.com>
|
||||
Date: Wed, 24 Dec 2014 23:44:02 +0000
|
||||
Subject: Bump shlib version to libflite.so.2
|
||||
|
||||
|
||||
diff --git a/config/project.mak b/config/project.mak
|
||||
index 1d655d9..a1d0729 100644
|
||||
--- a/config/project.mak
|
||||
+++ b/config/project.mak
|
||||
@@ -40,4 +40,4 @@ PROJECT_VERSION = 2.1
|
||||
PROJECT_DATE = Dec 2017
|
||||
PROJECT_STATE = release
|
||||
|
||||
-PROJECT_SHLIB_VERSION = 1
|
||||
+PROJECT_SHLIB_VERSION = 2
|
||||
--
|
||||
2.19.0
|
||||
|
||||
|
||||
From b496372f06a8292255a1e64ffa4211344252e8df Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Gu <timothygu99@gmail.com>
|
||||
Date: Wed, 24 Dec 2014 22:39:36 +0000
|
||||
Subject: Separate code and declaration
|
||||
|
||||
|
||||
diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c
|
||||
index e0ae73f..7444472 100644
|
||||
--- a/lang/cmu_indic_lex/cmu_indic_lex.c
|
||||
+++ b/lang/cmu_indic_lex/cmu_indic_lex.c
|
||||
@@ -420,6 +420,9 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords,
|
||||
int cmu_indic_variant_deletes_word_final_schwa,
|
||||
const cst_features *feats)
|
||||
{
|
||||
+ const cst_val *v, *vx;
|
||||
+ cst_val *ph;
|
||||
+
|
||||
cst_val *in_ords = 0;
|
||||
cst_val *t_ords = 0;
|
||||
cst_val *out_phone_strings = 0;
|
||||
@@ -587,8 +590,6 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords,
|
||||
/* There may be multiple phones in the expansion, but they are just */
|
||||
/* space separated tokens in the val, so we need to make them into */
|
||||
/* an actual val list of phones */
|
||||
- const cst_val *v, *vx;
|
||||
- cst_val *ph;
|
||||
for(v=out_phone_strings; v; v=val_cdr(v)) {
|
||||
ph = val_readlist_string(val_string(val_car(v)));
|
||||
for(vx=ph; vx; vx=val_cdr(vx)) {
|
||||
--
|
||||
2.19.0
|
||||
|
||||
|
||||
From e265c30eb34893a59d17c87f88870ea08ae4e295 Mon Sep 17 00:00:00 2001
|
||||
From: Panagiotis Vasilopoulos <hello@alwayslivid.com>
|
||||
Date: Sat, 4 Jan 2020 19:00:00 +0000
|
||||
Subject: Made cmu_indic_lang.c C89 compatible
|
||||
|
||||
|
||||
diff --git a/lang/cmu_indic_lang/cmu_indic_lang.c b/lang/cmu_indic_lang/cmu_indic_lang.c
|
||||
index 27371ea..fdd8676 100644
|
||||
--- a/lang/cmu_indic_lang/cmu_indic_lang.c
|
||||
+++ b/lang/cmu_indic_lang/cmu_indic_lang.c
|
||||
@@ -411,6 +411,10 @@ static int indic_nump_old(const char *number)
|
||||
|
||||
static int indic_nump(const char *number)
|
||||
{
|
||||
+ cst_val *p;
|
||||
+ const cst_val *q;
|
||||
+ int flag, fflag, ffflag;
|
||||
+
|
||||
/* Check if non-empty string */
|
||||
if (!number[0])
|
||||
return FALSE;
|
||||
@@ -418,15 +422,12 @@ static int indic_nump(const char *number)
|
||||
/* Catch lone commas */
|
||||
if (number[0] == ',')
|
||||
return indic_nump(&number[1]);
|
||||
-
|
||||
-
|
||||
+
|
||||
/* Returns 2 if all characters are numbers or commas */
|
||||
- /* Returns 1 if it starts with a number */
|
||||
- cst_val *p;
|
||||
- const cst_val *q;
|
||||
- int flag = TRUE;
|
||||
- int fflag;
|
||||
- int ffflag = FALSE; /* Switches to TRUE at first digit found */
|
||||
+ /* Returns 1 if it starts with a number */
|
||||
+
|
||||
+ flag = TRUE;
|
||||
+ ffflag = FALSE; /* Switches to TRUE at first digit found */
|
||||
|
||||
p = cst_utf8_explode(number);
|
||||
for (q=p; q && (flag==TRUE); q=val_cdr(q))
|
||||
--
|
||||
2.19.0
|
||||
|
||||
Reference in New Issue
Block a user