tomoe-ruby.patch

   1 --- tomoe-0.6.0/macros/ruby.m4.orig     2007-06-11 03:05:42.000000000 +0200
   2 +++ tomoe-0.6.0/macros/ruby.m4  2012-11-12 21:18:04.642203203 +0100
   3 @@ -28,14 +28,15 @@
   4
   5    changequote(<<, >>)
   6    for var_name in archdir sitearchdir CFLAGS LIBRUBYARG libdir \
   7 -                  sitelibdir sitearchdir; do
   8 +                  vendorlibdir vendorarchdir rubyhdrdir sitehdrdir arch; do
   9      rbconfig_tmp=`$rbconfig "print Config::CONFIG['$var_name']"`
  10      eval "rbconfig_$var_name=\"$rbconfig_tmp\""
  11    done
  12 +  rbconfig_archhdrdir="$rbconfig_rubyhdrdir/$rbconfig_arch"
  13    changequote([, ])
  14
  15 -  RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_archdir "
  16 -  RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_sitearchdir "
  17 +  RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_archdir -I$rbconfig_rubyhdrdir -I$rbconfig_archhdrdir"
  18 +  RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_vendorarchdir -I$rbconfig_vendorhdrdir"
  19    RUBY_CFLAGS="$RUBY_CFLAGS $rbconfig_CFLAGS "
  20    RUBY_LIBS="$rbconfig_LIBRUBYARG"
  21    RUBY_LDFLAGS="-L$rbconfig_libdir"
  22 @@ -69,7 +69,7 @@
  23
  24    AC_MSG_CHECKING([where to install Ruby binding])
  25    AC_CACHE_VAL([cv_ruby_archdir],
  26 -               [cv_ruby_archdir="$rbconfig_sitearchdir"])
  27 +               [cv_ruby_archdir="$rbconfig_vendorarchdir"])
  28    AC_ARG_WITH([ruby-bindingdir],
  29                  AS_HELP_STRING([--with-ruby-bindingdir=EXTDIR],
  30                                 [install Ruby bindings in EXTDIR
  31 @@ -80,13 +80,13 @@
  32
  33    AC_MSG_CHECKING([where to install Ruby scripts])
  34    AC_CACHE_VAL([cv_ruby_sitedir],
  35 -               [cv_ruby_sitedir="$rbconfig_sitelibdir"])
  36 +               [cv_ruby_sitedir="$rbconfig_vendorlibdir"])
  37    AC_ARG_WITH([ruby-libdir],
  38                 AS_HELP_STRING([--with-ruby-libdir=LIBDIR],
  39                                [install Ruby scripts for bindings in LIBDIR
  40                                 (default is same as ruby's one)]),
  41                 [ruby_libdir="$withval"],
  42 -               [ruby_libdir="$cv_ruby_sitedir"])
  43 +               [ruby_libdir="$cv_ruby_vendordir"])
  44    AC_MSG_RESULT([$ruby_libdir])
  45
  46    AC_SUBST(ruby_bindingdir)
  47 --- tomoe-0.6.0/bindings/ruby/tomoe-rb-char.c.orig      2007-06-06 02:44:38.000000000 +0200
  48 +++ tomoe-0.6.0/bindings/ruby/tomoe-rb-char.c   2012-11-12 21:20:44.718863156 +0100
  49 @@ -13,7 +13,7 @@
  50      if (NIL_P(xml)) {
  51          chr = tomoe_char_new();
  52      } else {
  53 -        chr = tomoe_char_new_from_xml_data(RVAL2CSTR(xml), RSTRING(xml)->len);
  54 +        chr = tomoe_char_new_from_xml_data(RVAL2CSTR(xml), RSTRING_LEN(xml));
  55      }
  56
  57      G_INITIALIZE(self, chr);