Author: svn-role
Date: Sat Nov 22 04:00:10 2025
New Revision: 1929906
Log:
Merge the 1.14.x-r1928521 branch:
* r1928521, r1928524
swig-py: follow up to r1912500: Fix NameError on using old SWIG
Justification:
Fix a regression for old SWIG versions and make clear minimal supported
version of SWIG for swig-py
Branch:
1.14.x-r1928521
Votes:
+0: hartmannathan (review from swig-py experts requested!)
+1: jun66j5, jamessan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/build/ac-macros/swig.m4
subversion/branches/1.14.x/subversion/bindings/swig/INSTALL
subversion/branches/1.14.x/subversion/bindings/swig/svn_delta.i
Modified: subversion/branches/1.14.x/STATUS
==============================================================================
--- subversion/branches/1.14.x/STATUS Sat Nov 22 03:56:23 2025
(r1929905)
+++ subversion/branches/1.14.x/STATUS Sat Nov 22 04:00:10 2025
(r1929906)
@@ -63,15 +63,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1928521, r1928524
- swig-py: follow up to r1912500: Fix NameError on using old SWIG
- Justification:
- Fix a regression for old SWIG versions and make clear minimal supported
- version of SWIG for swig-py
- Branch:
- 1.14.x-r1928521
- Votes:
- +0: hartmannathan (review from swig-py experts requested!)
- +1: jun66j5, jamessan
-
Modified: subversion/branches/1.14.x/build/ac-macros/swig.m4
==============================================================================
--- subversion/branches/1.14.x/build/ac-macros/swig.m4 Sat Nov 22 03:56:23
2025 (r1929905)
+++ subversion/branches/1.14.x/build/ac-macros/swig.m4 Sat Nov 22 04:00:10
2025 (r1929906)
@@ -89,7 +89,7 @@ AC_DEFUN(SVN_FIND_SWIG,
# The major is passed straight through,
# the minor is zero padded to two places,
# and the patch level is zero padded to three places.
- # e.g. 1.3.24 becomes 103024
+ # e.g. 1.3.40 becomes 103040
SWIG_VERSION="`echo \"$SWIG_VERSION_RAW\" | \
$SED -e 's/[[^0-9\.]].*$//' \
-e 's/\.\([[0-9]]\)$/.0\1/' \
@@ -98,9 +98,9 @@ AC_DEFUN(SVN_FIND_SWIG,
AC_MSG_RESULT([$SWIG_VERSION_RAW])
# If you change the required swig version number, don't forget to update:
# subversion/bindings/swig/INSTALL
- if test ! -n "$SWIG_VERSION" || test "$SWIG_VERSION" -lt "103024"; then
+ if test ! -n "$SWIG_VERSION" || test "$SWIG_VERSION" -lt "103040"; then
AC_MSG_WARN([Detected SWIG version $SWIG_VERSION_RAW])
- AC_MSG_WARN([Subversion requires SWIG >= 1.3.24])
+ AC_MSG_WARN([Subversion requires SWIG >= 1.3.40])
fi
fi
])
@@ -206,7 +206,7 @@ suitable Python interpreter is not found
else
SWIG_PY_OPTS="-no-such-option" # fool proof
SWIG_PY_ERRMSG="SWIG version is not suitable"
- AC_MSG_WARN([Subversion Python bindings for Python 2 require
1.3.24 <= SWIG < 4.0.0])
+ AC_MSG_WARN([Subversion Python bindings for Python 2 require
1.3.40 <= SWIG < 4.0.0])
fi
fi
fi
Modified: subversion/branches/1.14.x/subversion/bindings/swig/INSTALL
==============================================================================
--- subversion/branches/1.14.x/subversion/bindings/swig/INSTALL Sat Nov 22
03:56:23 2025 (r1929905)
+++ subversion/branches/1.14.x/subversion/bindings/swig/INSTALL Sat Nov 22
04:00:10 2025 (r1929906)
@@ -82,10 +82,10 @@ Step 1: [Optional] Install a suitable ve
* We currently support SWIG versions 2.0.0 and later, with the
following notes:
- - SWIG 1.3.24 and later 1.3.x may work, but we do not test these
- versions on our latest source code.
- - For Python 2 bindings, SWIG 4.0.0 or later is not supported.
- - For Python 3 bindings, SWIG 3.0.10 or later is required.
+ - For Python 3 bindings, use SWIG 3.0.10 or later. (SWIG 4.0.0
+ or later is supported as well.)
+ - For Python 2 bindings, use SWIG 1.3.40-3.x. (SWIG 4.0.0 or later
+ is not supported as it lacks the '-classic' option.)
- Note that SWIG 3.0.9 has some trouble with Python support.
(See https://sourceforge.net/p/swig/news/2016/06/swig-3010-released/)
- For Perl 5.16 and later, SWIG 2.0.8 or later is required.
Modified: subversion/branches/1.14.x/subversion/bindings/swig/svn_delta.i
==============================================================================
--- subversion/branches/1.14.x/subversion/bindings/swig/svn_delta.i Sat Nov
22 03:56:23 2025 (r1929905)
+++ subversion/branches/1.14.x/subversion/bindings/swig/svn_delta.i Sat Nov
22 04:00:10 2025 (r1929906)
@@ -208,6 +208,7 @@ void _ops_get(int *num_ops, const svn_tx
# Baton container class for editor/parse_fns3 batons and their decendants.
class _ItemBaton:
def __init__(self, editor, pool, baton=None):
+ import libsvn.core
self.pool = pool if pool else libsvn.core.svn_pool_create()
self.baton = baton
self.editor = editor
