Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtspeech for openSUSE:Factory
checked in at 2022-11-04 17:32:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtspeech (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtspeech.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtspeech"
Fri Nov 4 17:32:03 2022 rev:23 rq:1033116 version:5.15.7+kde1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtspeech/libqt5-qtspeech.changes
2022-09-27 20:10:03.717315077 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtspeech.new.2275/libqt5-qtspeech.changes
2022-11-04 17:32:36.632069828 +0100
@@ -1,0 +2,6 @@
+Thu Nov 3 08:56:49 UTC 2022 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Update to version 5.15.7+kde1, rebased upstream:
+ * Android: Protect against a null Locale object when calling getLocale
+
+-------------------------------------------------------------------
Old:
----
qtspeech-everywhere-src-5.15.6+kde1.obscpio
New:
----
qtspeech-everywhere-src-5.15.7+kde1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtspeech.spec ++++++
--- /var/tmp/diff_new_pack.VZeZcQ/_old 2022-11-04 17:32:37.760075898 +0100
+++ /var/tmp/diff_new_pack.VZeZcQ/_new 2022-11-04 17:32:37.760075898 +0100
@@ -19,11 +19,11 @@
%define qt5_snapshot 1
%define libname libQt5TextToSpeech5
%define base_name libqt5
-%define real_version 5.15.6
-%define so_version 5.15.6
+%define real_version 5.15.7
+%define so_version 5.15.7
%define tar_version qtspeech-everywhere-src-%{version}
Name: libqt5-qtspeech
-Version: 5.15.6+kde1
+Version: 5.15.7+kde1
Release: 0
Summary: Qt 5 Speech Addon
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.VZeZcQ/_old 2022-11-04 17:32:37.812076177 +0100
+++ /var/tmp/diff_new_pack.VZeZcQ/_new 2022-11-04 17:32:37.816076199 +0100
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.6+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.7+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtspeech.git</param>
<param name="scm">git</param>
<param name="filename">qtspeech-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.6-lts-lgpl</param>
+ <param name="parent-tag">v5.15.7-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qtspeech-everywhere-src-5.15.6+kde1.obscpio ->
qtspeech-everywhere-src-5.15.7+kde1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtspeech-everywhere-src-5.15.6+kde1/.qmake.conf
new/qtspeech-everywhere-src-5.15.7+kde1/.qmake.conf
--- old/qtspeech-everywhere-src-5.15.6+kde1/.qmake.conf 2022-09-07
19:35:56.000000000 +0200
+++ new/qtspeech-everywhere-src-5.15.7+kde1/.qmake.conf 2022-10-28
12:23:13.000000000 +0200
@@ -5,4 +5,4 @@
DEFINES += QT_NO_FOREACH
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
-MODULE_VERSION = 5.15.6
+MODULE_VERSION = 5.15.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtspeech-everywhere-src-5.15.6+kde1/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java
new/qtspeech-everywhere-src-5.15.7+kde1/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java
---
old/qtspeech-everywhere-src-5.15.6+kde1/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java
2022-09-07 19:35:56.000000000 +0200
+++
new/qtspeech-everywhere-src-5.15.7+kde1/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java
2022-10-28 12:23:13.000000000 +0200
@@ -254,6 +254,8 @@
{
//Log.d("QtTextToSpeech", "getLocale: " + mLocale);
final Locale language = mTts.getLanguage();
+ if (language == null)
+ return null;
String languageCode = language.getLanguage();
String countryCode = language.getCountry();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtspeech-everywhere-src-5.15.6+kde1/src/plugins/tts/android/src/qtexttospeech_android.cpp
new/qtspeech-everywhere-src-5.15.7+kde1/src/plugins/tts/android/src/qtexttospeech_android.cpp
---
old/qtspeech-everywhere-src-5.15.6+kde1/src/plugins/tts/android/src/qtexttospeech_android.cpp
2022-09-07 19:35:56.000000000 +0200
+++
new/qtspeech-everywhere-src-5.15.7+kde1/src/plugins/tts/android/src/qtexttospeech_android.cpp
2022-10-28 12:23:13.000000000 +0200
@@ -256,11 +256,13 @@
result.reserve(count);
for (int i = 0; i < count; ++i) {
auto locale = locales.callObjectMethod("get", "(I)Ljava/lang/Object;",
i);
- auto localeLanguage =
locale.callObjectMethod<jstring>("getLanguage").toString();
- auto localeCountry =
locale.callObjectMethod<jstring>("getCountry").toString();
- if (!localeCountry.isEmpty())
- localeLanguage += QString("_%1").arg(localeCountry).toUpper();
- result << QLocale(localeLanguage);
+ if (locale.isValid()) {
+ auto localeLanguage =
locale.callObjectMethod<jstring>("getLanguage").toString();
+ auto localeCountry =
locale.callObjectMethod<jstring>("getCountry").toString();
+ if (!localeCountry.isEmpty())
+ localeLanguage += QString("_%1").arg(localeCountry).toUpper();
+ result << QLocale(localeLanguage);
+ }
}
return result;
}
++++++ qtspeech-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.VZeZcQ/_old 2022-11-04 17:32:38.044077426 +0100
+++ /var/tmp/diff_new_pack.VZeZcQ/_new 2022-11-04 17:32:38.048077447 +0100
@@ -1,5 +1,5 @@
name: qtspeech-everywhere-src
-version: 5.15.6+kde1
-mtime: 1662572156
-commit: d1273416f25a15a6edf6ea56a07602cd7d99fe48
+version: 5.15.7+kde1
+mtime: 1666952593
+commit: d32f4a479d38a11f547598004b975f4356424a16
