Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (8685e60bf0414eec14e786ce6aabbc1ffbae153c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (8685e60bf0414eec14e786ce6aabbc1ffbae153c)
  • Date: Sat, 5 Aug 2017 18:36:30 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

libs/ncurses/DETAILS | 2 -
libs/ncurses/HISTORY | 4 ++
libs/ncurses/POST_INSTALL | 9 +++++
libs/ncurses/PRE_BUILD | 5 --
libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch | 39
-----------------------
5 files changed, 15 insertions(+), 44 deletions(-)

New commits:
commit 8685e60bf0414eec14e786ce6aabbc1ffbae153c
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

ncurses: 6.0

diff --git a/libs/ncurses/DETAILS b/libs/ncurses/DETAILS
index c689dc9..559b1f6 100755
--- a/libs/ncurses/DETAILS
+++ b/libs/ncurses/DETAILS
@@ -1,5 +1,5 @@
SPELL=ncurses
- VERSION=5.9
+ VERSION=6.0
PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index e06dd73..119602a 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,7 @@
+2017-08-05 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS, POST_INSTALL, PRE_BUILD,
+ ncurses-5.9-gcc5_buildfixes-1.patch: updated to 6.0
+
2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* INSTALL: create symlinks for .pc files

diff --git a/libs/ncurses/POST_INSTALL b/libs/ncurses/POST_INSTALL
new file mode 100755
index 0000000..aaa13b2
--- /dev/null
+++ b/libs/ncurses/POST_INSTALL
@@ -0,0 +1,9 @@
+ln -s libcurses.so.6 /lib/libcurses.so.5
+ln -s libform.so.6 /lib/libform.so.5
+ln -s libformw.so.6 /lib/libformw.so.5
+ln -s libmenu.so.6 /lib/libmenu.so.5
+ln -s libmenuw.so.6 /lib/libmenuw.so.5
+ln -s libncurses.so.6 /lib/libncurses.so.5
+ln -s libncursesw.so.6 /lib/libncursesw.so.5
+ln -s libpanel.so.6 /lib/libpanel.so.5
+ln -s libpanelw.so.6 /lib/libpanelw.so.5
diff --git a/libs/ncurses/PRE_BUILD b/libs/ncurses/PRE_BUILD
index ac464c4..fcd278e 100755
--- a/libs/ncurses/PRE_BUILD
+++ b/libs/ncurses/PRE_BUILD
@@ -3,7 +3,4 @@ cd "$SOURCE_DIRECTORY" &&

# don't nuke the terminfo database #13731
sed -i '/rm -rf $(DESTDIR)$(ticdir)/d' "$SOURCE_DIRECTORY/misc/Makefile.in"
&&
-sed -i '/rm -fr ?/d' "$SOURCE_DIRECTORY/misc/run_tic.in" &&
-
-# gcc 5.1 fix
-patch -p1 < $SCRIPT_DIRECTORY/ncurses-5.9-gcc5_buildfixes-1.patch
+sed -i '/rm -fr ?/d' "$SOURCE_DIRECTORY/misc/run_tic.in"
diff --git a/libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch
b/libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch
deleted file mode 100644
index be64931..0000000
--- a/libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Submitted By: Douglas R. Reno <renodr2002 AT gmail.com>
-Date: 2015-04-15
-Initial Package Version: 5.9
-Upstream Status: Unknown
-Origin:
ftp://invisible-island.net/ncurses/5.9/ncurses-5.9-20141206.patch.gz
-Description: Fixes a compilation issue with GCC 5.1. Note
that this patch was trimmed from the above patch.
-
-Index: ncurses-5.9/ncurses/base/MKlib_gen.sh
-===========================================================================================
-
---- ncurses-5.9-20141129+/ncurses/base/MKlib_gen.sh 2011-06-04
19:14:08.000000000 +0000
-+++ ncurses-5.9-20141206/ncurses/base/MKlib_gen.sh 2014-12-06
18:56:25.000000000 +0000
-@@ -474,11 +474,22 @@
- -e 's/gen_$//' \
- -e 's/ / /g' >>$TMP
-
-+cat >$ED1 <<EOF
-+s/ / /g
-+s/^ //
-+s/ $//
-+s/P_NCURSES_BOOL/NCURSES_BOOL/g
-+EOF
-+
-+# A patch discussed here:
-+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-+# introduces spurious #line markers. Work around that by ignoring the
system's
-+# attempt to define "bool" and using our own symbol here.
-+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
-+cat $ED2 >$TMP
-+
- $preprocessor $TMP 2>/dev/null \
--| sed \
-- -e 's/ / /g' \
-- -e 's/^ //' \
-- -e 's/_Bool/NCURSES_BOOL/g' \
-+| sed -f $ED1 \
- | $AWK -f $AW2 \
- | sed -f $ED3 \
- | sed \



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (8685e60bf0414eec14e786ce6aabbc1ffbae153c), Remko van der Vossen, 08/05/2017

Archive powered by MHonArc 2.6.24.

Top of Page