From a2101c2baf6fdd0a77e59c770212711db4cc3bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 10 Oct 2020 06:25:51 +0700
Subject: [PATCH] flowblade: support usr merge

---
 srcpkgs/flowblade/patches/usr-merge.patch | 13 +++++++++++++
 srcpkgs/flowblade/template                |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/flowblade/patches/usr-merge.patch

diff --git a/srcpkgs/flowblade/patches/usr-merge.patch b/srcpkgs/flowblade/patches/usr-merge.patch
new file mode 100644
index 00000000000..595d5574fa9
--- /dev/null
+++ b/srcpkgs/flowblade/patches/usr-merge.patch
@@ -0,0 +1,13 @@
+diff --git flowblade-trunk/flowblade flowblade-trunk/flowblade
+index faeba629..9acad76e 100755
+--- flowblade-trunk/flowblade
++++ flowblade-trunk/flowblade
+@@ -34,7 +34,7 @@ print ("Launch script dir:", launch_dir)
+ 
+ # Update sys.path to include modules.
+ # When running on distro.
+-if launch_dir == "/usr/bin":
++if os.path.realpath(launch_dir) == "/usr/bin":
+     print ("Running from installation...")
+     modules_path = "/usr/share/flowblade/Flowblade"
+     if not os.path.isdir(modules_path):
diff --git a/srcpkgs/flowblade/template b/srcpkgs/flowblade/template
index d207c39684c..1a12e6efa77 100644
--- a/srcpkgs/flowblade/template
+++ b/srcpkgs/flowblade/template
@@ -1,7 +1,7 @@
 # Template file for 'flowblade'
 pkgname=flowblade
 version=2.6
-revision=1
+revision=2
 build_wrksrc=flowblade-trunk
 build_style=python3-module
 make_install_args="--install-lib=${DESTDIR}/usr/share/pyshared"