[meld] Merge branch 'include-dbus-exe' into 'meld-3-20'



commit 82288aa389c0b9e2adb0cf97bff210bdda725e0c
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Jan 10 05:11:49 2020 +0000

    Merge branch 'include-dbus-exe' into 'meld-3-20'
    
    win32, installer: Glib 2.62+ requires gdbus.exe for dbus-related apis
    
    See merge request GNOME/meld!47
    
    (cherry picked from commit 2aaddaff7113d28eef25d3501c3874ba13a62e89)
    
    721eefe3 Glib 2.62+ requires gdbus.exe for dbus-related apis

 setup_win32.py | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/setup_win32.py b/setup_win32.py
index 1b3a4147..45838b40 100755
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -29,6 +29,9 @@ def get_non_python_libs():
         # dll imported by dll dependencies expected to be auto-resolved later
         inst_root = [os.path.join(local_bin, 'libgtksourceview-4-0.dll')]
 
+        # required for communicating multiple instances
+        inst_lib.append(os.path.join(local_bin, 'gdbus.exe'))
+
         # gspawn-helper is needed for Gtk.show_uri function
         if platform.architecture()[0] == '32bit':
             inst_lib.append(os.path.join(local_bin, 'gspawn-win32-helper.exe'))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]