May 2022 - openSUSE Commits - openSUSE Mailing Lists

commit fwts for openSUSE:Factory
by Source-Sync 31 May '22

31 May '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fwts for openSUSE:Factory checked in at 2022-05-31 15:47:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwts (Old) and /work/SRC/openSUSE:Factory/.fwts.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fwts" Tue May 31 15:47:46 2022 rev:69 rq:980057 version:22.05.00 Changes: -------- --- /work/SRC/openSUSE:Factory/fwts/fwts.changes 2022-03-24 23:00:25.428390899 +0100 +++ /work/SRC/openSUSE:Factory/.fwts.new.1548/fwts.changes 2022-05-31 15:48:59.464052306 +0200 @@ -1,0 +2,15 @@ +Tue May 31 08:15:44 UTC 2022 - Martin Pluskal <mpluskal(a)suse.com> + +- Update to version 22.05.00: + * lib: fwts_version.h - update to V22.05.00 + * debian: update changelog + * fwts-test: sync up IORT test with specification version E.d + * acpi: mcfg: checking kernel lockdown when doing mmap PCI config space + * auto-packager:mkpackage.sh: add kinetic + * acpi: iort: update IORT test to specification version E.d + * Update copyright year to 2022 + * acpi: iort: update the IORT node dump + * acpi: iort: update IORT node revision check + * ACPICA: Update to version 20220331 + +------------------------------------------------------------------- Old: ---- fwts-22.03.00.obscpio New: ---- fwts-22.05.00.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwts.spec ++++++ --- /var/tmp/diff_new_pack.uhtMZj/_old 2022-05-31 15:49:00.092052724 +0200 +++ /var/tmp/diff_new_pack.uhtMZj/_new 2022-05-31 15:49:00.100052729 +0200 @@ -17,7 +17,7 @@ Name: fwts -Version: 22.03.00 +Version: 22.05.00 Release: 0 Summary: Firmware Test Suite License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.uhtMZj/_old 2022-05-31 15:49:00.160052769 +0200 +++ /var/tmp/diff_new_pack.uhtMZj/_new 2022-05-31 15:49:00.172052776 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://git.launchpad.net/fwts</param> - <param name="changesrevision">7f83b02d0429d8d5bbbf3538e223e0142ecea43e</param></service></servicedata> + <param name="changesrevision">d82204d836a6e6bf1ce491224923ea5072bed967</param></service></servicedata> (No newline at EOF) ++++++ fwts-22.03.00.obscpio -> fwts-22.05.00.obscpio ++++++ /work/SRC/openSUSE:Factory/fwts/fwts-22.03.00.obscpio /work/SRC/openSUSE:Factory/.fwts.new.1548/fwts-22.05.00.obscpio differ: char 49, line 1 ++++++ fwts.obsinfo ++++++ --- /var/tmp/diff_new_pack.uhtMZj/_old 2022-05-31 15:49:00.228052814 +0200 +++ /var/tmp/diff_new_pack.uhtMZj/_new 2022-05-31 15:49:00.232052817 +0200 @@ -1,5 +1,5 @@ name: fwts -version: 22.03.00 -mtime: 1647497444 -commit: 7f83b02d0429d8d5bbbf3538e223e0142ecea43e +version: 22.05.00 +mtime: 1653285229 +commit: d82204d836a6e6bf1ce491224923ea5072bed967

1 0

commit pdns-recursor for openSUSE:Factory
by Source-Sync 31 May '22

31 May '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pdns-recursor for openSUSE:Factory checked in at 2022-05-31 15:47:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pdns-recursor (Old) and /work/SRC/openSUSE:Factory/.pdns-recursor.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pdns-recursor" Tue May 31 15:47:45 2022 rev:54 rq:980065 version:4.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pdns-recursor/pdns-recursor.changes 2022-04-12 21:52:01.969810841 +0200 +++ /work/SRC/openSUSE:Factory/.pdns-recursor.new.1548/pdns-recursor.changes 2022-05-31 15:48:57.584051058 +0200 @@ -1,0 +2,26 @@ +Mon May 30 17:15:50 UTC 2022 - Michael Str��der <michael(a)stroeder.com> + +- update to 4.7.0 + * A configurable way of adding Additional records to answers sent + to the client, so the client does not have to ask for these + records. + * The step sizes for Query Minimization are now computed following to + guidelines in [2]RFC 9156. + * The Recursor now schedules tasks to resolve IPv6 addresses of name + servers not learned by glue records. This has the consequence that, + if applicable, name servers will be contacted over IPv6 more often. + * An experimental implementation of unilateral [3]DoT probing. This + allows the Recursor to learn if a an authoritative servers supports + DoT. + * Recursor has gained a way to fall back to the parent NS set if + contacting servers in the child NS set does not lead to an answer. + This works around some broken authoritative servers configurations. + * ZONEMD validation of the zones retrieved by the [5]Zone to Cache, + providing integrity guarantees for the zone retrieved. + * The table recording round trip times of authoritative server IP + addresses is now shared between threads to make it more effective + and to reduce its memory footprint. + * A Lua FFI hook for post-resolve interception: [6]postresolve_ffi, + providing a very fast way to do post-resolve Lua scripting. + +------------------------------------------------------------------- Old: ---- pdns-recursor-4.6.2.tar.bz2 pdns-recursor-4.6.2.tar.bz2.sig New: ---- pdns-recursor-4.7.0.tar.bz2 pdns-recursor-4.7.0.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdns-recursor.spec ++++++ --- /var/tmp/diff_new_pack.OZJIYf/_old 2022-05-31 15:48:58.076051385 +0200 +++ /var/tmp/diff_new_pack.OZJIYf/_new 2022-05-31 15:48:58.084051390 +0200 @@ -25,7 +25,7 @@ %endif Name: pdns-recursor -Version: 4.6.2 +Version: 4.7.0 Release: 0 BuildRequires: autoconf BuildRequires: automake ++++++ pdns-recursor-4.6.2.tar.bz2 -> pdns-recursor-4.7.0.tar.bz2 ++++++ ++++ 32575 lines of diff (skipped)

1 0

commit python-Pint for openSUSE:Factory
by Source-Sync 31 May '22

31 May '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-Pint for openSUSE:Factory checked in at 2022-05-31 15:47:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Pint (Old) and /work/SRC/openSUSE:Factory/.python-Pint.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Pint" Tue May 31 15:47:44 2022 rev:14 rq:980050 version:0.19.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Pint/python-Pint.changes 2021-11-28 21:31:41.929770957 +0100 +++ /work/SRC/openSUSE:Factory/.python-Pint.new.1548/python-Pint.changes 2022-05-31 15:48:56.856050575 +0200 @@ -1,0 +2,61 @@ +Tue May 31 03:00:36 UTC 2022 - Arun Persaud <arun(a)gmx.de> + +- specfile: + * update copyright year + * require python >= 3.8, numpy >= 1.19 + +- update to version 0.19.2: + * Add the "separate_format_defaults" registry setting (Issue #1501, + PR #1503) + * Handle definitions @import from relative paths on Windows (Issue + #1508, thanks khaeru) + +- changes from version 0.19.1: + * Provide a method to iter the definitions in the order they appear, + recursing the imported files. (Issue #1498) + +- changes from version 0.19: + * Better separation between parsing and loading of definitions. + Implement a parsed "binary" version of "textual" definition files. + Infrastructure to disk cache parsed definition files and + RegistryCache resulting in a 10X speed up in registry + instantiation when enabled. (Issue #1465) + * Deprecate the old format defaulting behavior and prepare for the + new one (Issue #1407) + * Fix a bug for offset units of higher dimension, e.g. gauge + pressure. (Issue #1066, thanks dalito) + * Fix type hints of function wrapper (Issue #1431) + * Upgrade min version of uncertainties to 3.1.4 + * Add a example for `register_unit_format` to the formatting docs + (Issue #1422). + * Fix setting options of the application registry (Issue #1403). + * Fix Quantity & Unit `is_compatible_with` with registry active + contexts (Issue #1424). + * Allow Quantity to parse 'NaN' and 'inf(inity)', case insensitive + * Fix casting error when using to_reduced_units with array of int. + (Issue #1184) + * Use default numpy `np.printoptions` available since numpy 1.15. + * Implement `numpy.nanprod` (Issue #1369) + * Fix default_format ignored for measurement (Issue #1456) + * Add `pint.testing` with functions to compare pint objects in tests + (Issue #1421). + * Fix handling modulo & floordiv operator in pint_eval (Issue #1470) + * Fix `to_compact` and `infer_base_unit` for non-float non_int_type. + * Fix `to_reduced_units` to work with dimensionless units. (Issue + #919) + * Fix parsing of units string with same canonalized name (Issue + #1441 & #1142) + * The pint-pandas example notebook has been moved to the pint-pandas + package. + + * New Units + + `sverdrup` (PR #1404) + + `cooling_tower_ton` (PR #1484) + * Breaking Changes + + Update hour default symbol to `h`. (Issue #719) + + Replace `h` with `��` (U+210E) as default symbol for planck + constant. + + Change minimal Python version support to 3.8+ + + Change minimal Numpy version support to 1.19+ + +------------------------------------------------------------------- Old: ---- Pint-0.18.tar.gz New: ---- Pint-0.19.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Pint.spec ++++++ --- /var/tmp/diff_new_pack.p4Vnzh/_old 2022-05-31 15:48:57.288050862 +0200 +++ /var/tmp/diff_new_pack.p4Vnzh/_new 2022-05-31 15:48:57.292050864 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-Pint # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,13 @@ %define skip_python2 1 %define skip_python36 1 Name: python-Pint -Version: 0.18 +Version: 0.19.2 Release: 0 Summary: Physical quantities module License: BSD-3-Clause URL: https://github.com/hgrecco/pint Source: https://files.pythonhosted.org/packages/source/P/Pint/Pint-%{version}.tar.gz +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module importlib-metadata} BuildRequires: %{python_module importlib-resources} BuildRequires: %{python_module setuptools_scm} @@ -36,10 +37,10 @@ Requires: python-importlib-resources Requires: python-packaging Requires: python-uncertainties >= 3.0 -Recommends: python-numpy >= 1.17 +Recommends: python-numpy >= 1.19 BuildArch: noarch # SECTION test requirements -BuildRequires: %{python_module numpy >= 1.17} +BuildRequires: %{python_module numpy >= 1.19} BuildRequires: %{python_module packaging} BuildRequires: %{python_module pytest >= 4.0} BuildRequires: %{python_module pytest-subtests} ++++++ Pint-0.18.tar.gz -> Pint-0.19.2.tar.gz ++++++ ++++ 10259 lines of diff (skipped)

1 0

commit osc for openSUSE:Factory
by Source-Sync 31 May '22

31 May '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2022-05-31 15:47:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc" Tue May 31 15:47:42 2022 rev:161 rq:980016 version:0.178.0 Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2022-04-27 21:41:29.989025615 +0200 +++ /work/SRC/openSUSE:Factory/.osc.new.1548/osc.changes 2022-05-31 15:48:54.628049096 +0200 @@ -1,0 +2,26 @@ +Tue May 24 12:34:52 UTC 2022 - Daniel Mach <daniel.mach(a)suse.com> + +- 0.178.0 + - EXPERIMENTAL: git repository handling + * init command is working inside of a git repository + * downloadassets command fetches references assets from build description + * checkout is cloning from git + - EXPERIMENTAL: signature (ssh key) authetication + * allow to configure 'sshkey' option in the config + * try to guess ssh key from the keys added to ssh-agent + * rename OscHTTPBasicAuthHandler to OscHTTPAuthHandler + * simplify bad auth retry workaround needed for old python versions + - add support for building preinstall images + - add support for building Helm charts + - show the md5s that are failing to validate after fetching a package + - add missing space to copypac completion + - never require login in the help command + - linkdiff: raise an exception when an added file is missing + - run tests via calling 'setup.py test' + - several coding style fixes + +- spec file: + - run tests via calling 'setup.py test' + - disabled tests in debian.rules + +------------------------------------------------------------------- Old: ---- osc-0.177.0.tar.gz New: ---- osc-0.178.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.o0lCVY/_old 2022-05-31 15:48:55.604049744 +0200 +++ /var/tmp/diff_new_pack.o0lCVY/_new 2022-05-31 15:48:55.608049747 +0200 @@ -27,7 +27,7 @@ %define use_python python %endif -%define version_unconverted 0.177.0 +%define version_unconverted 0.178.0 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc %if ! %{defined _rpmmacrodir} @@ -35,7 +35,7 @@ %endif Name: osc -Version: 0.177.0 +Version: 0.178.0 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later @@ -182,8 +182,7 @@ %if 0%{?suse_version} >= 1500 %check -cd tests -%{use_python} suite.py +%{use_python} setup.py test %endif %clean ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.o0lCVY/_old 2022-05-31 15:48:55.640049768 +0200 +++ /var/tmp/diff_new_pack.o0lCVY/_new 2022-05-31 15:48:55.640049768 +0200 @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.177.0 +pkgver=0.178.0 pkgrel=0 pkgdesc="Open Build Service client" arch=('x86_64') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.o0lCVY/_old 2022-05-31 15:48:55.660049781 +0200 +++ /var/tmp/diff_new_pack.o0lCVY/_new 2022-05-31 15:48:55.664049784 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.177.0</param> - <param name="revision">0.177.0</param> + <param name="version">0.178.0</param> + <param name="revision">0.178.0</param> <param name="url">https://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.o0lCVY/_old 2022-05-31 15:48:55.700049808 +0200 +++ /var/tmp/diff_new_pack.o0lCVY/_new 2022-05-31 15:48:55.708049813 +0200 @@ -1,4 +1,4 @@ -osc (0.177.0-0) unstable; urgency=low +osc (0.178.0-0) unstable; urgency=low - Update to 0.174.0: - fix password deletion via "osc config -d <apiurl> pass" - support changing the password store via "osc config <apiurl> ++++++ debian.rules ++++++ --- /var/tmp/diff_new_pack.o0lCVY/_old 2022-05-31 15:48:55.812049882 +0200 +++ /var/tmp/diff_new_pack.o0lCVY/_new 2022-05-31 15:48:55.816049884 +0200 @@ -13,3 +13,7 @@ install -Dm0644 dist/complete.sh debian/tmp/etc/bash_completion.d/osc.sh install -Dm0755 dist/osc.complete debian/tmp/usr/lib/osc/complete + +override_dh_auto_test: + echo "skipping test" + ++++++ osc-0.177.0.tar.gz -> osc-0.178.0.tar.gz ++++++ ++++ 2061 lines of diff (skipped) ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.o0lCVY/_old 2022-05-31 15:48:56.084050062 +0200 +++ /var/tmp/diff_new_pack.o0lCVY/_new 2022-05-31 15:48:56.088050065 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.177.0-0 +Version: 0.178.0-0 Binary: osc Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: any

1 0

commit python-pre-commit for openSUSE:Factory
by Source-Sync 31 May '22

