October 2024 - openSUSE Commits - openSUSE Mailing Lists

commit python-platformio for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-platformio for openSUSE:Factory checked in at 2024-10-03 17:40:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-platformio (Old) and /work/SRC/openSUSE:Factory/.python-platformio.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-platformio" Thu Oct 3 17:40:33 2024 rev:13 rq:1205379 version:6.1.16 Changes: -------- --- /work/SRC/openSUSE:Factory/python-platformio/python-platformio.changes 2024-05-07 18:05:32.583174235 +0200 +++ /work/SRC/openSUSE:Factory/.python-platformio.new.19354/python-platformio.changes 2024-10-03 17:41:47.503764288 +0200 @@ -1,0 +2,20 @@ +Thu Oct 3 08:30:27 UTC 2024 - Dirk Müller <dmueller(a)suse.com> + +- update to 6.1.16: + * Added support for Python 3.13 + * Introduced the PLATFORMIO_SYSTEM_TYPE environment variable, + enabling manual override of the detected system type for + greater flexibility and control in custom build environments + * Enhanced internet connection checks by falling back to HTTPS + protocol when HTTP (port 80) fails (issue #4980) + * Upgraded the build engine to the latest version of SCons + (4.8.1) to improve build performance, reliability, and + compatibility with other tools and systems (release notes) + * Upgraded the Doctest testing framework to version 2.4.11, the + GoogleTest to version 1.15.2, and the Unity to version 2.6.0, + incorporating the latest features and improvements for + enhanced testing capabilities + * Corrected an issue where the incorrect public class was + imported for the ``DoctestTestRunner`` (issue #4949) + +------------------------------------------------------------------- Old: ---- platformio-6.1.15.tar.gz New: ---- platformio-6.1.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-platformio.spec ++++++ --- /var/tmp/diff_new_pack.PGFGtw/_old 2024-10-03 17:41:47.955783127 +0200 +++ /var/tmp/diff_new_pack.PGFGtw/_new 2024-10-03 17:41:47.955783127 +0200 @@ -17,7 +17,7 @@ Name: python-platformio -Version: 6.1.15 +Version: 6.1.16 Release: 0 Summary: New Generation Ecosystem for Embedded Development License: Apache-2.0 ++++++ platformio-6.1.15.tar.gz -> platformio-6.1.16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/PKG-INFO new/platformio-6.1.16/PKG-INFO --- old/platformio-6.1.15/PKG-INFO 2024-04-25 10:52:22.742703200 +0200 +++ new/platformio-6.1.16/PKG-INFO 2024-09-26 12:32:31.835679800 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: platformio -Version: 6.1.15 +Version: 6.1.16 Summary: Your Gateway to Embedded Software Development Excellence. Unlock the true potential of embedded software development with PlatformIO's collaborative ecosystem, embracing declarative principles, test-driven methodologies, and modern toolchains for unrivaled success. Home-page: https://platformio.org Author: PlatformIO Labs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/__init__.py new/platformio-6.1.16/platformio/__init__.py --- old/platformio-6.1.15/platformio/__init__.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/__init__.py 2024-09-26 12:19:08.000000000 +0200 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -VERSION = (6, 1, 15) +VERSION = (6, 1, 16) __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/account/client.py new/platformio-6.1.16/platformio/account/client.py --- old/platformio-6.1.15/platformio/account/client.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/account/client.py 2024-09-26 12:19:08.000000000 +0200 @@ -144,7 +144,7 @@ def registration( self, username, email, password, firstname, lastname - ): # pylint:disable=too-many-arguments + ): # pylint: disable=too-many-arguments,too-many-positional-arguments try: self.fetch_authentication_token() except: # pylint:disable=bare-except diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/assets/system/99-platformio-udev.rules new/platformio-6.1.16/platformio/assets/system/99-platformio-udev.rules --- old/platformio-6.1.15/platformio/assets/system/99-platformio-udev.rules 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/assets/system/99-platformio-udev.rules 2024-09-26 12:19:08.000000000 +0200 @@ -178,3 +178,6 @@ # Espressif USB JTAG/serial debug unit ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1001", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1" + +# Zephyr framework USB CDC-ACM +ATTRS{idVendor}=="2fe3", ATTRS{idProduct}=="0100", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/builder/tools/piotarget.py new/platformio-6.1.16/platformio/builder/tools/piotarget.py --- old/platformio-6.1.15/platformio/builder/tools/piotarget.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/builder/tools/piotarget.py 2024-09-26 12:19:08.000000000 +0200 @@ -61,7 +61,7 @@ print("Done cleaning") -def AddTarget( # pylint: disable=too-many-arguments +def AddTarget( # pylint: disable=too-many-arguments,too-many-positional-arguments env, name, dependencies, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/check/cli.py new/platformio-6.1.16/platformio/check/cli.py --- old/platformio-6.1.15/platformio/check/cli.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/check/cli.py 2024-09-26 12:19:08.000000000 +0200 @@ -60,7 +60,7 @@ type=click.Choice(DefectItem.SEVERITY_LABELS.values()), ) @click.option("--skip-packages", is_flag=True) -def cli( +def cli( # pylint: disable=too-many-positional-arguments environment, project_dir, project_conf, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/check/defect.py new/platformio-6.1.16/platformio/check/defect.py --- old/platformio-6.1.15/platformio/check/defect.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/check/defect.py 2024-09-26 12:19:08.000000000 +0200 @@ -29,7 +29,7 @@ SEVERITY_LOW = 4 SEVERITY_LABELS = {4: "low", 2: "medium", 1: "high"} - def __init__( + def __init__( # pylint: disable=too-many-positional-arguments self, severity, category, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/commands/ci.py new/platformio-6.1.16/platformio/commands/ci.py --- old/platformio-6.1.15/platformio/commands/ci.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/commands/ci.py 2024-09-26 12:19:08.000000000 +0200 @@ -63,7 +63,7 @@ @click.option("-e", "--environment", "environments", multiple=True) @click.option("-v", "--verbose", is_flag=True) @click.pass_context -def cli( # pylint: disable=too-many-arguments, too-many-branches +def cli( # pylint: disable=too-many-arguments,too-many-positional-arguments, too-many-branches ctx, src, lib, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/commands/lib.py new/platformio-6.1.16/platformio/commands/lib.py --- old/platformio-6.1.15/platformio/commands/lib.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/commands/lib.py 2024-09-26 12:19:08.000000000 +0200 @@ -152,7 +152,7 @@ "-f", "--force", is_flag=True, help="Reinstall/redownload library if exists" ) @click.pass_context -def lib_install( # pylint: disable=too-many-arguments,unused-argument +def lib_install( # pylint: disable=too-many-arguments,too-many-positional-arguments,unused-argument ctx, libraries, save, silent, interactive, force ): click.secho( @@ -210,7 +210,7 @@ @click.option("-s", "--silent", is_flag=True, help="Suppress progress reporting") @click.option("--json-output", is_flag=True) @click.pass_context -def lib_update( # pylint: disable=too-many-arguments +def lib_update( # pylint: disable=too-many-arguments,too-many-positional-arguments ctx, libraries, only_check, dry_run, silent, json_output ): only_check = dry_run or only_check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/commands/platform.py new/platformio-6.1.16/platformio/commands/platform.py --- old/platformio-6.1.15/platformio/commands/platform.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/commands/platform.py 2024-09-26 12:19:08.000000000 +0200 @@ -159,7 +159,7 @@ help="Reinstall/redownload dev/platform and its packages if exist", ) @click.pass_context -def platform_install( # pylint: disable=too-many-arguments +def platform_install( # pylint: disable=too-many-arguments,too-many-positional-arguments ctx, platforms, with_package, @@ -224,7 +224,7 @@ @click.option("-s", "--silent", is_flag=True, help="Suppress progress reporting") @click.option("--json-output", is_flag=True) @click.pass_context -def platform_update( # pylint: disable=too-many-locals, too-many-arguments +def platform_update( # pylint: disable=too-many-locals,too-many-arguments,too-many-positional-arguments ctx, platforms, only_check, dry_run, silent, json_output, **_ ): only_check = dry_run or only_check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/debug/cli.py new/platformio-6.1.16/platformio/debug/cli.py --- old/platformio-6.1.15/platformio/debug/cli.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/debug/cli.py 2024-09-26 12:19:08.000000000 +0200 @@ -57,7 +57,7 @@ @click.option("--interface", type=click.Choice(["gdb"])) @click.argument("client_extra_args", nargs=-1, type=click.UNPROCESSED) @click.pass_context -def cli( +def cli( # pylint: disable=too-many-positional-arguments ctx, project_dir, project_conf, @@ -111,7 +111,9 @@ return None -def _configure(ctx, project_config, env_name, load_mode, verbose, client_extra_args): +def _configure( + ctx, project_config, env_name, load_mode, verbose, client_extra_args +): # pylint: disable=too-many-positional-arguments platform = PlatformFactory.from_env(env_name, autoinstall=True) debug_config = DebugConfigFactory.new( platform, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/debug/helpers.py new/platformio-6.1.16/platformio/debug/helpers.py --- old/platformio-6.1.15/platformio/debug/helpers.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/debug/helpers.py 2024-09-26 12:19:08.000000000 +0200 @@ -76,7 +76,7 @@ def predebug_project( ctx, project_dir, project_config, env_name, preload, verbose -): # pylint: disable=too-many-arguments +): # pylint: disable=too-many-arguments,too-many-positional-arguments debug_testname = project_config.get("env:" + env_name, "debug_test") if debug_testname: test_names = list_test_names(project_config) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/dependencies.py new/platformio-6.1.16/platformio/dependencies.py --- old/platformio-6.1.15/platformio/dependencies.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/dependencies.py 2024-09-26 12:19:08.000000000 +0200 @@ -14,14 +14,14 @@ import platform -from platformio.compat import PY36, is_proxy_set +from platformio.compat import is_proxy_set def get_core_dependencies(): return { "contrib-piohome": "~3.4.2", "contrib-pioremote": "~1.0.0", - "tool-scons": "~4.40700.0", + "tool-scons": "~4.40801.0", "tool-cppcheck": "~1.21100.0", "tool-clangtidy": "~1.150005.0", "tool-pvs-studio": "~7.18.0", @@ -30,7 +30,8 @@ def get_pip_dependencies(): core = [ - "bottle == 0.12.*", + 'bottle == 0.12.*; python_version < "3.7"', + 'bottle == 0.13.*; python_version >= "3.7"', "click >=8.0.4, <9", "colorama", "marshmallow == 3.*", @@ -44,8 +45,9 @@ home = [ # PIO Home requirements "ajsonrpc == 1.2.*", - "starlette >=0.19, <0.38", - "uvicorn %s" % ("== 0.16.0" if PY36 else ">=0.16, <0.30"), + "starlette >=0.19, <0.40", + 'uvicorn == 0.16.0; python_version < "3.7"', + 'uvicorn >=0.16, <0.31; python_version >= "3.7"', "wsproto == 1.*", ] @@ -53,7 +55,9 @@ # issue #4702; Broken "requests/charset_normalizer" on macOS ARM if platform.system() == "Darwin" and "arm" in platform.machine().lower(): - extra.append("chardet>=3.0.2,<6") + extra.append( + 'chardet >= 3.0.2,<6; platform_system == "Darwin" and "arm" in platform_machine' + ) # issue 4614: urllib3 v2.0 only supports OpenSSL 1.1.1+ try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/device/finder.py new/platformio-6.1.16/platformio/device/finder.py --- old/platformio-6.1.15/platformio/device/finder.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/device/finder.py 2024-09-26 12:19:08.000000000 +0200 @@ -89,7 +89,7 @@ class SerialPortFinder: - def __init__( # pylint: disable=too-many-arguments + def __init__( # pylint: disable=too-many-arguments,too-many-positional-arguments self, board_config=None, upload_protocol=None, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/http.py new/platformio-6.1.16/platformio/http.py --- old/platformio-6.1.15/platformio/http.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/http.py 2024-09-26 12:19:08.000000000 +0200 @@ -190,10 +190,11 @@ @util.memoized(expire="10s") def _internet_on(): timeout = 2 + use_proxy = is_proxy_set() socket.setdefaulttimeout(timeout) for host in __check_internet_hosts__: try: - if is_proxy_set(): + if use_proxy: requests.get("http://%s" % host, allow_redirects=False, timeout=timeout) return True # try to resolve `host` for both AF_INET and AF_INET6, and then try to connect @@ -203,6 +204,15 @@ return True except: # pylint: disable=bare-except pass + + # falling back to HTTPs, issue #4980 + for host in __check_internet_hosts__: + try: + requests.get("https://%s" % host, allow_redirects=False, timeout=timeout) + except requests.exceptions.RequestException: + pass + return True + return False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/package/commands/publish.py new/platformio-6.1.16/platformio/package/commands/publish.py --- old/platformio-6.1.15/platformio/package/commands/publish.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/package/commands/publish.py 2024-09-26 12:19:08.000000000 +0200 @@ -82,7 +82,7 @@ help="Do not show interactive prompt", hidden=True, ) -def package_publish_cmd( # pylint: disable=too-many-arguments, too-many-locals +def package_publish_cmd( # pylint: disable=too-many-arguments,too-many-positional-arguments,too-many-locals package, owner, typex, released_at, private, notify, no_interactive, non_interactive ): click.secho("Preparing a package...", fg="cyan") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/package/manager/platform.py new/platformio-6.1.16/platformio/package/manager/platform.py --- old/platformio-6.1.15/platformio/package/manager/platform.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/package/manager/platform.py 2024-09-26 12:19:08.000000000 +0200 @@ -38,7 +38,7 @@ def manifest_names(self): return PackageType.get_manifest_map()[PackageType.PLATFORM] - def install( # pylint: disable=arguments-differ,too-many-arguments + def install( # pylint: disable=arguments-differ,too-many-arguments,too-many-positional-arguments self, spec, skip_dependencies=False, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/package/manifest/schema.py new/platformio-6.1.16/platformio/package/manifest/schema.py --- old/platformio-6.1.15/platformio/package/manifest/schema.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/package/manifest/schema.py 2024-09-26 12:19:08.000000000 +0200 @@ -276,7 +276,7 @@ @staticmethod @memoized(expire="1h") def load_spdx_licenses(): - version = "3.23" + version = "3.24.0" spdx_data_url = ( "https://raw.githubusercontent.com/spdx/license-list-data/" f"v{version}/json/licenses.json" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/package/meta.py new/platformio-6.1.16/platformio/package/meta.py --- old/platformio-6.1.15/platformio/package/meta.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/package/meta.py 2024-09-26 12:19:08.000000000 +0200 @@ -196,7 +196,7 @@ class PackageSpec: # pylint: disable=too-many-instance-attributes - def __init__( # pylint: disable=redefined-builtin,too-many-arguments + def __init__( # pylint: disable=redefined-builtin,too-many-arguments,too-many-positional-arguments self, raw=None, owner=None, id=None, name=None, requirements=None, uri=None ): self._requirements = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/platform/_run.py new/platformio-6.1.16/platformio/platform/_run.py --- old/platformio-6.1.15/platformio/platform/_run.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/platform/_run.py 2024-09-26 12:19:08.000000000 +0200 @@ -44,7 +44,7 @@ value = json.loads(value) return value - def run( # pylint: disable=too-many-arguments + def run( # pylint: disable=too-many-arguments,too-many-positional-arguments self, variables, targets, silent, verbose, jobs ): assert isinstance(variables, dict) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/project/commands/init.py new/platformio-6.1.16/platformio/project/commands/init.py --- old/platformio-6.1.15/platformio/project/commands/init.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/project/commands/init.py 2024-09-26 12:19:08.000000000 +0200 @@ -68,7 +68,7 @@ @click.option("--no-install-dependencies", is_flag=True) @click.option("--env-prefix", default="") @click.option("-s", "--silent", is_flag=True) -def project_init_cmd( +def project_init_cmd( # pylint: disable=too-many-positional-arguments project_dir, boards, ide, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/project/options.py new/platformio-6.1.16/platformio/project/options.py --- old/platformio-6.1.15/platformio/project/options.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/project/options.py 2024-09-26 12:19:08.000000000 +0200 @@ -23,7 +23,7 @@ from platformio.compat import IS_WINDOWS -class ConfigOption: # pylint: disable=too-many-instance-attributes +class ConfigOption: # pylint: disable=too-many-instance-attributes,too-many-positional-arguments def __init__( self, scope, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/public.py new/platformio-6.1.16/platformio/public.py --- old/platformio-6.1.15/platformio/public.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/public.py 2024-09-26 12:19:08.000000000 +0200 @@ -23,7 +23,7 @@ from platformio.project.options import get_config_options_schema from platformio.test.result import TestCase, TestCaseSource, TestStatus from platformio.test.runners.base import TestRunnerBase -from platformio.test.runners.doctest import DoctestTestCaseParser +from platformio.test.runners.doctest import DoctestTestRunner from platformio.test.runners.googletest import GoogletestTestRunner from platformio.test.runners.unity import UnityTestRunner from platformio.util import get_systype diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/registry/client.py new/platformio-6.1.16/platformio/registry/client.py --- old/platformio-6.1.15/platformio/registry/client.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/registry/client.py 2024-09-26 12:19:08.000000000 +0200 @@ -42,7 +42,7 @@ pass return False - def publish_package( # pylint: disable=redefined-builtin + def publish_package( # pylint: disable=redefined-builtin, too-many-positional-arguments self, owner, type, archive_path, released_at=None, private=False, notify=True ): with open(archive_path, "rb") as fp: @@ -64,7 +64,7 @@ x_with_authorization=True, ) - def unpublish_package( # pylint: disable=redefined-builtin + def unpublish_package( # pylint: disable=redefined-builtin, too-many-positional-arguments self, owner, type, name, version=None, undo=False ): path = "/v3/packages/%s/%s/%s" % (owner, type, name) @@ -142,7 +142,9 @@ x_with_authorization=self.allowed_private_packages(), ) - def get_package(self, typex, owner, name, version=None, extra_path=None): + def get_package( + self, typex, owner, name, version=None, extra_path=None + ): # pylint: disable=too-many-positional-arguments try: return self.fetch_json_data( "get", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/remote/cli.py new/platformio-6.1.16/platformio/remote/cli.py --- old/platformio-6.1.15/platformio/remote/cli.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/remote/cli.py 2024-09-26 12:19:08.000000000 +0200 @@ -110,7 +110,7 @@ @click.option("-v", "--verbose", is_flag=True) @click.pass_obj @click.pass_context -def remote_run( +def remote_run( # pylint: disable=too-many-positional-arguments ctx, agents, environment, @@ -198,7 +198,7 @@ @click.option("--verbose", "-v", is_flag=True) @click.pass_obj @click.pass_context -def remote_test( # pylint: disable=redefined-builtin +def remote_test( # pylint: disable=redefined-builtin,too-many-positional-arguments ctx, agents, environment, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/remote/client/run_or_test.py new/platformio-6.1.16/platformio/remote/client/run_or_test.py --- old/platformio-6.1.15/platformio/remote/client/run_or_test.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/remote/client/run_or_test.py 2024-09-26 12:19:08.000000000 +0200 @@ -239,7 +239,7 @@ except (AttributeError, pb.DeadReferenceError): self.disconnect(exit_code=1) - def cb_psync_upload_chunk_result( # pylint: disable=too-many-arguments + def cb_psync_upload_chunk_result( # pylint: disable=too-many-arguments,too-many-positional-arguments self, result, agent_id, ac_id, dbindex, fileobj ): result = PROJECT_SYNC_STAGE.lookupByValue(result) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/remote/factory/ssl.py new/platformio-6.1.16/platformio/remote/factory/ssl.py --- old/platformio-6.1.15/platformio/remote/factory/ssl.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/remote/factory/ssl.py 2024-09-26 12:19:08.000000000 +0200 @@ -30,7 +30,7 @@ ctx.load_verify_locations(certifi.where()) return ctx - def verifyHostname( # pylint: disable=unused-argument,too-many-arguments + def verifyHostname( # pylint: disable=unused-argument,too-many-arguments,too-many-positional-arguments self, connection, x509, errno, depth, status ): cn = x509.get_subject().commonName diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/run/cli.py new/platformio-6.1.16/platformio/run/cli.py --- old/platformio-6.1.15/platformio/run/cli.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/run/cli.py 2024-09-26 12:19:08.000000000 +0200 @@ -76,7 +76,7 @@ @click.option("-s", "--silent", is_flag=True) @click.option("-v", "--verbose", is_flag=True) @click.pass_context -def cli( +def cli( # pylint: disable=too-many-positional-arguments ctx, environment, target, @@ -174,7 +174,7 @@ return True -def process_env( +def process_env( # pylint: disable=too-many-positional-arguments ctx, name, config, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/run/processor.py new/platformio-6.1.16/platformio/run/processor.py --- old/platformio-6.1.15/platformio/run/processor.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/run/processor.py 2024-09-26 12:19:08.000000000 +0200 @@ -22,7 +22,7 @@ class EnvironmentProcessor: - def __init__( # pylint: disable=too-many-arguments + def __init__( # pylint: disable=too-many-arguments,too-many-positional-arguments self, cmd_ctx, name, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/test/cli.py new/platformio-6.1.16/platformio/test/cli.py --- old/platformio-6.1.15/platformio/test/cli.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/test/cli.py 2024-09-26 12:19:08.000000000 +0200 @@ -90,7 +90,7 @@ help="Increase verbosity level, maximum is 3 levels (-vvv), see docs for details", ) @click.pass_context -def cli( # pylint: disable=too-many-arguments,too-many-locals,redefined-builtin +def cli( # pylint: disable=too-many-arguments,too-many-positional-arguments,too-many-locals,redefined-builtin ctx, environment, ignore, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/test/result.py new/platformio-6.1.16/platformio/test/result.py --- old/platformio-6.1.15/platformio/test/result.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/test/result.py 2024-09-26 12:19:08.000000000 +0200 @@ -55,7 +55,7 @@ class TestCase: - def __init__( # pylint: disable=too-many-arguments + def __init__( # pylint: disable=too-many-arguments,too-many-positional-arguments self, name, status, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/test/runners/base.py new/platformio-6.1.16/platformio/test/runners/base.py --- old/platformio-6.1.15/platformio/test/runners/base.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/test/runners/base.py 2024-09-26 12:19:08.000000000 +0200 @@ -26,7 +26,7 @@ class TestRunnerOptions: # pylint: disable=too-many-instance-attributes - def __init__( # pylint: disable=too-many-arguments + def __init__( # pylint: disable=too-many-arguments,too-many-positional-arguments self, verbose=0, without_building=False, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/test/runners/doctest.py new/platformio-6.1.16/platformio/test/runners/doctest.py --- old/platformio-6.1.15/platformio/test/runners/doctest.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/test/runners/doctest.py 2024-09-26 12:19:08.000000000 +0200 @@ -101,7 +101,7 @@ class DoctestTestRunner(TestRunnerBase): - EXTRA_LIB_DEPS = ["doctest/doctest(a)^2.4.9"] + EXTRA_LIB_DEPS = ["doctest/doctest(a)^2.4.11"] def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/test/runners/googletest.py new/platformio-6.1.16/platformio/test/runners/googletest.py --- old/platformio-6.1.15/platformio/test/runners/googletest.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/test/runners/googletest.py 2024-09-26 12:19:08.000000000 +0200 @@ -88,7 +88,7 @@ class GoogletestTestRunner(TestRunnerBase): - EXTRA_LIB_DEPS = ["google/googletest(a)^1.12.1"] + EXTRA_LIB_DEPS = ["google/googletest(a)^1.15.2"] def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/test/runners/unity.py new/platformio-6.1.16/platformio/test/runners/unity.py --- old/platformio-6.1.15/platformio/test/runners/unity.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/test/runners/unity.py 2024-09-26 12:19:08.000000000 +0200 @@ -26,7 +26,7 @@ class UnityTestRunner(TestRunnerBase): - EXTRA_LIB_DEPS = ["throwtheswitch/Unity(a)^2.5.2"] + EXTRA_LIB_DEPS = ["throwtheswitch/Unity(a)^2.6.0"] # Examples: # test/test_foo.cpp:44:test_function_foo:FAIL: Expected 32 Was 33 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio/util.py new/platformio-6.1.16/platformio/util.py --- old/platformio-6.1.15/platformio/util.py 2024-04-25 10:40:04.000000000 +0200 +++ new/platformio-6.1.16/platformio/util.py 2024-09-26 12:19:08.000000000 +0200 @@ -15,6 +15,7 @@ import datetime import functools import math +import os import platform import re import shutil @@ -136,6 +137,11 @@ def get_systype(): + # allow manual override, eg. for + # windows on arm64 systems with emulated x86 + if "PLATFORMIO_SYSTEM_TYPE" in os.environ: + return os.environ.get("PLATFORMIO_SYSTEM_TYPE") + system = platform.system().lower() arch = platform.machine().lower() if system == "windows": diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio.egg-info/PKG-INFO new/platformio-6.1.16/platformio.egg-info/PKG-INFO --- old/platformio-6.1.15/platformio.egg-info/PKG-INFO 2024-04-25 10:52:22.000000000 +0200 +++ new/platformio-6.1.16/platformio.egg-info/PKG-INFO 2024-09-26 12:32:31.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: platformio -Version: 6.1.15 +Version: 6.1.16 Summary: Your Gateway to Embedded Software Development Excellence. Unlock the true potential of embedded software development with PlatformIO's collaborative ecosystem, embracing declarative principles, test-driven methodologies, and modern toolchains for unrivaled success. Home-page: https://platformio.org Author: PlatformIO Labs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformio-6.1.15/platformio.egg-info/requires.txt new/platformio-6.1.16/platformio.egg-info/requires.txt --- old/platformio-6.1.15/platformio.egg-info/requires.txt 2024-04-25 10:52:22.000000000 +0200 +++ new/platformio-6.1.16/platformio.egg-info/requires.txt 2024-09-26 12:32:31.000000000 +0200 @@ -1,4 +1,3 @@ -bottle==0.12.* click<9,>=8.0.4 colorama marshmallow==3.* @@ -8,6 +7,13 @@ semantic_version==2.10.* tabulate==0.* ajsonrpc==1.2.* -starlette<0.38,>=0.19 -uvicorn<0.30,>=0.16 +starlette<0.40,>=0.19 wsproto==1.* + +[:python_version < "3.7"] +bottle==0.12.* +uvicorn==0.16.0 + +[:python_version >= "3.7"] +bottle==0.13.* +uvicorn<0.31,>=0.16

