Switch package to use barracuda-fsh/pyobd

5 files changed, 51 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6bf94697450b..ecf43e9a0c81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,24 @@
 pkgbase = pyobd
 	pkgdesc = An OBD-II compliant car diagnostic tool
-	pkgver = 0.9.3
-	pkgrel = 3
-	url = http://www.obdtester.com/pyobd
+	pkgver = 1.12
+	pkgrel = 1
+	url = https://github.com/barracuda-fsh/pyobd
 	install = pyobd.install
 	arch = any
 	license = GPL
-	depends = wxpython
-	depends = python2-pyserial
+	depends = python-wxpython
+	depends = python-pyserial
+	depends = python-numpy
+	depends = python-tornado
+	depends = python-pint
 	depends = hicolor-icon-theme
-	source = http://www.obdtester.com/download/pyobd_0.9.3.tar.gz
-	source = fix-configure-dialog.patch
+	source = https://github.com/barracuda-fsh/pyobd/archive/refs/tags/v1.12.tar.gz
+	source = pyobd
+	source = pyobd.desktop
 	source = pyobd.png
-	sha256sums = f3004db4000e2bc166aae3b4342c98aa62f74f3372c5829472af0ee56c5e110c
-	sha256sums = 7537ba8401e1c6dcdad8ffcbb037b9042e10cf957834f83417c60ca0fd2ae14f
+	sha256sums = 43a61c06b2fc9c6f44f0149f6a6d71cd60226af8b2c6056cef209c901eec6236
+	sha256sums = 78399115ad17dedfaf6d0391e8bc5cf11575b0dcab4beff8103bbabe094d998f
+	sha256sums = c305544cf5b42cfaa8cba20143e8cf8900c9018cd91114c409d50a6bab993024
 	sha256sums = 14d0d90dcda38c339dc8397f004923075f6d4fce37b7c8539021f4a77b3a86fd
 
 pkgname = pyobd
diff --git a/PKGBUILD b/PKGBUILD
index 4c3893d283c3..abc99525b1d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,35 @@
 # Maintainer: Presence <dan465 at mail dot com>
 
 pkgname=pyobd
-pkgver=0.9.3
-pkgrel=3
+pkgver=1.12
+pkgrel=1
 pkgdesc="An OBD-II compliant car diagnostic tool"
 arch=('any')
-url="http://www.obdtester.com/pyobd"
+url="https://github.com/barracuda-fsh/pyobd"
 license=('GPL')
-depends=('wxpython' 'python2-pyserial' 'hicolor-icon-theme')
+depends=('python-wxpython' 'python-pyserial' 'python-numpy' 'python-tornado' 'python-pint' 'hicolor-icon-theme')
 install=pyobd.install
