fix v0.15: install bin/*.py under /usr/bin, and patched *.el to use executable under /usr/bin

3 files changed, 33 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 869c5fee755f..1b1883af658d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,6 +7,7 @@ pkgbase = emacs-flycheck-pycheckers
 	license = GPL
 	depends = emacs
 	depends = flycheck
+	depends = python<3.12
 	optdepends = python-pylint: pylint checker
 	optdepends = flake8: flake8 checker
 	optdepends = autopep8: pep8 checker
diff --git a/PKGBUILD b/PKGBUILD
index 730f01d0e298..1ddb7126c526 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,6 +11,9 @@ arch=(any)
 depends=(
     emacs
     flycheck
+    'python<3.12' 		# depend on distutils, deprecated in
+				# 3.10, removed in 3.12. Ref:
+				# https://www.python.org/dev/peps/pep-0632/
 )
 optdepends=(
     'python-pylint: pylint checker'
@@ -21,11 +24,20 @@ optdepends=(
     'bandit: bandit checker'
 )
 
-source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
-sha512sums=('74bf24f228167f7fafa4d3beacf7b7a226468029d8667b8b9a5fdb496cfb34587fc499a30b596c641b23adbb12ac1507be115eedc27b6b1e78a9c8609a3b33e4')
-b2sums=('7fc54c35bf71a63bcb9640f1e46303c9e070c1eb66c0644edf7f9183ad5f546df82ef2038a57c6a041ac0aa0d78cef432364e6223e3c57f8aa1935631b2b5cab')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
+       'fix-pychecker-executable-path.patch')
+sha512sums=('74bf24f228167f7fafa4d3beacf7b7a226468029d8667b8b9a5fdb496cfb34587fc499a30b596c641b23adbb12ac1507be115eedc27b6b1e78a9c8609a3b33e4'
+            '5f82a5eb963e8b66daa8bfab04e9619fd850e716fea63652a2fe8bc0382114c20b8421a8055518bce11f521fd5d40cad20885536b7f7c15d30b8d4ea65963200')
+b2sums=('7fc54c35bf71a63bcb9640f1e46303c9e070c1eb66c0644edf7f9183ad5f546df82ef2038a57c6a041ac0aa0d78cef432364e6223e3c57f8aa1935631b2b5cab'
+        '779ed5d117e408bb9b0cdf5df6347983d4a3abc424a95b0347ed1fb688edeb667b4462445523342aa6c67d032e3feb1d7734d4b60d92d6a388e77c00f13de9a6')
 
 CD_DIR="$_pkgname-$pkgver"
+prepare() {
+    cd "$srcdir"
+    # patch the files
+    patch -p1 < "${source[1]}"
+}
+
 build() {
     # byte-compile all *.el files
     cd "$srcdir/$CD_DIR"
@@ -46,6 +58,11 @@ package() {
 	    -t "$pkgdir/usr/share/emacs/site-lisp/"
     # doc files
 
+    # install executable file
+    install -Dm0755 \
+	    bin/pycheckers.py \
+	    "$pkgdir/usr/bin/pycheckers"
+    
     ## there are two files under /docs, a GIF and a PNG, won't install
     ## them here
     install -Dm0644 \
diff --git a/fix-pychecker-executable-path.patch b/fix-pychecker-executable-path.patch
new file mode 100644
index 000000000000..76c157597121
--- /dev/null
+++ b/fix-pychecker-executable-path.patch
@@ -0,0 +1,12 @@
+--- src/flycheck-pycheckers-0.15/flycheck-pycheckers.el		2020-07-04 00:33:57.000000000 -0400
++++ src/flycheck-pycheckers-0.15/flycheck-pycheckers.el.new	2021-08-24 23:30:30.133148284 -0400
+@@ -163,8 +163,7 @@
+ (require 'flycheck)
+ 
+ (defvar flycheck-pycheckers-command
+-  (executable-find (concat (file-name-directory (or load-file-name buffer-file-name))
+-                           "bin/pycheckers.py")))
++  (executable-find "/usr/bin/pycheckers"))
+ 
+ (flycheck-def-args-var flycheck-pycheckers-args python-pycheckers
+   )