From 991ec896f6579228f80cc6a9589af54fdf429223 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 4 Sep 2021 22:07:53 +1000
Subject: [PATCH] OpenShot: bump version

---
 ...hot-2.5.1.recipe => openshot-2.6.0.recipe} |  6 +--
 ...2.5.1.patchset => openshot-2.6.0.patchset} | 44 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)
 rename media-video/openshot/{openshot-2.5.1.recipe => openshot-2.6.0.recipe} (94%)
 rename media-video/openshot/patches/{openshot-2.5.1.patchset => openshot-2.6.0.patchset} (67%)

diff --git a/media-video/openshot/openshot-2.5.1.recipe b/media-video/openshot/openshot-2.6.0.recipe
similarity index 94%
rename from media-video/openshot/openshot-2.5.1.recipe
rename to media-video/openshot/openshot-2.6.0.recipe
index 1a162fad3..1a23e88f2 100644
--- a/media-video/openshot/openshot-2.5.1.recipe
+++ b/media-video/openshot/openshot-2.6.0.recipe
@@ -4,11 +4,11 @@ you create the film you always dreamed of. Easily add sub-titles, transitions,\
  and effects, then export your film to DVD, YouTube, Vimeo, Xbox 360, and many\
  other common formats."
 HOMEPAGE="https://www.openshot.org"
-COPYRIGHT="2008-2020 OpenShot Studios, LLC"
+COPYRIGHT="2008-2021 OpenShot Studios, LLC"
 LICENSE="GNU GPL v3"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="https://github.com/OpenShot/openshot-qt/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="4c25eb9a5de42e749de4c6ca2f7a313c60e1283fe52d70c121629dbb8bb2df7b"
+CHECKSUM_SHA256="3d637d6028cf680e634ced52de08dc22c1c603fdb3a2ede515b1b528f0b9cd97"
 SOURCE_FILENAME="openshot-$portVersion.tar.gz"
 SOURCE_DIR="openshot-qt-$portVersion"
 PATCHES="openshot-$portVersion.patchset"
diff --git a/media-video/openshot/patches/openshot-2.5.1.patchset b/media-video/openshot/patches/openshot-2.6.0.patchset
similarity index 67%
rename from media-video/openshot/patches/openshot-2.5.1.patchset
rename to media-video/openshot/patches/openshot-2.6.0.patchset
index 9ae30b176..661fcca13 100644
--- a/media-video/openshot/patches/openshot-2.5.1.patchset
+++ b/media-video/openshot/patches/openshot-2.6.0.patchset
@@ -1,11 +1,11 @@
-From 0f7ddcef06d78d73e38fe65cd5dc29acb9871cb2 Mon Sep 17 00:00:00 2001
+From 6a787fef864339fb88cbef3a513c1064cfde9ec9 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 2 May 2020 21:44:08 +1000
+Date: Sat, 4 Sep 2021 19:42:30 +1000
 Subject: classes/info: use finddir
 
 
 diff --git a/src/classes/info.py b/src/classes/info.py
-index 48fcbdf..594c643 100644
+index 7724683..6926f1a 100644
 --- a/src/classes/info.py
 +++ b/src/classes/info.py
 @@ -25,6 +25,7 @@
@@ -14,9 +14,9 @@ index 48fcbdf..594c643 100644
  
 +import subprocess
  import os
+ from time import strftime
  
- from PyQt5.QtCore import QDir
-@@ -49,7 +50,7 @@ EXPORT_PRESETS_PATH = os.path.join(PATH, "presets")
+@@ -48,7 +49,7 @@ EXPORT_PRESETS_PATH = os.path.join(PATH, "presets")
  
  # User paths
  HOME_PATH = os.path.join(os.path.expanduser("~"))
@@ -26,55 +26,55 @@ index 48fcbdf..594c643 100644
  RECOVERY_PATH = os.path.join(USER_PATH, "recovery")
  THUMBNAIL_PATH = os.path.join(USER_PATH, "thumbnail")
 -- 
-2.26.0
+2.30.2
 
 
-From 63289a7f91b8fe6c21de4fff97946c82f4425518 Mon Sep 17 00:00:00 2001
+From 3a3ad0a2b0a600eeed8787a52ba8bb15b9c876d9 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 2 May 2020 21:44:37 +1000
+Date: Sat, 4 Sep 2021 19:42:45 +1000
 Subject: Use icons from theme
 
 
 diff --git a/src/windows/ui/main-window.ui b/src/windows/ui/main-window.ui
-index 3b3c620..01d9bef 100644
+index 99380a1..a9280c8 100644
 --- a/src/windows/ui/main-window.ui
 +++ b/src/windows/ui/main-window.ui
-@@ -812,7 +812,7 @@
+@@ -860,7 +860,7 @@
      <bool>true</bool>
     </property>
     <property name="icon">
--    <iconset resource="../../images/openshot.qrc">
-+    <iconset theme="arrow" resource="../../images/openshot.qrc">
+-    <iconset resource="../../../images/openshot.qrc">
++    <iconset theme="arrow" resource="../../../images/openshot.qrc">
       <normaloff>:/icons/Humanity/actions/custom/arrow.png</normaloff>:/icons/Humanity/actions/custom/arrow.png</iconset>
     </property>
     <property name="text">
-@@ -827,7 +827,7 @@
+@@ -875,7 +875,7 @@
      <bool>true</bool>
     </property>
     <property name="icon">
--    <iconset resource="../../images/openshot.qrc">
-+    <iconset theme="edit-cut" resource="../../images/openshot.qrc">
+-    <iconset resource="../../../images/openshot.qrc">
++    <iconset theme="edit-cut" resource="../../../images/openshot.qrc">
       <normaloff>:/icons/Humanity/actions/16/edit-cut.svg</normaloff>:/icons/Humanity/actions/16/edit-cut.svg</iconset>
     </property>
     <property name="text">
-@@ -845,7 +845,7 @@
+@@ -896,7 +896,7 @@
      <bool>true</bool>
     </property>
     <property name="icon">
--    <iconset resource="../../images/openshot.qrc">
-+    <iconset theme="snap" resource="../../images/openshot.qrc">
+-    <iconset resource="../../../images/openshot.qrc">
++    <iconset theme="snap" resource="../../../images/openshot.qrc">
       <normaloff>:/icons/Humanity/actions/custom/snap.png</normaloff>:/icons/Humanity/actions/custom/snap.png</iconset>
     </property>
     <property name="text">
-@@ -857,7 +857,7 @@
+@@ -908,7 +908,7 @@
    </action>
    <action name="actionAddMarker">
     <property name="icon">
--    <iconset resource="../../images/openshot.qrc">
-+    <iconset theme="add_marker" resource="../../images/openshot.qrc">
+-    <iconset resource="../../../images/openshot.qrc">
++    <iconset theme="add_marker" resource="../../../images/openshot.qrc">
       <normaloff>:/icons/Humanity/actions/custom/add_marker.png</normaloff>:/icons/Humanity/actions/custom/add_marker.png</iconset>
     </property>
     <property name="text">
 -- 
-2.26.0
+2.30.2