Accepting request 1315243 from devel:tools:scm:svn

fix build with SWIG 4.4.0 boo#1252962 (forwarded request 1314946 from AndreasStieger)

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

subversion-1.14.5-swig-4.4.0.patch

@@ -0,0 +1,31 @@
+From: Andreas Stieger <Andreas.Stieger@gmx.de>
+Date: Fri, 31 Oct 2025 21:46:39 +0100
+Subject: [PATCH] Fix build with SWIG 4.4.0
+References: boo#1252962
+
+From https://bugzilla.opensuse.org/show_bug.cgi?id=1252962
+
+[  109s] subversion/bindings/swig/python/core.c: In function '_wrap_apr_pool_destroy':
+[  109s] subversion/bindings/swig/python/core.c:4562:7: error: implicit declaration of function 'SWIG_Python_TypeError'; did you mean 'SWIG_Python_TypeQuery'? [-Wimplicit-function-declaration]
+[  109s]  4562 |       SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj0);
+[  109s]       |       ^~~~~~~~~~~~~~~~~~~~~
+[  109s]       |       SWIG_Python_TypeQuery
+[  109s] make: *** [build-outputs.mk:2594: subversion/bindings/swig/python/core.lo] Error 1
+
+As discussed in:
+https://lists.apache.org/thread/p79p4p6tw4v2t6678mz1mgkylnqzz87y
+https://github.com/swig/swig/issues/3260#issuecomment-3272521479
+
+Index: subversion-1.14.5/subversion/bindings/swig/include/svn_types.swg
+===================================================================
+--- subversion-1.14.5.orig/subversion/bindings/swig/include/svn_types.swg
++++ subversion-1.14.5/subversion/bindings/swig/include/svn_types.swg
+@@ -601,7 +601,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE se
+ %typemap(in, noblock=1) apr_pool_t * {
+   /* Verify that the user supplied a valid pool */
+   if ($input != Py_None && $input != _global_py_pool) {
+-    SWIG_Python_TypeError(SWIG_TypePrettyName($descriptor), $input);
++    SWIG_Error(SWIG_TypeError,  "expected '$type'");
+     SWIG_arg_fail($svn_argnum);
+     SWIG_fail;
+   }

subversion.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Oct 31 20:49:57 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- fix build with SWIG 4.4.0 boo#1252962
+  add subversion-1.14.5-swig-4.4.0.patch
+
+-------------------------------------------------------------------
+Sun Apr  6 15:30:29 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
+
+- add -std=gnu11 to CFLAGS to fix gcc15 compile time error, and to
+  still allow build on Leap 15.6
+
 -------------------------------------------------------------------
 Fri Dec 27 18:51:42 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
 

subversion.spec

@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2009-2010 Pascal Bleser <pascal.bleser@opensuse.org>
-# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
+# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -75,6 +75,8 @@ 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
+# PATCH-FIX-UPSTREAM andreas.stieger@gmx.de boo#1252962
+Patch48:        subversion-1.14.5-swig-4.4.0.patch
 BuildRequires:  apache-rpm-macros
 BuildRequires:  apache2-devel >= 2.2.0
 BuildRequires:  apache2-prefork
@@ -283,7 +285,7 @@ do
 	fi
 	echo
 done >> build-outputs.mK
-export CFLAGS="%{apache_cflags} %{optflags} -fstack-protector -fpie"
+export CFLAGS="%{apache_cflags} %{optflags} -fstack-protector -fpie -std=gnu11"
 export CXXFLAGS="$CFLAGS"
 export APACHE_LDFLAGS="-Wl,-z,relro,-z,now"
 export LDFLAGS="-pie"