From: Matti Picus <matti.picus@gmail.com>
Date: Fri, 7 Feb 2025 08:18:14 +1100
Subject: fix sqlite3_serialize argument type,
 remove deprecated sqlite3_trace interface

Bug-Upstream: https://github.com/pypy/pypy/issues/5194
Origin: upstream, https://github.com/pypy/pypy/commit/634a0b37b1fd9e7554309eca46d9459a396393e3 https://github.com/pypy/pypy/commit/9031a0d591b40b91e975c547279cb09f8915e837
---
 lib_pypy/_sqlite3.py       | 2 +-
 lib_pypy/_sqlite3_build.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
index d3e4115..d14ba38 100644
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -1192,7 +1192,7 @@ class Connection(object):
             """
             encname = name.encode('utf-8')
             flags = _lib.SQLITE_SERIALIZE_NOCOPY
-            sizemem = _ffi.new('int64_t *')
+            sizemem = _ffi.new('sqlite_int64 *')
             data = _lib.sqlite3_serialize(self._db, encname, sizemem, flags)
             if data:
                 return bytes(_ffi.buffer(data, sizemem[0]))
diff --git a/lib_pypy/_sqlite3_build.py b/lib_pypy/_sqlite3_build.py
index f4c8e70..2a4e573 100644
--- a/lib_pypy/_sqlite3_build.py
+++ b/lib_pypy/_sqlite3_build.py
@@ -168,8 +168,8 @@ typedef ... sqlite3;
 typedef ... sqlite3_stmt;
 typedef ... sqlite3_context;
 typedef ... sqlite3_value;
-typedef int64_t sqlite3_int64;
-typedef uint64_t sqlite3_uint64;
+typedef long long int sqlite3_int64;
+typedef unsigned long long int sqlite3_uint64;
 
 int sqlite3_open(
     const char *filename,   /* Database filename (UTF-8) */
@@ -226,7 +226,6 @@ int sqlite3_column_type(sqlite3_stmt*, int iCol);
 const char *sqlite3_column_decltype(sqlite3_stmt*,int);
 
 void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
-void sqlite3_trace(sqlite3*, void(*)(void*, const char*), void*);
 int sqlite3_trace_v2(
   sqlite3*,
   unsigned uMask,
