diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ext/tk/extconf.rb | 8 | ||||
-rw-r--r-- | lib/date.rb | 2 | ||||
-rw-r--r-- | version.h | 10 |
4 files changed, 20 insertions, 8 deletions
@@ -1,3 +1,11 @@ +Mon Aug 3 10:06:00 2009 Kirk Haines <khaines@ruby-lang.org> + + * lib/date.rb: Added private on to_date and to_datetime back; this should not have been backported to 1.8.6 from 1.9 yet, since it hasn't gone into 1.8.8/1.8.7. + +Wed Jul 29 17:04:00 2009 Kirk Haines <khaines@ruby-lang.org> + + * ext/tk/extconf.rb: Added some additional paths where TCL files are common found; fixes problems with building on some distributions. + Tue Jul 14 13:14:00 2009 Kirk Haines <khaines@ruby-lang.org> * lib/complex.rb: Adjust #angle/#arg NaN return as per issue #1715 and recent rubyspec changes. Adjust angle/arg handling of (-0.0).angle as per r23960 & recent rubyspec changes. diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 5ed86a8b76..7cc24c36b6 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -50,7 +50,7 @@ stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs") use_X = with_config("X11", (! is_win32)) def find_tcl(tcllib, stubs) - paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] + paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"] if stubs func = "Tcl_InitStubs" lib = "tclstub" @@ -276,8 +276,10 @@ end if tcltk_framework || (have_header("tcl.h") && have_header("tk.h") && ( !use_X || find_library("X11", "XOpenDisplay", - "/usr/X11/lib", "/usr/lib/X11", - "/usr/X11R6/lib", "/usr/openwin/lib")) && + "/usr/X11/lib64", "/usr/X11/lib", + "/usr/lib64/X11", "/usr/lib/X11", + "/usr/X11R6/lib64", "/usr/X11R6/lib", + "/usr/openwin/lib64", "/usr/openwin/lib")) && find_tcl(tcllib, stubs) && find_tk(tklib, stubs)) $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs diff --git a/lib/date.rb b/lib/date.rb index 4ec8fb1cc2..ea557313f7 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -1604,6 +1604,8 @@ class Time DateTime.new!(DateTime.jd_to_ajd(jd, fr, of), of, DateTime::ITALY) end + private :to_date, :to_datetime + end class Date @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-07-20" +#define RUBY_RELEASE_DATE "2009-08-03" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090720 -#define RUBY_PATCHLEVEL 381 +#define RUBY_RELEASE_CODE 20090803 +#define RUBY_PATCHLEVEL 383 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 -#define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_MONTH 8 +#define RUBY_RELEASE_DAY 3 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |