[openshot/f35] Fix filename join (rfbz#6080)

commit 673268c4cc26123ad369ed9bfefe522661ca0be6 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Thu Sep 9 17:56:06 2021 +0100 Fix filename join (rfbz#6080) Fix_filename_join.patch | 29 +++++++++++++++++++++++++++++ openshot.spec | 8 ++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) --- diff --git a/Fix_filename_join.patch b/Fix_filename_join.patch new file mode 100644 index 0000000..c1cb73c --- /dev/null +++ b/Fix_filename_join.patch @@ -0,0 +1,29 @@ +From 904663c2fc481b312c845f6b112a4b8bec6995be Mon Sep 17 00:00:00 2001 +From: "FeRD (Frank Dana)" <ferdnyc(a)gmail.com&gt; +Date: Wed, 29 Apr 2020 04:18:09 -0400 +Subject: [PATCH] Blender: Fix filename join + +--- + src/windows/views/blender_listview.py | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/windows/views/blender_listview.py b/src/windows/views/blender_listview.py +index 1db7af8a01..43e3a252be 100644 +--- a/src/windows/views/blender_listview.py ++++ b/src/windows/views/blender_listview.py +@@ -148,9 +148,12 @@ def currentChanged(self, selected, deselected): + continue + + param["values"][fileName] = "|".join( +- file.data["path"], str(file.data["height"]), +- str(file.data["width"]), file.data["media_type"], +- str(file.data["fps"]["num"] / file.data["fps"]["den"]) ++ (file.data["path"], ++ str(file.data["height"]), ++ str(file.data["width"]), ++ file.data["media_type"], ++ str(file.data["fps"]["num"] / file.data["fps"]["den"]) ++ ) + ) + + # Add normal values diff --git a/openshot.spec b/openshot.spec index c7e60b0..51d2562 100644 --- a/openshot.spec +++ b/openshot.spec @@ -3,7 +3,7 @@ Name: openshot Version: 2.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Create and edit videos and movies Group: Applications/Multimedia @@ -21,6 +21,7 @@ Patch1: openshot-rpmfusion-contact.patch # Backported fix for crashes under Python 3.9, see # https://github.com/OpenShot/openshot-qt/pull/3937/ Patch2: openshot-2.5.1-unity.patch +Patch3: https://github.com/OpenShot/openshot-qt/commit/904663c2fc481b312c845f6b11... BuildArch: noarch # libopenshot is unavailable on ppc64le, see rfbz #5528 @@ -158,7 +159,10 @@ fi %changelog -* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 2.5.1-8 +* Thu Sep 09 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2.5.1-9 +- Fix filename join (rfbz#6080) + +* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 2.5.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Tue Jun 15 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2.5.1-7