ncurses: update to development version and enable shared build

Dev is fairly stable, and has fixes for mingw shared build.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

2 files changed, 16 insertions, 74 deletions

diff --git a/src/ncurses-1-fix-headers.patch b/src/ncurses-1-fix-headers.patch
deleted file mode 100644
index 87690b8..0000000
--- a/src/ncurses-1-fix-headers.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch has been taken from:
-http://lists.gnu.org/archive/html/bug-ncurses/2012-07/msg00007.html
-
-# ncurses 5.9 - patch 20120707 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 5.9 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 5.9 are in the subdirectory
-# 	ftp://invisible-island.net/ncurses/5.9
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/5.9/ncurses-5.9-20120707.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Sat Jul  7 23:45:45 UTC 2012
-# ------------------------------------------------------------------------------
-# include/headers             |   17 +++++++++++++----
-# 15 files changed, 13 insertions(+), 4 deletions(-)
-# ------------------------------------------------------------------------------
-Index: include/headers
-Prereq:  1.10 
---- ncurses-5.9-20120630+/include/headers	2009-09-05 17:46:30.000000000 +0000
-+++ ncurses-5.9-20120707/include/headers	2012-07-07 19:58:24.000000000 +0000
-@@ -1,6 +1,6 @@
--# $Id: headers,v 1.10 2009/09/05 17:46:30 tom Exp $
-+# $Id: headers,v 1.11 2012/07/07 19:58:24 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -29,14 +29,23 @@
- #
- # Author: Thomas E. Dickey	1996-on
- #
--term.h
- curses.h
- unctrl.h
--termcap.h
- ncurses_dll.h
-+
-+# Support for termcap (and tic, etc.), which can be a separate library
-+@ termlib
-+term.h
-+termcap.h
-+
-+# Headers used only for tic, other programs using internal interfaces
- @ ticlib
- $(srcdir)/tic.h
- $(srcdir)/term_entry.h
- $(srcdir)/nc_tparm.h
- 
-+# Porting
-+@ port_win32con
-+$(srcdir)/ncurses_mingw.h
-+
- # vile:makemode
diff --git a/src/ncurses.mk b/src/ncurses.mk
index 859240f..6eb5a42 100644
--- a/src/ncurses.mk
+++ b/src/ncurses.mk
@@ -3,19 +3,25 @@
 
 PKG             := ncurses
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.9
-$(PKG)_CHECKSUM := 3e042e5f2c7223bffdaac9646a533b8c758b65b5
-$(PKG)_SUBDIR   := ncurses-$($(PKG)_VERSION)
-$(PKG)_FILE     := ncurses-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://ftp.gnu.org/pub/gnu/ncurses/$($(PKG)_FILE)
+$(PKG)_VERSION  := c6f5464
+$(PKG)_CHECKSUM := 5a40e0906139f877be083976f80bf0262dc95ad2
+# $(PKG)_VERSION  := 5.9
+# $(PKG)_SUBDIR   := ncurses-$($(PKG)_VERSION)
+# $(PKG)_FILE     := ncurses-$($(PKG)_VERSION).tar.gz
+# $(PKG)_URL      := http://ftp.gnu.org/pub/gnu/ncurses/$($(PKG)_FILE)
+$(PKG)_SUBDIR   := mirror-$(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://github.com/mirror/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc libgnurx
 
-define $(PKG)_UPDATE
+define $(PKG)_UPDATE_RELEASE
     $(WGET) -q -O- 'http://ftp.gnu.org/pub/gnu/ncurses/?C=M;O=D' | \
     $(SED) -n 's,.*<a href="ncurses-\([0-9][^"]*\)\.tar.*,\1,p' | \
     head -1
 endef
 
+$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, mirror/ncurses, master)
+
 define $(PKG)_BUILD
     # native build of terminfo compiler
     cp -Rp '$(1)' '$(1).native'
@@ -40,10 +46,9 @@ define $(PKG)_BUILD
         --without-tests \
         --enable-pc-files \
         PKG_CONFIG_LIBDIR='$(PREFIX)/$(TARGET)/lib/pkgconfig' \
-        --with-normal \
-        --without-shared
+        $(if $(BUILD_STATIC), \
+            --with-normal    --without-shared --with-static, \
+            --without-normal --without-static --with-shared)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install TIC_PATH='$(1).native/progs/tic'
-endef
-
-$(PKG)_BUILD_SHARED =
+endef
\ No newline at end of file