Commit Debian 3.0 (quilt) metadata

[dgit (10.0) quilt-fixup]

2 files changed, 61 insertions, 0 deletions

diff --git a/debian/patches/series b/debian/patches/series
index d1e1ffb..3651ff4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ python-builds
 examples-compile-instructions
 workaround_EINVAL_on_kfreebsd
 use-python3-as-the-interpreter-now-for-tests-not-python.patch
+swig-py-fix-conditionals-by-swig-version.patch
diff --git a/debian/patches/swig-py-fix-conditionals-by-swig-version.patch b/debian/patches/swig-py-fix-conditionals-by-swig-version.patch
new file mode 100644
index 0000000..657478a
--- /dev/null
+++ b/debian/patches/swig-py-fix-conditionals-by-swig-version.patch
@@ -0,0 +1,60 @@
+From: Yasuhito Futatsuki <futatuki@apache.org>
+Date: Tue, 20 Sep 2022 12:57:06 +0000
+X-Dgit-Generated: 1.14.2-4 16964505e3be18838bb39d2870695da11624c85c
+Subject: swig-py: Fix conditionals by SWIG version and by Python version for proxy code.
+
+We are using different code for proxy object, by Python version and by SWIG
+version.  The distinguish between Python 2 and Python 3 was done by SWIG
+macro "SWIGPYTHON_PY3".  However, the macro was dropped since SWIG commit
+a343b7e[1], between SWIG 4.0.2 release and upcoming SWIG 4.1.0 release.
+
+As we already dropped support for the combination of SWIG >= 4.0 and Python 2,
+we should detect Python 2 only in SWIG < 4.0 case. So we can rely on the macro
+only in the case.
+
+* subversion/bindings/swig/include/proxy.swg ():
+  Reorder the conditionals distinguish SWIG versions and Python versions,
+  as described above.
+
+Found by: Jitka Plesnikova (jplesnik {_AT_} redhat.com)
+
+Suggested by: Julien Schueller (schueller {_AT_} phimeca.com) [2]
+
+[1] https://github.com/swig/swig/commit/a343b7e254567a64761bc1be7dc55b7b7424ec52
+[2] https://github.com/swig/swig/issues/2373#issuecomment-1250997124
+
+git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1904167 13f79535-47bb-0310-9956-ffa450edef68
+Signed-off-by: James McCoy <jamessan@debian.org>
+Closes: #1023529
+
+---
+
+diff --git a/subversion/bindings/swig/include/proxy.swg b/subversion/bindings/swig/include/proxy.swg
+index ac67d434ca..7d2d0dd033 100644
+--- a/subversion/bindings/swig/include/proxy.swg
++++ b/subversion/bindings/swig/include/proxy.swg
+@@ -66,7 +66,6 @@
+         fn()
+ 
+ %}
+-#if defined(SWIGPYTHON_PY3)
+ #if SWIG_VERSION >= 0x040000
+ %pythoncode %{
+   # -classic and -modern options have been dropped and this variable
+@@ -76,7 +75,7 @@
+   _set_instance_attr = _swig_setattr_nondynamic_instance_variable(object.__setattr__)
+ 
+ %}
+-#else
++#elif defined(SWIGPYTHON_PY3)
+ %pythoncode %{
+   # SWIG classes generated with -modern do not define this variable
+   try:
+@@ -90,7 +89,6 @@
+   _set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+ 
+ %}
+-#endif
+ #else
+ %pythoncode %{
+   # SWIG classes generated with -classic do not define this variable,