Projects
home:Aloysius:branches:Extra
mbrola
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 2
View file
mbrola.changes
Changed
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 28 15:17:19 UTC 2023 - Luigi Baldoni <aloisio@gmx.com> + +- Fix paths in txt2phorc +- Backport txt2pho-gcc11.1.patch + +------------------------------------------------------------------- Sat Jun 12 19:46:29 UTC 2021 - Luigi Baldoni <aloisio@gmx.com> - Define correct version in header file
View file
mbrola.spec
Changed
@@ -33,6 +33,9 @@ Source4: txt2phorc # PATCH-FIX-OPENSUSE txt2pho-gcc11.patch Patch0: txt2pho-gcc11.patch +# PATCH-FIX-UPSTREAM txt2pho-0.96-gcc11.1.patch +#Patch1: txt2pho-0.96-gcc11.1.patch +Patch1: new_head.patch BuildRequires: fdupes BuildRequires: gcc-c++ Requires: sox @@ -50,6 +53,7 @@ %prep %setup -q -n MBROLA-%{version} -a 0 -a 2 %patch0 -p1 +%patch1 -p1 mkdir txt2pho-%{tver}/lib txt2pho-%{tver}/obj sed -i 's/SYNTH_VERSION.*/SYNTH_VERSION \"%{version}\"/' Misc/common.h
View file
txt2pho-gcc11.1.patch
Added
@@ -0,0 +1,67 @@ +From 2d1282c31ff3c76d0445dabd343e7a831368bddf Mon Sep 17 00:00:00 2001 +From: GHPS <GHPS@users.noreply.github.com> +Date: Tue, 15 Jun 2021 19:56:14 +0200 +Subject: PATCH Update to GCC 11.1 fixed uninitialized spacer string in PP) + +Index: MBROLA-3.3/txt2pho-0.96/src/hposttra.cc +=================================================================== +--- MBROLA-3.3.orig/txt2pho-0.96/src/hposttra.cc ++++ MBROLA-3.3/txt2pho-0.96/src/hposttra.cc +@@ -166,7 +166,7 @@ Wordlist::Wordlist(TFile &infile) + if (buffer0 == '{') + { + w.text = strdup(buffer) ; +- strncpy(w.wordclass, "COM", 3) ; ++ strncpy(w.wordclass, "COM", 4) ; + w.wk = Unknown ; + w.konstit = invalid ; + w.satztyp = garnix ; +@@ -254,7 +254,7 @@ Wordlist::Wordlist(char** lexlist, int l + if (buffer0 == '{') + { + w.text = strdup(buffer) ; +- strncpy(w.wordclass, "COM", 3) ; ++ strncpy(w.wordclass, "COM", 4) ; + w.wk = Unknown ; + w.konstit = invalid ; + w.pg_betonung = 0 ; +@@ -300,7 +300,7 @@ Wordlist::Wordlist(char** lexlist, int l + if (w.flag == 0) + { + w1.text = strdup(wklstring) ; +- strncpy(w1.wordclass, "COM", 3) ; ++ strncpy(w1.wordclass, "COM", 4) ; + w1.wk = Unknown ; + w1.konstit = invalid ; + w1.satztyp = garnix ; +Index: MBROLA-3.3/txt2pho-0.96/src/preproc/PPFuncts.cc +=================================================================== +--- MBROLA-3.3.orig/txt2pho-0.96/src/preproc/PPFuncts.cc ++++ MBROLA-3.3/txt2pho-0.96/src/preproc/PPFuncts.cc +@@ -201,11 +201,11 @@ char* dnumeral_range(char* in) + char* temp2 = new char5 ; + char* from, *to, *result; + int range_type; +- if (to = strchr (in, '-')) ++ if (to = strchr(in, '-')) + { + range_type = RANGE_LONG; + } +- else if (to = strchr (in, '/')) ++ else if (to = strchr(in, '/')) + { + range_type = RANGE_SMALL; + } +Index: MBROLA-3.3/txt2pho-0.96/src/preproc/PPInput.cc +=================================================================== +--- MBROLA-3.3.orig/txt2pho-0.96/src/preproc/PPInput.cc ++++ MBROLA-3.3/txt2pho-0.96/src/preproc/PPInput.cc +@@ -96,7 +96,7 @@ char PPInput::get_next_char(FILE* infile + + PPInput::PPInput(const char* i, const char* sp) + { +- strcpy(spacer, sp); ++ spacer = strdup(sp); + if (strcmp(i, "-") == 0) + in = stdin ; + else
View file
txt2phorc
Changed
@@ -7,10 +7,10 @@ # # All path names must end with a separator !!!!!!! # -DATAPATH=/usr/share/mbrola/data +DATAPATH=/usr/share/mbrola/data/ # Path to voice files -INVPATH=/usr/share/mbrola/data +INVPATH=/usr/share/mbrola/data/ # Path to temporary and log files (default: /tmp/)
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.