[arch-commits] Commit in sdl2/trunk (PKGBUILD ibus.diff)

[Jan Steffens]

    Date: Thursday, October 5, 2017 @ 08:32:44
  Author: heftig
Revision: 306785

2.0.6-2

Added:
  sdl2/trunk/ibus.diff
Modified:
  sdl2/trunk/PKGBUILD

-----------+
 PKGBUILD  |   11 ++++++++---
 ibus.diff |   13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-05 07:44:11 UTC (rev 306784)
+++ PKGBUILD	2017-10-05 08:32:44 UTC (rev 306785)
@@ -1,7 +1,7 @@
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 pkgname=sdl2
 pkgver=2.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org"
@@ -11,13 +11,18 @@
              'wayland-protocols' 'ibus' 'fcitx' 'libxss')
 optdepends=('alsa-lib: ALSA audio driver'
             'libpulse: PulseAudio audio driver')
-source=("https://www.libsdl.org/release/SDL2-${pkgver}.tar.gz"{,.sig})
+source=("https://www.libsdl.org/release/SDL2-${pkgver}.tar.gz"{,.sig}
+        ibus.diff)
 sha512sums=('ad4dad5663834ee0ffbdca1b531d753449b260c9256df2c48da7261aacd9795d91eef1286525cf914f6b92ba5985de7798f041557574b5d978b8224f10041830'
-            'SKIP')
+            'SKIP'
+            '78697993f2bd11193c1b4d69076f5162f4c76be13d4f1c3f84162163d4d7d9a887f9d9ece93ed3effdcadb8e0e46b4a88de51699f4654fb318309f20b47867d4')
 validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6')
 
 prepare() {
   mkdir build
+  cd SDL2-$pkgver
+  # Fix abort caused by unterminated varargs
+  patch -Np1 -i ../ibus.diff
 }
 
 build() {

Added: ibus.diff
===================================================================
--- ibus.diff	                        (rev 0)
+++ ibus.diff	2017-10-05 08:32:44 UTC (rev 306785)
@@ -0,0 +1,13 @@
+diff --git i/src/core/linux/SDL_ibus.c w/src/core/linux/SDL_ibus.c
+index 0fcec87a1107f34a..f537380963e5efaa 100644
+--- i/src/core/linux/SDL_ibus.c
++++ w/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);
+     }
+ }
+