[meld/meld-3-20: 1/2] Glib 2.62+ requires gdbus.exe for dbus-related apis
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/meld-3-20: 1/2] Glib 2.62+ requires gdbus.exe for dbus-related apis
- Date: Fri, 10 Jan 2020 05:12:08 +0000 (UTC)
commit 721eefe387733c2c672d12fd43a48d3b7b83b587
Author: Vasily Galkin <galkin-vv ya ru>
Date: Sun Jan 5 02:24:33 2020 +0300
Glib 2.62+ requires gdbus.exe for dbus-related apis
Usage of rundll32 was replaced by usage of gdbus.exe during fixing
https://gitlab.gnome.org/GNOME/glib/issues/1566
moved form meld's bug https://gitlab.gnome.org/GNOME/meld/issues/220
Since meld msi's on gitlab are built with rolling-release msys2
that already upgraded to glib 2.62
the gdbus.exe binary must be included in meld distribution.
Without this meld distribution built on current msys just silenetly fails
to do dbus communications (each process behaves indepently).
This patch does NOT break building meld distribution
with earlier versions of msys2: the gdbus.exe binary do present in
versions earlier to 2.62 (just not used for running session dbus)
setup_win32.py | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/setup_win32.py b/setup_win32.py
index 9c1a98d1..2ab7de55 100755
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -31,6 +31,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-3.0-1.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]