kitty: Bump to 0.26.5

packages/ncurses/build.sh

@@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=(6.3
 		    9.30
 		    15
-		    0.26.2
+		    0.26.5
 		    0.9.0)
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=(https://ftp.gnu.org/gnu/ncurses/ncurses-${TERMUX_PKG_VERSION[0]}.tar.gz
 		   https://fossies.org/linux/misc/rxvt-unicode-${TERMUX_PKG_VERSION[1]}.tar.bz2
 		   https://github.com/thestinger/termite/archive/v${TERMUX_PKG_VERSION[2]}.tar.gz
@@ -16,7 +16,7 @@ TERMUX_PKG_SRCURL=(https://ftp.gnu.org/gnu/ncurses/ncurses-${TERMUX_PKG_VERSION[
 TERMUX_PKG_SHA256=(97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059
 		   fe1c93d12f385876457a989fc3ae05c0915d2692efc59289d0f70fabe5b44d2d
 		   3ae9ebef28aad081c6c11351f086776e2fd9547563b2f900732b41c376bec05a
-		   69d3ad67b9a4db696c3c089623adadaa34237287cb53ef3309e0bcb62c2324eb
+		   7a1b444f1cc10e16ee0f20a804c0f80b52417eeabf60d9f25e37ef192503ba26
 		   6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3)
 # ncurses-utils: tset/reset/clear are moved to package 'ncurses'.
 TERMUX_PKG_BREAKS="ncurses-dev, ncurses-utils (<< 6.1.20190511-4)"

x11-packages/kitty/build.sh

@@ -4,11 +4,11 @@ TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # When updating the package, also update terminfo for kitty by updating
 # ncurses' kitty sources in main repo
-TERMUX_PKG_VERSION=0.26.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=0.26.5
 TERMUX_PKG_SRCURL=https://github.com/kovidgoyal/kitty/releases/download/v${TERMUX_PKG_VERSION}/kitty-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=586ff599c5a3f31831b2a32dd9faafacb6c3581f2561f8ddcab0ba815bc7dab4
-TERMUX_PKG_DEPENDS="dbus, fontconfig, freetype, harfbuzz, libpng, librsync, libx11, libxkbcommon, littlecms, mesa (>= 22.0.3), python, zlib"
+TERMUX_PKG_SHA256=5544a580314fec7711187ce28162909b5ecff6780071444fe96fb97f8be5c9ad
+# fontconfig is dlopen(3)ed:
+TERMUX_PKG_DEPENDS="dbus, fontconfig, harfbuzz, libpng, librsync, libx11, libxkbcommon, littlecms, mesa (>= 22.0.3), ncurses, openssl, python, zlib"
 TERMUX_PKG_BUILD_DEPENDS="libxcursor, libxi, libxinerama, libxrandr, xorgproto"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_RM_AFTER_INSTALL="
@@ -16,10 +16,13 @@ share/doc/kitty/html
 share/terminfo/x/xterm-kitty
 "
 
-termux_step_pre_configure() {
+termux_step_post_get_source() {
 	sed 's|@TERMUX_PREFIX@|'"$TERMUX_PREFIX"'|g' \
 		$TERMUX_PKG_BUILDER_DIR/posix-shm.c.in > kitty/posix-shm.c
+	cp $TERMUX_PKG_BUILDER_DIR/reallocarray.c glfw/
+}
 
+termux_step_pre_configure() {
 	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
 	termux_setup_python_crossenv
 	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR

x11-packages/kitty/glfw-x11_window.c.patch

@@ -0,0 +1,11 @@
+--- a/glfw/x11_window.c
++++ b/glfw/x11_window.c
+@@ -43,6 +43,8 @@
+ #include <errno.h>
+ #include <assert.h>
+ 
++#include "reallocarray.c"
++
+ // Action for EWMH client messages
+ #define _NET_WM_STATE_REMOVE        0
+ #define _NET_WM_STATE_ADD           1

x11-packages/kitty/reallocarray.c

@@ -0,0 +1,15 @@
+#if defined __ANDROID__ && __ANDROID_API__ < 29
+#include <stdlib.h>
+#include <errno.h>
+
+static void *
+reallocarray(void *ptr, size_t nmemb, size_t size)
+{
+    size_t res;
+    if (__builtin_mul_overflow(nmemb, size, &res)) {
+        errno = ENOMEM;
+        return NULL;
+    }
+    return realloc(ptr, nmemb * size);
+}
+#endif