From e156901c4cf02d2e7d918f01c8962706967700be76c1ae40d87bf35b0f853c13 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 2 Oct 2017 19:15:42 +0000
Subject: [PATCH] - Add dbus.diff

OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=63
---
 SDL2.changes |  5 +++++
 SDL2.spec    | 16 ++++++++--------
 dbus.diff    | 21 +++++++++++++++++++++
 3 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 dbus.diff

diff --git a/SDL2.changes b/SDL2.changes
index 23d2059..e6d314b 100644
--- a/SDL2.changes
+++ b/SDL2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct  2 19:11:12 UTC 2017 - jengelh@inai.de
+
+- Add dbus.diff
+
 -------------------------------------------------------------------
 Mon Oct  2 10:06:41 UTC 2017 - guillaume@opensuse.org
 
diff --git a/SDL2.spec b/SDL2.spec
index 4791ef1..59eb0c2 100644
--- a/SDL2.spec
+++ b/SDL2.spec
@@ -30,7 +30,8 @@ Source:         http://libsdl.org/release/%name-%version.tar.gz
 Source2:        http://libsdl.org/release/%name-%version.tar.gz.sig
 Source3:        %name.keyring
 Source4:        baselibs.conf
-Patch1:         %{name}-ppc64-declaration-after-statement.patch
+Patch1:         dbus.diff
+Patch2:         %name-ppc64-declaration-after-statement.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  dos2unix
@@ -104,8 +105,9 @@ library.
 
 %prep
 %setup -q
-%ifarch ppc64 ppc64le
 %patch -P 1 -p1
+%ifarch ppc64 ppc64le
+%patch -P 2 -p1
 %endif
 dos2unix WhatsNew.txt
 dos2unix TODO.txt
@@ -117,14 +119,12 @@ dos2unix COPYING.txt
 
 %build
 # In this instance, we do want --with-pic because of libSDL2main.a.
-%configure --with-pic \
+%configure --with-pic --disable-alsa-shared --disable-video-directfb \
+	--enable-video-kmsdrm \
 %if 0%{?sle_version}
-    --disable-fcitx \
+	--disable-fcitx \
 %endif
-    --disable-rpath \
-    --disable-alsa-shared \
-    --disable-video-directfb \
-    --enable-video-kmsdrm
+	--disable-rpath
 make %{?_smp_mflags} V=1
 
 %install
diff --git a/dbus.diff b/dbus.diff
new file mode 100644
index 0000000..dd30509
--- /dev/null
+++ b/dbus.diff
@@ -0,0 +1,21 @@
+References: https://bugzilla.libsdl.org/show_bug.cgi?id=3854
+
+Fix an assertion, triggered by libdbus receiving garbage
+from a varargs function in SDL.
+---
+ src/core/linux/SDL_ibus.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: SDL2-2.0.6/src/core/linux/SDL_ibus.c
+===================================================================
+--- SDL2-2.0.6.orig/src/core/linux/SDL_ibus.c
++++ SDL2-2.0.6/src/core/linux/SDL_ibus.c
+@@ -479,7 +479,7 @@ IBus_SimpleMessage(const char *method)
+     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);
+     }
+ }
+