January 2023 - openSUSE Commits - openSUSE Mailing Lists

commit bottom for openSUSE:Factory
by Source-Sync 02 Jan '23

02 Jan '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bottom for openSUSE:Factory checked in at 2023-01-02 15:01:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bottom (Old) and /work/SRC/openSUSE:Factory/.bottom.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bottom" Mon Jan 2 15:01:54 2023 rev:13 rq:1046011 version:0.7.0~0 Changes: -------- --- /work/SRC/openSUSE:Factory/bottom/bottom.changes 2022-06-21 16:32:38.667831626 +0200 +++ /work/SRC/openSUSE:Factory/.bottom.new.1563/bottom.changes 2023-01-02 15:01:58.849287709 +0100 @@ -1,0 +2,50 @@ +Sun Jan 1 16:31:08 UTC 2023 - Jan-Luca Kiok <me(a)jlk.one> + +- Add build dependency to zstd compression tool + +------------------------------------------------------------------- +Sun Jan 1 15:45:48 UTC 2023 - Jan-Luca Kiok <me(a)jlk.one> + +- Apply current rust service template +- Change source compress algorithm +- Use cargo test for check stage +- Update to version 0.7.0: + * Bug Fixes + + Fix building in Rust beta 1.61 due to `as_ref()` calls + causing type inference issues. + + Fix clicking on empty space in tables selecting the very last + entry of a list in some cases. + + Fix panic if battery feature was disabled during compilation. + + Fix bottom keeping devices awake in certain scenarios + + Use alternative method of getting parent PID in some cases on + macOS devices to avoid needing root access. + + Fix possible gaps with widget layout spacing. + + Fix search scrolling with wider Unicode characters. + * Changes + + Add some colour to `-h`/`--help` as part of updating to clap + 3.0. + + Add ARM musl binary build tasks. + + Add more human friendly temperature sensor names for Linux + + Add macOS M1, FreeBSD 12, and FreeBSD 13 binary build tasks. + + Improve CPU usage by optimizing draw logic of charts and + tables. + * Features + + Add support for NVIDIA GPU temperature sensors + + Add a check for whether bottom is being run in a terminal. + + Add FreeBSD support + + Add half page scrolling with `ctrl-u` and `ctrl-d` + + Add ZFS ARC support + + Add GPU memory support for NVIDIA GPUs + + Update sysinfo to support M1 macOS temperature sensors. + + Add CLI options for GPU memory + + Add page up/page down support for the help screen + + Make temperature widget sortable. + + Make disk widget sortable. + + Add pasting to the search bar. + + Add custom retention periods for data. + + Add non-normalized CPU usage to processes + + Add an option to expand the default widget on startup + * Other + + Fix dead links in docs + +------------------------------------------------------------------- Old: ---- bottom-0.6.8.tar.gz vendor.tar.xz New: ---- _servicedata bottom-0.7.0~0.tar.zst vendor.tar.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bottom.spec ++++++ --- /var/tmp/diff_new_pack.IyoxvZ/_old 2023-01-02 15:01:59.957293936 +0100 +++ /var/tmp/diff_new_pack.IyoxvZ/_new 2023-01-02 15:01:59.965293981 +0100 @@ -1,7 +1,7 @@ # # spec file for package bottom # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2020-2021, Martin Hauke <mardnh(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -18,17 +18,17 @@ Name: bottom -Version: 0.6.8 +Version: 0.7.0~0 Release: 0 Summary: Yet another graphical process/system monitor License: MIT Group: System/Monitoring URL: https://github.com/ClementTsang/bottom -Source: https://github.com/ClementTsang/bottom/archive/refs/tags/%{version}.tar.gz#… -Source1: vendor.tar.xz +Source: %{name}-%{version}.tar.zst +Source1: vendor.tar.zst Source2: cargo_config -BuildRequires: cargo >= 1.58 -BuildRequires: rust +BuildRequires: cargo-packaging +BuildRequires: zstd %description A cross-platform graphical process/system monitor with a @@ -44,6 +44,9 @@ %install cargo install --no-track --root=%{buildroot}%{_prefix} --path . +%check +%{cargo_test} + %files %license LICENSE %doc CHANGELOG.md README.md ++++++ _service ++++++ --- /var/tmp/diff_new_pack.IyoxvZ/_old 2023-01-02 15:02:00.009294228 +0100 +++ /var/tmp/diff_new_pack.IyoxvZ/_new 2023-01-02 15:02:00.013294251 +0100 @@ -1,6 +1,28 @@ <services> + <service mode="disabled" name="obs_scm"> + <param name="url">https://github.com/ClementTsang/bottom.git</param> + <param name="versionformat">@PARENT_TAG@~@TAG_OFFSET@</param> + <param name="scm">git</param> + <param name="revision">0.7.0</param> + <param name="match-tag">*</param> + <param name="versionrewrite-pattern">(\d+\.\d+\.\d+)</param> + <param name="versionrewrite-replacement">\1</param> + <param name="changesgenerate">enable</param> + <param name="changesauthor">opensuse-packages(a)jlk.one</param> + </service> + <service mode="disabled" name="tar" /> + <service mode="disabled" name="recompress"> + <param name="file">*.tar</param> + <param name="compression">zst</param> + </service> + <service mode="disabled" name="set_version"/> <service name="cargo_vendor" mode="disabled"> - <param name="srcdir">bottom-0.6.8</param> + <param name="srcdir">bottom</param> + <param name="update">true</param> + <param name="compression">zst</param> + </service> + <service name="cargo_audit" mode="disabled"> + <param name="srcdir">bottom</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ClementTsang/bottom.git</param> <param name="changesrevision">4d5a58c3eced02189b70ecfdae4dc600b98d20c2</param></service></servicedata> (No newline at EOF)

1 0

commit python-jupyter_contrib_core for openSUSE:Factory
by Source-Sync 02 Jan '23

02 Jan '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-jupyter_contrib_core for openSUSE:Factory checked in at 2023-01-02 15:01:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jupyter_contrib_core (Old) and /work/SRC/openSUSE:Factory/.python-jupyter_contrib_core.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jupyter_contrib_core" Mon Jan 2 15:01:56 2023 rev:7 rq:1046022 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jupyter_contrib_core/python-jupyter_contrib_core.changes 2022-08-02 22:09:28.825822390 +0200 +++ /work/SRC/openSUSE:Factory/.python-jupyter_contrib_core.new.1563/python-jupyter_contrib_core.changes 2023-01-02 15:02:00.269295690 +0100 @@ -1,0 +2,8 @@ +Sun Jan 1 17:58:00 UTC 2023 - Ben Greiner <code(a)bnavigator.de> + +- Update to 0.4.2 + * Compatibility update + * Remove `scripts` entry from `setup.py` +- Move to PEP517 + +------------------------------------------------------------------- Old: ---- jupyter_contrib_core-0.4.0.tar.gz New: ---- jupyter_contrib_core-0.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jupyter_contrib_core.spec ++++++ --- /var/tmp/diff_new_pack.pF6WSP/_old 2023-01-02 15:02:00.741298342 +0100 +++ /var/tmp/diff_new_pack.pF6WSP/_new 2023-01-02 15:02:00.749298387 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-jupyter_contrib_core # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,18 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-jupyter_contrib_core -Version: 0.4.0 +Version: 0.4.2 Release: 0 Summary: Common utilities for jupyter-contrib projects License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/jupyter-contrib/jupyter_contrib_core Source: https://files.pythonhosted.org/packages/source/j/jupyter_contrib_core/jupyt… +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros # SECTION test requirements @@ -68,11 +69,11 @@ %build export LANG=en_US.UTF-8 -%python_build +%pyproject_wheel %install export LANG=en_US.UTF-8 -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/jupyter-contrib %python_expand %fdupes %{buildroot}%{$python_sitelib} ++++++ jupyter_contrib_core-0.4.0.tar.gz -> jupyter_contrib_core-0.4.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jupyter_contrib_core-0.4.0/.gitignore new/jupyter_contrib_core-0.4.2/.gitignore --- old/jupyter_contrib_core-0.4.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/jupyter_contrib_core-0.4.2/.gitignore 2022-07-08 21:47:11.000000000 +0200 @@ -0,0 +1,44 @@ +*~ + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] + +# Unit test / coverage reports +htmlcov +.tox +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml + +# Sphinx documentation +docs/_build + +.idea + +# pip install +*.egg +*.egg-info +dist +build +eggs +.eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 +venv*/ +pyvenv*/ +MANIFEST + +# Installer logs +pip-log.txt + +# ipython notebook checkpoints +.ipynb_checkpoints diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jupyter_contrib_core-0.4.0/PKG-INFO new/jupyter_contrib_core-0.4.2/PKG-INFO --- old/jupyter_contrib_core-0.4.0/PKG-INFO 2022-07-09 10:12:03.061977900 +0200 +++ new/jupyter_contrib_core-0.4.2/PKG-INFO 2022-11-15 17:21:49.400249700 +0100 @@ -1,9 +1,9 @@ Metadata-Version: 2.1 Name: jupyter_contrib_core -Version: 0.4.0 +Version: 0.4.2 Summary: Common utilities for jupyter-contrib projects. Home-page: https://github.com/jupyter-contrib/jupyter_contrib_core -Download-URL: https://github.com/jupyter-contrib/jupyter_contrib_core/tarball/0.4.0 +Download-URL: https://github.com/jupyter-contrib/jupyter_contrib_core/tarball/0.4.2 Author: jcb91, jupyter-contrib developers Author-email: joshuacookebarnes(a)gmail.com License: BSD 3-clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jupyter_contrib_core-0.4.0/README.md new/jupyter_contrib_core-0.4.2/README.md --- old/jupyter_contrib_core-0.4.0/README.md 2022-07-08 21:43:51.000000000 +0200 +++ new/jupyter_contrib_core-0.4.2/README.md 2022-11-15 17:04:58.000000000 +0100 @@ -16,6 +16,13 @@ Changes ======= +0.4.2 +----- + +* Fix CI +* Remove `scripts` entry from `setup.py` + + 0.3.3 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jupyter_contrib_core-0.4.0/setup.py new/jupyter_contrib_core-0.4.2/setup.py --- old/jupyter_contrib_core-0.4.0/setup.py 2022-07-09 10:11:36.000000000 +0200 +++ new/jupyter_contrib_core-0.4.2/setup.py 2022-11-15 17:04:58.000000000 +0100 @@ -23,14 +23,14 @@ - common application components and cli scripts - utility classes and functions for use in tests """, - version='0.4.0', + version='0.4.2', author='jcb91, jupyter-contrib developers', author_email='joshuacookebarnes(a)gmail.com', url=('https://github.com/' 'jupyter-contrib/jupyter_contrib_core'), download_url=('https://github.com/' 'jupyter-contrib/jupyter_contrib_core/' - 'tarball/0.4.0'), + 'tarball/0.4.2'), keywords=['Jupyter', 'notebook'], license='BSD 3-clause', platforms=['any'], @@ -63,9 +63,6 @@ 'jupyter-contrib = jupyter_contrib_core.application:main', # noqa ], }, - scripts=[os.path.join('scripts', p) for p in [ - 'jupyter-contrib', - ]], classifiers=[ 'Intended Audience :: End Users/Desktop', 'Intended Audience :: Science/Research', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jupyter_contrib_core-0.4.0/src/jupyter_contrib_core/__init__.py new/jupyter_contrib_core-0.4.2/src/jupyter_contrib_core/__init__.py --- old/jupyter_contrib_core-0.4.0/src/jupyter_contrib_core/__init__.py 2022-07-08 21:43:51.000000000 +0200 +++ new/jupyter_contrib_core-0.4.2/src/jupyter_contrib_core/__init__.py 2022-11-15 17:04:58.000000000 +0100 @@ -5,4 +5,4 @@ from __future__ import unicode_literals -__version__ = '0.3.3' +__version__ = '0.4.2' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jupyter_contrib_core-0.4.0/src/jupyter_contrib_core.egg-info/PKG-INFO new/jupyter_contrib_core-0.4.2/src/jupyter_contrib_core.egg-info/PKG-INFO --- old/jupyter_contrib_core-0.4.0/src/jupyter_contrib_core.egg-info/PKG-INFO 2022-07-09 10:12:03.000000000 +0200 +++ new/jupyter_contrib_core-0.4.2/src/jupyter_contrib_core.egg-info/PKG-INFO 2022-11-15 17:21:49.000000000 +0100 @@ -1,9 +1,9 @@ Metadata-Version: 2.1 Name: jupyter-contrib-core -Version: 0.4.0 +Version: 0.4.2 Summary: Common utilities for jupyter-contrib projects. Home-page: https://github.com/jupyter-contrib/jupyter_contrib_core -Download-URL: https://github.com/jupyter-contrib/jupyter_contrib_core/tarball/0.4.0 +Download-URL: https://github.com/jupyter-contrib/jupyter_contrib_core/tarball/0.4.2 Author: jcb91, jupyter-contrib developers Author-email: joshuacookebarnes(a)gmail.com License: BSD 3-clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jupyter_contrib_core-0.4.0/src/jupyter_contrib_core.egg-info/SOURCES.txt new/jupyter_contrib_core-0.4.2/src/jupyter_contrib_core.egg-info/SOURCES.txt --- old/jupyter_contrib_core-0.4.0/src/jupyter_contrib_core.egg-info/SOURCES.txt 2022-07-09 10:12:03.000000000 +0200 +++ new/jupyter_contrib_core-0.4.2/src/jupyter_contrib_core.egg-info/SOURCES.txt 2022-11-15 17:21:49.000000000 +0100 @@ -1,3 +1,4 @@ +.gitignore LICENSE.txt MANIFEST.in README.md

