diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2019-08-06 14:52:18 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2019-08-06 14:52:18 +0000 |
| commit | 0cad1f011aebdf0845ad6fe30dfb387e8b84c05c (patch) | |
| tree | 9c82622e3cf7801bdef46eed0631a0c41f92b719 | |
| parent | 81bbfcc4024b83f3292bcace77baa02984d72841 (diff) | |
| download | aports-0cad1f011aebdf0845ad6fe30dfb387e8b84c05c.tar.bz2 aports-0cad1f011aebdf0845ad6fe30dfb387e8b84c05c.tar.xz | |
testing/kitty: upgrade to 0.14.3
| -rw-r--r-- | testing/kitty/APKBUILD | 8 | ||||
| -rw-r--r-- | testing/kitty/musl.patch | 37 |
2 files changed, 42 insertions, 3 deletions
diff --git a/testing/kitty/APKBUILD b/testing/kitty/APKBUILD index e34cc8699a..eff21cc974 100644 --- a/testing/kitty/APKBUILD +++ b/testing/kitty/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=kitty -pkgver=0.14.2 +pkgver=0.14.3 pkgrel=0 pkgdesc="A modern, hackable, featureful, OpenGL based terminal emulator" url="https://sw.kovidgoyal.net/kitty/" @@ -18,9 +18,10 @@ depends="py3-pygments imagemagick ncurses" makedepends="py3-setuptools harfbuzz-dev zlib-dev libpng-dev freetype-dev fontconfig-dev mesa-dev python3-dev dbus-dev libxi-dev libxkbcommon-dev libxrandr-dev libxinerama-dev libxcursor-dev - wayland-protocols wayland-dev py-sphinx" + wayland-protocols wayland-dev py-sphinx libcanberra-dev" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/kovidgoyal/$pkgname/archive/v$pkgver.tar.gz + musl.patch fix-ppc64le-build-ioctl-with-musl.patch" build() { @@ -35,5 +36,6 @@ package() { python3 setup.py linux-package --prefix ${pkgdir}/usr } -sha512sums="f020125d7dfe7984da8d1538df3c8a6473e5510a22160e62a76fd7a2ef9a3e494b1d05956c003722389c7de0ef99450928ace27f683cee4d81e5e43d2c3b615a kitty-0.14.2.tar.gz +sha512sums="3224cf2ceed41d74728d61bda99c0ba7b77cee3867f6139818fbf37b2aa64a411110df9c96ee86a4dbe8f189717b3c39f16bd4f5737f67b2c66b952e67149b9a kitty-0.14.3.tar.gz +b9005f3fa5329e5c6aaa73900d3b83c51d275c838a587cf4fc375c03be3b695c0730630fdd9895dcc874aae166f9ef507ebe3bf1faaf9983ee2d6569b816d230 musl.patch 330f56f5fd60607c57f4f2cffdf33768b3af9e4c3e271a60a05cc3c653d70f7402af91ba0cdfe0257c8b4779884a6440eb52496078bce11799aaa1829ced9245 fix-ppc64le-build-ioctl-with-musl.patch" diff --git a/testing/kitty/musl.patch b/testing/kitty/musl.patch new file mode 100644 index 0000000000..99b86547a7 --- /dev/null +++ b/testing/kitty/musl.patch @@ -0,0 +1,37 @@ +From 9cbb726566f14454b24d05e6e94c640997fc77ff Mon Sep 17 00:00:00 2001 +From: Kovid Goyal <kovid@kovidgoyal.net> +Date: Tue, 30 Jul 2019 06:20:54 +0530 +Subject: [PATCH] Fix #1865 + +--- + glfw/linux_joystick.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/glfw/linux_joystick.c b/glfw/linux_joystick.c +index d40bf0233..70a86f6f3 100644 +--- a/glfw/linux_joystick.c ++++ b/glfw/linux_joystick.c +@@ -144,10 +144,10 @@ static bool openJoystickDevice(const char* path) + char absBits[(ABS_CNT + 7) / 8] = {0}; + struct input_id id; + +- if (ioctl(linjs.fd, EVIOCGBIT(0, sizeof(evBits)), evBits) < 0 || +- ioctl(linjs.fd, EVIOCGBIT(EV_KEY, sizeof(keyBits)), keyBits) < 0 || +- ioctl(linjs.fd, EVIOCGBIT(EV_ABS, sizeof(absBits)), absBits) < 0 || +- ioctl(linjs.fd, EVIOCGID, &id) < 0) ++ if (ioctl(linjs.fd, (int32_t)EVIOCGBIT(0, sizeof(evBits)), evBits) < 0 || ++ ioctl(linjs.fd, (int32_t)EVIOCGBIT(EV_KEY, sizeof(keyBits)), keyBits) < 0 || ++ ioctl(linjs.fd, (int32_t)EVIOCGBIT(EV_ABS, sizeof(absBits)), absBits) < 0 || ++ ioctl(linjs.fd, (int32_t)EVIOCGID, &id) < 0) + { + _glfwInputError(GLFW_PLATFORM_ERROR, + "Linux: Failed to query input device: %s", +@@ -165,7 +165,7 @@ static bool openJoystickDevice(const char* path) + + char name[256] = ""; + +- if (ioctl(linjs.fd, EVIOCGNAME(sizeof(name)), name) < 0) ++ if (ioctl(linjs.fd, (int32_t)EVIOCGNAME(sizeof(name)), name) < 0) + strncpy(name, "Unknown", sizeof(name)); + + char guid[33] = ""; |