mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-02 04:58:52 +02:00
OpenShot: bump version
This commit is contained in:
@@ -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-2019 OpenShot Studios, LLC"
|
||||
COPYRIGHT="2008-2020 OpenShot Studios, LLC"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="6"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/OpenShot/openshot-qt/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="8197923b3fff2010ee69c75469818543674a12fcb8fcb08944471e4ead3426be"
|
||||
CHECKSUM_SHA256="4c25eb9a5de42e749de4c6ca2f7a313c60e1283fe52d70c121629dbb8bb2df7b"
|
||||
SOURCE_FILENAME="openshot-$portVersion.tar.gz"
|
||||
SOURCE_DIR="openshot-qt-$portVersion"
|
||||
PATCHES="openshot-$portVersion.patchset"
|
||||
@@ -1,46 +1,45 @@
|
||||
From 2c801d768ae60f4718b44d30f8ec3830ddc31762 Mon Sep 17 00:00:00 2001
|
||||
From 0f7ddcef06d78d73e38fe65cd5dc29acb9871cb2 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 6 Oct 2018 12:15:40 +1000
|
||||
Date: Sat, 2 May 2020 21:44:08 +1000
|
||||
Subject: classes/info: use finddir
|
||||
|
||||
|
||||
diff --git a/src/classes/info.py b/src/classes/info.py
|
||||
index 85acdb1..1e59702 100644
|
||||
index 48fcbdf..594c643 100644
|
||||
--- a/src/classes/info.py
|
||||
+++ b/src/classes/info.py
|
||||
@@ -24,7 +24,7 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
@@ -25,6 +25,7 @@
|
||||
along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
|
||||
"""
|
||||
-
|
||||
|
||||
+import subprocess
|
||||
import os
|
||||
|
||||
from PyQt5.QtCore import QDir
|
||||
@@ -41,7 +41,7 @@ COPYRIGHT = "Copyright (c) 2008-2018 %s" % COMPANY_NAME
|
||||
CWD = os.getcwd()
|
||||
PATH = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) # Primary openshot folder
|
||||
@@ -49,7 +50,7 @@ EXPORT_PRESETS_PATH = os.path.join(PATH, "presets")
|
||||
|
||||
# User paths
|
||||
HOME_PATH = os.path.join(os.path.expanduser("~"))
|
||||
-USER_PATH = os.path.join(HOME_PATH, ".openshot_qt")
|
||||
+USER_PATH = os.path.join(subprocess.run(["finddir", "B_USER_VAR_DIRECTORY"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True, errors="strict").stdout.strip(), "openshot_qt")
|
||||
BACKUP_PATH = os.path.join(USER_PATH, "backup")
|
||||
BLENDER_PATH = os.path.join(USER_PATH, "blender")
|
||||
ASSETS_PATH = os.path.join(USER_PATH, "assets")
|
||||
BACKUP_PATH = os.path.join(USER_PATH)
|
||||
RECOVERY_PATH = os.path.join(USER_PATH, "recovery")
|
||||
THUMBNAIL_PATH = os.path.join(USER_PATH, "thumbnail")
|
||||
--
|
||||
2.23.0
|
||||
2.26.0
|
||||
|
||||
|
||||
From 2112ac5e1e8e7f33c8307d2b6c81b36cef750866 Mon Sep 17 00:00:00 2001
|
||||
From 63289a7f91b8fe6c21de4fff97946c82f4425518 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 12 Oct 2019 22:39:25 +1000
|
||||
Date: Sat, 2 May 2020 21:44:37 +1000
|
||||
Subject: Use icons from theme
|
||||
|
||||
|
||||
diff --git a/src/windows/ui/main-window.ui b/src/windows/ui/main-window.ui
|
||||
index 22a3c0a..9a49141 100644
|
||||
index 3b3c620..01d9bef 100644
|
||||
--- a/src/windows/ui/main-window.ui
|
||||
+++ b/src/windows/ui/main-window.ui
|
||||
@@ -784,7 +784,7 @@
|
||||
@@ -812,7 +812,7 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
@@ -49,7 +48,7 @@ index 22a3c0a..9a49141 100644
|
||||
<normaloff>:/icons/Humanity/actions/custom/arrow.png</normaloff>:/icons/Humanity/actions/custom/arrow.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
@@ -799,7 +799,7 @@
|
||||
@@ -827,7 +827,7 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
@@ -58,7 +57,7 @@ index 22a3c0a..9a49141 100644
|
||||
<normaloff>:/icons/Humanity/actions/16/edit-cut.svg</normaloff>:/icons/Humanity/actions/16/edit-cut.svg</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
@@ -817,7 +817,7 @@
|
||||
@@ -845,7 +845,7 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
@@ -67,7 +66,7 @@ index 22a3c0a..9a49141 100644
|
||||
<normaloff>:/icons/Humanity/actions/custom/snap.png</normaloff>:/icons/Humanity/actions/custom/snap.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
@@ -829,7 +829,7 @@
|
||||
@@ -857,7 +857,7 @@
|
||||
</action>
|
||||
<action name="actionAddMarker">
|
||||
<property name="icon">
|
||||
@@ -77,5 +76,5 @@ index 22a3c0a..9a49141 100644
|
||||
</property>
|
||||
<property name="text">
|
||||
--
|
||||
2.23.0
|
||||
2.26.0
|
||||
|
||||
Reference in New Issue
Block a user