From af705a745886fbeee66906fb9e1310faa0361c49 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 20 Dec 2022 18:15:45 +1000
Subject: [PATCH] OpenShot: bump version

---
 ...hot-2.6.1.recipe => openshot-3.0.0.recipe} |  6 +--
 ...2.6.1.patchset => openshot-3.0.0.patchset} | 37 +++++++------------
 2 files changed, 17 insertions(+), 26 deletions(-)
 rename media-video/openshot/{openshot-2.6.1.recipe => openshot-3.0.0.recipe} (94%)
 rename media-video/openshot/patches/{openshot-2.6.1.patchset => openshot-3.0.0.patchset} (64%)

diff --git a/media-video/openshot/openshot-2.6.1.recipe b/media-video/openshot/openshot-3.0.0.recipe
similarity index 94%
rename from media-video/openshot/openshot-2.6.1.recipe
rename to media-video/openshot/openshot-3.0.0.recipe
index bef34285b..add8ccaa0 100644
--- a/media-video/openshot/openshot-2.6.1.recipe
+++ b/media-video/openshot/openshot-3.0.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-2021 OpenShot Studios, LLC"
+COPYRIGHT="2008-2022 OpenShot Studios, LLC"
 LICENSE="GNU GPL v3"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/OpenShot/openshot-qt/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="11651d5e7287da3c766ce6b447aef8da5cdadaf5626a2816e9025c831d0e1a66"
+CHECKSUM_SHA256="9a6b76ebb32f34722a30af0cafeea2dee1ef11daef1d7c9c73ba9b1350ea57f9"
 SOURCE_FILENAME="openshot-$portVersion.tar.gz"
 SOURCE_DIR="openshot-qt-$portVersion"
 PATCHES="openshot-$portVersion.patchset"
diff --git a/media-video/openshot/patches/openshot-2.6.1.patchset b/media-video/openshot/patches/openshot-3.0.0.patchset
similarity index 64%
rename from media-video/openshot/patches/openshot-2.6.1.patchset
rename to media-video/openshot/patches/openshot-3.0.0.patchset
index 661fcca13..057177677 100644
--- a/media-video/openshot/patches/openshot-2.6.1.patchset
+++ b/media-video/openshot/patches/openshot-3.0.0.patchset
@@ -1,11 +1,11 @@
-From 6a787fef864339fb88cbef3a513c1064cfde9ec9 Mon Sep 17 00:00:00 2001
+From 506e36a29c64eed60616003dc792a93f8ee481ba Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 4 Sep 2021 19:42:30 +1000
+Date: Tue, 20 Dec 2022 17:56:38 +1000
 Subject: classes/info: use finddir
 
 
 diff --git a/src/classes/info.py b/src/classes/info.py
-index 7724683..6926f1a 100644
+index 8c53461..534982f 100644
 --- a/src/classes/info.py
 +++ b/src/classes/info.py
 @@ -25,6 +25,7 @@
@@ -16,7 +16,7 @@ index 7724683..6926f1a 100644
  import os
  from time import strftime
  
-@@ -48,7 +49,7 @@ EXPORT_PRESETS_PATH = os.path.join(PATH, "presets")
+@@ -49,7 +50,7 @@ EXPORT_PRESETS_PATH = os.path.join(PATH, "presets")
  
  # User paths
  HOME_PATH = os.path.join(os.path.expanduser("~"))
@@ -26,29 +26,20 @@ index 7724683..6926f1a 100644
  RECOVERY_PATH = os.path.join(USER_PATH, "recovery")
  THUMBNAIL_PATH = os.path.join(USER_PATH, "thumbnail")
 -- 
-2.30.2
+2.37.3
 
 
-From 3a3ad0a2b0a600eeed8787a52ba8bb15b9c876d9 Mon Sep 17 00:00:00 2001
+From c679a2dde05afb5e5a69052678d227c9a43f4ed5 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 4 Sep 2021 19:42:45 +1000
+Date: Tue, 20 Dec 2022 17:56:49 +1000
 Subject: Use icons from theme
 
 
 diff --git a/src/windows/ui/main-window.ui b/src/windows/ui/main-window.ui
-index 99380a1..a9280c8 100644
+index c147571..491acb9 100644
 --- a/src/windows/ui/main-window.ui
 +++ b/src/windows/ui/main-window.ui
-@@ -860,7 +860,7 @@
-     <bool>true</bool>
-    </property>
-    <property name="icon">
--    <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">
-@@ -875,7 +875,7 @@
+@@ -880,7 +880,7 @@
      <bool>true</bool>
     </property>
     <property name="icon">
@@ -57,24 +48,24 @@ index 99380a1..a9280c8 100644
       <normaloff>:/icons/Humanity/actions/16/edit-cut.svg</normaloff>:/icons/Humanity/actions/16/edit-cut.svg</iconset>
     </property>
     <property name="text">
-@@ -896,7 +896,7 @@
+@@ -901,7 +901,7 @@
      <bool>true</bool>
     </property>
     <property name="icon">
 -    <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>
+      <normaloff>:/icons/Humanity/actions/custom/snap.svg</normaloff>:/icons/Humanity/actions/custom/snap.svg</iconset>
     </property>
     <property name="text">
-@@ -908,7 +908,7 @@
+@@ -913,7 +913,7 @@
    </action>
    <action name="actionAddMarker">
     <property name="icon">
 -    <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>
+      <normaloff>:/icons/actions/add_marker.svg</normaloff>:/icons/actions/add_marker.svg</iconset>
     </property>
     <property name="text">
 -- 
-2.30.2
+2.37.3