fix(main/libgnt): Build against Termux ncurses headers, not host

Fix building `libgnt`, which before this patch tried to use the host ncurses headers, which no longer works.
termux · Oct 2, 2024 · c41eb63 · c41eb63
1 parent bde9267
commit c41eb63
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/packages/libgnt/build.sh b/packages/libgnt/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="An ncurses toolkit for creating text-mode graphical user
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.14.3
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/pidgin/libgnt/${TERMUX_PKG_VERSION}/libgnt-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=57f5457f72999d0bb1a139a37f2746ec1b5a02c094f2710a339d8bcea4236123
 TERMUX_PKG_DEPENDS="glib, libxml2, ncurses, ncurses-ui-libs"

diff --git a/packages/libgnt/meson.build.patch b/packages/libgnt/meson.build.patch
@@ -0,0 +1,12 @@
+diff -u -r ../libgnt-2.14.3/meson.build ./meson.build
+--- ../libgnt-2.14.3/meson.build	2021-09-26 03:56:33.000000000 +0000
++++ ./meson.build	2024-10-02 20:30:13.929310165 +0000
+@@ -85,7 +85,7 @@
+ 	# FIXME: $host ?
+ 	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
+ else
+-	ncurses_sys_prefix = '/usr'
++	ncurses_sys_prefix = '@TERMUX_PREFIX@'
+ endif
+
+ ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',