Merge ~lucaskanashiro/ubuntu/+source/libprelude:ruby27-support into ubuntu/+source/libprelude:ubuntu/devel

[Lucas Kanashiro]

libprelude FTBFS against ruby2.7 [1]. The proposed patch fixes this failure avoiding an ambiguous call. I registered myself on upstream bug tracker system but it needs admin's approval, so I didn't forward it upstream yet.

[1] https://launchpadlibrarian.net/467386361/buildlog_ubuntu-focal-amd64.libprelude_5.1.1-4build2_BUILDING.txt.gz

[Lucas Kanashiro (lucaskanashiro)]

PPA: https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-libprelude-ruby27-support/+packages

[Christian Ehrhardt  (paelzer)]

I added some comments, nothing severe but worth to modify/clarify upfront IMHO

review: Needs Information

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the review Christian. I addressed all the points you raised, I hope it is all good now. Up for review again.

I also rebuilt this new version in my PPA:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-libprelude-ruby27-support/+packages

[Christian Ehrhardt  (paelzer)]

LGTM now, thanks!

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/libprelude
 * [new tag] upload/5.1.1-4ubuntu1 -> upload/5.1.1-4ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libprelude_5.1.1-4ubuntu1.dsc: done.
  Uploading libprelude_5.1.1-4ubuntu1.debian.tar.xz: done.
  Uploading libprelude_5.1.1-4ubuntu1_source.buildinfo: done.
  Uploading libprelude_5.1.1-4ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 743120a..c10c33e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libprelude (5.1.1-4ubuntu1) focal; urgency=medium
+
+  * Add support to Ruby 2.7.
+    + d/p/020-ruby27_support.patch: add patch to avoid ambiguity in
+      rb_define_virtual_variable call.
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 03 Mar 2020 15:51:42 -0300
+
 libprelude (5.1.1-4build2) focal; urgency=medium
 
   [ Rafael David Tinoco ]
diff --git a/debian/control b/debian/control
index 6f9585c..493bba0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libprelude
 Priority: optional
 Section: libs
-Maintainer: Pierre Chifflier <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Pierre Chifflier <[e-mail]>
 Uploaders: Thomas Andrejak <[e-mail]>
 Rules-Requires-Root: no
 Build-Depends: debhelper-compat (= 12),
diff --git a/debian/patches/020-ruby27_support.patch b/debian/patches/020-ruby27_support.patch
 new file mode 100644
index 0000000..c336f2a
--- /dev/null
+++ b/debian/patches/020-ruby27_support.patch
@@ -0,0 +1,30 @@
+Description: Add support to Ruby 2.7
+ Type cast the parameters of rb_define_virtual_variable call to avoid ambiguity:
+ .
+ /usr/include/ruby-2.7.0/ruby/backward/cxxanyargs.hpp:59:1: note: candidate: ‘void ruby::backward::cxxanyargs::rb_define_virtual_variable(const char*, VALUE (*)(...), void (*)(...))’
+   59 | rb_define_virtual_variable(const char *q, type *w, void_type *e)
+      | ^~~~~~~~~~~~~~~~~~~~~~~~~~
+/usr/include/ruby-2.7.0/ruby/backward/cxxanyargs.hpp:90:1: note: candidate: ‘void ruby::backward::cxxanyargs::rb_define_virtual_variable(const char*, VALUE (*)(...), void (*)(VALUE, ID, VALUE*))’
+   90 | rb_define_virtual_variable(const char *q, type *w, rb_gvar_setter_t *e)
+ .
+ It is important to note that this patch might not be compatible with Ruby < 2.7.
+Author: Lucas Kanashiro <[e-mail]>
+Forwarded: No
+X-Not-Forwarded-Reason: Waiting for upstream approval to create my account in their BTS
+Last-Updated: 2020-03-03
+
+--- a/bindings/ruby/Prelude.cxx
++++ b/bindings/ruby/Prelude.cxx
+@@ -1260,7 +1260,12 @@
+     swig_ruby_trackings = (st_table*)NUM2SWIG(trackings_value);
+   }
+ 
++#if RUBY_VERSION_MAJOR == 2 && RUBY_VERSION_MINOR < 7
+   rb_define_virtual_variable("SWIG_TRACKINGS_COUNT", swig_ruby_trackings_count, NULL);
++#else
++  rb_define_virtual_variable("SWIG_TRACKINGS_COUNT", (rb_gvar_getter_t *)swig_ruby_trackings_count, (rb_gvar_setter_t *)NULL);
++#endif
++
+ }
+ 
+ /* Add a Tracking from a C/C++ struct to a Ruby object */
diff --git a/debian/patches/series b/debian/patches/series
index 1402174..fe52e64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 017-enable_detection_new_python3.patch
 018-fix_gtkdoc_1.32.patch
 019-fix_path_max_on_hurd.patch
+020-ruby27_support.patch