31 May '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pre-commit for openSUSE:Factory checked in at 2022-05-31 15:47:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pre-commit (Old) and /work/SRC/openSUSE:Factory/.python-pre-commit.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pre-commit" Tue May 31 15:47:43 2022 rev:10 rq:980049 version:2.19.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pre-commit/python-pre-commit.changes 2022-04-08 00:29:04.933402246 +0200 +++ /work/SRC/openSUSE:Factory/.python-pre-commit.new.1548/python-pre-commit.changes 2022-05-31 15:48:56.196050137 +0200 @@ -1,0 +2,17 @@ +Tue May 31 02:56:01 UTC 2022 - Arun Persaud <arun(a)gmx.de> + +- update to version 2.19.0: + * Features + + Allow multiple outputs from language: dotnet hooks. + + Add more information to healthy() failure. + + Upgrade ruby-build. + + Add pre-commit validate-config / pre-commit validate-manifest + and deprecate pre-commit-validate-config and + pre-commit-validate-manifest. + * Fixes + + Fix pre-push when pushed ref contains spaces. + * Updating + + Change pre-commit-validate-config / pre-commit-validate-manifest + to pre-commit validate-config / pre-commit validate-manifest. + +------------------------------------------------------------------- Old: ---- pre_commit-2.18.1.tar.gz New: ---- pre_commit-2.19.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pre-commit.spec ++++++ --- /var/tmp/diff_new_pack.1t8qQN/_old 2022-05-31 15:48:56.584050395 +0200 +++ /var/tmp/diff_new_pack.1t8qQN/_new 2022-05-31 15:48:56.588050397 +0200 @@ -19,7 +19,7 @@ %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pre-commit -Version: 2.18.1 +Version: 2.19.0 Release: 0 Summary: Multi-language pre-commit hooks License: MIT ++++++ pre_commit-2.18.1.tar.gz -> pre_commit-2.19.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/.github/ISSUE_TEMPLATE/bug.yaml new/pre-commit-2.19.0/.github/ISSUE_TEMPLATE/bug.yaml --- old/pre-commit-2.18.1/.github/ISSUE_TEMPLATE/bug.yaml 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/.github/ISSUE_TEMPLATE/bug.yaml 2022-05-05 15:54:43.000000000 +0200 @@ -9,6 +9,13 @@ [pre-commit.ci]: https://pre-commit.ci [pre-commit-ci/issues]: https://github.com/pre-commit-ci/issues + - type: input + id: search + attributes: + label: search tried in the issue tracker + placeholder: ... + validations: + required: true - type: textarea id: freeform attributes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/.pre-commit-config.yaml new/pre-commit-2.19.0/.pre-commit-config.yaml --- old/pre-commit-2.18.1/.pre-commit-config.yaml 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/.pre-commit-config.yaml 2022-05-05 15:54:43.000000000 +0200 @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v4.2.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -10,22 +10,22 @@ - id: name-tests-test - id: requirements-txt-fixer - repo: https://github.com/asottile/setup-cfg-fmt - rev: v1.20.0 + rev: v1.20.1 hooks: - id: setup-cfg-fmt - repo: https://github.com/asottile/reorder_python_imports - rev: v3.0.1 + rev: v3.1.0 hooks: - id: reorder-python-imports exclude: ^(pre_commit/resources/|testing/resources/python3_hooks_repo/) args: [--py37-plus, --add-import, 'from __future__ import annotations'] - repo: https://github.com/asottile/add-trailing-comma - rev: v2.2.1 + rev: v2.2.3 hooks: - id: add-trailing-comma args: [--py36-plus] - repo: https://github.com/asottile/pyupgrade - rev: v2.31.1 + rev: v2.32.0 hooks: - id: pyupgrade args: [--py37-plus] @@ -38,7 +38,7 @@ hooks: - id: flake8 - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.942 + rev: v0.950 hooks: - id: mypy additional_dependencies: [types-all] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/.pre-commit-hooks.yaml new/pre-commit-2.19.0/.pre-commit-hooks.yaml --- old/pre-commit-2.18.1/.pre-commit-hooks.yaml 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/.pre-commit-hooks.yaml 2022-05-05 15:54:43.000000000 +0200 @@ -1,6 +1,6 @@ - id: validate_manifest name: validate pre-commit manifest description: This validator validates a pre-commit hooks manifest file - entry: pre-commit-validate-manifest + entry: pre-commit validate-manifest language: python - files: ^(\.pre-commit-hooks\.yaml|hooks\.yaml)$ + files: ^\.pre-commit-hooks\.yaml$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/CHANGELOG.md new/pre-commit-2.19.0/CHANGELOG.md --- old/pre-commit-2.18.1/CHANGELOG.md 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/CHANGELOG.md 2022-05-05 15:54:43.000000000 +0200 @@ -1,3 +1,27 @@ +2.19.0 - 2022-05-05 +=================== + +### Features +- Allow multiple outputs from `language: dotnet` hooks. + - #2332 PR by @WallucePinkham. +- Add more information to `healthy()` failure. + - #2348 PR by @asottile. +- Upgrade ruby-build. + - #2342 PR by @jalessio. +- Add `pre-commit validate-config` / `pre-commit validate-manifest` and + deprecate `pre-commit-validate-config` and `pre-commit-validate-manifest`. + - #2362 PR by @asottile. + +### Fixes +- Fix `pre-push` when pushed ref contains spaces. + - #2345 PR by @wwade. + - #2344 issue by @wwade. + +### Updating +- Change `pre-commit-validate-config` / `pre-commit-validate-manifest` to + `pre-commit validate-config` / `pre-commit validate-manifest`. + - #2362 PR by @asottile. + 2.18.1 - 2022-04-02 =================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/CONTRIBUTING.md new/pre-commit-2.19.0/CONTRIBUTING.md --- old/pre-commit-2.18.1/CONTRIBUTING.md 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/CONTRIBUTING.md 2022-05-05 15:54:43.000000000 +0200 @@ -117,15 +117,16 @@ `python` is currently the only language which implements this api -#### `healthy` +#### `health_check` This is used to check whether the installed environment is considered healthy. -This function should return `True` or `False`. +This function should return a detailed message if unhealthy or `None` if +healthy. You generally don't need to implement this on a first pass and can just use: ```python -healthy = helpers.basic_healthy +health_check = helpers.basic_healthy_check ``` `python` is currently the only language which implements this api, for python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/azure-pipelines.yml new/pre-commit-2.19.0/azure-pipelines.yml --- old/pre-commit-2.18.1/azure-pipelines.yml 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/azure-pipelines.yml 2022-05-05 15:54:43.000000000 +0200 @@ -10,7 +10,7 @@ type: github endpoint: github name: asottile/azure-pipeline-templates - ref: refs/tags/v2.1.0 + ref: refs/tags/v2.4.1 jobs: - template: job--python-tox.yml@asottile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/clientlib.py new/pre-commit-2.19.0/pre_commit/clientlib.py --- old/pre-commit-2.18.1/pre_commit/clientlib.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/clientlib.py 2022-05-05 15:54:43.000000000 +0200 @@ -14,6 +14,8 @@ import pre_commit.constants as C from pre_commit.color import add_color_option +from pre_commit.commands.validate_config import validate_config +from pre_commit.commands.validate_manifest import validate_manifest from pre_commit.errors import FatalError from pre_commit.languages.all import all_languages from pre_commit.logging_handler import logging_handler @@ -100,14 +102,12 @@ args = parser.parse_args(argv) with logging_handler(args.color): - ret = 0 - for filename in args.filenames: - try: - load_manifest(filename) - except InvalidManifestError as e: - print(e) - ret = 1 - return ret + logger.warning( + 'pre-commit-validate-manifest is deprecated -- ' + 'use `pre-commit validate-manifest` instead.', + ) + + return validate_manifest(args.filenames) LOCAL = 'local' @@ -409,11 +409,9 @@ args = parser.parse_args(argv) with logging_handler(args.color): - ret = 0 - for filename in args.filenames: - try: - load_config(filename) - except InvalidConfigError as e: - print(e) - ret = 1 - return ret + logger.warning( + 'pre-commit-validate-config is deprecated -- ' + 'use `pre-commit validate-config` instead.', + ) + + return validate_config(args.filenames) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/commands/hook_impl.py new/pre-commit-2.19.0/pre_commit/commands/hook_impl.py --- old/pre-commit-2.18.1/pre_commit/commands/hook_impl.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/commands/hook_impl.py 2022-05-05 15:54:43.000000000 +0200 @@ -114,7 +114,8 @@ remote_url = args[1] for line in stdin.decode().splitlines(): - local_branch, local_sha, remote_branch, remote_sha = line.split() + parts = line.rsplit(maxsplit=3) + local_branch, local_sha, remote_branch, remote_sha = parts if local_sha == Z40: continue elif remote_sha != Z40 and _rev_exists(remote_sha): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/commands/validate_config.py new/pre-commit-2.19.0/pre_commit/commands/validate_config.py --- old/pre-commit-2.18.1/pre_commit/commands/validate_config.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pre-commit-2.19.0/pre_commit/commands/validate_config.py 2022-05-05 15:54:43.000000000 +0200 @@ -0,0 +1,16 @@ +from __future__ import annotations + +from pre_commit import clientlib + + +def validate_config(filenames: list[str]) -> int: + ret = 0 + + for filename in filenames: + try: + clientlib.load_config(filename) + except clientlib.InvalidConfigError as e: + print(e) + ret = 1 + + return ret diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/commands/validate_manifest.py new/pre-commit-2.19.0/pre_commit/commands/validate_manifest.py --- old/pre-commit-2.18.1/pre_commit/commands/validate_manifest.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pre-commit-2.19.0/pre_commit/commands/validate_manifest.py 2022-05-05 15:54:43.000000000 +0200 @@ -0,0 +1,16 @@ +from __future__ import annotations + +from pre_commit import clientlib + + +def validate_manifest(filenames: list[str]) -> int: + ret = 0 + + for filename in filenames: + try: + clientlib.load_manifest(filename) + except clientlib.InvalidManifestError as e: + print(e) + ret = 1 + + return ret diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/all.py new/pre-commit-2.19.0/pre_commit/languages/all.py --- old/pre-commit-2.18.1/pre_commit/languages/all.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/all.py 2022-05-05 15:54:43.000000000 +0200 @@ -34,7 +34,7 @@ # return a value to replace `'default` for `language_version` get_default_version: Callable[[], str] # return whether the environment is healthy (or should be rebuilt) - healthy: Callable[[Prefix, str], bool] + health_check: Callable[[Prefix, str], str | None] # install a repository for the given language and language_version install_environment: Callable[[Prefix, str, Sequence[str]], None] # execute a hook and return the exit code and output @@ -44,25 +44,25 @@ # TODO: back to modules + Protocol: https://github.com/python/mypy/issues/5018 languages = { # BEGIN GENERATED (testing/gen-languages-all) - 'conda': Language(name='conda', ENVIRONMENT_DIR=conda.ENVIRONMENT_DIR, get_default_version=conda.get_default_version, healthy=conda.healthy, install_environment=conda.install_environment, run_hook=conda.run_hook), # noqa: E501 - 'coursier': Language(name='coursier', ENVIRONMENT_DIR=coursier.ENVIRONMENT_DIR, get_default_version=coursier.get_default_version, healthy=coursier.healthy, install_environment=coursier.install_environment, run_hook=coursier.run_hook), # noqa: E501 - 'dart': Language(name='dart', ENVIRONMENT_DIR=dart.ENVIRONMENT_DIR, get_default_version=dart.get_default_version, healthy=dart.healthy, install_environment=dart.install_environment, run_hook=dart.run_hook), # noqa: E501 - 'docker': Language(name='docker', ENVIRONMENT_DIR=docker.ENVIRONMENT_DIR, get_default_version=docker.get_default_version, healthy=docker.healthy, install_environment=docker.install_environment, run_hook=docker.run_hook), # noqa: E501 - 'docker_image': Language(name='docker_image', ENVIRONMENT_DIR=docker_image.ENVIRONMENT_DIR, get_default_version=docker_image.get_default_version, healthy=docker_image.healthy, install_environment=docker_image.install_environment, run_hook=docker_image.run_hook), # noqa: E501 - 'dotnet': Language(name='dotnet', ENVIRONMENT_DIR=dotnet.ENVIRONMENT_DIR, get_default_version=dotnet.get_default_version, healthy=dotnet.healthy, install_environment=dotnet.install_environment, run_hook=dotnet.run_hook), # noqa: E501 - 'fail': Language(name='fail', ENVIRONMENT_DIR=fail.ENVIRONMENT_DIR, get_default_version=fail.get_default_version, healthy=fail.healthy, install_environment=fail.install_environment, run_hook=fail.run_hook), # noqa: E501 - 'golang': Language(name='golang', ENVIRONMENT_DIR=golang.ENVIRONMENT_DIR, get_default_version=golang.get_default_version, healthy=golang.healthy, install_environment=golang.install_environment, run_hook=golang.run_hook), # noqa: E501 - 'lua': Language(name='lua', ENVIRONMENT_DIR=lua.ENVIRONMENT_DIR, get_default_version=lua.get_default_version, healthy=lua.healthy, install_environment=lua.install_environment, run_hook=lua.run_hook), # noqa: E501 - 'node': Language(name='node', ENVIRONMENT_DIR=node.ENVIRONMENT_DIR, get_default_version=node.get_default_version, healthy=node.healthy, install_environment=node.install_environment, run_hook=node.run_hook), # noqa: E501 - 'perl': Language(name='perl', ENVIRONMENT_DIR=perl.ENVIRONMENT_DIR, get_default_version=perl.get_default_version, healthy=perl.healthy, install_environment=perl.install_environment, run_hook=perl.run_hook), # noqa: E501 - 'pygrep': Language(name='pygrep', ENVIRONMENT_DIR=pygrep.ENVIRONMENT_DIR, get_default_version=pygrep.get_default_version, healthy=pygrep.healthy, install_environment=pygrep.install_environment, run_hook=pygrep.run_hook), # noqa: E501 - 'python': Language(name='python', ENVIRONMENT_DIR=python.ENVIRONMENT_DIR, get_default_version=python.get_default_version, healthy=python.healthy, install_environment=python.install_environment, run_hook=python.run_hook), # noqa: E501 - 'r': Language(name='r', ENVIRONMENT_DIR=r.ENVIRONMENT_DIR, get_default_version=r.get_default_version, healthy=r.healthy, install_environment=r.install_environment, run_hook=r.run_hook), # noqa: E501 - 'ruby': Language(name='ruby', ENVIRONMENT_DIR=ruby.ENVIRONMENT_DIR, get_default_version=ruby.get_default_version, healthy=ruby.healthy, install_environment=ruby.install_environment, run_hook=ruby.run_hook), # noqa: E501 - 'rust': Language(name='rust', ENVIRONMENT_DIR=rust.ENVIRONMENT_DIR, get_default_version=rust.get_default_version, healthy=rust.healthy, install_environment=rust.install_environment, run_hook=rust.run_hook), # noqa: E501 - 'script': Language(name='script', ENVIRONMENT_DIR=script.ENVIRONMENT_DIR, get_default_version=script.get_default_version, healthy=script.healthy, install_environment=script.install_environment, run_hook=script.run_hook), # noqa: E501 - 'swift': Language(name='swift', ENVIRONMENT_DIR=swift.ENVIRONMENT_DIR, get_default_version=swift.get_default_version, healthy=swift.healthy, install_environment=swift.install_environment, run_hook=swift.run_hook), # noqa: E501 - 'system': Language(name='system', ENVIRONMENT_DIR=system.ENVIRONMENT_DIR, get_default_version=system.get_default_version, healthy=system.healthy, install_environment=system.install_environment, run_hook=system.run_hook), # noqa: E501 + 'conda': Language(name='conda', ENVIRONMENT_DIR=conda.ENVIRONMENT_DIR, get_default_version=conda.get_default_version, health_check=conda.health_check, install_environment=conda.install_environment, run_hook=conda.run_hook), # noqa: E501 + 'coursier': Language(name='coursier', ENVIRONMENT_DIR=coursier.ENVIRONMENT_DIR, get_default_version=coursier.get_default_version, health_check=coursier.health_check, install_environment=coursier.install_environment, run_hook=coursier.run_hook), # noqa: E501 + 'dart': Language(name='dart', ENVIRONMENT_DIR=dart.ENVIRONMENT_DIR, get_default_version=dart.get_default_version, health_check=dart.health_check, install_environment=dart.install_environment, run_hook=dart.run_hook), # noqa: E501 + 'docker': Language(name='docker', ENVIRONMENT_DIR=docker.ENVIRONMENT_DIR, get_default_version=docker.get_default_version, health_check=docker.health_check, install_environment=docker.install_environment, run_hook=docker.run_hook), # noqa: E501 + 'docker_image': Language(name='docker_image', ENVIRONMENT_DIR=docker_image.ENVIRONMENT_DIR, get_default_version=docker_image.get_default_version, health_check=docker_image.health_check, install_environment=docker_image.install_environment, run_hook=docker_image.run_hook), # noqa: E501 + 'dotnet': Language(name='dotnet', ENVIRONMENT_DIR=dotnet.ENVIRONMENT_DIR, get_default_version=dotnet.get_default_version, health_check=dotnet.health_check, install_environment=dotnet.install_environment, run_hook=dotnet.run_hook), # noqa: E501 + 'fail': Language(name='fail', ENVIRONMENT_DIR=fail.ENVIRONMENT_DIR, get_default_version=fail.get_default_version, health_check=fail.health_check, install_environment=fail.install_environment, run_hook=fail.run_hook), # noqa: E501 + 'golang': Language(name='golang', ENVIRONMENT_DIR=golang.ENVIRONMENT_DIR, get_default_version=golang.get_default_version, health_check=golang.health_check, install_environment=golang.install_environment, run_hook=golang.run_hook), # noqa: E501 + 'lua': Language(name='lua', ENVIRONMENT_DIR=lua.ENVIRONMENT_DIR, get_default_version=lua.get_default_version, health_check=lua.health_check, install_environment=lua.install_environment, run_hook=lua.run_hook), # noqa: E501 + 'node': Language(name='node', ENVIRONMENT_DIR=node.ENVIRONMENT_DIR, get_default_version=node.get_default_version, health_check=node.health_check, install_environment=node.install_environment, run_hook=node.run_hook), # noqa: E501 + 'perl': Language(name='perl', ENVIRONMENT_DIR=perl.ENVIRONMENT_DIR, get_default_version=perl.get_default_version, health_check=perl.health_check, install_environment=perl.install_environment, run_hook=perl.run_hook), # noqa: E501 + 'pygrep': Language(name='pygrep', ENVIRONMENT_DIR=pygrep.ENVIRONMENT_DIR, get_default_version=pygrep.get_default_version, health_check=pygrep.health_check, install_environment=pygrep.install_environment, run_hook=pygrep.run_hook), # noqa: E501 + 'python': Language(name='python', ENVIRONMENT_DIR=python.ENVIRONMENT_DIR, get_default_version=python.get_default_version, health_check=python.health_check, install_environment=python.install_environment, run_hook=python.run_hook), # noqa: E501 + 'r': Language(name='r', ENVIRONMENT_DIR=r.ENVIRONMENT_DIR, get_default_version=r.get_default_version, health_check=r.health_check, install_environment=r.install_environment, run_hook=r.run_hook), # noqa: E501 + 'ruby': Language(name='ruby', ENVIRONMENT_DIR=ruby.ENVIRONMENT_DIR, get_default_version=ruby.get_default_version, health_check=ruby.health_check, install_environment=ruby.install_environment, run_hook=ruby.run_hook), # noqa: E501 + 'rust': Language(name='rust', ENVIRONMENT_DIR=rust.ENVIRONMENT_DIR, get_default_version=rust.get_default_version, health_check=rust.health_check, install_environment=rust.install_environment, run_hook=rust.run_hook), # noqa: E501 + 'script': Language(name='script', ENVIRONMENT_DIR=script.ENVIRONMENT_DIR, get_default_version=script.get_default_version, health_check=script.health_check, install_environment=script.install_environment, run_hook=script.run_hook), # noqa: E501 + 'swift': Language(name='swift', ENVIRONMENT_DIR=swift.ENVIRONMENT_DIR, get_default_version=swift.get_default_version, health_check=swift.health_check, install_environment=swift.install_environment, run_hook=swift.run_hook), # noqa: E501 + 'system': Language(name='system', ENVIRONMENT_DIR=system.ENVIRONMENT_DIR, get_default_version=system.get_default_version, health_check=system.health_check, install_environment=system.install_environment, run_hook=system.run_hook), # noqa: E501 # END GENERATED } # TODO: fully deprecate `python_venv` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/conda.py new/pre-commit-2.19.0/pre_commit/languages/conda.py --- old/pre-commit-2.18.1/pre_commit/languages/conda.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/conda.py 2022-05-05 15:54:43.000000000 +0200 @@ -18,7 +18,7 @@ ENVIRONMENT_DIR = 'conda' get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check def get_env_patch(env: str) -> PatchesT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/coursier.py new/pre-commit-2.19.0/pre_commit/languages/coursier.py --- old/pre-commit-2.18.1/pre_commit/languages/coursier.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/coursier.py 2022-05-05 15:54:43.000000000 +0200 @@ -17,7 +17,7 @@ ENVIRONMENT_DIR = 'coursier' get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check def install_environment( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/dart.py new/pre-commit-2.19.0/pre_commit/languages/dart.py --- old/pre-commit-2.18.1/pre_commit/languages/dart.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/dart.py 2022-05-05 15:54:43.000000000 +0200 @@ -21,7 +21,7 @@ ENVIRONMENT_DIR = 'dartenv' get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check def get_env_patch(venv: str) -> PatchesT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/docker.py new/pre-commit-2.19.0/pre_commit/languages/docker.py --- old/pre-commit-2.18.1/pre_commit/languages/docker.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/docker.py 2022-05-05 15:54:43.000000000 +0200 @@ -16,7 +16,7 @@ ENVIRONMENT_DIR = 'docker' PRE_COMMIT_LABEL = 'PRE_COMMIT' get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check def _is_in_docker() -> bool: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/docker_image.py new/pre-commit-2.19.0/pre_commit/languages/docker_image.py --- old/pre-commit-2.18.1/pre_commit/languages/docker_image.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/docker_image.py 2022-05-05 15:54:43.000000000 +0200 @@ -8,7 +8,7 @@ ENVIRONMENT_DIR = None get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check install_environment = helpers.no_install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/dotnet.py new/pre-commit-2.19.0/pre_commit/languages/dotnet.py --- old/pre-commit-2.18.1/pre_commit/languages/dotnet.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/dotnet.py 2022-05-05 15:54:43.000000000 +0200 @@ -18,7 +18,7 @@ BIN_DIR = 'bin' get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check def get_env_patch(venv: str) -> PatchesT: @@ -59,22 +59,19 @@ # Determine tool from the packaged file <tool_name>.<version>.nupkg build_outputs = os.listdir(os.path.join(prefix.prefix_dir, build_dir)) - if len(build_outputs) != 1: - raise NotImplementedError( - f"Can't handle multiple build outputs. Got {build_outputs}", - ) - tool_name = build_outputs[0].split('.')[0] + for output in build_outputs: + tool_name = output.split('.')[0] - # Install to bin dir - helpers.run_setup_cmd( - prefix, - ( - 'dotnet', 'tool', 'install', - '--tool-path', os.path.join(envdir, BIN_DIR), - '--add-source', build_dir, - tool_name, - ), - ) + # Install to bin dir + helpers.run_setup_cmd( + prefix, + ( + 'dotnet', 'tool', 'install', + '--tool-path', os.path.join(envdir, BIN_DIR), + '--add-source', build_dir, + tool_name, + ), + ) # Clean the git dir, ignoring the environment dir clean_cmd = ('git', 'clean', '-ffxd', '-e', f'{ENVIRONMENT_DIR}-*') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/fail.py new/pre-commit-2.19.0/pre_commit/languages/fail.py --- old/pre-commit-2.18.1/pre_commit/languages/fail.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/fail.py 2022-05-05 15:54:43.000000000 +0200 @@ -7,7 +7,7 @@ ENVIRONMENT_DIR = None get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check install_environment = helpers.no_install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/golang.py new/pre-commit-2.19.0/pre_commit/languages/golang.py --- old/pre-commit-2.18.1/pre_commit/languages/golang.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/golang.py 2022-05-05 15:54:43.000000000 +0200 @@ -21,7 +21,7 @@ ENVIRONMENT_DIR = 'golangenv' get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check def get_env_patch(venv: str) -> PatchesT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/helpers.py new/pre-commit-2.19.0/pre_commit/languages/helpers.py --- old/pre-commit-2.18.1/pre_commit/languages/helpers.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/helpers.py 2022-05-05 15:54:43.000000000 +0200 @@ -88,8 +88,8 @@ return C.DEFAULT -def basic_healthy(prefix: Prefix, language_version: str) -> bool: - return True +def basic_health_check(prefix: Prefix, language_version: str) -> str | None: + return None def no_install( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/lua.py new/pre-commit-2.19.0/pre_commit/languages/lua.py --- old/pre-commit-2.18.1/pre_commit/languages/lua.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/lua.py 2022-05-05 15:54:43.000000000 +0200 @@ -18,7 +18,7 @@ ENVIRONMENT_DIR = 'lua_env' get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check def _get_lua_version() -> str: # pragma: win32 no cover diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/node.py new/pre-commit-2.19.0/pre_commit/languages/node.py --- old/pre-commit-2.18.1/pre_commit/languages/node.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/node.py 2022-05-05 15:54:43.000000000 +0200 @@ -73,10 +73,13 @@ yield -def healthy(prefix: Prefix, language_version: str) -> bool: +def health_check(prefix: Prefix, language_version: str) -> str | None: with in_env(prefix, language_version): retcode, _, _ = cmd_output_b('node', '--version', retcode=None) - return retcode == 0 + if retcode != 0: # pragma: win32 no cover + return f'`node --version` returned {retcode}' + else: + return None def install_environment( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/perl.py new/pre-commit-2.19.0/pre_commit/languages/perl.py --- old/pre-commit-2.18.1/pre_commit/languages/perl.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/perl.py 2022-05-05 15:54:43.000000000 +0200 @@ -16,7 +16,7 @@ ENVIRONMENT_DIR = 'perl_env' get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check def _envdir(prefix: Prefix, version: str) -> str: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/pygrep.py new/pre-commit-2.19.0/pre_commit/languages/pygrep.py --- old/pre-commit-2.18.1/pre_commit/languages/pygrep.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/pygrep.py 2022-05-05 15:54:43.000000000 +0200 @@ -14,7 +14,7 @@ ENVIRONMENT_DIR = None get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check install_environment = helpers.no_install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/python.py new/pre-commit-2.19.0/pre_commit/languages/python.py --- old/pre-commit-2.18.1/pre_commit/languages/python.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/python.py 2022-05-05 15:54:43.000000000 +0200 @@ -163,27 +163,44 @@ yield -def healthy(prefix: Prefix, language_version: str) -> bool: +def health_check(prefix: Prefix, language_version: str) -> str | None: directory = helpers.environment_dir(ENVIRONMENT_DIR, language_version) envdir = prefix.path(directory) pyvenv_cfg = os.path.join(envdir, 'pyvenv.cfg') # created with "old" virtualenv if not os.path.exists(pyvenv_cfg): - return False + return 'pyvenv.cfg does not exist (old virtualenv?)' exe_name = win_exe('python') py_exe = prefix.path(bin_dir(envdir), exe_name) cfg = _read_pyvenv_cfg(pyvenv_cfg) - return ( - 'version_info' in cfg and - # always use uncached lookup here in case we replaced an unhealthy env - _version_info.__wrapped__(py_exe) == cfg['version_info'] and ( - 'base-executable' not in cfg or - _version_info(cfg['base-executable']) == cfg['version_info'] + if 'version_info' not in cfg: + return "created virtualenv's pyvenv.cfg is missing `version_info`" + + # always use uncached lookup here in case we replaced an unhealthy env + virtualenv_version = _version_info.__wrapped__(py_exe) + if virtualenv_version != cfg['version_info']: + return ( + f'virtualenv python version did not match created version:\n' + f'- actual version: {virtualenv_version}\n' + f'- expected version: {cfg["version_info"]}\n' + ) + + # made with an older version of virtualenv? skip `base-executable` check + if 'base-executable' not in cfg: + return None + + base_exe_version = _version_info(cfg['base-executable']) + if base_exe_version != cfg['version_info']: + return ( + f'base executable python version does not match created version:\n' + f'- base-executable version: {base_exe_version}\n' + f'- expected version: {cfg["version_info"]}\n' ) - ) + else: + return None def install_environment( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/r.py new/pre-commit-2.19.0/pre_commit/languages/r.py --- old/pre-commit-2.18.1/pre_commit/languages/r.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/r.py 2022-05-05 15:54:43.000000000 +0200 @@ -19,7 +19,7 @@ ENVIRONMENT_DIR = 'renv' RSCRIPT_OPTS = ('--no-save', '--no-restore', '--no-site-file', '--no-environ') get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check def get_env_patch(venv: str) -> PatchesT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/ruby.py new/pre-commit-2.19.0/pre_commit/languages/ruby.py --- old/pre-commit-2.18.1/pre_commit/languages/ruby.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/ruby.py 2022-05-05 15:54:43.000000000 +0200 @@ -21,7 +21,7 @@ from pre_commit.util import resource_bytesio ENVIRONMENT_DIR = 'rbenv' -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check @functools.lru_cache(maxsize=1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/rust.py new/pre-commit-2.19.0/pre_commit/languages/rust.py --- old/pre-commit-2.18.1/pre_commit/languages/rust.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/rust.py 2022-05-05 15:54:43.000000000 +0200 @@ -19,7 +19,7 @@ ENVIRONMENT_DIR = 'rustenv' get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check def get_env_patch(target_dir: str) -> PatchesT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/script.py new/pre-commit-2.19.0/pre_commit/languages/script.py --- old/pre-commit-2.18.1/pre_commit/languages/script.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/script.py 2022-05-05 15:54:43.000000000 +0200 @@ -7,7 +7,7 @@ ENVIRONMENT_DIR = None get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check install_environment = helpers.no_install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/swift.py new/pre-commit-2.19.0/pre_commit/languages/swift.py --- old/pre-commit-2.18.1/pre_commit/languages/swift.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/swift.py 2022-05-05 15:54:43.000000000 +0200 @@ -17,7 +17,7 @@ ENVIRONMENT_DIR = 'swift_env' get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check BUILD_DIR = '.build' BUILD_CONFIG = 'release' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/languages/system.py new/pre-commit-2.19.0/pre_commit/languages/system.py --- old/pre-commit-2.18.1/pre_commit/languages/system.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/languages/system.py 2022-05-05 15:54:43.000000000 +0200 @@ -8,7 +8,7 @@ ENVIRONMENT_DIR = None get_default_version = helpers.basic_get_default_version -healthy = helpers.basic_healthy +health_check = helpers.basic_health_check install_environment = helpers.no_install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/main.py new/pre-commit-2.19.0/pre_commit/main.py --- old/pre-commit-2.18.1/pre_commit/main.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/main.py 2022-05-05 15:54:43.000000000 +0200 @@ -21,6 +21,8 @@ from pre_commit.commands.run import run from pre_commit.commands.sample_config import sample_config from pre_commit.commands.try_repo import try_repo +from pre_commit.commands.validate_config import validate_config +from pre_commit.commands.validate_manifest import validate_manifest from pre_commit.error_handler import error_handler from pre_commit.logging_handler import logging_handler from pre_commit.store import Store @@ -34,8 +36,10 @@ # pyvenv os.environ.pop('__PYVENV_LAUNCHER__', None) - -COMMANDS_NO_GIT = {'clean', 'gc', 'init-templatedir', 'sample-config'} +COMMANDS_NO_GIT = { + 'clean', 'gc', 'init-templatedir', 'sample-config', + 'validate-config', 'validate-manifest', +} def _add_config_option(parser: argparse.ArgumentParser) -> None: @@ -304,6 +308,20 @@ _add_config_option(uninstall_parser) _add_hook_type_option(uninstall_parser) + validate_config_parser = subparsers.add_parser( + 'validate-config', help='Validate .pre-commit-config.yaml files', + ) + add_color_option(validate_config_parser) + _add_config_option(validate_config_parser) + validate_config_parser.add_argument('filenames', nargs='*') + + validate_manifest_parser = subparsers.add_parser( + 'validate-manifest', help='Validate .pre-commit-hooks.yaml files', + ) + add_color_option(validate_manifest_parser) + _add_config_option(validate_manifest_parser) + validate_manifest_parser.add_argument('filenames', nargs='*') + help = subparsers.add_parser( 'help', help='Show help for a specific command.', ) @@ -378,6 +396,10 @@ config_file=args.config, hook_types=args.hook_types, ) + elif args.command == 'validate-config': + return validate_config(args.filenames) + elif args.command == 'validate-manifest': + return validate_manifest(args.filenames) else: raise NotImplementedError( f'Command {args.command} not implemented.', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/pre_commit/repository.py new/pre-commit-2.19.0/pre_commit/repository.py --- old/pre-commit-2.18.1/pre_commit/repository.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/pre_commit/repository.py 2022-05-05 15:54:43.000000000 +0200 @@ -57,7 +57,7 @@ _read_state(hook.prefix, venv) == _state(hook.additional_dependencies) ) and - lang.healthy(hook.prefix, hook.language_version) + not lang.health_check(hook.prefix, hook.language_version) ) ) @@ -79,11 +79,13 @@ lang.install_environment( hook.prefix, hook.language_version, hook.additional_dependencies, ) - if not lang.healthy(hook.prefix, hook.language_version): + health_error = lang.health_check(hook.prefix, hook.language_version) + if health_error: raise AssertionError( - f'BUG: expected environment for {hook.language} to be healthy() ' + f'BUG: expected environment for {hook.language} to be healthy ' f'immediately after install, please open an issue describing ' - f'your environment', + f'your environment\n\n' + f'more info:\n\n{health_error}', ) # Write our state to indicate we're installed _write_state(hook.prefix, venv, _state(hook.additional_dependencies)) Binary files old/pre-commit-2.18.1/pre_commit/resources/ruby-build.tar.gz and new/pre-commit-2.19.0/pre_commit/resources/ruby-build.tar.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/setup.cfg new/pre-commit-2.19.0/setup.cfg --- old/pre-commit-2.18.1/setup.cfg 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/setup.cfg 2022-05-05 15:54:43.000000000 +0200 @@ -1,6 +1,6 @@ [metadata] name = pre_commit -version = 2.18.1 +version = 2.19.0 description = A framework for managing and maintaining multi-language pre-commit hooks. long_description = file: README.md long_description_content_type = text/markdown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/testing/gen-languages-all new/pre-commit-2.19.0/testing/gen-languages-all --- old/pre-commit-2.18.1/testing/gen-languages-all 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/testing/gen-languages-all 2022-05-05 15:54:43.000000000 +0200 @@ -3,15 +3,15 @@ import sys -LANGUAGES = [ +LANGUAGES = ( 'conda', 'coursier', 'dart', 'docker', 'docker_image', 'dotnet', 'fail', 'golang', 'lua', 'node', 'perl', 'pygrep', 'python', 'r', 'ruby', 'rust', 'script', 'swift', 'system', -] -FIELDS = [ - 'ENVIRONMENT_DIR', 'get_default_version', 'healthy', 'install_environment', - 'run_hook', -] +) +FIELDS = ( + 'ENVIRONMENT_DIR', 'get_default_version', 'health_check', + 'install_environment', 'run_hook', +) def main() -> int: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/testing/get-swift.sh new/pre-commit-2.19.0/testing/get-swift.sh --- old/pre-commit-2.18.1/testing/get-swift.sh 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/testing/get-swift.sh 2022-05-05 15:54:43.000000000 +0200 @@ -3,9 +3,9 @@ set -euo pipefail . /etc/lsb-release -if [ "$DISTRIB_CODENAME" = "bionic" ]; then - SWIFT_URL='https://swift.org/builds/swift-5.1.3-release/ubuntu1804/swift-5.1.3-RELEASE…' - SWIFT_HASH='ac82ccd773fe3d586fc340814e31e120da1ff695c6a712f6634e9cc720769610' +if [ "$DISTRIB_CODENAME" = "focal" ]; then + SWIFT_URL='https://download.swift.org/swift-5.6.1-release/ubuntu2004/swift-5.6.1-RELEA…' + SWIFT_HASH='2b4f22d4a8b59fe8e050f0b7f020f8d8f12553cbda56709b2340a4a3bb90cfea' else echo "unknown dist: ${DISTRIB_CODENAME}" 1>&2 exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/testing/make-archives new/pre-commit-2.19.0/testing/make-archives --- old/pre-commit-2.18.1/testing/make-archives 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/testing/make-archives 2022-05-05 15:54:43.000000000 +0200 @@ -17,7 +17,7 @@ REPOS = ( ('rbenv', 'https://github.com/rbenv/rbenv', '38e1fbb'), - ('ruby-build', 'https://github.com/rbenv/ruby-build', 'a5ca3e4'), + ('ruby-build', 'https://github.com/rbenv/ruby-build', '2004fd7'), ( 'ruby-download', 'https://github.com/garnieretienne/rvm-download', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/.pre-commit-hooks.yaml new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/.pre-commit-hooks.yaml --- old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/.pre-commit-hooks.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/.pre-commit-hooks.yaml 2022-05-05 15:54:43.000000000 +0200 @@ -0,0 +1,12 @@ +- id: dotnet-example-hook + name: Test Project 1 + description: Test Project 1 + entry: proj1 + language: dotnet + stages: [commit] +- id: proj2 + name: Test Project 2 + description: Test Project 2 + entry: proj2 + language: dotnet + stages: [commit] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/dotnet_hooks_combo_repo.sln new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/dotnet_hooks_combo_repo.sln --- old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/dotnet_hooks_combo_repo.sln 1970-01-01 01:00:00.000000000 +0100 +++ new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/dotnet_hooks_combo_repo.sln 2022-05-05 15:54:43.000000000 +0200 @@ -0,0 +1,28 @@ +�� +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30114.105 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "proj1", "proj1\proj1.csproj", "{38A939C3-DEA4-47D7-9B75-0418C4249662}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "proj2", "proj2\proj2.csproj", "{4C9916CB-165C-4EF5-8A57-4CB6794C1EBF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {38A939C3-DEA4-47D7-9B75-0418C4249662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {38A939C3-DEA4-47D7-9B75-0418C4249662}.Debug|Any CPU.Build.0 = Debug|Any CPU + {38A939C3-DEA4-47D7-9B75-0418C4249662}.Release|Any CPU.ActiveCfg = Release|Any CPU + {38A939C3-DEA4-47D7-9B75-0418C4249662}.Release|Any CPU.Build.0 = Release|Any CPU + {4C9916CB-165C-4EF5-8A57-4CB6794C1EBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C9916CB-165C-4EF5-8A57-4CB6794C1EBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C9916CB-165C-4EF5-8A57-4CB6794C1EBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C9916CB-165C-4EF5-8A57-4CB6794C1EBF}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/proj1/Program.cs new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/proj1/Program.cs --- old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/proj1/Program.cs 1970-01-01 01:00:00.000000000 +0100 +++ new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/proj1/Program.cs 2022-05-05 15:54:43.000000000 +0200 @@ -0,0 +1,12 @@ +��using System; + +namespace proj1 +{ + class Program + { + static void Main(string[] args) + { + Console.Write("Hello from dotnet!\n"); + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/proj1/proj1.csproj new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/proj1/proj1.csproj --- old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/proj1/proj1.csproj 1970-01-01 01:00:00.000000000 +0100 +++ new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/proj1/proj1.csproj 2022-05-05 15:54:43.000000000 +0200 @@ -0,0 +1,12 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <OutputType>Exe</OutputType> + <TargetFramework>net5.0</TargetFramework> + + <PackAsTool>true</PackAsTool> + <ToolCommandName>proj1</ToolCommandName> + <PackageOutputPath>./nupkg</PackageOutputPath> + </PropertyGroup> + +</Project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/proj2/Program.cs new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/proj2/Program.cs --- old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/proj2/Program.cs 1970-01-01 01:00:00.000000000 +0100 +++ new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/proj2/Program.cs 2022-05-05 15:54:43.000000000 +0200 @@ -0,0 +1,12 @@ +��using System; + +namespace proj2 +{ + class Program + { + static void Main(string[] args) + { + Console.WriteLine("Hello World!"); + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/proj2/proj2.csproj new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/proj2/proj2.csproj --- old/pre-commit-2.18.1/testing/resources/dotnet_hooks_combo_repo/proj2/proj2.csproj 1970-01-01 01:00:00.000000000 +0100 +++ new/pre-commit-2.19.0/testing/resources/dotnet_hooks_combo_repo/proj2/proj2.csproj 2022-05-05 15:54:43.000000000 +0200 @@ -0,0 +1,12 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <OutputType>Exe</OutputType> + <TargetFramework>net5.0</TargetFramework> + + <PackAsTool>true</PackAsTool> + <ToolCommandName>proj2</ToolCommandName> + <PackageOutputPath>./nupkg</PackageOutputPath> + </PropertyGroup> + +</Project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/testing/resources/golang_hooks_repo/go.mod new/pre-commit-2.19.0/testing/resources/golang_hooks_repo/go.mod --- old/pre-commit-2.18.1/testing/resources/golang_hooks_repo/go.mod 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/testing/resources/golang_hooks_repo/go.mod 2022-05-05 15:54:43.000000000 +0200 @@ -1 +1,5 @@ module golang-hello-world + +go 1.18 + +require github.com/BurntSushi/toml v1.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/testing/resources/golang_hooks_repo/go.sum new/pre-commit-2.19.0/testing/resources/golang_hooks_repo/go.sum --- old/pre-commit-2.18.1/testing/resources/golang_hooks_repo/go.sum 1970-01-01 01:00:00.000000000 +0100 +++ new/pre-commit-2.19.0/testing/resources/golang_hooks_repo/go.sum 2022-05-05 15:54:43.000000000 +0200 @@ -0,0 +1,2 @@ +github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I= +github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/tests/clientlib_test.py new/pre-commit-2.19.0/tests/clientlib_test.py --- old/pre-commit-2.18.1/tests/clientlib_test.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/tests/clientlib_test.py 2022-05-05 15:54:43.000000000 +0200 @@ -122,8 +122,8 @@ f = tmpdir.join('cfg.yaml') f.write('- {repo: meta, hooks: [{id: identity}]}') assert not validate_config_main((f.strpath,)) - start = '[WARNING] normalizing pre-commit configuration to a top-level map' - assert cap_out.get().startswith(start) + msg = '[WARNING] normalizing pre-commit configuration to a top-level map' + assert msg in cap_out.get() def test_validate_warn_on_unknown_keys_at_repo_level(tmpdir, caplog): @@ -142,6 +142,12 @@ ( 'pre_commit', logging.WARNING, + 'pre-commit-validate-config is deprecated -- ' + 'use `pre-commit validate-config` instead.', + ), + ( + 'pre_commit', + logging.WARNING, 'Unexpected key(s) present on https://gitlab.com/pycqa/flake8: ' 'args', ), @@ -165,6 +171,12 @@ ( 'pre_commit', logging.WARNING, + 'pre-commit-validate-config is deprecated -- ' + 'use `pre-commit validate-config` instead.', + ), + ( + 'pre_commit', + logging.WARNING, 'Unexpected key(s) present at root: foo', ), ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/tests/commands/hook_impl_test.py new/pre-commit-2.19.0/tests/commands/hook_impl_test.py --- old/pre-commit-2.18.1/tests/commands/hook_impl_test.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/tests/commands/hook_impl_test.py 2022-05-05 15:54:43.000000000 +0200 @@ -242,6 +242,18 @@ assert ns is None +def test_run_ns_pre_push_ref_with_whitespace(push_example): + src, src_head, clone, _ = push_example + + with cwd(clone): + args = ('origin', src) + line = f'HEAD^{{/ }} {src_head} refs/heads/b2 {hook_impl.Z40}\n' + stdin = line.encode() + ns = hook_impl._run_ns('pre-push', False, args, stdin) + + assert ns is None + + def test_pushing_orphan_branch(push_example): src, src_head, clone, _ = push_example diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/tests/languages/helpers_test.py new/pre-commit-2.19.0/tests/languages/helpers_test.py --- old/pre-commit-2.18.1/tests/languages/helpers_test.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/tests/languages/helpers_test.py 2022-05-05 15:54:43.000000000 +0200 @@ -67,8 +67,8 @@ assert helpers.basic_get_default_version() == C.DEFAULT -def test_basic_healthy(): - assert helpers.basic_healthy(Prefix('.'), 'default') is True +def test_basic_health_check(): + assert helpers.basic_health_check(Prefix('.'), 'default') is None def test_failed_setup_command_does_not_unicode_error(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/tests/languages/node_test.py new/pre-commit-2.19.0/tests/languages/node_test.py --- old/pre-commit-2.18.1/tests/languages/node_test.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/tests/languages/node_test.py 2022-05-05 15:54:43.000000000 +0200 @@ -62,7 +62,7 @@ prefix = Prefix(str(tmpdir)) node.install_environment(prefix, 'system', ()) - assert node.healthy(prefix, 'system') + assert node.health_check(prefix, 'system') is None @xfailif_windows # pragma: win32 no cover @@ -78,10 +78,11 @@ with envcontext.envcontext((path,)): prefix = Prefix(str(prefix_dir)) node.install_environment(prefix, 'system', ()) - assert node.healthy(prefix, 'system') + assert node.health_check(prefix, 'system') is None node_bin.remove() - assert not node.healthy(prefix, 'system') + ret = node.health_check(prefix, 'system') + assert ret == '`node --version` returned 127' @xfailif_windows # pragma: win32 no cover @@ -101,7 +102,7 @@ prefix = Prefix(str(tmpdir)) node.install_environment(prefix, 'system', ()) - assert node.healthy(prefix, 'system') + assert node.health_check(prefix, 'system') is None # this directory shouldn't exist, make sure we succeed without it existing cmd_output('rm', '-rf', str(tmpdir.join('node_modules'))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/tests/languages/python_test.py new/pre-commit-2.19.0/tests/languages/python_test.py --- old/pre-commit-2.18.1/tests/languages/python_test.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/tests/languages/python_test.py 2022-05-05 15:54:43.000000000 +0200 @@ -93,11 +93,11 @@ python.install_environment(prefix, C.DEFAULT, ()) # should be healthy right after creation - assert python.healthy(prefix, C.DEFAULT) is True + assert python.health_check(prefix, C.DEFAULT) is None # even if a `types.py` file exists, should still be healthy tmpdir.join('types.py').ensure() - assert python.healthy(prefix, C.DEFAULT) is True + assert python.health_check(prefix, C.DEFAULT) is None def test_healthy_venv_creator(python_dir): @@ -107,7 +107,7 @@ with envcontext((('VIRTUALENV_CREATOR', 'venv'),)): python.install_environment(prefix, C.DEFAULT, ()) - assert python.healthy(prefix, C.DEFAULT) is True + assert python.health_check(prefix, C.DEFAULT) is None def test_unhealthy_python_goes_missing(python_dir): @@ -119,7 +119,12 @@ py_exe = prefix.path(python.bin_dir('py_env-default'), exe_name) os.remove(py_exe) - assert python.healthy(prefix, C.DEFAULT) is False + ret = python.health_check(prefix, C.DEFAULT) + assert ret == ( + f'virtualenv python version did not match created version:\n' + f'- actual version: <<error retrieving version from {py_exe}>>\n' + f'- expected version: {python._version_info(sys.executable)}\n' + ) def test_unhealthy_with_version_change(python_dir): @@ -127,10 +132,15 @@ python.install_environment(prefix, C.DEFAULT, ()) - with open(prefix.path('py_env-default/pyvenv.cfg'), 'w') as f: + with open(prefix.path('py_env-default/pyvenv.cfg'), 'a+') as f: f.write('version_info = 1.2.3\n') - assert python.healthy(prefix, C.DEFAULT) is False + ret = python.health_check(prefix, C.DEFAULT) + assert ret == ( + f'virtualenv python version did not match created version:\n' + f'- actual version: {python._version_info(sys.executable)}\n' + f'- expected version: 1.2.3\n' + ) def test_unhealthy_system_version_changes(python_dir): @@ -141,7 +151,12 @@ with open(prefix.path('py_env-default/pyvenv.cfg'), 'a') as f: f.write('base-executable = /does/not/exist\n') - assert python.healthy(prefix, C.DEFAULT) is False + ret = python.health_check(prefix, C.DEFAULT) + assert ret == ( + f'base executable python version does not match created version:\n' + f'- base-executable version: <<error retrieving version from /does/not/exist>>\n' # noqa: E501 + f'- expected version: {python._version_info(sys.executable)}\n' + ) def test_unhealthy_old_virtualenv(python_dir): @@ -152,7 +167,21 @@ # simulate "old" virtualenv by deleting this file os.remove(prefix.path('py_env-default/pyvenv.cfg')) - assert python.healthy(prefix, C.DEFAULT) is False + ret = python.health_check(prefix, C.DEFAULT) + assert ret == 'pyvenv.cfg does not exist (old virtualenv?)' + + +def test_unhealthy_unexpected_pyvenv(python_dir): + prefix, tmpdir = python_dir + + python.install_environment(prefix, C.DEFAULT, ()) + + # simulate a buggy environment build (I don't think this is possible) + with open(prefix.path('py_env-default/pyvenv.cfg'), 'w'): + pass + + ret = python.health_check(prefix, C.DEFAULT) + assert ret == "created virtualenv's pyvenv.cfg is missing `version_info`" def test_unhealthy_then_replaced(python_dir): @@ -170,9 +199,14 @@ make_executable(py_exe) # should be unhealthy due to version mismatch - assert python.healthy(prefix, C.DEFAULT) is False + ret = python.health_check(prefix, C.DEFAULT) + assert ret == ( + f'virtualenv python version did not match created version:\n' + f'- actual version: 1.2.3\n' + f'- expected version: {python._version_info(sys.executable)}\n' + ) # now put the exe back and it should be healthy again os.replace(f'{py_exe}.tmp', py_exe) - assert python.healthy(prefix, C.DEFAULT) is True + assert python.health_check(prefix, C.DEFAULT) is None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/tests/main_test.py new/pre-commit-2.19.0/tests/main_test.py --- old/pre-commit-2.18.1/tests/main_test.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/tests/main_test.py 2022-05-05 15:54:43.000000000 +0200 @@ -79,6 +79,7 @@ FNS = ( 'autoupdate', 'clean', 'gc', 'hook_impl', 'install', 'install_hooks', 'migrate_config', 'run', 'sample_config', 'uninstall', + 'validate_config', 'validate_manifest', ) CMDS = tuple(fn.replace('_', '-') for fn in FNS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pre-commit-2.18.1/tests/repository_test.py new/pre-commit-2.19.0/tests/repository_test.py --- old/pre-commit-2.18.1/tests/repository_test.py 2022-04-03 03:32:54.000000000 +0200 +++ new/pre-commit-2.19.0/tests/repository_test.py 2022-05-05 15:54:43.000000000 +0200 @@ -173,6 +173,7 @@ ) +@xfailif_windows # pragma: win32 no cover # no python 2 in GHA def test_switch_language_versions_doesnt_clobber(tempdir_factory, store): # We're using the python3 repo because it prints the python version path = make_repo(tempdir_factory, 'python3_hooks_repo') @@ -667,7 +668,7 @@ path = make_repo(tempdir_factory, 'golang_hooks_repo') config = make_config_from_repo(path) # A small go package - deps = ['golang.org/x/example/hello'] + deps = ['golang.org/x/example/hello@latest'] config['hooks'][0]['additional_dependencies'] = deps hook = _get_hook(config, store, 'golang-hook') binaries = os.listdir( @@ -688,7 +689,7 @@ 'name': 'hello', 'entry': 'hello', 'language': 'golang', - 'additional_dependencies': ['golang.org/x/example/hello'], + 'additional_dependencies': ['golang.org/x/example/hello@latest'], }], } hook = _get_hook(config, store, 'hello') @@ -892,6 +893,7 @@ assert _norm_out(out) == b"3\n['filename']\nHello World\n" +@xfailif_windows # pragma: win32 no cover # no python2 in GHA def test_local_python_repo_python2(store, local_python_config): local_python_config['hooks'][0]['language_version'] = 'python2' hook = _get_hook(local_python_config, store, 'python3-hook') @@ -1042,6 +1044,7 @@ ( 'dotnet_hooks_csproj_repo', 'dotnet_hooks_sln_repo', + 'dotnet_hooks_combo_repo', ), ) def test_dotnet_hook(tempdir_factory, store, repo):

