alarrosa/SDL2
SHA256
1
0
Fork 0
forked from jengelh/SDL2
Code Pull Requests Activity

- Add dbus.diff

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=63
This commit is contained in:
Jan Engelhardt 2017-10-02 19:15:42 +00:00 committed by Git OBS Bridge
parent ebe1d7ac63
commit e156901c4c
3 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SDL2.changes
View File

@ -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 Mon Oct 2 10:06:41 UTC 2017 - guillaume@opensuse.org

16
SDL2.spec
View File

@ -30,7 +30,8 @@ Source: http://libsdl.org/release/%name-%version.tar.gz
Source2: http://libsdl.org/release/%name-%version.tar.gz.sig Source2: http://libsdl.org/release/%name-%version.tar.gz.sig
Source3: %name.keyring Source3: %name.keyring
Source4: baselibs.conf 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake BuildRequires: cmake
BuildRequires: dos2unix BuildRequires: dos2unix
@ -104,8 +105,9 @@ library.
%prep %prep
%setup -q %setup -q
%ifarch ppc64 ppc64le
%patch -P 1 -p1 %patch -P 1 -p1
%ifarch ppc64 ppc64le
%patch -P 2 -p1
%endif %endif
dos2unix WhatsNew.txt dos2unix WhatsNew.txt
dos2unix TODO.txt dos2unix TODO.txt
@ -117,14 +119,12 @@ dos2unix COPYING.txt
%build %build
# In this instance, we do want --with-pic because of libSDL2main.a. # 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} %if 0%{?sle_version}
--disable-fcitx \ --disable-fcitx \
%endif %endif
--disable-rpath \ --disable-rpath
--disable-alsa-shared \
--disable-video-directfb \
--enable-video-kmsdrm
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1
%install %install

21
dbus.diff Normal file
View File

@ -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);
}
}