Attached patches fixes following important build problems of mergeant:

mergeant-implicit-declarations.patch: Fixes implicit declarations causing potential crash for platforms with different sizes of pointer and integer (x86_64).

mergeant-data.patch: Compoud patch fixing support data files. It fixes following issues:

- Migrates obsolete (since GNOME 2.8) GNOME Mime Info to Shared MIME Info.

- Implements --disable-update-mimedb to for packaging of Shared MIME info.

- Fixed desktop file:
  - Added GenericName
  - Don't use not allowed relative path
  - Use approved Categories

- Fixes make distcheck

- Moves mergeant.png to one of two approved locations of desktop file icon.

- Moves MIME icon to proper location (TODO: Redesign icon to conform MIME icon conventions).

After applying of this patch, you have to do:

mv data/gnome-application-x-mergeant.png data/application-x-mergeant.png 
rm data/mergeant.applications data/mergeant.keys.in data/mergeant.keys data/mergeant.mime 

WARNING: I am not able to find any reference to many image files installed to datadir/pixmaps/mergeant, so I did not verify, that move of mergeant.png from datadir/pixmaps/mergeant/mergeant.png to datadir/pixmaps/mergeant.png is correct. If not, you have to make a copy or symlink.