Update the pyodbc version to patch to 5.3.0

Author: peytondmurray

.gitignore

@@ -1,11 +1,7 @@
 # Meson
-subprojects/*
-!subprojects/*.wrap
-!subprojects/packagefiles
 build/
-subprojects/packagefiles/patches/*.h
-subprojects/packagefiles/patches/*.cpp
-subprojects/packagefiles/patches/*.toml
+subprojects/pyodbc/
+subprojects/.wraplock
 
 # Python
 __pycache__/

include/npcontainer.h

@@ -2,6 +2,11 @@
 #define _NPCONTAINER_H_
 
 #include <Python.h>
+#include "pyodbc.h"
+#include "wrapper.h"
+#include "textenc.h"
+#include "connection.h"
+#include "cursor.h"
 
 PyObject *Cursor_fetchdictarray(PyObject *self, PyObject *args, PyObject *kwargs);
 

meson.build

@@ -29,7 +29,14 @@ npyodbc_sources = [
   'src/npyodbcmodule.cpp'
 ]
 
-add_project_arguments('-DPYODBC_VERSION=' + meson.project_version(), language: 'cpp')
+add_project_arguments(
+  [
+    '-DPYODBC_VERSION=' + meson.project_version(),
+    '-Wno-write-strings',
+    '-Wno-deprecated-declarations',
+  ],
+  language: 'cpp'
+)
 
 # Build the npyodbc module
 python.extension_module(
@@ -44,4 +51,6 @@ python.extension_module(
   ],
   include_directories : [npyodbc_inc],
   install : true,
+  cpp_args : run_command(['odbc_config', '--cflags'], check : true).stdout().strip(),
+  link_args : run_command(['odbc_config', '--libs'], check : true).stdout().strip(),
 )

src/npcontainer.cpp

@@ -25,6 +25,8 @@
 // do not correctly specify includes inside themselves,
 // and there will be undefined objects if the order is changed.
 #include "pyodbc.h"
+#include "wrapper.h"
+#include "textenc.h"
 #include "connection.h"
 #include "cursor.h"
 #include "dbspecific.h"

subprojects/packagefiles/patches/pyproject.patch

@@ -1,28 +1,10 @@
---- pyodbc/pyproject.toml	2024-06-13 15:43:19.682449229 -0500
-+++
-@@ -10,7 +10,7 @@
- 
- description = "DB API module for ODBC"
- readme = "README.md"
--license = {text = "MIT License"}
-+license = {text = "MIT-0 License"}
- 
- authors = [{name = "Michael Kleehammer", email="michael@kleehammer.com"}]
- 
-@@ -22,7 +22,7 @@
- classifiers=['Development Status :: 5 - Production/Stable',
-              'Intended Audience :: Developers',
-              'Intended Audience :: System Administrators',
--             'License :: OSI Approved :: MIT License',
-+             'License :: OSI Approved :: MIT No Attribution License (MIT-0)',
-              'Operating System :: Microsoft :: Windows',
-              'Operating System :: POSIX',
-              'Programming Language :: Python',
-@@ -34,5 +34,5 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -33,5 +33,5 @@ classifiers=['Development Status :: 5 - Production/Stable',
  Homepage = "https://github.com/mkleehammer/pyodbc"
- 
+
  [build-system]
 -requires = ["setuptools"]
 -build-backend = "setuptools.build_meta"
++requires = ["meson-python"]
 +build-backend = "mesonpy"
-+requires = ["meson-python", "numpy <2"]

subprojects/packagefiles/patches/textenc.patch

@@ -1,5 +1,5 @@
 --- pyodbc/src/textenc.h	2024-06-13 15:22:07.845998858 -0500
-+++ 
++++
 @@ -1,5 +1,7 @@
  #ifndef _TEXTENC_H
  #define _TEXTENC_H

subprojects/packagefiles/pyodbc/meson.build

@@ -1,12 +1,16 @@
-project('pyodbc', 'cpp', version : '5.1.0')
+project(
+  'pyodbc',
+  'cpp',
+  version : '5.3.0',
+)
 
 python = import('python').find_installation()
-python_dependency = python.dependency()
+python_dep = python.dependency()
 
 compiler = meson.get_compiler('cpp')
 
 # ODBC driver needs to be installed by the OS.
-odbc_dependency = compiler.find_library('odbc')
+odbc_dep = compiler.find_library('odbc')
 
 pyodbc_sources = [
   'src/cnxninfo.cpp',
@@ -27,9 +31,12 @@ pyodbc_inc = include_directories(
 )
 
 pyodbc_dep = declare_dependency(
-  include_directories: pyodbc_inc,
   sources: pyodbc_sources,
-  dependencies: [python_dependency, odbc_dependency],
+  dependencies: [
+    python_dep,
+    odbc_dep,
+  ],
+  include_directories: [pyodbc_inc],
 )
 
 meson.override_dependency('pyodbc', pyodbc_dep)

subprojects/packagefiles/pyodbc/src/connection.h

@@ -1,7 +1,7 @@
 [wrap-git]
 directory = pyodbc
 url = https://github.com/mkleehammer/pyodbc.git
-revision = 5.1.0
+revision = 5.3.0
 depth = 1
 patch_directory = pyodbc
 diff_files = patches/textenc.patch, patches/pyproject.patch, patches/cursor.patch, patches/pyodbcmodule.patch