Fix invalid dbus arguments

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2017-10-05 23:07:30 +02:00
parent 106ce7003a
commit 55efd55e4b
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,30 @@
# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1507221448 25200
# Thu Oct 05 09:37:28 2017 -0700
# Node ID dc7245e3d1f2ae032caa7776940af4aebe6afc05
# Parent 3a23ca10675256240c5da2e68c6dceacb8d41dde
Fixed bug 3854 - arguments to dbus_type_is_basic() were incorrect
Aaron
As of 2.0.6, all of my games are failing with the following error:
process 31778: arguments to dbus_type_is_basic() were incorrect, assertion "dbus_type_is_valid (typecode) || typecode == DBUS_TYPE_INVALID" failed in file dbus-signature.c line 322.
This is normally a bug in some application using the D-Bus library.
D-Bus not built with -rdynamic so unable to print a backtrace
(patch by Ozkan Sezer)
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);
}
}

View File

@ -1,6 +1,6 @@
Name: SDL2 Name: SDL2
Version: 2.0.6 Version: 2.0.6
Release: 1%{?dist} Release: 2%{?dist}
Summary: A cross-platform multimedia library Summary: A cross-platform multimedia library
License: zlib and MIT License: zlib and MIT
@ -9,6 +9,10 @@ Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
Source1: SDL_config.h Source1: SDL_config.h
Patch0: multilib.patch Patch0: multilib.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1496895
# https://bugzilla.libsdl.org/show_bug.cgi?id=3854
# https://hg.libsdl.org/SDL/rev/dc7245e3d1f2
Patch1: SDL2-2.0.6-invalid-dbus-args.patch
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel BuildRequires: audiofile-devel
@ -125,6 +129,9 @@ rm -vf %{buildroot}%{_libdir}/*.la
%{_libdir}/lib*.a %{_libdir}/lib*.a
%changelog %changelog
* Thu Oct 05 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.0.6-2
- Fix invalid dbus arguments
* Sat Sep 23 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.0.6-1 * Sat Sep 23 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.0.6-1
- Update to 2.0.6 - Update to 2.0.6