commit 946ee9814696c2dc09f91f9ebfd16dc9bd3fc92f
parent ba451bd8aab15d2be0ca0d53ff064e4ef5ce4318
Author: Ted Hess <thess@kitschensync.net>
Date: Wed, 18 May 2016 17:54:07 -0400
zile: Fix build with latest ncurses changes
Signed-off-by: Ted Hess <thess@kitschensync.net>
Diffstat:
3 files changed, 2 insertions(+), 28 deletions(-)
diff --git 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
@@ -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
@@ -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
