Accepting request 1070632 from devel:tools:scm:svn

- add swig4.patch for better support with SWIG 4.x (bsc#1209110)

OBS-URL: https://build.opensuse.org/request/show/1070632
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=191

subversion.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 10 08:48:55 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- add swig4.patch for better support with SWIG 4.x (bsc#1209110) 
+
 -------------------------------------------------------------------
 Fri Jan  6 21:04:21 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

subversion.spec

@@ -77,6 +77,7 @@ Patch46:        remove-kdelibs4support-dependency.patch
 # PATCH-FIX-UPSTREAM danilo.spinella@suse.com bsc#1195486 bsc#1193778
 # Fix testCrash_RequestChannel_nativeRead_AfterException test on aarch64 and ppc64le
 Patch47:        fix-javahl-test.patch
+Patch48:        swig4.patch
 BuildRequires:  apache-rpm-macros
 BuildRequires:  apache2-devel >= 2.2.0
 BuildRequires:  apache2-prefork
@@ -259,6 +260,7 @@ parameters and keywords for the svn command and other tools.
 %patch45 -p1
 %patch46 -p1
 %patch47
+%patch48 -p1
 
 # do not use 'env python'
 sed -i -e 's#%{_bindir}/env python#%{_bindir}/python3#' subversion/tests/cmdline/*.py

swig4.patch

@@ -0,0 +1,29 @@
+Index: subversion-1.14.2/subversion/bindings/swig/include/proxy.swg
+===================================================================
+--- subversion-1.14.2.orig/subversion/bindings/swig/include/proxy.swg
++++ subversion-1.14.2/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,