zile: Fix build with latest ncurses changes

Signed-off-by: Ted Hess <redacted>

diff --git a/utils/zile/Makefile b/utils/zile/Makefile
index c9ab03af79ddba1c5e913cad6f9ea811d5d9b27f..0bd948791fffc221b1b93c6dbaced88dcb05bff6 100644 (file)
--- a/utils/zile/Makefile
+++ b/utils/zile/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zile
 PKG_VERSION:=2.3.24
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/zile

diff --git a/utils/zile/patches/005-fix_configure_checking_for_ncursesw.patch b/utils/zile/patches/005-fix_configure_checking_for_ncursesw.patch
deleted file mode 100644 (file)
index 26ef0ab..0000000
--- a/utils/zile/patches/005-fix_configure_checking_for_ncursesw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/ax_with_curses.m4
-+++ b/m4/ax_with_curses.m4
-@@ -72,7 +72,7 @@ AC_DEFUN([AX_WITH_CURSES],
-        AC_CACHE_CHECK([for working ncursesw], ax_cv_ncursesw,
-          [LIBS="$ax_save_LIBS -lncursesw"
-           AC_TRY_LINK(
--            [#include <ncurses.h>],
-+            [#include <ncursesw/ncurses.h>],
-             [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
-             ax_cv_ncursesw=yes, ax_cv_ncursesw=no)])
-        if test "$ax_cv_ncursesw" = yes

diff --git a/utils/zile/patches/020-build_with_ncursesw.patch b/utils/zile/patches/020-build_with_ncursesw.patch
deleted file mode 100644 (file)
index 9a4cffb..0000000
--- a/utils/zile/patches/020-build_with_ncursesw.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/term_curses.c
-+++ b/src/term_curses.c
-@@ -23,7 +23,11 @@
- 
- #include <stdlib.h>
- #ifdef HAVE_NCURSES_H
--#include <ncurses.h>
-+# ifdef HAVE_NCURSESW
-+# include <ncursesw/ncurses.h>
-+# else
-+# include <ncurses.h>
-+# endif
- #else
- #include <curses.h>
- #endif