1 0

commit ccls for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ccls for openSUSE:Factory checked in at 2024-10-03 17:40:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ccls (Old) and /work/SRC/openSUSE:Factory/.ccls.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ccls" Thu Oct 3 17:40:12 2024 rev:20 rq:1205331 version:0.20240505 Changes: -------- --- /work/SRC/openSUSE:Factory/ccls/ccls.changes 2024-04-23 18:55:58.190239546 +0200 +++ /work/SRC/openSUSE:Factory/.ccls.new.19354/ccls.changes 2024-10-03 17:41:42.207543564 +0200 @@ -1,0 +2,6 @@ +Wed Oct 2 21:59:58 UTC 2024 - Aaron Puchert <aaronpuchert(a)alice-dsl.net> + +- Update to version 0.20240505. + * For LLVM 19. + +------------------------------------------------------------------- Old: ---- ccls-0.20240202.tar.gz New: ---- ccls-0.20240505.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccls.spec ++++++ --- /var/tmp/diff_new_pack.tWnSmF/_old 2024-10-03 17:41:42.675563069 +0200 +++ /var/tmp/diff_new_pack.tWnSmF/_new 2024-10-03 17:41:42.679563236 +0200 @@ -17,7 +17,7 @@ Name: ccls -Version: 0.20240202 +Version: 0.20240505 Release: 0 Summary: C/C++/ObjC language server # main package is Apache 2.0 ++++++ ccls-0.20240202.tar.gz -> ccls-0.20240505.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20240202/src/clang_tu.cc new/ccls-0.20240505/src/clang_tu.cc --- old/ccls-0.20240202/src/clang_tu.cc 2024-02-02 09:05:55.000000000 +0100 +++ new/ccls-0.20240505/src/clang_tu.cc 2024-05-06 02:49:30.000000000 +0200 @@ -337,8 +337,12 @@ return "queue_t"; case BuiltinType::OCLReserveID: return "reserve_id_t"; +#if LLVM_VERSION_MAJOR >= 19 // llvmorg-19-init-9465-g39adc8f42329 + case BuiltinType::ArraySection: +#else case BuiltinType::OMPArraySection: - return "<OpenMP array section type>"; +#endif + return "<array section type>"; default: return ""; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20240202/src/clang_tu.hh new/ccls-0.20240505/src/clang_tu.hh --- old/ccls-0.20240202/src/clang_tu.hh 2024-02-02 09:05:55.000000000 +0100 +++ new/ccls-0.20240505/src/clang_tu.hh 2024-05-06 02:49:30.000000000 +0200 @@ -21,6 +21,11 @@ #define isAsciiIdentifierContinue isIdentifierBody #endif +#if LLVM_VERSION_MAJOR >= 19 +#define startswith starts_with +#define endswith ends_with +#endif + namespace ccls { #if LLVM_VERSION_MAJOR < 19 std::string pathFromFileEntry(const clang::FileEntry &file); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20240202/src/indexer.cc new/ccls-0.20240505/src/indexer.cc --- old/ccls-0.20240202/src/indexer.cc 2024-02-02 09:05:55.000000000 +0100 +++ new/ccls-0.20240505/src/indexer.cc 2024-05-06 02:49:30.000000000 +0200 @@ -1126,7 +1126,10 @@ const FileEntry *file, #endif StringRef searchPath, StringRef relativePath, - const Module *imported, + const clang::Module *suggestedModule, +#if LLVM_VERSION_MAJOR >= 19 // llvmorg-19-init-1720-gda95d926f6fc + bool moduleImported, +#endif SrcMgr::CharacteristicKind fileType) override { #if LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2 const FileEntry *file = fileRef ? &fileRef->getFileEntry() : nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20240202/src/indexer.hh new/ccls-0.20240505/src/indexer.hh --- old/ccls-0.20240202/src/indexer.hh 2024-02-02 09:05:55.000000000 +0100 +++ new/ccls-0.20240505/src/indexer.hh 2024-05-06 02:49:30.000000000 +0200 @@ -18,6 +18,11 @@ #include <unordered_map> #include <vector> +#if LLVM_VERSION_MAJOR >= 19 +#define startswith starts_with +#define endswith ends_with +#endif + namespace std { template <> struct hash<clang::FileID> { std::size_t operator()(clang::FileID fid) const { return fid.getHashValue(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccls-0.20240202/src/sema_manager.cc new/ccls-0.20240505/src/sema_manager.cc --- old/ccls-0.20240202/src/sema_manager.cc 2024-02-02 09:05:55.000000000 +0100 +++ new/ccls-0.20240505/src/sema_manager.cc 2024-05-06 02:49:30.000000000 +0200 @@ -187,7 +187,10 @@ const FileEntry *file, #endif StringRef searchPath, StringRef relativePath, - const clang::Module *imported, + const clang::Module *suggestedModule, +#if LLVM_VERSION_MAJOR >= 19 // llvmorg-19-init-1720-gda95d926f6fc + bool moduleImported, +#endif SrcMgr::CharacteristicKind fileKind) override { (void)sm; #if LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2

