[meld/meld-3-20] Clear MinGW environment variable to avoid library path issues (#267)

[Kai Willadsen <kaiw src gnome org>]

commit 20540d6f3a837430b880079dd6f659438d64c1a0
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Tue Dec 31 08:09:41 2019 +1000

    Clear MinGW environment variable to avoid library path issues (#267)
    
    The MSYSTEM environment variable causes issues for our msys-bundled
    binary when it looks for DLLs. There's not a lot of accessible
    information on what this is supposed to do, but clearing the variable
    fixes the problem, which is good enough for now.

 bin/meld | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index 5406ea76..038afd2a 100755
--- a/bin/meld
+++ b/bin/meld
@@ -348,8 +348,9 @@ def setup_glib_logging():
 
 def environment_hacks():
     # We manage cwd ourselves for git operations, and GIT_DIR in particular
-    # can mess with this when set.
-    for var in ('GIT_DIR', 'GIT_WORK_TREE'):
+    # can mess with this when set. MSYSTEM is set by git, and confuses our
+    # msys-packaged version's library search path.
+    for var in ('GIT_DIR', 'GIT_WORK_TREE', 'MSYSTEM'):
         try:
             del os.environ[var]
         except KeyError:
@@ -357,13 +358,13 @@ def environment_hacks():
 
 
 if __name__ == '__main__':
+    environment_hacks()
     setup_logging()
     disable_stdout_buffering()
     check_requirements()
     setup_glib_logging()
     setup_resources()
     setup_settings()
-    environment_hacks()
 
     import meld.meldapp
     if sys.platform != 'win32':