On Sat, 22 Feb 2020 22:04:09 -0500 James McCoy <james...@debian.org> wrote:
>
> I might need to wait for the next upstream release.
FWIW, we applied the attached patch in Ubuntu to make src:subversion
build against swig 3.0 for now. If you could apply this patch it'd be
great because at the moment we are trying to rebuild src:subversion to
remove ruby 2.5 support from the archive and it is failing due to the
lack of swig 4.0 support:
https://release.debian.org/transitions/html/ruby2.5-rm.html
--
Lucas Kanashiro
diff -Nru subversion-1.13.0/debian/control subversion-1.13.0.new/debian/control
--- subversion-1.13.0/debian/control 2020-01-19 10:59:14.000000000 -0300
+++ subversion-1.13.0.new/debian/control 2020-03-23 11:39:46.474677200
-0300
@@ -32,7 +32,7 @@
rename,
ruby,
ruby-dev,
- swig,
+ swig3.0,
zlib1g-dev
Build-Conflicts: libsvn-dev (<< 1.13~)
Rules-Requires-Root: no
diff -Nru subversion-1.13.0/debian/patches/fix-swig-ruby-includes.patch
subversion-1.13.0.new/debian/patches/fix-swig-ruby-includes.patch
--- subversion-1.13.0/debian/patches/fix-swig-ruby-includes.patch
1969-12-31 21:00:00.000000000 -0300
+++ subversion-1.13.0.new/debian/patches/fix-swig-ruby-includes.patch
2020-03-23 11:39:46.450677157 -0300
@@ -0,0 +1,15 @@
+Description: Do not include ruby include subdir which has headers that
+ clash with standard ones, such as assert.h.
+Author: Dimitri John Ledkov <x...@ubuntu.com>
+
+--- a/build/ac-macros/swig.m4
++++ b/build/ac-macros/swig.m4
+@@ -168,7 +168,7 @@
+ AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
+ if test -d "$rbconfig_rubyhdrdir"; then
+ dnl Ruby >=1.9
+- svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir
-I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
++ svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir
-I$rbconfig_rubyhdrdir/ruby/backward"
+ if test -d "$rbconfig_rubyarchhdrdir"; then
+ dnl Ruby >=2.0
+ svn_cv_ruby_includes="$svn_cv_ruby_includes
-I$rbconfig_rubyarchhdrdir"
diff -Nru subversion-1.13.0/debian/patches/series
subversion-1.13.0.new/debian/patches/series
--- subversion-1.13.0/debian/patches/series 2020-01-19 10:59:14.000000000
-0300
+++ subversion-1.13.0.new/debian/patches/series 2020-03-23 11:39:46.450677157
-0300
@@ -11,3 +11,4 @@
examples-compile-instructions
workaround_EINVAL_on_kfreebsd
use-python2-as-the-interpreter-now-for-tests-not-python.patch
+fix-swig-ruby-includes.patch
diff -Nru subversion-1.13.0/debian/rules subversion-1.13.0.new/debian/rules
--- subversion-1.13.0/debian/rules 2020-01-19 10:59:14.000000000 -0300
+++ subversion-1.13.0.new/debian/rules 2020-03-23 11:39:46.474677200 -0300
@@ -100,7 +100,7 @@
--with-sasl=/usr \
--with-editor=/usr/bin/editor \
--with-ruby-sitedir=/usr/lib/ruby \
- --with-swig=/usr/bin/swig \
+ --with-swig=/usr/bin/swig3.0 \
--with-lz4 \
--with-utf8proc \
CFLAGS="$(CFLAGS)" \