1 0

commit modello for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package modello for openSUSE:Factory checked in at 2024-10-03 17:40:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modello (Old) and /work/SRC/openSUSE:Factory/.modello.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "modello" Thu Oct 3 17:40:07 2024 rev:20 rq:1205319 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/modello/modello-maven-plugin.changes 2024-06-06 12:33:20.578057997 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.19354/modello-maven-plugin.changes 2024-10-03 17:41:37.267337677 +0200 @@ -1,0 +2,11 @@ +Wed Oct 2 20:26:43 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Build against velocity-engine-core, since we can do it now without + introducing build cycles + +------------------------------------------------------------------- +Mon Jun 10 14:01:25 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Add dependency on jakarta-inject, needed by google-guice 6.0.0 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/modello/modello.changes 2024-06-11 18:28:09.166371246 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.19354/modello.changes 2024-10-03 17:41:37.287338511 +0200 @@ -1,0 +2,6 @@ +Wed Oct 2 20:26:43 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Build against velocity-engine-core, since we can do it now without + introducing build cycles + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modello-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.f5nM2H/_old 2024-10-03 17:41:39.239419865 +0200 +++ /var/tmp/diff_new_pack.f5nM2H/_new 2024-10-03 17:41:39.255420532 +0200 @@ -94,8 +94,6 @@ %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 modello-core -%pom_change_dep -r :velocity-engine-core :velocity - %pom_remove_dep :jackson-bom %build ++++++ modello.spec ++++++ --- /var/tmp/diff_new_pack.f5nM2H/_old 2024-10-03 17:41:39.511431202 +0200 +++ /var/tmp/diff_new_pack.f5nM2H/_new 2024-10-03 17:41:39.519431535 +0200 @@ -48,7 +48,7 @@ BuildRequires: slf4j BuildRequires: snakeyaml BuildRequires: unzip -BuildRequires: velocity +BuildRequires: velocity-engine-core Requires: aopalliance Requires: atinject Requires: google-guice @@ -67,7 +67,7 @@ Requires: sisu-plexus Requires: slf4j Requires: snakeyaml -Requires: velocity +Requires: velocity-engine-core BuildArch: noarch %description @@ -109,9 +109,6 @@ %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 modello-core -# This builds correctly with the older velocity 1.x and avoids build cycles -%pom_change_dep -r :velocity-engine-core :velocity - %pom_remove_dep :jackson-bom %build @@ -133,7 +130,7 @@ plexus/xml \ slf4j/api \ snakeyaml \ - velocity + velocity-engine/velocity-engine-core %{ant} \ -Dtest.skip=true \ @@ -166,7 +163,7 @@ %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:jakarta-inject:javadoc-parser:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true +%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:jakarta-inject:javadoc-parser:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity-engine/velocity-engine-core %{name} true %files -f .mfiles -f .mfiles-core %license LICENSE.txt LICENSE-2.0.txt

1 0

commit chromium for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2024-10-03 17:37:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium" Thu Oct 3 17:37:48 2024 rev:433 rq:1205161 version:129.0.6668.89 Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2024-09-25 21:57:28.526719124 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new.19354/chromium.changes 2024-10-03 17:41:15.838444610 +0200 @@ -1,0 +2,9 @@ +Wed Oct 2 10:54:17 CEST 2024 - ro(a)suse.de + +- Chromium 129.0.6668.89 (stable released 2024-09-24) + (boo#1231232) + * CVE-2024-7025: Integer overflow in Layout + * CVE-2024-9369: Insufficient data validation in Mojo + * CVE-2024-9370: Inappropriate implementation in V8 + +------------------------------------------------------------------- Old: ---- chromium-129.0.6668.70.tar.xz New: ---- chromium-129.0.6668.89.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.hn0PVU/_old 2024-10-03 17:41:34.539223980 +0200 +++ /var/tmp/diff_new_pack.hn0PVU/_new 2024-10-03 17:41:34.543224147 +0200 @@ -96,7 +96,7 @@ %define n_suffix %{nil} %endif Name: chromium%{n_suffix} -Version: 129.0.6668.70 +Version: 129.0.6668.89 Release: 0 Summary: Google's open source browser project License: BSD-3-Clause AND LGPL-2.1-or-later ++++++ chromium-129.0.6668.70.tar.xz -> chromium-129.0.6668.89.tar.xz ++++++ /work/SRC/openSUSE:Factory/chromium/chromium-129.0.6668.70.tar.xz /work/SRC/openSUSE:Factory/.chromium.new.19354/chromium-129.0.6668.89.tar.xz differ: char 15, line 1

1 0

commit qt6-quickeffectmaker for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-quickeffectmaker for openSUSE:Factory checked in at 2024-10-03 17:37:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-quickeffectmaker (Old) and /work/SRC/openSUSE:Factory/.qt6-quickeffectmaker.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-quickeffectmaker" Thu Oct 3 17:37:40 2024 rev:12 rq:1205140 version:6.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-quickeffectmaker/qt6-quickeffectmaker.changes 2024-06-24 20:53:38.713081876 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-quickeffectmaker.new.19354/qt6-quickeffectmaker.changes 2024-10-03 17:37:59.274237129 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:23:05 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +------------------------------------------------------------------- Old: ---- qtquickeffectmaker-everywhere-src-6.7.2.tar.xz New: ---- qtquickeffectmaker-everywhere-src-6.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-quickeffectmaker.spec ++++++ --- /var/tmp/diff_new_pack.GX9gWz/_old 2024-10-03 17:38:00.222276727 +0200 +++ /var/tmp/diff_new_pack.GX9gWz/_new 2024-10-03 17:38:00.226276894 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define tar_name qtquickeffectmaker-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-quickeffectmaker%{?pkg_suffix} -Version: 6.7.2 +Version: 6.7.3 Release: 0 Summary: Tool for creating shader effects for Qt Quick License: GPL-3.0-only ++++++ qtquickeffectmaker-everywhere-src-6.7.2.tar.xz -> qtquickeffectmaker-everywhere-src-6.7.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickeffectmaker-everywhere-src-6.7.2/.cmake.conf new/qtquickeffectmaker-everywhere-src-6.7.3/.cmake.conf --- old/qtquickeffectmaker-everywhere-src-6.7.2/.cmake.conf 2024-06-08 03:28:25.000000000 +0200 +++ new/qtquickeffectmaker-everywhere-src-6.7.3/.cmake.conf 2024-09-19 22:20:11.000000000 +0200 @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.7.2") +set(QT_REPO_MODULE_VERSION "6.7.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickeffectmaker-everywhere-src-6.7.2/.tag new/qtquickeffectmaker-everywhere-src-6.7.3/.tag --- old/qtquickeffectmaker-everywhere-src-6.7.2/.tag 2024-06-08 03:28:25.000000000 +0200 +++ new/qtquickeffectmaker-everywhere-src-6.7.3/.tag 2024-09-19 22:20:11.000000000 +0200 @@ -1 +1 @@ -c8222da4ff3e3da0ebee36bd344f76b127029d9e +830d21c264c631ddfb913e0f7852215533dfc94b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickeffectmaker-everywhere-src-6.7.2/dependencies.yaml new/qtquickeffectmaker-everywhere-src-6.7.3/dependencies.yaml --- old/qtquickeffectmaker-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 03:28:25.000000000 +0200 +++ new/qtquickeffectmaker-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 22:20:11.000000000 +0200 @@ -1,13 +1,13 @@ dependencies: ../qtbase: - ref: b5fbe0923cfc566036b83c3d968f225b26117efc + ref: 92b685784960eea6eb353688cf0edeb94d69c6cd required: true ../qtdeclarative: - ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc + ref: 34ffe0c15a9564fefcf01a738eb0bde370399959 required: true ../qtquick3d: - ref: 8209c3e400ba348590907a4b8bab6c5353237d1e + ref: b342cba39e702e35c2e670308dbfc9764ba6105e required: false ../qtshadertools: - ref: 1e141980f3f74d81e9a740273d61f445f9a58704 + ref: 0d1782b43e6262f8592bee5dbbe638d65c8e9dfd required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickeffectmaker-everywhere-src-6.7.2/licenseRule.json new/qtquickeffectmaker-everywhere-src-6.7.3/licenseRule.json --- old/qtquickeffectmaker-everywhere-src-6.7.2/licenseRule.json 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquickeffectmaker-everywhere-src-6.7.3/licenseRule.json 2024-09-19 22:20:11.000000000 +0200 @@ -0,0 +1,104 @@ +[ + { + "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"] + }, + "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"] + }, + "nodes/common/BlurHelper\\.qml" : { + "comment" : "these nodes give starting points to your shaders, which users can modify", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + }, + "tools/qqem/qml/about_effect/AboutEffect1\\.qml" : { + "comment" : "just shown to users in the Effect Maker", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + }, + "tools/qqem/qml/about_effect/AboutEffect1\\.qep" : { + "comment" : "used to create AboutEffect1.qml", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + } +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickeffectmaker-everywhere-src-6.7.2/src/doc/CMakeLists.txt new/qtquickeffectmaker-everywhere-src-6.7.3/src/doc/CMakeLists.txt --- old/qtquickeffectmaker-everywhere-src-6.7.2/src/doc/CMakeLists.txt 2024-06-08 03:28:25.000000000 +0200 +++ new/qtquickeffectmaker-everywhere-src-6.7.3/src/doc/CMakeLists.txt 2024-09-19 22:20:11.000000000 +0200 @@ -1,6 +1,4 @@ add_library(QtQuickEffectMakerDoc INTERFACE) -target_link_libraries(QtQuickEffectMakerDoc INTERFACE Qt::Core) - qt_internal_add_docs(QtQuickEffectMakerDoc qtquickeffectmaker.qdocconf ) Binary files old/qtquickeffectmaker-everywhere-src-6.7.2/tools/qqem/qml/images/background_dark.jpg and new/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/qml/images/background_dark.jpg differ Binary files old/qtquickeffectmaker-everywhere-src-6.7.2/tools/qqem/qml/images/background_light.jpg and new/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/qml/images/background_light.jpg differ

1 0

commit qt6-quick3dphysics for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-quick3dphysics for openSUSE:Factory checked in at 2024-10-03 17:37:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-quick3dphysics (Old) and /work/SRC/openSUSE:Factory/.qt6-quick3dphysics.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-quick3dphysics" Thu Oct 3 17:37:39 2024 rev:17 rq:1205138 version:6.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-quick3dphysics/qt6-quick3dphysics.changes 2024-06-24 20:53:36.184989378 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-quick3dphysics.new.19354/qt6-quick3dphysics.changes 2024-10-03 17:37:57.618167959 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:23:04 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +------------------------------------------------------------------- Old: ---- qtquick3dphysics-everywhere-src-6.7.2.tar.xz New: ---- qtquick3dphysics-everywhere-src-6.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-quick3dphysics.spec ++++++ --- /var/tmp/diff_new_pack.jn5AW5/_old 2024-10-03 17:37:58.230193522 +0200 +++ /var/tmp/diff_new_pack.jn5AW5/_new 2024-10-03 17:37:58.234193689 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define tar_name qtquick3dphysics-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-quick3dphysics%{?pkg_suffix} -Version: 6.7.2 +Version: 6.7.3 Release: 0 Summary: Qt 6 Quick3D Physics Extensions License: GPL-3.0-only ++++++ qtquick3dphysics-everywhere-src-6.7.2.tar.xz -> qtquick3dphysics-everywhere-src-6.7.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.2/.cmake.conf new/qtquick3dphysics-everywhere-src-6.7.3/.cmake.conf --- old/qtquick3dphysics-everywhere-src-6.7.2/.cmake.conf 2024-06-08 03:28:30.000000000 +0200 +++ new/qtquick3dphysics-everywhere-src-6.7.3/.cmake.conf 2024-09-19 22:20:09.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.2") +set(QT_REPO_MODULE_VERSION "6.7.3") 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/qtquick3dphysics-everywhere-src-6.7.2/.tag new/qtquick3dphysics-everywhere-src-6.7.3/.tag --- old/qtquick3dphysics-everywhere-src-6.7.2/.tag 2024-06-08 03:28:30.000000000 +0200 +++ new/qtquick3dphysics-everywhere-src-6.7.3/.tag 2024-09-19 22:20:09.000000000 +0200 @@ -1 +1 @@ -54a9bae884d3c8d5bc2bad1880aae8360e3e29e9 +cfd2a02307721a07506ab1a518b4e6b882ed3efe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.2/dependencies.yaml new/qtquick3dphysics-everywhere-src-6.7.3/dependencies.yaml --- old/qtquick3dphysics-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 03:28:30.000000000 +0200 +++ new/qtquick3dphysics-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 22:20:09.000000000 +0200 @@ -1,13 +1,13 @@ dependencies: ../qtbase: - ref: b5fbe0923cfc566036b83c3d968f225b26117efc + ref: 92b685784960eea6eb353688cf0edeb94d69c6cd required: true ../qtdeclarative: - ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc + ref: 34ffe0c15a9564fefcf01a738eb0bde370399959 required: true ../qtquick3d: - ref: 8209c3e400ba348590907a4b8bab6c5353237d1e + ref: b342cba39e702e35c2e670308dbfc9764ba6105e required: true ../qtshadertools: - ref: 1e141980f3f74d81e9a740273d61f445f9a58704 + ref: 0d1782b43e6262f8592bee5dbbe638d65c8e9dfd required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.2/src/helpers/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.3/src/helpers/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.2/src/helpers/CMakeLists.txt 2024-06-08 03:28:30.000000000 +0200 +++ new/qtquick3dphysics-everywhere-src-6.7.3/src/helpers/CMakeLists.txt 2024-09-19 22:20:09.000000000 +0200 @@ -19,6 +19,8 @@ PAST_MAJOR_VERSIONS 1 DEFINES QT_BUILD_QUICK3DPHYSICSHELPERS_LIB + DEPENDENCIES + QtQuick3D LIBRARIES Qt::Quick3DPhysics PUBLIC_LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.2/src/quick3dphysics/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.3/src/quick3dphysics/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.2/src/quick3dphysics/CMakeLists.txt 2024-06-08 03:28:30.000000000 +0200 +++ new/qtquick3dphysics-everywhere-src-6.7.3/src/quick3dphysics/CMakeLists.txt 2024-09-19 22:20:09.000000000 +0200 @@ -54,6 +54,8 @@ SYSTEM_INCLUDE_DIRECTORIES ../3rdparty/PhysX/include ../3rdparty/PhysX/pxshared/include + DEPENDENCIES + QtQuick3D LIBRARIES Qt::CorePrivate Qt::GuiPrivate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.2/tools/cooker/main.cpp new/qtquick3dphysics-everywhere-src-6.7.3/tools/cooker/main.cpp --- old/qtquick3dphysics-everywhere-src-6.7.2/tools/cooker/main.cpp 2024-06-08 03:28:30.000000000 +0200 +++ new/qtquick3dphysics-everywhere-src-6.7.3/tools/cooker/main.cpp 2024-09-19 22:20:09.000000000 +0200 @@ -9,6 +9,8 @@ #include <QtCore/QFile> #include <QtCore/QFileInfo> #include <QtGui/QImage> +#include <QCommandLineParser> +#include <QScopeGuard> #include "PxPhysicsAPI.h" #include "cooking/PxCooking.h" @@ -23,18 +25,15 @@ return mesh.isValid(); } -bool tryReadImage(const char *inputPath, QImage &image) +bool tryReadImage(const QString &inputPath, QImage &image) { image = QImage(inputPath); return image.format() != QImage::Format_Invalid; } -bool cookMeshes(const char *inputPath, QSSGMesh::Mesh &mesh) +bool cookMeshes(const QString &inputPath, QSSGMesh::Mesh &mesh, physx::PxCooking *cooking) { - physx::PxDefaultErrorCallback defaultErrorCallback; - physx::PxDefaultAllocator defaultAllocatorCallback; - auto foundation = PxCreateFoundation(PX_PHYSICS_VERSION, defaultAllocatorCallback, defaultErrorCallback); - auto cooking = PxCreateCooking(PX_PHYSICS_VERSION, *foundation, physx::PxCookingParams(physx::PxTolerancesScale())); + Q_ASSERT(cooking); const int vStride = mesh.vertexBuffer().stride; const int vCount = mesh.vertexBuffer().data.size() / vStride; @@ -66,7 +65,7 @@ physx::PxDefaultMemoryOutputStream buf; if (!cooking->cookTriangleMesh(triangleDesc, buf, &result)) { - std::cerr << "Could not cook triangle mesh."; + std::cerr << "Error: could not cook triangle mesh '" << inputPath.toStdString() << "'." << std::endl; return false; } @@ -78,14 +77,14 @@ auto outputFile = QFile(output); if (!outputFile.open(QIODevice::WriteOnly)) { - std::cerr << "Could not open " << output.toStdString() << "for writing."; + std::cerr << "Error: could not open '" << output.toStdString() << "' for writing." << std::endl; return false; } outputFile.write(reinterpret_cast<char *>(buf.getData()), buf.getSize()); outputFile.close(); - std::cout << "Success: wrote triangle mesh '" << output.toStdString() << "'" << std::endl; + std::cout << "Success: wrote triangle mesh '" << output.toStdString() << "'." << std::endl; } { // Convex mesh @@ -107,7 +106,7 @@ physx::PxDefaultMemoryOutputStream buf; if (!cooking->cookConvexMesh(convexDesc, buf, &result)) { - std::cerr << "Could not cook convex mesh."; + std::cerr << "Error: could not cook convex mesh '" << inputPath.toStdString() << "'." << std::endl; return false; } @@ -119,25 +118,22 @@ auto outputFile = QFile(output); if (!outputFile.open(QIODevice::WriteOnly)) { - std::cerr << "Could not open " << output.toStdString() << "for writing."; + std::cerr << "Error: could not open '" << output.toStdString() << "' for writing." << std::endl; return false; } outputFile.write(reinterpret_cast<char *>(buf.getData()), buf.getSize()); outputFile.close(); - std::cout << "Success: wrote convex mesh '" << output.toStdString() << "'" << std::endl; + std::cout << "Success: wrote convex mesh '" << output.toStdString() << "'." << std::endl; } return true; } -bool cookHeightfield(const char *inputPath, QImage &heightMap) +bool cookHeightfield(const QString &inputPath, QImage &heightMap, physx::PxCooking *cooking) { - physx::PxDefaultErrorCallback defaultErrorCallback; - physx::PxDefaultAllocator defaultAllocatorCallback; - auto foundation = PxCreateFoundation(PX_PHYSICS_VERSION, defaultAllocatorCallback, defaultErrorCallback); - auto cooking = PxCreateCooking(PX_PHYSICS_VERSION, *foundation, physx::PxCookingParams(physx::PxTolerancesScale())); + Q_ASSERT(cooking); int numRows = heightMap.height(); int numCols = heightMap.width(); @@ -159,7 +155,7 @@ physx::PxDefaultMemoryOutputStream buf; if (!(numRows && numCols && cooking->cookHeightField(hfDesc, buf))) { - std::cerr << "Could not create height field from " << inputPath << std::endl; + std::cerr << "Could not create height field from '" << inputPath.toStdString() << "'." << std::endl; return false; } @@ -167,7 +163,7 @@ auto outputFile = QFile(output); if (!outputFile.open(QIODevice::WriteOnly)) { - std::cerr << "Could not open " << output.toStdString() << "for writing."; + std::cerr << "Could not open '" << output.toStdString() << "' for writing." << std::endl; return false; } @@ -180,31 +176,55 @@ int main(int argc, char *argv[]) { - if (argc != 2) { - qDebug() << "Invalid number of arguments provided. Usage: cooker input.mesh"; - return -1; - } - - const char *inputPath = argv[1]; + QCoreApplication app(argc, argv); + QCoreApplication::setApplicationName("cooker"); + QCoreApplication::setApplicationVersion("6.5.7"); + + QCommandLineParser parser; + parser.setApplicationDescription( + "A commandline utility for pre-cooking meshes for use with the QtQuick3DPhysics module."); + parser.addHelpOption(); + parser.addVersionOption(); + parser.addPositionalArgument("input", + "The input file(s). Accepts either a .mesh created by QtQuick3D's balsam" + " or a Qt compatible image file. The output filename will be of the format" + " input.cooked.{cvx/tri/hf}. The filename suffixes .cvx, .tri, and .hf" + " mean it is a convex mesh, a triangle mesh or a heightfield."); + parser.process(app); + + const QStringList args = parser.positionalArguments(); + if (args.isEmpty()) + parser.showHelp(0); - QFile *file = new QFile(inputPath); - if (!file->open(QIODevice::ReadOnly)) { - delete file; - std::cerr << "Could not open input file '" << inputPath << "'" << std::endl; - return -1; - } - - QImage image; - QSSGMesh::Mesh mesh; - if (tryReadImage(inputPath, image)) { - if (!cookHeightfield(inputPath, image)) + physx::PxDefaultErrorCallback defaultErrorCallback; + physx::PxDefaultAllocator defaultAllocatorCallback; + auto foundation = PxCreateFoundation(PX_PHYSICS_VERSION, defaultAllocatorCallback, defaultErrorCallback); + auto cooking = PxCreateCooking(PX_PHYSICS_VERSION, *foundation, physx::PxCookingParams(physx::PxTolerancesScale())); + auto cleanup = qScopeGuard([&] { + cooking->release(); + foundation->release(); + }); + + for (const QString &inputPath : args) { + QFile *file = new QFile(inputPath); + if (!file->open(QIODevice::ReadOnly)) { + delete file; + std::cerr << "Error: could not open input file '" << inputPath.toStdString() << "'" << std::endl; return -1; - } else if (tryReadMesh(file, mesh)) { - if (!cookMeshes(inputPath, mesh)) + } + + QImage image; + QSSGMesh::Mesh mesh; + if (tryReadImage(inputPath, image)) { + if (!cookHeightfield(inputPath, image, cooking)) + return -1; + } else if (tryReadMesh(file, mesh)) { + if (!cookMeshes(inputPath, mesh, cooking)) + return -1; + } else { + std::cerr << "Error: failed to read mesh or image from file '" << inputPath.toStdString() << "'" << std::endl; return -1; - } else { - std::cerr << "Failed to read mesh or image from file '" << inputPath << "'" << std::endl; - return -1; + } } return 0;

