From 1459ff76309b503167ad9cd76312413f69bfa3d5 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Tue, 4 Apr 2017 20:51:25 -0300
Subject: openshot-2.3.1-1.parabola1{,.nonprism1}: updating version

---
 nonprism/openshot/PKGBUILD       | 10 +++++-----
 nonprism/openshot/nonprism.patch | 22 ++++++++++++++++------
 2 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'nonprism/openshot')

diff --git a/nonprism/openshot/PKGBUILD b/nonprism/openshot/PKGBUILD
index 391baec99..ee81545f3 100644
--- a/nonprism/openshot/PKGBUILD
+++ b/nonprism/openshot/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 208487 2017-01-23 09:47:30Z jelle $
+# $Id: PKGBUILD 220424 2017-04-03 17:11:57Z spupykin $
 # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Arch): Florian Pritz <bluewind@xinu.at>
 # Contributor (Arch): Asa Marco <marcoasa90[at]gmail[.]com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=openshot
-pkgver=2.2.0
-pkgrel=3.parabola1.nonprism1
+pkgver=2.3.1
+pkgrel=1.parabola1.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/"
@@ -22,8 +22,8 @@ replaces=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-libre-nonprism" "
 conflicts=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-libre-nonprism" "${pkgname}-nonprism")
 source=("https://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/openshot-qt-$pkgver.tar.gz"
         'nonprism.patch')
-sha256sums=('8de6e193784af3b9149ea13c0552d4556df33396452360d5f9ac30682148e6f7'
-            '4d15b46ba39aaae75037eb97e001d08e56ff668086930ecdd780d4a5e4e08232')
+sha256sums=('f3bcfb82b66cd58409acbef8b58445ae0034b07fa3593353653d1d306adf7b88'
+            '434b1b52dd873efc0bb2c15b231035e7928decdcd7b2256638fbc0d5ab6c7375')
 prepare() {
   cd "$srcdir"
   patch -Np1 -i $srcdir/nonprism.patch
diff --git a/nonprism/openshot/nonprism.patch b/nonprism/openshot/nonprism.patch
index 232ba6ccc..e6a1f07bb 100644
--- a/nonprism/openshot/nonprism.patch
+++ b/nonprism/openshot/nonprism.patch
@@ -1,8 +1,8 @@
 diff --git a/src/windows/main_window.py b/src/windows/main_window.py
-index 2e77fc2..670727f 100644
+index df9a7feb3..c69c643b1 100644
 --- a/src/windows/main_window.py
 +++ b/src/windows/main_window.py
-@@ -470,17 +470,6 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface):
+@@ -609,17 +609,6 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface):
          else:
              log.info('canceled')
  
@@ -20,10 +20,20 @@ index 2e77fc2..670727f 100644
      def actionExportVideo_trigger(self, event):
          # show window
          from windows.export import Export
-@@ -1888,4 +1877,4 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface):
-         self.tutorial_manager = TutorialManager(self)
+@@ -2241,9 +2230,6 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface):
+             self.ExportFrame.connect(self.FrameExported)
+             self.ExportEnded.connect(self.ExportFinished)
  
-         # Install event filter
+-        # 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.installEventFilter(self)
++        self.initialized = True
-- 
cgit v1.2.3