[kaffeine/f24] Patch for gcc6 and cmake changes