1 0

commit qt6-opcua for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-opcua for openSUSE:Factory checked in at 2024-10-03 17:37:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-opcua (Old) and /work/SRC/openSUSE:Factory/.qt6-opcua.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-opcua" Thu Oct 3 17:37:38 2024 rev:30 rq:1205135 version:6.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-opcua/qt6-opcua.changes 2024-06-24 20:53:34.744936689 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-opcua.new.19354/qt6-opcua.changes 2024-10-03 17:37:56.302112990 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:23:02 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +------------------------------------------------------------------- Old: ---- qtopcua-everywhere-src-6.7.2.tar.xz New: ---- qtopcua-everywhere-src-6.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-opcua.spec ++++++ --- /var/tmp/diff_new_pack.hU9abY/_old 2024-10-03 17:37:57.026143231 +0200 +++ /var/tmp/diff_new_pack.hU9abY/_new 2024-10-03 17:37:57.030143398 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define tar_name qtopcua-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-opcua%{?pkg_suffix} -Version: 6.7.2 +Version: 6.7.3 Release: 0 Summary: Qt wrapper for existing OPC UA stacks # src/plugins/opcua is GPL-3.0-or-later, rest is dual licensed ++++++ _service ++++++ --- /var/tmp/diff_new_pack.hU9abY/_old 2024-10-03 17:37:57.070145069 +0200 +++ /var/tmp/diff_new_pack.hU9abY/_new 2024-10-03 17:37:57.078145403 +0200 @@ -1,9 +1,9 @@ <services> <service name="tar_scm" mode="disabled"> <param name="changesgenerate">disable</param> - <param name="version">6.7.2</param> + <param name="version">6.7.3</param> <param name="url">git://code.qt.io/qt/qtopcua.git</param> - <param name="revision">v6.7.2</param> + <param name="revision">v6.7.3</param> <param name="scm">git</param> <param name="filename">qtopcua-everywhere-src</param> </service> ++++++ qtopcua-everywhere-src-6.7.2.tar.xz -> qtopcua-everywhere-src-6.7.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.7.2/.cmake.conf new/qtopcua-everywhere-src-6.7.3/.cmake.conf --- old/qtopcua-everywhere-src-6.7.2/.cmake.conf 2024-06-08 01:54:52.000000000 +0200 +++ new/qtopcua-everywhere-src-6.7.3/.cmake.conf 2024-09-19 20:59:29.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.2") +set(QT_REPO_MODULE_VERSION "6.7.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.7.2/dependencies.yaml new/qtopcua-everywhere-src-6.7.3/dependencies.yaml --- old/qtopcua-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 01:54:52.000000000 +0200 +++ new/qtopcua-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 20:59:29.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: b5fbe0923cfc566036b83c3d968f225b26117efc + ref: 92b685784960eea6eb353688cf0edeb94d69c6cd required: true ../qtdeclarative: - ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc + ref: 34ffe0c15a9564fefcf01a738eb0bde370399959 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.7.2/src/opcua/x509/openssl_symbols.cpp new/qtopcua-everywhere-src-6.7.3/src/opcua/x509/openssl_symbols.cpp --- old/qtopcua-everywhere-src-6.7.2/src/opcua/x509/openssl_symbols.cpp 2024-06-08 01:54:52.000000000 +0200 +++ new/qtopcua-everywhere-src-6.7.3/src/opcua/x509/openssl_symbols.cpp 2024-09-19 20:59:29.000000000 +0200 @@ -593,11 +593,15 @@ { LoadedOpenSsl result; -#ifdef Q_PROCESSOR_X86_64 +#if defined(Q_PROCESSOR_X86_64) #define QT_SSL_SUFFIX "-x64" -#else // !Q_PROCESSOFR_X86_64 +#elif defined(Q_PROCESSOR_ARM_64) +#define QT_SSL_SUFFIX "-arm64" +#elif defined(Q_PROCESSOR_ARM_32) +#define QT_SSL_SUFFIX "-arm" +#else #define QT_SSL_SUFFIX -#endif // !Q_PROCESSOR_x86_64 +#endif tryToLoadOpenSslWin32Library(QLatin1String("libssl-3" QT_SSL_SUFFIX), QLatin1String("libcrypto-3" QT_SSL_SUFFIX), result); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.7.2/src/plugins/opcua/open62541/qopen62541backend.cpp new/qtopcua-everywhere-src-6.7.3/src/plugins/opcua/open62541/qopen62541backend.cpp --- old/qtopcua-everywhere-src-6.7.2/src/plugins/opcua/open62541/qopen62541backend.cpp 2024-06-08 01:54:52.000000000 +0200 +++ new/qtopcua-everywhere-src-6.7.3/src/plugins/opcua/open62541/qopen62541backend.cpp 2024-09-19 20:59:29.000000000 +0200 @@ -477,12 +477,10 @@ void Open62541AsyncBackend::findServers(const QUrl &url, const QStringList &localeIds, const QStringList &serverUris) { - UA_Client *tmpClient = UA_Client_new(); - auto conf = UA_Client_getConfig(tmpClient); - - conf->logger = m_open62541Logger; - - UA_ClientConfig_setDefault(UA_Client_getConfig(tmpClient)); + UA_ClientConfig initialConfig {}; + initialConfig.logger = m_open62541Logger; + UA_ClientConfig_setDefault(&initialConfig); + UA_Client *tmpClient = UA_Client_newWithConfig(&initialConfig); UaDeleter<UA_Client> clientDeleter(tmpClient, UA_Client_delete); @@ -1008,10 +1006,11 @@ emit stateAndOrErrorChanged(QOpcUaClient::Connecting, QOpcUaClient::NoError); - m_uaclient = UA_Client_new(); - auto conf = UA_Client_getConfig(m_uaclient); + UA_ClientConfig initialConfig {}; + initialConfig.logger = m_open62541Logger; + m_uaclient = UA_Client_newWithConfig(&initialConfig); - conf->logger = m_open62541Logger; + auto conf = UA_Client_getConfig(m_uaclient); const auto identity = m_clientImpl->m_client->applicationIdentity(); const auto authInfo = m_clientImpl->m_client->authenticationInformation(); @@ -1196,12 +1195,10 @@ void Open62541AsyncBackend::requestEndpoints(const QUrl &url) { - UA_Client *tmpClient = UA_Client_new(); - auto conf = UA_Client_getConfig(tmpClient); - - conf->logger = m_open62541Logger; - - UA_ClientConfig_setDefault(conf); + UA_ClientConfig initialConfig {}; + initialConfig.logger = m_open62541Logger; + UA_ClientConfig_setDefault(&initialConfig); + UA_Client *tmpClient = UA_Client_newWithConfig(&initialConfig); size_t numEndpoints = 0; UA_EndpointDescription *endpoints = nullptr;

1 0

commit qt6-lottie for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-lottie for openSUSE:Factory checked in at 2024-10-03 17:37:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-lottie (Old) and /work/SRC/openSUSE:Factory/.qt6-lottie.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-lottie" Thu Oct 3 17:37:34 2024 rev:29 rq:1205131 version:6.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-lottie/qt6-lottie.changes 2024-06-24 20:53:29.972762083 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-lottie.new.19354/qt6-lottie.changes 2024-10-03 17:37:54.562040311 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:23:00 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +------------------------------------------------------------------- Old: ---- qtlottie-everywhere-src-6.7.2.tar.xz New: ---- qtlottie-everywhere-src-6.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-lottie.spec ++++++ --- /var/tmp/diff_new_pack.u3vwvJ/_old 2024-10-03 17:37:55.190066542 +0200 +++ /var/tmp/diff_new_pack.u3vwvJ/_new 2024-10-03 17:37:55.190066542 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define short_name qtlottie %define tar_name qtlottie-everywhere-src @@ -28,7 +28,7 @@ %endif # Name: qt6-lottie%{?pkg_suffix} -Version: 6.7.2 +Version: 6.7.3 Release: 0 Summary: QML API for rendering graphics and animation # LICENSE.GPL3-EXCEPT only applies to the conan recipe which is not used ++++++ qtlottie-everywhere-src-6.7.2.tar.xz -> qtlottie-everywhere-src-6.7.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.7.2/.cmake.conf new/qtlottie-everywhere-src-6.7.3/.cmake.conf --- old/qtlottie-everywhere-src-6.7.2/.cmake.conf 2024-06-08 01:54:28.000000000 +0200 +++ new/qtlottie-everywhere-src-6.7.3/.cmake.conf 2024-09-19 20:59:02.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.2") +set(QT_REPO_MODULE_VERSION "6.7.3") 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/qtlottie-everywhere-src-6.7.2/.tag new/qtlottie-everywhere-src-6.7.3/.tag --- old/qtlottie-everywhere-src-6.7.2/.tag 2024-06-08 01:54:28.000000000 +0200 +++ new/qtlottie-everywhere-src-6.7.3/.tag 2024-09-19 20:59:02.000000000 +0200 @@ -1 +1 @@ -1a3e3bc3cdb7ddb1d69bd087e41f53b8401d8a21 +8bffbb35312cd855804019de5d2d964b6f793a86 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.7.2/dependencies.yaml new/qtlottie-everywhere-src-6.7.3/dependencies.yaml --- old/qtlottie-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 01:54:28.000000000 +0200 +++ new/qtlottie-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 20:59:02.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: b5fbe0923cfc566036b83c3d968f225b26117efc + ref: 92b685784960eea6eb353688cf0edeb94d69c6cd required: true ../qtdeclarative: - ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc + ref: 34ffe0c15a9564fefcf01a738eb0bde370399959 required: true

