From 3c3d9c40636b0a282086079f6e6d901f166c4f9a Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 8 May 2023 21:45:22 +0200
Subject: [PATCH] Port to C99

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
---
 subversion-ruby-c99.patch | 27 +++++++++++++++++++++++++++
 subversion.spec           |  7 ++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 subversion-ruby-c99.patch

diff --git a/subversion-ruby-c99.patch b/subversion-ruby-c99.patch
new file mode 100644
index 0000000..bab7ed8
--- /dev/null
+++ b/subversion-ruby-c99.patch
@@ -0,0 +1,27 @@
+The Ruby bindings apply the Ruby NIL_P macro to an apr_hash_t * value,
+which some compilers flag as a type error.
+
+Submitted upstream: <https://issues.apache.org/jira/browse/SVN-4915>
+
+diff --git a/subversion/bindings/swig/include/svn_containers.swg b/subversion/bindings/swig/include/svn_containers.swg
+index d3c6305a412b6505..47bc50a92bb8b433 100644
+--- a/subversion/bindings/swig/include/svn_containers.swg
++++ b/subversion/bindings/swig/include/svn_containers.swg
+@@ -299,7 +299,7 @@
+   $1 = svn_swig_rb_hash_to_apr_hash_svn_string($input, _global_pool);
+   _global_pool = NULL;
+   if (!NIL_P(rb_pool)) {
+-    if (NIL_P($1)) {
++    if ($1 == NULL) {
+       svn_swig_rb_destroy_pool(rb_pool);
+     } else {
+       svn_swig_rb_set_pool_for_no_swig_type($input, rb_pool);
+@@ -373,7 +373,7 @@
+     svn_swig_rb_hash_to_apr_hash_string($input, _global_pool);
+   _global_pool = NULL;
+   if (!NIL_P(rb_pool)) {
+-    if (NIL_P($1)) {
++    if ($1 == NULL) {
+       svn_swig_rb_destroy_pool(rb_pool);
+     } else {
+       svn_swig_rb_set_pool_for_no_swig_type($input, rb_pool);
diff --git a/subversion.spec b/subversion.spec
index b2533b1..6d2d019 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -59,7 +59,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.14.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: Apache-2.0
 URL: https://subversion.apache.org/
 Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2
@@ -79,6 +79,7 @@ Patch6: subversion-1.14.1-testnomagic.patch
 Patch8: subversion-1.14.1-python-3.11-build.patch
 Patch9: subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
 Patch10: subversion-1.14.2-ruby32-remove-deprecated-api.patch
+Patch11: subversion-ruby-c99.patch
 
 BuildRequires: make
 BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++
@@ -245,6 +246,7 @@ This package includes supplementary tools for use with Subversion.
 %patch8 -p1 -b .pythonbuild
 %patch9 -p1 -b .swigfix
 %patch10 -p0 -b .ruby32
+%patch11 -p1
 
 :
 : === Building:
@@ -585,6 +587,9 @@ make check-javahl
 %endif
 
 %changelog
+* Mon May 08 2023 Florian Weimer <fweimer@redhat.com> - 1.14.2-15
+- Port to C99
+
 * Thu Feb 16 2023 Richard Lescak <rlescak@redhat.com> - 1.14.2-14
 - SPDX migration