From 634cbc7786c93db28403c16f2213e6dcfb849535 Mon Sep 17 00:00:00 2001 From: Chad Wagner <47257594+wagnerch@users.noreply.github.com> Date: Mon, 23 Oct 2023 19:55:53 -0400 Subject: [PATCH] ncurses: enable hashmap (default) for scrolling optimizations and drop patch --- packages/devel/ncurses/package.mk | 2 +- .../patches/ncurses-003-fix_hints.patch | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 packages/devel/ncurses/patches/ncurses-003-fix_hints.patch diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk index d9209926b2..00eebc59ac 100644 --- a/packages/devel/ncurses/package.mk +++ b/packages/devel/ncurses/package.mk @@ -50,7 +50,7 @@ PKG_CONFIGURE_OPTS_TARGET="--without-ada \ --without-develop \ --disable-hard-tabs \ --disable-xmc-glitch \ - --disable-hashmap \ + --enable-hashmap \ --disable-safe-sprintf \ --disable-scroll-hints \ --enable-widec \ diff --git a/packages/devel/ncurses/patches/ncurses-003-fix_hints.patch b/packages/devel/ncurses/patches/ncurses-003-fix_hints.patch deleted file mode 100644 index 8462304867..0000000000 --- a/packages/devel/ncurses/patches/ncurses-003-fix_hints.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix USE_SCROLL_HINTS/USE_HASHMAP logic - ---- a/ncurses/curses.priv.h 2018-12-16 02:16:58.000000000 +0100 -+++ a/ncurses/curses.priv.h 2021-05-30 00:12:14.086528124 +0200 -@@ -258,10 +258,9 @@ extern NCURSES_EXPORT(void *) _nc_memmov - /* - * Scroll hints are useless when hashmap is used - */ --#if !USE_SCROLL_HINTS --#if !USE_HASHMAP --#define USE_SCROLL_HINTS 1 --#else -+#if USE_SCROLL_HINTS -+#if USE_HASHMAP -+#undef USE_SCROLL_HINTS - #define USE_SCROLL_HINTS 0 - #endif - #endif