1 0

commit qt6-location for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-location for openSUSE:Factory checked in at 2024-10-03 17:37:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-location (Old) and /work/SRC/openSUSE:Factory/.qt6-location.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-location" Thu Oct 3 17:37:33 2024 rev:14 rq:1205129 version:6.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-location/qt6-location.changes 2024-06-24 20:53:27.920687001 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-location.new.19354/qt6-location.changes 2024-10-03 17:37:53.141980998 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:22:59 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +------------------------------------------------------------------- Old: ---- qtlocation-everywhere-src-6.7.2.tar.xz New: ---- qtlocation-everywhere-src-6.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-location.spec ++++++ --- /var/tmp/diff_new_pack.NMVD0f/_old 2024-10-03 17:37:53.718005057 +0200 +++ /var/tmp/diff_new_pack.NMVD0f/_new 2024-10-03 17:37:53.718005057 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define tar_name qtlocation-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-location%{?pkg_suffix} -Version: 6.7.2 +Version: 6.7.3 Release: 0 Summary: Qt 6 Location plugins and libraries License: GPL-3.0-or-later ++++++ qtlocation-everywhere-src-6.7.2.tar.xz -> qtlocation-everywhere-src-6.7.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.7.2/.cmake.conf new/qtlocation-everywhere-src-6.7.3/.cmake.conf --- old/qtlocation-everywhere-src-6.7.2/.cmake.conf 2024-06-08 02:48:22.000000000 +0200 +++ new/qtlocation-everywhere-src-6.7.3/.cmake.conf 2024-09-19 21:33:22.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.2") +set(QT_REPO_MODULE_VERSION "6.7.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.7.2/.tag new/qtlocation-everywhere-src-6.7.3/.tag --- old/qtlocation-everywhere-src-6.7.2/.tag 2024-06-08 02:48:22.000000000 +0200 +++ new/qtlocation-everywhere-src-6.7.3/.tag 2024-09-19 21:33:22.000000000 +0200 @@ -1 +1 @@ -04654948d3e539acb0983bdc211e565790e135d0 +82bf7f73b711a0800dfb9ce62fc8791b189dac52 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.7.2/dependencies.yaml new/qtlocation-everywhere-src-6.7.3/dependencies.yaml --- old/qtlocation-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 02:48:22.000000000 +0200 +++ new/qtlocation-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 21:33:22.000000000 +0200 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: b5fbe0923cfc566036b83c3d968f225b26117efc + ref: 92b685784960eea6eb353688cf0edeb94d69c6cd required: true ../qtdeclarative: - ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc + ref: 34ffe0c15a9564fefcf01a738eb0bde370399959 required: true ../qtpositioning: - ref: e7b33b314ff6a2ef2f9d808a0a69945dc697152f + ref: 415babffd1cfcfec64a5e9a15c896d476c9331b6 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.7.2/src/location/doc/src/plugins/osm.qdoc new/qtlocation-everywhere-src-6.7.3/src/location/doc/src/plugins/osm.qdoc --- old/qtlocation-everywhere-src-6.7.2/src/location/doc/src/plugins/osm.qdoc 2024-06-08 02:48:22.000000000 +0200 +++ new/qtlocation-everywhere-src-6.7.3/src/location/doc/src/plugins/osm.qdoc 2024-09-19 21:33:22.000000000 +0200 @@ -233,9 +233,9 @@ \li Url string set when making network requests to the routing server. This parameter should be set to a valid server url with the correct OSRM API. If not specified the default - \l {http://router.project-osrm.org/route/v1/driving/}{url} will be used. + \l {https://project-osrm.org/docs/v5.24.0/api/#}{url} will be used. \note The API documentation and sources are available at - \l {http://project-osrm.org/}{Project OSRM}. + \l {https://project-osrm.org/}{Project OSRM}. \row \li osm.useragent

1 0

commit qt6-grpc for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-grpc for openSUSE:Factory checked in at 2024-10-03 17:37:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-grpc (Old) and /work/SRC/openSUSE:Factory/.qt6-grpc.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-grpc" Thu Oct 3 17:37:31 2024 rev:14 rq:1205125 version:6.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-grpc/qt6-grpc.changes 2024-07-02 18:17:11.161035696 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-grpc.new.19354/qt6-grpc.changes 2024-10-03 17:37:50.821884093 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:22:57 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +------------------------------------------------------------------- Old: ---- qtgrpc-everywhere-src-6.7.2.tar.xz New: ---- qtgrpc-everywhere-src-6.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-grpc.spec ++++++ --- /var/tmp/diff_new_pack.24lYfN/_old 2024-10-03 17:37:51.477911494 +0200 +++ /var/tmp/diff_new_pack.24lYfN/_new 2024-10-03 17:37:51.481911661 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define short_name qtgrpc %define tar_name qtgrpc-everywhere-src @@ -28,7 +28,7 @@ %endif Name: qt6-grpc%{?pkg_suffix} -Version: 6.7.2 +Version: 6.7.3 Release: 0 Summary: gRPC and Protobuf generator and bindings for Qt framework License: GPL-3.0-or-later ++++++ qtgrpc-everywhere-src-6.7.2.tar.xz -> qtgrpc-everywhere-src-6.7.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/.cmake.conf new/qtgrpc-everywhere-src-6.7.3/.cmake.conf --- old/qtgrpc-everywhere-src-6.7.2/.cmake.conf 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/.cmake.conf 2024-09-19 20:58:41.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.2") +set(QT_REPO_MODULE_VERSION "6.7.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/.tag new/qtgrpc-everywhere-src-6.7.3/.tag --- old/qtgrpc-everywhere-src-6.7.2/.tag 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/.tag 2024-09-19 20:58:41.000000000 +0200 @@ -1 +1 @@ -2d93de389eb25c14267c45df031951a4e9eefbfb +8b7193ab0d86e090d43422056d0864c4e5bece70 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/dependencies.yaml new/qtgrpc-everywhere-src-6.7.3/dependencies.yaml --- old/qtgrpc-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 20:58:41.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: b5fbe0923cfc566036b83c3d968f225b26117efc + ref: 92b685784960eea6eb353688cf0edeb94d69c6cd required: true ../qtdeclarative: - ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc + ref: 34ffe0c15a9564fefcf01a738eb0bde370399959 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/src/grpc/qgrpchttp2channel.cpp new/qtgrpc-everywhere-src-6.7.3/src/grpc/qgrpchttp2channel.cpp --- old/qtgrpc-everywhere-src-6.7.2/src/grpc/qgrpchttp2channel.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/src/grpc/qgrpchttp2channel.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -15,6 +15,7 @@ #include <QtCore/qlist.h> #include <QtCore/qqueue.h> #include <QtNetwork/private/hpack_p.h> +#include <QtNetwork/private/http2protocol_p.h> #include <QtNetwork/private/qhttp2connection_p.h> #include <QtNetwork/qlocalsocket.h> #include <QtNetwork/qtcpsocket.h> @@ -68,8 +69,44 @@ constexpr QByteArrayView GrpcStatusHeader("grpc-status"); constexpr QByteArrayView GrpcStatusMessageHeader("grpc-message"); constexpr qsizetype GrpcMessageSizeHeaderSize = 5; + +// This HTTP/2 Error Codes to QGrpcStatus::StatusCode mapping should be kept in sync +// with the following docs: +// https://www.rfc-editor.org/rfc/rfc7540#section-7 +// https://github.com/grpc/grpc/blob/master/doc/statuscodes.md +// https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md +constexpr QGrpcStatus::StatusCode http2ErrorToStatusCode(const quint32 http2Error) +{ + using StatusCode = QGrpcStatus::StatusCode; + using Http2Error = Http2::Http2Error; + switch (http2Error) { + case Http2Error::HTTP2_NO_ERROR: + case Http2Error::PROTOCOL_ERROR: + case Http2Error::INTERNAL_ERROR: + case Http2Error::FLOW_CONTROL_ERROR: + case Http2Error::SETTINGS_TIMEOUT: + case Http2Error::STREAM_CLOSED: + case Http2Error::FRAME_SIZE_ERROR: + return StatusCode::Internal; + case Http2Error::REFUSE_STREAM: + return StatusCode::Unavailable; + case Http2Error::CANCEL: + return StatusCode::Cancelled; + case Http2Error::COMPRESSION_ERROR: + case Http2Error::CONNECT_ERROR: + return StatusCode::Internal; + case Http2Error::ENHANCE_YOUR_CALM: + return StatusCode::ResourceExhausted; + case Http2Error::INADEQUATE_SECURITY: + return StatusCode::PermissionDenied; + case Http2Error::HTTP_1_1_REQUIRED: + return StatusCode::Unknown; + } + return StatusCode::Internal; } +} // namespace + class QGrpcSocketHandler; struct QGrpcHttp2ChannelPrivate : public QObject @@ -176,10 +213,6 @@ return typedSocket; } - // This QNetworkReply::NetworkError -> QGrpcStatus::StatusCode mapping should be kept in sync - // with original https://github.com/grpc/grpc/blob/master/doc/statuscodes.md - static std::unordered_map<quint32, QGrpcStatus::StatusCode> StatusCodeMap; - QGrpcChannelOptions m_channelOptions; std::unique_ptr<QIODevice> m_socket = nullptr; QHttp2Connection *m_connection = nullptr; @@ -288,50 +321,9 @@ processQueue(); } -std::unordered_map<quint32, QGrpcStatus::StatusCode> QGrpcHttp2ChannelPrivate::StatusCodeMap; - QGrpcHttp2ChannelPrivate::QGrpcHttp2ChannelPrivate(const QGrpcChannelOptions &options) : m_channelOptions(options) { - [[maybe_unused]] static bool statusCodeMapInitialized = []() -> bool { - QGrpcHttp2ChannelPrivate::StatusCodeMap = { - { QNetworkReply::ConnectionRefusedError, QGrpcStatus::Unavailable }, - { QNetworkReply::RemoteHostClosedError, QGrpcStatus::Unavailable }, - { QNetworkReply::HostNotFoundError, QGrpcStatus::Unavailable }, - { QNetworkReply::TimeoutError, QGrpcStatus::DeadlineExceeded }, - { QNetworkReply::OperationCanceledError, QGrpcStatus::Unavailable }, - { QNetworkReply::SslHandshakeFailedError, QGrpcStatus::PermissionDenied }, - { QNetworkReply::TemporaryNetworkFailureError, QGrpcStatus::Unknown }, - { QNetworkReply::NetworkSessionFailedError, QGrpcStatus::Unavailable }, - { QNetworkReply::BackgroundRequestNotAllowedError, QGrpcStatus::Unknown }, - { QNetworkReply::TooManyRedirectsError, QGrpcStatus::Unavailable }, - { QNetworkReply::InsecureRedirectError, QGrpcStatus::PermissionDenied }, - { QNetworkReply::UnknownNetworkError, QGrpcStatus::Unknown }, - { QNetworkReply::ProxyConnectionRefusedError, QGrpcStatus::Unavailable }, - { QNetworkReply::ProxyConnectionClosedError, QGrpcStatus::Unavailable }, - { QNetworkReply::ProxyNotFoundError, QGrpcStatus::Unavailable }, - { QNetworkReply::ProxyTimeoutError, QGrpcStatus::DeadlineExceeded }, - { QNetworkReply::ProxyAuthenticationRequiredError, QGrpcStatus::Unauthenticated }, - { QNetworkReply::UnknownProxyError, QGrpcStatus::Unknown }, - { QNetworkReply::ContentAccessDenied, QGrpcStatus::PermissionDenied }, - { QNetworkReply::ContentOperationNotPermittedError, QGrpcStatus::PermissionDenied }, - { QNetworkReply::ContentNotFoundError, QGrpcStatus::NotFound }, - { QNetworkReply::AuthenticationRequiredError, QGrpcStatus::PermissionDenied }, - { QNetworkReply::ContentReSendError, QGrpcStatus::DataLoss }, - { QNetworkReply::ContentConflictError, QGrpcStatus::InvalidArgument }, - { QNetworkReply::ContentGoneError, QGrpcStatus::DataLoss }, - { QNetworkReply::UnknownContentError, QGrpcStatus::Unknown }, - { QNetworkReply::ProtocolUnknownError, QGrpcStatus::Unknown }, - { QNetworkReply::ProtocolInvalidOperationError, QGrpcStatus::Unimplemented }, - { QNetworkReply::ProtocolFailure, QGrpcStatus::Unknown }, - { QNetworkReply::InternalServerError, QGrpcStatus::Internal }, - { QNetworkReply::OperationNotImplementedError, QGrpcStatus::Unimplemented }, - { QNetworkReply::ServiceUnavailableError, QGrpcStatus::Unavailable }, - { QNetworkReply::UnknownServerError, QGrpcStatus::Unknown } - }; - return true; - }(); - QUrl url = m_channelOptions.host(); if (url.scheme() == "unix"_L1) { auto *localSocket = initSocket<QLocalSocket>(); @@ -358,8 +350,17 @@ url.setPort(443); } - if (options.sslConfiguration()) - sslSocket->setSslConfiguration(options.sslConfiguration().value()); + if (const auto userSslConfig = options.sslConfiguration(); userSslConfig) { + sslSocket->setSslConfiguration(*userSslConfig); + } else { + static const QByteArray h2NexProtocol = "h2"_ba; + auto defautlSslConfig = QSslConfiguration::defaultConfiguration(); + auto allowedNextProtocols = defautlSslConfig.allowedNextProtocols(); + if (!allowedNextProtocols.contains(h2NexProtocol)) + allowedNextProtocols.append(h2NexProtocol); + defautlSslConfig.setAllowedNextProtocols(allowedNextProtocols); + sslSocket->setSslConfiguration(defautlSslConfig); + } QObject::connect(sslSocket, &QSslSocket::encrypted, this, &QGrpcHttp2ChannelPrivate::createHttp2Connection); @@ -524,16 +525,14 @@ }); QObject::connect(handler->stream.get(), &QHttp2Stream::errorOccurred, channelOpPtr, - [this, channelOpPtr, handler](quint32 errorCode, const QString &errorString) { + [this, channelOpPtr, handler](quint32 http2ErrorCode, const QString &errorString) { deleteHandler(handler); - if (errorCode == 0) { + // Check for HTTP2_NO_ERROR to avoid invalid error emission. + // This is fixed in Qt6.8 + if (http2ErrorCode == 0) { return; } - QGrpcStatus::StatusCode code = QGrpcStatus::Unknown; - const auto it = StatusCodeMap.find(errorCode); - if (it != StatusCodeMap.end()) { - code = it->second; - } + QGrpcStatus::StatusCode code = http2ErrorToStatusCode(http2ErrorCode); emit channelOpPtr->errorOccurred({ code, errorString }); }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/src/grpcquick/qqmlabstractgrpcchannel.h new/qtgrpc-everywhere-src-6.7.3/src/grpcquick/qqmlabstractgrpcchannel.h --- old/qtgrpc-everywhere-src-6.7.2/src/grpcquick/qqmlabstractgrpcchannel.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/src/grpcquick/qqmlabstractgrpcchannel.h 2024-09-19 20:58:41.000000000 +0200 @@ -4,10 +4,11 @@ #ifndef QQMLABSTRACTGRPCCHANNEL_H #define QQMLABSTRACTGRPCCHANNEL_H -#include <QtCore/qobject.h> #include <QtGrpc/qabstractgrpcchannel.h> #include <QtGrpcQuick/qtgrpcquickexports.h> +#include <QtCore/qobject.h> + #include <memory> QT_BEGIN_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/src/grpcquick/qqmlgrpchttp2channel.cpp new/qtgrpc-everywhere-src-6.7.3/src/grpcquick/qqmlgrpchttp2channel.cpp --- old/qtgrpc-everywhere-src-6.7.2/src/grpcquick/qqmlgrpchttp2channel.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/src/grpcquick/qqmlgrpchttp2channel.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -5,6 +5,8 @@ #include <QtGrpc/qabstractgrpcclient.h> #include <QtGrpc/qgrpchttp2channel.h> +#include <QtCore/qdebug.h> + QT_BEGIN_NAMESPACE QQmlGrpcHttp2Channel::QQmlGrpcHttp2Channel(QObject *parent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/src/protobuf/doc/src/qt_add_protobuf.qdoc new/qtgrpc-everywhere-src-6.7.3/src/protobuf/doc/src/qt_add_protobuf.qdoc --- old/qtgrpc-everywhere-src-6.7.2/src/protobuf/doc/src/qt_add_protobuf.qdoc 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/src/protobuf/doc/src/qt_add_protobuf.qdoc 2024-09-19 20:58:41.000000000 +0200 @@ -6,7 +6,7 @@ \ingroup cmake-commands-qtprotobuf \title qt_add_protobuf -\target qt6_add_protobuf +\keyword qt6_add_protobuf \summary {Generates Qt-based C++ source code using a protobuf schema} \preliminarycmakecommand \cmakecommandsince 6.5 @@ -39,8 +39,7 @@ \include qtprotoccommon-options.qdocinc 0 \li \c QML enables QProtobufMessage types in QML context by registering them as a QML module. - Protobuf types can extend an existing QML module. - See code examples: + Protobuf types can extend an existing QML module: \badcode qt_add_qml_module(targetname ... @@ -52,6 +51,11 @@ ) \endcode + If \c qt_add_protobuf is called with a non-existing target + or the target is not a QML module, a new QML module will be created + implicitly. In case of the new QML module creation, the + \l {qt_add_qml_module} command is called inside the + \c qt_add_protobuf command. \badcode qt_add_executable(targetname ... @@ -62,12 +66,11 @@ ... ) \endcode - If \c qt_add_protobuf is called with a non-existing target - or the target is not a QML module, a new QML module will be created - implicitly. In case of the new QML module creation, the - \l {qt_add_qml_module} command is called inside the - \c qt_add_protobuf command. - See code example: + Every QML module has to define a \c URI name. Other QML modules may + use this name in \l{qtqml-syntax-imports.html}{import statements} + to import the module into a user application. Use the \c QML_URI + option to set the \c URI name. It has to be specified in dotted + notation, e.g. \c {Qt.Protobuf.Package}. \badcode qt_add_executable(targetname ... @@ -78,11 +81,6 @@ QML_URI proto.uri.example ) \endcode - Every QML module has to define a \c URI name. Other QML modules may - use this name in \l{qtqml-syntax-imports.html}{import statements} - to import the module into a user application. Use the \c QML_URI - option to set the \c URI name. It has to be specified in dotted - notation, e.g. \c {Qt.Protobuf.Package}. If \c QML_URI is omitted, then the protobuf package name will be used as the module \c URI. \note If \c QML_URI is passed to \c qt_add_protobuf command @@ -109,6 +107,7 @@ The project may have two or more \c .proto files with dependencies: \badcode +// test_messages.proto syntax = "proto3"; package test.messages; @@ -119,6 +118,7 @@ \endcode \badcode +// test_extensions.proto syntax = "proto3"; import "test_messages.proto"; @@ -153,10 +153,12 @@ target_link_libraries(test_extensions PUBLIC test_messages) \endcode -\note It's recommended to use the \c PUBLIC linking scope, since messages from -\c test_messages target are referenced in header files that belong to -the \c test_extensions target, so targets that link to \c test_extensions should -have the \c test_messages target as a transitive dependency. +\note Messages from \c test_messages target are used in header files that belong +to the \c test_extensions target, so targets that link to \c test_extensions +should have the \c test_messages target as a transitive dependency. It's +recommended to use the \c PUBLIC linking scope, to have the proper +\c INTERFACE_INCLUDE_DIRECTORIES and \c INTERFACE_LINK_LIBRARIES properties for +protobuf library targets. \section1 Example diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/src/protobuf/qprotobufjsonserializer.cpp new/qtgrpc-everywhere-src-6.7.3/src/protobuf/qprotobufjsonserializer.cpp --- old/qtgrpc-everywhere-src-6.7.2/src/protobuf/qprotobufjsonserializer.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/src/protobuf/qprotobufjsonserializer.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -34,20 +34,6 @@ \l {The qtprotobufgen Tool} {qtprotobufgen} directly. */ - -/*! - \fn QAbstractProtobufSerializer::DeserializationError QProtobufJsonSerializer::deserializationError() const - - Returns the last deserialization error. -*/ - -/*! - \fn QString QProtobufJsonSerializer::deserializationErrorString() const - - Returns a human-readable string describing the last deserialization error. - If there was no error, an empty string is returned. -*/ - using namespace Qt::StringLiterals; using namespace QtProtobufPrivate; @@ -600,12 +586,20 @@ QProtobufJsonSerializer::~QProtobufJsonSerializer() = default; +/*! + Returns the last deserialization error for the serializer instance. + \sa deserializationErrorString() +*/ QAbstractProtobufSerializer::DeserializationError QProtobufJsonSerializer::deserializationError() const { return d_ptr->deserializationError; } +/*! + Returns the last deserialization error string for the serializer instance. + \sa deserializationError() +*/ QString QProtobufJsonSerializer::deserializationErrorString() const { return d_ptr->deserializationErrorString; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/src/protobuf/qprotobufserializer.cpp new/qtgrpc-everywhere-src-6.7.3/src/protobuf/qprotobufserializer.cpp --- old/qtgrpc-everywhere-src-6.7.2/src/protobuf/qprotobufserializer.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/src/protobuf/qprotobufserializer.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -80,19 +80,6 @@ \l {The qtprotobufgen Tool} {qtprotobufgen} directly. */ -/*! - \fn QProtobufSerializer::DeserializationError QProtobufSerializer::deserializationError() const - - Returns the last deserialization error. -*/ - -/*! - \fn QString QProtobufSerializer::deserializationErrorString() const - - Returns a human-readable string describing the last deserialization error. - If there was no error, an empty string is returned. -*/ - using namespace Qt::StringLiterals; using namespace QtProtobufPrivate; @@ -772,11 +759,19 @@ return it == last; } +/*! + Returns the last deserialization error for the serializer instance. + \sa deserializationErrorString() +*/ QAbstractProtobufSerializer::DeserializationError QProtobufSerializer::deserializationError() const { return d_ptr->deserializationError; } +/*! + Returns the last deserialization error string for the serializer instance. + \sa deserializationError() +*/ QString QProtobufSerializer::deserializationErrorString() const { return d_ptr->deserializationErrorString; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/src/protobufqttypes/protobufqtguitypes/qtprotobufqtguitypesglobal.h new/qtgrpc-everywhere-src-6.7.3/src/protobufqttypes/protobufqtguitypes/qtprotobufqtguitypesglobal.h --- old/qtgrpc-everywhere-src-6.7.2/src/protobufqttypes/protobufqtguitypes/qtprotobufqtguitypesglobal.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/src/protobufqttypes/protobufqtguitypes/qtprotobufqtguitypesglobal.h 2024-09-19 20:58:41.000000000 +0200 @@ -2,10 +2,10 @@ // Copyright (C) 2019 Alexey Edelev <semlanik(a)gmail.com> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef QTPROTOBUFQTTYPESGLOBAL_H -#define QTPROTOBUFQTTYPESGLOBAL_H +#ifndef QTPROTOBUFQTGUITYPESGLOBAL_H +#define QTPROTOBUFQTGUITYPESGLOBAL_H #include <QtProtobufQtGuiTypes/qtprotobufqtguitypesexports.h> #include <QtCore/qglobal.h> -#endif // QTPROTOBUFQTTYPESGLOBAL_H +#endif // QTPROTOBUFQTGUITYPESGLOBAL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake new/qtgrpc-everywhere-src-6.7.3/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake --- old/qtgrpc-everywhere-src-6.7.2/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake 2024-09-19 20:58:41.000000000 +0200 @@ -51,6 +51,11 @@ endforeach() endmacro() +# Returns the generator target name according to the pre-defined pattern +function(_qt_internal_get_generator_dep_target_name out_var target generator dep_index) + set(${out_var} "${target}_${generator}_deps_${dep_index}" PARENT_SCOPE) +endfunction() + # The base function that generates rules to call the protoc executable with the custom generator # plugin. # Multi-value Arguments: @@ -96,7 +101,7 @@ if(NOT num_deps) set(num_deps 0) endif() - set(deps_target ${target}_${generator}_deps_${num_deps}) + _qt_internal_get_generator_dep_target_name(deps_target ${target} ${generator} ${num_deps}) math(EXPR num_deps "${num_deps} + 1") set(generator_file $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::${generator}>) @@ -172,6 +177,7 @@ DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::${generator} ${proto_files} + $<TARGET_FILE:WrapProtoc::WrapProtoc> COMMENT "Generating QtProtobuf ${target} sources for ${generator}..." COMMAND_EXPAND_LISTS VERBATIM @@ -543,6 +549,7 @@ set(export_macro_file "${output_directory}/${export_macro_filename}") endif() + set_source_files_properties(${type_registrations} PROPERTIES SKIP_AUTOGEN ON) if(is_static OR (WIN32 AND NOT is_executable)) if(TARGET ${target}_protobuf_registration) target_sources(${target}_protobuf_registration PRIVATE ${type_registrations}) @@ -556,6 +563,17 @@ INTERFACE "$<TARGET_OBJECTS:$<TARGET_NAME:${target}_protobuf_registration>>") add_dependencies(${target} ${target}_protobuf_registration) + get_target_property(num_deps ${target} _qt_qtprotobufgen_deps_num) + if(num_deps) + # foreach includes the last element in the RANGE + math(EXPR num_deps "${num_deps} - 1") + foreach(i RANGE 0 ${num_deps}) + _qt_internal_get_generator_dep_target_name(deps_target ${target} + qtprotobufgen ${i}) + add_dependencies(${target}_protobuf_registration ${deps_target}) + endforeach() + endif() + target_include_directories(${target}_protobuf_registration PRIVATE "$<GENEX_EVAL:$<TARGET_PROPERTY:${target},INCLUDE_DIRECTORIES>>") target_link_libraries(${target}_protobuf_registration @@ -585,22 +603,37 @@ string(REPLACE "." "/" qml_module_output_path "${qml_uri}") set(qml_module_output_full_path "${CMAKE_CURRENT_BINARY_DIR}/${qml_module_output_path}") + if(NOT is_executable) + set(plugin_options PLUGIN_TARGET "${target}plugin") + endif() + qt_policy(SET QTP0001 NEW) qt6_add_qml_module(${target} URI ${qml_uri} - PLUGIN_TARGET "${target}plugin" + ${plugin_options} VERSION 1.0 OUTPUT_DIRECTORY "${qml_module_output_full_path}" - ) - set_target_properties(${target}plugin - PROPERTIES - AUTOMOC ON - ) - target_link_libraries(${target}plugin PRIVATE - ${QT_CMAKE_EXPORT_NAMESPACE}::Protobuf + OUTPUT_TARGETS qml_output_targets ) - list(APPEND ${arg_OUTPUT_TARGETS} ${target}plugin) + if(TARGET ${target}plugin) + set_target_properties(${target}plugin + PROPERTIES + AUTOMOC ON + ) + target_link_libraries(${target}plugin PRIVATE + ${QT_CMAKE_EXPORT_NAMESPACE}::Protobuf + ) + endif() + + if(DEFINED arg_OUTPUT_TARGETS) + if(qml_output_targets) + list(APPEND ${arg_OUTPUT_TARGETS} ${qml_output_targets}) + endif() + if(TARGET ${target}plugin) + list(APPEND ${arg_OUTPUT_TARGETS} "${target}plugin") + endif() + endif() endif() if(DEFINED arg_OUTPUT_HEADERS) @@ -608,6 +641,7 @@ endif() if(DEFINED arg_OUTPUT_TARGETS) + list(REMOVE_DUPLICATES ${arg_OUTPUT_TARGETS}) set(${arg_OUTPUT_TARGETS} "${${arg_OUTPUT_TARGETS}}" PARENT_SCOPE) endif() endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/src/tools/qtprotoccommon/commontemplates.cpp new/qtgrpc-everywhere-src-6.7.3/src/tools/qtprotoccommon/commontemplates.cpp --- old/qtgrpc-everywhere-src-6.7.2/src/tools/qtprotoccommon/commontemplates.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/src/tools/qtprotoccommon/commontemplates.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -488,14 +488,21 @@ const char *CommonTemplates::GetterMessageDeclarationTemplate() { return "bool has$property_name_cap$() const;\n" - "$getter_type$ &$property_name$() const;\n"; + "$getter_type$ &$property_name$();\n" + "const $getter_type$ &$property_name$() const;\n"; } const char *CommonTemplates::GetterMessageDefinitionTemplate() { return "bool $classname$::has$property_name_cap$() const\n{\n" " return dptr->m_$property_name$.operator bool();\n" "}\n\n" - "$getter_type$ &$classname$::$property_name$() const\n{\n" + "$getter_type$ &$classname$::$property_name$()\n" + "{\n" + " dptr.detach();\n" + " return *dptr->m_$property_name$;\n" + "}\n" + "const $getter_type$ &$classname$::$property_name$() const\n" + "{\n" " return *dptr->m_$property_name$;\n" "}\n\n"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/grpc/client/bidirstream/tst_grpc_client_bidirstream.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/grpc/client/bidirstream/tst_grpc_client_bidirstream.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/grpc/client/bidirstream/tst_grpc_client_bidirstream.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/grpc/client/bidirstream/tst_grpc_client_bidirstream.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -44,9 +44,9 @@ stream->sendMessage(request); }); - QSignalSpy streamFinishedSpy(stream.get(), &QGrpcServerStream::finished); + QSignalSpy streamFinishedSpy(stream.get(), &QGrpcBidirStream::finished); QVERIFY(streamFinishedSpy.isValid()); - QSignalSpy streamErrorSpy(stream.get(), &QGrpcServerStream::errorOccurred); + QSignalSpy streamErrorSpy(stream.get(), &QGrpcBidirStream::errorOccurred); QVERIFY(streamErrorSpy.isValid()); QTRY_COMPARE_EQ_WITH_TIMEOUT(streamFinishedSpy.count(), 1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/grpc/client/clientstream/tst_grpc_client_clientstream.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/grpc/client/clientstream/tst_grpc_client_clientstream.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/grpc/client/clientstream/tst_grpc_client_clientstream.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/grpc/client/clientstream/tst_grpc_client_clientstream.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -45,9 +45,9 @@ sendTimer.start(MessageLatency); - QSignalSpy streamFinishedSpy(stream.get(), &QGrpcServerStream::finished); + QSignalSpy streamFinishedSpy(stream.get(), &QGrpcClientStream::finished); QVERIFY(streamFinishedSpy.isValid()); - QSignalSpy streamErrorSpy(stream.get(), &QGrpcServerStream::errorOccurred); + QSignalSpy streamErrorSpy(stream.get(), &QGrpcClientStream::errorOccurred); QVERIFY(streamErrorSpy.isValid()); QTRY_COMPARE_EQ_WITH_TIMEOUT(streamFinishedSpy.count(), 1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/grpc/client/shared/test_server/CMakeLists.txt new/qtgrpc-everywhere-src-6.7.3/tests/auto/grpc/client/shared/test_server/CMakeLists.txt --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/grpc/client/shared/test_server/CMakeLists.txt 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/grpc/client/shared/test_server/CMakeLists.txt 2024-09-19 20:58:41.000000000 +0200 @@ -28,7 +28,7 @@ --plugin=protoc-gen-grpc=$<TARGET_FILE:WrapgRPC::WrapgRPCPlugin> "${proto_files}" WORKING_DIRECTORY ${out_dir} - DEPENDS "${proto_files}" + DEPENDS "${proto_files}" $<TARGET_FILE:WrapProtoc::WrapProtoc> COMMENT "Generating gRPC ${target} sources..." COMMAND_EXPAND_LISTS VERBATIM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -459,6 +459,11 @@ actual.testComplexField().setTestFieldString("AccessMessageFieldsFromGetter"); QCOMPARE(actual, expected); + + ComplexMessage actualCopy = actual; + actual.testComplexField().setTestFieldString("Ensure detach"); + + QCOMPARE_NE(actual, actualCopy); } void QtProtobufTypesGenerationTest::InvalidMessageConstructorTest() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobuf/shared/qtprotobuftestscommon.h new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobuf/shared/qtprotobuftestscommon.h --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobuf/shared/qtprotobuftestscommon.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobuf/shared/qtprotobuftestscommon.h 2024-09-19 20:58:41.000000000 +0200 @@ -9,7 +9,7 @@ #include <QTest> template<typename MessageType, typename PropertyType> -static void qProtobufAssertMessagePropertyRegistered(int fieldIndex, const char *propertyTypeName, const char *propertyName, bool skipMetatypeCheck = false) +static void qProtobufAssertMessagePropertyRegistered(int fieldIndex, const char *propertyTypeName, const char *propertyName) { // TODO: there should be(?) a mapping available: PropertyType -> propertyTypeName @@ -19,10 +19,8 @@ // Q_PROPERTY returns non-aliased type for the aliases defined using the 'using' keyword. // QCOMPARE(QLatin1String(propertyTypeName), QLatin1String(MessageType::staticMetaObject.property(propertyNumber).typeName())); Q_UNUSED(propertyTypeName) - if (!skipMetatypeCheck) { - QCOMPARE(QMetaType::fromType<PropertyType>(), - MessageType::staticMetaObject.property(propertyNumber).metaType()); - } + QCOMPARE(QMetaType::fromType<PropertyType>(), + MessageType::staticMetaObject.property(propertyNumber).metaType()); QCOMPARE(QLatin1String(MessageType::staticMetaObject.property(propertyNumber).name()), QLatin1String(propertyName)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/CMakeLists.txt new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/CMakeLists.txt --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/CMakeLists.txt 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/CMakeLists.txt 2024-09-19 20:58:41.000000000 +0200 @@ -7,6 +7,8 @@ find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) endif() +get_target_property(protoc_version WrapProtoc::WrapProtoc _qt_internal_protobuf_version) + qt_internal_add_test(tst_qtprotobufgen SOURCES tst_qtprotobufgen.cpp @@ -45,10 +47,18 @@ ../shared/data/proto/mapmessages.proto ../shared/data/proto/oneofmessages.proto ../shared/data/proto/repeatedmessages.proto - ../shared/data/proto/optional.proto GENERATE_PACKAGE_SUBFOLDERS OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated/folder" ) + +if(protoc_version VERSION_GREATER_EQUAL "3.12") + qt_add_protobuf(tst_qtprotobufgen_gen + PROTO_FILES + ../shared/data/proto/optional.proto + GENERATE_PACKAGE_SUBFOLDERS + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated/folder" + ) +endif() qt_autogen_tools_initial_setup(tst_qtprotobufgen_gen) add_library(tst_qtprotobufgen_custom_exports_gen SHARED) @@ -81,7 +91,6 @@ target_compile_options(tst_qtprotobufgen_gen PRIVATE "-Wa,-mbig-obj") endif() -get_target_property(protoc_version WrapProtoc::WrapProtoc _qt_internal_protobuf_version) if(protoc_version VERSION_GREATER_EQUAL "3.12" AND protoc_version VERSION_LESS "3.15") qt_internal_extend_target(tst_qtprotobufgen DEFINES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -1967,7 +1967,12 @@ return dptr->m_testComplexField.operator bool(); } -SimpleStringMessage &ComplexMessage::testComplexField() const +SimpleStringMessage &ComplexMessage::testComplexField() +{ + dptr.detach(); + return *dptr->m_testComplexField; +} +const SimpleStringMessage &ComplexMessage::testComplexField() const { return *dptr->m_testComplexField; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.h new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.h --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.h 2024-09-19 20:58:41.000000000 +0200 @@ -712,7 +712,8 @@ QtProtobuf::int32 testFieldInt() const; bool hasTestComplexField() const; - SimpleStringMessage &testComplexField() const; + SimpleStringMessage &testComplexField(); + const SimpleStringMessage &testComplexField() const; void clearTestComplexField(); void setTestFieldInt(const QtProtobuf::int32 &testFieldInt); void setTestComplexField(const SimpleStringMessage &testComplexField); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -344,7 +344,12 @@ return dptr->m_testComplexField.operator bool(); } -SimpleStringMessage &ComplexMessage::testComplexField() const +SimpleStringMessage &ComplexMessage::testComplexField() +{ + dptr.detach(); + return *dptr->m_testComplexField; +} +const SimpleStringMessage &ComplexMessage::testComplexField() const { return *dptr->m_testComplexField; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.h new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.h --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.h 2024-09-19 20:58:41.000000000 +0200 @@ -123,7 +123,8 @@ QtProtobuf::int32 testFieldInt() const; bool hasTestComplexField() const; - SimpleStringMessage &testComplexField() const; + SimpleStringMessage &testComplexField(); + const SimpleStringMessage &testComplexField() const; void clearTestComplexField(); void setTestFieldInt(const QtProtobuf::int32 &testFieldInt); void setTestComplexField(const SimpleStringMessage &testComplexField); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -390,7 +390,12 @@ return dptr->m_testFieldMessage.operator bool(); } -TestStringMessage &OptionalMessage::testFieldMessage() const +TestStringMessage &OptionalMessage::testFieldMessage() +{ + dptr.detach(); + return *dptr->m_testFieldMessage; +} +const TestStringMessage &OptionalMessage::testFieldMessage() const { return *dptr->m_testFieldMessage; } @@ -413,7 +418,12 @@ return dptr->m_testFieldMessageOpt.operator bool(); } -TestStringMessage &OptionalMessage::testFieldMessageOpt() const +TestStringMessage &OptionalMessage::testFieldMessageOpt() +{ + dptr.detach(); + return *dptr->m_testFieldMessageOpt; +} +const TestStringMessage &OptionalMessage::testFieldMessageOpt() const { return *dptr->m_testFieldMessageOpt; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.h new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.h --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.h 2024-09-19 20:58:41.000000000 +0200 @@ -123,11 +123,13 @@ QString testFieldStringOpt() const; bool hasTestFieldMessage() const; - TestStringMessage &testFieldMessage() const; + TestStringMessage &testFieldMessage(); + const TestStringMessage &testFieldMessage() const; void clearTestFieldMessage(); bool hasTestFieldMessageOpt() const; - TestStringMessage &testFieldMessageOpt() const; + TestStringMessage &testFieldMessageOpt(); + const TestStringMessage &testFieldMessageOpt() const; void clearTestFieldMessageOpt(); void setTestField(const QtProtobuf::sint32 &testField); void setTestFieldOpt(const QtProtobuf::sint32 &testFieldOpt); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -1967,7 +1967,12 @@ return dptr->m_testComplexField.operator bool(); } -SimpleStringMessage &ComplexMessage::testComplexField() const +SimpleStringMessage &ComplexMessage::testComplexField() +{ + dptr.detach(); + return *dptr->m_testComplexField; +} +const SimpleStringMessage &ComplexMessage::testComplexField() const { return *dptr->m_testComplexField; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.h new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.h --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.h 2024-09-19 20:58:41.000000000 +0200 @@ -712,7 +712,8 @@ QtProtobuf::int32 testFieldInt() const; bool hasTestComplexField() const; - SimpleStringMessage &testComplexField() const; + SimpleStringMessage &testComplexField(); + const SimpleStringMessage &testComplexField() const; void clearTestComplexField(); void setTestFieldInt(const QtProtobuf::int32 &testFieldInt); void setTestComplexField(const SimpleStringMessage &testComplexField); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -1967,7 +1967,12 @@ return dptr->m_testComplexField.operator bool(); } -SimpleStringMessage &ComplexMessage::testComplexField() const +SimpleStringMessage &ComplexMessage::testComplexField() +{ + dptr.detach(); + return *dptr->m_testComplexField; +} +const SimpleStringMessage &ComplexMessage::testComplexField() const { return *dptr->m_testComplexField; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.h new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.h --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.h 2024-09-19 20:58:41.000000000 +0200 @@ -711,7 +711,8 @@ QtProtobuf::int32 testFieldInt() const; bool hasTestComplexField() const; - SimpleStringMessage &testComplexField() const; + SimpleStringMessage &testComplexField(); + const SimpleStringMessage &testComplexField() const; void clearTestComplexField(); void setTestFieldInt(const QtProtobuf::int32 &testFieldInt); void setTestComplexField(const SimpleStringMessage &testComplexField); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -1967,7 +1967,12 @@ return dptr->m_testComplexField.operator bool(); } -SimpleStringMessage &ComplexMessage::testComplexField() const +SimpleStringMessage &ComplexMessage::testComplexField() +{ + dptr.detach(); + return *dptr->m_testComplexField; +} +const SimpleStringMessage &ComplexMessage::testComplexField() const { return *dptr->m_testComplexField; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.h new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.h --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.h 2024-09-19 20:58:41.000000000 +0200 @@ -711,7 +711,8 @@ QtProtobuf::int32 testFieldInt() const; bool hasTestComplexField() const; - SimpleStringMessage &testComplexField() const; + SimpleStringMessage &testComplexField(); + const SimpleStringMessage &testComplexField() const; void clearTestComplexField(); void setTestFieldInt(const QtProtobuf::int32 &testFieldInt); void setTestComplexField(const SimpleStringMessage &testComplexField); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -344,7 +344,12 @@ return dptr->m_testComplexField.operator bool(); } -SimpleStringMessage &ComplexMessage::testComplexField() const +SimpleStringMessage &ComplexMessage::testComplexField() +{ + dptr.detach(); + return *dptr->m_testComplexField; +} +const SimpleStringMessage &ComplexMessage::testComplexField() const { return *dptr->m_testComplexField; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.h new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.h --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.h 2024-09-19 20:58:41.000000000 +0200 @@ -123,7 +123,8 @@ QtProtobuf::int32 testFieldInt() const; bool hasTestComplexField() const; - SimpleStringMessage &testComplexField() const; + SimpleStringMessage &testComplexField(); + const SimpleStringMessage &testComplexField() const; void clearTestComplexField(); void setTestFieldInt(const QtProtobuf::int32 &testFieldInt); void setTestComplexField(const SimpleStringMessage &testComplexField); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -390,7 +390,12 @@ return dptr->m_testFieldMessage.operator bool(); } -TestStringMessage &OptionalMessage::testFieldMessage() const +TestStringMessage &OptionalMessage::testFieldMessage() +{ + dptr.detach(); + return *dptr->m_testFieldMessage; +} +const TestStringMessage &OptionalMessage::testFieldMessage() const { return *dptr->m_testFieldMessage; } @@ -413,7 +418,12 @@ return dptr->m_testFieldMessageOpt.operator bool(); } -TestStringMessage &OptionalMessage::testFieldMessageOpt() const +TestStringMessage &OptionalMessage::testFieldMessageOpt() +{ + dptr.detach(); + return *dptr->m_testFieldMessageOpt; +} +const TestStringMessage &OptionalMessage::testFieldMessageOpt() const { return *dptr->m_testFieldMessageOpt; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.h new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.h --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.h 2024-09-19 20:58:41.000000000 +0200 @@ -122,11 +122,13 @@ QString testFieldStringOpt() const; bool hasTestFieldMessage() const; - TestStringMessage &testFieldMessage() const; + TestStringMessage &testFieldMessage(); + const TestStringMessage &testFieldMessage() const; void clearTestFieldMessage(); bool hasTestFieldMessageOpt() const; - TestStringMessage &testFieldMessageOpt() const; + TestStringMessage &testFieldMessageOpt(); + const TestStringMessage &testFieldMessageOpt() const; void clearTestFieldMessageOpt(); void setTestField(const QtProtobuf::sint32 &testField); void setTestFieldOpt(const QtProtobuf::sint32 &testFieldOpt); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -339,7 +339,12 @@ return dptr->m_testField.operator bool(); } -SimpleIntMessageExt &NoPackageExternalMessage::testField() const +SimpleIntMessageExt &NoPackageExternalMessage::testField() +{ + dptr.detach(); + return *dptr->m_testField; +} +const SimpleIntMessageExt &NoPackageExternalMessage::testField() const { return *dptr->m_testField; } @@ -484,7 +489,12 @@ return dptr->m_testField.operator bool(); } -SimpleIntMessage &NoPackageMessage::testField() const +SimpleIntMessage &NoPackageMessage::testField() +{ + dptr.detach(); + return *dptr->m_testField; +} +const SimpleIntMessage &NoPackageMessage::testField() const { return *dptr->m_testField; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h 2024-09-19 20:58:41.000000000 +0200 @@ -152,7 +152,8 @@ bool operator !=(const NoPackageExternalMessage &other) const; bool hasTestField() const; - SimpleIntMessageExt &testField() const; + SimpleIntMessageExt &testField(); + const SimpleIntMessageExt &testField() const; Q_INVOKABLE void clearTestField(); void setTestField(const SimpleIntMessageExt &testField); static void registerTypes(); @@ -195,7 +196,8 @@ bool operator !=(const NoPackageMessage &other) const; bool hasTestField() const; - SimpleIntMessage &testField() const; + SimpleIntMessage &testField(); + const SimpleIntMessage &testField() const; Q_INVOKABLE void clearTestField(); void setTestField(const SimpleIntMessage &testField); static void registerTypes(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -1967,7 +1967,12 @@ return dptr->m_testComplexField.operator bool(); } -SimpleStringMessage &ComplexMessage::testComplexField() const +SimpleStringMessage &ComplexMessage::testComplexField() +{ + dptr.detach(); + return *dptr->m_testComplexField; +} +const SimpleStringMessage &ComplexMessage::testComplexField() const { return *dptr->m_testComplexField; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h 2024-09-19 20:58:41.000000000 +0200 @@ -749,7 +749,8 @@ QtProtobuf::int32 testFieldInt() const; bool hasTestComplexField() const; - SimpleStringMessage &testComplexField() const; + SimpleStringMessage &testComplexField(); + const SimpleStringMessage &testComplexField() const; Q_INVOKABLE void clearTestComplexField(); void setTestFieldInt(const QtProtobuf::int32 &testFieldInt); void setTestComplexField(const SimpleStringMessage &testComplexField); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/tst_qtprotobufgen.cpp new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/tst_qtprotobufgen.cpp --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufgen/tst_qtprotobufgen.cpp 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufgen/tst_qtprotobufgen.cpp 2024-09-19 20:58:41.000000000 +0200 @@ -104,6 +104,35 @@ return result.toLocal8Bit(); } +void compareTwoFiles(const QString &expectedFileName, const QString &actualFileName) +{ + QFile expectedResultFile(expectedFileName); + QFile generatedFile(actualFileName); + + QVERIFY2(expectedResultFile.exists(), qPrintable(expectedResultFile.fileName())); + QVERIFY2(generatedFile.exists(), qPrintable(expectedResultFile.fileName())); + + QVERIFY2(expectedResultFile.open(QIODevice::ReadOnly | QIODevice::Text), + msgCannotReadFile(expectedResultFile).constData()); + QVERIFY2(generatedFile.open(QIODevice::ReadOnly | QIODevice::Text), + msgCannotReadFile(generatedFile).constData()); + + QByteArray expectedData = expectedResultFile.readAll(); + QByteArray generatedData = generatedFile.readAll(); + + expectedResultFile.close(); + generatedFile.close(); + + if (hash(expectedData).toHex() != hash(generatedData).toHex()) { + const QString diff = doCompare(splitToLines(generatedData), + splitToLines(expectedData)); + QCOMPARE_GT(diff.size(), 0); // Hashes can only differ if content does. + QFAIL(qPrintable(diff)); + } + // Ensure we do see a failure, even in the unlikely case of a hash collision: + QVERIFY(generatedData == expectedData); +} + bool containsString(const QStringList &list, const QString &comment) { return std::any_of(list.cbegin(), list.cend(), @@ -175,9 +204,10 @@ QDir testOutputBaseDir(QCoreApplication::applicationDirPath()); testOutputBaseDir.mkdir(QLatin1StringView("cmd_line_generation")); - QLatin1StringView folders[] = {"comments"_L1, "extra-namespace"_L1, - "fieldenum"_L1, "folder"_L1, - "qml-no-package"_L1, "no-options"_L1}; + QLatin1StringView folders[] = { + "comments"_L1, "extra-namespace"_L1, "fieldenum"_L1, "folder"_L1, + "qml-no-package"_L1, "no-options"_L1, "invalid_export_macro"_L1 + }; for (QLatin1StringView folder : folders) testOutputBaseDir.mkdir("cmd_line_generation/"_L1 + folder); @@ -307,32 +337,8 @@ QFETCH(QString, folder); QFETCH(QString, extension); - QFile expectedResultFile(m_expectedResult + folder + fileName + extension); - QFile generatedFile(m_cmakeGenerated + folder + fileName + extension); - - QVERIFY2(expectedResultFile.exists(), qPrintable(expectedResultFile.fileName())); - QVERIFY2(generatedFile.exists(), qPrintable(expectedResultFile.fileName())); - - QVERIFY2(expectedResultFile.open(QIODevice::ReadOnly | QIODevice::Text), - msgCannotReadFile(expectedResultFile).constData()); - QVERIFY2(generatedFile.open(QIODevice::ReadOnly | QIODevice::Text), - msgCannotReadFile(generatedFile).constData()); - - QByteArray expectedData = expectedResultFile.readAll(); - QByteArray generatedData = generatedFile.readAll(); - - expectedResultFile.close(); - generatedFile.close(); - - if (hash(expectedData).toHex() != hash(generatedData).toHex()) - { - const QString diff = doCompare(splitToLines(generatedData), - splitToLines(expectedData)); - QCOMPARE_GT(diff.size(), 0); // Hashes can only differ if content does. - QFAIL(qPrintable(diff)); - } - // Ensure we do see a failure, even in the unlikely case of a hash collision: - QVERIFY(generatedData == expectedData); + const QString filePath = folder + fileName + extension; + compareTwoFiles(m_expectedResult + filePath, m_cmakeGenerated + filePath); } void tst_qtprotobufgen::cmdLineGeneratedFile_data() @@ -458,33 +464,8 @@ QVERIFY2(process.exitStatus() == QProcess::NormalExit, msgProcessCrashed(process).constData()); QVERIFY2(process.exitCode() == 0, msgProcessFailed(process).constData()); - QString filePath = folder + generatedFolderStructure; - QFile expectedResultFile(m_expectedResult + filePath + fileName + extension); - QFile generatedFile(m_commandLineGenerated + filePath + fileName + extension); - - QVERIFY(generatedFile.exists()); - QVERIFY(expectedResultFile.exists()); - - QVERIFY2(expectedResultFile.open(QIODevice::ReadOnly | QIODevice::Text), - msgCannotReadFile(expectedResultFile).constData()); - QVERIFY2(generatedFile.open(QIODevice::ReadOnly | QIODevice::Text), - msgCannotReadFile(generatedFile).constData()); - - QByteArray expectedData = expectedResultFile.readAll(); - QByteArray generatedData = generatedFile.readAll(); - - expectedResultFile.close(); - generatedFile.close(); - - if (hash(expectedData).toHex() != hash(generatedData).toHex()) - { - const QString diff = doCompare(splitToLines(generatedData), - splitToLines(expectedData)); - QCOMPARE_GT(diff.size(), 0); // Hashes can only differ if content does. - QFAIL(qPrintable(diff)); - } - // Ensure we do see a failure, even in the unlikely case of a hash collision: - QVERIFY(generatedData == expectedData); + const QString filePath = folder + generatedFolderStructure + fileName + extension; + compareTwoFiles(m_expectedResult + filePath, m_commandLineGenerated + filePath); } void tst_qtprotobufgen::cmdLineGeneratedNoOptions_data() @@ -575,32 +556,8 @@ QVERIFY2(process.exitStatus() == QProcess::NormalExit, msgProcessCrashed(process).constData()); QVERIFY2(process.exitCode() == 0, msgProcessFailed(process).constData()); - QFile expectedResultFile(m_expectedResult + folder + fileName + extension); - QFile generatedFile(m_commandLineGenerated + folder + fileName + extension); - - QVERIFY(generatedFile.exists()); - QVERIFY(expectedResultFile.exists()); - - QVERIFY2(expectedResultFile.open(QIODevice::ReadOnly | QIODevice::Text), - msgCannotReadFile(expectedResultFile).constData()); - QVERIFY2(generatedFile.open(QIODevice::ReadOnly | QIODevice::Text), - msgCannotReadFile(generatedFile).constData()); - - QByteArray expectedData = expectedResultFile.readAll(); - QByteArray generatedData = generatedFile.readAll(); - - expectedResultFile.close(); - generatedFile.close(); - - if (hash(expectedData).toHex() != hash(generatedData).toHex()) - { - const QString diff = doCompare(splitToLines(generatedData), - splitToLines(expectedData)); - QCOMPARE_GT(diff.size(), 0); // Hashes can only differ if content does. - QFAIL(qPrintable(diff)); - } - // Ensure we do see a failure, even in the unlikely case of a hash collision: - QVERIFY(generatedData == expectedData); + const QString filePath = folder + fileName + extension; + compareTwoFiles(m_expectedResult + filePath, m_commandLineGenerated + filePath); } void tst_qtprotobufgen::cmdLineInvalidExportMacro_data() @@ -610,7 +567,6 @@ QTest::addRow("contains_dash") << "TST_QTPROTOBUFGEN-FAIL" << 1; QTest::addRow("contains_number_first") << "1Not_ALLoWeD" << 1; - QTest::addRow("valid") << "MACRO_NAME_OK" << 0; } void tst_qtprotobufgen::cmdLineInvalidExportMacro() @@ -618,15 +574,14 @@ QFETCH(QString, exportMacro); QFETCH(int, result); - QString folder = "/folder/"; + QString folder = "/invalid_export_macro/"; QString fileName = "basicmessages"; - QString generatingOption = "GENERATE_PACKAGE_SUBFOLDERS"; QString exportMacroCmd = "EXPORT_MACRO=" + exportMacro; QProcess process; process.setWorkingDirectory(m_commandLineGenerated); process.startCommand(protocolBufferCompiler + QString(" ") + protocGenQtprotobufKey - + m_protobufgen + optKey + generatingOption + ";" + exportMacroCmd + + m_protobufgen + optKey + ";" + exportMacroCmd + outputKey + m_commandLineGenerated + folder + includeKey + m_protoFiles + " " + fileName + ".proto" + allow_proto3_optional); QVERIFY2(process.waitForStarted(), msgProcessStartFailed(process).constData()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufqml/basic/qml/tst_basic.qml new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufqml/basic/qml/tst_basic.qml --- old/qtgrpc-everywhere-src-6.7.2/tests/auto/protobufqml/basic/qml/tst_basic.qml 2024-06-08 01:54:43.000000000 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/tests/auto/protobufqml/basic/qml/tst_basic.qml 2024-09-19 20:58:41.000000000 +0200 @@ -8,9 +8,11 @@ pragma ValueTypeBehavior: Addressable - Item { +Item { id: root + property var usLocale: Qt.locale("en_US") + TestCase { name: "qtprotobufBasicTest" @@ -213,31 +215,31 @@ } function test_int32LocaleStringConversion() { - var field = int32Msg.testFieldInt.toLocaleString(Qt.locale()) - var answer = Number(int32Msg.testFieldInt).toLocaleString(Qt.locale()) + var field = int32Msg.testFieldInt.toLocaleString(root.usLocale) + var answer = Number(int32Msg.testFieldInt).toLocaleString(root.usLocale) expectFail("", "int32Msg number is not match" + field + " not equal " + answer) compare(field, answer) } function test_fixed32LocaleStringConversion(data) { - var field = fixed32Msg.testFieldFixedInt32.toLocaleString(Qt.locale()) - var answer = Number(fixed32Msg.testFieldFixedInt32).toLocaleString(Qt.locale()) + var field = fixed32Msg.testFieldFixedInt32.toLocaleString(root.usLocale) + var answer = Number(fixed32Msg.testFieldFixedInt32).toLocaleString(root.usLocale) expectFail("", "fixed32LocaleString number is not match" + field + " not equal " + answer) compare(field, answer) } function test_sint32LocaleStringConversion() { - compare(sint32Msg.testFieldInt.toLocaleString(Qt.locale()), - Number(sint32Msg.testFieldInt).toLocaleString(Qt.locale()), + compare(sint32Msg.testFieldInt.toLocaleString(root.usLocale), + Number(sint32Msg.testFieldInt).toLocaleString(root.usLocale), "Locale number string is not match " - + sint32Msg.testFieldInt.toLocaleString(Qt.locale()) - + " != " + Number(sint32Msg.testFieldInt).toLocaleString(Qt.locale())) + + sint32Msg.testFieldInt.toLocaleString(root.usLocale) + + " != " + Number(sint32Msg.testFieldInt).toLocaleString(root.usLocale)) } function test_sfixed32LocaleStringConversion(data) { - var field = sfixed32Msg.testFieldFixedInt32.toLocaleString(Qt.locale()) - var answer = Number(sfixed32Msg.testFieldFixedInt32).toLocaleString(Qt.locale()) + var field = sfixed32Msg.testFieldFixedInt32.toLocaleString(root.usLocale) + var answer = Number(sfixed32Msg.testFieldFixedInt32).toLocaleString(root.usLocale) expectFail("", "sfixed32LocaleString number is not match" + field + " not equal " + answer)

1 0