Hello community,
here is the log from the commit of package libqt5-qtspeech for openSUSE:Factory
checked in at 2020-11-25 19:29:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtspeech (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtspeech.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtspeech"
Wed Nov 25 19:29:10 2020 rev:19 rq:850034 version:5.15.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtspeech/libqt5-qtspeech.changes
2020-09-14 12:10:18.060055245 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtspeech.new.5913/libqt5-qtspeech.changes
2020-11-25 19:29:37.534510972 +0100
@@ -1,0 +2,8 @@
+Fri Nov 20 12:09:38 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Update to 5.15.2:
+ * New bugfix release
+ * For more details please see:
+ http://code.qt.io/cgit/qt/qtspeech.git/plain/dist/changes-5.15.2/?h=5.15.2
+
+-------------------------------------------------------------------
Old:
----
qtspeech-everywhere-src-5.15.1.tar.xz
New:
----
qtspeech-everywhere-src-5.15.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtspeech.spec ++++++
--- /var/tmp/diff_new_pack.PBUDfZ/_old 2020-11-25 19:29:38.258511884 +0100
+++ /var/tmp/diff_new_pack.PBUDfZ/_new 2020-11-25 19:29:38.262511889 +0100
@@ -19,11 +19,11 @@
%define qt5_snapshot 0
%define libname libQt5TextToSpeech5
%define base_name libqt5
-%define real_version 5.15.1
-%define so_version 5.15.1
-%define tar_version qtspeech-everywhere-src-5.15.1
+%define real_version 5.15.2
+%define so_version 5.15.2
+%define tar_version qtspeech-everywhere-src-5.15.2
Name: libqt5-qtspeech
-Version: 5.15.1
+Version: 5.15.2
Release: 0
Summary: Qt 5 Speech Addon
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
++++++ qtspeech-everywhere-src-5.15.1.tar.xz ->
qtspeech-everywhere-src-5.15.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtspeech-everywhere-src-5.15.1/.qmake.conf
new/qtspeech-everywhere-src-5.15.2/.qmake.conf
--- old/qtspeech-everywhere-src-5.15.1/.qmake.conf 2020-08-24
11:20:53.000000000 +0200
+++ new/qtspeech-everywhere-src-5.15.2/.qmake.conf 2020-10-27
09:02:11.000000000 +0100
@@ -5,4 +5,4 @@
DEFINES += QT_NO_FOREACH
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
-MODULE_VERSION = 5.15.1
+MODULE_VERSION = 5.15.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtspeech-everywhere-src-5.15.1/.tag
new/qtspeech-everywhere-src-5.15.2/.tag
--- old/qtspeech-everywhere-src-5.15.1/.tag 2020-08-24 11:20:53.000000000
+0200
+++ new/qtspeech-everywhere-src-5.15.2/.tag 2020-10-27 09:02:11.000000000
+0100
@@ -1 +1 @@
-f4601353aa9a14eacfc83e1ca650ae5b6c21283a
+84dd22a080014cb99a7dff7772990787a04ca533
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtspeech-everywhere-src-5.15.1/dist/changes-5.12.10
new/qtspeech-everywhere-src-5.15.2/dist/changes-5.12.10
--- old/qtspeech-everywhere-src-5.15.1/dist/changes-5.12.10 1970-01-01
01:00:00.000000000 +0100
+++ new/qtspeech-everywhere-src-5.15.2/dist/changes-5.12.10 2020-10-27
09:02:11.000000000 +0100
@@ -0,0 +1,28 @@
+Qt 5.12.10 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.9.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ https://doc.qt.io/qt-5.12/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Important Behavior Changes *
+****************************************************************************
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtspeech-everywhere-src-5.15.1/dist/changes-5.15.2
new/qtspeech-everywhere-src-5.15.2/dist/changes-5.15.2
--- old/qtspeech-everywhere-src-5.15.1/dist/changes-5.15.2 1970-01-01
01:00:00.000000000 +0100
+++ new/qtspeech-everywhere-src-5.15.2/dist/changes-5.15.2 2020-10-27
09:02:11.000000000 +0100
@@ -0,0 +1,28 @@
+Qt 5.15.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.15.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ https://doc.qt.io/qt-5.15/index.html
+
+The Qt version 5.15 series is binary compatible with the 5.14.x series.
+Applications compiled for 5.14 will continue to run with 5.15.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Important Behavior Changes *
+****************************************************************************
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtspeech-everywhere-src-5.15.1/include/QtTextToSpeech/5.15.1/QtTextToSpeech/private/qtexttospeech_p.h
new/qtspeech-everywhere-src-5.15.2/include/QtTextToSpeech/5.15.1/QtTextToSpeech/private/qtexttospeech_p.h
---
old/qtspeech-everywhere-src-5.15.1/include/QtTextToSpeech/5.15.1/QtTextToSpeech/private/qtexttospeech_p.h
2020-08-24 11:20:53.000000000 +0200
+++
new/qtspeech-everywhere-src-5.15.2/include/QtTextToSpeech/5.15.1/QtTextToSpeech/private/qtexttospeech_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/tts/qtexttospeech_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtspeech-everywhere-src-5.15.1/include/QtTextToSpeech/5.15.1/QtTextToSpeech/private/qvoice_p.h
new/qtspeech-everywhere-src-5.15.2/include/QtTextToSpeech/5.15.1/QtTextToSpeech/private/qvoice_p.h
---
old/qtspeech-everywhere-src-5.15.1/include/QtTextToSpeech/5.15.1/QtTextToSpeech/private/qvoice_p.h
2020-08-24 11:20:53.000000000 +0200
+++
new/qtspeech-everywhere-src-5.15.2/include/QtTextToSpeech/5.15.1/QtTextToSpeech/private/qvoice_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/tts/qvoice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtspeech-everywhere-src-5.15.1/include/QtTextToSpeech/5.15.2/QtTextToSpeech/private/qtexttospeech_p.h
new/qtspeech-everywhere-src-5.15.2/include/QtTextToSpeech/5.15.2/QtTextToSpeech/private/qtexttospeech_p.h
---
old/qtspeech-everywhere-src-5.15.1/include/QtTextToSpeech/5.15.2/QtTextToSpeech/private/qtexttospeech_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtspeech-everywhere-src-5.15.2/include/QtTextToSpeech/5.15.2/QtTextToSpeech/private/qtexttospeech_p.h
2020-10-27 09:02:11.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/tts/qtexttospeech_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtspeech-everywhere-src-5.15.1/include/QtTextToSpeech/5.15.2/QtTextToSpeech/private/qvoice_p.h
new/qtspeech-everywhere-src-5.15.2/include/QtTextToSpeech/5.15.2/QtTextToSpeech/private/qvoice_p.h
---
old/qtspeech-everywhere-src-5.15.1/include/QtTextToSpeech/5.15.2/QtTextToSpeech/private/qvoice_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtspeech-everywhere-src-5.15.2/include/QtTextToSpeech/5.15.2/QtTextToSpeech/private/qvoice_p.h
2020-10-27 09:02:11.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/tts/qvoice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtspeech-everywhere-src-5.15.1/include/QtTextToSpeech/qttexttospeechversion.h
new/qtspeech-everywhere-src-5.15.2/include/QtTextToSpeech/qttexttospeechversion.h
---
old/qtspeech-everywhere-src-5.15.1/include/QtTextToSpeech/qttexttospeechversion.h
2020-09-04 05:31:40.000000000 +0200
+++
new/qtspeech-everywhere-src-5.15.2/include/QtTextToSpeech/qttexttospeechversion.h
2020-11-12 18:24:13.000000000 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTTEXTTOSPEECH_VERSION_H
#define QT_QTTEXTTOSPEECH_VERSION_H
-#define QTTEXTTOSPEECH_VERSION_STR "5.15.1"
+#define QTTEXTTOSPEECH_VERSION_STR "5.15.2"
-#define QTTEXTTOSPEECH_VERSION 0x050F01
+#define QTTEXTTOSPEECH_VERSION 0x050F02
#endif // QT_QTTEXTTOSPEECH_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtspeech-everywhere-src-5.15.1/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java
new/qtspeech-everywhere-src-5.15.2/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java
---
old/qtspeech-everywhere-src-5.15.1/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java
2020-08-24 11:20:53.000000000 +0200
+++
new/qtspeech-everywhere-src-5.15.2/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java
2020-10-27 09:02:11.000000000 +0100
@@ -253,7 +253,16 @@
public Locale getLocale()
{
//Log.d("QtTextToSpeech", "getLocale: " + mLocale);
- return mTts.getLanguage();
+ final Locale language = mTts.getLanguage();
+ String languageCode = language.getLanguage();
+ String countryCode = language.getCountry();
+
+ if (languageCode.equals(language.getISO3Language()))
+ languageCode =
convertLanguageCodeThreeDigitToTwoDigit(languageCode);
+ if (countryCode.equals(language.getISO3Country()))
+ countryCode = convertCountryCodeThreeDigitToTwoDigit(countryCode);
+
+ return new Locale(languageCode, countryCode);
}
public Object getVoice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtspeech-everywhere-src-5.15.1/src/plugins/tts/android/src/qtexttospeech_android.cpp
new/qtspeech-everywhere-src-5.15.2/src/plugins/tts/android/src/qtexttospeech_android.cpp
---
old/qtspeech-everywhere-src-5.15.1/src/plugins/tts/android/src/qtexttospeech_android.cpp
2020-08-24 11:20:53.000000000 +0200
+++
new/qtspeech-everywhere-src-5.15.2/src/plugins/tts/android/src/qtexttospeech_android.cpp
2020-10-27 09:02:11.000000000 +0100
@@ -286,8 +286,11 @@
{
auto locale = m_speech.callObjectMethod("getLocale",
"()Ljava/util/Locale;");
if (locale.isValid()) {
- auto localeName =
locale.callObjectMethod<jstring>("toString").toString();
- return QLocale(localeName);
+ auto localeLanguage =
locale.callObjectMethod<jstring>("getLanguage").toString();
+ auto localeCountry =
locale.callObjectMethod<jstring>("getCountry").toString();
+ if (!localeCountry.isEmpty())
+ localeLanguage += QString("_%1").arg(localeCountry).toUpper();
+ return QLocale(localeLanguage);
}
return QLocale();
}
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
