2.4

3 files changed, 18 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8dca1ce753c3..f111b0669f3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flowblade
 	pkgdesc = a multitrack non-linear video editor for Linux
-	pkgver = 2.2
+	pkgver = 2.4
 	pkgrel = 1
 	url = https://github.com/jliljebl/flowblade
 	arch = any
@@ -11,18 +11,18 @@ pkgbase = flowblade
 	depends = gtk3
 	depends = librsvg
 	depends = mlt
-	depends = mlt-python2-bindings
 	depends = movit
-	depends = pygtk
-	depends = python2-dbus
-	depends = python2-gobject
-	depends = python2-numpy
-	depends = python2-pillow
+	depends = pygobject-devel
+	depends = python-dbus
+	depends = python-gobject
+	depends = python-mlt
+	depends = python-numpy
+	depends = python-pillow
 	depends = sdl_image
 	depends = sox
 	depends = swh-plugins
-	source = https://github.com/jliljebl/flowblade/archive/v2.2.tar.gz
-	sha256sums = 4c7bc61d2d38dbf91bbae9f835fbf82504a47d973983427264706a0596573e70
+	source = https://github.com/jliljebl/flowblade/archive/v2.4.tar.gz
+	sha256sums = 708ec92081d12f1388191fccce69643bf3a30fe6567a0037fb95c8774014472b
 
 pkgname = flowblade
 
diff --git a/PKGBUILD b/PKGBUILD
index ea5f65d194f9..2950a354172b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bernhard Landauer <oberon@manjaro.org>
 
 pkgname=flowblade
-pkgver=2.2
+pkgver=2.4
 pkgrel=1
 pkgdesc="a multitrack non-linear video editor for Linux"
 arch=('any')
@@ -13,22 +13,22 @@ depends=('dbus-glib'
          'gtk3'
          'librsvg'
          'mlt'
-         'mlt-python2-bindings'
          'movit'
-         'pygtk'
-         'python2-dbus'
-         'python2-gobject'
-         'python2-numpy'
-         'python2-pillow'
+         'pygobject-devel'
+         'python-dbus'
+         'python-gobject'
+         'python-mlt'
+         'python-numpy'
+         'python-pillow'
          'sdl_image'
          'sox'
          'swh-plugins')
 source=("$url/archive/v$pkgver.tar.gz")
-sha256sums=('4c7bc61d2d38dbf91bbae9f835fbf82504a47d973983427264706a0596573e70')
+sha256sums=('708ec92081d12f1388191fccce69643bf3a30fe6567a0037fb95c8774014472b')
 
 package() {
   cd $pkgname-$pkgver/$pkgname-trunk
-  python2 setup.py install \
+  python setup.py install \
     --root=$pkgdir \
     --install-lib=/usr/share/pyshared \
     --optimize=1
diff --git a/run_from_install.patch b/run_from_install.patch
deleted file mode 100644
index 2f717bdcb383..000000000000
--- a/run_from_install.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -rupN a/flowblade-trunk/flowblade b/flowblade-trunk/flowblade
---- a/flowblade-trunk/flowblade	2017-10-04 14:31:30.000000000 +0200
-+++ b/flowblade-trunk/flowblade	2018-02-17 18:56:31.302010091 +0100
-@@ -26,22 +26,10 @@ import sys
- print "FLOWBLADE MOVIE EDITOR 1.14"
- print "---------------------------"
- 
--
--# Get launch script dir
--launch_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
--
--print "Launch script dir:", launch_dir
--
--# Update sys.path to include modules
--if launch_dir == "/usr/bin":
--    print "Running from installation..."
--    modules_path = "/usr/share/flowblade/Flowblade"
--    if not os.path.isdir(modules_path):
--        modules_path = "/usr/share/pyshared/Flowblade"
--    print "modules path:", modules_path
--else:
--    print "Running from filesystem..."
--    modules_path = launch_dir + "/Flowblade"
-+modules_path = "/usr/share/flowblade/Flowblade"
-+if not os.path.isdir(modules_path):
-+    modules_path = "/usr/share/pyshared/Flowblade"
-+print "modules path:", modules_path
- 
- sys.path.insert(0, modules_path)
- sys.path.insert(0, modules_path + "/vieweditor")
-@@ -64,10 +52,7 @@ except Exception, err:
- try:
-     import app
-     import editorstate
--    if launch_dir == "/usr/bin":
--        editorstate.app_running_from = editorstate.RUNNING_FROM_INSTALLATION
--    else:
--        editorstate.app_running_from = editorstate.RUNNING_FROM_DEV_VERSION
-+    editorstate.app_running_from = editorstate.RUNNING_FROM_INSTALLATION
- except Exception, err:
-     print "Failed to import module app.py to launch Flowblade!"
-     print "ERROR:", err