Date: Thursday, October 5, 2017 @ 08:33:46 Author: heftig Revision: 306786
archrelease: copy trunk to extra-i686, extra-x86_64 Added: sdl2/repos/extra-i686/PKGBUILD (from rev 306785, sdl2/trunk/PKGBUILD) sdl2/repos/extra-i686/ibus.diff (from rev 306785, sdl2/trunk/ibus.diff) sdl2/repos/extra-x86_64/PKGBUILD (from rev 306785, sdl2/trunk/PKGBUILD) sdl2/repos/extra-x86_64/ibus.diff (from rev 306785, sdl2/trunk/ibus.diff) Deleted: sdl2/repos/extra-i686/PKGBUILD sdl2/repos/extra-x86_64/PKGBUILD ------------------------+ /PKGBUILD | 88 +++++++++++++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 39 -------------------- extra-i686/ibus.diff | 13 ++++++ extra-x86_64/PKGBUILD | 39 -------------------- extra-x86_64/ibus.diff | 13 ++++++ 5 files changed, 114 insertions(+), 78 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-10-05 08:32:44 UTC (rev 306785) +++ extra-i686/PKGBUILD 2017-10-05 08:33:46 UTC (rev 306786) @@ -1,39 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -pkgname=sdl2 -pkgver=2.0.6 -pkgrel=1 -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" -license=('MIT') -depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl' 'libxcursor') -makedepends=('alsa-lib' 'mesa' 'libpulse' 'libxrandr' 'libxinerama' 'wayland' 'libxkbcommon' - '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}) -sha512sums=('ad4dad5663834ee0ffbdca1b531d753449b260c9256df2c48da7261aacd9795d91eef1286525cf914f6b92ba5985de7798f041557574b5d978b8224f10041830' - 'SKIP') -validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6') - -prepare() { - mkdir build -} - -build() { - cd build - ../SDL2-$pkgver/configure --prefix=/usr \ - --enable-sdl-dlopen \ - --disable-arts --disable-esd --disable-nas \ - --enable-alsa --enable-pulseaudio-shared \ - --enable-video-wayland \ - --enable-ibus --enable-fcitx \ - --disable-rpath - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - install -Dm644 ../SDL2-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} Copied: sdl2/repos/extra-i686/PKGBUILD (from rev 306785, sdl2/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-10-05 08:33:46 UTC (rev 306786) @@ -0,0 +1,44 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +pkgname=sdl2 +pkgver=2.0.6 +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" +license=('MIT') +depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl' 'libxcursor') +makedepends=('alsa-lib' 'mesa' 'libpulse' 'libxrandr' 'libxinerama' 'wayland' 'libxkbcommon' + '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} + ibus.diff) +sha512sums=('ad4dad5663834ee0ffbdca1b531d753449b260c9256df2c48da7261aacd9795d91eef1286525cf914f6b92ba5985de7798f041557574b5d978b8224f10041830' + 'SKIP' + '78697993f2bd11193c1b4d69076f5162f4c76be13d4f1c3f84162163d4d7d9a887f9d9ece93ed3effdcadb8e0e46b4a88de51699f4654fb318309f20b47867d4') +validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6') + +prepare() { + mkdir build + cd SDL2-$pkgver + # Fix abort caused by unterminated varargs + patch -Np1 -i ../ibus.diff +} + +build() { + cd build + ../SDL2-$pkgver/configure --prefix=/usr \ + --enable-sdl-dlopen \ + --disable-arts --disable-esd --disable-nas \ + --enable-alsa --enable-pulseaudio-shared \ + --enable-video-wayland \ + --enable-ibus --enable-fcitx \ + --disable-rpath + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + install -Dm644 ../SDL2-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Copied: sdl2/repos/extra-i686/ibus.diff (from rev 306785, sdl2/trunk/ibus.diff) =================================================================== --- extra-i686/ibus.diff (rev 0) +++ extra-i686/ibus.diff 2017-10-05 08:33:46 UTC (rev 306786) @@ -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); + } + } + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-10-05 08:32:44 UTC (rev 306785) +++ extra-x86_64/PKGBUILD 2017-10-05 08:33:46 UTC (rev 306786) @@ -1,39 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -pkgname=sdl2 -pkgver=2.0.6 -pkgrel=1 -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" -license=('MIT') -depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl' 'libxcursor') -makedepends=('alsa-lib' 'mesa' 'libpulse' 'libxrandr' 'libxinerama' 'wayland' 'libxkbcommon' - '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}) -sha512sums=('ad4dad5663834ee0ffbdca1b531d753449b260c9256df2c48da7261aacd9795d91eef1286525cf914f6b92ba5985de7798f041557574b5d978b8224f10041830' - 'SKIP') -validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6') - -prepare() { - mkdir build -} - -build() { - cd build - ../SDL2-$pkgver/configure --prefix=/usr \ - --enable-sdl-dlopen \ - --disable-arts --disable-esd --disable-nas \ - --enable-alsa --enable-pulseaudio-shared \ - --enable-video-wayland \ - --enable-ibus --enable-fcitx \ - --disable-rpath - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - install -Dm644 ../SDL2-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} Copied: sdl2/repos/extra-x86_64/PKGBUILD (from rev 306785, sdl2/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-10-05 08:33:46 UTC (rev 306786) @@ -0,0 +1,44 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +pkgname=sdl2 +pkgver=2.0.6 +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" +license=('MIT') +depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl' 'libxcursor') +makedepends=('alsa-lib' 'mesa' 'libpulse' 'libxrandr' 'libxinerama' 'wayland' 'libxkbcommon' + '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} + ibus.diff) +sha512sums=('ad4dad5663834ee0ffbdca1b531d753449b260c9256df2c48da7261aacd9795d91eef1286525cf914f6b92ba5985de7798f041557574b5d978b8224f10041830' + 'SKIP' + '78697993f2bd11193c1b4d69076f5162f4c76be13d4f1c3f84162163d4d7d9a887f9d9ece93ed3effdcadb8e0e46b4a88de51699f4654fb318309f20b47867d4') +validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6') + +prepare() { + mkdir build + cd SDL2-$pkgver + # Fix abort caused by unterminated varargs + patch -Np1 -i ../ibus.diff +} + +build() { + cd build + ../SDL2-$pkgver/configure --prefix=/usr \ + --enable-sdl-dlopen \ + --disable-arts --disable-esd --disable-nas \ + --enable-alsa --enable-pulseaudio-shared \ + --enable-video-wayland \ + --enable-ibus --enable-fcitx \ + --disable-rpath + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + install -Dm644 ../SDL2-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Copied: sdl2/repos/extra-x86_64/ibus.diff (from rev 306785, sdl2/trunk/ibus.diff) =================================================================== --- extra-x86_64/ibus.diff (rev 0) +++ extra-x86_64/ibus.diff 2017-10-05 08:33:46 UTC (rev 306786) @@ -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); + } + } +