1 0

commit hamlib for openSUSE:Factory
by Source-Sync 02 Jan '23

02 Jan '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hamlib for openSUSE:Factory checked in at 2023-01-02 15:01:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hamlib (Old) and /work/SRC/openSUSE:Factory/.hamlib.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hamlib" Mon Jan 2 15:01:53 2023 rev:15 rq:1046007 version:4.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/hamlib/hamlib.changes 2022-12-27 11:55:14.175372757 +0100 +++ /work/SRC/openSUSE:Factory/.hamlib.new.1563/hamlib.changes 2023-01-02 15:01:57.193278402 +0100 @@ -1,0 +2,10 @@ +Sun Jan 1 14:58:19 UTC 2023 - Wojciech Kazubski <wk(a)ire.pw.edu.pl> + +- Update to version 4.5.3 (2022-12-31) + * Fix serial.c for hardware flow control on Linux and MacOSy + * Add QRPLabs QCX/QDX rig -- not quite a TS480 + * Fix QRP QRDX firmware bugs in IF message so PTT works now + * FTDX5000 will now remember startup front/read settings and restore it + * Fix FTDX5000 write_delay with microham + +------------------------------------------------------------------- Old: ---- Hamlib-4.5.2.tar.gz New: ---- Hamlib-4.5.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hamlib.spec ++++++ --- /var/tmp/diff_new_pack.7AVcge/_old 2023-01-02 15:01:57.853282112 +0100 +++ /var/tmp/diff_new_pack.7AVcge/_new 2023-01-02 15:01:57.857282134 +0100 @@ -18,7 +18,7 @@ %define sover 4 Name: hamlib -Version: 4.5.2 +Version: 4.5.3 Release: 0 Summary: Run-time library to control radio transcievers and receivers License: LGPL-2.1-only ++++++ Hamlib-4.5.2.tar.gz -> Hamlib-4.5.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/NEWS new/Hamlib-4.5.3/NEWS --- old/Hamlib-4.5.2/NEWS 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/NEWS 2022-12-31 21:46:26.000000000 +0100 @@ -22,6 +22,15 @@ * Add FLIR PTU-D48, E46, D100, D300 rotors * Fix FTDX3000 rig split +Version 4.5.3 + * 2022-12-31 + * Fix serial.c for hardware flow control on Linux and MacOSy + * Add QRPLabs QCX/QDX rig -- not quite a TS480 + * Fix QRP QRDX firmware bugs in IF message so PTT works now + * FTDX5000 will now remember startup front/read settings and restore it + * Fix FTDX5000 write_delay with microham + * Fix grep error on MingW build + Version 4.5.2 * 2022-12-23 * Fix PowerSDR ability to do commands while powered off diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/configure.ac new/Hamlib-4.5.3/configure.ac --- old/Hamlib-4.5.2/configure.ac 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/configure.ac 2022-12-31 21:46:26.000000000 +0100 @@ -14,7 +14,7 @@ dnl however, the use of '~' should be fine as apt (others?) will treat dnl it as an earlier version than the actual release. TNX KA6MAL dnl PACKAGE_NAME + " " + PACKAGE_VERSION must not exceed 20 chars! -AC_INIT([Hamlib],[4.5.2],[hamlib-developer@lists.sourceforge.net],[hamlib],[http://www.hamlib.org]) +AC_INIT([Hamlib],[4.5.3],[hamlib-developer@lists.sourceforge.net],[hamlib],[http://www.hamlib.org]) AC_CONFIG_SRCDIR([include/hamlib/rig.h]) AC_CONFIG_MACRO_DIR([macros]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/include/hamlib/riglist.h new/Hamlib-4.5.3/include/hamlib/riglist.h --- old/Hamlib-4.5.2/include/hamlib/riglist.h 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/include/hamlib/riglist.h 2022-12-31 21:46:26.000000000 +0100 @@ -185,6 +185,7 @@ #define RIG_MODEL_MALACHITE RIG_MAKE_MODEL(RIG_KENWOOD, 49) #define RIG_MODEL_LAB599_TX500 RIG_MAKE_MODEL(RIG_KENWOOD,50) #define RIG_MODEL_SDRUNO RIG_MAKE_MODEL(RIG_KENWOOD,51) +#define RIG_MODEL_QRPLABS RIG_MAKE_MODEL(RIG_KENWOOD,52) /* * Icom diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/rigs/kenwood/ic10.c new/Hamlib-4.5.3/rigs/kenwood/ic10.c --- old/Hamlib-4.5.2/rigs/kenwood/ic10.c 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/rigs/kenwood/ic10.c 2022-12-31 21:46:26.000000000 +0100 @@ -532,7 +532,7 @@ { struct kenwood_priv_caps *priv = (struct kenwood_priv_caps *)rig->caps->priv; char infobuf[50]; - int retval, iflen; + int retval, iflen, offset; retval = get_ic10_if(rig, infobuf); @@ -546,8 +546,15 @@ /* IFggmmmkkkhhh snnnzrx yytdfcp */ /* IFggmmmkkkhhhxxxxxrrrrrssxcctmfcp */ + /* IFggmmmkkkhhhxxxxxrrrrrssxcctmfcp#### what should be if p13/p14/p15 included */ + /* IF00014074000 +00000000003000000 ; QRP QDX bad IF command -- 36 bytes instead of 33 */ + /* QRP QDX should be 37 bytes but used only 1 byte for p14 instead of 2 bytes */ + /* 12345678901234567890123456789012345678 */ + offset = 5; + if (iflen == 36) offset = 8; // QRP QDX gets completely bogus length + else if (iflen == 37) offset = 9; // just incase somebody does this add p13/p14x2/p15 - *ptt = infobuf[iflen - 5] == '0' ? RIG_PTT_OFF : RIG_PTT_ON; + *ptt = infobuf[iflen - offset] == '0' ? RIG_PTT_OFF : RIG_PTT_ON; return RIG_OK; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/rigs/kenwood/kenwood.c new/Hamlib-4.5.3/rigs/kenwood/kenwood.c --- old/Hamlib-4.5.2/rigs/kenwood/kenwood.c 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/rigs/kenwood/kenwood.c 2022-12-31 21:46:26.000000000 +0100 @@ -5774,6 +5774,7 @@ rig_register(&malachite_caps); rig_register(&tx500_caps); rig_register(&sdruno_caps); + rig_register(&qrplabs_caps); return (RIG_OK); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/rigs/kenwood/kenwood.h new/Hamlib-4.5.3/rigs/kenwood/kenwood.h --- old/Hamlib-4.5.2/rigs/kenwood/kenwood.h 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/rigs/kenwood/kenwood.h 2022-12-31 21:46:26.000000000 +0100 @@ -29,7 +29,7 @@ #include "misc.h" #include "idx_builtin.h" -#define BACKEND_VER "20221128" +#define BACKEND_VER "20221230" #define EOM_KEN ';' #define EOM_TH '\r' @@ -110,6 +110,7 @@ #define RIG_IS_PT8000A (rig->caps->rig_model == RIG_MODEL_PT8000A) #define RIG_IS_POWERSDR (rig->caps->rig_model == RIG_MODEL_POWERSDR) #define RIG_IS_MALACHITE (rig->caps->rig_model == RIG_MODEL_MALACHITE) +#define RIG_IS_QRPLABS (rig->caps->rig_model == RIG_MODEL_QRPLABS) struct kenwood_filter_width { @@ -311,6 +312,7 @@ extern const struct rig_caps malachite_caps; extern const struct rig_caps tx500_caps; extern const struct rig_caps sdruno_caps; +extern const struct rig_caps qrplabs_caps; /* use when not interested in the answer, but want to check its len */ static int inline kenwood_simple_transaction(RIG *rig, const char *cmd, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/rigs/kenwood/ts480.c new/Hamlib-4.5.3/rigs/kenwood/ts480.c --- old/Hamlib-4.5.2/rigs/kenwood/ts480.c 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/rigs/kenwood/ts480.c 2022-12-31 21:46:26.000000000 +0100 @@ -1449,6 +1449,198 @@ }; /* + * QRPLabs TS-480 emulation rig capabilities + * Notice that some rigs share the same functions. + */ +const struct rig_caps qrplabs_caps = +{ + RIG_MODEL(RIG_MODEL_QRPLABS), + .model_name = "QCX/QDX", + .mfg_name = "QRPLabs", + .version = BACKEND_VER ".0", + .copyright = "LGPL", + .status = RIG_STATUS_STABLE, + .rig_type = RIG_TYPE_TRANSCEIVER, + .ptt_type = RIG_PTT_RIG, + .dcd_type = RIG_DCD_RIG, + .port_type = RIG_PORT_SERIAL, + .serial_rate_min = 4800, + .serial_rate_max = 115200, + .serial_data_bits = 8, + .serial_stop_bits = 1, + .serial_parity = RIG_PARITY_NONE, + .serial_handshake = RIG_HANDSHAKE_NONE, + .write_delay = 0, + .post_write_delay = 0, + .timeout = 500, + .retry = 3, + .preamp = {12, RIG_DBLST_END,}, + .attenuator = {12, RIG_DBLST_END,}, + .max_rit = kHz(9.99), + .max_xit = kHz(9.99), + .max_ifshift = Hz(0), + .targetable_vfo = RIG_TARGETABLE_FREQ, + .transceive = RIG_TRN_RIG, + .agc_level_count = 3, + .agc_levels = { RIG_AGC_OFF, RIG_AGC_FAST, RIG_AGC_SLOW }, + + .rx_range_list1 = { + {kHz(100), Hz(59999999), TS480_ALL_MODES, -1, -1, TS480_VFO}, + RIG_FRNG_END, + }, /*!< Receive frequency range list for ITU region 1 */ + .tx_range_list1 = { + {kHz(1810), kHz(1850), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, /* 100W class */ + {kHz(1810), kHz(1850), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, /* 25W class */ + {kHz(3500), kHz(3800), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {kHz(3500), kHz(3800), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {MHz(7), kHz(7200), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {MHz(7), kHz(7200), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {kHz(10100), kHz(10150), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {kHz(10100), kHz(10150), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {MHz(14), kHz(14350), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {MHz(14), kHz(14350), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {kHz(18068), kHz(18168), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {kHz(18068), kHz(18168), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {MHz(21), kHz(21450), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {MHz(21), kHz(21450), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {kHz(24890), kHz(24990), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {kHz(24890), kHz(24990), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {MHz(28), kHz(29700), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {MHz(28), kHz(29700), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {MHz(50), kHz(52000), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {MHz(50), kHz(52000), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + RIG_FRNG_END, + }, /*!< Transmit frequency range list for ITU region 1 */ + .rx_range_list2 = { + {kHz(100), Hz(59999999), TS480_ALL_MODES, -1, -1, TS480_VFO}, + RIG_FRNG_END, + }, /*!< Receive frequency range list for ITU region 2 */ + .tx_range_list2 = { + {kHz(1800), MHz(2) - 1, TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, /* 100W class */ + {kHz(1800), MHz(2) - 1, TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, /* 25W class */ + {kHz(3500), MHz(4) - 1, TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {kHz(3500), MHz(4) - 1, TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {kHz(5250), kHz(5450), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {kHz(5250), kHz(5450), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {MHz(7), kHz(7300), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {MHz(7), kHz(7300), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {kHz(10100), kHz(10150), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {kHz(10100), kHz(10150), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {MHz(14), kHz(14350), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {MHz(14), kHz(14350), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {kHz(18068), kHz(18168), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {kHz(18068), kHz(18168), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {MHz(21), kHz(21450), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {MHz(21), kHz(21450), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {kHz(24890), kHz(24990), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {kHz(24890), kHz(24990), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {MHz(28), kHz(29700), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {MHz(28), kHz(29700), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + {MHz(50), kHz(52000), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, + {MHz(50), kHz(52000), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, + RIG_FRNG_END, + }, /*!< Transmit frequency range list for ITU region 2 */ + .tuning_steps = { + {TS480_ALL_MODES, kHz(1)}, + {TS480_ALL_MODES, Hz(2500)}, + {TS480_ALL_MODES, kHz(5)}, + {TS480_ALL_MODES, Hz(6250)}, + {TS480_ALL_MODES, kHz(10)}, + {TS480_ALL_MODES, Hz(12500)}, + {TS480_ALL_MODES, kHz(15)}, + {TS480_ALL_MODES, kHz(20)}, + {TS480_ALL_MODES, kHz(25)}, + {TS480_ALL_MODES, kHz(30)}, + {TS480_ALL_MODES, kHz(100)}, + {TS480_ALL_MODES, kHz(500)}, + {TS480_ALL_MODES, MHz(1)}, + {TS480_ALL_MODES, 0}, /* any tuning step */ + RIG_TS_END, + }, + /* mode/filter list, remember: order matters! */ + .filters = { + {RIG_MODE_SSB, kHz(2.4)}, + {RIG_MODE_SSB, Hz(270)}, + {RIG_MODE_SSB, Hz(500)}, + {RIG_MODE_CW | RIG_MODE_CWR, Hz(200)}, + {RIG_MODE_CW | RIG_MODE_CWR, Hz(50)}, + {RIG_MODE_CW | RIG_MODE_CWR, Hz(1000)}, + {RIG_MODE_CW | RIG_MODE_CWR, Hz(80)}, + {RIG_MODE_CW | RIG_MODE_CWR, Hz(100)}, + {RIG_MODE_CW | RIG_MODE_CWR, Hz(150)}, + {RIG_MODE_CW | RIG_MODE_CWR, Hz(300)}, + {RIG_MODE_CW | RIG_MODE_CWR, Hz(400)}, + {RIG_MODE_CW | RIG_MODE_CWR, Hz(500)}, + {RIG_MODE_CW | RIG_MODE_CWR, Hz(600)}, + {RIG_MODE_CW | RIG_MODE_CWR, Hz(2000)}, + {RIG_MODE_RTTY | RIG_MODE_RTTYR, Hz(500)}, + {RIG_MODE_RTTY | RIG_MODE_RTTYR, Hz(250)}, + {RIG_MODE_RTTY | RIG_MODE_RTTYR, Hz(1000)}, + {RIG_MODE_RTTY | RIG_MODE_RTTYR, Hz(1500)}, + {RIG_MODE_AM, kHz(6)}, + {RIG_MODE_AM, kHz(2.4)}, + {RIG_MODE_FM, kHz(12)}, + RIG_FLT_END, + }, + .vfo_ops = TS480_VFO_OPS, + .level_gran = + { +#include "level_gran_kenwood.h" + [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } }, + [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 30 }, .step = { .i = 1 } }, + [LVL_KEYSPD] = {.min = {.i = 10}, .max = {.i = 60}, .step = {.i = 1}}, + [LVL_CWPITCH] = {.min = {.i = 400}, .max = {.i = 1000}, .step = {.i = 50}}, + [LVL_BKIN_DLYMS] = {.min = {.i = 0}, .max = {.i = 1000}, .step = {.i = 50}}, + [LVL_SLOPE_LOW] = {.min = {.i = 0}, .max = {.i = 2400}, .step = {.i = 10}}, + [LVL_SLOPE_HIGH] = {.min = {.i = 0}, .max = {.i = 5000}, .step = {.i = 10}}, + }, + .str_cal = TS480_STR_CAL, + .swr_cal = TS480_SWR_CAL, + + .ext_tokens = ts480_ext_tokens, + .extfuncs = ts480_ext_funcs, + .extlevels = ts480_ext_levels, + + .priv = (void *)& ts480_priv_caps, + .rig_init = ts480_init, + .rig_open = kenwood_open, + .rig_cleanup = kenwood_cleanup, + .set_freq = kenwood_set_freq, + .get_freq = kenwood_get_freq, + .set_rit = ts480_set_rit, + .get_rit = ts480_get_rit, + .set_xit = ts480_set_rit, + .get_xit = ts480_get_rit, + .set_mode = kenwood_set_mode, + .get_mode = kenwood_get_mode, + .set_vfo = kenwood_set_vfo, + .get_vfo = kenwood_get_vfo_if, + .set_split_vfo = kenwood_set_split_vfo, + .get_split_vfo = kenwood_get_split_vfo_if, + .get_ptt = kenwood_get_ptt, + .set_ptt = kenwood_set_ptt, + .get_dcd = kenwood_get_dcd, + .get_info = kenwood_ts480_get_info, + .reset = kenwood_reset, + .has_set_level = TS480_LEVEL_SET, + .has_get_level = TS480_LEVEL_GET, + .set_level = kenwood_ts480_set_level, + .get_level = kenwood_ts480_get_level, + .set_ext_level = ts480_set_ext_level, + .get_ext_level = ts480_get_ext_level, + .has_get_func = TS480_FUNC_ALL, + .has_set_func = TS480_FUNC_ALL, + .set_func = ts480_set_func, + .get_func = ts480_get_func, + .set_ext_func = ts480_set_ext_func, + .get_ext_func = ts480_get_ext_func, + .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse, + .vfo_op = kenwood_vfo_op, + .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS +}; + +/* * Hilberling PS8000A TS480 emulation * Notice that some rigs share the same functions. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/rigs/yaesu/ft5000.c new/Hamlib-4.5.3/rigs/yaesu/ft5000.c --- old/Hamlib-4.5.2/rigs/yaesu/ft5000.c 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/rigs/yaesu/ft5000.c 2022-12-31 21:46:26.000000000 +0100 @@ -51,7 +51,7 @@ { .index = 8, .set_value = 0, .get_value = '6', .width = 3000, .optional = 0 }, { .index = 9, .set_value = 0, .get_value = '9', .width = 600, .optional = 0 }, { .index = 10, .set_value = 0, .get_value = 'A', .width = 300, .optional = 0 }, - } + }, }; const struct confparams ftdx5000_ext_levels[] = @@ -140,7 +140,7 @@ RIG_MODEL(RIG_MODEL_FTDX5000), .model_name = "FTDX-5000", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".7", + .version = NEWCAT_VER ".9", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/rigs/yaesu/ft5000.h new/Hamlib-4.5.3/rigs/yaesu/ft5000.h --- old/Hamlib-4.5.2/rigs/yaesu/ft5000.h 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/rigs/yaesu/ft5000.h 2022-12-31 21:46:26.000000000 +0100 @@ -141,7 +141,7 @@ /* Delay between bytes sent to FT-5000 * Should not exceed value set in CAT TOT menu (rig default is 10 mSec) */ -#define FTDX5000_WRITE_DELAY 1 +#define FTDX5000_WRITE_DELAY 0 /* Delay sequential fast writes */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/rigs/yaesu/newcat.c new/Hamlib-4.5.3/rigs/yaesu/newcat.c --- old/Hamlib-4.5.2/rigs/yaesu/newcat.c 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/rigs/yaesu/newcat.c 2022-12-31 21:46:26.000000000 +0100 @@ -545,6 +545,7 @@ struct newcat_priv_data *priv = rig->state.priv; struct rig_state *rig_s = &rig->state; const char *handshake[3] = {"None", "Xon/Xoff", "Hardware"}; + int err; ENTERFUNC; @@ -600,7 +601,6 @@ || priv->rig_id == NC_RIGID_FTDX3000 || priv->rig_id == NC_RIGID_FTDX3000DM) { - int err; char *cmd = "EX0291;EX029;"; // FT2000/D if (priv->rig_id == NC_RIGID_FT950 || rig->caps->rig_model == RIG_MODEL_FT950) { cmd = "EX0271;EX027;"; } @@ -631,6 +631,21 @@ rig_debug(RIG_DEBUG_VERBOSE, "%s: disabling FTDX3000 band select\n", __func__); } + if (is_ftdx5000) + { + // Remember EX103 status + SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX103;"); + rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str); + err = newcat_get_cmd(rig); + + if (RIG_OK != (err = newcat_get_cmd(rig))) + { + RETURNFUNC(err); + } + + if (priv->ret_data[6] == ';') { priv->front_rear_status = priv->ret_data[5]; } + } + RETURNFUNC(RIG_OK); } @@ -664,8 +679,9 @@ if (is_ftdx5000) { - // Ensure FT5000 is back to MIC input - SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX1030;"); + // Restore EX103 status + SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX103%c;", + priv->front_rear_status); rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str); newcat_set_cmd(rig); // don't care about the return } @@ -1741,7 +1757,7 @@ int newcat_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) { struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv; - int err; + int err = -RIG_EPROTO; char txon[] = "TX1;"; char txoff[] = "TX0;"; @@ -1756,24 +1772,45 @@ switch (ptt) { - // the FTDX5000 uses menu 103 for front/rear audio in USB mode case RIG_PTT_ON_MIC: - SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX1030;"); + + /* Build the command string */ + // the FTDX5000 uses menu 103 for front/rear audio in USB mode + if (is_ftdx5000) + { + // Ensure FT5000 is back to MIC input + SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX1030;"); + rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str); + newcat_set_cmd(rig); // don't care about the return + } + + SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s", txon); rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str); err = newcat_set_cmd(rig); break; case RIG_PTT_ON_DATA: - SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX1031;"); + + /* Build the command string */ + // the FTDX5000 uses menu 103 for front/rear audio in USB mode + if (is_ftdx5000) + { + // Ensure FT5000 is back to MIC input + SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX1031;"); + rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str); + newcat_set_cmd(rig); // don't care about the return + } + + SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s", txon); rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str); err = newcat_set_cmd(rig); break; case RIG_PTT_ON: - /* Build the command string */ SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s", txon); rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str); err = newcat_set_cmd(rig); + break; case RIG_PTT_OFF: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/rigs/yaesu/newcat.h new/Hamlib-4.5.3/rigs/yaesu/newcat.h --- old/Hamlib-4.5.2/rigs/yaesu/newcat.h 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/rigs/yaesu/newcat.h 2022-12-31 21:46:26.000000000 +0100 @@ -50,7 +50,7 @@ typedef char ncboolean; /* shared function version */ -#define NEWCAT_VER "20221223" +#define NEWCAT_VER "20221228" /* Hopefully large enough for future use, 128 chars plus '\0' */ #define NEWCAT_DATA_LEN 129 @@ -128,6 +128,7 @@ char last_if_response[NEWCAT_DATA_LEN]; int poweron; /* to prevent powering on more than once */ int question_mark_response_means_rejected; /* the question mark response has multiple meanings */ + char front_rear_status; /* e.g. FTDX5000 EX103 status */ }; /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/simulators/simftdx5000.c new/Hamlib-4.5.3/simulators/simftdx5000.c --- old/Hamlib-4.5.2/simulators/simftdx5000.c 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/simulators/simftdx5000.c 2022-12-31 21:46:26.000000000 +0100 @@ -22,6 +22,7 @@ int sh = 25; int na = 0; int ex039 = 0; +int ex103 = 0; // ID 0310 == 310, Must drop leading zero typedef enum nc_rigid_e @@ -316,6 +317,20 @@ { sscanf(buf, "EX039%d", &ex039); } + else if (strcmp(buf, "EX103;") == 0) + { + SNPRINTF(buf, sizeof(buf), "EX103%d;", ex103); + n = write(fd, buf, strlen(buf)); + } + else if (strncmp(buf, "EX103", 3) == 0) + { + sscanf(buf, "EX103%d", &ex103); + } + else if (strcmp(buf, "PS;") == 0) + { + SNPRINTF(buf, sizeof(buf), "PS1;"); + n = write(fd, buf, strlen(buf)); + } else if (strlen(buf) > 0) { fprintf(stderr, "Unknown command: %s\n", buf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/src/Makefile.am new/Hamlib-4.5.3/src/Makefile.am --- old/Hamlib-4.5.2/src/Makefile.am 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/src/Makefile.am 2022-12-31 21:46:26.000000000 +0100 @@ -30,9 +30,10 @@ # directory before the source directory for the hamlibdatetime.h # header. hamlibdatetime.h: FORCE + echo "#define HAMLIBDATETIME "\"$$(TZ=UTC git --git-dir=$(top_srcdir)/.git log --no-merges --date='format-local:%b %d %H:%M:%SZ %Y SHA=' --format='%cd' -n 1)$$(git --git-dir=$(top_srcdir)/.git log --no-merges -n 1 | cut -c8-13)\" @if test -x $(top_srcdir)/.git ; then \ echo "/* This date time is from the last non-merge commit to Hamlib. */" > $(builddir)/$((a)F).tmp ;\ - echo "#define HAMLIBDATETIME "\"$$(TZ=UTC git --git-dir=$(top_srcdir)/.git log --no-merges --date='format-local:%a %b %d %H:%M:%S %Y %z SHA=' --format='%cd' -n 1)$$(git --git-dir=$(top_srcdir)/.git log --no-merges | grep commit | head -n 1 | cut -c8-13)\" >> $(builddir)/$((a)F).tmp ;\ + echo "#define HAMLIBDATETIME "\"$$(TZ=UTC git --git-dir=$(top_srcdir)/.git log --no-merges --date='format-local:%b %d %H:%M:%SZ %Y SHA=' --format='%cd' -n 1)$$(git --git-dir=$(top_srcdir)/.git log --no-merges -n 1 | head -n 1 | cut -c8-13)\" >> $(builddir)/$((a)F).tmp ;\ diff -qN $(builddir)/$((a)F).tmp $(builddir)/$(@F) ; test $$? -eq 0 || { echo "Generating SCS header \"$(builddir)/$(@F)\"" ; mv -f $(builddir)/$((a)F).tmp $(builddir)/$(@F) ; } ;\ rm -f $(builddir)/$((a)F).tmp ;\ else \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.2/src/serial.c new/Hamlib-4.5.3/src/serial.c --- old/Hamlib-4.5.2/src/serial.c 2022-12-24 00:04:12.000000000 +0100 +++ new/Hamlib-4.5.3/src/serial.c 2022-12-31 21:46:26.000000000 +0100 @@ -290,8 +290,10 @@ fd = rp->fd; // Linux sets pins high so we force them low once - ser_set_rts(rp, 0); - ser_set_dtr(rp, 0); + // This fails on Linux and MacOS with hardware flow control + // Seems setting low disables hardware flow setting later +// ser_set_rts(rp, 0); +// ser_set_dtr(rp, 0); /* * Get the current options for the port...

1 0

commit musescore for openSUSE:Factory
by Source-Sync 02 Jan '23

02 Jan '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package musescore for openSUSE:Factory checked in at 2023-01-02 15:01:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/musescore (Old) and /work/SRC/openSUSE:Factory/.musescore.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "musescore" Mon Jan 2 15:01:48 2023 rev:28 rq:1045994 version:4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/musescore/musescore.changes 2023-01-01 09:39:01.658834004 +0100 +++ /work/SRC/openSUSE:Factory/.musescore.new.1563/musescore.changes 2023-01-02 15:01:55.773270422 +0100 @@ -1,0 +2,18 @@ +Sun Jan 1 11:11:45 UTC 2023 - Marcus Rueckert <mrueckert(a)suse.de> + +- Fix audio playback support in muse score + https://github.com/musescore/MuseScore/issues/11220#issuecomment-1365822403 + + - Fix jack finder by backporting 0dde64eef84.patch: + Though the jack code in Musescore seems to be unused and only + alsa seems supported + - Require alsa-plugins-pulse or pipewire-alsa to make playing out + of the box + +- prepare disabling the update check but it is currently not + possible due to + https://github.com/musescore/MuseScore/issues/15617 + +- cmake searches for ogg support: add proper BR + +------------------------------------------------------------------- New: ---- 0dde64eef84.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ musescore.spec ++++++ --- /var/tmp/diff_new_pack.7u4FgC/_old 2023-01-02 15:01:56.789276132 +0100 +++ /var/tmp/diff_new_pack.7u4FgC/_new 2023-01-02 15:01:56.793276155 +0100 @@ -1,7 +1,7 @@ # # spec file for package musescore # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,6 +46,8 @@ Source5: README.SUSE # PATCH-FIX-OPENSUSE: openSUSE has qmake-qt5 qmake was reserved for qt4, which is no longer present Patch0: use-qtmake-qt5.patch +# PATCH-FIX-UPSTREAM: fix build with jack on linux. +Patch1: 0dde64eef84.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -79,6 +81,7 @@ BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(libpulse-simple) +BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(portaudiocpp) BuildRequires: pkgconfig(sndfile) @@ -88,6 +91,8 @@ Requires: %{name}-fonts = %{version}-%{release} Requires: libqt5-qtgraphicaleffects Requires: libqt5-qtquickcontrols2 +Requires: ( alsa-plugins-pulse if pulseaudio ) +Requires: ( pipewire-alsa if pipewire ) %description MuseScore is a graphical music typesetter. It allows for note entry on a @@ -137,11 +142,19 @@ %build %define __builddir build.release +# TODO: +# find out what those do: +# BUILD_VIDEOEXPORT_MODULE:BOOL=ON +# find out how to enable this +# BUILD_VST:BOOL=ON +# -DBUILD_UPDATE_MODULE:BOOL=OFF triggers bug https://github.com/musescore/MuseScore/issues/15617 %cmake \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DMUSESCORE_BUILD_CONFIG=release \ -DBUILD_UNIT_TESTS=OFF \ -DUSE_SYSTEM_FREETYPE=ON \ + -DBUILD_JACK:BOOL=ON \ + -DBUILD_UPDATE_MODULE:BOOL=ON \ -DBUILD_CRASHPAD_CLIENT=OFF \ -DMUSESCORE_REVISION=%{revision} %make_jobs ++++++ 0dde64eef84.patch ++++++ commit 0dde64eef849027d16a0ac83b15bc8789d678564 Author: Jerry James <loganjerry(a)gmail.com> Date: Tue Dec 6 13:19:35 2022 -0700 Fix cmake error when building with jack on Linux diff --git a/build/cmake/FindJack.cmake b/build/cmake/FindJack.cmake index 6713e3aeef..d1676fa82b 100644 --- a/build/cmake/FindJack.cmake +++ b/build/cmake/FindJack.cmake @@ -28,6 +28,7 @@ IF(BUILD_JACK) set (JACK_LIB "$ENV{${progenv}}/Jack/lib/libjack.a") MESSAGE("JACK support enabled.") ELSE(MINGW OR MSVC) + include(UsePkgConfig1) PKGCONFIG1 (jack ${JACK_MIN_VERSION} JACK_INCDIR JACK_LIBDIR JACK_LIB JACK_CPP) IF(JACK_INCDIR) MESSAGE(STATUS "${JACK_LONGNAME} >= ${JACK_MIN_VERSION} found. jack support enabled.")

1 0

commit gromacs for openSUSE:Factory
by Source-Sync 02 Jan '23

02 Jan '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gromacs for openSUSE:Factory checked in at 2023-01-02 15:01:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gromacs (Old) and /work/SRC/openSUSE:Factory/.gromacs.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gromacs" Mon Jan 2 15:01:44 2023 rev:56 rq:1045992 version:2022.4 Changes: -------- --- /work/SRC/openSUSE:Factory/gromacs/gromacs.changes 2022-12-25 15:15:24.489561633 +0100 +++ /work/SRC/openSUSE:Factory/.gromacs.new.1563/gromacs.changes 2023-01-02 15:01:52.829253877 +0100 @@ -1,0 +2,8 @@ +Wed Dec 28 10:26:13 UTC 2022 - Stefan Br��ns <stefan.bruens(a)rwth-aachen.de> + +- Update to 2022.4 + * Bugfix release, see + https://manual.gromacs.org/current/release-notes/2022/2022.4.html +- Drop ustream relax_test_tolerance.patch + +------------------------------------------------------------------- Old: ---- gromacs-2022.3.tar.gz manual-2022.3.pdf regressiontests-2022.3.tar.gz relax_test_tolerance.patch New: ---- gromacs-2022.4.tar.gz manual-2022.4.pdf regressiontests-2022.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gromacs.spec ++++++ --- /var/tmp/diff_new_pack.IMt6kk/_old 2023-01-02 15:01:55.077266510 +0100 +++ /var/tmp/diff_new_pack.IMt6kk/_new 2023-01-02 15:01:55.081266533 +0100 @@ -1,5 +1,5 @@ # -# spec file +# spec file for package gromacs # # Copyright (c) 2022 SUSE LLC # Copyright (c) 2015-2019 Christoph Junghans <junghans(a)votca.org> @@ -48,7 +48,7 @@ %bcond_without tests Name: gromacs%{?with_mpi:-openmpi} -Version: 2022.3 +Version: 2022.4 Release: 0 %define uversion %{version} Summary: Molecular Dynamics Package @@ -58,8 +58,6 @@ Source0: ftp://ftp.gromacs.org/pub/gromacs/gromacs-%{uversion}.tar.gz Source1: ftp://ftp.gromacs.org/pub/manual/manual-%{uversion}.pdf Source2: ftp://ftp.gromacs.org/regressiontests/regressiontests-%{uversion}.tar.gz -# PATCH-FIX-UPSTREAM -Patch0: https://gitlab.com/gromacs/gromacs/-/commit/0ccdf623928dfe1ce04aa7a8995a540… BuildRequires: cmake >= 3.13.0 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -195,7 +193,7 @@ %endif # Avoid oversubscription, some tests run with 2 Ranks locally -export MAX_TEST_THREADS=$(( %_smp_build_ncpus / 2 )) +export MAX_TEST_THREADS=$(( %{?_smp_build_ncpus}%{!?_smp_build_ncpus:2} / 2 )) %cmake \ -DGMX_VERSION_STRING_OF_FORK=openSUSE \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ ++++++ gromacs-2022.3.tar.gz -> gromacs-2022.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/gromacs/gromacs-2022.3.tar.gz /work/SRC/openSUSE:Factory/.gromacs.new.1563/gromacs-2022.4.tar.gz differ: char 12, line 1 ++++++ manual-2022.3.pdf -> manual-2022.4.pdf ++++++ (binary differes) ++++++ regressiontests-2022.3.tar.gz -> regressiontests-2022.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/gromacs/regressiontests-2022.3.tar.gz /work/SRC/openSUSE:Factory/.gromacs.new.1563/regressiontests-2022.4.tar.gz differ: char 234, line 3

1 0

commit python-notebook-shim for openSUSE:Factory
by Source-Sync 02 Jan '23

02 Jan '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-notebook-shim for openSUSE:Factory checked in at 2023-01-02 15:01:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-notebook-shim (Old) and /work/SRC/openSUSE:Factory/.python-notebook-shim.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-notebook-shim" Mon Jan 2 15:01:41 2023 rev:3 rq:1045953 version:0.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-notebook-shim/python-notebook-shim.changes 2022-10-26 14:25:55.536287413 +0200 +++ /work/SRC/openSUSE:Factory/.python-notebook-shim.new.1563/python-notebook-shim.changes 2023-01-02 15:01:49.573235579 +0100 @@ -1,0 +2,6 @@ +Mon Dec 26 23:58:03 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to v0.2.2 + * Add config file + +------------------------------------------------------------------- Old: ---- notebook_shim-0.2.0.tar.gz New: ---- notebook_shim-0.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-notebook-shim.spec ++++++ --- /var/tmp/diff_new_pack.6UfpEi/_old 2023-01-02 15:01:49.969237804 +0100 +++ /var/tmp/diff_new_pack.6UfpEi/_new 2023-01-02 15:01:49.973237826 +0100 @@ -17,7 +17,7 @@ Name: python-notebook-shim -Version: 0.2.0 +Version: 0.2.2 Release: 0 Summary: A shim layer for notebook traits and config License: BSD-3-Clause @@ -27,12 +27,15 @@ BuildRequires: %{python_module hatchling >= 1.0} BuildRequires: %{python_module pip} BuildRequires: fdupes +BuildRequires: jupyter-rpm-macros BuildRequires: python-rpm-macros +Requires: jupyter-notebook-shim = %{version} Requires: (python-jupyter_server >= 1.8 with python-jupyter_server < 3) Provides: python-notebook_shim = %{version}-%{release} BuildArch: noarch BuildRequires: %{python_module jupyter_server >= 1.8 with %python-jupyter_server < 3} BuildRequires: %{python_module pytest-console-scripts} +BuildRequires: %{python_module pytest-jupyter} BuildRequires: %{python_module pytest-tornasync} BuildRequires: %{python_module pytest} %python_subpackages @@ -41,6 +44,17 @@ This project provides a way for JupyterLab and other frontends to switch to Jupyter Server for their Python Web application backend. +%package -n jupyter-notebook-shim +Summary: The configuration file for python-notebook-shim +Provides: juypter-notebook_shim = %{version}-%{release} +# Any flavor is okay +Requires: (%(echo "%{python_module notebook-shim = %{version}@or@}" | sed "s/@or@/ or /g" | sed 's/ or\s*$//')) + +%description -n jupyter-notebook-shim +This project provides a way for JupyterLab and other frontends to switch to +Jupyter Server for their Python Web application backend. Common configuration +file + %prep %setup -q -n notebook_shim-%{version} @@ -49,6 +63,7 @@ %install %pyproject_install +%jupyter_move_config %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -60,4 +75,7 @@ %{python_sitelib}/notebook_shim %{python_sitelib}/notebook_shim-%{version}*-info +%files -n jupyter-notebook-shim +%_jupyter_config %{_jupyter_server_confdir}/notebook_shim.json + %changelog ++++++ notebook_shim-0.2.0.tar.gz -> notebook_shim-0.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook_shim-0.2.0/.github/workflows/check-release.yml new/notebook_shim-0.2.2/.github/workflows/check-release.yml --- old/notebook_shim-0.2.0/.github/workflows/check-release.yml 2020-02-02 01:00:00.000000000 +0100 +++ new/notebook_shim-0.2.2/.github/workflows/check-release.yml 2020-02-02 01:00:00.000000000 +0100 @@ -2,40 +2,26 @@ on: push: branches: - - "*" + - '*' pull_request: branches: - - "*" + - '*' permissions: - contents: - write + contents: write jobs: check_release: runs-on: ubuntu-latest - strategy: - matrix: - group: [check_release, link_check] steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Base Setup - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - - - name: Install Dependencies - run: | - pip install -e . - + - uses: actions/checkout@v2 + - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - name: Check Release - if: ${{ matrix.group == 'check_release' }} - env: - TWINE_PASSWORD: ${{ secrets.TEST_PYPI_TOKEN }} - uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1 + uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2 with: token: ${{ secrets.GITHUB_TOKEN }} - - - name: Check Links - if: ${{ matrix.group == 'link_check' }} - uses: jupyter-server/jupyter_releaser/.github/actions/check-links@v1 + - name: Upload Distributions + uses: actions/upload-artifact@v2 + with: + name: jupyter-resource-usage-releaser-dist-${{ github.run_number }} + path: .jupyter_releaser_checkout/dist diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook_shim-0.2.0/.github/workflows/prep-release.yaml new/notebook_shim-0.2.2/.github/workflows/prep-release.yaml --- old/notebook_shim-0.2.0/.github/workflows/prep-release.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/notebook_shim-0.2.2/.github/workflows/prep-release.yaml 2020-02-02 01:00:00.000000000 +0100 @@ -0,0 +1,42 @@ +name: "Step 1: Prep Release" +on: + workflow_dispatch: + inputs: + version_spec: + description: "New Version Specifier" + default: "next" + required: false + branch: + description: "The branch to target" + required: false + post_version_spec: + description: "Post Version Specifier" + required: false + since: + description: "Use PRs with activity since this date or git reference" + required: false + since_last_stable: + description: "Use PRs with activity since the last stable git tag" + required: false + type: boolean +jobs: + prep_release: + runs-on: ubuntu-latest + steps: + - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + + - name: Prep Release + id: prep-release + uses: jupyter-server/jupyter_releaser/.github/actions/prep-release@v2 + with: + token: ${{ secrets.ADMIN_GITHUB_TOKEN }} + version_spec: ${{ github.event.inputs.version_spec }} + post_version_spec: ${{ github.event.inputs.post_version_spec }} + target: ${{ github.event.inputs.target }} + branch: ${{ github.event.inputs.branch }} + since: ${{ github.event.inputs.since }} + since_last_stable: ${{ github.event.inputs.since_last_stable }} + + - name: "** Next Step **" + run: | + echo "Optional): Review Draft Release: ${{ steps.prep-release.outputs.release_url }}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook_shim-0.2.0/.github/workflows/publish-release.yaml new/notebook_shim-0.2.2/.github/workflows/publish-release.yaml --- old/notebook_shim-0.2.0/.github/workflows/publish-release.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/notebook_shim-0.2.2/.github/workflows/publish-release.yaml 2020-02-02 01:00:00.000000000 +0100 @@ -0,0 +1,53 @@ +name: "Step 2: Publish Release" +on: + workflow_dispatch: + inputs: + branch: + description: "The target branch" + required: false + release_url: + description: "The URL of the draft GitHub release" + required: false + steps_to_skip: + description: "Comma separated list of steps to skip" + required: false + +jobs: + publish_release: + runs-on: ubuntu-latest + steps: + - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + + - name: Populate Release + id: populate-release + uses: jupyter-server/jupyter_releaser/.github/actions/populate-release@v2 + with: + token: ${{ secrets.ADMIN_GITHUB_TOKEN }} + target: ${{ github.event.inputs.target }} + branch: ${{ github.event.inputs.branch }} + release_url: ${{ github.event.inputs.release_url }} + steps_to_skip: ${{ github.event.inputs.steps_to_skip }} + + - name: Finalize Release + id: finalize-release + env: + PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} + PYPI_TOKEN_MAP: ${{ secrets.PYPI_TOKEN_MAP }} + TWINE_USERNAME: __token__ + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + uses: jupyter-server/jupyter-releaser/.github/actions/finalize-release@v2 + with: + token: ${{ secrets.ADMIN_GITHUB_TOKEN }} + target: ${{ github.event.inputs.target }} + release_url: ${{ steps.populate-release.outputs.release_url }} + + - name: "** Next Step **" + if: ${{ success() }} + run: | + echo "Verify the final release" + echo ${{ steps.finalize-release.outputs.release_url }} + - name: "** Failure Message **" + if: ${{ failure() }} + run: | + echo "Failed to Publish the Draft Release Url:" + echo ${{ steps.populate-release.outputs.release_url }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook_shim-0.2.0/CHANGELOG.md new/notebook_shim-0.2.2/CHANGELOG.md --- old/notebook_shim-0.2.0/CHANGELOG.md 2020-02-02 01:00:00.000000000 +0100 +++ new/notebook_shim-0.2.2/CHANGELOG.md 2020-02-02 01:00:00.000000000 +0100 @@ -2,6 +2,41 @@  +## 0.2.2 + +([Full Changelog](https://github.com/jupyter/notebook_shim/compare/v0.2.0...e1f121…) + +### Bugs fixed + +- Fixes #7 [#24](https://github.com/jupyter/notebook_shim/pull/24) ([@dleen](https://github.com/dleen)) +- Add config file [#23](https://github.com/jupyter/notebook_shim/pull/23) ([@dleen](https://github.com/dleen)) + +### Maintenance and upkeep improvements + +- add releaser v2 workflows [#25](https://github.com/jupyter/notebook_shim/pull/25) ([@Zsailer](https://github.com/Zsailer)) + +### Contributors to this release + +([GitHub contributors page for this release](https://github.com/jupyter/notebook_shim/graphs/contributors?from=…) + +[@dleen](https://github.com/search?q=repo%3Ajupyter%2Fnotebook_shim+involves%3Adleen+updated%3A2022-10-17..2022-11-03&type=Issues) | [@Zsailer](https://github.com/search?q=repo%3Ajupyter%2Fnotebook_shim+involves%3AZsailer+updated%3A2022-10-17..2022-11-03&type=Issues) + + + +## 0.2.1 + +([Full Changelog](https://github.com/jupyter/notebook_shim/compare/v0.2.0...b72af7…) + +### Bugs fixed + +- Add config file [#23](https://github.com/jupyter/notebook_shim/pull/23) ([@dleen](https://github.com/dleen)) + +### Contributors to this release + +([GitHub contributors page for this release](https://github.com/jupyter/notebook_shim/graphs/contributors?from=…) + +[@dleen](https://github.com/search?q=repo%3Ajupyter%2Fnotebook_shim+involves%3Adleen+updated%3A2022-10-17..2022-11-02&type=Issues) + ## 0.2.0 ([Full Changelog](https://github.com/jupyter/notebook_shim/compare/v0.1.0...4e4228…) @@ -21,8 +56,6 @@ [@blink1073](https://github.com/search?q=repo%3Ajupyter%2Fnotebook_shim+involves%3Ablink1073+updated%3A2022-02-10..2022-10-17&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook_shim+involves%3Ajtpio+updated%3A2022-02-10..2022-10-17&type=Issues) | [@Zsailer](https://github.com/search?q=repo%3Ajupyter%2Fnotebook_shim+involves%3AZsailer+updated%3A2022-02-10..2022-10-17&type=Issues) - - ## 0.1.0 ([Full Changelog](https://github.com/jupyterlab/notebook_shim/compare/first-commit…) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook_shim-0.2.0/PKG-INFO new/notebook_shim-0.2.2/PKG-INFO --- old/notebook_shim-0.2.0/PKG-INFO 2020-02-02 01:00:00.000000000 +0100 +++ new/notebook_shim-0.2.2/PKG-INFO 2020-02-02 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: notebook_shim -Version: 0.2.0 +Version: 0.2.2 Summary: A shim layer for notebook traits and config Author-email: Jupyter Development Team <jupyter(a)googlegroups.com> License: BSD 3-Clause License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook_shim-0.2.0/conftest.py new/notebook_shim-0.2.2/conftest.py --- old/notebook_shim-0.2.0/conftest.py 1970-01-01 01:00:00.000000000 +0100 +++ new/notebook_shim-0.2.2/conftest.py 2020-02-02 01:00:00.000000000 +0100 @@ -0,0 +1 @@ +pytest_plugins = ["jupyter_server.pytest_plugin"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook_shim-0.2.0/notebook_shim/_version.py new/notebook_shim-0.2.2/notebook_shim/_version.py --- old/notebook_shim-0.2.0/notebook_shim/_version.py 2020-02-02 01:00:00.000000000 +0100 +++ new/notebook_shim-0.2.2/notebook_shim/_version.py 2020-02-02 01:00:00.000000000 +0100 @@ -1,2 +1,2 @@ -version_info = (0, 2, 0, "", "") -__version__ = "0.2.0" +version_info = (0, 2, 2, "", "") +__version__ = "0.2.2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook_shim-0.2.0/notebook_shim/conftest.py new/notebook_shim-0.2.2/notebook_shim/conftest.py --- old/notebook_shim-0.2.0/notebook_shim/conftest.py 2020-02-02 01:00:00.000000000 +0100 +++ new/notebook_shim-0.2.2/notebook_shim/conftest.py 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -pytest_plugins = ["jupyter_server.pytest_plugin"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook_shim-0.2.0/pyproject.toml new/notebook_shim-0.2.2/pyproject.toml --- old/notebook_shim-0.2.0/pyproject.toml 2020-02-02 01:00:00.000000000 +0100 +++ new/notebook_shim-0.2.2/pyproject.toml 2020-02-02 01:00:00.000000000 +0100 @@ -31,6 +31,9 @@ "jupyter_server>=1.8,<3" ] +[tool.hatch.build.targets.wheel.shared-data] +"jupyter_server_config.d/notebook_shim.json" = "etc/jupyter/jupyter_server_config.d/notebook_shim.json" + [project.optional-dependencies] test = [ "pytest", @@ -38,11 +41,13 @@ "pytest-console-scripts", ] + + [tool.hatch.version] path = "notebook_shim/_version.py" [tool.tbump.version] -current = "0.2.0" +current = "0.2.2" regex = ''' (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+) ((?P<channel>a|b|rc|.dev)(?P<release>\d+))?

1 0

commit python-jupyterlab for openSUSE:Factory
by Source-Sync 02 Jan '23

02 Jan '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-jupyterlab for openSUSE:Factory checked in at 2023-01-02 15:01:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jupyterlab (Old) and /work/SRC/openSUSE:Factory/.python-jupyterlab.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jupyterlab" Mon Jan 2 15:01:40 2023 rev:23 rq:1045951 version:3.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jupyterlab/python-jupyterlab.changes 2022-10-27 13:54:57.964810435 +0200 +++ /work/SRC/openSUSE:Factory/.python-jupyterlab.new.1563/python-jupyterlab.changes 2023-01-02 15:01:48.485229464 +0100 @@ -1,0 +2,11 @@ +Mon Dec 26 22:52:43 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to 3.5.2 + * use jupyter_config_dir instead of config_path[0] for + workspaces, settings #13589 (@minrk) + * Fix Python test dependencies #13508 (@fcollonval) +- Release 3.5.1 + * Fixes sharing metadata #13491 (@hbcarlos) + * Bump sanitize-html to 2.7.3 #13509 (@fcollonval) + +------------------------------------------------------------------- Old: ---- jupyterlab-3.5.0-py3-none-any.whl New: ---- jupyterlab-3.5.2-py3-none-any.whl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jupyterlab.spec ++++++ --- /var/tmp/diff_new_pack.hHQSNM/_old 2023-01-02 15:01:49.217233578 +0100 +++ /var/tmp/diff_new_pack.hHQSNM/_new 2023-01-02 15:01:49.221233600 +0100 @@ -17,7 +17,7 @@ Name: python-jupyterlab -Version: 3.5.0 +Version: 3.5.2 Release: 0 Summary: Environment for interactive and reproducible computing License: BSD-3-Clause @@ -58,6 +58,8 @@ BuildRequires: %{python_module pytest >= 6.0} BuildRequires: %{python_module pytest-check-links} BuildRequires: %{python_module pytest-console-scripts} +BuildRequires: %{python_module pytest-jupyter >= 0.6} +BuildRequires: %{python_module pytest-tornasync} BuildRequires: %{python_module requests} BuildRequires: %{python_module virtualenv} # /SECTION @@ -107,7 +109,8 @@ %fdupes %{buildroot}%{$python_sitelib} } %fdupes %{buildroot}%{_jupyter_prefix} -cp %{buildroot}%{python3_sitelib}/jupyterlab-%{version}.dist-info/LICENSE . +# Find any one installed LICENSE and get if for the rpm tagged file +find %{buildroot}%{_prefix}/lib/python3.* -path '*/jupyterlab-%{version}.dist-info/LICENSE' -exec cp {} . ';' -quit %check # This is only a rudimentary set of tests which we can run offline using pytest directly. The full test

1 0

commit console-setup for openSUSE:Factory
by Source-Sync 02 Jan '23

02 Jan '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package console-setup for openSUSE:Factory checked in at 2023-01-02 15:01:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/console-setup (Old) and /work/SRC/openSUSE:Factory/.console-setup.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "console-setup" Mon Jan 2 15:01:37 2023 rev:8 rq:1045985 version:1.215 Changes: -------- --- /work/SRC/openSUSE:Factory/console-setup/console-setup.changes 2022-12-21 16:06:08.054390645 +0100 +++ /work/SRC/openSUSE:Factory/.console-setup.new.1563/console-setup.changes 2023-01-02 15:01:38.945175849 +0100 @@ -1,0 +2,21 @@ +Sun Jan 1 10:13:39 UTC 2023 - Stefan Dirsch <sndirsch(a)suse.com> + +- removed buildrequires to kbd to resolve kbd/console-setup build + cycle + +------------------------------------------------------------------- +Fri Dec 30 12:16:39 UTC 2022 - Alexei Sorokin <sor.alexei(a)meowr.ru> + +- Update to version 1.215: + * See https://salsa.debian.org/installer-team/console-setup/-/blob/debian/1.215/d… +- Make a bdf2psf package like in Fedora. +- Suggest xkeyboard-config. +- Replace console-setup-1.76-paths.patch with + console-setup-paths.patch. +- Move the fonts to /usr/share/kbd/ to be discoverable by vconsole. +- Drop console-setup-1.134-perl526.patch, + console-setup-1.134-reproducible.patch, u_fix-iso-left-tab.patch, + 0001-ckbcomp-Fix-check-for-non-ascii.patch: fixed upstream. +- Fix the RPM Group. + +------------------------------------------------------------------- Old: ---- 0001-ckbcomp-Fix-check-for-non-ascii.patch console-setup-1.134-perl526.patch console-setup-1.134-reproducible.patch console-setup-1.76-paths.patch console-setup_1.134.tar.xz u_fix-iso-left-tab.patch New: ---- console-setup-paths.patch console-setup_1.215.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ console-setup.spec ++++++ --- /var/tmp/diff_new_pack.BxhMro/_old 2023-01-02 15:01:40.197182885 +0100 +++ /var/tmp/diff_new_pack.BxhMro/_new 2023-01-02 15:01:40.201182907 +0100 @@ -1,7 +1,7 @@ # # spec file for package console-setup # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,67 +17,84 @@ Name: console-setup -Version: 1.134 +Version: 1.215 Release: 0 Summary: Tools for configuring the console using X Window System key maps License: GPL-2.0-or-later AND MIT AND SUSE-Public-Domain -Group: Applications/System -URL: http://packages.debian.org/cs/sid/console-setup -Source: http://ftp.de.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.… -# Fixes installing paths to Fedora style -Patch0: console-setup-1.76-paths.patch -# Fixes FSF address, sent to upstream -Patch1: console-setup-1.76-fsf-address.patch -# Backport fix from 1.143 -Patch2: console-setup-1.134-perl526.patch -# PATCH-FIX-UPSTREAM in 1.174 -Patch3: console-setup-1.134-reproducible.patch -# Fix Shift-Tab mapping (bsc#1122361) -Patch4: u_fix-iso-left-tab.patch -# Fix using Caps_Lock where possible (bsc#1202853). Sent upstream. -Patch5: 0001-ckbcomp-Fix-check-for-non-ascii.patch - +Group: System/Console +URL: https://salsa.debian.org/installer-team/console-setup +Source: https://deb.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.xz +# PATCH-FIX-OPENSUSE console-setup-1.76-fsf-address.patch -- Fix the FSF address. +Patch0: console-setup-1.76-fsf-address.patch +# PATCH-FIX-OPENSUSE console-setup-paths.patch -- Change installing paths to SUSE-style. +Patch1: console-setup-paths.patch BuildRequires: perl BuildRequires: perl(encoding) -# require 'xkeyboard-config' to have X Window keyboard descriptions? +Suggests: xkeyboard-config BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -This package provides the console with the same keyboard configuration -scheme that X Window System has. Besides the keyboard, the package configures -also the font on the console. It includes a rich collection of fonts and -supports several languages that would be otherwise unsupported on the console -(such as Armenian, Georgian, Lao and Thai). +This package provides the console with the same keyboard +configuration scheme that X Window System has. +Besides the keyboard, the package also configures the font on the +console. It includes a rich collection of fonts and supports +several languages that would be otherwise unsupported on the +console (such as Armenian, Georgian, Lao and Thai). + +%package -n bdf2psf +Summary: Generate console fonts from BDF source fonts + +%description -n bdf2psf +This package provides a command-line converter that can be used in +scripts to build console fonts from BDF sources automatically. +The converter comes with a collection of font encodings that cover +many of the world's languages. The output font can use a different +character encoding from the input. When the source font does not +define a glyph for a particular symbol in the encoding table, that +glyph position in the console font is not wasted but used for +another symbol. %prep -%setup -q -%patch0 -p1 -b .paths -%patch1 -p1 -b .fsf-address -%patch2 -p1 -b .perl526 -%patch3 -p1 -b .reproducible -%patch4 -p1 -b .shift-tab -%patch5 -p1 -b .nonascii +%autosetup -n %{name} -p1 + +cp -a debian/changelog ChangeLog +cp -a debian/copyright COPYING %build -make build-linux +%make_build build-linux %install -make prefix=$RPM_BUILD_ROOT install-linux +make prefix=%{buildroot}%{_prefix} install-linux # we don't want another set of keyboard descriptions, we want to use descriptions from # xkeyboard-config (require it?), so removing it # or maybe have these from tarball it in optional subpackage? -rm -rf $RPM_BUILD_ROOT/etc/console-setup +rm -r %{buildroot}%{_sysconfdir}/console-setup/ + +install -Dpm 0755 Fonts/bdf2psf %{buildroot}%{_bindir}/bdf2psf +install -Dpm 0644 man/bdf2psf.1 %{buildroot}%{_mandir}/man1/bdf2psf.1 + +mkdir -p %{buildroot}%{_datadir}/bdf2psf/ +cp -a Fonts/fontsets/ Fonts/*.equivalents Fonts/*.set \ + %{buildroot}%{_datadir}/bdf2psf/ %files -%defattr(-,root,root) -%doc README COPYRIGHT CHANGES copyright.fonts copyright.xkb Fonts/copyright -%{_bindir}/ckbcomp -%{_bindir}/setupcon +%license COPYING copyright.fonts copyright.xkb Fonts/copyright +%doc ChangeLog README %config(noreplace) %{_sysconfdir}/default/console-setup %config(noreplace) %{_sysconfdir}/default/keyboard -%{_datadir}/consolefonts -%{_datadir}/consoletrans -%{_mandir}/*/* +%{_bindir}/ckbcomp +%{_bindir}/setupcon +%dir %{_datadir}/kbd +%{_datadir}/kbd/consolefonts/ +%{_datadir}/kbd/consoletrans/ +%{_mandir}/man1/setupcon.1%{?ext_man} +%{_mandir}/man1/ckbcomp.1%{?ext_man} +%{_mandir}/man5/keyboard.5%{?ext_man} +%{_mandir}/man5/console-setup.5%{?ext_man} + +%files -n bdf2psf +%{_bindir}/bdf2psf +%{_datadir}/bdf2psf/ +%{_mandir}/man1/bdf2psf.1%{?ext_man} %changelog ++++++ console-setup-paths.patch ++++++ --- a/Keyboard/ckbcomp +++ b/Keyboard/ckbcomp @@ -3273,14 +3273,14 @@ if ($keycodes =~ /(^|\+|\|)ataritt(\([^\ ########### READ ACM ############################################### if ($charmap) { - for my $acmfile ("$installdir/share/consoletrans/${charmap}", - "$installdir/share/consoletrans/${charmap}.gz", - "$installdir/share/consoletrans/${charmap}.acm", - "$installdir/share/consoletrans/${charmap}.acm.gz", - "/usr/share/consoletrans/${charmap}", - "/usr/share/consoletrans/${charmap}.gz", - "/usr/share/consoletrans/${charmap}.acm", - "/usr/share/consoletrans/${charmap}.acm.gz", + for my $acmfile ("$installdir/share/kbd/consoletrans/${charmap}", + "$installdir/share/kbd/consoletrans/${charmap}.gz", + "$installdir/share/kbd/consoletrans/${charmap}.acm", + "$installdir/share/kbd/consoletrans/${charmap}.acm.gz", + "/usr/share/kbd/consoletrans/${charmap}", + "/usr/share/kbd/consoletrans/${charmap}.gz", + "/usr/share/kbd/consoletrans/${charmap}.acm", + "/usr/share/kbd/consoletrans/${charmap}.acm.gz", "${charmap}") { if (-f $acmfile) { $acm = $acmfile; --- a/Keyboard/compose_translator +++ b/Keyboard/compose_translator @@ -51,10 +51,10 @@ my %uni2acm; my %acm2uni; if ($acm) { for my $acmfile ("${acm}", "${acm}.gz", "${acm}.acm", "${acm}.acm.gz", - "/usr/share/consoletrans/${acm}", - "/usr/share/consoletrans/${acm}.gz", - "/usr/share/consoletrans/${acm}.acm", - "/usr/share/consoletrans/${acm}.acm.gz",) { + "/usr/share/kbd/consoletrans/${acm}", + "/usr/share/kbd/consoletrans/${acm}.gz", + "/usr/share/kbd/consoletrans/${acm}.acm", + "/usr/share/kbd/consoletrans/${acm}.acm.gz",) { if (-f $acmfile) { $acm = $acmfile; last; --- a/Makefile +++ b/Makefile @@ -11,9 +11,9 @@ include Fonts/Makefile ~ := main prefix := /usr/local -# etcdir must be either /etc or -etcdir := $(prefix)/etc bootprefix := $(patsubst %/usr,%/,$(prefix:%/=%)) +# etcdir must be either /etc or /usr/etc +etcdir := $(bootprefix)/etc mandir := $(prefix)/share/man acmfiles := $(wildcard $./acm/*.acm) @@ -26,8 +26,8 @@ build-common: gzipped-acmfiles .PHONY: install-common install-common: build-common - install -d $(bootprefix)/bin/ - install setupcon $(bootprefix)/bin/ + install -d $(prefix)/bin/ + install setupcon $(prefix)/bin/ install -d $(etcdir)/default install -m 644 config/keyboard $(etcdir)/default/ install -m 644 config/console-setup $(etcdir)/default/ @@ -39,10 +39,11 @@ install-common: build-common .PHONY: install-common-linux install-common-linux: build-linux - install -d $(prefix)/share/consolefonts/ - install -m 644 Fonts/*.psf.gz $(prefix)/share/consolefonts/ - install -d $(prefix)/share/consoletrans - install -m 644 acm/*.acm.gz $(prefix)/share/consoletrans/ + install -d $(prefix)/share/kbd + install -d $(prefix)/share/kbd/consolefonts/ + install -m 644 Fonts/*.psf.gz $(prefix)/share/kbd/consolefonts/ + install -d $(prefix)/share/kbd/consoletrans + install -m 644 acm/*.acm.gz $(prefix)/share/kbd/consoletrans/ install -d $(etcdir)/console-setup install -m 644 Keyboard/compose.*.inc $(etcdir)/console-setup/ install -m 644 Keyboard/remap.inc $(etcdir)/console-setup/ @@ -53,8 +54,8 @@ install-common-freebsd: build-freebsd install -m 644 Fonts/*.fnt $(prefix)/share/syscons/fonts/ install -d $(prefix)/share/syscons/scrnmaps/ install -m 644 Fonts/*.scm $(prefix)/share/syscons/scrnmaps/ - install -d $(prefix)/share/consoletrans - install -m 644 acm/*.acm $(prefix)/share/consoletrans/ + install -d $(prefix)/share/kbd/consoletrans + install -m 644 acm/*.acm $(prefix)/share/kbd/consoletrans/ install -d $(etcdir)/console-setup install -m 644 Fonts/terminfo $(etcdir)/console-setup/ install -m 644 Fonts/termcap $(etcdir)/console-setup/ @@ -99,10 +100,10 @@ install-mini-freebsd: install-common ins common-uninstall: | build-linux build-mini-linux build-freebsd build-mini-freebsd -for font in Fonts/*.psf.gz; do \ - rm $(prefix)/share/consolefonts/$${font##*/}; \ + rm $(prefix)/share/kbd/consolefonts/$${font##*/}; \ done -for acm in acm/*.acm.gz acm/*.acm; do \ - rm $(prefix)/share/consoletrans/$${acm##*/}; \ + rm $(prefix)/share/kbd/consoletrans/$${acm##*/}; \ done -for font in Fonts/*.fnt; do \ rm $(prefix)/share/syscons/fonts/$${font##*/}; \ @@ -119,7 +120,7 @@ common-uninstall: | build-linux build-mi -rm $(etcdir)/default/keyboard -rm $(etcdir)/default/console-setup -rm $(prefix)/bin/ckbcomp - -rm $(bootprefix)/bin/setupcon + -rm $(prefix)/bin/setupcon .PHONY: uninstall-linux uninstall-linux: build-linux common-uninstall --- a/man/ckbcomp.1 +++ b/man/ckbcomp.1 @@ -46,7 +46,7 @@ Print a usage message and exit. .BI -charmap\ charmap The encoding to use for the output keymap. There should be an character mapping table defining this encoding in -.IR /usr/local/share/consoletrans . +.IR /usr/share/kbd/consoletrans . Definitions of the following charmaps are provided: .nh .BR ARMSCII-8 , @@ -86,8 +86,9 @@ for files included by the keymap descrip multiple times. If a file can not be found in any of the specified directories, it will be searched also in some other standard locations, such as -.IR /usr/local/etc/console-setup/ckb , -.IR /usr/local/share/X11/xkb +.IR /etc/console-setup/ckb , +.IR /usr/local/share/X11/xkb , +.IR /usr/share/X11/xkb and .IR /etc/X11/xkb @@ -167,9 +168,9 @@ Specifies the layout variant used to cho Adds an option used to choose component names. .SH FILES -.I /usr/local/share/consoletrans +.I /usr/share/kbd/consoletrans .br -.I /usr/local/etc/console-setup/ckb +.I /etc/console-setup/ckb .br .I /usr/share/X11/xkb .br --- a/man/console-setup.5 +++ b/man/console-setup.5 @@ -403,16 +403,16 @@ Completely covered by the following font The standard location of the .B console-setup configuration file is -.IR /usr/local/etc/default/console-setup . +.IR /etc/default/console-setup . The keyboard configuration is in -.IR /usr/local/etc/default/keyboard . +.IR /etc/default/keyboard . Fonts that can be used with the variable .B FONT are usually installed in -.IR /usr/share/consolefonts/ " or " /usr/share/syscons/fonts/ . +.IR /usr/share/kbd/consolefonts/ " or " /usr/share/consolefonts/ . Translation maps that can be used with the variable CONSOLE_MAP are usually installed in -.IR /usr/share/consoletrans/ " or " /usr/share/syscons/scrnmaps/ . +.IR /usr/share/kbd/consoletrans/ " or " /usr/share/consoletrans/ . .SH NOTES The aim of the Terminus font is to reduce the eyes-fatigue when one --- a/man/keyboard.5 +++ b/man/keyboard.5 @@ -154,12 +154,12 @@ on FreeBSD. The standard location of the .B keyboard file is -.IR /usr/local/etc/default/keyboard . +.IR /etc/default/keyboard . Description of all available keyboard models, layouts, variants and options is available in -.IR /usr/local/share/X11/xkb/rules/base.lst . +.IR /usr/share/X11/xkb/rules/base.lst . In most cases, in -.IR /usr/share/keymaps/ " or " /usr/share/syscons/keymaps/ +.IR /usr/share/kbd/keymaps/ you will find several keymaps that can be used with the variable .BR KMAP . --- a/man/setupcon.1 +++ b/man/setupcon.1 @@ -22,11 +22,11 @@ the console. Most of the time you invok without arguments. The keyboard configuration is specified in .I ~/.keyboard or -.IR /usr/local/etc/default/keyboard . +.IR /etc/default/keyboard . The font configuration is specified in .I ~/.console-setup or -.IR /usr/local/etc/default/console-setup . +.IR /etc/default/console-setup . Consult .BR keyboard (5) and @@ -162,13 +162,13 @@ Display usage information. .br .I ~/.keyboard .br -.I /usr/local/etc/default/console-setup +.I /etc/default/console-setup .br -.I /usr/local/etc/default/keyboard +.I /etc/default/keyboard .br -.I /usr/local/etc/default/console-setup.VARIANT +.I /etc/default/console-setup.VARIANT .br -.I /usr/local/etc/default/keyboard.VARIANT +.I /etc/default/keyboard.VARIANT .br .I /etc/console-setup/ --- a/setupcon +++ b/setupcon @@ -644,9 +644,9 @@ esac # mapdir, fontdir, stdfont, stdfontfallback case "$kernel" in linux) - mapdir=share/consoletrans + mapdir=share/kbd/consoletrans stdmap=$CHARMAP.acm.gz - fontdir=share/consolefonts + fontdir=share/kbd/consolefonts stdfont=$CODESET-$FONTFACE$FONTSIZE.psf.gz # [A-WXYZa-wyz] is a funny way to say [A-Za-wyz]. In some locales # [A-Z] includes x and we don't want this. @@ -716,7 +716,7 @@ fi # FONTMAPFILE FONTMAPFILE='' if [ "$kernel" = linux -a -n "$FONT_MAP" ]; then - FONTMAPFILE=`findfile share/consoletrans "$FONT_MAP"` + FONTMAPFILE=`findfile share/kbd/consoletrans "$FONT_MAP"` fi # XKBMODEL ++++++ console-setup_1.134.tar.xz -> console-setup_1.215.tar.xz ++++++ ++++ 490873 lines of diff (skipped)

1 0

commit kbd for openSUSE:Factory
by Source-Sync 02 Jan '23

02 Jan '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2023-01-02 15:01:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kbd" Mon Jan 2 15:01:36 2023 rev:114 rq:1045923 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2022-08-24 15:11:00.308495375 +0200 +++ /work/SRC/openSUSE:Factory/.kbd.new.1563/kbd.changes 2023-01-02 15:01:37.081165374 +0100 @@ -1,0 +2,7 @@ +Sat Dec 31 12:29:16 UTC 2022 - Stefan Dirsch <sndirsch(a)suse.com> + +- rebased cz-map.patch for console-setup 1.215 update; apparently + 'U+00b0' needs to be 'dead_abovering' and not 'dead_grave' as we + assumed before + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cz-map.patch ++++++ --- /var/tmp/diff_new_pack.uOjk7p/_old 2023-01-02 15:01:37.845169667 +0100 +++ /var/tmp/diff_new_pack.uOjk7p/_new 2023-01-02 15:01:37.849169690 +0100 @@ -1,14 +1,5 @@ --- cz.map.orig 2021-10-04 21:08:13.000000000 +0200 +++ cz.map 2021-10-04 21:13:29.969027000 +0200 -@@ -39,7 +39,7 @@ - keycode 38 = +U+006c +U+004c +U+0141 +U+0141 Control_l Control_l Control_l Control_l Meta_l Meta_L Meta_l Meta_L Meta_Control_l Meta_Control_l Meta_Control_l Meta_Control_l +U+006c +U+004c +U+0141 +U+0141 Control_l Control_l Control_l Control_l Meta_l Meta_L Meta_l Meta_L Meta_Control_l Meta_Control_l Meta_Control_l Meta_Control_l +U+006c +U+004c +U+0141 +U+0141 Control_l Control_l Control_l Control_l Meta_l Meta_L Meta_l Meta_L Meta_Control_l Meta_Control_l Meta_Control_l Meta_Control_l +U+006c +U+004c +U+0141 +U+0141 Control_l Control_l Control_l Control_l Meta_l Meta_L Meta_l Meta_L Meta_Control_l Meta_Control_l Meta_Control_l Meta_Control_l +U+004c +U+006c +U+0142 +U+0142 Control_l Control_l Control_l Control_l Meta_l Meta_L Meta_l Meta_L Meta_Control_l Meta_Control_l Meta_Control_l Meta_Control_l +U+004c +U+006c +U+0142 +U+0142 Control_l Control_l Control_l Control_l Meta_l Meta_L Meta_l Meta_L Meta_Control_l Meta_Control_l Meta_Control_l Meta_Control_l +U+004c +U+006c +U+0142 +U+0142 Control_l Control_l Control_l Control_l Meta_l Meta_L Meta_l Meta_L Meta_Control_l Meta_Control_l Meta_Control_l Meta_Control_l +U+004c +U+006c +U+0142 +U+0142 Control_l Control_l Control_l Control_l Meta_l Meta_L Meta_l Meta_L Meta_Control_l Meta_Control_l Meta_Control_l Meta_Control_l - keycode 39 = +U+016f U+0022 U+0024 dead_doubleacute +U+016f U+0022 U+0024 dead_doubleacute Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar +U+016f U+0022 U+0024 dead_doubleacute +U+016f U+0022 U+0024 dead_doubleacute Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar +U+016f U+0022 U+0024 dead_doubleacute +U+016f U+0022 U+0024 dead_doubleacute Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar +U+016f U+0022 U+0024 dead_doubleacute +U+016f U+0022 U+0024 dead_doubleacute Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar +U+016e U+0022 U+0024 dead_doubleacute +U+016e U+0022 U+0024 dead_doubleacute Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar +U+016e U+0022 U+0024 dead_doubleacute +U+016e U+0022 U+0024 dead_doublea cute Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar +U+016e U+0022 U+0024 dead_doubleacute +U+016e U+0022 U+0024 dead_doubleacute Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar +U+016e U+0022 U+0024 dead_doubleacute +U+016e U+0022 U+0024 dead_doubleacute Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar Meta_quotedbl Meta_quotedbl Meta_dollar Meta_dollar - keycode 40 = U+00a7 U+0021 U+0027 +U+00df U+00a7 U+0021 U+0027 +U+00df Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe U+00a7 U+0021 U+0027 +U+00df U+00a7 U+0021 U+0027 +U+00df Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe U+00a7 U+0021 U+0027 +U+00df U+00a7 U+0021 U+0027 +U+00df Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe U+00a7 U+0021 U+0027 +U+00df U+00a7 U+0021 U+0027 +U+00df Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe U+00a7 U+0021 U+0027 +U+0053 U+00a7 U+0021 U+0027 +U+0053 Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe U+00a7 U+0021 U+0027 +U+0053 U+00a7 U+0021 U+0027 +U+0053 Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe Meta_exclam Meta_ex clam Meta_apostrophe Meta_apostrophe U+00a7 U+0021 U+0027 +U+0053 U+00a7 U+0021 U+0027 +U+0053 Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe U+00a7 U+0021 U+0027 +U+0053 U+00a7 U+0021 U+0027 +U+0053 Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe Meta_exclam Meta_exclam Meta_apostrophe Meta_apostrophe --keycode 41 = U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Met a_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum -+keycode 41 = U+003b dead_grave U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum U+003b U+00b0 U+0060 U+007e nul Control_asciicircum nul Control_asciicircum Meta_semicolon Meta_semicolon Meta_grave Meta_asciitilde Meta_nul Meta_Control_asciicircum Meta_nul Meta_Control_asciicircum - keycode 42 = Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift Shift - keycode 43 = dead_diaeresis U+0027 U+005c U+007c Control_backslash Control_backslash Control_backslash Control_backslash Meta_apostrophe Meta_apostrophe Meta_backslash Meta_bar Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash dead_diaeresis U+0027 U+005c U+007c Control_backslash Control_backslash Control_backslash Control_backslash Meta_apostrophe Meta_apostrophe Meta_backslash Meta_bar Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash dead_diaeresis U+0027 U+005c U+007c Control_backslash Control_backslash Control_backslash Control_backslash Meta_apostrophe Meta_apostrophe Meta_backslash Meta_bar Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash dead_diaeresis U+0027 U+005c U+007c Control_backslash Control_backslash Control_backslash Control_backslash Meta_apostrophe Meta_apostrophe Meta_backslash Meta_bar Meta_Control_backslash Meta_Control_backslash Meta_ Control_backslash Meta_Control_backslash dead_diaeresis U+0027 U+005c U+007c Control_backslash Control_backslash Control_backslash Control_backslash Meta_apostrophe Meta_apostrophe Meta_backslash Meta_bar Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash dead_diaeresis U+0027 U+005c U+007c Control_backslash Control_backslash Control_backslash Control_backslash Meta_apostrophe Meta_apostrophe Meta_backslash Meta_bar Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash dead_diaeresis U+0027 U+005c U+007c Control_backslash Control_backslash Control_backslash Control_backslash Meta_apostrophe Meta_apostrophe Meta_backslash Meta_bar Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash dead_diaeresis U+0027 U+005c U+007c Control_backslash Control_backslash Control_backslash Control_backslash Meta_apostrophe Meta_apostrophe Meta_backslash Meta_bar Meta_Control_backslash M eta_Control_backslash Meta_Control_backslash Meta_Control_backslash - keycode 44 = +U+0079 +U+0059 U+00b0 U+2039 Control_y Control_y Control_y Control_y Meta_y Meta_Y Meta_y Meta_Y Meta_Control_y Meta_Control_y Meta_Control_y Meta_Control_y +U+0079 +U+0059 U+00b0 U+2039 Control_y Control_y Control_y Control_y Meta_y Meta_Y Meta_y Meta_Y Meta_Control_y Meta_Control_y Meta_Control_y Meta_Control_y +U+0079 +U+0059 U+00b0 U+2039 Control_y Control_y Control_y Control_y Meta_y Meta_Y Meta_y Meta_Y Meta_Control_y Meta_Control_y Meta_Control_y Meta_Control_y +U+0079 +U+0059 U+00b0 U+2039 Control_y Control_y Control_y Control_y Meta_y Meta_Y Meta_y Meta_Y Meta_Control_y Meta_Control_y Meta_Control_y Meta_Control_y +U+0059 +U+0079 U+00b0 U+2039 Control_y Control_y Control_y Control_y Meta_y Meta_Y Meta_y Meta_Y Meta_Control_y Meta_Control_y Meta_Control_y Meta_Control_y +U+0059 +U+0079 U+00b0 U+2039 Control_y Control_y Control_y Control_y Meta_y Meta_Y Meta_y Meta_Y Meta_Control_y Meta_Control_y Meta_Control_y Meta_Control_y +U+0059 +U+0079 U+00b0 U+2039 Contr ol_y Control_y Control_y Control_y Meta_y Meta_Y Meta_y Meta_Y Meta_Control_y Meta_Control_y Meta_Control_y Meta_Control_y +U+0059 +U+0079 U+00b0 U+2039 Control_y Control_y Control_y Control_y Meta_y Meta_Y Meta_y Meta_Y Meta_Control_y Meta_Control_y Meta_Control_y Meta_Control_y @@ -108,3 +108,49 @@ keycode 127 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol Voi dSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol keycode 121 = KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP _Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period KP_Period

1 0

commit makedepend for openSUSE:Factory
by Source-Sync 02 Jan '23

02 Jan '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package makedepend for openSUSE:Factory checked in at 2023-01-02 15:01:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/makedepend (Old) and /work/SRC/openSUSE:Factory/.makedepend.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "makedepend" Mon Jan 2 15:01:34 2023 rev:12 rq:1045912 version:1.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/makedepend/makedepend.changes 2022-12-15 19:23:36.407510652 +0100 +++ /work/SRC/openSUSE:Factory/.makedepend.new.1563/makedepend.changes 2023-01-02 15:01:36.057159619 +0100 @@ -1,0 +2,8 @@ +Tue Dec 20 12:09:34 UTC 2022 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Update to version 1.0.8: + + Bug #2: fix regression introduced by fix for bug #1 + - Obsoletes issue2-mr7.patch + + man page: add line breaks in Synopsis section + +------------------------------------------------------------------- Old: ---- issue2-mr7.patch makedepend-1.0.7.tar.xz New: ---- makedepend-1.0.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ makedepend.spec ++++++ --- /var/tmp/diff_new_pack.QIpGmF/_old 2023-01-02 15:01:36.681163126 +0100 +++ /var/tmp/diff_new_pack.QIpGmF/_new 2023-01-02 15:01:36.689163170 +0100 @@ -17,19 +17,17 @@ Name: makedepend -Version: 1.0.7 +Version: 1.0.8 Release: 0 Summary: Utility to create dependencies in makefiles License: MIT Group: Development/Tools/Building -URL: http://xorg.freedesktop.org/ +URL: https://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar… -Patch0: issue2-mr7.patch -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(xproto) >= 7.0.17 # This was part of the xorg-x11-util-devel package up to version 7.6 Conflicts: xorg-x11-util-devel <= 7.6 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The makedepend program reads each sourcefile in sequence and parses it @@ -41,19 +39,18 @@ has changed. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build %configure -make %{?_smp_mflags} +%make_build %install %make_install %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README.md +%license COPYING +%doc AUTHORS ChangeLog README.md %{_bindir}/makedepend %{_mandir}/man1/makedepend.1%{?ext_man} ++++++ makedepend-1.0.7.tar.xz -> makedepend-1.0.8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedepend-1.0.7/ChangeLog new/makedepend-1.0.8/ChangeLog --- old/makedepend-1.0.7/ChangeLog 2022-10-29 04:32:05.000000000 +0200 +++ new/makedepend-1.0.8/ChangeLog 2022-12-12 20:12:09.000000000 +0100 @@ -1,3 +1,35 @@ +commit f7ad4c3164cf673bc30a2a038beb7cdb45ee3e94 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon Dec 12 11:07:08 2022 -0800 + + makedepend 1.0.8 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 654f6355d501153fe1fbdbc073cb72fd6355e194 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon Dec 5 15:48:17 2022 -0800 + + Bug #2: fix regression introduced by fix for bug #1 + + Refactor code to find the full file path before comparing against + existing items in the list so that we stop adding duplicate entries + for all the files in the system include path and with larger amounts + of code hitting the MAXFILES limit. + + Fixes: 3dc64b0 ("Add test case for bug #1 + proposed fix.") + Closes: #2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit a17093a3f99f21bb999f3e0f9a45340eeed98da8 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon Dec 5 10:44:51 2022 -0800 + + man page: add line breaks in Synopsis section + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + commit d62a9e49c6b83f05c5692bbe4b80c485d08ecfd3 Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Fri Oct 28 19:28:57 2022 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedepend-1.0.7/aclocal.m4 new/makedepend-1.0.8/aclocal.m4 --- old/makedepend-1.0.7/aclocal.m4 2022-10-29 04:31:58.000000000 +0200 +++ new/makedepend-1.0.8/aclocal.m4 2022-12-12 20:12:02.000000000 +0100 @@ -1793,7 +1793,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-xmlto option, it allows maximum flexibilty in making decisions +# the --with-xmlto option, it allows maximum flexibility in making decisions # as whether or not to use the xmlto package. When DEFAULT is not specified, # --with-xmlto assumes 'auto'. # @@ -2007,7 +2007,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-asciidoc option, it allows maximum flexibilty in making decisions +# the --with-asciidoc option, it allows maximum flexibility in making decisions # as whether or not to use the asciidoc package. When DEFAULT is not specified, # --with-asciidoc assumes 'auto'. # @@ -2077,7 +2077,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-doxygen option, it allows maximum flexibilty in making decisions +# the --with-doxygen option, it allows maximum flexibility in making decisions # as whether or not to use the doxygen package. When DEFAULT is not specified, # --with-doxygen assumes 'auto'. # @@ -2161,7 +2161,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-groff option, it allows maximum flexibilty in making decisions +# the --with-groff option, it allows maximum flexibility in making decisions # as whether or not to use the groff package. When DEFAULT is not specified, # --with-groff assumes 'auto'. # @@ -2269,7 +2269,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-fop option, it allows maximum flexibilty in making decisions +# the --with-fop option, it allows maximum flexibility in making decisions # as whether or not to use the fop package. When DEFAULT is not specified, # --with-fop assumes 'auto'. # @@ -2363,7 +2363,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-ps2pdf option, it allows maximum flexibilty in making decisions +# the --with-ps2pdf option, it allows maximum flexibility in making decisions # as whether or not to use the ps2pdf package. When DEFAULT is not specified, # --with-ps2pdf assumes 'auto'. # @@ -2418,7 +2418,7 @@ # not at the appropriate level. This macro enables a builder to skip all # documentation targets except traditional man pages. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2451,7 +2451,7 @@ # # This macro enables a builder to skip all developer documentation. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2484,7 +2484,7 @@ # # This macro enables a builder to skip all functional specification targets. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2975,7 +2975,7 @@ # Minimum version: 1.16.0 # # Test if the compiler works when passed the given flag as a command line argument. -# If it succeeds, the flag is appeneded to the given variable. If not, it tries the +# If it succeeds, the flag is appended to the given variable. If not, it tries the # next flag in the list until there are no more options. # # Note that this does not guarantee that the compiler supports the flag as some @@ -3132,7 +3132,7 @@ # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedepend-1.0.7/configure new/makedepend-1.0.8/configure --- old/makedepend-1.0.7/configure 2022-10-29 04:31:59.000000000 +0200 +++ new/makedepend-1.0.8/configure 2022-12-12 20:12:03.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for makedepend 1.0.7. +# Generated by GNU Autoconf 2.71 for makedepend 1.0.8. # # Report bugs to <https://gitlab.freedesktop.org/xorg/util/makedepend/-/issues>. # @@ -612,8 +612,8 @@ # Identity of this package. PACKAGE_NAME='makedepend' PACKAGE_TARNAME='makedepend' -PACKAGE_VERSION='1.0.7' -PACKAGE_STRING='makedepend 1.0.7' +PACKAGE_VERSION='1.0.8' +PACKAGE_STRING='makedepend 1.0.8' PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/util/makedepend/-/issues' PACKAGE_URL='' @@ -1350,7 +1350,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 makedepend 1.0.7 to adapt to many kinds of systems. +\`configure' configures makedepend 1.0.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1421,7 +1421,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of makedepend 1.0.7:";; + short | recursive ) echo "Configuration of makedepend 1.0.8:";; esac cat <<\_ACEOF @@ -1534,7 +1534,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -makedepend configure 1.0.7 +makedepend configure 1.0.8 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1804,7 +1804,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by makedepend $as_me 1.0.7, which was +It was created by makedepend $as_me 1.0.8, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3078,7 +3078,7 @@ # Define the identity of the package. PACKAGE='makedepend' - VERSION='1.0.7' + VERSION='1.0.8' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -7110,7 +7110,7 @@ # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -12114,7 +12114,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by makedepend $as_me 1.0.7, which was +This file was extended by makedepend $as_me 1.0.8, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12182,7 +12182,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -makedepend config.status 1.0.7 +makedepend config.status 1.0.8 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/makedepend-1.0.7/configure.ac new/makedepend-1.0.8/configure.ac --- old/makedepend-1.0.7/configure.ac 2022-10-29 04:31:56.000000000 +0200 +++ new/makedepend-1.0.8/configure.ac 2022-12-12 20:12:00.000000000 +0100 @@ -3,7 +3,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([makedepend], [1.0.7], +AC_INIT([makedepend], [1.0.8], [https://gitlab.freedesktop.org/xorg/util/makedepend/-/issues] AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([makedepend-config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedepend-1.0.7/include.c new/makedepend-1.0.8/include.c --- old/makedepend-1.0.7/include.c 2022-10-29 04:31:56.000000000 +0200 +++ new/makedepend-1.0.8/include.c 2022-12-12 20:12:00.000000000 +0100 @@ -222,60 +222,17 @@ } } -struct inclist * -inc_path(const char *file, const char *include, int type) +/* + * Return full path for the "include" file of the given "type", + * which may be found relative to the source file "file". + */ +static const char * +find_full_inc_path(const char *file, const char *include, int type) { static char path[ BUFSIZ ]; register const char **pp, *p; - register struct inclist *ip; struct stat st; - /* - * Check all previously found include files for a path that - * has already been expanded. - */ - if ((type == INCLUDE) || (type == INCLUDEDOT)) - inclistnext = inclist; - ip = inclistnext; - - for (; ip->i_file; ip++) { - if ((strcmp(ip->i_incstring, include) == 0) && - !(ip->i_flags & INCLUDED_SYM)) { - /* - * Same filename but same file ? - */ - char r_include[PATHMAX+1]; - char r_saved_path[PATHMAX+1]; - char* ptr; - ptr = realpath(include, r_include); - ptr = realpath(ip->i_file, r_saved_path); - if (!strcmp(r_include, r_saved_path)) { - inclistnext = ip + 1; - return ip; - } - - /* - * Check if we have a header in the same dir - */ - for (p=file+strlen(file); p>file; p--) - if (*p == '/') - break; - if (p == file) { - strcpy(path, include); - } else { - strncpy(path, file, (p-file) + 1); - path[ (p-file) + 1 ] = '\0'; - strcpy(path + (p-file) + 1, include); - } - remove_dotdot(path); - ptr = realpath(path, r_include); - if (!strcmp(r_include, r_saved_path)) { - inclistnext = ip + 1; - return ip; - } - } - } - if (inclistnext == inclist) { /* * If the path was surrounded by "" or is an absolute path, @@ -285,7 +242,7 @@ (type == INCLUDENEXTDOT) || (*include == '/')) { if (stat(include, &st) == 0 && !S_ISDIR(st.st_mode)) - return newinclude(include, include); + return include; if (show_where_not) warning1("\tnot in %s\n", include); } @@ -307,7 +264,7 @@ } remove_dotdot(path); if (stat(path, &st) == 0 && !S_ISDIR(st.st_mode)) - return newinclude(path, include); + return path; if (show_where_not) warning1("\tnot in %s\n", path); } @@ -326,7 +283,7 @@ remove_dotdot(path); if (stat(path, &st) == 0 && !S_ISDIR(st.st_mode)) { includedirsnext = pp + 1; - return newinclude(path, include); + return path; } if (show_where_not) warning1("\tnot in %s\n", path); @@ -334,3 +291,43 @@ return NULL; } + +struct inclist * +inc_path(const char *file, const char *include, int type) +{ + const char *fp; + struct inclist *ip; + char r_include[PATHMAX+1]; + + /* + * Check all previously found include files for a path that + * has already been expanded. + */ + if ((type == INCLUDE) || (type == INCLUDEDOT)) + inclistnext = inclist; + ip = inclistnext; + + fp = find_full_inc_path(file, include, type); + if (fp == NULL) + return NULL; + if (realpath(fp, r_include) == NULL) + return NULL; + + for (; ip->i_file; ip++) { + if ((strcmp(ip->i_incstring, include) == 0) && + !(ip->i_flags & INCLUDED_SYM)) { + /* + * Same filename but same file ? + */ + char r_saved_path[PATHMAX+1]; + if (realpath(ip->i_file, r_saved_path) == NULL) + continue; + if (!strcmp(r_include, r_saved_path)) { + inclistnext = ip + 1; + return ip; + } + } + } + + return newinclude(fp, include); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedepend-1.0.7/makedepend.man new/makedepend-1.0.8/makedepend.man --- old/makedepend-1.0.7/makedepend.man 2022-10-29 04:31:56.000000000 +0200 +++ new/makedepend-1.0.8/makedepend.man 2022-12-12 20:12:00.000000000 +0100 @@ -37,7 +37,9 @@ .BI \-I includedir ] [ .BI \-Y includedir -] [ +] +.br + [ .B \-a ] [ .BI \-f makefile @@ -45,7 +47,9 @@ .BI \-include \ file ] [ .BI \-o objsuffix -] [ +] +.br + [ .BI \-p objprefix ] [ .BI \-s string @@ -55,14 +59,15 @@ .B \-v ] [ .B \-m -] [ +] +.br + [ \-\^\- .I otheroptions \-\^\- ] .I sourcefile \&.\|.\|. -.br .SH DESCRIPTION The .B makedepend

1 0