trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: December 2011

Need help with patch

From: Darrell Anderson <humanreadable@...>
Date: Thu, 8 Dec 2011 11:09:33 -0800 (PST)
Several days ago when I started my koffice nightmare, I submitted bug report 721 (http://bugs.pearsoncomputing.net/show_bug.cgi?id=721).

For the poppler warning messages I ran across a patch from Francois. I updated the bug report with a link to the patch already in GIT.

Today I ran across the likely cause to the ruby messages: the configure scripts do not support ruby 1.9.x (https://gist.github.com/1414497).

I started a patch but still receive the warning message. I'm missing something else but don't know what.

Here is the patch:

=======================================
diff -urN koffice/configure.in koffice.new/configure.in
--- koffice/configure.in	2011-08-21 18:30:53.000000000 -0500
+++ koffice.new/configure.in	2011-12-08 12:56:01.215427952 -0600
@@ -1539,14 +1539,20 @@
 # Check for Ruby

 if test "x$compile_kross" = "xyes" ; then
-  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby)
+  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)

   if test -n "$RUBY"; then
     AC_MSG_CHECKING(for Ruby dirs)
     RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
     RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
     RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
-    RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
+    if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
+      # Ruby 1.9
+      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
+    else
+      # not Ruby 1.9
+      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
+    fi
     RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
     RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
     RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
@@ -1602,7 +1608,7 @@
                 #include <version.h>
             ],[

-#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)
+#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR >= 8 && RUBY_VERSION_TEENY <= 1)
 #error "need at least ruby 1.8.2\n"
 #endif

diff -urN koffice/lib/kross/configure.in.in koffice.new/lib/kross/configure.in.in
--- koffice/lib/kross/configure.in.in	2010-08-11 22:16:27.000000000 -0500
+++ koffice.new/lib/kross/configure.in.in	2011-12-08 12:56:45.787428312 -0600
@@ -21,14 +21,20 @@
 # Check for Ruby

 if test "x$compile_kross" = "xyes" ; then
-  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby)
+  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)

   if test -n "$RUBY"; then
     AC_MSG_CHECKING(for Ruby dirs)
     RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
     RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
     RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
-    RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
+    if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
+      # Ruby 1.9
+      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
+    else
+      # not Ruby 1.9
+      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
+    fi
     RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
     RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
     RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
@@ -84,7 +90,7 @@
                 #include <version.h>
             ],[

-#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)
+#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR >= 8 && RUBY_VERSION_TEENY <= 1)
 #error "need at least ruby 1.8.2\n"
 #endif
=======================================

If we get this resolved the patch will be available to close the bug report. :)

Thanks for any help.

Darrell