From 04dbf8a63a936939f2fc9c6d8beed95d8ce01f11 Mon Sep 17 00:00:00 2001
From: Freemor <freemor@freemor.ca>
Date: Sat, 9 Feb 2019 09:51:03 -0400
Subject: Bring [nonprism/openshot] current. Fixes #2167

---
 nonprism/openshot/PKGBUILD       | 18 +++++++++++-------
 nonprism/openshot/nonprism.patch | 17 -----------------
 2 files changed, 11 insertions(+), 24 deletions(-)

(limited to 'nonprism')

diff --git a/nonprism/openshot/PKGBUILD b/nonprism/openshot/PKGBUILD
index 2fbda5801..e10e2bada 100644
--- a/nonprism/openshot/PKGBUILD
+++ b/nonprism/openshot/PKGBUILD
@@ -11,11 +11,12 @@
 #  - neuter google analytics and exception tracking as it all happens over http
 
 pkgname=openshot
-pkgver=2.4.1
-pkgrel=1.nonprism3
+pkgver=2.4.3
+pkgrel=1
+pkgrel+=.nonprism1
 pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation and Youtube uploader support"
 arch=('any')
-url="http://www.openshotvideo.com/"
+url="http://www.openshot.org/"
 license=('GPL')
 depends=('mlt-python-bindings' 'sdl' 'librsvg' 'mplayer'
 	 'pyxdg' 'python-pyqt5' 'python-httplib2' 'python-pillow' 'dvgrab'
@@ -23,14 +24,17 @@ depends=('mlt-python-bindings' 'sdl' 'librsvg' 'mplayer'
 	 'libopenshot' 'python-pyzmq' 'qt5-webkit' 'python-setuptools'
          'python-requests')
 optdepends=('frei0r-plugins: effects'
-	    'libquicktime' 'libavc1394' 'jack' 'jack-rack')
+	    'libquicktime' 'libavc1394' 'jack')
 makedepends=('python-setuptools')
+
+
 source=("$pkgname-$pkgver.tar.gz::https://github.com/OpenShot/openshot-qt/archive/v$pkgver.tar.gz"
         'nonprism.patch'
 	'neuter_tracking.patch')
-sha256sums=('da388c08cd94ec503a57756871244d9bb8746973807e2f95618a0d9d5e11fae9'
-            '434b1b52dd873efc0bb2c15b231035e7928decdcd7b2256638fbc0d5ab6c7375'
-            'dc457fac8fdef5a120fe83661ff72bc8bf31ae92ffc503e0439a0d2d10171486')
+
+sha256sums=('901b485c28cfcbb4d1baf3cd6a30b165090c49c96f252236f1bbd8c8ab709721'
+            '31b78e88c83bba0ff469afdbbdc36577ca64a55640e4220e9a88ccf0c7f105dc'
+            '3990bdf10f46cd5255d01b0b113fe10e3ffed16da0577dfcaad470edd016aef9')
 
 prepare() {
   cd "$srcdir"/openshot-qt-$pkgver
diff --git a/nonprism/openshot/nonprism.patch b/nonprism/openshot/nonprism.patch
index e6a1f07bb..969db2445 100644
--- a/nonprism/openshot/nonprism.patch
+++ b/nonprism/openshot/nonprism.patch
@@ -20,20 +20,3 @@ index df9a7feb3..c69c643b1 100644
      def actionExportVideo_trigger(self, event):
          # show window
          from windows.export import Export
-@@ -2241,9 +2230,6 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface):
-             self.ExportFrame.connect(self.FrameExported)
-             self.ExportEnded.connect(self.ExportFinished)
- 
--        # Install event filter
--        self.installEventFilter(self)
--
-         # Save settings
-         s.save()
- 
-@@ -2251,4 +2237,4 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface):
-         QTimer.singleShot(100, self.refreshFrameSignal.emit)
- 
-         # Main window is initialized
--        self.initialized = True
-\ No newline at end of file
-+        self.initialized = True
-- 
cgit v1.2.2