Merge remote branch 'taglib/master' into abstract-io

diff --cc taglib/CMakeLists.txt
Simple merge

diff --cc taglib/flac/flacfile.cpp
Simple merge

diff --cc taglib/toolkit/tfile.cpp
index c0afd4031bc41923e562d72fd7216c2f35aa6068,93879f10cdfba20efd4afc65feab8a1d2a9f2f6e..bb0261eae3a6df461a73a4d62414ae1090b803af
--- 1/taglib/toolkit/tfile.cpp
--- 2/taglib/toolkit/tfile.cpp
+++ b/taglib/toolkit/tfile.cpp
@@@ -314,12 -550,18 +314,13 @@@ bool File::isWritable(const char *file
  // protected members
  ////////////////////////////////////////////////////////////////////////////////
  
 -void File::setValid(bool valid)
 -{
 -  d->valid = valid;
 -}
 -
 -void File::truncate(long length)
 +TagLib::uint File::bufferSize()
  {
 -  ftruncate(fileno(d->file), length);
 +  return FilePrivate::bufferSize;
  }
  
 -TagLib::uint File::bufferSize()
 +void File::setValid(bool valid)
  {
 -  return FilePrivate::bufferSize;
 +  d->valid = valid;
  }
+