June 2024 - openSUSE Commits - openSUSE Mailing Lists

commit openSUSE-build-key for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openSUSE-build-key for openSUSE:Factory checked in at 2024-06-24 20:50:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-build-key (Old) and /work/SRC/openSUSE:Factory/.openSUSE-build-key.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-build-key" Mon Jun 24 20:50:22 2024 rev:45 rq:1182852 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-build-key/openSUSE-build-key.changes 2024-04-12 17:34:01.614076963 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-build-key.new.18349/openSUSE-build-key.changes 2024-06-24 20:50:57.695195060 +0200 @@ -1,0 +2,6 @@ +Fri Jun 21 16:13:28 UTC 2024 - Lubos Kocman <Lubos.Kocman(a)suse.com> + +- Ensure that SLM 6.0 key is installed on Leap Micro and Leap 16 +- install SLFO / SLM 6.0 key and SLES 15 SP6+ key by default + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-build-key.spec ++++++ --- /var/tmp/diff_new_pack.aqhdtU/_old 2024-06-24 20:50:58.583227520 +0200 +++ /var/tmp/diff_new_pack.aqhdtU/_new 2024-06-24 20:50:58.587227667 +0200 @@ -113,6 +113,8 @@ %ifarch ppc ppc64 ppc64le cp %{SOURCE6} . %endif +cp %{SOURCE16} . +cp %{SOURCE17} . %install mkdir -p %{buildroot}%{keydir} @@ -129,6 +131,8 @@ %ifarch ppc ppc64 ppc64le %{SOURCE6} \ %endif +%{SOURCE16} \ +%{SOURCE17} \ ; do case "$i" in */gpg-pubkey-*.asc)

1 0

commit libnettle for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libnettle for openSUSE:Factory checked in at 2024-06-24 20:50:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnettle (Old) and /work/SRC/openSUSE:Factory/.libnettle.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnettle" Mon Jun 24 20:50:20 2024 rev:48 rq:1182662 version:3.10 Changes: -------- --- /work/SRC/openSUSE:Factory/libnettle/libnettle.changes 2023-06-27 23:15:45.507070924 +0200 +++ /work/SRC/openSUSE:Factory/.libnettle.new.18349/libnettle.changes 2024-06-24 20:50:55.227104612 +0200 @@ -1,0 +2,29 @@ +Mon Jun 17 06:22:31 UTC 2024 - Pedro Monreal <pmonreal(a)suse.com> + +- Update to 3.10: + * Bug fixes: + - Add missing hash functions sha512_224 and sha512_256 to the + nettle_get_hashes() list. The name values in the + corresponding nettle_hash structs also changed to use + underscore instead of dash, for consistency. + - Fix a few cases of formally undefined calls to memcpy(dst, + NULL, 0), resulting from valid calls to, e.g., + sha256_update(ctx, 0, NULL). + * New features: + - Support RSA-OAEP encryption. Contributed by Nicolas Mora and Daiki Ueno. + - New function sha3_256_shake_output, new functions + sha3_128_init, sha3_128_update, sha3_128_shake, + sha3_128_shake_output. Contributed by Daiki Ueno. + - Added DRBG-CTR with AES256, contributed by Simon Josefsson. + * Optimizations: + - New combined gcm-aes assembly for powerpc64, contributed by Danny Tsen. + - New sha256 assembly for powerpc64, contributed by Eric Richter. + - Improved performance for powerpc64 AES decrypt, by skipping + subkey transformations that don't suit the vncipher instructions. + - Add arm64 CPU feature detection for Android and for Apple systems, + contributed by Foolbar and Tim Kosse, prespectively. + * Miscellaneous: + - New tests for side-channel silence, based on valgrind. + - Delete all md5 assembly code. Delete all sparc32 assembly code. + +------------------------------------------------------------------- Old: ---- nettle-3.9.1.tar.gz nettle-3.9.1.tar.gz.sig New: ---- nettle-3.10.tar.gz nettle-3.10.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnettle.spec ++++++ --- /var/tmp/diff_new_pack.pl3LKP/_old 2024-06-24 20:50:56.711159015 +0200 +++ /var/tmp/diff_new_pack.pl3LKP/_new 2024-06-24 20:50:56.715159162 +0200 @@ -1,7 +1,7 @@ # # spec file for package libnettle # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define soname 8 %define hogweed_soname 6 Name: libnettle -Version: 3.9.1 +Version: 3.10 Release: 0 Summary: Cryptographic Library License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ nettle-3.9.1.tar.gz -> nettle-3.10.tar.gz ++++++ ++++ 32157 lines of diff (skipped)

1 0

commit hplip for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2024-06-24 20:50:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hplip" Mon Jun 24 20:50:18 2024 rev:154 rq:1182534 version:3.24.4 Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2024-02-23 16:41:55.431930084 +0100 +++ /work/SRC/openSUSE:Factory/.hplip.new.18349/hplip.changes 2024-06-24 20:50:53.375036716 +0200 @@ -1,0 +2,12 @@ +Fri Jun 21 21:30:55 UTC 2024 - Martin Wilck <martin.wilck(a)suse.com> + +- Update to hplip 3.24.4 +- Added support for new printers: + * HP OfficeJet 8120 All-in-One series + * HP OfficeJet Pro 8120 All-in-One series + * HP OfficeJet 8130 All-in-One series + * HP OfficeJet Pro 8130 All-in-One series + * HP OfficeJet Pro 9720 Series + * HP OfficeJet Pro 9730 Series + +------------------------------------------------------------------- Old: ---- hplip-3.23.12.tar.gz hplip-3.23.12.tar.gz.asc New: ---- hplip-3.24.4.tar.gz hplip-3.24.4.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.znLCvF/_old 2024-06-24 20:50:54.787088480 +0200 +++ /var/tmp/diff_new_pack.znLCvF/_new 2024-06-24 20:50:54.791088628 +0200 @@ -24,7 +24,7 @@ %define pyexe %{_bindir}/python3 %global use_qt5 1 Name: hplip -Version: 3.23.12 +Version: 3.24.4 Release: 0 Summary: HP's Printing, Scanning, and Faxing Software License: BSD-3-Clause AND GPL-2.0-or-later AND MIT ++++++ hplip-3.23.12.tar.gz -> hplip-3.24.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/hplip/hplip-3.23.12.tar.gz /work/SRC/openSUSE:Factory/.hplip.new.18349/hplip-3.24.4.tar.gz differ: char 14, line 1

1 0

