upgpkg: Update dependencies and patch qltui.py import

3 files changed, 45 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0adfec5752b3..5e4a7e56d4a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-qiling-git
 	pkgdesc = An advanced binary emulation framework
-	pkgver = 1.4.4.r187.g62d89c7d
+	pkgver = 1.4.4.r268.g3e18c093
 	pkgrel = 1
 	url = https://qiling.io/
 	arch = any
@@ -17,9 +17,14 @@ pkgbase = python-qiling-git
 	depends = python-gevent
 	depends = python-multiprocess
 	depends = python-yaml
-	provides = python-qiling=1.4.4.r187.g62d89c7d
+	depends = python-fx
+	depends = python-questionary
+	depends = python-termcolor
+	provides = python-qiling=1.4.4.r268.g3e18c093
 	conflicts = python-qiling
 	source = python-qiling-git::git+https://github.com/qilingframework/qiling.git#branch=dev
+	source = 001-fix-qltui.patch
 	sha256sums = SKIP
+	sha256sums = c487e8b57c5b270e2d457a844a51e40591640ca6d9c26fb1900988f0b0c1ef9b
 
 pkgname = python-qiling-git
diff --git a/001-fix-qltui.patch b/001-fix-qltui.patch
new file mode 100644
index 000000000000..4719481512f9
--- /dev/null
+++ b/001-fix-qltui.patch
@@ -0,0 +1,17 @@
+diff --git a/qltui.py b/qiling/tui.py
+similarity index 100%
+rename from qltui.py
+rename to qiling/tui.py
+diff --git a/qltool b/qltool
+index be6a52d3..b454a932 100755
+--- a/qltool
++++ b/qltool
+@@ -229,7 +229,7 @@ if __name__ == '__main__':
+         handle_examples(parser)
+ 
+     if options.subcommand == 'qltui':
+-        import qltui
++        from qiling import tui as qltui
+         options = qltui.get_data()
+         qltui_enabled = True
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 000d8a97ec53..98fd9eee389b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: nullableVoidPtr <nullableVoidPtr _ gmail _ com>
+# Maintainer: Avery Warddhana <nullableVoidPtr+arch _ gmail>
 
 pkgname=python-qiling-git
-pkgver=1.4.4.r187.g62d89c7d
+pkgver=1.4.4.r268.g3e18c093
 pkgrel=1
 pkgdesc="An advanced binary emulation framework"
 url='https://qiling.io/'
@@ -9,28 +9,35 @@ arch=('any')
 license=('GPL2')
 depends=('python' 'python-capstone' 'python-unicorn' 'python-pefile'
          'python-registry' 'python-keystone' 'python-pyelftools'
-         'python-gevent' 'python-multiprocess' 'python-yaml')
+         'python-gevent' 'python-multiprocess' 'python-yaml'
+         'python-fx' 'python-questionary' 'python-termcolor')
 makedepends=('git' 'python-setuptools')
 provides=(${pkgname%-*}=$pkgver)
 conflicts=(${pkgname%-*})
-source=($pkgname::git+https://github.com/qilingframework/qiling.git#branch=dev)
-sha256sums=('SKIP')
+source=("$pkgname::git+https://github.com/qilingframework/qiling.git#branch=dev"
+        '001-fix-qltui.patch')
+sha256sums=('SKIP'
+            'c487e8b57c5b270e2d457a844a51e40591640ca6d9c26fb1900988f0b0c1ef9b')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
-  git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    cd "${pkgname}"
+    git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+    cd "${pkgname}"
+    patch --forward --strip=1 --input="${srcdir}/001-fix-qltui.patch"
 }
 
 build() {
-  cd "${srcdir}/${pkgname}"
-  python setup.py build
+    cd "${pkgname}"
+    python setup.py build
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
-  export PYTHONHASHSEED=0
-  python setup.py install --root="${pkgdir}" -O1 --skip-build
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+    cd "${pkgname}"
+    PYTHONHASHSEED=0 python setup.py install --root="${pkgdir}" -O1 --skip-build
+    install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
-# vim:set et sw=2 sts=2 tw=80:
+# vim:set et sw=4 sts=4: