Project

General

Profile

0001-Fix-tk-crash-with-Tk-8.6.1-on-Ubuntu.patch

h.shirosaki (Hiroshi Shirosaki), 08/07/2014 07:47 AM

View differences:

ext/tk/extconf.rb
12 12
  %w[8.5 8.4] # At present, Tcl/Tk8.6 is not supported.
13 13

  
14 14
TkLib_Config['unsupported_versions'] =
15
  %w[8.8 8.7 8.6] # At present, Tcl/Tk8.6 is not supported.
15
  %w[8.8 8.7] # At present, Tcl/Tk8.7 is not supported.
16 16

  
17 17
TkLib_Config['major_nums'] = '87'
18 18

  
......
477 477

  
478 478
    config_dir << RbConfig::CONFIG['libdir']
479 479

  
480
    ['/usr/lib/x86_64-linux-gnu'].each do |dir|
481
      config_dir << dir if File.exist?(dir)
482
    end
483

  
480 484
    ((maybe_64bit?)? ['lib64', 'lib']: ['lib']).each{|dir|
481 485
      config_dir.concat [
482 486
        File.join(RbConfig::CONFIG['exec_prefix'], dir),
ext/tk/tcltklib.c
6074 6074
        return;
6075 6075
    }
6076 6076

  
6077
    if (orig_info.isNativeObjectProc) {
6078
        Tcl_CreateObjCommand(interp, "__orig_namespace_command__",
6079
                             orig_info.objProc, orig_info.objClientData,
6080
                             orig_info.deleteProc);
6081
    } else {
6082
        Tcl_CreateCommand(interp, "__orig_namespace_command__",
6083
                          orig_info.proc, orig_info.clientData,
6084
                          orig_info.deleteProc);
6085
    }
6077
    Tcl_Eval(interp, "rename namespace __orig_namespace_command__");
6086 6078

  
6087 6079
    Tcl_CreateObjCommand(interp, "namespace", ip_rbNamespaceObjCmd,
6088 6080
                         (ClientData) 0, (Tcl_CmdDeleteProc *)NULL);
6089
-