upgpkg: mlat-client-git 0.2.12.r0.g16924db-2

Added patch to fix function name change in Python 3.11

3 files changed, 49 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a094816c8a1a..2a0b5b6e912f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mlat-client-git
 	pkgdesc = Mode S multilateration client by Mutability
 	pkgver = 0.2.12.r0.g16924db
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/mutability/mlat-client
 	changelog = mlat-client-git.changelog
 	arch = i686
@@ -17,6 +17,10 @@ pkgbase = mlat-client-git
 	conflicts = mlat-client
 	conflicts = fa-mlat-client
 	source = mlat-client::git+https://github.com/mutability/mlat-client.git#branch=dev
-	md5sums = SKIP
+	source = python-function-names.patch
+	sha256sums = SKIP
+	sha256sums = c3645a1535418c1c0b083f101c07b8243c1ac947e21f07a501c868d95c3bf43c
+	b2sums = SKIP
+	b2sums = 123f866478b0100dce0efbca8db88a302ddc50aedf82153da6aa097874f6319908eceb1edb274f16edc8c6f09a51d56800d687c44aaf57dda2b698f4885e2a14
 
 pkgname = mlat-client-git
diff --git a/PKGBUILD b/PKGBUILD
index ca67e22ab220..0313c4df944d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=mlat-client-git
 pkgver=0.2.12.r0.g16924db
-pkgrel=1
+pkgrel=2
 pkgdesc="Mode S multilateration client by Mutability"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 url="https://github.com/mutability/${pkgname%-git}"
@@ -15,14 +15,23 @@ makedepends=('git')
 provides=("${pkgname%-git}" "fa-${pkgname%-git}")
 conflicts=("${pkgname%-git}" "fa-${pkgname%-git}")
 changelog="$pkgname.changelog"
-source=("${pkgname%-git}::git+$url.git#branch=dev")
-md5sums=('SKIP')
+source=("${pkgname%-git}::git+$url.git#branch=dev"
+        "python-function-names.patch")
+sha256sums=('SKIP'
+            'c3645a1535418c1c0b083f101c07b8243c1ac947e21f07a501c868d95c3bf43c')
+b2sums=('SKIP'
+        '123f866478b0100dce0efbca8db88a302ddc50aedf82153da6aa097874f6319908eceb1edb274f16edc8c6f09a51d56800d687c44aaf57dda2b698f4885e2a14')
 
 pkgver() {
   cd "${pkgname%-git}"
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+  cd "${pkgname%-git}"
+  patch --forward --strip=1 --input="${srcdir}/python-function-names.patch"
+}
+
 build() {
   cd "${pkgname%-git}"
   ./setup.py build
diff --git a/python-function-names.patch b/python-function-names.patch
new file mode 100644
index 000000000000..d8b3b1cb3757
--- /dev/null
+++ b/python-function-names.patch
@@ -0,0 +1,31 @@
+diff --unified --recursive --text mlat-client/modes_reader.c mlat-client.new/modes_reader.c
+--- mlat-client/modes_reader.c	2023-07-29 19:28:28.326973012 -0600
++++ mlat-client.new/modes_reader.c	2023-07-29 19:34:48.801995009 -0600
+@@ -503,6 +503,19 @@
+ {
+     float lat, lon, alt;
+
++#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >=11
++    lat = PyFloat_Unpack4(data + 4, 1);
++    if (lat == -1.0 && PyErr_Occurred())
++        return NULL;
++
++    lon = PyFloat_Unpack4(data + 8, 1);
++    if (lon == -1.0 && PyErr_Occurred())
++        return NULL;
++
++    alt = PyFloat_Unpack4(data + 12, 1);
++    if (alt == -1.0 && PyErr_Occurred())
++        return NULL;
++#else
+     lat = _PyFloat_Unpack4(data + 4, 1);
+     if (lat == -1.0 && PyErr_Occurred())
+         return NULL;
+@@ -514,6 +527,7 @@
+     alt = _PyFloat_Unpack4(data + 12, 1);
+     if (alt == -1.0 && PyErr_Occurred())
+         return NULL;
++#endif
+
+     return Py_BuildValue("{s:f,s:f,s:f}",
+                          "lat", lat,