1 0

commit sccache for openSUSE:Factory
by Source-Sync 31 May '22

31 May '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sccache for openSUSE:Factory checked in at 2022-05-31 15:47:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sccache (Old) and /work/SRC/openSUSE:Factory/.sccache.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sccache" Tue May 31 15:47:40 2022 rev:19 rq:980015 version:0.3.0~git4.a372a20 Changes: -------- --- /work/SRC/openSUSE:Factory/sccache/sccache.changes 2022-05-05 23:07:18.245625510 +0200 +++ /work/SRC/openSUSE:Factory/.sccache.new.1548/sccache.changes 2022-05-31 15:48:53.280048201 +0200 @@ -1,0 +2,15 @@ +Tue May 24 06:28:56 UTC 2022 - William Brown <william.brown(a)suse.com> + +- Automatic update of vendored dependencies + +------------------------------------------------------------------- +Mon May 23 02:11:35 UTC 2022 - william.brown(a)suse.com + +- Update to version 0.3.0~git4.e5e233f: + * Force concurrent disk cache by default + * Ignore some env vars + * Add experimental concurrent cache support + * Increase the MSRV and bump dependencies (#1137) +- Remove 0001-Ignore-some-env-vars.patch as it is on the maint branch + +------------------------------------------------------------------- Old: ---- 0001-Ignore-some-env-vars.patch sccache-0.3.0~git0.f6e36e6.tar.xz New: ---- sccache-0.3.0~git4.a372a20.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sccache.spec ++++++ --- /var/tmp/diff_new_pack.yVxayt/_old 2022-05-31 15:48:54.132048766 +0200 +++ /var/tmp/diff_new_pack.yVxayt/_new 2022-05-31 15:48:54.140048772 +0200 @@ -19,7 +19,7 @@ %define configdir %{_sysconfdir}/%{name} Name: sccache -Version: 0.3.0~git0.f6e36e6 +Version: 0.3.0~git4.a372a20 Release: 0 Summary: A compiler caching tool for Rust, C and C++ with optional cloud storage License: (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR CC0-1.0) AND ((Apache-2.0 AND BSD-2-Clause) OR MIT) AND (Apache-2.0 OR MIT OR BSD-2-Clause) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND ISC AND MIT @@ -33,7 +33,6 @@ Source12: builder.conf Source13: scheduler.conf Source14: client.example -Patch1: 0001-Ignore-some-env-vars.patch BuildRequires: cargo-packaging BuildRequires: pkgconfig(openssl) Requires: bubblewrap @@ -47,7 +46,6 @@ %prep %setup -q %setup -qa1 -%patch1 -p1 mkdir .cargo cp %{SOURCE2} .cargo/config @@ -57,13 +55,13 @@ %build %ifarch x86_64 # 'dist-server' available only on x86_64 so far - https://github.com/mozilla/sccache/issues/656 -features="azure,s3,redis,dist-server,dist-client" +features="azure,s3,redis,dist-server,dist-client,concurrent-cache" %else %ifarch aarch64 -features="azure,s3,redis" +features="azure,s3,redis,concurrent-cache" %else # Most other arches have issues (especially with ring). Use FS cache only -features="" +features="concurrent-cache" %endif %endif ++++++ _service ++++++ --- /var/tmp/diff_new_pack.yVxayt/_old 2022-05-31 15:48:54.176048796 +0200 +++ /var/tmp/diff_new_pack.yVxayt/_new 2022-05-31 15:48:54.180048798 +0200 @@ -1,9 +1,11 @@ <services> <service mode="disabled" name="obs_scm"> - <param name="url">https://github.com/mozilla/sccache.git</param> +  + <param name="url">https://github.com/Firstyear/sccache.git</param> <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param> <param name="scm">git</param> - <param name="revision">v0.3.0</param> +  + <param name="revision">20220520-suse-maint-1</param> <param name="match-tag">*</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> <param name="versionrewrite-replacement">\1</param> ++++++ cargo_config ++++++ --- /var/tmp/diff_new_pack.yVxayt/_old 2022-05-31 15:48:54.228048830 +0200 +++ /var/tmp/diff_new_pack.yVxayt/_new 2022-05-31 15:48:54.232048833 +0200 @@ -1,6 +1,10 @@ [source.crates-io] replace-with = "vendored-sources" +[source."https://github.com/Firstyear/opensuse-proxy-cache.git"] +git = "https://github.com/Firstyear/opensuse-proxy-cache.git" +replace-with = "vendored-sources" + [source.vendored-sources] directory = "vendor" (No newline at EOF) ++++++ sccache-0.3.0~git0.f6e36e6.tar.xz -> sccache-0.3.0~git4.a372a20.tar.xz ++++++ ++++ 1666 lines of diff (skipped) ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/sccache/vendor.tar.xz /work/SRC/openSUSE:Factory/.sccache.new.1548/vendor.tar.xz differ: char 26, line 1

1 0

commit python-stomp.py for openSUSE:Factory
by Source-Sync 31 May '22

