Package: gparted
Version: 0.3.9-1
Severity: important
Tags: patch
gparted fails to build on arm armel mips and mipsel since a patch in the
package isn't complete. I attach an updated version. The interdiff of
both patches is:
diff -u gparted-0.3.9/src/GParted_Core.cc gparted-0.3.9/src/GParted_Core.cc
--- gparted-0.3.9/src/GParted_Core.cc 2008-09-16 20:42:31.000000000 +1000
+++ gparted-0.3.9/src/GParted_Core.cc 2008-09-16 20:42:31.000000000 +1000
@@ -1750,7 +1750,7 @@
//Benchmark copy times using different block sizes to determine optimal
size
while ( succes &&
- std::llabs( done ) + N <= length &&
+ llabs( done ) + N <= length &&
benchmark_blocksize <= N )
{
timer .reset() ;
Thiemo
--- gparted-0.3.9/src/GParted_Core.cc 2008-09-13 08:13:54.000000000 +1000
+++ gparted-0.3.9/src/GParted_Core.cc 2008-09-16 20:42:31.000000000 +1000
@@ -1750,7 +1750,7 @@ bool GParted_Core::copy_filesystem( cons
//Benchmark copy times using different block sizes to determine optimal size
while ( succes &&
- std::llabs( done ) + N <= length &&
+ llabs( done ) + N <= length &&
benchmark_blocksize <= N )
{
timer .reset() ;
@@ -1792,7 +1792,7 @@ bool GParted_Core::copy_filesystem( cons
dst_device,
src_start + ( dst_start > src_start ? 0 : done ),
dst_start + ( dst_start > src_start ? 0 : done ),
- length - std::llabs( done ),
+ length - ::llabs( done ),
optimal_blocksize,
operationdetail,
readonly,
@@ -1966,7 +1966,7 @@ bool GParted_Core::copy_blocks( const Gl
if ( lp_device_src && lp_device_dst && ped_device_open( lp_device_src ) && ped_device_open( lp_device_dst ) )
{
Glib::ustring error_message ;
- buf = static_cast<char *>( malloc( std::llabs( blocksize ) * 512 ) ) ;
+ buf = static_cast<char *>( malloc( ::llabs( blocksize ) * 512 ) ) ;
if ( buf )
{
ped_device_sync( lp_device_dst ) ;
@@ -1987,7 +1987,7 @@ bool GParted_Core::copy_blocks( const Gl
operationdetail .get_last_child() .add_child( OperationDetail( "", STATUS_NONE ) ) ;
Glib::Timer timer_progress_timeout, timer_total ;
- while( succes && std::llabs( done ) < length )
+ while( succes && ::llabs( done ) < length )
{
succes = copy_block( lp_device_src,
lp_device_dst,
@@ -2002,7 +2002,7 @@ bool GParted_Core::copy_blocks( const Gl
if ( timer_progress_timeout .elapsed() >= 0.5 )
{
set_progress_info( length,
- std::llabs( done + blocksize ),
+ ::llabs( done + blocksize ),
timer_total,
operationdetail .get_last_child() .get_last_child(),
readonly ) ;
@@ -2021,13 +2021,13 @@ bool GParted_Core::copy_blocks( const Gl
//final description
operationdetail .get_last_child() .get_last_child() .set_description(
- String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), std::llabs( done ), length ), FONT_ITALIC ) ;
+ String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), ::llabs( done ), length ), FONT_ITALIC ) ;
if ( ! succes && ! error_message .empty() )
operationdetail .get_last_child() .add_child(
OperationDetail( error_message, STATUS_NONE, FONT_ITALIC ) ) ;
- total_done += std::llabs( done ) ;
+ total_done += ::llabs( done ) ;
//close and destroy the devices..
ped_device_close( lp_device_src ) ;
@@ -2054,7 +2054,7 @@ bool GParted_Core::copy_block( PedDevice
{
if ( blocksize < 0 )
{
- blocksize = std::llabs( blocksize ) ;
+ blocksize = ::llabs( blocksize ) ;
offset_src -= ( blocksize -1 ) ;
offset_dst -= ( blocksize -1 ) ;
}
