Here are all the *.rej files actually attahced. Cedric Krier wrote:
Can you sent wxw/mAConsoleMonitor.cpp.rej in attachement instead of a copy/paste?
Cédric Krier
On 28/07/06 21:24 +0400, Vassili Slessarenko wrote:
Hey,
I can't seem to be able to use the patch... just get:
patch --verbose --dry-run -p1 < patch1 Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ru miniAudicle-0.1.3.3~/wxw/mAConsoleMonitor.cpp miniAudicle-0.1.3.3/wxw/mAConsoleMonitor.cpp |--- miniAudicle-0.1.3.3~/wxw/mAConsoleMonitor.cpp 2006-07-26 21:52:18.000000000 +0200 |+++ miniAudicle-0.1.3.3/wxw/mAConsoleMonitor.cpp 2006-07-27 15:53:20.000000000 +0200 -------------------------- Patching file wxw/mAConsoleMonitor.cpp using Plan A... Hunk #1 FAILED at 203. Hunk #2 FAILED at 223. 2 out of 2 hunks FAILED -- saving rejects to file wxw/mAConsoleMonitor.cpp.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ru miniAudicle-0.1.3.3~/wxw/mAParentFrame.cpp miniAudicle-0.1.3.3/wxw/mAParentFrame.cpp |--- miniAudicle-0.1.3.3~/wxw/mAParentFrame.cpp 2006-07-26 21:52:18.000000000 +0200 |+++ miniAudicle-0.1.3.3/wxw/mAParentFrame.cpp 2006-07-27 15:49:39.000000000 +0200 -------------------------- Patching file wxw/mAParentFrame.cpp using Plan A... Hunk #1 FAILED at 366. 1 out of 1 hunk FAILED -- saving rejects to file wxw/mAParentFrame.cpp.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ru miniAudicle-0.1.3.3~/wxw/mAView.cpp miniAudicle-0.1.3.3/wxw/mAView.cpp |--- miniAudicle-0.1.3.3~/wxw/mAView.cpp 2006-07-26 21:52:18.000000000 +0200 |+++ miniAudicle-0.1.3.3/wxw/mAView.cpp 2006-07-27 15:51:55.000000000 +0200 -------------------------- Patching file wxw/mAView.cpp using Plan A... Hunk #1 FAILED at 179. Hunk #2 FAILED at 191. Hunk #3 FAILED at 203. 3 out of 3 hunks FAILED -- saving rejects to file wxw/mAView.cpp.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ru miniAudicle-0.1.3.3~/wxw/mAVMMonitor.cpp miniAudicle-0.1.3.3/wxw/mAVMMonitor.cpp |--- miniAudicle-0.1.3.3~/wxw/mAVMMonitor.cpp 2006-07-26 21:52:18.000000000 +0200 |+++ miniAudicle-0.1.3.3/wxw/mAVMMonitor.cpp 2006-07-28 18:05:25.000000000 +0200 -------------------------- Patching file wxw/mAVMMonitor.cpp using Plan A... Hunk #1 FAILED at 83. Hunk #2 FAILED at 220. 2 out of 2 hunks FAILED -- saving rejects to file wxw/mAVMMonitor.cpp.rej Hmm... Ignoring the trailing garbage. done
**********************************************************************************
Looking at one of the files though this is what I get:
cat wxw/mAVMMonitor.cpp.rej *************** *** 83,89 **** wxSize( 250, 300 ), wxSUNKEN_BORDER ); sizer->Add( grid, 2, wxALL | wxALIGN_CENTER | wxEXPAND, 10 );
- vm_start = new wxButton( this, mAID_TOGGLE_VM, "Start Virtual Machine" ); sizer->Add( vm_start, 0, wxBOTTOM | wxALIGN_CENTER, 10 );
grid->CreateGrid( 0, 4 ); --- 83,89 ---- wxSize( 250, 300 ), wxSUNKEN_BORDER ); sizer->Add( grid, 2, wxALL | wxALIGN_CENTER | wxEXPAND, 10 );
+ vm_start = new wxButton( this, mAID_TOGGLE_VM, _T( "Start Virtual Machine" ) ); sizer->Add( vm_start, 0, wxBOTTOM | wxALIGN_CENTER, 10 );
grid->CreateGrid( 0, 4 ); *************** *** 220,246 **** now = ( time_t ) ( status.now_system / status.srate ); if( now != last_now ) { - time_counter->SetLabel( wxString::Format( "running time: %u:%02u",
now / 60, now % 60 ) ); last_now = now; }
if( num_shreds != last_num_shreds ) { - shred_count->SetLabel( wxString::Format( "shreds: %u", num_shreds ) ); last_num_shreds = num_shreds; }
for( int i = 0; i < num_shreds; i++ ) { - temp = wxString::Format( "%u", status.list[i]->xid ); grid->SetCellValue( i, 0, temp );
- temp = wxString::Format( "%s", status.list[i]->name.c_str() ); grid->SetCellValue( i, 1, temp );
age = ( time_t ) ( ( status.now_system - status.list[i]->start ) / status.srate ); - temp = wxString::Format( "%u:%02u", age / 60, age % 60 ); grid->SetCellValue( i, 2, temp );
grid->SetCellValue( i, 3, _T( "-" ) ); --- 220,246 ---- now = ( time_t ) ( status.now_system / status.srate ); if( now != last_now ) { + time_counter->SetLabel( wxString::Format( _T( "running time: %u:%02u" ),
now / 60, now % 60 ) ); last_now = now; }
if( num_shreds != last_num_shreds ) { + shred_count->SetLabel( wxString::Format( _T( "shreds: %u" ), num_shreds ) ); last_num_shreds = num_shreds; }
for( int i = 0; i < num_shreds; i++ ) { + temp = wxString::Format( _T( "%u" ), status.list[i]->xid ); grid->SetCellValue( i, 0, temp );
+ temp = wxString::Format( _T( "%s" ), status.list[i]->name.c_str() ); grid->SetCellValue( i, 1, temp );
age = ( time_t ) ( ( status.now_system - status.list[i]->start ) / status.srate ); + temp = wxString::Format( _T( "%u:%02u" ), age / 60, age % 60 ); grid->SetCellValue( i, 2, temp );
grid->SetCellValue( i, 3, _T( "-" ) );
I'm not particularly good at understanding compile and patch errors... so figured this might help you see where the problem is.
Cedric Krier wrote:
Here is a new patch for the unicode issue. It fix the UTF error messages. But I find an other bug. It happens when you try to close a file and there is more than one file open.
Cédric
------------------------------------------------------------------------
diff -ru miniAudicle-0.1.3.3~/wxw/mAConsoleMonitor.cpp miniAudicle-0.1.3.3/wxw/mAConsoleMonitor.cpp --- miniAudicle-0.1.3.3~/wxw/mAConsoleMonitor.cpp 2006-07-26 21:52:18.000000000 +0200 +++ miniAudicle-0.1.3.3/wxw/mAConsoleMonitor.cpp 2006-07-27 15:53:20.000000000 +0200 @@ -203,14 +203,14 @@ { len = read( console_monitor->err_fd, buf, BUF_SIZE-1 ); buf[len] = 0; - console_monitor->text->AppendText( _T( buf ) ); + console_monitor->text->AppendText( wxString(buf, wxConvUTF8) ); }
if( pfd[1].revents & POLLIN ) { len = read( console_monitor->out_fd, buf, BUF_SIZE-1 ); buf[len] = 0; - console_monitor->text->AppendText( _T( buf ) ); + console_monitor->text->AppendText( wxString(buf, wxConvUTF8) ); } } } @@ -223,7 +223,7 @@ //fflush( NULL );
if( fgets( buf, BUF_SIZE, f ) ) - console_monitor->text->AppendText( _T( buf ) ); + console_monitor->text->AppendText( wxString(buf, wxConvUTF8) ); }
#endif /* __PLATFORM_WIN32__ */ diff -ru miniAudicle-0.1.3.3~/wxw/mAParentFrame.cpp miniAudicle-0.1.3.3/wxw/mAParentFrame.cpp --- miniAudicle-0.1.3.3~/wxw/mAParentFrame.cpp 2006-07-26 21:52:18.000000000 +0200 +++ miniAudicle-0.1.3.3/wxw/mAParentFrame.cpp 2006-07-27 15:49:39.000000000 +0200 @@ -366,7 +366,7 @@ sizer->Add( logo, 0, wxALL | wxALIGN_CENTER, 10 );
wxString copystring; - copystring.Printf( MA_ABOUT, MA_VERSION, CK_VERSION ); + copystring.Printf( wxString(MA_ABOUT, wxConvUTF8), MA_VERSION, CK_VERSION ); copystring.Prepend( _T( "miniAudicle\n" ) ); wxStaticText * copytext = new wxStaticText( &about_dialog, wxID_ANY, copystring, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); diff -ru miniAudicle-0.1.3.3~/wxw/mAView.cpp miniAudicle-0.1.3.3/wxw/mAView.cpp --- miniAudicle-0.1.3.3~/wxw/mAView.cpp 2006-07-26 21:52:18.000000000 +0200 +++ miniAudicle-0.1.3.3/wxw/mAView.cpp 2006-07-27 15:51:55.000000000 +0200 @@ -179,7 +179,7 @@
ma->run_code( code, name, cid, cgid, result );
- wxString status( _T( result.c_str() ) ); + wxString status(result.c_str(), wxConvUTF8);
frame->SetStatusText( status ); } @@ -191,7 +191,7 @@
ma->remove_code( cid, cgid, result );
- wxString status( _T( result.c_str() ) ); + wxString status(result.c_str(), wxConvUTF8);
frame->SetStatusText( status ); } @@ -203,7 +203,7 @@
ma->replace_code( code, cid, cgid, result );
- wxString status( _T( result.c_str() ) ); + wxString status( result.c_str(), wxConvUTF8);
frame->SetStatusText( status ); } diff -ru miniAudicle-0.1.3.3~/wxw/mAVMMonitor.cpp miniAudicle-0.1.3.3/wxw/mAVMMonitor.cpp --- miniAudicle-0.1.3.3~/wxw/mAVMMonitor.cpp 2006-07-26 21:52:18.000000000 +0200 +++ miniAudicle-0.1.3.3/wxw/mAVMMonitor.cpp 2006-07-28 18:05:25.000000000 +0200 @@ -83,7 +83,7 @@ wxSize( 250, 300 ), wxSUNKEN_BORDER ); sizer->Add( grid, 2, wxALL | wxALIGN_CENTER | wxEXPAND, 10 );
- vm_start = new wxButton( this, mAID_TOGGLE_VM, "Start Virtual Machine" ); + vm_start = new wxButton( this, mAID_TOGGLE_VM, _T( "Start Virtual Machine" ) ); sizer->Add( vm_start, 0, wxBOTTOM | wxALIGN_CENTER, 10 );
grid->CreateGrid( 0, 4 ); @@ -220,27 +220,27 @@ now = ( time_t ) ( status.now_system / status.srate ); if( now != last_now ) { - time_counter->SetLabel( wxString::Format( "running time: %u:%02u", + time_counter->SetLabel( wxString::Format( _T( "running time: %u:%02u" ), now / 60, now % 60 ) ); last_now = now; }
if( num_shreds != last_num_shreds ) { - shred_count->SetLabel( wxString::Format( "shreds: %u", num_shreds ) ); + shred_count->SetLabel( wxString::Format( _T( "shreds: %u" ), num_shreds ) ); last_num_shreds = num_shreds; }
for( int i = 0; i < num_shreds; i++ ) { - temp = wxString::Format( "%u", status.list[i]->xid ); + temp = wxString::Format( _T( "%u" ), status.list[i]->xid ); grid->SetCellValue( i, 0, temp );
- temp = wxString::Format( "%s", status.list[i]->name.c_str() ); + temp = wxString(status.list[i]->name.c_str(), wxConvUTF8); grid->SetCellValue( i, 1, temp );
age = ( time_t ) ( ( status.now_system - status.list[i]->start ) / status.srate ); - temp = wxString::Format( "%u:%02u", age / 60, age % 60 ); + temp = wxString::Format( _T( "%u:%02u" ), age / 60, age % 60 ); grid->SetCellValue( i, 2, temp );
grid->SetCellValue( i, 3, _T( "-" ) );
------------------------------------------------------------------------
_______________________________________________ chuck-users mailing list chuck-users@lists.cs.princeton.edu https://lists.cs.princeton.edu/mailman/listinfo/chuck-users
_______________________________________________ chuck-users mailing list chuck-users@lists.cs.princeton.edu https://lists.cs.princeton.edu/mailman/listinfo/chuck-users
------------------------------------------------------------------------
_______________________________________________ chuck-users mailing list chuck-users@lists.cs.princeton.edu https://lists.cs.princeton.edu/mailman/listinfo/chuck-users