commit cfb49dfec449a21a2d6ae747c24f14d374c07896 Author: Martin Gansser <mgansser(a)online.de&gt; Date: Sat Jun 8 10:20:47 2024 +0200 Update to 2.16.2 Add %{name}-invalid-escape-sequence.patch .gitignore | 1 + flowblade-invalid-escape-sequence.patch | 29 +++++++++++++++++++++++++++++ flowblade.spec | 11 ++++++++--- sources | 2 +- 4 files changed, 39 insertions(+), 4 deletions(-) --- diff --git a/.gitignore b/.gitignore index 3a29654..e357f23 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /flowblade-2.14.0.1.tar.gz /flowblade-2.14.0.2.tar.gz /flowblade-2.16.tar.gz +/flowblade-2.16.2.tar.gz diff --git a/flowblade-invalid-escape-sequence.patch b/flowblade-invalid-escape-sequence.patch new file mode 100644 index 0000000..349175d --- /dev/null +++ b/flowblade-invalid-escape-sequence.patch @@ -0,0 +1,29 @@ +--- ./flowblade-trunk/Flowblade/keyevents.py.orig 2024-06-08 09:56:17.758693101 +0200 ++++ ./flowblade-trunk/Flowblade/keyevents.py 2024-06-08 09:57:55.533079094 +0200 +@@ -561,10 +561,10 @@ + if modifier == "": + modifier = 'None' + try: +- action = _secondary_dict[''.join(sorted(re.sub('[\s]','',modifier.lower())))] ++ action = _secondary_dict[''.join(sorted(re.sub(r'[\s+]','',modifier.lower())))] + except: + try: +- action = _secondary_dict[''.join(sorted(re.sub('[\s]','','Any'.lower())))] ++ action = _secondary_dict[''.join(sorted(re.sub(r'[\s+]','','Any'.lower())))] + except: + action = 'None' + return action +--- ./flowblade-trunk/Flowblade/shortcuts.py.orig 2024-06-08 09:59:00.103761405 +0200 ++++ ./flowblade-trunk/Flowblade/shortcuts.py 2024-06-08 09:59:42.021175923 +0200 +@@ -141,9 +141,9 @@ + # to easily compare with any entered combo of the modifiers. In fact, CTRL+ALT becomes the + # same as ALT+CTRL and Alt+Ctrl- it will all be +acllrtt + if event.get('modifiers') == None: +- _modifier_dict[''.join(sorted(re.sub('[\s]','','None'.lower())))] = event.get('code') ++ _modifier_dict[''.join(sorted(re.sub(r'[\s+]','','None'.lower())))] = event.get('code') + else: +- _modifier_dict[''.join(sorted(re.sub('[\s]','',event.get('modifiers').lower())))] = event.get('code') ++ _modifier_dict[''.join(sorted(re.sub(r'[\s+]','',event.get('modifiers').lower())))] = event.get('code') + _keyboard_actions[event.text] = _modifier_dict + _editable = root.get('editable') + except: diff --git a/flowblade.spec b/flowblade.spec index 5b0d38f..95c085c 100644 --- a/flowblade.spec +++ b/flowblade.spec @@ -12,8 +12,8 @@ Name: flowblade Version: 2.14.0.2 Release: 1%{?dist} %else -Version: 2.16 -Release: 2%{?dist} +Version: 2.16.2 +Release: 1%{?dist} %endif License: GPLv3 Summary: Multitrack non-linear video editor for Linux @@ -23,7 +23,8 @@ Source0: %{url}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar %else Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz %endif -Patch0: flowblade_sys_path.patch +Patch0: %{name}_sys_path.patch +Patch1: %{name}-invalid-escape-sequence.patch #Patch1: mlt7.patch BuildRequires: desktop-file-utils @@ -123,6 +124,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{python3_sitelib}/%{name}* %changelog +* Sat Jun 08 2024 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.16.2-1 +- Update to 2.16.2 +- Add %%{name}-invalid-escape-sequence.patch + * Wed May 29 2024 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.16-2 - Add RR python3-libusb1 diff --git a/sources b/sources index 417d5f5..e9b2a61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (flowblade-2.16.tar.gz) = 55e71d56d8383d13d870fc513e2601dcff3b25960ae4a62692c3efbce9baea6dfda46beab1dd51efb7e626726458e7c056005677d394222c3fd9ecae0173eb4d +SHA512 (flowblade-2.16.2.tar.gz) = 0bfb8595bed047dd46927feb3b899d16a38b0c1684acc62704a184f6f7dfd0ac88e9da679ddc34d2f4421612882dd03130412c392347f8bd0a6b261d4f5b0c6e