[gimp] (2 commits) Non-fast-forward update to branch wip/Jehan/fix-win-CI

[Jehan <jehanp src gnome org>]

The branch 'wip/Jehan/fix-win-CI' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  ba3341b... build: fix json-c cross-build for Windows.

Commits added to the branch:

  505967c... gitlab-ci: fix recently broken CLang compilation. (*)
  2b2a6b0... build: fix json-c cross-build for Windows.

(*) This commit already existed in another branch; no separate mail sent