[Pkg-sdl-commits] [libsdl2] 01/01: Backport upstream fix for dbus issue/error

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository libsdl2.

commit ce467bde0cbcdd83d24b4d6e197de4d5bfc50788
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Oct 7 09:34:36 2017 +0200

    Backport upstream fix for dbus issue/error
---
 debian/changelog                  |  9 +++++++++
 debian/patches/dc7245e3d1f2.patch | 18 ++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 862fbdf..83f8d75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libsdl2 (2.0.6+dfsg1-3) UNRELEASED; urgency=medium
+
+  * debian/patches/dc7245e3d1f2.patch:
+    - backport upstream fix for dbus error.
+      LP: #1721907
+      thanks LGB [Gábor Lénárt] (lgb) for the report!
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sat, 07 Oct 2017 09:33:15 +0200
+
 libsdl2 (2.0.6+dfsg1-2) unstable; urgency=medium
 
   * Fix libSDL2-2.0.so symlink, thanks Andreas Beckmann (Closes: #877270)
diff --git a/debian/patches/dc7245e3d1f2.patch b/debian/patches/dc7245e3d1f2.patch
new file mode 100644
index 0000000..524519a
--- /dev/null
+++ b/debian/patches/dc7245e3d1f2.patch
@@ -0,0 +1,18 @@
+Origin: https://hg.libsdl.org/SDL/rev/dc7245e3d1f2
+
+diff -r 3a23ca106752 -r dc7245e3d1f2 src/core/linux/SDL_ibus.c
+--- a/src/core/linux/SDL_ibus.c	Mon Oct 02 10:50:33 2017 -0700
++++ b/src/core/linux/SDL_ibus.c	Thu Oct 05 09:37:28 2017 -0700
+@@ -479,7 +479,7 @@
+     SDL_DBusContext *dbus = SDL_DBus_GetContext();
+     
+     if (IBus_CheckConnection(dbus)) {
+-        SDL_DBus_CallVoidMethodOnConnection(ibus_conn, IBUS_SERVICE, input_ctx_path, IBUS_INPUT_INTERFACE, method);
++        SDL_DBus_CallVoidMethodOnConnection(ibus_conn, IBUS_SERVICE, input_ctx_path, IBUS_INPUT_INTERFACE, method, DBUS_TYPE_INVALID);
+     }
+ }
+ 
+
+
+
+
diff --git a/debian/patches/series b/debian/patches/series
index e1e64f2..0e79947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 no-libdir.patch
+dc7245e3d1f2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2.git