[meld: 9/9] Merge branch 'windows-fixes' into 'master'

[Kai Willadsen <kaiw src gnome org>]

commit ac02fe2cf55af2217580343d6d3c562f67dd612a
Merge: d3b79365 5024c8f6
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Wed Aug 10 05:05:18 2022 +0000

    Merge branch 'windows-fixes' into 'master'
    
    Fix Windows binary builds for cx_Freeze updates
    
    See merge request GNOME/meld!88

 .gitlab-ci.yml        |  7 +++++--
 bin/meld              |  9 ++-------
 meld/build_helpers.py |  7 ++++++-
 meld/misc.py          | 23 ++++++++++++-----------
 meld/settings.py      | 19 +++++++++++++++++--
 meld/sourceview.py    |  4 ++++
 meld/vc/_vc.py        | 19 +++++++++++++++----
 setup_win32.py        |  8 ++++----
 8 files changed, 65 insertions(+), 31 deletions(-)
---