From b0f7eb5988b6db378ea4f46bd97cca08fc62e281 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 16 Nov 2024 09:27:36 -0500
Subject: [PATCH] pyliblo: rebuild for python3-3.13

---
 srcpkgs/pyliblo/patches/cython3.patch     | 32 +++++++++++++++++++++++
 srcpkgs/pyliblo/patches/python-3.11.patch | 19 ++++++++++++++
 srcpkgs/pyliblo/template                  |  8 ++++--
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pyliblo/patches/cython3.patch
 create mode 100644 srcpkgs/pyliblo/patches/python-3.11.patch

diff --git a/srcpkgs/pyliblo/patches/cython3.patch b/srcpkgs/pyliblo/patches/cython3.patch
new file mode 100644
index 00000000000..6f01930e175
--- /dev/null
+++ b/srcpkgs/pyliblo/patches/cython3.patch
@@ -0,0 +1,32 @@
+Taken from
+
+  https://gitlab.archlinux.org/archlinux/packaging/packages/python-pyliblo
+
+diff -urN pyliblo-0.10.0-orig/src/liblo.pxd pyliblo-0.10.0/src/liblo.pxd
+--- pyliblo-0.10.0-orig/src/liblo.pxd	2015-03-14 23:32:24.000000000 -0300
++++ pyliblo-0.10.0/src/liblo.pxd	2023-08-02 04:17:47.601508337 -0400
+@@ -53,20 +53,20 @@
+     int lo_send_bundle_from(lo_address targ, lo_server serv, lo_bundle b)
+ 
+     # server
+-    lo_server lo_server_new_with_proto(char *port, int proto, lo_err_handler err_h)
++    lo_server lo_server_new_with_proto(char *port, int proto, void(*err_h)(int num, const_char *msg, const_char *where) except * nogil)
+     void lo_server_free(lo_server s)
+     char *lo_server_get_url(lo_server s)
+     int lo_server_get_port(lo_server s)
+     int lo_server_get_protocol(lo_server s)
+-    lo_method lo_server_add_method(lo_server s, char *path, char *typespec, lo_method_handler h, void *user_data)
++    lo_method lo_server_add_method(lo_server s, char *path, char *typespec, int(*h)(const_char *path, const_char *types, lo_arg **argv, int argc, lo_message msg, void *user_data) except?-1 nogil, void *user_data)
+     void lo_server_del_method(lo_server s, char *path, char *typespec)
+-    int lo_server_add_bundle_handlers(lo_server s, lo_bundle_start_handler sh, lo_bundle_end_handler eh, void *user_data)
++    int lo_server_add_bundle_handlers(lo_server s, int(*sh)(lo_timetag time, void *user_data) except?-1 nogil , int(*eh)(void *user_data) except?-1 nogil, void *user_data)
+     int lo_server_recv(lo_server s) nogil
+     int lo_server_recv_noblock(lo_server s, int timeout) nogil
+     int lo_server_get_socket_fd(lo_server s)
+ 
+     # server thread
+-    lo_server_thread lo_server_thread_new_with_proto(char *port, int proto, lo_err_handler err_h)
++    lo_server_thread lo_server_thread_new_with_proto(char *port, int proto, void(*err_h)(int num, const_char *msg, const_char *where) except * nogil)
+     void lo_server_thread_free(lo_server_thread st)
+     lo_server lo_server_thread_get_server(lo_server_thread st)
+     void lo_server_thread_start(lo_server_thread st)
diff --git a/srcpkgs/pyliblo/patches/python-3.11.patch b/srcpkgs/pyliblo/patches/python-3.11.patch
new file mode 100644
index 00000000000..b8bdbb8397d
--- /dev/null
+++ b/srcpkgs/pyliblo/patches/python-3.11.patch
@@ -0,0 +1,19 @@
+Taken from
+
+  https://gitlab.archlinux.org/archlinux/packaging/packages/python-pyliblo
+
+diff -ruN a/src/liblo.pyx b/src/liblo.pyx
+--- a/src/liblo.pyx	2015-04-14 09:02:22.000000000 +0200
++++ b/src/liblo.pyx	2023-04-06 19:51:56.042679208 +0200
+@@ -258,9 +258,9 @@
+                  cb.user_data)
+ 
+     # call function
+-    if _inspect.getargspec(func)[1] == None:
++    if _inspect.getfullargspec(func)[1] == None:
+         # determine number of arguments to call the function with
+-        n = len(_inspect.getargspec(func)[0])
++        n = len(_inspect.getfullargspec(func)[0])
+         if _inspect.ismethod(func):
+             n -= 1  # self doesn't count
+         r = cb.func(*func_args[0:n])
diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template
index 44b0efdb283..9c823e9e109 100644
--- a/srcpkgs/pyliblo/template
+++ b/srcpkgs/pyliblo/template
@@ -1,9 +1,9 @@
 # Template file for 'pyliblo'
 pkgname=pyliblo
 version=0.10.0
-revision=4
+revision=5
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython0.29"
+hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel liblo-devel"
 depends="python3"
 short_desc="Python bindings for the liblo OSC library"
@@ -13,3 +13,7 @@ homepage="http://das.nasophon.de/pyliblo/"
 distfiles="${PYPI_SITE}/p/pyliblo/pyliblo-${version}.tar.gz"
 checksum=fc67f1950b827272b00f9f0dc4ed7113c0ccef0c1c09e9976dead40ebbf1798f
 make_check=ci-skip # fails "test.test_liblo.ServerCreationTestCase" due to root
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" python3 ./test/test_liblo.py
+}