commit python310 for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python310 for openSUSE:Factory checked in at 2024-06-24 20:50:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python310 (Old) and /work/SRC/openSUSE:Factory/.python310.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python310" Mon Jun 24 20:50:16 2024 rev:43 rq:1182484 version:3.10.14 Changes: -------- --- /work/SRC/openSUSE:Factory/python310/python310.changes 2024-03-26 19:25:33.629181333 +0100 +++ /work/SRC/openSUSE:Factory/.python310.new.18349/python310.changes 2024-06-24 20:50:50.230921455 +0200 @@ -1,0 +2,8 @@ +Fri Apr 19 08:37:04 UTC 2024 - Matej Cepl <mcepl(a)suse.com> + +- Add CVE-2023-52425-libexpat-2.6.0-backport.patch to fix tests with + patched libexpat below 2.6.0 that doesn't update the version number, + just in SLE. +- Remove old-libexpat.patch, of course. + +------------------------------------------------------------------- @@ -41 +49 @@ - across multiple threads + across multiple threads (bsc#1226447, CVE-2024-0397) Old: ---- old-libexpat.patch New: ---- CVE-2023-52425-libexpat-2.6.0-backport.patch BETA DEBUG BEGIN: Old: just in SLE. - Remove old-libexpat.patch, of course. BETA DEBUG END: BETA DEBUG BEGIN: New: - Add CVE-2023-52425-libexpat-2.6.0-backport.patch to fix tests with patched libexpat below 2.6.0 that doesn't update the version number, BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python310.spec ++++++ --- /var/tmp/diff_new_pack.X62KNe/_old 2024-06-24 20:50:51.294960462 +0200 +++ /var/tmp/diff_new_pack.X62KNe/_new 2024-06-24 20:50:51.298960609 +0200 @@ -192,9 +192,9 @@ # * gh#python/cpython#104221 # * gh#python/cpython#107246 Patch21: fix-sphinx-72.patch -# PATCH-FIX-UPSTREAM old-libexpat.patch gh#python/cpython#117187 mcepl(a)suse.com +# PATCH-FIX-UPSTREAM CVE-2023-52425-libexpat-2.6.0-backport.patch gh#python/cpython#117187 mcepl(a)suse.com # Make the test suite work with libexpat < 2.6.0 -Patch22: old-libexpat.patch +Patch22: CVE-2023-52425-libexpat-2.6.0-backport.patch BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: fdupes ++++++ CVE-2023-52425-libexpat-2.6.0-backport.patch ++++++ --- Lib/test/test_pyexpat.py | 4 ++++ Lib/test/test_sax.py | 3 +++ Lib/test/test_xml_etree.py | 7 +++++++ 3 files changed, 14 insertions(+) --- a/Lib/test/test_pyexpat.py +++ b/Lib/test/test_pyexpat.py @@ -766,6 +766,10 @@ class ReparseDeferralTest(unittest.TestC self.assertEqual(started, ['doc']) def test_reparse_deferral_disabled(self): + if expat.version_info < (2, 6, 0): + self.skipTest(f'Expat {expat.version_info} does not ' + 'support reparse deferral') + started = [] def start_element(name, _): --- a/Lib/test/test_sax.py +++ b/Lib/test/test_sax.py @@ -1240,6 +1240,9 @@ class ExpatReaderTest(XmlTestBase): self.assertEqual(result.getvalue(), start + b"<doc></doc>") + @unittest.skipIf(pyexpat.version_info < (2, 6, 0), + f'Expat {pyexpat.version_info} does not ' + 'support reparse deferral') def test_flush_reparse_deferral_disabled(self): result = BytesIO() xmlgen = XMLGenerator(result) --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -1420,9 +1420,13 @@ class XMLPullParserTest(unittest.TestCas self.assert_event_tags(parser, [('end', 'root')]) self.assertIsNone(parser.close()) + @unittest.skipIf(pyexpat.version_info < (2, 6, 0), + f'Fail with patched version of Expat {pyexpat.version_info}') def test_simple_xml_chunk_1(self): self.test_simple_xml(chunk_size=1, flush=True) + @unittest.skipIf(pyexpat.version_info < (2, 6, 0), + f'Fail with patched version of Expat {pyexpat.version_info}') def test_simple_xml_chunk_5(self): self.test_simple_xml(chunk_size=5, flush=True) @@ -1648,6 +1652,9 @@ class XMLPullParserTest(unittest.TestCas self.assert_event_tags(parser, [('end', 'doc')]) + @unittest.skipIf(pyexpat.version_info < (2, 6, 0), + f'Expat {pyexpat.version_info} does not ' + 'support reparse deferral') def test_flush_reparse_deferral_disabled(self): parser = ET.XMLPullParser(events=('start', 'end')) ++++++ Python-3.10.14.tar.xz.asc ++++++ --- /var/tmp/diff_new_pack.X62KNe/_old 2024-06-24 20:50:51.386963835 +0200 +++ /var/tmp/diff_new_pack.X62KNe/_new 2024-06-24 20:50:51.390963981 +0200 @@ -1,17 +1,17 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCAAdFiEE4/8oOcBIslwITevpsmmV4xAlBWgFAmX6IF0ACgkQsmmV4xAl -BWj0Lw//cYVyJ6YPSr42rylEeHV3+jZNjgpNadPFlM46M9zKmx8tP95fAut+JDF4 -gwcuql/lvfbPw1eJDrX+7TiIn33yS+KZDD/J2U6v/aCbuLByOWGWt5C3BfE6U5o/ -FkCbJ2GM6e4M85dVGEIudgwoZfZByRLxA8HJ6n37UhoeXSQQTr8LHfC4w7lyXJ+D -V2JQ+Mru0NJmG2FaVA+46Rez1ynsqSQnabJsM+0Kmaqs+ziWHSpWkLMecwqrojcJ -kzEs6TBGCaPDJncSONRU2o8i4pzkeq9SsXGT03kHsfPTZqU5sJD6yIeiIJbhQfea -+hPKg5+LVNDnOeSWPzm+5Fs1WWqeVNiFi/pDG4ofVXH79ULP7hxnnDMRe/ShdWWh -gp4uchu15tqbQLwCdH7r/r/j21PjSYxJBnz+1n2Yon9hYrjT8wTPalt6TyaQ7dpL -tKG/JLC8r9hxMSFSa6QlHB/+kOu57NZccy4XoitCEQhsnqmRFX/7zCiHM3P4t1G9 -RrLWYseS9elf6OZUlvF1PbwiEuRA36pvGCHEF0NWBF4yVxShN81f05pZutZVfVFx -W2V/ACB10agGbMsR5FVJROLo0zuek/G/QJ9GSp6cB6D1xuNbL1nNFfWZ7aEzPdeu -yBZkyyY4bOqstAw2I/bOlZTfFEMwdZFG6Zg2au/mtt2qFcGIEKM= -=9/7V +iQIzBAABCAAdFiEEz9yiRbEEPPKl+Xhl/+h0BBaL2EcFAmX76AkACgkQ/+h0BBaL +2EeKvhAAuN+7X3iFv8tYwUTbKJT9x9fLsADI5wOn5j8xuDiXQCOMzsqqyB1RSdEd +tbCQXg9XJj1bVHc4DY337vUix9jvFcTqbQqlzUm/peX4buY2bKkZu2quti1iWSJf +IN26jDYO2TobPvGdvNiH2Hceqe1dc5tU7iYEfaLR5ImgO4aGgK6x4DiLdmFqo2bk +ZZWZLkXbwenrSdLVmUZLP5Gg2dsfMkbfFpydau9Zk3RVl6mVYATwzJaY9K5otC0K +7kc+nKPwkTxKAjndbznjsVrWK0Xcr4hrlMHs4Re2Nrdqa2mVd1jAAFO5xETJJtd7 +YqL6mQuJ9wQfEEq2QWz1hEi67l8g8VeEgzYQOjZ6pTxwYYt0YDfKBjRtRCWuJ11c +w6Q+pniGcgIHAMkQGjZds88CwAdIiyG7IAIT2ovW+xVxH/JqLPHeRsHMKYx4DPqL +2y23Tchw+gBUvmbwCdObXWL1eq5R3Xz3ikkdX/I6zknmEvgPTi5N59C1IQqh0W/6 +8uMrHOdELz9I5Fd+zGTJ8iyh/wrecMiIx+HOsBTYv/FYbMVnQUshUBOiD70geUb5 +uSeHyxl/P7VK/0phbxOznU4oDot2fHPmZRK3q+K67J9L16q7pEou1AJAw8E7ed5C +Ywf+y2tdxsuqChQK/OA6uuqW6rXjZPuCoG5Bn6YIEuU769LsHcY= +=1PBR -----END PGP SIGNATURE----- ++++++ python.keyring ++++++ ++++ 787 lines (skipped) ++++ between python.keyring ++++ and /work/SRC/openSUSE:Factory/.python310.new.18349/python.keyring

1 0

