1 --- qpidc-0.16/configure.ac.orig 2020-12-13 12:55:35.066289854 +0100
2 +++ qpidc-0.16/configure.ac 2020-12-13 18:50:43.760850752 +0100
4 if test -n "$RUBY" ; then
5 AC_ARG_VAR(RUBY_INC, [Directory where ruby.h can be found])
6 if test -z "$RUBY_INC" ; then
7 - [RUBY_INC=`$RUBY -rrbconfig -e 'puts Config::CONFIG["rubyhdrdir"] || Config::CONFIG["archdir"]'`]
8 + [RUBY_INC=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["rubyhdrdir"] || RbConfig::CONFIG["archdir"]'`]
12 AC_ARG_VAR(RUBY_INC_ARCH, [Directory where ruby/config.h can be found (needed from Ruby 1.9)])
13 if test -z "$RUBY_INC_ARCH" ; then
14 - [RUBY_INC_ARCH=`$RUBY -rrbconfig -e 'd = Config::CONFIG["rubyhdrdir"];if d != nil; print d + "/" + Config::CONFIG["arch"]; end'`]
15 + [RUBY_INC_ARCH=`$RUBY -rrbconfig -e 'd = RbConfig::CONFIG["rubyhdrdir"];if d != nil; print d + "/" + RbConfig::CONFIG["arch"]; end'`]
16 dnl For earlier versions, just make it the same as RUBY_INC.
17 test x"$RUBY_INC_ARCH" != x || RUBY_INC_ARCH=$RUBY_INC
20 AC_ARG_VAR(RUBY_LIB, [Directory to install ruby files into])
21 if test -z "$RUBY_LIB" ; then
22 dnl Kludge to install ruby files under $prefix
23 - [RUBY_LIB=`$RUBY -rrbconfig -e 'puts Config::CONFIG["sitelibdir"].gsub("/usr", "${prefix}")'`]
24 + [RUBY_LIB=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"].gsub("/usr", "${prefix}")'`]
28 AC_ARG_VAR(RUBY_LIB_ARCH, [Directory to install ruby binary modules into])
29 if test -z "$RUBY_LIB_ARCH" ; then
30 dnl Kludge to install ruby files under $prefix
31 - [RUBY_LIB_ARCH=`$RUBY -rrbconfig -e 'puts Config::CONFIG["sitearchdir"].gsub("/usr", "${prefix}")'`]
32 + [RUBY_LIB_ARCH=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"].gsub("/usr", "${prefix}")'`]
34 AC_SUBST(RUBY_LIB_ARCH)
40 - RUBY_DLEXT=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["DLEXT"]]'`
41 + RUBY_DLEXT=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["DLEXT"]]'`
44 AM_CONDITIONAL([HAVE_RUBY_DEVEL], [test -f $RUBY_INC/ruby.h && test -n "$SWIG"])
45 --- qpidc-0.16/bindings/qpid/ruby/ruby.i.orig 2010-08-13 00:35:23.000000000 +0200
46 +++ qpidc-0.16/bindings/qpid/ruby/ruby.i 2020-12-13 19:47:14.499148213 +0100
49 catch (qpid::messaging::MessagingException& mex) {
50 static VALUE merror = rb_define_class("MessagingError", rb_eStandardError);
51 - rb_raise(merror, mex.what());
52 + rb_raise(merror, "%s", mex.what());
56 --- qpidc-0.16/bindings/swig_ruby_typemaps.i.orig 2012-01-04 17:24:33.000000000 +0100
57 +++ qpidc-0.16/bindings/swig_ruby_typemaps.i 2020-12-13 20:27:15.396141438 +0100
60 } catch (qpid::types::Exception& ex) {
61 static VALUE error = rb_define_class("Error", rb_eStandardError);
62 - rb_raise(error, ex.what());
63 + rb_raise(error, "%s", ex.what());
67 --- qpidc-0.16/bindings/qmf2/ruby/ruby.i.orig 2010-09-23 03:42:08.000000000 +0200
68 +++ qpidc-0.16/bindings/qmf2/ruby/ruby.i 2020-12-13 21:21:22.161885533 +0100
71 catch (qpid::types::Exception& mex) {
72 static VALUE qmferror = rb_define_class("QmfError", rb_eStandardError);
73 - rb_raise(qmferror, mex.what());
74 + rb_raise(qmferror, "%s", mex.what());