summaryrefslogtreecommitdiff
path: root/user/qt5-qtspeech
diff options
context:
space:
mode:
Diffstat (limited to 'user/qt5-qtspeech')
-rw-r--r--user/qt5-qtspeech/APKBUILD14
-rw-r--r--user/qt5-qtspeech/fix-linking-order.patch6
-rw-r--r--user/qt5-qtspeech/kde-lts.patch36
3 files changed, 43 insertions, 13 deletions
diff --git a/user/qt5-qtspeech/APKBUILD b/user/qt5-qtspeech/APKBUILD
index 4b7588b8d..68f9c7baa 100644
--- a/user/qt5-qtspeech/APKBUILD
+++ b/user/qt5-qtspeech/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=qt5-qtspeech
-_pkgname=qtspeech-everywhere-src
-pkgver=5.12.9
+_pkgname=qtspeech-everywhere
+pkgver=5.15.4
pkgrel=0
pkgdesc=" Library for speech processing and Text-to-Speech (TTS) in Qt"
url="https://www.qt.io/"
@@ -12,10 +12,10 @@ license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-ex
depends=""
makedepends="qt5-qtbase-dev qt5-qtmultimedia-dev speech-dispatcher-dev"
subpackages="$pkgname-dev"
-source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz
- fix-linking-order.patch
+source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-opensource-src-$pkgver.tar.xz
+ kde-lts.patch
"
-builddir="$srcdir"/$_pkgname-$pkgver
+builddir="$srcdir"/$_pkgname-src-$pkgver
build() {
qmake
@@ -26,5 +26,5 @@ package() {
make install INSTALL_ROOT="$pkgdir"
}
-sha512sums="14fcdb9ba798c846c53066c6913d174838dbeaf790600392c242d0b44a77038fd73d30b422087ad21d94555470e9043b5972e0614878bc1ee890df1198dcb10f qtspeech-everywhere-src-5.12.9.tar.xz
-7bce4bd52aa0b60fbd0ec781fc18ac518a8fe76c99e61be03170f00d27747e989b1562a45435be78d0d166ab0fdf523055620ba7c63f49e328704e1cd6aa4718 fix-linking-order.patch"
+sha512sums="6582fe36950aee8428c72582ff2eda2dae433ad969c323e0c6e8be611be7d81766ceb1cae85a10dcd4d266e33a0cf782fe857e1502d7f3863e0dfb2306af2aed qtspeech-everywhere-opensource-src-5.15.4.tar.xz
+e40cf1cf3e65e5add61c45c2a73bc48927a9bd34b0e0353bf6ecb77a57978b3fe2cf73608b6ffe4c84de807f9d2c1af3bf022b4a78411313ff0c4ecd425b415d kde-lts.patch"
diff --git a/user/qt5-qtspeech/fix-linking-order.patch b/user/qt5-qtspeech/fix-linking-order.patch
deleted file mode 100644
index b07e0536d..000000000
--- a/user/qt5-qtspeech/fix-linking-order.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- qtspeech-opensource-src-5.9.7/config.tests/flite_alsa/flite_alsa.pro.old 2018-05-31 12:22:17.000000000 +0000
-+++ qtspeech-opensource-src-5.9.7/config.tests/flite_alsa/flite_alsa.pro 2019-02-17 15:12:30.810000000 +0000
-@@ -1,2 +1,2 @@
--LIBS += -lasound
- include(../flite/flite.pri)
-+LIBS += -lasound
diff --git a/user/qt5-qtspeech/kde-lts.patch b/user/qt5-qtspeech/kde-lts.patch
new file mode 100644
index 000000000..c8d350cad
--- /dev/null
+++ b/user/qt5-qtspeech/kde-lts.patch
@@ -0,0 +1,36 @@
+From c8a1dadc46ccdbeaef45aa805a9dc98d4b3220bd Mon Sep 17 00:00:00 2001
+From: Jeremy Whiting <jpwhiting@kde.org>
+Date: Tue, 8 Feb 2022 11:04:41 -0700
+Subject: [PATCH] Reverse list of voices before returning from
+ Speech-Dispatcher
+
+Since QMultiMap::values() gives voices in reverse order from the order
+inserted (latest first, oldest last) reverse the list before returning
+it to users.
+
+Change-Id: I908560d671f760b6722a3164ed2cb925238f7fc8
+Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
+Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
+(cherry picked from commit b5f91c3e92a1afeed73e1b907082fabff39a29d9)
+---
+ src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
+index 6eb74b8..bcc7dd1 100644
+--- a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
++++ b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
+@@ -357,7 +357,9 @@ QVector<QLocale> QTextToSpeechEngineSpeechd::availableLocales() const
+
+ QVector<QVoice> QTextToSpeechEngineSpeechd::availableVoices() const
+ {
+- return m_voices.values(m_currentLocale.name()).toVector();
++ QList<QVoice> resultList = m_voices.values(m_currentLocale.name());
++ std::reverse(resultList.begin(), resultList.end());
++ return resultList.toVector();
+ }
+
+ // We have no way of knowing our own client_id since speech-dispatcher seems to be incomplete
+--
+2.36.0
+