commit qt6-webview for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-webview for openSUSE:Factory checked in at 2024-06-24 20:50:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-webview (Old) and /work/SRC/openSUSE:Factory/.qt6-webview.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-webview" Mon Jun 24 20:50:13 2024 rev:18 rq:1182622 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-webview/qt6-webview.changes 2024-05-27 11:47:04.870498452 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-webview.new.18349/qt6-webview.changes 2024-06-24 20:50:40.110550451 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:26:09 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qtwebview-everywhere-src-6.7.1.tar.xz New: ---- qtwebview-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-webview.spec ++++++ --- /var/tmp/diff_new_pack.xQSg17/_old 2024-06-24 20:50:41.106586965 +0200 +++ /var/tmp/diff_new_pack.xQSg17/_new 2024-06-24 20:50:41.106586965 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define tar_name qtwebview-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-webview%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: Qt 6 WebView library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtwebview-everywhere-src-6.7.1.tar.xz -> qtwebview-everywhere-src-6.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.7.1/.cmake.conf new/qtwebview-everywhere-src-6.7.2/.cmake.conf --- old/qtwebview-everywhere-src-6.7.1/.cmake.conf 2024-05-16 05:09:27.000000000 +0200 +++ new/qtwebview-everywhere-src-6.7.2/.cmake.conf 2024-06-10 21:19:50.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.1") +set(QT_REPO_MODULE_VERSION "6.7.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.7.1/.tag new/qtwebview-everywhere-src-6.7.2/.tag --- old/qtwebview-everywhere-src-6.7.1/.tag 2024-05-16 05:09:27.000000000 +0200 +++ new/qtwebview-everywhere-src-6.7.2/.tag 2024-06-10 21:19:50.000000000 +0200 @@ -1 +1 @@ -4bcfbbf17b1742d9b8308ab00d92a055bff81de0 +3dbe4104cac53d4f1a3801faa75c75127e5cbaba diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.7.1/dependencies.yaml new/qtwebview-everywhere-src-6.7.2/dependencies.yaml --- old/qtwebview-everywhere-src-6.7.1/dependencies.yaml 2024-05-16 05:09:27.000000000 +0200 +++ new/qtwebview-everywhere-src-6.7.2/dependencies.yaml 2024-06-10 21:19:50.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtdeclarative: - ref: 734849e4577b75e85420b08ddb55974482bbd063 + ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc required: true ../qtwebengine: - ref: 2ccbc2bb78bfd1cc03b45361553f4c3d63b31c26 + ref: 445cd4e7784d294a3df8ad3f7b85a7a4988c0bbd required: false

1 0

commit qt6-websockets for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-websockets for openSUSE:Factory checked in at 2024-06-24 20:50:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-websockets (Old) and /work/SRC/openSUSE:Factory/.qt6-websockets.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-websockets" Mon Jun 24 20:50:12 2024 rev:23 rq:1182621 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-websockets/qt6-websockets.changes 2024-05-27 11:47:03.810459608 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-websockets.new.18349/qt6-websockets.changes 2024-06-24 20:50:38.314484609 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:26:08 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qtwebsockets-everywhere-src-6.7.1.tar.xz New: ---- qtwebsockets-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-websockets.spec ++++++ --- /var/tmp/diff_new_pack.f2g5jq/_old 2024-06-24 20:50:39.078512618 +0200 +++ /var/tmp/diff_new_pack.f2g5jq/_new 2024-06-24 20:50:39.082512764 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define tar_name qtwebsockets-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-websockets%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: Qt 6 WebSockets library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtwebsockets-everywhere-src-6.7.1.tar.xz -> qtwebsockets-everywhere-src-6.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.7.1/.cmake.conf new/qtwebsockets-everywhere-src-6.7.2/.cmake.conf --- old/qtwebsockets-everywhere-src-6.7.1/.cmake.conf 2024-05-09 01:15:19.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.7.2/.cmake.conf 2024-06-08 01:54:37.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.1") +set(QT_REPO_MODULE_VERSION "6.7.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.7.1/.tag new/qtwebsockets-everywhere-src-6.7.2/.tag --- old/qtwebsockets-everywhere-src-6.7.1/.tag 2024-05-09 01:15:19.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.7.2/.tag 2024-06-08 01:54:37.000000000 +0200 @@ -1 +1 @@ -f84f65fc877cd7f18554d2eddc6369f17dc53ec6 +6d040c4762d63746d8c98f65bb3c93acd5df956f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.7.1/dependencies.yaml new/qtwebsockets-everywhere-src-6.7.2/dependencies.yaml --- old/qtwebsockets-everywhere-src-6.7.1/dependencies.yaml 2024-05-09 01:15:19.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 01:54:37.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 + ref: b5fbe0923cfc566036b83c3d968f225b26117efc required: true ../qtdeclarative: - ref: 734849e4577b75e85420b08ddb55974482bbd063 + ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.7.1/tests/auto/websockets/qwebsocket/CMakeLists.txt new/qtwebsockets-everywhere-src-6.7.2/tests/auto/websockets/qwebsocket/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.7.1/tests/auto/websockets/qwebsocket/CMakeLists.txt 2024-05-09 01:15:19.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.7.2/tests/auto/websockets/qwebsocket/CMakeLists.txt 2024-06-08 01:54:37.000000000 +0200 @@ -12,6 +12,7 @@ tst_qwebsocket.cpp LIBRARIES Qt::WebSockets + BUNDLE_ANDROID_OPENSSL_LIBS ) set(qwebsocketshared_resource_files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.7.1/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp new/qtwebsockets-everywhere-src-6.7.2/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp --- old/qtwebsockets-everywhere-src-6.7.1/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp 2024-05-09 01:15:19.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.7.2/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp 2024-06-08 01:54:37.000000000 +0200 @@ -1025,7 +1025,7 @@ socket->write(payload); if (withConnectionClose) - socket->disconnectFromHost(); + socket->close(); } static QLatin1StringView getHeaderValue(const QLatin1StringView keyHeader, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.7.1/tests/auto/websockets/qwebsocketserver/CMakeLists.txt new/qtwebsockets-everywhere-src-6.7.2/tests/auto/websockets/qwebsocketserver/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.7.1/tests/auto/websockets/qwebsocketserver/CMakeLists.txt 2024-05-09 01:15:19.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.7.2/tests/auto/websockets/qwebsocketserver/CMakeLists.txt 2024-06-08 01:54:37.000000000 +0200 @@ -12,6 +12,7 @@ tst_qwebsocketserver.cpp LIBRARIES Qt::WebSockets + BUNDLE_ANDROID_OPENSSL_LIBS ) # Resources:

1 0

commit qt6-wayland for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-wayland for openSUSE:Factory checked in at 2024-06-24 20:49:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-wayland (Old) and /work/SRC/openSUSE:Factory/.qt6-wayland.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-wayland" Mon Jun 24 20:49:56 2024 rev:34 rq:1182618 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-wayland/qt6-wayland.changes 2024-05-27 11:46:58.066249122 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-wayland.new.18349/qt6-wayland.changes 2024-06-24 20:50:20.205820761 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:26:06 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qtwayland-everywhere-src-6.7.1.tar.xz New: ---- qtwayland-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-wayland.spec ++++++ --- /var/tmp/diff_new_pack.ocSNEu/_old 2024-06-24 20:50:20.785842024 +0200 +++ /var/tmp/diff_new_pack.ocSNEu/_new 2024-06-24 20:50:20.789842171 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define tar_name qtwayland-everywhere-src %define tar_suffix %{nil} @@ -30,7 +30,7 @@ %global with_opengl 1 %endif Name: qt6-wayland%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: Qt 6 Wayland libraries and tools # The wayland compositor files are GPL-3.0-or-later ++++++ qtwayland-everywhere-src-6.7.1.tar.xz -> qtwayland-everywhere-src-6.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/.cmake.conf new/qtwayland-everywhere-src-6.7.2/.cmake.conf --- old/qtwayland-everywhere-src-6.7.1/.cmake.conf 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/.cmake.conf 2024-06-08 01:54:39.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.1") +set(QT_REPO_MODULE_VERSION "6.7.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/.tag new/qtwayland-everywhere-src-6.7.2/.tag --- old/qtwayland-everywhere-src-6.7.1/.tag 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/.tag 2024-06-08 01:54:39.000000000 +0200 @@ -1 +1 @@ -c898ccb3d1596cf8448995c9cd5e93ffe2027c5e +3bd7a58abdf80df376697bace45cc1dc4860401e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/dependencies.yaml new/qtwayland-everywhere-src-6.7.2/dependencies.yaml --- old/qtwayland-everywhere-src-6.7.1/dependencies.yaml 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 01:54:39.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 + ref: b5fbe0923cfc566036b83c3d968f225b26117efc required: true ../qtdeclarative: - ref: 734849e4577b75e85420b08ddb55974482bbd063 + ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/licenseRule.json new/qtwayland-everywhere-src-6.7.2/licenseRule.json --- old/qtwayland-everywhere-src-6.7.1/licenseRule.json 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.2/licenseRule.json 2024-06-08 01:54:39.000000000 +0200 @@ -0,0 +1,124 @@ +[ + { + "comment" : ["file_pattern_ending: strings matched against the end of a file name.", + "location keys: regular expression matched against the beginning of", + "the file path (relative to the git submodule root).", + "spdx: list of SPDX-License-Expression's allowed in the matching files.", + "-------------------------------------------------------", + "Files with the following endings are Build System licensed,", + "unless they are examples", + "Files with other endings can also be build system files" + ], + "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", + "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in"], + "location" : { + "" : { + "comment" : "Default", + "file type" : "build system", + "spdx" : ["BSD-3-Clause"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comments" : ["Files with the following endings are Tool licensed,", + "unless they are examples.", + "Files with other endings can also be tool files."], + "file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"], + "location" :{ + "" : { + "comment" : "Default", + "file type" : "tools and utils", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comment" : "Files with the following endings are Documentation licensed.", + "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"], + "location" :{ + "" : { + "comment" : "", + "file type" : "documentation", + "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + } + } + }, + { + "comment" : ["All other files", + "The licensing is defined only by the file location in the Qt module repository.", + "NO <file_pattern_ending> key for this case!", + "This needs to be the last entry of the file."], + "location" : { + "" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "src/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "src/plugins/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "src/plugins/hardwareintegration/compositor/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "src/shared/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "src/imports/texture-sharing" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "src/qtwaylandscanner/qtwaylandscanner\\.cpp" : { + "comment" : "Default", + "file type" : "tools and utils", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "src/client/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "src/hardwareintegration/client/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "tests/" : { + "comment" : "Default", + "file type" : "test", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Default", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + }, + "config\\.tests/" : { + "comment" : "Default", + "file type" : "build system", + "spdx" : ["BSD-3-Clause"] + } + } + } +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandinputdevice.cpp new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandinputdevice.cpp --- old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandinputdevice.cpp 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandinputdevice.cpp 2024-06-08 01:54:39.000000000 +0200 @@ -887,8 +887,10 @@ WheelEvent(QWaylandWindow *surface, Qt::ScrollPhase phase, ulong timestamp, const QPointF &local, const QPointF &global, const QPoint &pixelDelta, const QPoint &angleDelta, Qt::MouseEventSource source, Qt::KeyboardModifiers modifiers, bool inverted) - : QWaylandPointerEvent(QEvent::Wheel, phase, surface, timestamp, - local, global, pixelDelta, angleDelta, source, modifiers, inverted) + : QWaylandPointerEvent(QEvent::Wheel, phase, surface, timestamp, local, global, + modifiers & Qt::AltModifier ? pixelDelta.transposed() : pixelDelta, + modifiers & Qt::AltModifier ? angleDelta.transposed() : angleDelta, + source, modifiers, inverted) { } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandsurface.cpp new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandsurface.cpp --- old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandsurface.cpp 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandsurface.cpp 2024-06-08 01:54:39.000000000 +0200 @@ -15,6 +15,7 @@ : wl_surface(display->createSurface(this)) { connect(qApp, &QGuiApplication::screenRemoved, this, &QWaylandSurface::handleScreenRemoved); + connect(qApp, &QGuiApplication::screenAdded, this, &QWaylandSurface::screensChanged); } QWaylandSurface::~QWaylandSurface() @@ -24,7 +25,14 @@ QWaylandScreen *QWaylandSurface::oldestEnteredScreen() { - return m_screens.value(0, nullptr); + for (auto *screen : std::as_const(m_screens)) { + // only report valid screens + // we can have some ouptuts waiting for xdg output information + // that are valid QPlatformScreens, but not valid QScreens + if (screen->screen()) + return screen; + } + return nullptr; } QWaylandSurface *QWaylandSurface::fromWlSurface(::wl_surface *surface) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandtextinputv3.cpp new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandtextinputv3.cpp --- old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandtextinputv3.cpp 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandtextinputv3.cpp 2024-06-08 01:54:39.000000000 +0200 @@ -80,8 +80,8 @@ return; m_pendingPreeditString.text = text; - m_pendingPreeditString.cursorBegin = cursorBegin; - m_pendingPreeditString.cursorEnd = cursorEnd; + m_pendingPreeditString.cursorBegin = QWaylandInputMethodEventBuilder::indexFromWayland(text, cursorBegin); + m_pendingPreeditString.cursorEnd = QWaylandInputMethodEventBuilder::indexFromWayland(text, cursorEnd); } void QWaylandTextInputv3::zwp_text_input_v3_commit_string(const QString &text) @@ -101,8 +101,8 @@ if (!QGuiApplication::focusObject()) return; - m_pendingDeleteBeforeText = QWaylandInputMethodEventBuilder::indexFromWayland(m_surroundingText, beforeText); - m_pendingDeleteAfterText = QWaylandInputMethodEventBuilder::indexFromWayland(m_surroundingText, afterText); + m_pendingDeleteBeforeText = beforeText; + m_pendingDeleteAfterText = afterText; } void QWaylandTextInputv3::zwp_text_input_v3_done(uint32_t serial) @@ -157,14 +157,26 @@ qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO << "DELETE" << m_pendingDeleteBeforeText << m_pendingDeleteAfterText; qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO << "COMMIT" << m_pendingCommitString; - // A workaround for reselection - // It will disable redundant commit after reselection - if (m_pendingDeleteBeforeText != 0 || m_pendingDeleteAfterText != 0) + int replaceFrom = 0; + int replaceLength = 0; + if (m_pendingDeleteBeforeText != 0 || m_pendingDeleteAfterText != 0) { + // A workaround for reselection + // It will disable redundant commit after reselection m_condReselection = true; + const QByteArray &utf8 = QStringView{m_surroundingText}.toUtf8(); + if (m_cursorPos < int(m_pendingDeleteBeforeText)) { + replaceFrom = -QString::fromUtf8(QByteArrayView{utf8}.first(m_pendingDeleteBeforeText)).size(); + replaceLength = QString::fromUtf8(QByteArrayView{utf8}.first(m_pendingDeleteBeforeText + m_pendingDeleteAfterText)).size(); + } else { + replaceFrom = -QString::fromUtf8(QByteArrayView{utf8}.sliced(m_cursorPos - m_pendingDeleteBeforeText, m_pendingDeleteBeforeText)).size(); + replaceLength = QString::fromUtf8(QByteArrayView{utf8}.sliced(m_cursorPos - m_pendingDeleteBeforeText, m_pendingDeleteBeforeText + m_pendingDeleteAfterText)).size(); + } + } + qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO << "DELETE from " << replaceFrom << " length " << replaceLength; event.setCommitString(m_pendingCommitString, - -m_pendingDeleteBeforeText, - m_pendingDeleteBeforeText + m_pendingDeleteAfterText); + replaceFrom, + replaceLength); m_currentPreeditString = m_pendingPreeditString; m_pendingPreeditString.clear(); m_pendingCommitString.clear(); @@ -235,54 +247,63 @@ int cursor = event.value(Qt::ImCursorPosition).toInt(); int anchor = event.value(Qt::ImAnchorPosition).toInt(); - qCDebug(qLcQpaWaylandTextInput) << "Orginal surrounding_text from InputMethodQuery: " << text << cursor << anchor; + qCDebug(qLcQpaWaylandTextInput) << "Original surrounding_text from InputMethodQuery: " << text << cursor << anchor; // Make sure text is not too big // surround_text cannot exceed 4000byte in wayland protocol // The worst case will be supposed here. const int MAX_MESSAGE_SIZE = 4000; - if (text.toUtf8().size() > MAX_MESSAGE_SIZE) { - const int selectionStart = QWaylandInputMethodEventBuilder::indexToWayland(text, qMin(cursor, anchor)); - const int selectionEnd = QWaylandInputMethodEventBuilder::indexToWayland(text, qMax(cursor, anchor)); + const int textSize = text.toUtf8().size(); + if (textSize > MAX_MESSAGE_SIZE) { + qCDebug(qLcQpaWaylandTextInput) << "SurroundText size is over " + << MAX_MESSAGE_SIZE + << " byte, some text will be clipped."; + const int selectionStart = qMin(cursor, anchor); + const int selectionEnd = qMax(cursor, anchor); const int selectionLength = selectionEnd - selectionStart; + const int selectionSize = QStringView{text}.sliced(selectionStart, selectionLength).toUtf8().size(); // If selection is bigger than 4000 byte, it is fixed to 4000 byte. // anchor will be moved in the 4000 byte boundary. - if (selectionLength > MAX_MESSAGE_SIZE) { + if (selectionSize > MAX_MESSAGE_SIZE) { if (anchor > cursor) { - const int length = MAX_MESSAGE_SIZE; - anchor = QWaylandInputMethodEventBuilder::trimmedIndexFromWayland(text, length, cursor); - anchor -= cursor; - text = text.mid(cursor, anchor); cursor = 0; + anchor = MAX_MESSAGE_SIZE; + text = text.sliced(selectionStart, selectionLength); } else { - const int length = -MAX_MESSAGE_SIZE; - anchor = QWaylandInputMethodEventBuilder::trimmedIndexFromWayland(text, length, cursor); - cursor -= anchor; - text = text.mid(anchor, cursor); anchor = 0; + cursor = MAX_MESSAGE_SIZE; + text = text.sliced(selectionEnd - selectionLength, selectionLength); } } else { - const int offset = (MAX_MESSAGE_SIZE - selectionLength) / 2; - - int textStart = QWaylandInputMethodEventBuilder::trimmedIndexFromWayland(text, -offset, qMin(cursor, anchor)); - int textEnd = QWaylandInputMethodEventBuilder::trimmedIndexFromWayland(text, MAX_MESSAGE_SIZE, textStart); - - anchor -= textStart; - cursor -= textStart; - text = text.mid(textStart, textEnd - textStart); + // This is not optimal in some cases. + // For examples, if the cursor position and + // the selectionEnd are close to the end of the surround text, + // the tail of the text might always be clipped. + // However all the cases of over 4000 byte are just exceptions. + int selEndSize = QStringView{text}.first(selectionEnd).toUtf8().size(); + cursor = QWaylandInputMethodEventBuilder::indexToWayland(text, cursor); + anchor = QWaylandInputMethodEventBuilder::indexToWayland(text, anchor); + if (selEndSize < MAX_MESSAGE_SIZE) { + text = QString::fromUtf8(QByteArrayView{text.toUtf8()}.first(MAX_MESSAGE_SIZE)); + } else { + const int startOffset = selEndSize - MAX_MESSAGE_SIZE; + text = QString::fromUtf8(QByteArrayView{text.toUtf8()}.sliced(startOffset, MAX_MESSAGE_SIZE)); + cursor -= startOffset; + anchor -= startOffset; + } } + } else { + cursor = QWaylandInputMethodEventBuilder::indexToWayland(text, cursor); + anchor = QWaylandInputMethodEventBuilder::indexToWayland(text, anchor); } qCDebug(qLcQpaWaylandTextInput) << "Modified surrounding_text: " << text << cursor << anchor; - const int cursorPos = QWaylandInputMethodEventBuilder::indexToWayland(text, cursor); - const int anchorPos = QWaylandInputMethodEventBuilder::indexToWayland(text, anchor); - - if (m_surroundingText != text || m_cursorPos != cursorPos || m_anchorPos != anchorPos) { + if (m_surroundingText != text || m_cursorPos != cursor || m_anchorPos != anchor) { qCDebug(qLcQpaWaylandTextInput) << "Current surrounding_text: " << m_surroundingText << m_cursorPos << m_anchorPos; - qCDebug(qLcQpaWaylandTextInput) << "New surrounding_text: " << text << cursorPos << anchorPos; + qCDebug(qLcQpaWaylandTextInput) << "New surrounding_text: " << text << cursor << anchor; - set_surrounding_text(text, cursorPos, anchorPos); + set_surrounding_text(text, cursor, anchor); // A workaround in the case of reselection // It will work when re-clicking a preedit text @@ -294,8 +315,8 @@ } m_surroundingText = text; - m_cursorPos = cursorPos; - m_anchorPos = anchorPos; + m_cursorPos = cursor; + m_anchorPos = anchor; m_cursor = cursor; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandtextinputv3_p.h new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandtextinputv3_p.h --- old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandtextinputv3_p.h 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandtextinputv3_p.h 2024-06-08 01:54:39.000000000 +0200 @@ -17,7 +17,6 @@ #include "qwaylandtextinputinterface_p.h" #include <QtWaylandClient/private/qwayland-text-input-unstable-v3.h> -#include <qwaylandinputmethodeventbuilder_p.h> #include <QLoggingCategory> struct wl_callback; @@ -63,8 +62,6 @@ void zwp_text_input_v3_done(uint32_t serial) override; private: - QWaylandInputMethodEventBuilder m_builder; - ::wl_surface *m_surface = nullptr; // ### Here for debugging purposes struct PreeditInfo { @@ -82,8 +79,8 @@ PreeditInfo m_pendingPreeditString; PreeditInfo m_currentPreeditString; QString m_pendingCommitString; - uint m_pendingDeleteBeforeText = 0; - uint m_pendingDeleteAfterText = 0; + uint m_pendingDeleteBeforeText = 0; // byte length + uint m_pendingDeleteAfterText = 0; // byte length QString m_surroundingText; int m_cursor; // cursor position in QString diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandwindow.cpp new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandwindow.cpp --- old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandwindow.cpp 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandwindow.cpp 2024-06-08 01:54:39.000000000 +0200 @@ -57,8 +57,6 @@ mFrameCallbackTimeout = frameCallbackTimeout; } - mScale = waylandScreen() ? waylandScreen()->scale() : 1; // fallback to 1 if we don't have a real screen - static WId id = 1; mWindowId = id++; initializeWlSurface(); @@ -317,6 +315,7 @@ mWaitingToApplyConfigure = false; mCanResize = true; mResizeDirty = false; + mScale = std::nullopt; mOpaqueArea = QRegion(); mMask = QRegion(); @@ -548,7 +547,6 @@ if (auto *screen = mSurface->oldestEnteredScreen()) return screen; } - return QPlatformWindow::screen(); } @@ -878,6 +876,7 @@ void QWaylandWindow::setCustomMargins(const QMargins &margins) { const QMargins oldMargins = mCustomMargins; mCustomMargins = margins; + propagateSizeHints(); setGeometry(geometry().marginsRemoved(oldMargins).marginsAdded(margins)); } @@ -1153,8 +1152,13 @@ if (auto transientParent = closestShellSurfaceWindow(window()->transientParent())) return transientParent; - if (QGuiApplication::focusWindow() && (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup)) - return closestShellSurfaceWindow(QGuiApplication::focusWindow()); + if (window()->type() == Qt::Popup) { + if (mTopPopup) + return mTopPopup; + } + + if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) + return display()->lastInputWindow(); return nullptr; } @@ -1401,14 +1405,11 @@ { QPlatformScreen *newScreen = calculateScreenFromSurfaceEvents(); - if (newScreen == mLastReportedScreen) + if (newScreen->screen() == window()->screen()) return; - if (!newScreen->isPlaceholder() && !newScreen->QPlatformScreen::screen()) - mDisplay->forceRoundTrip(); QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->QPlatformScreen::screen()); - mLastReportedScreen = newScreen; if (fixedToplevelPositions && !QPlatformWindow::parent() && window()->type() != Qt::Popup && window()->type() != Qt::ToolTip && geometry().topLeft() != newScreen->geometry().topLeft()) { @@ -1438,13 +1439,13 @@ return; } - int scale = mLastReportedScreen->isPlaceholder() ? 1 : static_cast<QWaylandScreen *>(mLastReportedScreen)->scale(); + int scale = screen()->isPlaceholder() ? 1 : static_cast<QWaylandScreen *>(screen())->scale(); setScale(scale); } void QWaylandWindow::setScale(qreal newScale) { - if (qFuzzyCompare(mScale, newScale)) + if (mScale.has_value() && qFuzzyCompare(mScale.value(), newScale)) return; mScale = newScale; @@ -1453,7 +1454,7 @@ if (mViewport) updateViewport(); else if (mSurface->version() >= 3) - mSurface->set_buffer_scale(std::ceil(mScale)); + mSurface->set_buffer_scale(std::ceil(newScale)); } ensureSize(); @@ -1515,7 +1516,7 @@ qreal QWaylandWindow::devicePixelRatio() const { - return qreal(mScale); + return mScale.value_or(waylandScreen() ? waylandScreen()->scale() : 1); } bool QWaylandWindow::setMouseGrabEnabled(bool grab) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandwindow_p.h new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandwindow_p.h --- old/qtwayland-everywhere-src-6.7.1/src/client/qwaylandwindow_p.h 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/client/qwaylandwindow_p.h 2024-06-08 01:54:39.000000000 +0200 @@ -310,8 +310,7 @@ bool mSentInitialResize = false; QPoint mOffset; - qreal mScale = 1; - QPlatformScreen *mLastReportedScreen = nullptr; + std::optional<qreal> mScale = std::nullopt; QString mWindowTitle; QIcon mWindowIcon; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputmanagerv3.cpp new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputmanagerv3.cpp --- old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputmanagerv3.cpp 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputmanagerv3.cpp 2024-06-08 01:54:39.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qwaylandtextinputmanagerv3.h" #include "qwaylandtextinputmanagerv3_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputmanagerv3.h new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputmanagerv3.h --- old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputmanagerv3.h 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputmanagerv3.h 2024-06-08 01:54:39.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QWAYLANDTEXTINPUTMANAGERV3_H #define QWAYLANDTEXTINPUTMANAGERV3_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputmanagerv3_p.h new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputmanagerv3_p.h --- old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputmanagerv3_p.h 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputmanagerv3_p.h 2024-06-08 01:54:39.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QWAYLANDTEXTINPUTMANAGERV3_P_H #define QWAYLANDTEXTINPUTMANAGERV3_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputv3.cpp new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputv3.cpp --- old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputv3.cpp 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputv3.cpp 2024-06-08 01:54:39.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qwaylandtextinputv3.h" #include "qwaylandtextinputv3_p.h" @@ -99,20 +99,40 @@ // Current cursor shape is only line. It means both cursorBegin // and cursorEnd will be the same values. - int32_t preeditCursorPos = newPreeditString.length(); + int32_t preeditCursorPos = newPreeditString.toUtf8().size(); - if (event->replacementLength() > 0 || event->replacementStart() < 0) { - if (event->replacementStart() <= 0 && (event->replacementLength() >= -event->replacementStart())) { - const int selectionStart = qMin(currentState->cursorPosition, currentState->anchorPosition); - const int selectionEnd = qMax(currentState->cursorPosition, currentState->anchorPosition); - const int before = QWaylandInputMethodEventBuilder::indexToWayland(currentState->surroundingText, -event->replacementStart(), selectionStart + event->replacementStart()); - const int after = QWaylandInputMethodEventBuilder::indexToWayland(currentState->surroundingText, event->replacementLength() + event->replacementStart(), selectionEnd); - send_delete_surrounding_text(focusResource->handle, before, after); - needsDone = true; - } else { - qCWarning(qLcWaylandCompositorTextInput) << "Not yet supported case of replacement. Start:" << event->replacementStart() << "length:" << event->replacementLength(); + if (event->replacementLength() > 0) { + int replacementStart = event->replacementStart(); + int replacementLength = event->replacementLength(); + const int cursorPos = currentState->cursorPosition; + if (currentState->cursorPosition < -event->replacementStart()) { + qCWarning(qLcWaylandCompositorTextInput) + << Q_FUNC_INFO + << "Invalid replacementStart :" << replacementStart + << "on the cursorPosition :" << cursorPos; + replacementStart = -cursorPos; } - preeditCursorPos = event->replacementStart() + event->replacementLength(); + auto targetText = QStringView{currentState->surroundingText}.sliced(cursorPos + replacementStart); + if (targetText.length() < replacementLength) { + qCWarning(qLcWaylandCompositorTextInput) + << Q_FUNC_INFO + << "Invalid replacementLength :" << replacementLength + << "for the surrounding text :" << targetText; + replacementLength = targetText.length(); + } + const int before = targetText.first(-replacementStart).toUtf8().size(); + const int after = targetText.first(replacementLength).toUtf8().size() - before; + + send_delete_surrounding_text(focusResource->handle, before, after); + needsDone = true; + + // The commit will also be applied here + currentState->surroundingText.replace(cursorPos + replacementStart, + replacementLength, + event->commitString()); + currentState->cursorPosition = cursorPos + replacementStart + event->commitString().length(); + currentState->anchorPosition = cursorPos + replacementStart + event->commitString().length(); + qApp->inputMethod()->update(Qt::ImSurroundingText | Qt::ImCursorPosition | Qt::ImAnchorPosition); } if (currentPreeditString != newPreeditString) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputv3.h new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputv3.h --- old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputv3.h 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputv3.h 2024-06-08 01:54:39.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QWAYLANDTEXTINPUTV3_H #define QWAYLANDTEXTINPUTV3_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputv3_p.h new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputv3_p.h --- old/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputv3_p.h 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/compositor/extensions/qwaylandtextinputv3_p.h 2024-06-08 01:54:39.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QWAYLANDTEXTINPUTV3_P_H #define QWAYLANDTEXTINPUTV3_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/qtwaylandscanner/qtwaylandscanner.cpp new/qtwayland-everywhere-src-6.7.2/src/qtwaylandscanner/qtwaylandscanner.cpp --- old/qtwayland-everywhere-src-6.7.1/src/qtwaylandscanner/qtwaylandscanner.cpp 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/qtwaylandscanner/qtwaylandscanner.cpp 2024-06-08 01:54:39.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <QCoreApplication> #include <QFile> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.1/src/shared/qwaylandinputmethodeventbuilder.cpp new/qtwayland-everywhere-src-6.7.2/src/shared/qwaylandinputmethodeventbuilder.cpp --- old/qtwayland-everywhere-src-6.7.1/src/shared/qwaylandinputmethodeventbuilder.cpp 2024-05-09 01:15:10.000000000 +0200 +++ new/qtwayland-everywhere-src-6.7.2/src/shared/qwaylandinputmethodeventbuilder.cpp 2024-06-08 01:54:39.000000000 +0200 @@ -278,10 +278,10 @@ if (length < 0) { const QByteArray &utf8 = QStringView{text}.left(base).toUtf8(); - return QString::fromUtf8(utf8.left(qMax(utf8.size() + length, 0))).size(); + return QString::fromUtf8(utf8.first(qMax(utf8.size() + length, 0))).size(); } else { const QByteArray &utf8 = QStringView{text}.mid(base).toUtf8(); - return QString::fromUtf8(utf8.left(length)).size() + base; + return QString::fromUtf8(utf8.first(qMin(length, utf8.size()))).size() + base; } }

