Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2017-11-05 21:02:22 +01:00
parent 3b995d2b63
commit 4aaa265407
2 changed files with 28 additions and 2 deletions

20
SDL2-2.0.7-fix-ibus.diff Normal file
View File

@ -0,0 +1,20 @@
diff -Nur SDL2-2.0.7/src/core/linux/SDL_ibus.c SDL2-2.0.7n/src/core/linux/SDL_ibus.c
--- SDL2-2.0.7/src/core/linux/SDL_ibus.c 2017-10-24 03:27:46.000000000 +0800
+++ SDL2-2.0.7n/src/core/linux/SDL_ibus.c 2017-10-26 18:32:46.795026798 +0800
@@ -299,7 +299,7 @@
caps |= IBUS_CAP_PREEDIT_TEXT;
}
- SDL_DBus_CallVoidMethod(IBUS_SERVICE, input_ctx_path, IBUS_INPUT_INTERFACE, "SetCapabilities",
+ SDL_DBus_CallVoidMethodOnConnection(ibus_conn, IBUS_SERVICE, input_ctx_path, IBUS_INPUT_INTERFACE, "SetCapabilities",
DBUS_TYPE_UINT32, &caps, DBUS_TYPE_INVALID);
}
}
@@ -341,6 +341,7 @@
dbus->bus_add_match(ibus_conn, "type='signal',interface='org.freedesktop.IBus.InputContext'", NULL);
dbus->connection_try_register_object_path(ibus_conn, input_ctx_path, &ibus_vtable, dbus, NULL);
dbus->connection_flush(ibus_conn);
+ result = SDL_TRUE;
}
SDL_IBus_SetFocus(SDL_GetKeyboardFocus() != NULL);

View File

@ -1,7 +1,7 @@
Name: SDL2
Version: 2.0.7
Release: 1%{?dist}
Summary: A cross-platform multimedia library
Release: 2%{?dist}
Summary: Cross-platform multimedia library
License: zlib and MIT
URL: http://www.libsdl.org/
@ -9,6 +9,9 @@ Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
Source1: SDL_config.h
Patch0: multilib.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1507444
# https://bugzilla.libsdl.org/show_bug.cgi?id=3920
Patch1: SDL2-2.0.7-fix-ibus.diff
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
@ -125,6 +128,9 @@ rm -vf %{buildroot}%{_libdir}/*.la
%{_libdir}/lib*.a
%changelog
* Sun Nov 05 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.0.7-2
- Fix IBus
* Tue Oct 24 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.0.7-1
- Update to 2.0.7