From 1cf3b497c581d8b4f9eac46c4d4ac58e8edc80f7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Jul 29 2019 03:20:59 +0000 Subject: piper 0.2.905 --- diff --git a/0001-Add-missing-device-id-for-MX-Master.patch b/0001-Add-missing-device-id-for-MX-Master.patch new file mode 100644 index 0000000..ddf72fc --- /dev/null +++ b/0001-Add-missing-device-id-for-MX-Master.patch @@ -0,0 +1,26 @@ +From 4566d8cb91486d9e50cb991cad16b4849c22166e Mon Sep 17 00:00:00 2001 +From: Dmitry Nikonov +Date: Wed, 24 Jul 2019 02:45:08 +0300 +Subject: [PATCH] Add missing device id for MX Master + +Update DeviceMatch for Logitech MX Master in according with the libratbag device description (there are two ids for usb and two for bluetooth). +--- + data/svgs/svg-lookup.ini | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/svgs/svg-lookup.ini b/data/svgs/svg-lookup.ini +index f657d88..f7bc036 100644 +--- a/data/svgs/svg-lookup.ini ++++ b/data/svgs/svg-lookup.ini +@@ -111,7 +111,7 @@ DeviceMatch=bluetooth:046d:b019;usb:046d:4069 + Svg=logitech-mx-master-2s.svg + + [Logitech MX Master] +-DeviceMatch=usb:046d:4041;bluetooth:046d:b012;usb:046d:4060 ++DeviceMatch=usb:046d:4041;bluetooth:046d:b012;usb:046d:4060;bluetooth:046d:b017 + Svg=logitech-mx-master.svg + + [Roccat Kone XTD] +-- +2.21.0 + diff --git a/0001-data-add-circle-as-allowed-element-to-check-svg.py.patch b/0001-data-add-circle-as-allowed-element-to-check-svg.py.patch new file mode 100644 index 0000000..c19c871 --- /dev/null +++ b/0001-data-add-circle-as-allowed-element-to-check-svg.py.patch @@ -0,0 +1,26 @@ +From 2aaac93b36b31381c0f8dc4a1a91f33aafb22fc1 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 29 Jul 2019 11:47:15 +1000 +Subject: [PATCH] data: add circle as allowed element to check-svg.py + +Signed-off-by: Peter Hutterer +--- + data/svgs/check-svg.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/svgs/check-svg.py b/data/svgs/check-svg.py +index 587d220..50b5dbd 100755 +--- a/data/svgs/check-svg.py ++++ b/data/svgs/check-svg.py +@@ -61,7 +61,7 @@ def check_elements(root, prefix, required=0): + # elements can be paths and rects + # This includes leaders and lines + element_ids = [] +- for element in ['path', 'rect', 'g']: ++ for element in ['path', 'rect', 'g', 'circle']: + element_ids += [p.attrib['id'] for p in root.xpath('//svg:{}'.format(element), namespaces=ns) if p.attrib['id'].startswith(prefix)] + + idx = 0 +-- +2.21.0 + diff --git a/0001-data-de-duplicate-the-svg-element-search.patch b/0001-data-de-duplicate-the-svg-element-search.patch new file mode 100644 index 0000000..ae2a681 --- /dev/null +++ b/0001-data-de-duplicate-the-svg-element-search.patch @@ -0,0 +1,30 @@ +From 5e5aa13866aa29dfd7fd3822b5a511681231a902 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 29 Jul 2019 11:46:30 +1000 +Subject: [PATCH] data: de-duplicate the svg element search + +Signed-off-by: Peter Hutterer +--- + data/svgs/check-svg.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/svgs/check-svg.py b/data/svgs/check-svg.py +index f62ccea..587d220 100755 +--- a/data/svgs/check-svg.py ++++ b/data/svgs/check-svg.py +@@ -60,9 +60,9 @@ def check_elements(root, prefix, required=0): + + # elements can be paths and rects + # This includes leaders and lines +- element_ids = [p.attrib['id'] for p in root.xpath('//svg:path', namespaces=ns) if p.attrib['id'].startswith(prefix)] +- element_ids += [p.attrib['id'] for p in root.xpath('//svg:rect', namespaces=ns) if p.attrib['id'].startswith(prefix)] +- element_ids += [g.attrib['id'] for g in root.xpath('//svg:g', namespaces=ns) if g.attrib['id'].startswith(prefix)] ++ element_ids = [] ++ for element in ['path', 'rect', 'g']: ++ element_ids += [p.attrib['id'] for p in root.xpath('//svg:{}'.format(element), namespaces=ns) if p.attrib['id'].startswith(prefix)] + + idx = 0 + highest = -1 +-- +2.21.0 + diff --git a/piper.spec b/piper.spec index 37578ed..534dfe6 100644 --- a/piper.spec +++ b/piper.spec @@ -1,11 +1,16 @@ Name: piper -Version: 0.2.904 -Release: 3%{?dist} +Version: 0.2.905 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/libratbag/%{name} Summary: GTK application to configure gaming mice Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz + +Patch01: 0001-Add-missing-device-id-for-MX-Master.patch +Patch02: 0001-data-de-duplicate-the-svg-element-search.patch +Patch03: 0001-data-add-circle-as-allowed-element-to-check-svg.py.patch + BuildArch: noarch BuildRequires: desktop-file-utils @@ -14,7 +19,7 @@ BuildRequires: pygobject3-devel BuildRequires: python3-devel BuildRequires: gettext-devel BuildRequires: python3-lxml -BuildRequires: meson +BuildRequires: meson git Requires: hicolor-icon-theme Requires: libratbag-ratbagd >= 0.9.905 @@ -28,7 +33,7 @@ Piper is a GTK+ application to configure gaming mice, using libratbag via ratbagd. %prep -%autosetup -p1 +%autosetup -S git sed -i '/meson_install.sh/d' meson.build %build @@ -54,6 +59,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Jul 29 2019 Peter Hutterer 0.2.905-1 +- piper 0.2.905 + * Fri Jul 26 2019 Fedora Release Engineering - 0.2.904-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 82b27a3..cefa9f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (piper-0.2.904.tar.gz) = 425d233a89eebf391650ae121134dd532bf75e0f6e15168c89ab86f3b5bac1adb6dfa985c0028a2285f85655226200b5cfe28f36cfd83814985f97ffa3774412 +SHA512 (piper-0.2.905.tar.gz) = bf9f63d54155cbbea9d7ec6f4c8fa9f63cc4cb9ecdfb592dbca5bedef910a01b1e15ecf28f1a04cea45adc426be876301c5b49b5032307a65923d9f158e54c9d