1 0

commit qt6-virtualkeyboard for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-virtualkeyboard for openSUSE:Factory checked in at 2024-06-24 20:49:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-virtualkeyboard (Old) and /work/SRC/openSUSE:Factory/.qt6-virtualkeyboard.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-virtualkeyboard" Mon Jun 24 20:49:54 2024 rev:29 rq:1182617 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-virtualkeyboard/qt6-virtualkeyboard.changes 2024-05-27 11:46:52.970062382 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-virtualkeyboard.new.18349/qt6-virtualkeyboard.changes 2024-06-24 20:50:16.629689663 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:26:05 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz New: ---- qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-virtualkeyboard.spec ++++++ --- /var/tmp/diff_new_pack.Ev6FNp/_old 2024-06-24 20:50:18.533759465 +0200 +++ /var/tmp/diff_new_pack.Ev6FNp/_new 2024-06-24 20:50:18.553760198 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define tar_name qtvirtualkeyboard-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-virtualkeyboard%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: Framework for writing or integrating input methods and engines for Qt 6 License: GPL-3.0-only ++++++ qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz -> qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtvirtualkeyboard-everywhere-src-6.7.1/.cmake.conf new/qtvirtualkeyboard-everywhere-src-6.7.2/.cmake.conf --- old/qtvirtualkeyboard-everywhere-src-6.7.1/.cmake.conf 2024-05-09 07:15:39.000000000 +0200 +++ new/qtvirtualkeyboard-everywhere-src-6.7.2/.cmake.conf 2024-06-08 04:17:09.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.1") +set(QT_REPO_MODULE_VERSION "6.7.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtvirtualkeyboard-everywhere-src-6.7.1/.tag new/qtvirtualkeyboard-everywhere-src-6.7.2/.tag --- old/qtvirtualkeyboard-everywhere-src-6.7.1/.tag 2024-05-09 07:15:39.000000000 +0200 +++ new/qtvirtualkeyboard-everywhere-src-6.7.2/.tag 2024-06-08 04:17:09.000000000 +0200 @@ -1 +1 @@ -09c71d9c8c80d7d00df57fd62e3df7be5b8f32f8 +bbbfcd3a5f023a4aab2476a8662cb3fff9ddc922 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtvirtualkeyboard-everywhere-src-6.7.1/dependencies.yaml new/qtvirtualkeyboard-everywhere-src-6.7.2/dependencies.yaml --- old/qtvirtualkeyboard-everywhere-src-6.7.1/dependencies.yaml 2024-05-09 07:15:39.000000000 +0200 +++ new/qtvirtualkeyboard-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 04:17:09.000000000 +0200 @@ -1,13 +1,13 @@ dependencies: ../qtbase: - ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 + ref: b5fbe0923cfc566036b83c3d968f225b26117efc required: true ../qtdeclarative: - ref: 734849e4577b75e85420b08ddb55974482bbd063 + ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc required: true ../qtmultimedia: - ref: 103cde748b78844f01d4972a3c3069a78b97cbd4 + ref: a3f871eb133673ea5460425712cc68d7458bf0ef required: false ../qtsvg: - ref: 7ed85b2bd5c2444938f3c0d0a5a34e125fbda3a8 + ref: eef891b4f06c76442e57d015665573972ccd2c49 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtvirtualkeyboard-everywhere-src-6.7.1/licenseRule.json new/qtvirtualkeyboard-everywhere-src-6.7.2/licenseRule.json --- old/qtvirtualkeyboard-everywhere-src-6.7.1/licenseRule.json 2024-05-09 07:15:39.000000000 +0200 +++ new/qtvirtualkeyboard-everywhere-src-6.7.2/licenseRule.json 2024-06-08 04:17:09.000000000 +0200 @@ -79,7 +79,7 @@ "file type" : "examples and snippets", "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] }, - "config.tests/" : { + "config\\.tests/" : { "comment" : "Default", "file type" : "build system", "spdx" : ["BSD-3-Clause"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtvirtualkeyboard-everywhere-src-6.7.1/tests/auto/inputpanel/tst_inputpanel.cpp new/qtvirtualkeyboard-everywhere-src-6.7.2/tests/auto/inputpanel/tst_inputpanel.cpp --- old/qtvirtualkeyboard-everywhere-src-6.7.1/tests/auto/inputpanel/tst_inputpanel.cpp 2024-05-09 07:15:39.000000000 +0200 +++ new/qtvirtualkeyboard-everywhere-src-6.7.2/tests/auto/inputpanel/tst_inputpanel.cpp 2024-06-08 04:17:09.000000000 +0200 @@ -7,18 +7,25 @@ #include <QFileInfo> #include <QDir> -static bool s_configEnv = qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard")); -static bool initStandardPaths() { - QStandardPaths::setTestModeEnabled(true); - auto configLocations = QStringList() - << QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/qtvirtualkeyboard" - << QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/qtvirtualkeyboard"; - for (const QString &configLocation : configLocations) { - if (configLocation != "/qtvirtualkeyboard") - QDir(configLocation).removeRecursively(); +namespace +{ + +struct VirtualKeyboardSetup : QObject +{ + VirtualKeyboardSetup() + { + qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard")); + QStandardPaths::setTestModeEnabled(true); + auto configLocations = QStringList() + << QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/qtvirtualkeyboard" + << QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/qtvirtualkeyboard"; + for (const QString &configLocation : configLocations) { + if (configLocation != "/qtvirtualkeyboard") + QDir(configLocation).removeRecursively(); + } } - return true; +}; + } -static bool s_initStandardPaths = initStandardPaths(); -QUICK_TEST_MAIN(inputpanel) +QUICK_TEST_MAIN_WITH_SETUP(inputpanel, VirtualKeyboardSetup) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtvirtualkeyboard-everywhere-src-6.7.1/tests/auto/inputpanelcontrols/tst_inputpanelcontrols.cpp new/qtvirtualkeyboard-everywhere-src-6.7.2/tests/auto/inputpanelcontrols/tst_inputpanelcontrols.cpp --- old/qtvirtualkeyboard-everywhere-src-6.7.1/tests/auto/inputpanelcontrols/tst_inputpanelcontrols.cpp 2024-05-09 07:15:39.000000000 +0200 +++ new/qtvirtualkeyboard-everywhere-src-6.7.2/tests/auto/inputpanelcontrols/tst_inputpanelcontrols.cpp 2024-06-08 04:17:09.000000000 +0200 @@ -7,18 +7,25 @@ #include <QFileInfo> #include <QDir> -static bool s_configEnv = qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard")); -static bool initStandardPaths() { - QStandardPaths::setTestModeEnabled(true); - auto configLocations = QStringList() - << QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/qtvirtualkeyboard" - << QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/qtvirtualkeyboard"; - for (const QString &configLocation : configLocations) { - if (configLocation != "/qtvirtualkeyboard") - QDir(configLocation).removeRecursively(); +namespace +{ + +struct VirtualKeyboardSetup : QObject +{ + VirtualKeyboardSetup() + { + qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard")); + QStandardPaths::setTestModeEnabled(true); + auto configLocations = QStringList() + << QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/qtvirtualkeyboard" + << QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/qtvirtualkeyboard"; + for (const QString &configLocation : configLocations) { + if (configLocation != "/qtvirtualkeyboard") + QDir(configLocation).removeRecursively(); + } } - return true; +}; + } -static bool s_initStandardPaths = initStandardPaths(); -QUICK_TEST_MAIN(inputpanelcontrols) +QUICK_TEST_MAIN_WITH_SETUP(inputpanelcontrols, VirtualKeyboardSetup) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtvirtualkeyboard-everywhere-src-6.7.1/tests/auto/shadowinput/tst_shadowinput.cpp new/qtvirtualkeyboard-everywhere-src-6.7.2/tests/auto/shadowinput/tst_shadowinput.cpp --- old/qtvirtualkeyboard-everywhere-src-6.7.1/tests/auto/shadowinput/tst_shadowinput.cpp 2024-05-09 07:15:39.000000000 +0200 +++ new/qtvirtualkeyboard-everywhere-src-6.7.2/tests/auto/shadowinput/tst_shadowinput.cpp 2024-06-08 04:17:09.000000000 +0200 @@ -7,6 +7,17 @@ #include <QFileInfo> #include <QDir> -static bool s_configEnv = qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard")); +namespace +{ -QUICK_TEST_MAIN(shadowinput) +struct VirtualKeyboardSetup : QObject +{ + VirtualKeyboardSetup() + { + qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard")); + } +}; + +} + +QUICK_TEST_MAIN_WITH_SETUP(shadowinput, VirtualKeyboardSetup)

1 0

commit qt6-tools for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-tools for openSUSE:Factory checked in at 2024-06-24 20:49:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-tools (Old) and /work/SRC/openSUSE:Factory/.qt6-tools.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-tools" Mon Jun 24 20:49:53 2024 rev:38 rq:1182615 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-tools/qt6-tools.changes 2024-05-27 11:46:50.725980152 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-tools.new.18349/qt6-tools.changes 2024-06-24 20:50:12.693545367 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:26:03 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qttools-everywhere-src-6.7.1.tar.xz New: ---- qttools-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-tools.spec ++++++ --- /var/tmp/diff_new_pack.kQUJ61/_old 2024-06-24 20:50:15.029631006 +0200 +++ /var/tmp/diff_new_pack.kQUJ61/_new 2024-06-24 20:50:15.041631447 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define tar_name qttools-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-tools%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: Qt 6 Tools libraries and tools # TODO Check if it's still valid ++++++ qttools-everywhere-src-6.7.1.tar.xz -> qttools-everywhere-src-6.7.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-tools/qttools-everywhere-src-6.7.1.tar.xz /work/SRC/openSUSE:Factory/.qt6-tools.new.18349/qttools-everywhere-src-6.7.2.tar.xz differ: char 27, line 1

1 0

commit qt6-speech for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-speech for openSUSE:Factory checked in at 2024-06-24 20:49:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-speech (Old) and /work/SRC/openSUSE:Factory/.qt6-speech.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-speech" Mon Jun 24 20:49:50 2024 rev:16 rq:1182613 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-speech/qt6-speech.changes 2024-05-27 11:46:43.061699309 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-speech.new.18349/qt6-speech.changes 2024-06-24 20:50:09.861441545 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:26:02 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qtspeech-everywhere-src-6.7.1.tar.xz New: ---- qtspeech-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-speech.spec ++++++ --- /var/tmp/diff_new_pack.AUxC9r/_old 2024-06-24 20:50:10.413461782 +0200 +++ /var/tmp/diff_new_pack.AUxC9r/_new 2024-06-24 20:50:10.413461782 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define tar_name qtspeech-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-speech%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: Qt 6 TextToSpeech Library and Plugin License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtspeech-everywhere-src-6.7.1.tar.xz -> qtspeech-everywhere-src-6.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/.cmake.conf new/qtspeech-everywhere-src-6.7.2/.cmake.conf --- old/qtspeech-everywhere-src-6.7.1/.cmake.conf 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/.cmake.conf 2024-06-08 04:17:16.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.1") +set(QT_REPO_MODULE_VERSION "6.7.2") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/.tag new/qtspeech-everywhere-src-6.7.2/.tag --- old/qtspeech-everywhere-src-6.7.1/.tag 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/.tag 2024-06-08 04:17:16.000000000 +0200 @@ -1 +1 @@ -8f45a09c4086a2a2246450efa3411950b69932fc +95466b3abcf17a03cf9c7427afa7cfb7ba75a98f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/dependencies.yaml new/qtspeech-everywhere-src-6.7.2/dependencies.yaml --- old/qtspeech-everywhere-src-6.7.1/dependencies.yaml 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 04:17:16.000000000 +0200 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 + ref: b5fbe0923cfc566036b83c3d968f225b26117efc required: true ../qtdeclarative: - ref: 734849e4577b75e85420b08ddb55974482bbd063 + ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc required: false ../qtmultimedia: - ref: 103cde748b78844f01d4972a3c3069a78b97cbd4 + ref: a3f871eb133673ea5460425712cc68d7458bf0ef required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/licenseRule.json new/qtspeech-everywhere-src-6.7.2/licenseRule.json --- old/qtspeech-everywhere-src-6.7.1/licenseRule.json 1970-01-01 01:00:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.7.2/licenseRule.json 2024-06-08 04:17:16.000000000 +0200 @@ -0,0 +1,84 @@ +[ + { + "comment" : ["file_pattern_ending: strings matched against the end of a file name.", + "location keys: regular expression matched against the beginning of", + "the file path (relative to the git submodule root).", + "spdx: list of SPDX-License-Expression's allowed in the matching files.", + "-------------------------------------------------------", + "Files with the following endings are Build System licensed,", + "unless they are examples", + "Files with other endings can also be build system files" + ], + "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", + "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in"], + "location" : { + "" : { + "comment" : "Default", + "file type" : "build system", + "spdx" : ["BSD-3-Clause"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comments" : ["Files with the following endings are Tool licensed,", + "unless they are examples.", + "Files with other endings can also be tool files."], + "file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"], + "location" :{ + "" : { + "comment" : "Default", + "file type" : "tools and utils", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comment" : "Files with the following endings are Documentation licensed.", + "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"], + "location" :{ + "" : { + "comment" : "", + "file type" : "documentation", + "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + } + } + }, + { + "comment" : ["All other files", + "The licensing is defined only by the file location in the Qt module repository.", + "NO <file_pattern_ending> key for this case!", + "This needs to be the last entry of the file."], + "location" : { + "" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "src/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "tests/" : { + "comment" : "Default", + "file type" : "test", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Default", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + } +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/android/jar/src/org/qtproject/qt/android/speech/QtTextToSpeech.java new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/android/jar/src/org/qtproject/qt/android/speech/QtTextToSpeech.java --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/android/jar/src/org/qtproject/qt/android/speech/QtTextToSpeech.java 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/android/jar/src/org/qtproject/qt/android/speech/QtTextToSpeech.java 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only package org.qtproject.qt.android.speech; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/android/src/qtexttospeech_android.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/android/src/qtexttospeech_android.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/android/src/qtexttospeech_android.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/android/src/qtexttospeech_android.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_android.h" #include <QtCore/qcoreapplication.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/android/src/qtexttospeech_android.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/android/src/qtexttospeech_android.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/android/src/qtexttospeech_android.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/android/src/qtexttospeech_android.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_ANDROID_H #define QTEXTTOSPEECHENGINE_ANDROID_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/android/src/qtexttospeech_android_plugin.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/android/src/qtexttospeech_android_plugin.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/android/src/qtexttospeech_android_plugin.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/android/src/qtexttospeech_android_plugin.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_android_plugin.h" #include "qtexttospeech_android.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/android/src/qtexttospeech_android_plugin.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/android/src/qtexttospeech_android_plugin.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/android/src/qtexttospeech_android_plugin.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/android/src/qtexttospeech_android_plugin.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_ANDROID_H #define QTEXTTOSPEECHPLUGIN_ANDROID_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/darwin/qtexttospeech_darwin.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/darwin/qtexttospeech_darwin.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/darwin/qtexttospeech_darwin.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/darwin/qtexttospeech_darwin.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_DARWIN_H #define QTEXTTOSPEECHENGINE_DARWIN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/darwin/qtexttospeech_darwin.mm new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/darwin/qtexttospeech_darwin.mm --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/darwin/qtexttospeech_darwin.mm 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/darwin/qtexttospeech_darwin.mm 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <AVFoundation/AVFoundation.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_darwin_plugin.h" #include "qtexttospeech_darwin.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_DARWIN_H #define QTEXTTOSPEECHPLUGIN_DARWIN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_flite.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_FLITE_H #define QTEXTTOSPEECHENGINE_FLITE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite_plugin.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite_plugin.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite_plugin.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite_plugin.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_flite_plugin.h" #include "qtexttospeech_flite.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite_plugin.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite_plugin.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite_plugin.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite_plugin.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_FLITE_H #define QTEXTTOSPEECHPLUGIN_FLITE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_flite_processor.h" #include "qtexttospeech_flite_plugin.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite_processor.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite_processor.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/flite/qtexttospeech_flite_processor.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/flite/qtexttospeech_flite_processor.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPROCESSOR_FLITE_H #define QTEXTTOSPEECHPROCESSOR_FLITE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/macos/qtexttospeech_macos.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/macos/qtexttospeech_macos.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/macos/qtexttospeech_macos.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/macos/qtexttospeech_macos.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_MACOS_H #define QTEXTTOSPEECHENGINE_MACOS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/macos/qtexttospeech_macos.mm new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/macos/qtexttospeech_macos.mm --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/macos/qtexttospeech_macos.mm 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/macos/qtexttospeech_macos.mm 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <Cocoa/Cocoa.h> #include "qtexttospeech_macos.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/macos/qtexttospeech_macos_plugin.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/macos/qtexttospeech_macos_plugin.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/macos/qtexttospeech_macos_plugin.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/macos/qtexttospeech_macos_plugin.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_macos_plugin.h" #include "qtexttospeech_macos.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/macos/qtexttospeech_macos_plugin.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/macos/qtexttospeech_macos_plugin.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/macos/qtexttospeech_macos_plugin.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/macos/qtexttospeech_macos_plugin.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_MACOS_H #define QTEXTTOSPEECHPLUGIN_MACOS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/mock/qtexttospeech_mock.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/mock/qtexttospeech_mock.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/mock/qtexttospeech_mock.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/mock/qtexttospeech_mock.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_mock.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/mock/qtexttospeech_mock.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/mock/qtexttospeech_mock.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/mock/qtexttospeech_mock.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/mock/qtexttospeech_mock.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECH_MOCK_H #define QTEXTTOSPEECH_MOCK_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/mock/qtexttospeech_mock_plugin.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/mock/qtexttospeech_mock_plugin.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/mock/qtexttospeech_mock_plugin.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/mock/qtexttospeech_mock_plugin.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_mock_plugin.h" #include "qtexttospeech_mock.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/mock/qtexttospeech_mock_plugin.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/mock/qtexttospeech_mock_plugin.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/mock/qtexttospeech_mock_plugin.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/mock/qtexttospeech_mock_plugin.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_MOCK_H #define QTEXTTOSPEECHPLUGIN_MOCK_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/sapi/qtexttospeech_sapi.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/sapi/qtexttospeech_sapi.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/sapi/qtexttospeech_sapi.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/sapi/qtexttospeech_sapi.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_sapi.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/sapi/qtexttospeech_sapi.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/sapi/qtexttospeech_sapi.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/sapi/qtexttospeech_sapi.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/sapi/qtexttospeech_sapi.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_SAPI_H #define QTEXTTOSPEECHENGINE_SAPI_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_sapi_plugin.h" #include "qtexttospeech_sapi.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_SAPI_H #define QTEXTTOSPEECHPLUGIN_SAPI_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,11 +1,12 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_speechd.h" #include <QtCore/QDebug> #include <QtCore/QCoreApplication> +#include <QtCore/QLoggingCategory> #include <libspeechd.h> @@ -15,6 +16,8 @@ QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(lcSpeechTtsSpeechd, "qt.speech.tts.speechd") + typedef QList<QTextToSpeechEngineSpeechd*> QTextToSpeechSpeechDispatcherBackendList; Q_GLOBAL_STATIC(QTextToSpeechSpeechDispatcherBackendList, backends) @@ -385,7 +388,7 @@ // (history functions are just stubs) void speech_finished_callback(size_t msg_id, size_t client_id, SPDNotificationType state) { - qDebug() << "Message from speech dispatcher" << msg_id << client_id; + qCDebug(lcSpeechTtsSpeechd) << "Message from speech dispatcher" << msg_id << client_id; for (QTextToSpeechEngineSpeechd *backend : std::as_const(*backends)) backend->spdStateChanged(state); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_SPEECHD_H #define QTEXTTOSPEECHENGINE_SPEECHD_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_speechd_plugin.h" #include "qtexttospeech_speechd.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_SPEECHD_H #define QTEXTTOSPEECHPLUGIN_SPEECHD_H @@ -8,12 +8,9 @@ #include "qtexttospeechengine.h" #include <QtCore/QObject> -#include <QtCore/QLoggingCategory> QT_BEGIN_NAMESPACE -//Q_DECLARE_LOGGING_CATEGORY(lcSpeechTtsSpeechd) - class QTextToSpeechSpeechdPlugin : public QObject, public QTextToSpeechPlugin { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_winrt.h" #include "qtexttospeech_winrt_audiosource.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_WINRT_H #define QTEXTTOSPEECHENGINE_WINRT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_winrt_audiosource.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_WINRT_AUDIOSOURCE_H #define QTEXTTOSPEECHENGINE_WINRT_AUDIOSOURCE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.cpp new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.cpp --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_winrt_plugin.h" #include "qtexttospeech_winrt.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.h new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.h --- old/qtspeech-everywhere-src-6.7.1/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_WINRT_H #define QTEXTTOSPEECHPLUGIN_WINRT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeech.cpp new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeech.cpp --- old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeech.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeech.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeech.h new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeech.h --- old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeech.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeech.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeech_global.h new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeech_global.h --- old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeech_global.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeech_global.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeech_p.h new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeech_p.h --- old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeech_p.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeech_p.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeechengine.cpp new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeechengine.cpp --- old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeechengine.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeechengine.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeechengine.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeechengine.h new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeechengine.h --- old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeechengine.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeechengine.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_H #define QTEXTTOSPEECHENGINE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeechplugin.cpp new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeechplugin.cpp --- old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeechplugin.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeechplugin.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeechplugin.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeechplugin.h new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeechplugin.h --- old/qtspeech-everywhere-src-6.7.1/src/tts/qtexttospeechplugin.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/tts/qtexttospeechplugin.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_H #define QTEXTTOSPEECHPLUGIN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/tts/qvoice.cpp new/qtspeech-everywhere-src-6.7.2/src/tts/qvoice.cpp --- old/qtspeech-everywhere-src-6.7.1/src/tts/qvoice.cpp 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/tts/qvoice.cpp 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/tts/qvoice.h new/qtspeech-everywhere-src-6.7.2/src/tts/qvoice.h --- old/qtspeech-everywhere-src-6.7.1/src/tts/qvoice.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/tts/qvoice.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QVOICE_H #define QVOICE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.7.1/src/tts/qvoice_p.h new/qtspeech-everywhere-src-6.7.2/src/tts/qvoice_p.h --- old/qtspeech-everywhere-src-6.7.1/src/tts/qvoice_p.h 2024-05-09 07:15:34.000000000 +0200 +++ new/qtspeech-everywhere-src-6.7.2/src/tts/qvoice_p.h 2024-06-08 04:17:16.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

1 0