mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
- Unbreak after recent sysutils/afflib update changed some function names in
header files used by aimage - Fix warnings about passing std::string objects to printf - Take maintainership Reported by: pointyhat (via pav) Feature safe: yes
This commit is contained in:
parent
851ab17e71
commit
2299afd558
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=267804
@ -10,13 +10,11 @@ PORTVERSION= 3.2.4
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://afflib.org/downloads/
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
MAINTAINER= glarkin@FreeBSD.org
|
||||
COMMENT= Advanced Disk Imager
|
||||
|
||||
LIB_DEPENDS= afflib:${PORTSDIR}/sysutils/afflib
|
||||
|
||||
BROKEN= does not compile
|
||||
|
||||
USE_OPENSSL= yes
|
||||
USE_GMAKE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
|
54
sysutils/aimage/files/patch-src__gui.cpp
Normal file
54
sysutils/aimage/files/patch-src__gui.cpp
Normal file
@ -0,0 +1,54 @@
|
||||
--- ./src/gui.cpp.orig 2008-05-24 10:00:14.000000000 -0400
|
||||
+++ ./src/gui.cpp 2011-01-11 00:53:39.000000000 -0500
|
||||
@@ -282,8 +282,8 @@
|
||||
printf("Bytes written: %qd\n",im->callback_bytes_written);
|
||||
if(acbi) printf("Current phase: %d\n",acbi->phase);
|
||||
printf("Free space on capture drive: %qd\n",im->output_ident->freebytes());
|
||||
- printf("Elapsed Time: %s\n",im->imaging_timer.timer_text());
|
||||
- if(fraction_done>0) printf("Done in: %s\n",im->imaging_timer.eta_text(fraction_done));
|
||||
+ printf("Elapsed Time: %s\n",im->imaging_timer.elapsed_text().c_str());
|
||||
+ if(fraction_done>0) printf("Done in: %s\n",im->imaging_timer.eta_text(fraction_done).c_str());
|
||||
printf("\n");
|
||||
return;
|
||||
}
|
||||
@@ -314,7 +314,7 @@
|
||||
* to use curses...
|
||||
*/
|
||||
|
||||
- mvprintw(time_row,0,"Elapsed Time: %s",im->imaging_timer.timer_text());
|
||||
+ mvprintw(time_row,0,"Elapsed Time: %s",im->imaging_timer.elapsed_text().c_str());
|
||||
|
||||
if(im->imaging){
|
||||
attr_on(WA_BOLD,0);
|
||||
@@ -356,11 +356,11 @@
|
||||
|
||||
if(opt_use_timers){
|
||||
mvprintw(reading_row,0," Time spent reading: %15s ",
|
||||
- im->read_timer.timer_text());
|
||||
+ im->read_timer.elapsed_text().c_str());
|
||||
}
|
||||
if(fraction_done>0){
|
||||
mvprintw(done_in_row,0," Done in: %s ",
|
||||
- im->imaging_timer.eta_text(fraction_done));
|
||||
+ im->imaging_timer.eta_text(fraction_done).c_str());
|
||||
if(imagers.size()>1){
|
||||
printw("(this drive)");
|
||||
|
||||
@@ -373,7 +373,7 @@
|
||||
double total_fraction_done = tsr_ad / ts_ad;
|
||||
if(total_fraction_done>0 && total_fraction_done<100){
|
||||
printw(" %s (all drives)",
|
||||
- total_time.eta_text(total_fraction_done));
|
||||
+ total_time.eta_text(total_fraction_done).c_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -406,7 +406,7 @@
|
||||
attr_off(WA_BOLD,0);
|
||||
|
||||
if(opt_use_timers){
|
||||
- printw(" (%s)", im->write_timer.timer_text());
|
||||
+ printw(" (%s)", im->write_timer.elapsed_text().c_str());
|
||||
}
|
||||
|
||||
if(im->callback_bytes_to_write>0 && im->callback_bytes_written>0 && acbi && acbi->af){
|
Loading…
Reference in New Issue
Block a user