diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2022-03-21 12:23:32 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2022-03-21 12:23:32 +0100 |
commit | 920d54124a7ed87e205b280038934d9c3a55cee1 (patch) | |
tree | 1fb31204d00830f134888aa263a4d71e7279060e /lib | |
parent | 07ad9d5a17eb91bd3d14f3289474aa83888c869e (diff) | |
download | koffice-920d54124a7ed87e205b280038934d9c3a55cee1.tar.gz koffice-920d54124a7ed87e205b280038934d9c3a55cee1.zip |
Fix FTBFS with Ruby 3.x due to removed rb_set_safe_level.
In Ruby 2.7 the entire concept is deprecated and in Ruby 3.x is removed
entirely - see https://bugs.ruby-lang.org/issues/16131
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/kross/ruby/rubyinterpreter.cpp | 4 | ||||
-rw-r--r-- | lib/kross/ruby/rubywrapper.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/kross/ruby/rubyinterpreter.cpp b/lib/kross/ruby/rubyinterpreter.cpp index 18ae6595..3504ca7c 100644 --- a/lib/kross/ruby/rubyinterpreter.cpp +++ b/lib/kross/ruby/rubyinterpreter.cpp @@ -16,6 +16,8 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ***************************************************************************/ + +#include "config.h" #include "rubyinterpreter.h" #include <map> @@ -83,12 +85,14 @@ RubyInterpreter::RubyInterpreter(Kross::Api::InterpreterInfo* info): Kross::Api: { initRuby(); } +#ifndef HAVE_RUBY_3 if(info->hasOption("safelevel") ) { kross_rb_set_safe_level( info->getOption("safelevel")->value.toInt() ); } else { kross_rb_set_safe_level(3); // if the safelevel option is undefined, set it to maximum level } +#endif } diff --git a/lib/kross/ruby/rubywrapper.c b/lib/kross/ruby/rubywrapper.c index 84d12540..a25b1b28 100644 --- a/lib/kross/ruby/rubywrapper.c +++ b/lib/kross/ruby/rubywrapper.c @@ -17,8 +17,11 @@ * Boston, MA 02110-1301, USA. ***************************************************************************/ +#include "config.h" #include "ruby.h" void kross_rb_set_safe_level(int safelevel) { +#ifndef HAVE_RUBY_3 rb_set_safe_level(safelevel); +#endif } |