patch: use static launch path

3 files changed, 56 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 875c3a377f82..bfceaef2f336 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Feb  7 11:53:22 UTC 2018
+# Sat Feb 17 18:13:23 UTC 2018
 pkgbase = flowblade
 	pkgdesc = a multitrack non-linear video editor for Linux
 	pkgver = 1.14
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/jliljebl/flowblade
 	arch = any
 	license = GPL3
@@ -23,7 +23,9 @@ pkgbase = flowblade
 	depends = sox
 	depends = swh-plugins
 	source = https://github.com/jliljebl/flowblade/archive/v1.14.tar.gz
+	source = run_from_install.patch
 	sha256sums = 6096d6fb67ec8bb4cf422a11282bb8a38fb879ae178a1e54693870ef9ae212bf
+	sha256sums = df19be875ec78eb1a109c9206589a09f64208364ce91e5f6a3a0928dd5156b9c
 
 pkgname = flowblade
 
diff --git a/PKGBUILD b/PKGBUILD
index 3a887b4f41e5..a7322696f9b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=flowblade
 pkgver=1.14
-pkgrel=1
+pkgrel=2
 pkgdesc="a multitrack non-linear video editor for Linux"
 arch=('any')
 url="https://github.com/jliljebl/$pkgname"
@@ -22,8 +22,15 @@ depends=('dbus-glib'
          'python2-pillow'
          'sox'
          'swh-plugins')
-source=("$url/archive/v$pkgver.tar.gz")
-sha256sums=('6096d6fb67ec8bb4cf422a11282bb8a38fb879ae178a1e54693870ef9ae212bf')
+source=("$url/archive/v$pkgver.tar.gz"
+        'run_from_install.patch')
+sha256sums=('6096d6fb67ec8bb4cf422a11282bb8a38fb879ae178a1e54693870ef9ae212bf'
+            'df19be875ec78eb1a109c9206589a09f64208364ce91e5f6a3a0928dd5156b9c')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i $srcdir/run_from_install.patch
+}
 
 package() {
   cd $pkgname-$pkgver/$pkgname-trunk
diff --git a/run_from_install.patch b/run_from_install.patch
new file mode 100644
index 000000000000..2f717bdcb383
--- /dev/null
+++ b/run_from_install.patch
@@ -0,0 +1,42 @@
+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