trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: August 2013

Re: [trinity-devel] Tim: k3b FTBFS & proposed patch

From: "Timothy Pearson" <kb9vqf@...>
Date: Sat, 10 Aug 2013 15:07:23 -0500
> Tim,
>
> k3bhalconnection.cpp:845:70: error: no matching function for call
> to 'TDEStorageDevice::mountDevice(const TQString&, TQString&)'
>
> Proposed patch, based upon today's tdebase patch:
>
> diff -urN k3b/libk3bdevice/k3bhalconnection.cpp
> k3b.new/libk3bdevice/k3bhalconnection.cpp
> --- k3b/libk3bdevice/k3bhalconnection.cpp	2013-04-05
> 22:32:35.000000000 -0500
> +++ k3b.new/libk3bdevice/k3bhalconnection.cpp	2013-08-09
> 21:35:42.121489109 -0500
> @@ -840,9 +840,9 @@
>  	TDEStorageDevice* sdevice =
> static_cast<TDEStorageDevice*>(hwdevice);
>
>  	// FIXME
> -	// Options from 'options' are not currently loaded into
> 'optionString'
> -	TQString optionString;
> -	TQString mountedPath = sdevice->mountDevice(mountPoint,
> optionString);
> +	// Options from 'options' are not currently loaded into
> 'mountOptions'
> +	TDEStorageMountOptions mountOptions;
> +	TQString mountedPath = sdevice->mountDevice(mountPoint,
> mountOptions);
>  	if (mountedPath.isNull()) {
>  		return org_freedesktop_Hal_CommunicationError;
>  	}
> @@ -869,8 +869,8 @@
>  	TDEStorageDevice* sdevice =
> static_cast<TDEStorageDevice*>(hwdevice);
>
>  	// FIXME
> -	// Options from 'options' are not currently loaded into
> 'optionString'
> -	TQString optionString;
> +	// Options from 'options' are not currently loaded into
> 'mountOptions'
> +	TQString mountOptions;
>
>  	if (!sdevice->unmountDevice(NULL)) {
>  		// Unmount failed!
>
>
> The patch allowed be to build k3b, although you know more than me
> what is happening.
>
> Darrell

Looks good, go ahead and push.  What is happening is that it was brought
to my attention that the TDE HW library API inadvertently assumed the
usage of pmount in all cases.  Therefore, I updated the API to use a more
generic method of specifying mount options; apparently I missed a few
users of the TDE HW library such as k3b.

Tim