31 May '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-stomp.py for openSUSE:Factory checked in at 2022-05-31 15:47:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-stomp.py (Old) and /work/SRC/openSUSE:Factory/.python-stomp.py.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-stomp.py" Tue May 31 15:47:40 2022 rev:12 rq:980014 version:8.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-stomp.py/python-stomp.py.changes 2022-02-14 22:36:12.561419661 +0100 +++ /work/SRC/openSUSE:Factory/.python-stomp.py.new.1548/python-stomp.py.changes 2022-05-31 15:48:52.552047718 +0200 @@ -1,0 +2,6 @@ +Tue May 24 06:55:07 UTC 2022 - Sebastian Wagner <sebix+novell.com(a)sebix.at> + +- update to version 8.0.1: + * Change code to use cryptography lib rather than PyOpenSSL (which is not recommended for use any more - discussed here: https://github.com/jasonrbriggs/stomp.py/issues/378) + +------------------------------------------------------------------- Old: ---- python-stomp.py-8.0.0.tar.gz New: ---- python-stomp.py-8.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-stomp.py.spec ++++++ --- /var/tmp/diff_new_pack.tpMvG0/_old 2022-05-31 15:48:53.024048031 +0200 +++ /var/tmp/diff_new_pack.tpMvG0/_new 2022-05-31 15:48:53.032048036 +0200 @@ -18,7 +18,7 @@ %define skip_python2 1 Name: python-stomp.py -Version: 8.0.0 +Version: 8.0.1 Release: 0 Summary: Python STOMP client License: Apache-2.0 ++++++ python-stomp.py-8.0.0.tar.gz -> python-stomp.py-8.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stomp.py-8.0.0/CHANGELOG.md new/stomp.py-8.0.1/CHANGELOG.md --- old/stomp.py-8.0.0/CHANGELOG.md 2022-02-05 23:25:39.000000000 +0100 +++ new/stomp.py-8.0.1/CHANGELOG.md 2022-05-01 20:17:05.000000000 +0200 @@ -1,4 +1,9 @@ -## Upcoming (8.0.0) +## Version 8.0.1 - May 2022 + + * Change code to use cryptography lib rather than PyOpenSSL (which is not recommended for use any more - discussed here: https://github.com/jasonrbriggs/stomp.py/issues/378) + + +## Version 8.0.0 - Feb 2022 * Add support for backwards compatible CONNECT in 1.1 and 1.2 protocols (https://github.com/jasonrbriggs/stomp.py/pull/348) * Flip DEFAULT_SSL_VERSION to use ssl.PROTOCOL_TLS rather than ssl.PROTOCOL_TLSv1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stomp.py-8.0.0/docker/Dockerfile new/stomp.py-8.0.1/docker/Dockerfile --- old/stomp.py-8.0.0/docker/Dockerfile 2022-02-05 23:25:39.000000000 +0100 +++ new/stomp.py-8.0.1/docker/Dockerfile 2022-05-01 20:17:05.000000000 +0200 @@ -11,6 +11,7 @@ rsyslog \ stompserver \ vim \ + wget \ && rm -rf /var/lib/apt/lists/* # rabbitmq setup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stomp.py-8.0.0/poetry.lock new/stomp.py-8.0.1/poetry.lock --- old/stomp.py-8.0.0/poetry.lock 2022-02-05 23:25:39.000000000 +0100 +++ new/stomp.py-8.0.1/poetry.lock 2022-05-01 20:17:05.000000000 +0200 @@ -59,7 +59,7 @@ [[package]] name = "cryptography" -version = "36.0.1" +version = "37.0.1" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = true @@ -71,7 +71,7 @@ pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] sdist = ["setuptools_rust (>=0.11.4)"] ssh = ["bcrypt (>=3.1.5)"] -test = ["pytest (>=6.2.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"] +test = ["pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"] [package.dependencies] cffi = ">=1.12" @@ -158,24 +158,8 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] -name = "pyopenssl" -version = "20.0.1" -description = "Python wrapper module around the OpenSSL library" -category = "main" -optional = true -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" - -[package.extras] -docs = ["sphinx", "sphinx-rtd-theme"] -test = ["flaky", "pretend", "pytest (>=3.0.1)"] - -[package.dependencies] -cryptography = ">=3.2" -six = ">=1.5.2" - -[[package]] name = "pyparsing" -version = "3.0.6" +version = "3.0.7" description = "Python parsing module" category = "dev" optional = false @@ -186,14 +170,14 @@ [[package]] name = "pytest" -version = "6.2.5" +version = "7.0.1" description = "pytest: simple powerful testing with Python" category = "dev" optional = false python-versions = ">=3.6" [package.extras] -testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] +testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"] [package.dependencies] atomicwrites = ">=1.0" @@ -203,7 +187,7 @@ packaging = "*" pluggy = ">=0.12,<2.0" py = ">=1.8.2" -toml = "*" +tomli = ">=1.0.0" [package.dependencies.importlib-metadata] version = ">=0.12" @@ -276,22 +260,6 @@ pytest = "*" [[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -category = "main" -optional = true -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" - -[[package]] -name = "toml" -version = "0.10.2" -description = "Python Library for Tom's Obvious, Minimal Language" -category = "dev" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" - -[[package]] name = "tomli" version = "1.2.3" description = "A lil' TOML parser" @@ -301,7 +269,7 @@ [[package]] name = "typing-extensions" -version = "4.0.1" +version = "4.1.1" description = "Backported and Experimental Type Hints for Python 3.6+" category = "dev" optional = false @@ -321,9 +289,12 @@ docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +[extras] +cryptography = ["cryptography"] + [metadata] python-versions = "^3.6" -content-hash = "3356b57c54579e8a7ac581bc42d5dd6abdb58b3f2316fda6f8d034de64d9412f" +content-hash = "40bc1124d1a9f6330aa97af1900a1bc6bfb493b64b9ad754f366aae77e360d89" [metadata.files] atomicwrites = [ @@ -440,26 +411,28 @@ {file = "coverage-6.2.tar.gz", hash = "sha256:e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"}, ] cryptography = [ - {file = "cryptography-36.0.1-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:73bc2d3f2444bcfeac67dd130ff2ea598ea5f20b40e36d19821b4df8c9c5037b"}, - {file = "cryptography-36.0.1-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:2d87cdcb378d3cfed944dac30596da1968f88fb96d7fc34fdae30a99054b2e31"}, - {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74d6c7e80609c0f4c2434b97b80c7f8fdfaa072ca4baab7e239a15d6d70ed73a"}, - {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:6c0c021f35b421ebf5976abf2daacc47e235f8b6082d3396a2fe3ccd537ab173"}, - {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d59a9d55027a8b88fd9fd2826c4392bd487d74bf628bb9d39beecc62a644c12"}, - {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0a817b961b46894c5ca8a66b599c745b9a3d9f822725221f0e0fe49dc043a3a3"}, - {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:94ae132f0e40fe48f310bba63f477f14a43116f05ddb69d6fa31e93f05848ae2"}, - {file = "cryptography-36.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:7be0eec337359c155df191d6ae00a5e8bbb63933883f4f5dffc439dac5348c3f"}, - {file = "cryptography-36.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:e0344c14c9cb89e76eb6a060e67980c9e35b3f36691e15e1b7a9e58a0a6c6dc3"}, - {file = "cryptography-36.0.1-cp36-abi3-win32.whl", hash = "sha256:4caa4b893d8fad33cf1964d3e51842cd78ba87401ab1d2e44556826df849a8ca"}, - {file = "cryptography-36.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:391432971a66cfaf94b21c24ab465a4cc3e8bf4a939c1ca5c3e3a6e0abebdbcf"}, - {file = "cryptography-36.0.1-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bb5829d027ff82aa872d76158919045a7c1e91fbf241aec32cb07956e9ebd3c9"}, - {file = "cryptography-36.0.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ebc15b1c22e55c4d5566e3ca4db8689470a0ca2babef8e3a9ee057a8b82ce4b1"}, - {file = "cryptography-36.0.1-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:596f3cd67e1b950bc372c33f1a28a0692080625592ea6392987dba7f09f17a94"}, - {file = "cryptography-36.0.1-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:30ee1eb3ebe1644d1c3f183d115a8c04e4e603ed6ce8e394ed39eea4a98469ac"}, - {file = "cryptography-36.0.1-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ec63da4e7e4a5f924b90af42eddf20b698a70e58d86a72d943857c4c6045b3ee"}, - {file = "cryptography-36.0.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca238ceb7ba0bdf6ce88c1b74a87bffcee5afbfa1e41e173b1ceb095b39add46"}, - {file = "cryptography-36.0.1-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:ca28641954f767f9822c24e927ad894d45d5a1e501767599647259cbf030b903"}, - {file = "cryptography-36.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:39bdf8e70eee6b1c7b289ec6e5d84d49a6bfa11f8b8646b5b3dfe41219153316"}, - {file = "cryptography-36.0.1.tar.gz", hash = "sha256:53e5c1dc3d7a953de055d77bef2ff607ceef7a2aac0353b5d630ab67f7423638"}, + {file = "cryptography-37.0.1-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:74b55f67f4cf026cb84da7a1b04fc2a1d260193d4ad0ea5e9897c8b74c1e76ac"}, + {file = "cryptography-37.0.1-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:0db5cf21bd7d092baacb576482b0245102cea2d3cf09f09271ce9f69624ecb6f"}, + {file = "cryptography-37.0.1-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:faf0f5456c059c7b1c29441bdd5e988f0ba75bdc3eea776520d8dcb1e30e1b5c"}, + {file = "cryptography-37.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:06bfafa6e53ccbfb7a94be4687b211a025ce0625e3f3c60bb15cd048a18f3ed8"}, + {file = "cryptography-37.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf585476fcbcd37bed08072e8e2db3954ce1bfc68087a2dc9c19cfe0b90979ca"}, + {file = "cryptography-37.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d4daf890e674d191757d8d7d60dc3a29c58c72c7a76a05f1c0a326013f47e8b"}, + {file = "cryptography-37.0.1-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:ae1cd29fbe6b716855454e44f4bf743465152e15d2d317303fe3b58ee9e5af7a"}, + {file = "cryptography-37.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:451aaff8b8adf2dd0597cbb1fdcfc8a7d580f33f843b7cce75307a7f20112dd8"}, + {file = "cryptography-37.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:1858eff6246bb8bbc080eee78f3dd1528739e3f416cba5f9914e8631b8df9871"}, + {file = "cryptography-37.0.1-cp36-abi3-win32.whl", hash = "sha256:e69a0e36e62279120e648e787b76d79b41e0f9e86c1c636a4f38d415595c722e"}, + {file = "cryptography-37.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:a18ff4bfa9d64914a84d7b06c46eb86e0cc03113470b3c111255aceb6dcaf81d"}, + {file = "cryptography-37.0.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cce90609e01e1b192fae9e13665058ab46b2ea53a3c05a3ea74a3eb8c3af8857"}, + {file = "cryptography-37.0.1-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:c4a58eeafbd7409054be41a377e726a7904a17c26f45abf18125d21b1215b08b"}, + {file = "cryptography-37.0.1-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:618391152147a1221c87b1b0b7f792cafcfd4b5a685c5c72eeea2ddd29aeceff"}, + {file = "cryptography-37.0.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ceae26f876aabe193b13a0c36d1bb8e3e7e608d17351861b437bd882f617e9f"}, + {file = "cryptography-37.0.1-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:930b829e8a2abaf43a19f38277ae3c5e1ffcf547b936a927d2587769ae52c296"}, + {file = "cryptography-37.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:58021d6e9b1d88b1105269d0da5e60e778b37dfc0e824efc71343dd003726831"}, + {file = "cryptography-37.0.1-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:b1ee5c82cf03b30f6ae4e32d2bcb1e167ef74d6071cbb77c2af30f101d0b360b"}, + {file = "cryptography-37.0.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f095988548ec5095e3750cdb30e6962273d239b1998ba1aac66c0d5bee7111c1"}, + {file = "cryptography-37.0.1-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:125702572be12bcd318e3a14e9e70acd4be69a43664a75f0397e8650fe3c6cc3"}, + {file = "cryptography-37.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:315af6268de72bcfa0bb3401350ce7d921f216e6b60de12a363dad128d9d459f"}, + {file = "cryptography-37.0.1.tar.gz", hash = "sha256:d610d0ee14dd9109006215c7c0de15eee91230b70a9bce2263461cf7c3720b83"}, ] docopt = [ {file = "docopt-0.6.2.tar.gz", hash = "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"}, @@ -488,17 +461,13 @@ {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] -pyopenssl = [ - {file = "pyOpenSSL-20.0.1-py2.py3-none-any.whl", hash = "sha256:818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b"}, - {file = "pyOpenSSL-20.0.1.tar.gz", hash = "sha256:4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51"}, -] pyparsing = [ - {file = "pyparsing-3.0.6-py3-none-any.whl", hash = "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4"}, - {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"}, + {file = "pyparsing-3.0.7-py3-none-any.whl", hash = "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484"}, + {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"}, ] pytest = [ - {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"}, - {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"}, + {file = "pytest-7.0.1-py3-none-any.whl", hash = "sha256:9ce3ff477af913ecf6321fe337b93a2c0dcf2a0a1439c43f5452112c1e4280db"}, + {file = "pytest-7.0.1.tar.gz", hash = "sha256:e30905a0c131d3d94b89624a1cc5afec3e0ba2fbdb151867d8e0ebd49850f171"}, ] pytest-cov = [ {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"}, @@ -521,21 +490,13 @@ {file = "pytest_ordering-0.6-py2-none-any.whl", hash = "sha256:27fba3fc265f5d0f8597e7557885662c1bdc1969497cd58aff6ed21c3b617de2"}, {file = "pytest_ordering-0.6-py3-none-any.whl", hash = "sha256:3f314a178dbeb6777509548727dc69edf22d6d9a2867bf2d310ab85c403380b6"}, ] -six = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] -toml = [ - {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, - {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, -] tomli = [ {file = "tomli-1.2.3-py3-none-any.whl", hash = "sha256:e3069e4be3ead9668e21cb9b074cd948f7b3113fd9c8bba083f48247aab8b11c"}, {file = "tomli-1.2.3.tar.gz", hash = "sha256:05b6166bff487dc068d322585c7ea4ef78deed501cc124060e0f238e89a9231f"}, ] typing-extensions = [ - {file = "typing_extensions-4.0.1-py3-none-any.whl", hash = "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b"}, - {file = "typing_extensions-4.0.1.tar.gz", hash = "sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e"}, + {file = "typing_extensions-4.1.1-py3-none-any.whl", hash = "sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2"}, + {file = "typing_extensions-4.1.1.tar.gz", hash = "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42"}, ] zipp = [ {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stomp.py-8.0.0/pyproject.toml new/stomp.py-8.0.1/pyproject.toml --- old/stomp.py-8.0.0/pyproject.toml 2022-02-05 23:25:39.000000000 +0100 +++ new/stomp.py-8.0.1/pyproject.toml 2022-05-01 20:17:05.000000000 +0200 @@ -1,6 +1,6 @@ [tool.poetry] name = "stomp.py" -version = "8.0.0" +version = "8.0.1" description = "Python STOMP client, supporting versions 1.0, 1.1 and 1.2 of the protocol" authors = ["Jason R Briggs <jasonrbriggs(a)gmail.com>"] license = "Apache-2.0" @@ -21,7 +21,7 @@ [tool.poetry.dependencies] python = "^3.6" docopt = "^0.6.2" -PyOpenSSL = {version = "^20.0.1", optional = true} +cryptography = {version = "^37.0.1", optional = true} [tool.poetry.dev-dependencies] pytest = ">=5.2" @@ -30,6 +30,9 @@ pytest-html = ">=2.0.1" pytest-ordering = ">=0.6" +[tool.poetry.extras] +cryptography = ["cryptography"] + [tool.poetry.scripts] stomp = "stomp.__main__:main" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stomp.py-8.0.0/stomp/transport.py new/stomp.py-8.0.1/stomp/transport.py --- old/stomp.py-8.0.0/stomp/transport.py 2022-02-05 23:25:39.000000000 +0100 +++ new/stomp.py-8.0.1/stomp/transport.py 2022-05-01 20:17:05.000000000 +0200 @@ -28,17 +28,13 @@ import ssl from ssl import SSLError DEFAULT_SSL_VERSION = ssl.PROTOCOL_TLS + from cryptography import x509 except (ImportError, AttributeError): ssl = None class SSLError(object): pass DEFAULT_SSL_VERSION = None -try: - import OpenSSL -except ImportError: - OpenSSL = None - import stomp.exception as exception import stomp.listener @@ -50,12 +46,11 @@ ''' Check the expiry date of the certificate presented by the host/port. ''' - if OpenSSL: + if ssl: host, port = host_and_port cert = ssl.get_server_certificate((host, port)) - x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, cert) - dt = datetime.datetime.strptime(x509.get_notAfter().decode().replace('Z',''), "%Y%m%d%H%M%S") - valid_cert = dt > datetime.datetime.now() + x509_cert = x509.load_pem_x509_certificate(cert.encode()) + valid_cert = x509_cert.not_valid_after > datetime.datetime.now() if not valid_cert: logging.info("SSL certificate for %s:%s expired on %s", host, port, dt) assert valid_cert

1 0

commit gnome-remote-desktop for openSUSE:Factory
by Source-Sync 31 May '22

31 May '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-remote-desktop for openSUSE:Factory checked in at 2022-05-31 15:47:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-remote-desktop (Old) and /work/SRC/openSUSE:Factory/.gnome-remote-desktop.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-remote-desktop" Tue May 31 15:47:38 2022 rev:10 rq:980030 version:42.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-remote-desktop/gnome-remote-desktop.changes 2022-04-27 21:41:54.745054856 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-remote-desktop.new.1548/gnome-remote-desktop.changes 2022-05-31 15:48:51.320046899 +0200 @@ -1,0 +2,18 @@ +Mon May 30 12:11:18 UTC 2022 - dimstar(a)opensuse.org + +- Update to version 42.2: + + rdp-graphics-pipeline: Measure bandwidth when sending frame + updates. + + session-rdp: Handle queued bandwidth measure stop operations. + + rdp/nw-auto: Add APIs for bandwidth measurement. + + rdp/nw-auto: Also notify client about network characteristics + results. + + rdp/nw-auto: Turn ping info condition into assertion. + + rdp/nw-auto: Assert RTT consumer != NONE, when removing RTT + consumer. + + rdp/nw-auto: Remove superfluous if condition. + + rdp/nw-auto: Fix initial ping source not being created. + + rdp/rdpgfx: Create RTT pause source while GFX mutex is locked. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-remote-desktop-42.1.1.obscpio New: ---- gnome-remote-desktop-42.2.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-remote-desktop.spec ++++++ --- /var/tmp/diff_new_pack.hUyeHG/_old 2022-05-31 15:48:52.092047412 +0200 +++ /var/tmp/diff_new_pack.hUyeHG/_new 2022-05-31 15:48:52.100047417 +0200 @@ -21,7 +21,7 @@ %define freerdp_version 2.2.0 Name: gnome-remote-desktop -Version: 42.1.1 +Version: 42.2 Release: 0 Summary: GNOME Remote Desktop screen sharing service License: GPL-2.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.hUyeHG/_old 2022-05-31 15:48:52.140047444 +0200 +++ /var/tmp/diff_new_pack.hUyeHG/_new 2022-05-31 15:48:52.144047446 +0200 @@ -2,7 +2,7 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://gitlab.gnome.org/GNOME/gnome-remote-desktop.git</param> <param name="scm">git</param> - <param name="revision">refs/tags/42.1.1</param> + <param name="revision">refs/tags/42.2</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.hUyeHG/_old 2022-05-31 15:48:52.172047465 +0200 +++ /var/tmp/diff_new_pack.hUyeHG/_new 2022-05-31 15:48:52.176047468 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.gnome.org/GNOME/gnome-remote-desktop.git</param> - <param name="changesrevision">a7cbaae7139c108a6c0297dac7881ab071a91ca3</param></service></servicedata> + <param name="changesrevision">a5a962b923bf88d64793b43e0f3915e0eaa8acbe</param></service></servicedata> (No newline at EOF) ++++++ gnome-remote-desktop-42.1.1.obscpio -> gnome-remote-desktop-42.2.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/meson.build new/gnome-remote-desktop-42.2/meson.build --- old/gnome-remote-desktop-42.1.1/meson.build 2022-04-26 21:58:41.000000000 +0200 +++ new/gnome-remote-desktop-42.2/meson.build 2022-05-29 18:27:40.000000000 +0200 @@ -1,5 +1,5 @@ project('gnome-remote-desktop', 'c', - version: '42.1.1', + version: '42.2', meson_version: '>= 0.47.0', default_options: ['warning_level=1', 'buildtype=debugoptimized']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/po/LINGUAS new/gnome-remote-desktop-42.2/po/LINGUAS --- old/gnome-remote-desktop-42.1.1/po/LINGUAS 2022-04-26 21:58:41.000000000 +0200 +++ new/gnome-remote-desktop-42.2/po/LINGUAS 2022-05-29 18:27:40.000000000 +0200 @@ -21,10 +21,12 @@ id is it +ka kk ko lt nb +ne nl oc pa diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/po/de.po new/gnome-remote-desktop-42.2/po/de.po --- old/gnome-remote-desktop-42.1.1/po/de.po 2022-04-26 21:58:41.000000000 +0200 +++ new/gnome-remote-desktop-42.2/po/de.po 2022-05-29 18:27:40.000000000 +0200 @@ -9,18 +9,18 @@ "Project-Id-Version: gnome-remote-desktop master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-remote-desktop/" "issues\n" -"POT-Creation-Date: 2021-07-13 09:47+0000\n" -"PO-Revision-Date: 2021-08-12 21:48+0200\n" -"Last-Translator: Tim Sabsch <tim(a)sabsch.com>\n" +"POT-Creation-Date: 2022-05-09 07:39+0000\n" +"PO-Revision-Date: 2022-05-22 00:53+0200\n" +"Last-Translator: Christian Kirbach <christian.kirbach(a)gmail.com>\n" "Language-Team: German <gnome-de(a)gnome.org>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.0\n" +"X-Generator: Poedit 3.0.1\n" -#: src/grd-daemon.c:351 +#: src/grd-daemon.c:480 msgid "GNOME Remote Desktop" msgstr "GNOME Remote Desktop" @@ -46,12 +46,140 @@ msgid "Accept" msgstr "Akzeptieren" +#: src/grd-ctl.c:44 +#, c-format +msgid "Usage: %s [OPTIONS...] COMMAND [SUBCOMMAND]...\n" +msgstr "Aufruf: %s [OPTIONEN ��] BEFEHL [UNTERBEFEHL] ��\n" + +#: src/grd-ctl.c:383 +msgid "Commands:\n" +msgstr "Befehle:\n" + +#: src/grd-ctl.c:388 +msgid "" +" rdp - RDP subcommands:\n" +" enable - Enable the RDP backend\n" +" disable - Disable the RDP backend\n" +" set-tls-cert <path-to-cert> - Set path to TLS certificate\n" +" set-tls-key <path-to-key> - Set path to TLS key\n" +" set-credentials <username> <password> - Set username and password\n" +" credentials\n" +" clear-credentials - Clear username and password\n" +" credentials\n" +" enable-view-only - Disable remote control of " +"input\n" +" devices\n" +" disable-view-only - Enable remote control of " +"input\n" +" devices\n" +"\n" +msgstr "" +" rdp - RDP-Unterbefehle:\n" +" enable - RDP-Backend aktivieren\n" +" disable - RDP-Backend deaktivieren\n" +" set-tls-cert <pfad-zu-zertifikat> - Pfad zum TLS-Zertifikat " +"festlegen\n" +" set-tls-key <pfad-zu-schl��ssel> - Pfad zum TLS-Schl��ssel " +"festlegen\n" +" set-credentials <Benutzername> <Passwort> - Nutzername und Passwort " +"festlegen\n" +" clear-credentials - Nutzername und Passwort " +"l��schen\n" +" enable-view-only - Fernsteuerung mittels " +"Eingabeger��ten deaktivieren\n" +" disable-view-only - Fernsteuerung mittels " +"Eingabeger��ten aktivieren\n" +"\n" + +#: src/grd-ctl.c:407 +msgid "" +" vnc - VNC subcommands:\n" +" enable - Enable the VNC backend\n" +" disable - Disable the VNC backend\n" +" set-password <password> - Set the VNC password\n" +" clear-password - Clear the VNC password\n" +" set-auth-method password|prompt - Set the authorization method\n" +" enable-view-only - Disable remote control of " +"input\n" +" devices\n" +" disable-view-only - Enable remote control of " +"input\n" +" devices\n" +"\n" +msgstr "" +" vnc - VNC-Unterbefehle:\n" +" enable - VNC-Backend aktivieren\n" +" disable - VNC-Backend deaktivieren\n" +" set-password <Passwort> - VNC-Passwort festlegen\n" +" clear-password - VNC-Passwort l��schen\n" +" set-auth-method password|prompt - Authentifizierungsmethode " +"festlegen\n" +" enable-view-only - Fernsteuerung von " +"Eingabeger��ten deaktivieren\n" +" disable-view-only - Fernsteuerung von " +"Eingabeger��ten aktivieren\n" +"\n" + +#: src/grd-ctl.c:422 +msgid "" +" status [--show-credentials] - Show current status\n" +"\n" +"Options:\n" +" --help - Print this help text\n" +msgstr "" +" status [--show-credentials] - Aktuellen Status anzeigen\n" +"\n" +"Optionen:\n" +" --help - Diesen Hilfetext anzeigen\n" + #: src/org.gnome.desktop.remote-desktop.gschema.xml.in:7 +msgid "Whether the RDP backend is enabled or not" +msgstr "Legt fest, ob das RDP-Backend aktiviert ist oder nicht" + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:8 +msgid "If set to to 'true' the RDP backend will be initialized." +msgstr "Wenn ��wahr��, wird das RDP-Backend initialisiert." + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:14 +msgid "Screenshare mode of RDP connections" +msgstr "Art der Bildschirmfreigabe bei RDP-Verbindungen" + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:15 +msgid "" +"The screenshare mode specifies, whether the RDP backend mirrors the primary " +"screen, or whether a virtual monitor is created. For the initial resolution " +"of the virtual monitor, the RDP backend uses either the client core data " +"([MS-RDPBCGR] 2.2.1.3.2) or the client monitor data ([MS-RDPBCGR] " +"2.2.1.3.6), depending on what is available. When using a remote desktop " +"session with a virtual monitor, clients can resize the resolution of the " +"virtual monitor during a session with the Display Control Channel Extension " +"([MS-RDPEDISP]). Allowed screenshare modes include: * mirror-primary - " +"Record the primary monitor of the current user session. * extend - Create a " +"new virtual monitor and use it for the remote desktop session. The " +"resolution of this virtual monitor is derived from the monitor " +"configuration, submitted by the remote desktop client." +msgstr "" +"Die Art der Bildschirmfreigabe legt fest, ob das RDB-Backend den prim��ren " +"Bildschirm spiegelt, oder ob ein virtueller Monitor erstellt wird. Das RDP-" +"Backend verwendet f��r die anf��ngliche Aufl��sung des virtuellen Monitors " +"entweder die Client Kerndaten ([MS-RDPBCGR] 2.2.1.3.2), oder die Client " +"Monitor-Daten ([MS-RDPBCGR] 2.2.1.3.6), je nachdem was verf��gbar ist. Bei " +"Einsatz einer Freigabesitzung mit virtuellem Monitor k��nnen Clients die " +"Aufl��sung des virtuellen Monitors w��rhend einer Sitzung mit der Display " +"Control Channel Erweiterung anpassen ([MS-RDPEDISP]). M��gliche Arten der " +"Bildschirmfreigabe sind:\n" +"* mirror-primary - Den prim��ren Bildschirm der aktuellen Benutzersitzung " +"aufnehmen.\n" +"* extend - Einen neuen virtuellen Monitor erstellen und f��r die " +"Freigabesitzung verwenden. Die Aufl��sung der Monitors wird von der " +"Monitorkonfiguration abgeleitet, die vom Client ��bermittelt wurde." + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:41 msgid "Path to the certificate file" msgstr "Pfad zur Zertifikatsdatei" -#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:8 -#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:16 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:42 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:50 msgid "" "In order to be able to use RDP with TLS Security, both the private key file " "and the certificate file need to be provided to the RDP server." @@ -60,17 +188,17 @@ "Schl��sseldatei als auch die Zertifikatsdatei dem RDP-Server bereitgestellt " "werden." -#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:15 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:49 msgid "Path to the private key file" msgstr "Pfad zur privaten Schl��sseldatei" -#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:23 -#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:33 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:57 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:74 msgid "Only allow remote connections to view the screen content" msgstr "" "Entfernten Verbindungen lediglich das Ansehen des Bildschirminhalts erlauben" -#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:24 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:58 msgid "" "When view-only is true, remote RDP connections cannot manipulate input " "devices (e.g. mouse and keyboard)." @@ -78,7 +206,15 @@ "Wenn ��Nur ansehen�� wahr ist, k��nnen entfernte RDP-Verbindungen keine " "Eingabeger��te manipulieren (z.B. Maus und Tastatur)." -#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:34 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:67 +msgid "Whether the VNC backend is enabled or not" +msgstr "Legt fest, ob das VNC-Backend aktiviert ist oder nicht" + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:68 +msgid "If set to to 'true' the VNC backend will be initialized." +msgstr "Wenn ��wahr��, wird das VNC-Backend initialisiert." + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:75 msgid "" "When view-only is true, remote VNC connections cannot manipulate input " "devices (e.g. mouse and keyboard)." @@ -86,11 +222,11 @@ "Wenn ��Nur ansehen�� wahr ist, k��nnen entfernte VNC-Verbindungen keine " "Eingabeger��te manipulieren (z.B. Maus und Tastatur)." -#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:41 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:82 msgid "Method used to authenticate VNC connections" msgstr "Zur Authentifizierung von VNC-Verbindungen genutzte Methode" -#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:42 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:83 msgid "" "The VNC authentication method describes how a remote connection is " "authenticated. It can currently be done in two different ways: * prompt - by " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/po/ka.po new/gnome-remote-desktop-42.2/po/ka.po --- old/gnome-remote-desktop-42.1.1/po/ka.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-remote-desktop-42.2/po/ka.po 2022-05-29 18:27:40.000000000 +0200 @@ -0,0 +1,239 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-remote-desktop\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-remote-desktop/" +"issues\n" +"POT-Creation-Date: 2022-05-10 16:53+0000\n" +"PO-Revision-Date: 2022-05-13 06:48+0200\n" +"Last-Translator: Temuri Doghonadze <temuri.doghonadze(a)gmail.com>\n" +"Language-Team: Georgian <(nothing)>\n" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.0.1\n" + +#: src/grd-daemon.c:480 +msgid "GNOME Remote Desktop" +msgstr "GNOME Remote Desktop" + +#: src/grd-prompt.c:124 +#, c-format +msgid "Do you want to share your desktop?" +msgstr "�� ?" + +#: src/grd-prompt.c:125 +#, c-format +msgid "" +"A user on the computer '%s' is trying to remotely view or control your " +"desktop." +msgstr "" +"�� '%s' �� " +"�� ." + +#: src/grd-prompt.c:131 +msgid "Refuse" +msgstr "��" + +#: src/grd-prompt.c:136 +msgid "Accept" +msgstr "��" + +#: src/grd-ctl.c:44 +#, c-format +msgid "Usage: %s [OPTIONS...] COMMAND [SUBCOMMAND]...\n" +msgstr "��: %s [��...] �� [��]...\n" + +#: src/grd-ctl.c:383 +msgid "Commands:\n" +msgstr "��:\n" + +#: src/grd-ctl.c:388 +msgid "" +" rdp - RDP subcommands:\n" +" enable - Enable the RDP backend\n" +" disable - Disable the RDP backend\n" +" set-tls-cert <path-to-cert> - Set path to TLS certificate\n" +" set-tls-key <path-to-key> - Set path to TLS key\n" +" set-credentials <username> <password> - Set username and password\n" +" credentials\n" +" clear-credentials - Clear username and password\n" +" credentials\n" +" enable-view-only - Disable remote control of " +"input\n" +" devices\n" +" disable-view-only - Enable remote control of " +"input\n" +" devices\n" +"\n" +msgstr "" +" rdp - RDP-�� :\n" +" enable - RDP-�� \n" +" disable - RDP-�� \n" +" set-tls-cert <path-to-cert> - �� TLS " +"�� \n" +" set-tls-key <path-to-key> - �� TLS " +"�� \n" +" set-credentials <username> <password> - �� " +"��\n" +" �� \n" +" clear-credentials - " +"�� \n" +" enable-view-only �� " +"��\n" +" ��\n" +" disable-view-obly - �� " +"��\n" +" �� " +"�� \n" +"\n" + +#: src/grd-ctl.c:407 +msgid "" +" vnc - VNC subcommands:\n" +" enable - Enable the VNC backend\n" +" disable - Disable the VNC backend\n" +" set-password <password> - Set the VNC password\n" +" clear-password - Clear the VNC password\n" +" set-auth-method password|prompt - Set the authorization method\n" +" enable-view-only - Disable remote control of " +"input\n" +" devices\n" +" disable-view-only - Enable remote control of " +"input\n" +" devices\n" +"\n" +msgstr "" +" vnc - VNC subcommands:\n" +" enable - Enable the VNC backend\n" +" disable - VNC-�� \n" +" set-password <password> - VNC �� \n" +" clear-password - VNC �� \n" +" set-auth-method password|prompt - �� \n" +" enable-view-only - �� " +"��\n" +" ��\n" +" disable-view-only - �� " +"�� \n" +" �� \n" +"\n" + +#: src/grd-ctl.c:422 +msgid "" +" status [--show-credentials] - Show current status\n" +"\n" +"Options:\n" +" --help - Print this help text\n" +msgstr "" +" �� [--show-credentials] - �� \n" +"\n" +"��:\n" +" --help - �� \n" + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:7 +msgid "Whether the RDP backend is enabled or not" +msgstr "�� RDP �� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:8 +msgid "If set to 'true' the RDP backend will be initialized." +msgstr "�� , �� RDP ��." + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:14 +msgid "Screenshare mode of RDP connections" +msgstr "RDP �� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:15 +msgid "" +"The screenshare mode specifies, whether the RDP backend mirrors the primary " +"screen, or whether a virtual monitor is created. For the initial resolution " +"of the virtual monitor, the RDP backend uses either the client core data " +"([MS-RDPBCGR] 2.2.1.3.2) or the client monitor data ([MS-RDPBCGR] " +"2.2.1.3.6), depending on what is available. When using a remote desktop " +"session with a virtual monitor, clients can resize the resolution of the " +"virtual monitor during a session with the Display Control Channel Extension " +"([MS-RDPEDISP]). Allowed screenshare modes include: * mirror-primary - " +"Record the primary monitor of the current user session. * extend - Create a " +"new virtual monitor and use it for the remote desktop session. The " +"resolution of this virtual monitor is derived from the monitor " +"configuration, submitted by the remote desktop client." +msgstr "" +"�� , RDP �� " +"�� . �� " +"�� RDP �� " +"�� ([MS-RDPBCGR] 2.2.1.3.2), �� " +"�� ([MS-RDPBCGR] 2.2.1.3.6), �� . �� RDP_�� " +"�� , �� " +"�� ([MS-RDPEDISP]). �� : * mirror-primary " +"�� . * �� - �� " +"�� . �� " +"�� , �� ." + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:41 +msgid "Path to the certificate file" +msgstr "�� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:42 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:50 +msgid "" +"In order to be able to use RDP with TLS Security, both the private key file " +"and the certificate file need to be provided to the RDP server." +msgstr "" +"RDP-�� TLS �� , �� " +"�� ." + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:49 +msgid "Path to the private key file" +msgstr "�� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:57 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:74 +msgid "Only allow remote connections to view the screen content" +msgstr "�� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:58 +msgid "" +"When view-only is true, remote RDP connections cannot manipulate input " +"devices (e.g. mouse and keyboard)." +msgstr "" +"�� , RDP �� " +"�� (��, ��)." + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:67 +msgid "Whether the VNC backend is enabled or not" +msgstr "�� VNC-�� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:68 +msgid "If set to 'true' the VNC backend will be initialized." +msgstr "�� , �� VNC ��." + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:75 +msgid "" +"When view-only is true, remote VNC connections cannot manipulate input " +"devices (e.g. mouse and keyboard)." +msgstr "" +"�� , VNC �� " +"�� (��, ��)." + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:82 +msgid "Method used to authenticate VNC connections" +msgstr "VNC �� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:83 +msgid "" +"The VNC authentication method describes how a remote connection is " +"authenticated. It can currently be done in two different ways: * prompt - by " +"prompting the user for each new connection, requiring a person with physical " +"access to the workstation to explicitly approve the new connection. * " +"password - by requiring the remote client to provide a known password" +msgstr "" +"VNC �� , �� " +"��. �� : * �� " +"- �� , �� " +"�� " +"��. * �� - �� " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/po/ne.po new/gnome-remote-desktop-42.2/po/ne.po --- old/gnome-remote-desktop-42.1.1/po/ne.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-remote-desktop-42.2/po/ne.po 2022-05-29 18:27:40.000000000 +0200 @@ -0,0 +1,230 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Gnome Nepali Translation Project\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-remote-desktop/" +"issues\n" +"POT-Creation-Date: 2022-05-02 10:47+0000\n" +"PO-Revision-Date: 2022-05-09 13:23+0545\n" +"Last-Translator: \n" +"Language-Team: Nepali Team <chautari(a)gmail.com>\n" +"Language: ne\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.0.1\n" + +#: src/grd-daemon.c:480 +msgid "GNOME Remote Desktop" +msgstr "�� " + +#: src/grd-prompt.c:124 +#, c-format +msgid "Do you want to share your desktop?" +msgstr "�� ?" + +#: src/grd-prompt.c:125 +#, c-format +msgid "" +"A user on the computer '%s' is trying to remotely view or control your " +"desktop." +msgstr "" +"'%s' �� " +"�� " + +#: src/grd-prompt.c:131 +msgid "Refuse" +msgstr "�� " + +#: src/grd-prompt.c:136 +msgid "Accept" +msgstr "�� " + +#: src/grd-ctl.c:44 +#, c-format +msgid "Usage: %s [OPTIONS...] COMMAND [SUBCOMMAND]...\n" +msgstr "��: %s [OPTIONS...] �� [SUBCOMMAND]...\n" + +#: src/grd-ctl.c:383 +msgid "Commands:\n" +msgstr "��:\n" + +#: src/grd-ctl.c:388 +msgid "" +" rdp - RDP subcommands:\n" +" enable - Enable the RDP backend\n" +" disable - Disable the RDP backend\n" +" set-tls-cert <path-to-cert> - Set path to TLS certificate\n" +" set-tls-key <path-to-key> - Set path to TLS key\n" +" set-credentials <username> <password> - Set username and password\n" +" credentials\n" +" clear-credentials - Clear username and password\n" +" credentials\n" +" enable-view-only - Disable remote control of " +"input\n" +" devices\n" +" disable-view-only - Enable remote control of " +"input\n" +" devices\n" +"\n" +msgstr "" +" rdp - RDP �� :\n" +" �� - RDP �� \n" +" �� - RDP �� \n" +" TLS �� <path-to-cert> - TLS �� \n" +" ��-tls-�� <path-to-key> - TLS �� \n" +" ��-�� <username> <password> - �� \n" +" ��\n" +" ��-�� - �� \n" +" ��\n" +" ��-�� - �� \n" +" ��\n" +" ��-�� - �� \n" +" ��\n" +"\n" + +#: src/grd-ctl.c:407 +msgid "" +" vnc - VNC subcommands:\n" +" enable - Enable the VNC backend\n" +" disable - Disable the VNC backend\n" +" set-password <password> - Set the VNC password\n" +" clear-password - Clear the VNC password\n" +" set-auth-method password|prompt - Set the authorization method\n" +" enable-view-only - Disable remote control of " +"input\n" +" devices\n" +" disable-view-only - Enable remote control of " +"input\n" +" devices\n" +"\n" +msgstr "" +" vnc - VNC �� :\n" +" �� - �� \n" +" �� - �� \n" +" �� <password> �� - �� \n" +" �� - �� \n" +" auth-method �� |prompt - �� \n" +" ��-�� - �� \n" +" ��\n" +" ��-�� - �� \n" +" ��\n" +"\n" + +#: src/grd-ctl.c:422 +msgid "" +" status [--show-credentials] - Show current status\n" +"\n" +"Options:\n" +" --help - Print this help text\n" +msgstr "" +" status [--show-credentials] - �� \n" +"\n" +"��:\n" +" --help - �� \n" + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:7 +msgid "Whether the RDP backend is enabled or not" +msgstr "RDP �� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:8 +msgid "If set to to 'true' the RDP backend will be initialized." +msgstr "�� '��' �� RDP �� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:14 +msgid "Screenshare mode of RDP connections" +msgstr "RDP �� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:15 +msgid "" +"The screenshare mode specifies, whether the RDP backend mirrors the primary " +"screen, or whether a virtual monitor is created. For the initial resolution " +"of the virtual monitor, the RDP backend uses either the client core data " +"([MS-RDPBCGR] 2.2.1.3.2) or the client monitor data ([MS-RDPBCGR] " +"2.2.1.3.6), depending on what is available. When using a remote desktop " +"session with a virtual monitor, clients can resize the resolution of the " +"virtual monitor during a session with the Display Control Channel Extension " +"([MS-RDPEDISP]). Allowed screenshare modes include: * mirror-primary - " +"Record the primary monitor of the current user session. * extend - Create a " +"new virtual monitor and use it for the remote desktop session. The " +"resolution of this virtual monitor is derived from the monitor " +"configuration, submitted by the remote desktop client." +msgstr "" +"�� , �� , �� " +"�� , " +"RDP �� ([MS-RDPBCGR] 2.2.1.3.2) �� " +"�� ([MS-RDPBCGR] 2.2.1.3.6) �� , �� " +"�� , �� " +"([MS-RDPEDISP]) �� " +"�� : * ��-�� - �� " +"�� * �� - �� " +"�� " +"�� , �� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:41 +msgid "Path to the certificate file" +msgstr "�� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:42 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:50 +msgid "" +"In order to be able to use RDP with TLS Security, both the private key file " +"and the certificate file need to be provided to the RDP server." +msgstr "" +"TLS �� RDP �� , �� " +"RDP �� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:49 +msgid "Path to the private key file" +msgstr "�� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:57 +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:74 +msgid "Only allow remote connections to view the screen content" +msgstr "�� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:58 +msgid "" +"When view-only is true, remote RDP connections cannot manipulate input " +"devices (e.g. mouse and keyboard)." +msgstr "" +"�� , �� RDP �� (�� " +"��) �� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:67 +msgid "Whether the VNC backend is enabled or not" +msgstr "�� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:68 +msgid "If set to to 'true' the VNC backend will be initialized." +msgstr "�� '��' �� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:75 +msgid "" +"When view-only is true, remote VNC connections cannot manipulate input " +"devices (e.g. mouse and keyboard)." +msgstr "" +"�� , �� (�� " +"�� ) �� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:82 +msgid "Method used to authenticate VNC connections" +msgstr "�� " + +#: src/org.gnome.desktop.remote-desktop.gschema.xml.in:83 +msgid "" +"The VNC authentication method describes how a remote connection is " +"authenticated. It can currently be done in two different ways: * prompt - by " +"prompting the user for each new connection, requiring a person with physical " +"access to the workstation to explicitly approve the new connection. * " +"password - by requiring the remote client to provide a known password" +msgstr "" +"VNC �� " +"�� : * �� - �� , " +"�� " +"�� * �� - �� " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/po/oc.po new/gnome-remote-desktop-42.2/po/oc.po --- old/gnome-remote-desktop-42.1.1/po/oc.po 2022-04-26 21:58:41.000000000 +0200 +++ new/gnome-remote-desktop-42.2/po/oc.po 2022-05-29 18:27:40.000000000 +0200 @@ -8,8 +8,8 @@ "Project-Id-Version: gnome-remote-desktop master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-remote-desktop/" "issues\n" -"POT-Creation-Date: 2022-03-15 19:40+0000\n" -"PO-Revision-Date: 2022-03-16 15:04+0100\n" +"POT-Creation-Date: 2022-05-09 07:39+0000\n" +"PO-Revision-Date: 2022-05-26 20:05+0200\n" "Last-Translator: Quentin PAG��S\n" "Language-Team: Occitan <totenoc(a)gmail.com>\n" "Language: oc\n" @@ -18,7 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 3.0.1\n" -#: src/grd-daemon.c:423 +#: src/grd-daemon.c:480 msgid "GNOME Remote Desktop" msgstr "Bur��u distant de GNOME" @@ -72,6 +72,22 @@ " devices\n" "\n" msgstr "" +" rdp - Jos comandas��:\n" +" enable - Activar lo backend RDP\n" +" disable - Desactivar lo backend RDP\n" +" set-tls-cert <path-to-cert> - Definir empla��ament " +"certificat TLS\n" +" set-tls-key <path-to-key> - Definir empla��ament clau TLS\n" +" set-credentials <username> <password> - Definir nom utilizaire e " +"senhal\n" +" clear-credentials - Escafar nom utilizaire e " +"senhal\n" +"\n" +" enable-view-only - Desactivar las entras del " +"periferic del contr��la a dist��ncia\n" +" disable-view-only - Activar las entras del " +"periferic del contr��la a dist��ncia\n" +"\n" #: src/grd-ctl.c:407 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/src/grd-rdp-graphics-pipeline.c new/gnome-remote-desktop-42.2/src/grd-rdp-graphics-pipeline.c --- old/gnome-remote-desktop-42.1.1/src/grd-rdp-graphics-pipeline.c 2022-04-26 21:58:41.000000000 +0200 +++ new/gnome-remote-desktop-42.2/src/grd-rdp-graphics-pipeline.c 2022-05-29 18:27:40.000000000 +0200 @@ -37,6 +37,7 @@ #define ENC_TIMES_CHECK_INTERVAL_MS 1000 #define MAX_TRACKED_ENC_FRAMES 1000 +#define MIN_BW_MEASURE_SIZE (10 * 1024) typedef enum _HwAccelAPI { @@ -509,6 +510,8 @@ int64_t *enc_time_us) { RdpgfxServerContext *rdpgfx_context = graphics_pipeline->rdpgfx_context; + GrdRdpNetworkAutodetection *network_autodetection = + graphics_pipeline->network_autodetection; GrdRdpGfxSurface *gfx_surface = rdp_surface->gfx_surface; GrdRdpGfxSurface *render_surface = grd_rdp_gfx_surface_get_render_surface (gfx_surface); @@ -529,6 +532,7 @@ cairo_region_t *region; uint32_t surface_serial; int64_t enc_ack_time_us; + gboolean pending_bw_measure_stop = FALSE; int i; if (!rdp_surface->valid) @@ -629,6 +633,13 @@ } g_mutex_unlock (&graphics_pipeline->gfx_mutex); + if (network_autodetection && + (4 + avc420.meta.numRegionRects * 10 + avc420.length) >= MIN_BW_MEASURE_SIZE) + { + pending_bw_measure_stop = + grd_rdp_network_autodetection_try_bw_measure_start (network_autodetection); + } + rdpgfx_context->StartFrame (rdpgfx_context, &cmd_start); rdpgfx_context->SurfaceCommand (rdpgfx_context, &cmd); @@ -639,6 +650,9 @@ } rdpgfx_context->EndFrame (rdpgfx_context, &cmd_end); + if (pending_bw_measure_stop) + grd_rdp_network_autodetection_queue_bw_measure_stop (network_autodetection); + *enc_time_us = enc_ack_time_us; g_free (avc420.data); @@ -788,6 +802,8 @@ { RdpgfxServerContext *rdpgfx_context = graphics_pipeline->rdpgfx_context; GrdSessionRdp *session_rdp = graphics_pipeline->session_rdp; + GrdRdpNetworkAutodetection *network_autodetection = + graphics_pipeline->network_autodetection; GrdRdpGfxSurface *gfx_surface = rdp_surface->gfx_surface; GrdRdpGfxFrameController *frame_controller = grd_rdp_gfx_surface_get_frame_controller (gfx_surface); @@ -808,6 +824,7 @@ uint32_t codec_context_id; uint32_t surface_serial; int64_t enc_ack_time_us; + gboolean pending_bw_measure_stop = FALSE; int i; region = grd_rdp_damage_detector_get_damage_region (rdp_surface->detector); @@ -910,9 +927,18 @@ } g_mutex_unlock (&graphics_pipeline->gfx_mutex); + if (network_autodetection && cmd.length >= MIN_BW_MEASURE_SIZE) + { + pending_bw_measure_stop = + grd_rdp_network_autodetection_try_bw_measure_start (network_autodetection); + } + rdpgfx_context->SurfaceFrameCommand (rdpgfx_context, &cmd, &cmd_start, &cmd_end); + if (pending_bw_measure_stop) + grd_rdp_network_autodetection_queue_bw_measure_stop (network_autodetection); + *enc_time_us = enc_ack_time_us; cairo_region_destroy (region); @@ -1425,9 +1451,11 @@ rdpgfx_context->rdpcontext = rdp_context; rdpgfx_context->custom = graphics_pipeline; + g_mutex_lock (&graphics_pipeline->gfx_mutex); if (rdp_context->settings->NetworkAutoDetect && !graphics_pipeline->rtt_pause_source) ensure_rtt_receivement (graphics_pipeline); + g_mutex_unlock (&graphics_pipeline->gfx_mutex); return graphics_pipeline; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/src/grd-rdp-network-autodetection.c new/gnome-remote-desktop-42.2/src/grd-rdp-network-autodetection.c --- old/gnome-remote-desktop-42.1.1/src/grd-rdp-network-autodetection.c 2022-04-26 21:58:41.000000000 +0200 +++ new/gnome-remote-desktop-42.2/src/grd-rdp-network-autodetection.c 2022-05-29 18:27:40.000000000 +0200 @@ -25,16 +25,26 @@ #include "grd-rdp-private.h" #define BW_MEASURE_SEQUENCE_NUMBER 0 +#define MIN_NW_CHAR_RES_INTERVAL_US G_USEC_PER_SEC #define PING_INTERVAL_HIGH_MS 70 #define PING_INTERVAL_LOW_MS 700 #define RTT_AVG_PERIOD_US (500 * 1000) typedef enum _PingInterval { + PING_INTERVAL_NONE, PING_INTERVAL_HIGH, PING_INTERVAL_LOW, } PingInterval; +typedef enum _BwMeasureState +{ + BW_MEASURE_STATE_NONE, + BW_MEASURE_STATE_PENDING_STOP, + BW_MEASURE_STATE_QUEUED_STOP, + BW_MEASURE_STATE_PENDING_RESULTS, +} BwMeasureState; + typedef struct _PingInfo { uint16_t sequence_number; @@ -68,6 +78,13 @@ GQueue *round_trip_times; PingInterval ping_interval; + GMutex bw_measure_mutex; + uint32_t measured_bandwidth; + BwMeasureState bw_measure_state; + HANDLE bw_measure_stop_event; + + int64_t last_nw_char_res_notification_us; + uint16_t next_sequence_number; }; @@ -104,6 +121,16 @@ return FALSE; } +static gboolean +has_active_high_nec_rtt_consumers (GrdRdpNetworkAutodetection *network_autodetection) +{ + if (is_active_high_nec_rtt_consumer (network_autodetection, + GRD_RDP_NW_AUTODETECT_RTT_CONSUMER_RDPGFX)) + return TRUE; + + return FALSE; +} + static uint16_t get_next_free_sequence_number (GrdRdpNetworkAutodetection *network_autodetection) { @@ -146,30 +173,26 @@ static void update_ping_source (GrdRdpNetworkAutodetection *network_autodetection) { - GrdRdpNwAutodetectRTTConsumer active_high_nec_rtt_consumers; PingInterval new_ping_interval_type; uint32_t ping_interval_ms; - active_high_nec_rtt_consumers = GRD_RDP_NW_AUTODETECT_RTT_CONSUMER_NONE; - if (is_active_high_nec_rtt_consumer ( - network_autodetection, GRD_RDP_NW_AUTODETECT_RTT_CONSUMER_RDPGFX)) - active_high_nec_rtt_consumers |= GRD_RDP_NW_AUTODETECT_RTT_CONSUMER_RDPGFX; - - if (active_high_nec_rtt_consumers) + if (network_autodetection->rtt_consumers == GRD_RDP_NW_AUTODETECT_RTT_CONSUMER_NONE) + new_ping_interval_type = PING_INTERVAL_NONE; + else if (has_active_high_nec_rtt_consumers (network_autodetection)) new_ping_interval_type = PING_INTERVAL_HIGH; else new_ping_interval_type = PING_INTERVAL_LOW; - if ((network_autodetection->rtt_consumers == GRD_RDP_NW_AUTODETECT_RTT_CONSUMER_NONE || - network_autodetection->ping_interval != new_ping_interval_type) && + if (network_autodetection->ping_interval != new_ping_interval_type && network_autodetection->ping_source) { g_source_destroy (network_autodetection->ping_source); g_clear_pointer (&network_autodetection->ping_source, g_source_unref); } - if (network_autodetection->rtt_consumers == GRD_RDP_NW_AUTODETECT_RTT_CONSUMER_NONE || - network_autodetection->ping_interval == new_ping_interval_type) + network_autodetection->ping_interval = new_ping_interval_type; + + if (network_autodetection->ping_interval == PING_INTERVAL_NONE) return; g_assert (!network_autodetection->ping_source); @@ -177,6 +200,8 @@ switch (new_ping_interval_type) { + case PING_INTERVAL_NONE: + g_assert_not_reached (); case PING_INTERVAL_HIGH: ping_interval_ms = PING_INTERVAL_HIGH_MS; break; @@ -189,7 +214,6 @@ g_source_set_callback (network_autodetection->ping_source, emit_ping, network_autodetection, NULL); g_source_attach (network_autodetection->ping_source, NULL); - network_autodetection->ping_interval = new_ping_interval_type; } void @@ -199,8 +223,7 @@ g_assert (rtt_consumer != GRD_RDP_NW_AUTODETECT_RTT_CONSUMER_NONE); g_mutex_lock (&network_autodetection->consumer_mutex); - if (!has_rtt_consumer (network_autodetection, rtt_consumer)) - network_autodetection->rtt_consumers |= rtt_consumer; + network_autodetection->rtt_consumers |= rtt_consumer; update_ping_source (network_autodetection); g_mutex_unlock (&network_autodetection->consumer_mutex); @@ -210,6 +233,8 @@ grd_rdp_network_autodetection_remove_rtt_consumer (GrdRdpNetworkAutodetection *network_autodetection, GrdRdpNwAutodetectRTTConsumer rtt_consumer) { + g_assert (rtt_consumer != GRD_RDP_NW_AUTODETECT_RTT_CONSUMER_NONE); + g_mutex_lock (&network_autodetection->consumer_mutex); network_autodetection->rtt_consumers &= ~rtt_consumer; @@ -255,6 +280,59 @@ g_mutex_unlock (&network_autodetection->consumer_mutex); } +gboolean +grd_rdp_network_autodetection_try_bw_measure_start (GrdRdpNetworkAutodetection *network_autodetection) +{ + rdpAutoDetect *rdp_autodetect = network_autodetection->rdp_autodetect; + g_autoptr (GMutexLocker) locker = NULL; + + locker = g_mutex_locker_new (&network_autodetection->bw_measure_mutex); + if (network_autodetection->bw_measure_state != BW_MEASURE_STATE_NONE) + return FALSE; + + network_autodetection->bw_measure_state = BW_MEASURE_STATE_PENDING_STOP; + g_clear_pointer (&locker, g_mutex_locker_free); + + rdp_autodetect->BandwidthMeasureStart (network_autodetection->rdp_context, + BW_MEASURE_SEQUENCE_NUMBER); + + return TRUE; +} + +void +grd_rdp_network_autodetection_bw_measure_stop (GrdRdpNetworkAutodetection *network_autodetection) +{ + rdpAutoDetect *rdp_autodetect = network_autodetection->rdp_autodetect; + + g_mutex_lock (&network_autodetection->bw_measure_mutex); + g_assert (network_autodetection->bw_measure_state == BW_MEASURE_STATE_PENDING_STOP || + network_autodetection->bw_measure_state == BW_MEASURE_STATE_QUEUED_STOP); + + ResetEvent (network_autodetection->bw_measure_stop_event); + network_autodetection->bw_measure_state = BW_MEASURE_STATE_PENDING_RESULTS; + g_mutex_unlock (&network_autodetection->bw_measure_mutex); + + rdp_autodetect->BandwidthMeasureStop (network_autodetection->rdp_context, + BW_MEASURE_SEQUENCE_NUMBER); +} + +void +grd_rdp_network_autodetection_queue_bw_measure_stop (GrdRdpNetworkAutodetection *network_autodetection) +{ + g_mutex_lock (&network_autodetection->bw_measure_mutex); + g_assert (network_autodetection->bw_measure_state == BW_MEASURE_STATE_PENDING_STOP); + + SetEvent (network_autodetection->bw_measure_stop_event); + network_autodetection->bw_measure_state = BW_MEASURE_STATE_QUEUED_STOP; + g_mutex_unlock (&network_autodetection->bw_measure_mutex); +} + +HANDLE +grd_rdp_network_autodetection_get_bw_measure_stop_event_handle (GrdRdpNetworkAutodetection *network_autodetection) +{ + return network_autodetection->bw_measure_stop_event; +} + static void track_round_trip_time (GrdRdpNetworkAutodetection *network_autodetection, int64_t ping_time_us, @@ -281,27 +359,75 @@ g_free (g_queue_pop_head (network_autodetection->round_trip_times)); } -static int64_t -get_current_avg_round_trip_time_us (GrdRdpNetworkAutodetection *network_autodetection) +static void +update_round_trip_time_values (GrdRdpNetworkAutodetection *network_autodetection, + int64_t *base_round_trip_time_us, + int64_t *avg_round_trip_time_us) { int64_t sum_round_trip_times_us = 0; uint32_t total_round_trip_times; RTTInfo *rtt_info; GQueue *tmp; + *base_round_trip_time_us = 0; + *avg_round_trip_time_us = 0; + remove_old_round_trip_times (network_autodetection); - if (!g_queue_get_length (network_autodetection->round_trip_times)) - return 0; + if (g_queue_get_length (network_autodetection->round_trip_times) == 0) + return; tmp = g_queue_copy (network_autodetection->round_trip_times); total_round_trip_times = g_queue_get_length (tmp); + g_assert (total_round_trip_times > 0); + + *base_round_trip_time_us = INT64_MAX; while ((rtt_info = g_queue_pop_head (tmp))) - sum_round_trip_times_us += rtt_info->round_trip_time_us; + { + *base_round_trip_time_us = MIN (*base_round_trip_time_us, + rtt_info->round_trip_time_us); + sum_round_trip_times_us += rtt_info->round_trip_time_us; + } g_queue_free (tmp); - return sum_round_trip_times_us / total_round_trip_times; + *avg_round_trip_time_us = sum_round_trip_times_us / total_round_trip_times; +} + +static void +maybe_send_network_characteristics_results (GrdRdpNetworkAutodetection *network_autodetection, + uint32_t base_round_trip_time_ms, + uint32_t avg_round_trip_time_ms) +{ + rdpContext *rdp_context = network_autodetection->rdp_context; + rdpAutoDetect *rdp_autodetect = network_autodetection->rdp_autodetect; + int64_t last_notification_us; + int64_t current_time_us; + uint16_t sequence_number; + + if (network_autodetection->measured_bandwidth <= 0) + return; + + if (g_queue_get_length (network_autodetection->round_trip_times) == 0) + return; + + current_time_us = g_get_monotonic_time (); + last_notification_us = network_autodetection->last_nw_char_res_notification_us; + + if (current_time_us - last_notification_us < MIN_NW_CHAR_RES_INTERVAL_US) + return; + + rdp_autodetect->netCharBandwidth = network_autodetection->measured_bandwidth; + rdp_autodetect->netCharBaseRTT = base_round_trip_time_ms; + rdp_autodetect->netCharAverageRTT = avg_round_trip_time_ms; + + g_mutex_lock (&network_autodetection->sequence_mutex); + sequence_number = get_next_free_sequence_number (network_autodetection); + g_mutex_unlock (&network_autodetection->sequence_mutex); + + rdp_autodetect->NetworkCharacteristicsResult (rdp_context, sequence_number); + + network_autodetection->last_nw_char_res_notification_us = current_time_us; } static BOOL @@ -310,8 +436,10 @@ { RdpPeerContext *rdp_peer_context = (RdpPeerContext *) rdp_context; GrdRdpNetworkAutodetection *network_autodetection; - PingInfo *ping_info; + g_autofree PingInfo *ping_info = NULL; int64_t pong_time_us; + int64_t ping_time_us; + int64_t base_round_trip_time_us; int64_t avg_round_trip_time_us; gboolean has_rtt_consumer_rdpgfx = FALSE; @@ -335,35 +463,71 @@ g_clear_pointer (&ping_info, g_free); } - if (ping_info) - { - int64_t ping_time_us = ping_info->ping_time_us; - - g_assert (ping_info->sequence_number == sequence_number); - - track_round_trip_time (network_autodetection, ping_time_us, pong_time_us); - avg_round_trip_time_us = - get_current_avg_round_trip_time_us (network_autodetection); + g_assert (ping_info); + g_assert (ping_info->sequence_number == sequence_number); - g_hash_table_remove (network_autodetection->sequences, - GUINT_TO_POINTER (ping_info->sequence_number)); - } + g_hash_table_remove (network_autodetection->sequences, + GUINT_TO_POINTER (ping_info->sequence_number)); g_mutex_unlock (&network_autodetection->sequence_mutex); + ping_time_us = ping_info->ping_time_us; + track_round_trip_time (network_autodetection, ping_time_us, pong_time_us); + update_round_trip_time_values (network_autodetection, + &base_round_trip_time_us, + &avg_round_trip_time_us); + g_mutex_lock (&network_autodetection->consumer_mutex); has_rtt_consumer_rdpgfx = has_rtt_consumer ( network_autodetection, GRD_RDP_NW_AUTODETECT_RTT_CONSUMER_RDPGFX); g_mutex_unlock (&network_autodetection->consumer_mutex); g_mutex_lock (&network_autodetection->shutdown_mutex); - if (ping_info && !network_autodetection->in_shutdown && has_rtt_consumer_rdpgfx) + if (!network_autodetection->in_shutdown && has_rtt_consumer_rdpgfx) { grd_rdp_graphics_pipeline_notify_new_round_trip_time ( rdp_peer_context->graphics_pipeline, avg_round_trip_time_us); } g_mutex_unlock (&network_autodetection->shutdown_mutex); - g_free (ping_info); + maybe_send_network_characteristics_results (network_autodetection, + base_round_trip_time_us / 1000, + avg_round_trip_time_us / 1000); + + return TRUE; +} + +static BOOL +autodetect_bw_measure_results (rdpContext *rdp_context, + uint16_t sequence_number) +{ + RdpPeerContext *rdp_peer_context = (RdpPeerContext *) rdp_context; + GrdRdpNetworkAutodetection *network_autodetection = + rdp_peer_context->network_autodetection; + rdpAutoDetect *rdp_autodetect; + g_autoptr (GMutexLocker) locker = NULL; + int64_t base_round_trip_time_us; + int64_t avg_round_trip_time_us; + + locker = g_mutex_locker_new (&network_autodetection->bw_measure_mutex); + if (network_autodetection->bw_measure_state != BW_MEASURE_STATE_PENDING_RESULTS) + return TRUE; + + network_autodetection->bw_measure_state = BW_MEASURE_STATE_NONE; + g_clear_pointer (&locker, g_mutex_locker_free); + + rdp_autodetect = network_autodetection->rdp_autodetect; + if (rdp_autodetect->netCharBandwidth <= 0) + return TRUE; + + network_autodetection->measured_bandwidth = rdp_autodetect->netCharBandwidth; + + update_round_trip_time_values (network_autodetection, + &base_round_trip_time_us, + &avg_round_trip_time_us); + + maybe_send_network_characteristics_results (network_autodetection, + base_round_trip_time_us / 1000, + avg_round_trip_time_us / 1000); return TRUE; } @@ -381,6 +545,7 @@ network_autodetection->rdp_autodetect = rdp_autodetect; rdp_autodetect->RTTMeasureResponse = autodetect_rtt_measure_response; + rdp_autodetect->BandwidthMeasureResults = autodetect_bw_measure_results; return network_autodetection; } @@ -411,6 +576,8 @@ g_clear_pointer (&network_autodetection->sequences, g_hash_table_destroy); + g_clear_pointer (&network_autodetection->bw_measure_stop_event, CloseHandle); + G_OBJECT_CLASS (grd_rdp_network_autodetection_parent_class)->dispose (object); } @@ -420,6 +587,7 @@ GrdRdpNetworkAutodetection *network_autodetection = GRD_RDP_NETWORK_AUTODETECTION (object); + g_mutex_clear (&network_autodetection->bw_measure_mutex); g_mutex_clear (&network_autodetection->sequence_mutex); g_mutex_clear (&network_autodetection->consumer_mutex); g_mutex_clear (&network_autodetection->shutdown_mutex); @@ -430,6 +598,12 @@ static void grd_rdp_network_autodetection_init (GrdRdpNetworkAutodetection *network_autodetection) { + network_autodetection->ping_interval = PING_INTERVAL_NONE; + network_autodetection->bw_measure_state = BW_MEASURE_STATE_NONE; + + network_autodetection->bw_measure_stop_event = + CreateEvent (NULL, TRUE, FALSE, NULL); + network_autodetection->sequences = g_hash_table_new (NULL, NULL); network_autodetection->pings = g_queue_new (); network_autodetection->round_trip_times = g_queue_new (); @@ -437,6 +611,7 @@ g_mutex_init (&network_autodetection->shutdown_mutex); g_mutex_init (&network_autodetection->consumer_mutex); g_mutex_init (&network_autodetection->sequence_mutex); + g_mutex_init (&network_autodetection->bw_measure_mutex); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/src/grd-rdp-network-autodetection.h new/gnome-remote-desktop-42.2/src/grd-rdp-network-autodetection.h --- old/gnome-remote-desktop-42.1.1/src/grd-rdp-network-autodetection.h 2022-04-26 21:58:41.000000000 +0200 +++ new/gnome-remote-desktop-42.2/src/grd-rdp-network-autodetection.h 2022-05-29 18:27:40.000000000 +0200 @@ -53,4 +53,12 @@ GrdRdpNwAutodetectRTTConsumer rtt_consumer, GrdRdpNwAutodetectRTTNecessity rtt_necessity); +gboolean grd_rdp_network_autodetection_try_bw_measure_start (GrdRdpNetworkAutodetection *network_autodetection); + +void grd_rdp_network_autodetection_bw_measure_stop (GrdRdpNetworkAutodetection *network_autodetection); + +void grd_rdp_network_autodetection_queue_bw_measure_stop (GrdRdpNetworkAutodetection *network_autodetection); + +HANDLE grd_rdp_network_autodetection_get_bw_measure_stop_event_handle (GrdRdpNetworkAutodetection *network_autodetection); + #endif /* GRD_RDP_NETWORK_AUTODETECTION_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/src/grd-session-rdp.c new/gnome-remote-desktop-42.2/src/grd-session-rdp.c --- old/gnome-remote-desktop-42.1.1/src/grd-session-rdp.c 2022-04-26 21:58:41.000000000 +0200 +++ new/gnome-remote-desktop-42.2/src/grd-session-rdp.c 2022-05-29 18:27:40.000000000 +0200 @@ -2011,9 +2011,20 @@ while (TRUE) { + GrdRdpNetworkAutodetection *network_autodetection = + rdp_peer_context->network_autodetection; + gboolean pending_bw_measure_stop = FALSE; + HANDLE bw_measure_stop_event = NULL; + n_events = 0; events[n_events++] = session_rdp->stop_event; + if (network_autodetection) + { + bw_measure_stop_event = + grd_rdp_network_autodetection_get_bw_measure_stop_event_handle (network_autodetection); + events[n_events++] = bw_measure_stop_event; + } n_freerdp_handles = peer->GetEventHandles (peer, &events[n_events], 32 - n_events); @@ -2068,6 +2079,12 @@ break; } + if (bw_measure_stop_event) + { + pending_bw_measure_stop = WaitForSingleObject (bw_measure_stop_event, + 0) == WAIT_OBJECT_0; + } + if (WaitForSingleObject (channel_event, 0) == WAIT_OBJECT_0 && !WTSVirtualChannelManagerCheckFileDescriptor (vcm)) { @@ -2075,6 +2092,9 @@ handle_client_gone (session_rdp); break; } + + if (pending_bw_measure_stop) + grd_rdp_network_autodetection_bw_measure_stop (network_autodetection); } if (session_rdp->hwaccel_nvidia) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/tests/run-vnc-tests.py new/gnome-remote-desktop-42.2/tests/run-vnc-tests.py --- old/gnome-remote-desktop-42.1.1/tests/run-vnc-tests.py 2022-04-26 21:58:41.000000000 +0200 +++ new/gnome-remote-desktop-42.2/tests/run-vnc-tests.py 2022-05-29 18:27:40.000000000 +0200 @@ -21,7 +21,6 @@ vnc_server_failed = None os.environ['GNOME_REMOTE_DESKTOP_TEST_VNC_PASSWORD'] = 'secret' -os.environ['MUTTER_DEBUG_DUMMY_MODE_SPECS'] = '1024x768' def run_vnc_test_client(): print("Running VNC test client") @@ -70,7 +69,8 @@ def start_mutter(): global mutter print("Starting mutter") - mutter = subprocess.Popen(['mutter', '--nested', '--wayland'], + mutter = subprocess.Popen(['mutter', '--headless', '--wayland', '--no-x11', + '--virtual-monitor', '1024x768'], stderr=subprocess.STDOUT) def stop_mutter(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-remote-desktop-42.1.1/tests/vnc-test-runner.sh new/gnome-remote-desktop-42.2/tests/vnc-test-runner.sh --- old/gnome-remote-desktop-42.1.1/tests/vnc-test-runner.sh 2022-04-26 21:58:41.000000000 +0200 +++ new/gnome-remote-desktop-42.2/tests/vnc-test-runner.sh 2022-05-29 18:27:40.000000000 +0200 @@ -1,3 +1,3 @@ #!/usr/bin/env bash -dbus-run-session -- xvfb-run -s '+iglx -noreset' $TEST_SRCDIR/tests/run-vnc-tests.py +dbus-run-session -- $TEST_SRCDIR/tests/run-vnc-tests.py ++++++ gnome-remote-desktop.obsinfo ++++++ --- /var/tmp/diff_new_pack.hUyeHG/_old 2022-05-31 15:48:52.380047603 +0200 +++ /var/tmp/diff_new_pack.hUyeHG/_new 2022-05-31 15:48:52.384047606 +0200 @@ -1,5 +1,5 @@ name: gnome-remote-desktop -version: 42.1.1 -mtime: 1651003121 -commit: a7cbaae7139c108a6c0297dac7881ab071a91ca3 +version: 42.2 +mtime: 1653841660 +commit: a5a962b923bf88d64793b43e0f3915e0eaa8acbe

1 0

commit gnome-radio for openSUSE:Factory
by Source-Sync 31 May '22

31 May '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-radio for openSUSE:Factory checked in at 2022-05-31 15:47:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-radio (Old) and /work/SRC/openSUSE:Factory/.gnome-radio.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-radio" Tue May 31 15:47:38 2022 rev:5 rq:980029 version:16.0.43 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-radio/gnome-radio.changes 2022-04-25 23:35:16.322394996 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-radio.new.1548/gnome-radio.changes 2022-05-31 15:48:50.488046347 +0200 @@ -1,0 +2,7 @@ +Mon May 30 12:16:31 UTC 2022 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Update to version 16.0.43: + + Add some radio stations from Norway and Denmark. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-radio-16.0.42.tar.xz New: ---- gnome-radio-16.0.43.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-radio.spec ++++++ --- /var/tmp/diff_new_pack.1Tka0C/_old 2022-05-31 15:48:50.840046581 +0200 +++ /var/tmp/diff_new_pack.1Tka0C/_new 2022-05-31 15:48:50.844046583 +0200 @@ -17,7 +17,7 @@ Name: gnome-radio -Version: 16.0.42 +Version: 16.0.43 Release: 0 Summary: Live Internet radio broadcaster discovery program License: GPL-3.0-or-later ++++++ gnome-radio-16.0.42.tar.xz -> gnome-radio-16.0.43.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/ChangeLog new/gnome-radio-16.0.43/ChangeLog --- old/gnome-radio-16.0.42/ChangeLog 2022-04-02 21:19:51.000000000 +0200 +++ new/gnome-radio-16.0.43/ChangeLog 2022-05-27 09:57:06.000000000 +0200 @@ -1,3 +1,33 @@ +commit f48411d9f46594745b572eb6b1b0432aef214004 +Author: Ole Aamot <ole(a)gnome.org> +Date: Fri May 27 09:55:14 2022 +0200 + + Release Radio 16.0.43 for GNOME 43 (gnome-radio) + + ChangeLog | 12 ++++++++++ + Makefile.in | 2 +- + NEWS | 19 +++++++++++++++ + configure | 20 ++++++++-------- + configure.ac | 2 +- + data/gnome-radio.desktop.in | 2 +- + data/gnome-radio.desktop.in.in | 2 +- + gnome-radio.spec.in | 7 ++++-- + src/gnome-radio.c | 4 ++-- + src/gnome-radio.xml | 54 ++++++++++++++++++++++++++++++++++++++++-- + 10 files changed, 104 insertions(+), 20 deletions(-) + +commit 8d9a9b60ff19c90111f694e08dc8d47f8cf3d1fc +Author: Ole Aamot <ole(a)gnome.org> +Date: Sat Apr 9 22:07:55 2022 +0200 + + Release Radio 16.0.42 for GNOME 42 (gnome-radio) + + ChangeLog | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + NEWS | 17 +++++ + configure | 20 +++--- + src/gnome-radio.xml | 2 +- + 4 files changed, 209 insertions(+), 11 deletions(-) + commit 317cd940cb4cd07f4c4bd180d8bb0e9804448c56 Author: Ole Aamot <ole(a)gnome.org> Date: Sat Apr 2 19:14:42 2022 +0000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/Makefile new/gnome-radio-16.0.43/Makefile --- old/gnome-radio-16.0.42/Makefile 2022-04-02 20:46:44.000000000 +0200 +++ new/gnome-radio-16.0.43/Makefile 2022-05-27 09:57:04.000000000 +0200 @@ -206,15 +206,15 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} '/home/oleaamot/Source/gnome-radio/missing' aclocal-1.16 +ACLOCAL = ${SHELL} '/home/olekaa/Software/gnome-radio/missing' aclocal-1.16 ALL_LINGUAS = AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 0 AR = ar AS = as -AUTOCONF = ${SHELL} '/home/oleaamot/Source/gnome-radio/missing' autoconf -AUTOHEADER = ${SHELL} '/home/oleaamot/Source/gnome-radio/missing' autoheader -AUTOMAKE = ${SHELL} '/home/oleaamot/Source/gnome-radio/missing' automake-1.16 +AUTOCONF = ${SHELL} '/home/olekaa/Software/gnome-radio/missing' autoconf +AUTOHEADER = ${SHELL} '/home/olekaa/Software/gnome-radio/missing' autoheader +AUTOMAKE = ${SHELL} '/home/olekaa/Software/gnome-radio/missing' automake-1.16 AWK = gawk CATALOGS = CATOBJEXT = .gmo @@ -284,7 +284,7 @@ LTLIBOBJS = LT_SYS_LIBRARY_PATH = MAINT = -MAKEINFO = ${SHELL} '/home/oleaamot/Source/gnome-radio/missing' makeinfo +MAKEINFO = ${SHELL} '/home/olekaa/Software/gnome-radio/missing' makeinfo MANIFEST_TOOL = : MKDIR_P = /usr/bin/mkdir -p MKINSTALLDIRS = .//mkinstalldirs @@ -300,10 +300,10 @@ PACKAGE = gnome-radio PACKAGE_BUGREPORT = PACKAGE_NAME = gnome-radio -PACKAGE_STRING = gnome-radio 16.0.42 +PACKAGE_STRING = gnome-radio 16.0.43 PACKAGE_TARNAME = gnome-radio PACKAGE_URL = -PACKAGE_VERSION = 16.0.42 +PACKAGE_VERSION = 16.0.43 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = @@ -318,15 +318,15 @@ SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 16.0.42 +VERSION = 16.0.43 XGETTEXT = /usr/bin/xgettext XMLLINT = xmllint YELP_LC_DIST = true YELP_LC_MEDIA_LINKS = true -abs_builddir = /home/oleaamot/Source/gnome-radio -abs_srcdir = /home/oleaamot/Source/gnome-radio -abs_top_builddir = /home/oleaamot/Source/gnome-radio -abs_top_srcdir = /home/oleaamot/Source/gnome-radio +abs_builddir = /home/olekaa/Software/gnome-radio +abs_srcdir = /home/olekaa/Software/gnome-radio +abs_top_builddir = /home/olekaa/Software/gnome-radio +abs_top_srcdir = /home/olekaa/Software/gnome-radio ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -355,7 +355,7 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/oleaamot/Source/gnome-radio/install-sh +install_sh = ${SHELL} /home/olekaa/Software/gnome-radio/install-sh intltool__v_merge_options_ = $(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY)) intltool__v_merge_options_0 = -q libdir = ${exec_prefix}/lib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/NEWS new/gnome-radio-16.0.43/NEWS --- old/gnome-radio-16.0.42/NEWS 2022-04-02 21:19:46.000000000 +0200 +++ new/gnome-radio-16.0.43/NEWS 2022-05-27 09:56:41.000000000 +0200 @@ -1,4 +1,23 @@ =============== +Version 16.0.43 +=============== + +Build + + * configure.ac: 16.0.43 + * gnome-radio.spec.in: 16.0.43 + +GUI + + * src/gnome-radio.xml: Add NRK Folkemusikk (Oslo, Norway) + * src/gnome-radio.xml: Add NRK P1+ (Oslo, Norway) + * src/gnome-radio.xml: Add NRK P3X (Oslo, Norway) + * src/gnome-radio.xml: Add NRK Super (Oslo, Norway) + * src/gnome-radio.xml: Add Nordfjord N��rradio (Nordfjord, Norway) + * src/gnome-radio.xml: Add Radio Jazz (Copenhagen, Denmark) + * src/gnome-radio.xml: Update Radio ��lesund (��lesund, Norway) + +=============== Version 16.0.42 =============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/configure new/gnome-radio-16.0.43/configure --- old/gnome-radio-16.0.42/configure 2022-04-02 20:46:37.000000000 +0200 +++ new/gnome-radio-16.0.43/configure 2022-05-27 09:56:57.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for gnome-radio 16.0.42. +# Generated by GNU Autoconf 2.71 for gnome-radio 16.0.43. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -618,8 +618,8 @@ # Identity of this package. PACKAGE_NAME='gnome-radio' PACKAGE_TARNAME='gnome-radio' -PACKAGE_VERSION='16.0.42' -PACKAGE_STRING='gnome-radio 16.0.42' +PACKAGE_VERSION='16.0.43' +PACKAGE_STRING='gnome-radio 16.0.43' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1459,7 +1459,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-radio 16.0.42 to adapt to many kinds of systems. +\`configure' configures gnome-radio 16.0.43 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1530,7 +1530,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-radio 16.0.42:";; + short | recursive ) echo "Configuration of gnome-radio 16.0.43:";; esac cat <<\_ACEOF @@ -1668,7 +1668,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-radio configure 16.0.42 +gnome-radio configure 16.0.43 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1967,7 +1967,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-radio $as_me 16.0.42, which was +It was created by gnome-radio $as_me 16.0.43, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3236,7 +3236,7 @@ # Define the identity of the package. PACKAGE='gnome-radio' - VERSION='16.0.42' + VERSION='16.0.43' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -18330,7 +18330,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-radio $as_me 16.0.42, which was +This file was extended by gnome-radio $as_me 16.0.43, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18398,7 +18398,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -gnome-radio config.status 16.0.42 +gnome-radio config.status 16.0.43 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/configure.ac new/gnome-radio-16.0.43/configure.ac --- old/gnome-radio-16.0.42/configure.ac 2022-04-02 20:46:21.000000000 +0200 +++ new/gnome-radio-16.0.43/configure.ac 2022-05-27 09:56:41.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(gnome-radio,16.0.42) +AC_INIT(gnome-radio,16.0.43) AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects]) AM_MAINTAINER_MODE AC_CONFIG_SRCDIR([src/gnome-radio.c]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/data/gnome-radio.desktop new/gnome-radio-16.0.43/data/gnome-radio.desktop --- old/gnome-radio-16.0.42/data/gnome-radio.desktop 2022-04-02 20:46:44.000000000 +0200 +++ new/gnome-radio-16.0.43/data/gnome-radio.desktop 2022-05-27 09:57:05.000000000 +0200 @@ -11,7 +11,7 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-radio X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=16.0.1 +X-GNOME-Bugzilla-Version=16.0.43 MimeType=application/gnome-radio; # Extra keywords that can be used to search for gnome-radio in GNOME Shell and Unity Keywords=Live;Radio;Program;Station;NPR; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/data/gnome-radio.desktop.in new/gnome-radio-16.0.43/data/gnome-radio.desktop.in --- old/gnome-radio-16.0.42/data/gnome-radio.desktop.in 2022-04-02 20:35:45.000000000 +0200 +++ new/gnome-radio-16.0.43/data/gnome-radio.desktop.in 2022-05-27 09:56:41.000000000 +0200 @@ -11,7 +11,7 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-radio X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=16.0.1 +X-GNOME-Bugzilla-Version=16.0.43 MimeType=application/gnome-radio; # Extra keywords that can be used to search for gnome-radio in GNOME Shell and Unity Keywords=Live;Radio;Program;Station;NPR; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/data/gnome-radio.desktop.in.in new/gnome-radio-16.0.43/data/gnome-radio.desktop.in.in --- old/gnome-radio-16.0.42/data/gnome-radio.desktop.in.in 2022-04-02 20:35:45.000000000 +0200 +++ new/gnome-radio-16.0.43/data/gnome-radio.desktop.in.in 2022-05-27 09:56:41.000000000 +0200 @@ -11,7 +11,7 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-radio X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=16.0.1 +X-GNOME-Bugzilla-Version=16.0.43 MimeType=application/gnome-radio; # Extra keywords that can be used to search for gnome-radio in GNOME Shell and Unity Keywords=Live;Radio;Program;Station;NPR; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/gnome-radio.spec new/gnome-radio-16.0.43/gnome-radio.spec --- old/gnome-radio-16.0.42/gnome-radio.spec 2022-04-02 21:19:51.000000000 +0200 +++ new/gnome-radio-16.0.43/gnome-radio.spec 2022-05-27 09:57:05.000000000 +0200 @@ -1,10 +1,10 @@ Name: gnome-radio -Version: 16.0.42 +Version: 16.0.43 Release: 1%{?dist} Summary: Radio License: GPLv3+ -URL: https://people.gnome.org/~ole/%{name} -Source: %{url}/%{name}-%{version}.tar.xz +URL: http://www.gnomeradio.org/ +Source: %{url}/src/%{name}-%{version}.tar.xz BuildRequires: gcc BuildRequires: gtk3-devel @@ -61,6 +61,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Fri May 27 2022 Ole Aamot <ole(a)gnome.org> - 16.0.43-1 +- Initial gnome-radio 16.0.43 builds on Fedora Linux 36 + * Sat Apr 02 2022 Ole Aamot <ole(a)gnome.org> - 16.0.42-1 - Second gnome-radio 16.0.42 builds on Fedora Linux 36 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/gnome-radio.spec.in new/gnome-radio-16.0.43/gnome-radio.spec.in --- old/gnome-radio-16.0.42/gnome-radio.spec.in 2022-04-02 21:15:16.000000000 +0200 +++ new/gnome-radio-16.0.43/gnome-radio.spec.in 2022-05-27 09:56:41.000000000 +0200 @@ -3,8 +3,8 @@ Release: 1%{?dist} Summary: Radio License: GPLv3+ -URL: https://people.gnome.org/~ole/%{name} -Source: %{url}/%{name}-%{version}.tar.xz +URL: http://www.gnomeradio.org/ +Source: %{url}/src/%{name}-%{version}.tar.xz BuildRequires: gcc BuildRequires: gtk3-devel @@ -61,6 +61,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Fri May 27 2022 Ole Aamot <ole(a)gnome.org> - 16.0.43-1 +- Initial gnome-radio 16.0.43 builds on Fedora Linux 36 + * Sat Apr 02 2022 Ole Aamot <ole(a)gnome.org> - 16.0.42-1 - Second gnome-radio 16.0.42 builds on Fedora Linux 36 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/src/gnome-radio.c new/gnome-radio-16.0.43/src/gnome-radio.c --- old/gnome-radio-16.0.42/src/gnome-radio.c 2022-04-02 20:46:21.000000000 +0200 +++ new/gnome-radio-16.0.43/src/gnome-radio.c 2022-05-27 09:56:41.000000000 +0200 @@ -621,7 +621,7 @@ gtk_container_add (GTK_CONTAINER(window), GTK_WIDGET(grid)); g_signal_connect (window, "destroy", G_CALLBACK(gtk_main_quit), NULL); #endif - gtk_window_set_title (GTK_WINDOW(window), _("Radio 16.0.42 - http://www.gnomeradio.org/ - https://wiki.gnome.org/Apps/Radio")); + gtk_window_set_title (GTK_WINDOW(window), _("Radio 16.0.43 - http://www.gnomeradio.org/ - https://wiki.gnome.org/Apps/Radio")); gtk_window_set_default_size (GTK_WINDOW(window), 740, 580); gtk_window_maximize (GTK_WINDOW (window)); gnome_radio_app = create_gnome_radio_app(); @@ -812,7 +812,7 @@ /* give the window a 10px wide border */ gtk_container_set_border_width (GTK_CONTAINER (window), 10); /* give it the title */ - gtk_window_set_title (GTK_WINDOW (window), _("Radio 16.0.42 - http://www.gnomeradio.org/ - https://wiki.gnome.org/Apps/Radio")); + gtk_window_set_title (GTK_WINDOW (window), _("Radio 16.0.43 - http://www.gnomeradio.org/ - https://wiki.gnome.org/Apps/Radio")); /* Connect the destroy event of the window with our on_destroy function * When the window is about to be destroyed we get a notificaiton and * stop the main GTK loop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-radio-16.0.42/src/gnome-radio.xml new/gnome-radio-16.0.43/src/gnome-radio.xml --- old/gnome-radio-16.0.42/src/gnome-radio.xml 2022-04-02 21:18:39.000000000 +0200 +++ new/gnome-radio-16.0.43/src/gnome-radio.xml 2022-05-27 09:56:41.000000000 +0200 @@ -1,7 +1,57 @@ <?xml version="1.0" encoding="UTF-8"?> <?xml-stylesheet type="text/xsl" href="https://people.gnome.org/~ole/gnome-radio/gnome-radio.xsl" ?> <!DOCTYPE gnome_radio SYSTEM "gnome-radio-16.0.dtd"> -<gnome_radio version="16.0.42"> +<gnome_radio version="16.0.43"> + <station band="Online" id="nrkp1pluss" name="NRK P1+" rank="1.0" type="gov"> + <location>Oslo, Norway</location> + <description lang="nb">NRK P1+ er en av NRKs radiokanaler, som sendes p�� DAB og som nettradiokanal. NRK P1+ startet sine sendinger 2. oktober 2013 som en del av NRKs heldigitale radiotilbud og radiokanelen erstattet NRK Gull. Av de f��rste programlederne har v��rt Viggo Valle, Kari S��rb��, Hanne Hoftun, Erik Forfod og Hans-Petter Jacobsen.</description> + <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_p1pluss_aac_h" codec="MPEG-4 AAC" samplerate="48000 Hz" bitrate="125 kbps" /> + <uri>https://www.nrk.no/informasjon/nrk-p1_-pa-lufta-1.11253656</uri> + </station> + <station band="Online" id="nrkp3x" name="NRK P3X" rank="1.0" type="gov"> + <location>Oslo, Norway</location> + <description lang="nb">NRK P3X er en radiokanal fra NRK, som utelukkende spiller musikk, hovedsakelig hiphop, norsk rap og RnB. Den ble etablert 28. februar 2019. Kanalen ble opprettet med det form��l at musikkmiksen skal f��lges opp mye tettere og oppdateres ukentlig og ved behov, og i st��rre grad l��fte frem den norske musikkscenen.</description> + <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_p3x_aac_h" codec="MPEG-4 AAC" samplerate="48000 Hz" bitrate="125 kbps" /> + <uri>https://www.nrk.no/presse/programomtaler/nrk-p3-styrker-hiphop-tilbudet-1.1…</uri> + </station> + <station band="Online" id="nrksuper" name="NRK Super" rank="1.0" type="gov"> + <location>Oslo, Norway</location> + <description lang="nb">NRK Super er NRKs tilbud for barn fra 2 til 12 ��r. Tilbudet best��r av en TV-kanal som sender fra 06.30 til 19.30, p�� samme sendefrekvens som NRK3, Norges st��rste nettsted for barn; nrksuper.no, samt en radiokanal som sender p�� DAB hver dag fra 06 til 21, og d��gnkontinuerlig p�� nettradio i tillegg til en egen app med programarkiv.</description> + <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_super_aac_h" codec="MPEG-4 AAC" samplerate="48000 Hz" bitrate="125 kbps" /> + <uri>https://nrksuper.no/</uri> + </station> + <station band="Online" id="nrkfolkemusikk" name="NRK Folkemusikk" rank="1.0" type="gov"> + <location>Oslo, Norway</location> + <description lang="nb">NRK Folkemusikk er NRKs tiende radiokanal, og var den f��rste norske radiokanalen som bare sendte digitalt via DAB og Internett. Kanalen sender bare musikk, uten programleder. Musikken p�� kanalen best��r av b��de ny og gammel norsk folkemusikk i tillegg til noe verdensmusikk.</description> + <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_folkemusikk_aac_h" codec="MPEG-4 AAC" samplerate="48000 Hz" bitrate="125 kbps" /> + <uri>https://www.nrk.no/skole/musikkparken/folkemusikken-og-nrk-1.13175858</uri> + </station> + <station band="107.2FM" id="nordfjordn��rradio" name="Nordfjord N��rradio" rank="1.0" type="org"> + <location>Nordfjord, Norway</location> + <description lang="nn">Nordfjord N��rradio var stifta i 1987 og var lokaliset p�� Fjordane Folkeh��gskule p�� Eid. Det var i starten elevar og l��rarar p�� skulen som var drivkrafta bak radioen. Vi hadde fleire studio p�� skulen f��r vi flytta ut derifr��. Totalt har vi hatt 6 studio kringom p�� Eid. Hestnesbygget, ��yane der l��sbutikken ligg i dag, og dagens studio Trivselshj��rnet i det gamle vegvesen bygget. + + Opp igjennom tida sidan 1987, har det vore mange innom NNR. Vi har hatt fast ansatt redakt��r i full stilling p�� 90 talet, men det synte seg vanskelig �� f�� god ��konomi i dette. S�� p�� slutten av 90 talet kom Jon Roar inn som redakt��r, noko han er den dag i dag. Rasmus Torvik var og ein av mange primus motorar hos oss. Han har digitalisert det aller meste av v��re gamle program f��r han gjekk bort, og har difor hoved��ra for at vi har eit rikhaldig arkiv med program omtrent heilt fr�� starten av. + + Vi har medarbeidarar fr�� b��de Gloppen og Stad kommune, og det var ein lang periode 2 hovudstudio. Eit p�� Sandane og det andre p�� Eid. Etter at studioet p�� Sandane m��tte flytte ut fr�� lokalet vi hadde der, vart det dessverre ikkje funne nokon ny god plass der. Sidan har vi fokusert p�� utvikle dagens studio p�� Eid. + + Radioen gjekk gjennom nokre veldig tunge ��r etter tusen��rsskiftet, og vi var n��r med �� legge inn ��rane . Dette klarte vi heldigvis �� snu med god innsats og l��ysingar fra alle involverte i desse tunge ��ra. I dag kan vi seie at vi driv godt og sunt, takka vere radiobingoen v��r + + Radiobingoen har vore og er hovudinntektskjelda til radioen. Og den er popul��r i heile dekningsomr��det v��rt. Vi slepp difor �� selje reklame for �� overleve i dagens radiomarknad. + + I desse dagar (haust 21 og v��r 22) har vi oppgradert radioen til og �� sende p�� nett. Dette gjer at vi kan n�� lyttarar over heile verda (om vi vil) som har lyst �� h��yre kjente stemmer fr�� heimkommunane sine. Samt at vi n��r stadar som har d��rleg dekning p�� dagens FM sendarar. Vi sender direkte kvar onsdag med radiobingo og kvar fredag med Fredagskveld fr�� Trivselshj��rnet. I tillegg har vi sendingar torsdagar n��r det er kommunestyrem��te i Stad kommune. + + I dag sender vi alts�� p�� nett via linken til Radioplayer p�� framsida v��r. + + P�� FM nettet, har vi 1 hovudsendar p�� studioet p�� Eid som sender p�� 107,2 mhz. I tillegg har vi omformarar p�� Sandane 104,3 mhz, Hunvikfjellet 106,2 mhz og Davikneset 105,8 mhz. Desse har blitt og vil bli oppgraderte utover i 2022.</description> + <stream mime="audio/mpeg" uri="https://lyd.nnr1987.no/nnr_hq" codec="MPEG 1 Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="JntStereo" bitrate="192 kbps" /> + <uri>https://nnr1987.no/</uri> + </station> + <station band="102.9FM" id="radiojazzcopenhagen" name="Radio Jazz Copenhagen" rank="1.0" type="com"> + <location>Copenhagen, Denmark</location> + <description lang="dk">Radio Jazz sender p�� nettet hele d��gnet. P�� FM 102,9 Mhz samsender vi mandag til fredag fra 21.00 - 00.00 samt l��rdag og s��ndag i tidsrummet 12.00 - 16.00. Radio Jazz Copenhagen is broadcasting 24/7 on the web.</description> + <stream mime="audio/mpeg" uri="http://asima.out.airtime.pro:8000/radiojazzcopenhagen_a" codec="MPEG 1 Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="JntStereo" bitrate="192 kbps" /> + <uri>http://www.radiojazz.dk/</uri> + </station> <station band="Online" id="nporadio1" name="NPO Radio 1" rank="1.0" type="gov"> <location>Netherlands</location> <description>NPO Radio 1 is a public-service radio channel in the Netherlands, broadcasting mainly news and sport. It is part of the Netherlands Public Broadcasting system, NPO. It can be compared with BBC Radio 5 Live.</description> @@ -398,7 +448,7 @@ <station band="Online" id="radio��lesund" lang="no" name="Radio ��lesund" rank="1.0" type="com"> <location>��lesund, Norway</location> <description lang="no">Radio ��lesund</description> - <stream mime="audio/aac" uri="http://stream.jaerradiogruppen.no:8008/;" codec="MPEG-1 Layer 3 (MP3)" samplerate="44100 Hz" bitrate="191 kbps" /> + <stream mime="audio/aac" uri="https://audio.radioaalesund.no/aalesund_mq" codec="MPEG-2 AAC" samplerate="44100 Hz" bitrate="125 kbps" /> <uri>https://www.radioaalesund.no/</uri> </station> <station band="Online" id="p1_hordaland" lang="no" name="NRK P1 Hordaland" rank="1.0" type="gov">

1 0

commit gnome-initial-setup for openSUSE:Factory
by Source-Sync 31 May '22

31 May '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-initial-setup for openSUSE:Factory checked in at 2022-05-31 15:47:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-initial-setup (Old) and /work/SRC/openSUSE:Factory/.gnome-initial-setup.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-initial-setup" Tue May 31 15:47:37 2022 rev:21 rq:980027 version:42.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-initial-setup/gnome-initial-setup.changes 2022-04-27 21:41:59.637060827 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-initial-setup.new.1548/gnome-initial-setup.changes 2022-05-31 15:48:49.484045681 +0200 @@ -1,0 +2,6 @@ +Mon May 30 12:14:37 UTC 2022 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Update to version 42.2: + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-initial-setup-42.1.1.tar.xz New: ---- gnome-initial-setup-42.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-initial-setup.spec ++++++ --- /var/tmp/diff_new_pack.kNzWQd/_old 2022-05-31 15:48:49.980046010 +0200 +++ /var/tmp/diff_new_pack.kNzWQd/_new 2022-05-31 15:48:49.988046015 +0200 @@ -17,7 +17,7 @@ Name: gnome-initial-setup -Version: 42.1.1 +Version: 42.2 Release: 0 Summary: GNOME Initial Setup Assistant License: GPL-2.0-or-later ++++++ gnome-initial-setup-42.1.1.tar.xz -> gnome-initial-setup-42.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-initial-setup-42.1.1/NEWS new/gnome-initial-setup-42.2/NEWS --- old/gnome-initial-setup-42.1.1/NEWS 2022-04-21 07:11:51.000000000 +0200 +++ new/gnome-initial-setup-42.2/NEWS 2022-05-26 23:52:03.000000000 +0200 @@ -1,3 +1,10 @@ +42.2 +---- + +* Translation updates: + - French + - Georgian + 42.1.1 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-initial-setup-42.1.1/meson.build new/gnome-initial-setup-42.2/meson.build --- old/gnome-initial-setup-42.1.1/meson.build 2022-04-21 07:11:51.000000000 +0200 +++ new/gnome-initial-setup-42.2/meson.build 2022-05-26 23:52:03.000000000 +0200 @@ -1,6 +1,6 @@ project('gnome-initial-setup', ['c'], - version: '42.1.1', + version: '42.2', license: 'GPL-2.0-or-later', meson_version: '>= 0.53.0', ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-initial-setup-42.1.1/po/LINGUAS new/gnome-initial-setup-42.2/po/LINGUAS --- old/gnome-initial-setup-42.1.1/po/LINGUAS 2022-04-21 07:11:51.000000000 +0200 +++ new/gnome-initial-setup-42.2/po/LINGUAS 2022-05-26 23:52:03.000000000 +0200 @@ -35,6 +35,7 @@ is it ja +ka kk kn ko diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-initial-setup-42.1.1/po/fr.po new/gnome-initial-setup-42.2/po/fr.po --- old/gnome-initial-setup-42.1.1/po/fr.po 2022-04-21 07:11:51.000000000 +0200 +++ new/gnome-initial-setup-42.2/po/fr.po 2022-05-26 23:52:03.000000000 +0200 @@ -16,8 +16,8 @@ "Project-Id-Version: gnome-initial-setup\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-initial-setup/" "issues\n" -"POT-Creation-Date: 2022-01-06 15:43+0000\n" -"PO-Revision-Date: 2022-03-03 22:23+0100\n" +"POT-Creation-Date: 2022-03-08 08:47+0000\n" +"PO-Revision-Date: 2022-04-23 21:49+0200\n" "Last-Translator: Charles Monzat <charles.monzat(a)free.fr>\n" "Language-Team: GNOME French Team <gnomefr(a)traduc.org>\n" "Language: fr\n" @@ -52,11 +52,11 @@ msgid "_Cancel" msgstr "A_nnuler" -#: gnome-initial-setup/gnome-initial-setup.c:272 +#: gnome-initial-setup/gnome-initial-setup.c:273 msgid "Force existing user mode" msgstr "Forcer le mode utilisateur existant" -#: gnome-initial-setup/gnome-initial-setup.c:278 +#: gnome-initial-setup/gnome-initial-setup.c:279 msgid "�� GNOME initial setup" msgstr "�� Configuration initiale de GNOME" @@ -162,7 +162,7 @@ #: gnome-initial-setup/pages/account/gis-account-page-local.c:608 #, c-format msgid "Failed to create user '%s': " -msgstr "Impossible de cr��er l��utilisateur �� %s��" +msgstr "Impossible de cr��er l��utilisateur ��%s��: " #: gnome-initial-setup/pages/account/gis-account-page-local.ui:21 msgid "Avatar image" @@ -249,7 +249,7 @@ "digits and the following characters: . - _" msgstr "" "Le nom d��utilisateur doit ��tre uniquement compos�� de lettres majuscules et " -"minuscules de a �� z, de nombres et des caract��res suivants��: . -��_" +"minuscules de a �� z, de nombres et des caract��res suivants��: . - _" #: gnome-initial-setup/pages/account/um-utils.c:264 msgid "This will be used to name your home folder and can��t be changed." @@ -618,10 +618,6 @@ msgstr "D��p��ts de logiciels tiers" #: gnome-initial-setup/pages/software/gis-software-page.c:114 -#| msgid "" -#| "Third-party repositories provide access to additional software from " -#| "selected external sources. They include popular apps, as well as firmware " -#| "that is important for some devices. Some proprietary software is included." msgid "" "Third-party repositories provide access to additional software from selected " "external sources, including popular apps and drivers that are important for " @@ -633,12 +629,10 @@ "logiciels propri��taires." #: gnome-initial-setup/pages/software/gis-software-page.c:127 -#| msgid "Third-Party Repositories" msgid "_Disable Third-Party Repositories" msgstr "_D��sactiver les d��p��ts de logiciels tiers" #: gnome-initial-setup/pages/software/gis-software-page.c:132 -#| msgid "Third-Party Repositories" msgid "_Enable Third-Party Repositories" msgstr "_Activer les d��p��ts de logiciels tiers" @@ -679,8 +673,6 @@ #: gnome-initial-setup/pages/timezone/gis-location-entry.c:523 #: gnome-initial-setup/pages/timezone/gis-location-entry.c:551 #, c-format -#| msgctxt "timezone loc" -#| msgid "%s, %s" msgid "%s, %s" msgstr "%s, %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-initial-setup-42.1.1/po/ka.po new/gnome-initial-setup-42.2/po/ka.po --- old/gnome-initial-setup-42.1.1/po/ka.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-initial-setup-42.2/po/ka.po 2022-05-26 23:52:03.000000000 +0200 @@ -0,0 +1,726 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-initial-setup/" +"issues\n" +"POT-Creation-Date: 2022-04-21 05:14+0000\n" +"PO-Revision-Date: 2022-04-24 08:09+0200\n" +"Last-Translator: Temuri Doghonadze <temuri.doghonadze(a)gmail.com>\n" +"Language-Team: \n" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.0.1\n" + +#: data/gnome-initial-setup-first-login.desktop.in.in:3 +#: data/gnome-initial-setup.desktop.in.in:3 +msgid "Initial Setup" +msgstr "�� " + +#: gnome-initial-setup/gis-assistant.c:407 +msgid "_Next" +msgstr "_��" + +#: gnome-initial-setup/gis-assistant.c:408 +msgid "_Accept" +msgstr "_��" + +#: gnome-initial-setup/gis-assistant.c:409 +msgid "_Skip" +msgstr "_��" + +#: gnome-initial-setup/gis-assistant.c:410 +msgid "_Previous" +msgstr "_��" + +#: gnome-initial-setup/gis-assistant.c:411 +msgid "_Cancel" +msgstr "_��" + +#: gnome-initial-setup/gnome-initial-setup.c:273 +msgid "Force existing user mode" +msgstr "�� " + +#: gnome-initial-setup/gnome-initial-setup.c:287 +msgid "�� GNOME initial setup" +msgstr "-- GNOME-�� " + +#: gnome-initial-setup/pages/account/gis-account-avatar-chooser.ui:36 +msgid "Take a Picture��" +msgstr "�� " + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:185 +msgid "Failed to register account" +msgstr "�� " + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:379 +msgid "No supported way to authenticate with this domain" +msgstr "�� " + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:419 +msgid "Failed to join domain" +msgstr "�� " + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:487 +msgid "Failed to log into domain" +msgstr "�� " + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:17 +msgid "Enterprise Login" +msgstr "�� " + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:18 +msgid "" +"Enterprise login allows an existing centrally managed user account to be " +"used on this device. You can also use this account to access company " +"resources on the internet." +msgstr "" +"�� " +"�� . �� " +"�� ." + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:36 +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:287 +msgid "_Domain" +msgstr "_��" + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:53 +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:84 +msgid "_Username" +msgstr "_��" + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:70 +#: gnome-initial-setup/pages/password/gis-password-page.ui:34 +msgid "_Password" +msgstr "_��" + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:146 +msgid "Enterprise domain or realm name" +msgstr "�� " + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:211 +msgid "C_ontinue" +msgstr "_��" + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:246 +msgid "Domain Administrator Login" +msgstr "�� " + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:266 +msgid "" +"In order to use enterprise logins, this computer needs to be enrolled in a " +"domain. Please have your network administrator type the domain password " +"here, and choose a unique computer name for your computer." +msgstr "" +"�� , �� . " +"�� " +"�� ." + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:321 +msgid "_Computer" +msgstr "_��" + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:353 +msgid "Administrator _Name" +msgstr "�� _��" + +#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:387 +msgid "Administrator Password" +msgstr "�� -��" + +#: gnome-initial-setup/pages/account/gis-account-page-local.c:207 +msgid "Please check the name and username. You can choose a picture too." +msgstr "�� . �� ." + +#: gnome-initial-setup/pages/account/gis-account-page-local.c:453 +msgid "We need a few details to complete setup." +msgstr "�� ." + +#: gnome-initial-setup/pages/account/gis-account-page-local.c:559 +msgid "Administrator" +msgstr "��" + +#: gnome-initial-setup/pages/account/gis-account-page-local.c:565 +#: gnome-initial-setup/pages/account/gis-account-page-local.c:608 +#, c-format +msgid "Failed to create user '%s': " +msgstr "�� (\"%s\") �� : " + +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:21 +msgid "Avatar image" +msgstr "�� " + +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:38 +#: gnome-initial-setup/pages/account/gis-account-page.c:283 +msgid "About You" +msgstr "�� " + +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:39 +msgid "Please provide a name and username. You can choose a picture too." +msgstr "�� . �� ." + +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:53 +msgid "_Full Name" +msgstr "_�� " + +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:149 +msgid "Set up _parental controls for this user" +msgstr "�� _�� " + +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:156 +msgid "For use by a parent or supervisor, who must set up their own password." +msgstr "�� , �� ." + +#: gnome-initial-setup/pages/account/gis-account-page.ui:43 +msgid "_Enterprise Login" +msgstr "_�� " + +#: gnome-initial-setup/pages/account/gis-account-page.ui:53 +msgid "Go online to set up Enterprise Login." +msgstr "�� ." + +#: gnome-initial-setup/pages/account/um-realm-manager.c:310 +msgid "Cannot automatically join this type of domain" +msgstr "�� " + +#: gnome-initial-setup/pages/account/um-realm-manager.c:373 +#, c-format +msgid "No such domain or realm found" +msgstr "�� " + +#: gnome-initial-setup/pages/account/um-realm-manager.c:782 +#: gnome-initial-setup/pages/account/um-realm-manager.c:796 +#, c-format +msgid "Cannot log in as %s at the %s domain" +msgstr "%s-�� %s �� " + +#: gnome-initial-setup/pages/account/um-realm-manager.c:788 +msgid "Invalid password, please try again" +msgstr "�� . �� " + +#: gnome-initial-setup/pages/account/um-realm-manager.c:801 +#, c-format +msgid "Couldn��t connect to the %s domain: %s" +msgstr "�� (%s): %s" + +#: gnome-initial-setup/pages/account/um-utils.c:248 +msgid "Sorry, that user name isn��t available. Please try another." +msgstr "�� . �� ." + +#: gnome-initial-setup/pages/account/um-utils.c:251 +#, c-format +msgid "The username is too long." +msgstr "�� ." + +#: gnome-initial-setup/pages/account/um-utils.c:254 +msgid "The username cannot start with a ��-��." +msgstr "�� \"-\"-�� ." + +#: gnome-initial-setup/pages/account/um-utils.c:257 +msgid "That username isn��t available. Please try another." +msgstr "�� . �� ." + +#: gnome-initial-setup/pages/account/um-utils.c:260 +msgid "" +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" +msgstr "" +"�� (a-" +"z), �� : . - _" + +#: gnome-initial-setup/pages/account/um-utils.c:264 +msgid "This will be used to name your home folder and can��t be changed." +msgstr "" +"�� , �� " +"��." + +#: gnome-initial-setup/pages/goa/gis-goa-page.c:92 +msgid "Add Account" +msgstr "�� " + +#: gnome-initial-setup/pages/goa/gis-goa-page.c:357 +msgid "Online Accounts" +msgstr "�� " + +#: gnome-initial-setup/pages/goa/gis-goa-page.ui:17 +msgid "Connect Your Online Accounts" +msgstr "�� " + +#: gnome-initial-setup/pages/goa/gis-goa-page.ui:18 +msgid "" +"Connect your accounts to easily access your email, online calendar, " +"contacts, documents and photos." +msgstr "" +"�� , �� , ��, �� " +"�� ." + +#: gnome-initial-setup/pages/goa/gis-goa-page.ui:48 +msgid "" +"Accounts can be added and removed at any time from the Settings application." +msgstr "" +"�� ." + +#: gnome-initial-setup/pages/keyboard/cc-input-chooser.c:240 +msgid "Preview" +msgstr "��" + +#: gnome-initial-setup/pages/keyboard/cc-input-chooser.c:299 +#: gnome-initial-setup/pages/language/cc-language-chooser.c:227 +msgid "More��" +msgstr "��" + +#. Translators: a search for input methods or keyboard layouts +#. * did not yield any results +#. +#: gnome-initial-setup/pages/keyboard/cc-input-chooser.c:321 +msgid "No inputs found" +msgstr "�� " + +#: gnome-initial-setup/pages/keyboard/gis-keyboard-page.c:504 +#: gnome-initial-setup/pages/keyboard/gis-keyboard-page.ui:15 +msgid "Typing" +msgstr "��" + +#: gnome-initial-setup/pages/keyboard/gis-keyboard-page.ui:16 +msgid "Select your keyboard layout or an input method." +msgstr "�� ." + +#: gnome-initial-setup/pages/language/cc-language-chooser.c:243 +msgid "No languages found" +msgstr "�� " + +#: gnome-initial-setup/pages/language/gis-language-page.c:262 +msgid "Welcome" +msgstr "�� " + +#. Translators: This is meant to be a warm, engaging welcome message, +#. * like greeting somebody at the door. If the exclamation mark is not +#. * suitable for this in your language you may replace it. +#. +#: gnome-initial-setup/pages/language/gis-welcome-widget.c:136 +msgid "Welcome!" +msgstr "��!" + +#: gnome-initial-setup/pages/network/gis-network-page.c:318 +msgctxt "Wireless access point" +msgid "Other��" +msgstr "��" + +#: gnome-initial-setup/pages/network/gis-network-page.c:403 +msgid "Wireless networking is disabled" +msgstr "�� " + +#: gnome-initial-setup/pages/network/gis-network-page.c:410 +msgid "Checking for available wireless networks" +msgstr "�� " + +#: gnome-initial-setup/pages/network/gis-network-page.c:805 +msgid "Network" +msgstr "��" + +#: gnome-initial-setup/pages/network/gis-network-page.ui:18 +msgid "Wi-Fi" +msgstr "Wi-Fi" + +#: gnome-initial-setup/pages/network/gis-network-page.ui:19 +msgid "" +"Connecting to the internet helps you get new apps, information, and other " +"upgrades. It also helps set the time and your location automatically." +msgstr "" +"�� , �� " +"�� . �� , �� " +"�� ." + +#: gnome-initial-setup/pages/network/gis-network-page.ui:76 +msgid "No wireless available" +msgstr "�� " + +#: gnome-initial-setup/pages/network/gis-network-page.ui:91 +msgid "Turn On" +msgstr "��" + +#. Translators: The placeholder is the user��s full name. +#: gnome-initial-setup/pages/parental-controls/gis-parental-controls-page.c:102 +#, c-format +msgid "Parental Controls for %s" +msgstr "�� %s-��" + +#: gnome-initial-setup/pages/parental-controls/gis-parental-controls-page.c:104 +msgid "Set restrictions on what this user can run or install." +msgstr "�� ." + +#: gnome-initial-setup/pages/parental-controls/gis-parental-controls-page.c:199 +msgid "Parental Controls" +msgstr "�� " + +#. Don��t break UI compatibility if parental controls are disabled. +#: gnome-initial-setup/pages/password/gis-password-page.c:79 +msgid "Set a Password" +msgstr "�� " + +#: gnome-initial-setup/pages/password/gis-password-page.c:80 +#: gnome-initial-setup/pages/password/gis-password-page.c:89 +msgid "Be careful not to lose your password." +msgstr "��, �� ." + +#. Translators: The placeholder is for the user��s full name. +#: gnome-initial-setup/pages/password/gis-password-page.c:87 +#, c-format +msgid "Set a Password for %s" +msgstr "%s-�� " + +#: gnome-initial-setup/pages/password/gis-password-page.c:95 +msgid "Set a Parent Password" +msgstr "�� " + +#. Translators: The placeholder is the full name of the child user on the system. +#: gnome-initial-setup/pages/password/gis-password-page.c:97 +#, c-format +msgid "This password will control access to the parental controls for %s." +msgstr "%s-�� ." + +#: gnome-initial-setup/pages/password/gis-password-page.c:228 +msgid "This is a weak password." +msgstr "�� ." + +#: gnome-initial-setup/pages/password/gis-password-page.c:234 +msgid "The passwords do not match." +msgstr "�� ." + +#: gnome-initial-setup/pages/password/gis-password-page.c:420 +msgid "Password" +msgstr "��" + +#: gnome-initial-setup/pages/password/gis-password-page.ui:66 +msgid "_Confirm" +msgstr "_��" + +#: gnome-initial-setup/pages/password/pw-utils.c:81 +msgctxt "Password hint" +msgid "The new password needs to be different from the old one." +msgstr "��, �� , �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:83 +msgctxt "Password hint" +msgid "" +"This password is very similar to your last one. Try changing some letters " +"and numbers." +msgstr "�� , �� . �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:85 +#: gnome-initial-setup/pages/password/pw-utils.c:93 +msgctxt "Password hint" +msgid "" +"This password is very similar to your last one. Try changing the password a " +"bit more." +msgstr "�� , �� . �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:87 +msgctxt "Password hint" +msgid "" +"This is a weak password. A password without your user name would be stronger." +msgstr "�� . �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:89 +msgctxt "Password hint" +msgid "This is a weak password. Try to avoid using your name in the password." +msgstr "�� . �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:91 +msgctxt "Password hint" +msgid "" +"This is a weak password. Try to avoid some of the words included in the " +"password." +msgstr "�� . �� , �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:95 +msgctxt "Password hint" +msgid "This is a weak password. Try to avoid common words." +msgstr "�� . �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:97 +msgctxt "Password hint" +msgid "This is a weak password. Try to avoid reordering existing words." +msgstr "" +"�� . ��, �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:99 +msgctxt "Password hint" +msgid "This is a weak password. Try to use more numbers." +msgstr "�� . �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:101 +msgctxt "Password hint" +msgid "This is a weak password. Try to use more uppercase letters." +msgstr "�� . �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:103 +msgctxt "Password hint" +msgid "This is a weak password. Try to use more lowercase letters." +msgstr "�� . �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:105 +msgctxt "Password hint" +msgid "" +"This is a weak password. Try to use more special characters, like " +"punctuation." +msgstr "" +"�� . �� .�� " +"�� , �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:107 +msgctxt "Password hint" +msgid "" +"This is a weak password. Try to use a mixture of letters, numbers and " +"punctuation." +msgstr "" +"�� . �� , �� " +"��." + +#: gnome-initial-setup/pages/password/pw-utils.c:109 +msgctxt "Password hint" +msgid "This is a weak password. Try to avoid repeating the same character." +msgstr "�� . �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:111 +msgctxt "Password hint" +msgid "" +"This is a weak password. Try to avoid repeating the same type of character: " +"you need to mix up letters, numbers and punctuation." +msgstr "" +"�� . �� . " +"�� , �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:113 +msgctxt "Password hint" +msgid "This is a weak password. Try to avoid sequences like 1234 or abcd." +msgstr "�� . �� , �� abcd �� 1234." + +#: gnome-initial-setup/pages/password/pw-utils.c:115 +msgctxt "Password hint" +msgid "" +"This is a weak password. Try to add more letters, numbers and punctuation." +msgstr "�� . �� , �� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:117 +msgctxt "Password hint" +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "�� ." + +#: gnome-initial-setup/pages/password/pw-utils.c:119 +msgctxt "Password hint" +msgid "" +"Adding more letters, numbers and punctuation will make the password stronger." +msgstr "�� , �� ." + +#. Translators: the parameter here is the name of a distribution, +#. * like "Fedora" or "Ubuntu". It falls back to "GNOME" if we can't +#. * detect any distribution. +#. +#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:68 +#, c-format +msgid "" +"Sending reports of technical problems helps us to improve %s. Reports are " +"sent anonymously and are scrubbed of personal data." +msgstr "" +"�� , �� %s-�� " +"��. �� , �� " +"��." + +#. Translators: the parameter here is the name of a distribution, +#. * like "Fedora" or "Ubuntu". It falls back to "GNOME" if we can't +#. * detect any distribution. +#. +#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:78 +#, c-format +msgid "Problem data will be collected by %s:" +msgstr "��, �� %s-�� :" + +#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:79 +#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:135 +#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:210 +msgid "Privacy Policy" +msgstr "�� " + +#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:135 +msgid "Uses Mozilla Location Service:" +msgstr "�� Mozilla Location Service-��:" + +#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:246 +#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:16 +msgid "Privacy" +msgstr "�� " + +#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:31 +msgid "Location Services" +msgstr "�� " + +#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:52 +msgid "" +"Allows applications to determine your geographical location. An indication " +"is shown when location services are in use." +msgstr "" +"�� . " +"�� ." + +#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:74 +msgid "Automatic Problem Reporting" +msgstr "�� " + +#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:110 +msgid "" +"Privacy controls can be changed at any time from the Settings application." +msgstr "" +"�� " +"��." + +#: gnome-initial-setup/pages/software/gis-software-page.c:113 +#: gnome-initial-setup/pages/software/gis-software-page.ui:16 +msgid "Third-Party Repositories" +msgstr "�� " + +#: gnome-initial-setup/pages/software/gis-software-page.c:114 +msgid "" +"Third-party repositories provide access to additional software from selected " +"external sources, including popular apps and drivers that are important for " +"some devices. Some proprietary software is included." +msgstr "" +"�� " +"�� . �� " +"�� ." + +#: gnome-initial-setup/pages/software/gis-software-page.c:127 +msgid "_Disable Third-Party Repositories" +msgstr "_�� " + +#: gnome-initial-setup/pages/software/gis-software-page.c:132 +msgid "_Enable Third-Party Repositories" +msgstr "_�� _��" + +#. Translators: the parameter here is the name of a distribution, +#. * like "Fedora" or "Ubuntu". It falls back to "GNOME" if we can't +#. * detect any distribution. +#: gnome-initial-setup/pages/summary/gis-summary-page.c:233 +#, c-format +msgid "_Start Using %s" +msgstr "%s-�� " + +#. Translators: the parameter here is the name of a distribution, +#. * like "Fedora" or "Ubuntu". It falls back to "GNOME" if we can't +#. * detect any distribution. +#: gnome-initial-setup/pages/summary/gis-summary-page.c:240 +#, c-format +msgid "%s is ready to be used. We hope that you love it!" +msgstr "%s �� . �� , ��!" + +#: gnome-initial-setup/pages/summary/gis-summary-page.c:264 +msgid "Setup Complete" +msgstr "�� " + +#: gnome-initial-setup/pages/summary/gis-summary-page.ui:64 +msgid "All done!" +msgstr "�� !" + +#. Recurse, adding the ADM1 name to the country name +#. Translators: this is the name of a location followed by a region, for example: +#. * 'London, United Kingdom' +#. * You shouldn't need to translate this string unless the language has a different comma. +#. +#. <location> with no parent <city> +#. Translators: this is the name of a location followed by a region, for example: +#. * 'London, United Kingdom' +#. * You shouldn't need to translate this string unless the language has a different comma. +#. +#: gnome-initial-setup/pages/timezone/gis-location-entry.c:523 +#: gnome-initial-setup/pages/timezone/gis-location-entry.c:551 +#, c-format +msgid "%s, %s" +msgstr "%s, %s" + +#: gnome-initial-setup/pages/timezone/gis-location-entry.c:822 +msgid "Loading��" +msgstr "��" + +#. Translators: "city, country" +#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:271 +#, c-format +msgctxt "timezone loc" +msgid "%s, %s" +msgstr "%s, %s" + +#. Translators: UTC here means the Coordinated Universal Time. +#. * %:::z will be replaced by the offset from UTC e.g. UTC+02 +#. +#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:308 +msgid "UTC%:::z" +msgstr "UTC%:::z" + +#. Translators: This is the time format used in 12-hour mode. +#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:312 +msgid "%l:%M %p" +msgstr "%l:%M %p" + +#. Translators: This is the time format used in 24-hour mode. +#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:315 +msgid "%R" +msgstr "%R" + +#. Translators: "timezone (utc shift)" +#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:318 +#, c-format +msgctxt "timezone map" +msgid "%s (%s)" +msgstr "%s (%s)" + +#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:483 +#: gnome-initial-setup/pages/timezone/gis-timezone-page.ui:17 +msgid "Time Zone" +msgstr "�� " + +#: gnome-initial-setup/pages/timezone/gis-timezone-page.ui:18 +msgid "" +"The time zone will be set automatically if your location can be found. You " +"can also search for a city to set it yourself." +msgstr "" +"�� , �� " +"��. �� ." + +#: gnome-initial-setup/pages/timezone/gis-timezone-page.ui:56 +msgid "Please search for a nearby city" +msgstr "�� " + +#. Translators: This is meant to be a warm, engaging welcome message, +#. * like greeting somebody at the door. If the exclamation mark is not +#. * suitable for this in your language you may replace it. The space +#. * before the exclamation mark in this string is a typographical thin +#. * space (U200a) to improve the spacing in the title, which you can +#. * keep or remove. The %s is getting replaced with the name and version +#. * of the OS, e.g. "GNOME 3.38" +#. +#: gnome-initial-setup/pages/welcome/gis-welcome-page.c:209 +#, c-format +msgid "Welcome to %s��!" +msgstr "�� %s-��!" + +#: gnome-initial-setup/pages/welcome/gis-welcome-page.ui:5 +msgid "Setup" +msgstr "��" + +#: gnome-initial-setup/pages/welcome/gis-welcome-page.ui:43 +msgid "" +"Setup will guide you through making an account and enabling some features. " +"We��ll have you up and running in no time." +msgstr "" +"�� " +"��. �� ." + +#: gnome-initial-setup/pages/welcome/gis-welcome-page.ui:54 +msgid "_Start Setup" +msgstr "_�� " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-initial-setup-42.1.1/subprojects/gnome-desktop.wrap new/gnome-initial-setup-42.2/subprojects/gnome-desktop.wrap --- old/gnome-initial-setup-42.1.1/subprojects/gnome-desktop.wrap 2022-04-21 07:11:51.000000000 +0200 +++ new/gnome-initial-setup-42.2/subprojects/gnome-desktop.wrap 2022-05-26 23:52:03.000000000 +0200 @@ -1,3 +1,3 @@ [wrap-git] url = https://gitlab.gnome.org/GNOME/gnome-desktop.git -revision = master +revision = gnome-42 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-initial-setup-42.1.1/subprojects/libhandy.wrap new/gnome-initial-setup-42.2/subprojects/libhandy.wrap --- old/gnome-initial-setup-42.1.1/subprojects/libhandy.wrap 2022-04-21 07:11:51.000000000 +0200 +++ new/gnome-initial-setup-42.2/subprojects/libhandy.wrap 2022-05-26 23:52:03.000000000 +0200 @@ -1,3 +1,3 @@ [wrap-git] url = https://gitlab.gnome.org/GNOME/libhandy.git -revision = main +revision = libhandy-1-6

1 0