Log Message:
Fix compilation when building against gtk+ >= 2.18.  Patches from the upstream
sources.  This should address PR pkg/42508.
While here add the LICENSE setting.