-source=(http://www.obdtester.com/download/${pkgname}_${pkgver}.tar.gz
-        fix-configure-dialog.patch
+source=(https://github.com/barracuda-fsh/pyobd/archive/refs/tags/v${pkgver}.tar.gz
+        pyobd
+        pyobd.desktop
         pyobd.png)
-sha256sums=('f3004db4000e2bc166aae3b4342c98aa62f74f3372c5829472af0ee56c5e110c'
-            '7537ba8401e1c6dcdad8ffcbb037b9042e10cf957834f83417c60ca0fd2ae14f'
+sha256sums=('43a61c06b2fc9c6f44f0149f6a6d71cd60226af8b2c6056cef209c901eec6236'
+            '78399115ad17dedfaf6d0391e8bc5cf11575b0dcab4beff8103bbabe094d998f'
+            'c305544cf5b42cfaa8cba20143e8cf8900c9018cd91114c409d50a6bab993024'
             '14d0d90dcda38c339dc8397f004923075f6d4fce37b7c8539021f4a77b3a86fd')
 
-prepare() {
-	cd "$srcdir/${pkgname}-${pkgver}"
-
-	#Fix desktop file
-	sed -i -e "s#/usr/share/pyobd/pyobd.gif#$pkgname#" \
-		-e "s#python /usr/bin/pyobd#$pkgname#" \
-		-e "s#Name=pyOBD: OBD2 Diagnostics#Name=pyOBD\nGenericName=OBD2 Diagnostics#" \
-                -e "s#UTF8#UTF-8#" \
-		"pyobd.desktop"
-
-    #Fix configure dialog
-    patch -Np1 -i "$srcdir/fix-configure-dialog.patch"
-
-	#Set executable to run with python2
-	sed -i "s%#!/usr/bin/env python%#!/usr/bin/python2%" "pyobd"
-}
-
 package() {
-	cd "$srcdir/${pkgname}-${pkgver}"
-
-	install -Dm644 "pyobd.desktop"      "$pkgdir/usr/share/applications/$pkgname.desktop"
-	install -Dm644 "$srcdir/pyobd.png"  "$pkgdir/usr/share/icons/hicolor/32x32/apps/$pkgname.png"
-	install -Dm644 "COPYING"            "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-	install -Dm755 "pyobd"              "$pkgdir/usr/lib/$pkgname/pyobd"
-	install -m644 -t "$pkgdir/usr/lib/$pkgname/" *.py{,c}
-
-	mkdir -p "$pkgdir/usr/bin/"
-	ln -sf "../lib/$pkgname/pyobd" "$pkgdir/usr/bin/$pkgname"
+    cd "$srcdir/${pkgname}-${pkgver}"
+
+    install -Dm644 "$srcdir/pyobd.desktop"  "$pkgdir/usr/share/applications/$pkgname.desktop"
+    install -Dm644 "$srcdir/pyobd.png"      "$pkgdir/usr/share/icons/hicolor/32x32/apps/$pkgname.png"
+    install -Dm644 "COPYING"                "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+    install -Dm644 "pyobd.ico"              "$pkgdir/usr/lib/$pkgname/pyobd.ico"
+    install -Dm755 "$srcdir/pyobd"          "$pkgdir/usr/bin/pyobd"
+
+    mkdir -p "$pkgdir/usr/lib/$pkgname/obd/protocols/"
+    install -m644 -t "$pkgdir/usr/lib/$pkgname/" *.py
+    install -m644 -t "$pkgdir/usr/lib/$pkgname/obd/" obd/*.py
+    install -m644 -t "$pkgdir/usr/lib/$pkgname/obd/protocols/" obd/protocols/*.py
 }
 
diff --git a/fix-configure-dialog.patch b/fix-configure-dialog.patch
deleted file mode 100644
index b2ce260ded4f..000000000000
--- a/fix-configure-dialog.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-*** pyobd-0.9.3/pyobd.orig	2016-08-15 22:12:28.654786498 -0400
---- pyobd-0.9.3/pyobd	2016-08-15 22:12:36.304877524 -0400
-***************
-*** 593,605 ****
-          """scan for available ports. return a list of serial names"""
-          available = []
-          for i in range(256):
--           try: #scan standart ttyS*
--             s = serial.Serial(i)
--             available.append(s.portstr)
--             s.close()   # explicit close 'cause of delayed GC in java
--           except serial.SerialException:
--             pass
--         for i in range(256):
-            try: #scan USB ttyACM
-              s = serial.Serial("/dev/ttyACM"+str(i))
-              available.append(s.portstr)
---- 593,598 ----
diff --git a/pyobd b/pyobd
new file mode 100644
index 000000000000..58ac32e8ffde
--- /dev/null
+++ b/pyobd
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /usr/lib/pyobd
+python3 pyobd.py
diff --git a/pyobd.desktop b/pyobd.desktop
new file mode 100644
index 000000000000..eb77cfed2de6
--- /dev/null
+++ b/pyobd.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]

+Encoding=UTF-8

+Icon=pyobd

+Name=pyOBD

+GenericName=OBD2 Diagnostics

+Comment=Car On-Board 2 vehicle diagnostics (ELM-32x compatible interface)

+Exec=python /usr/bin/pyobd

+Terminal=false

+Type=Application

+Categories=Utility;

+StartupNotify=true