diff --git a/srcpkgs/flowblade/patches/usr-merge.patch b/srcpkgs/flowblade/patches/usr-merge.patch deleted file mode 100644 index 595d5574fa9..00000000000 --- a/srcpkgs/flowblade/patches/usr-merge.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 1bcf9e8ced2..74a7820aee8 100644 --- a/srcpkgs/flowblade/template +++ b/srcpkgs/flowblade/template @@ -1,10 +1,10 @@ # Template file for 'flowblade' pkgname=flowblade -version=2.6.3 +version=2.8 revision=1 build_wrksrc=flowblade-trunk build_style=python3-module -make_install_args="--install-lib=${DESTDIR}/usr/share/pyshared" +make_install_args="--install-lib=${DESTDIR}/usr/share/flowblade" hostmakedepends="python3-setuptools" # https://github.com/jliljebl/flowblade/blob/master/flowblade-trunk/docs/DEPENDENCIES.md depends="frei0r-plugins gmic mlt-python3 python3-Pillow python3-dbus gtk+3 @@ -14,4 +14,4 @@ maintainer="shizonic " license="GPL-3.0-or-later" homepage="https://jliljebl.github.io/flowblade/" distfiles="https://github.com/jliljebl/flowblade/archive/v${version}.tar.gz" -checksum=e36d9f3c341e87bc5e6810f7d16304f3c4cb4161557e5da455f74eda59f52e1b +checksum=0a06d31ed148087b49dadcce775b395cd89586e05d306834d02f219c450b8125