Add staging support for file-roller3
Add staging support
Fix try to fix the build with gcc. clang is happy with the changes too.
Merge remote-tracking branch 'upstream/master'