From d182ac8886f9b907c8d5d8824ff2a492c7d63201b3282ca0fca77e1effbd563f Mon Sep 17 00:00:00 2001 From: Frank Kunz Date: Thu, 18 Aug 2022 13:10:56 +0000 Subject: [PATCH] Accepting request 997979 from home:frank_kunz:branches:electronics - Update to new upstream version 2.4.22 - Add support for GPS Bricklet 3.0 and ESP32 (Ethernet) Brick - Add Data Logger support for GPS Bricklet 3.0 - Improve plot color palette for dark themes - Rework plot timing logic to greatly reduce jitter - Draw a vertical line to indicate time jumps in plots - Fix driver installation on Windows - Upgrade bundled Python to 3.9 on Windows (Windows 8.1 required) - added 0001-red-Handle-service-provider-country-codes-missing-in.patch to fix build OBS-URL: https://build.opensuse.org/request/show/997979 OBS-URL: https://build.opensuse.org/package/show/electronics/brickv?expand=0&rev=25 --- ...ce-provider-country-codes-missing-in.patch | 36 +++++++++++++++++++ brickv.changes | 13 +++++++ brickv.spec | 4 ++- v2.4.21.tar.gz | 3 -- v2.4.22.tar.gz | 3 ++ 5 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 0001-red-Handle-service-provider-country-codes-missing-in.patch delete mode 100644 v2.4.21.tar.gz create mode 100644 v2.4.22.tar.gz diff --git a/0001-red-Handle-service-provider-country-codes-missing-in.patch b/0001-red-Handle-service-provider-country-codes-missing-in.patch new file mode 100644 index 0000000..97c7608 --- /dev/null +++ b/0001-red-Handle-service-provider-country-codes-missing-in.patch @@ -0,0 +1,36 @@ +From 38339ae4a102acf13c250aa962d45acae5624b52 Mon Sep 17 00:00:00 2001 +From: Erik Fleckstein +Date: Wed, 27 Jul 2022 14:37:49 +0200 +Subject: [PATCH] red: Handle service provider country codes missing in + ISO-3166 database. + +--- + .../plugin_system/plugins/red/build_serviceproviders.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/brickv/plugin_system/plugins/red/build_serviceproviders.py b/src/brickv/plugin_system/plugins/red/build_serviceproviders.py +index 3b7d95ca..87a11c93 100644 +--- a/src/brickv/plugin_system/plugins/red/build_serviceproviders.py ++++ b/src/brickv/plugin_system/plugins/red/build_serviceproviders.py +@@ -3,7 +3,7 @@ + """ + Copyright (C) 2015 Ishraq Ibne Ashraf + Copyright (C) 2015 Matthias Bolte +-Copyright (C) 2020 Erik Fleckstein ++Copyright (C) 2020, 2022 Erik Fleckstein + + build_serviceproviders.py: Generate python dicts for mobile internet feature + +@@ -114,6 +114,9 @@ def main(): + + for dict_c in dict_provider['country']: + code_country = dict_c['@code'] ++ if code_country.upper() not in dict_country_all: ++ print(' Skipping country with code {}: not found in ISO-3166 database'.format(code_country)) ++ continue + dict_country[code_country] = dict_country_all[code_country.upper()] + + except Exception as e: +-- +2.37.1 + diff --git a/brickv.changes b/brickv.changes index 5c87cde..8666f3b 100644 --- a/brickv.changes +++ b/brickv.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Aug 18 10:57:06 UTC 2022 - Frank Kunz + +- Update to new upstream version 2.4.22 + - Add support for GPS Bricklet 3.0 and ESP32 (Ethernet) Brick + - Add Data Logger support for GPS Bricklet 3.0 + - Improve plot color palette for dark themes + - Rework plot timing logic to greatly reduce jitter + - Draw a vertical line to indicate time jumps in plots + - Fix driver installation on Windows + - Upgrade bundled Python to 3.9 on Windows (Windows 8.1 required) + - added 0001-red-Handle-service-provider-country-codes-missing-in.patch to fix build + ------------------------------------------------------------------- Sat Jan 8 09:35:22 UTC 2022 - Frank Kunz diff --git a/brickv.spec b/brickv.spec index ac44935..d98e78f 100644 --- a/brickv.spec +++ b/brickv.spec @@ -18,13 +18,14 @@ Name: brickv -Version: 2.4.21 +Version: 2.4.22 Release: 0 Summary: Tinkerforge Brick Viewer License: GPL-2.0-only Group: Development/Tools/Debuggers URL: http://www.tinkerforge.com Source0: https://github.com/Tinkerforge/brickv/archive/v%{version}.tar.gz +Patch0: 0001-red-Handle-service-provider-country-codes-missing-in.patch BuildRequires: %{python_module qt5} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -44,6 +45,7 @@ Small Qt GUI to control and test all Bricks and Bricklets from Tinkerforge. %prep %setup -q +%patch0 -p1 # remove unneeded shebangs sed -i 's|#!/usr/bin/env python3||g' src/brickv/main.py sed -i 's|#!/usr/bin/env python3||g' src/brickv/plugin_system/plugins/red/build_serviceproviders.py diff --git a/v2.4.21.tar.gz b/v2.4.21.tar.gz deleted file mode 100644 index 6a396da..0000000 --- a/v2.4.21.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:293b443a6544cf3f98704178a6cb0f1714623bc155a1666bbd74232e36748980 -size 11488499 diff --git a/v2.4.22.tar.gz b/v2.4.22.tar.gz new file mode 100644 index 0000000..0be23cf --- /dev/null +++ b/v2.4.22.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6346738ffaae975ed754216f48db76fb95c09c3daf623b6f62becb96048328f2 +size 18979004