Update ncurses to 6.1

7 files changed, 62 insertions, 14 deletions

diff --git a/data/ncurses/_metadata/depends b/data/ncurses/_metadata/depends
new file mode 100644
index 000000000..93e905f96
--- /dev/null
+++ b/data/ncurses/_metadata/depends
@@ -0,0 +1 @@
+ncurses5-libs
diff --git a/data/ncurses/_metadata/version b/data/ncurses/_metadata/version
index 760606e1f..a435f5a56 100644
--- a/data/ncurses/_metadata/version
+++ b/data/ncurses/_metadata/version
@@ -1 +1 @@
-5.7
+6.1
diff --git a/data/ncurses/clang.diff b/data/ncurses/clang.diff
new file mode 100644
index 000000000..407410221
--- /dev/null
+++ b/data/ncurses/clang.diff
@@ -0,0 +1,43 @@
+diff -ruNp ncurses-5.8.orig/c++/cursesf.h ncurses-5.8/c++/cursesf.h
+--- ncurses-5.8.orig/c++/cursesf.h	2005-08-13 21:08:24.000000000 +0300
++++ ncurses-5.8/c++/cursesf.h	2011-04-03 18:29:29.000000000 +0300
+@@ -681,7 +681,7 @@ public:
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+-    : NCursesForm (Fields, with_frame, autoDelete_Fields) {
++    : NCursesForm (&Fields, with_frame, autoDelete_Fields) {
+       if (form)
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+@@ -694,7 +694,7 @@ public:
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+-    : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
++    : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x,
+ 		   with_frame, autoDelete_Fields) {
+       if (form)
+ 	set_user (const_cast<void *>(p_UserData));
+diff -ruNp ncurses-5.8.orig/c++/cursesm.h ncurses-5.8/c++/cursesm.h
+--- ncurses-5.8.orig/c++/cursesm.h	2005-08-13 21:10:36.000000000 +0300
++++ ncurses-5.8/c++/cursesm.h	2011-04-03 18:31:42.000000000 +0300
+@@ -639,7 +639,7 @@ public:
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Items=FALSE)
+-    : NCursesMenu (Items, with_frame, autoDelete_Items) {
++    : NCursesMenu (&Items, with_frame, autoDelete_Items) {
+       if (menu)
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+@@ -651,7 +651,7 @@ public:
+ 		   int begin_x = 0,
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE)
+-    : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
++    : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) {
+       if (menu)
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+
diff --git a/data/ncurses/make.sh b/data/ncurses/make.sh
index 1c3d79359..177e2c812 100644
--- a/data/ncurses/make.sh
+++ b/data/ncurses/make.sh
@@ -6,19 +6,23 @@ mkdir bld-ncurses{,w}
 cd bld-ncurses
 flags='--with-shared --without-normal --without-debug --enable-sigwinch --disable-mixed-case --enable-termcap'
 PKG_CONF=../${dir}/configure PKG_MCPU=-marm pkg:configure ${flags}
-make
+make -j8
 pkg:install
 cd ../bld-ncursesw
 PKG_CONF=../${dir}/configure PKG_MCPU=-marm pkg:configure ${flags} --disable-overwrite --enable-widec
-make
+make -j8
 pkg:install
 
+# In adv-cmds
+pkg: rm /usr/bin/tabs
 pkg: mkdir -p @/usr/lib
 pkg: cp -aL /usr/lib/libcurses.dylib @/usr/lib/libcurses.dylib
 pkg: cp -aL /usr/lib/libncurses.dylib @/usr/lib/libncurses.dylib
 
 pkg: mkdir -p /usr/lib/_ncurses
 pkg: mv /usr/lib/lib{,n}curses.dylib /usr/lib/_ncurses/
+pkg: ln -s libncurses.6.dylib /usr/lib/libncurses6.dylib
+pkg: ln -s libncursesw.6.dylib /usr/lib/libncursesw6.dylib
 rm -f "${PKG_DEST}"/usr/lib/*.a
 
 for ti in "${PKG_DEST}"/usr/share/terminfo/*/*; do
diff --git a/data/ncurses/ncurses-5.7.tar.gz b/data/ncurses/ncurses-5.7.tar.gz
deleted file mode 100644
index d6916072d..000000000
--- a/data/ncurses/ncurses-5.7.tar.gz
+++ /dev/null
diff --git a/data/ncurses/ncurses-6.1.tar.gz b/data/ncurses/ncurses-6.1.tar.gz
new file mode 100644
index 000000000..98c01a816
--- /dev/null
+++ b/data/ncurses/ncurses-6.1.tar.gz
diff --git a/data/ncurses/xopen.diff b/data/ncurses/xopen.diff
index febad3b98..b3188a560 100644
--- a/data/ncurses/xopen.diff
+++ b/data/ncurses/xopen.diff
@@ -1,18 +1,18 @@
-diff -ru ncurses-5.7/ncurses/Makefile.in ncurses-5.7+iPhone/ncurses/Makefile.in
---- ncurses-5.7/ncurses/Makefile.in	2008-10-18 14:11:54.000000000 +0000
-+++ ncurses-5.7+iPhone/ncurses/Makefile.in	2009-04-08 13:08:06.000000000 +0000
-@@ -197,12 +197,12 @@
+diff -ur ncurses-6.1/ncurses/Makefile.in ncurses-6.1+iPhone/ncurses/Makefile.in
+--- ncurses-6.1/ncurses/Makefile.in	2018-01-15 09:28:45.000000000 -1000
++++ ncurses-6.1+iPhone/ncurses/Makefile.in	2018-08-03 13:09:39.000000000 -1000
+@@ -233,12 +233,12 @@
  make_keys$(BUILD_EXEEXT) : \
  		$(tinfo)/make_keys.c \
  		names.c
--	$(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
-+	$(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS) $(CPPFLAGS)
+-	$(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
++	$(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS) $(CPPFLAGS)
  
  make_hash$(BUILD_EXEEXT) : \
- 		$(tinfo)/comp_hash.c \
+ 		$(tinfo)/make_hash.c \
  		../include/hashsize.h
--	$(BUILD_CC) -o $@ $(BUILD_CCFLAGS) -DMAIN_PROGRAM $(tinfo)/comp_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
-+	$(BUILD_CC) -o $@ $(BUILD_CCFLAGS) -DMAIN_PROGRAM $(tinfo)/comp_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS) $(CPPFLAGS)
+-	$(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
++	$(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS) $(CPPFLAGS)
  
- ./expanded.c : $(serial)/MKexpanded.sh
- 	sh -e $(serial)/MKexpanded.sh "$(CPP)" $(CPPFLAGS) > $@
+ report_offsets$(BUILD_EXEEXT) : \
+ 		$(srcdir)/report_offsets.c