ncurses: update to 6.0.
No ABI bumps because we were using ABI 6 already for a long time.
This commit is contained in:
parent
4431281951
commit
decc01bc9c
3 changed files with 11 additions and 36 deletions
|
@ -66,11 +66,8 @@ libppl.so.13 ppl-1.1_1
|
||||||
libppl_c.so.4 ppl-0.11_1
|
libppl_c.so.4 ppl-0.11_1
|
||||||
libstdc++.so.6 libstdc++-4.4.0_1
|
libstdc++.so.6 libstdc++-4.4.0_1
|
||||||
libssp.so.0 libssp-4.4.0_1
|
libssp.so.0 libssp-4.4.0_1
|
||||||
libcurses.so ncurses-libs-5.8_1
|
libncurses.so.6 ncurses-libs-6.0_1 ignore
|
||||||
libncurses.so.5 ncurses-libs-5.8_1
|
libncurses.so.5 ncurses-libs-6.0_1 ignore
|
||||||
libform.so ncurses-libs-5.8_1
|
|
||||||
libpanel.so ncurses-libs-5.8_1
|
|
||||||
libmenu.so ncurses-libs-5.8_1
|
|
||||||
libncursesw.so.6 ncurses-libs-5.8_1 ignore
|
libncursesw.so.6 ncurses-libs-5.8_1 ignore
|
||||||
libncursesw.so.5 ncurses-libs-5.8_1 ignore
|
libncursesw.so.5 ncurses-libs-5.8_1 ignore
|
||||||
libformw.so.5 ncurses-libs-5.9_13 ignore
|
libformw.so.5 ncurses-libs-5.9_13 ignore
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
--- include/curses.h.in 2015-03-17 14:53:23.966261378 +0100
|
|
||||||
+++ include/curses.h.in 2015-03-17 14:57:43.902100942 +0100
|
|
||||||
@@ -149,14 +149,10 @@
|
|
||||||
*/
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
-/*
|
|
||||||
- * With XPG4, you must define _XOPEN_SOURCE_EXTENDED, it is redundant (or
|
|
||||||
- * conflicting) when _XOPEN_SOURCE is 500 or greater.
|
|
||||||
- */
|
|
||||||
+/* Enable wide char without consideration of _XOPEN_SOURCE.
|
|
||||||
+ * We only support ncursesw anyway. */
|
|
||||||
#undef NCURSES_WIDECHAR
|
|
||||||
-#if defined(_XOPEN_SOURCE_EXTENDED) || defined(_XPG5)
|
|
||||||
#define NCURSES_WIDECHAR
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
#include <stdarg.h> /* we need va_list */
|
|
||||||
#ifdef NCURSES_WIDECHAR
|
|
|
@ -1,13 +1,13 @@
|
||||||
# Template build file for 'ncurses'.
|
# Template build file for 'ncurses'.
|
||||||
pkgname=ncurses
|
pkgname=ncurses
|
||||||
version=5.9
|
version=6.0
|
||||||
revision=14
|
revision=1
|
||||||
short_desc="A System V Release 4.0 curses emulation library"
|
short_desc="A System V Release 4.0 curses emulation library"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
homepage="http://www.gnu.org/software/ncurses/"
|
homepage="http://www.gnu.org/software/ncurses/"
|
||||||
license="MIT"
|
license="MIT"
|
||||||
distfiles="http://ftp.gnu.org/pub/gnu/ncurses/$pkgname-$version.tar.gz"
|
distfiles="http://ftp.gnu.org/pub/gnu/ncurses/$pkgname-$version.tar.gz"
|
||||||
checksum=9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b
|
checksum=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260
|
||||||
|
|
||||||
bootstrap=yes
|
bootstrap=yes
|
||||||
|
|
||||||
|
@ -21,9 +21,6 @@ do_configure() {
|
||||||
mkdir -p ncurses-build ncursesw-build
|
mkdir -p ncurses-build ncursesw-build
|
||||||
cd ${wrksrc}/ncursesw-build
|
cd ${wrksrc}/ncursesw-build
|
||||||
|
|
||||||
# Make sure .pc files are generated
|
|
||||||
mkdir -p /usr/lib/pkgconfig || true
|
|
||||||
|
|
||||||
# widec build
|
# widec build
|
||||||
export CFLAGS="$CFLAGS -fPIC"
|
export CFLAGS="$CFLAGS -fPIC"
|
||||||
../configure ${configure_args} \
|
../configure ${configure_args} \
|
||||||
|
@ -31,13 +28,15 @@ do_configure() {
|
||||||
--with-manpage-symlinks --with-manpage-format=normal \
|
--with-manpage-symlinks --with-manpage-format=normal \
|
||||||
--without-ada --enable-ext-colors \
|
--without-ada --enable-ext-colors \
|
||||||
--without-tests --enable-pc-files \
|
--without-tests --enable-pc-files \
|
||||||
PKG_CONFIG=/usr/bin/pkg-config
|
--with-pkg-config-libdir=/usr/lib/pkgconfig \
|
||||||
|
ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
|
||||||
|
|
||||||
cd ${wrksrc}/ncurses-build
|
cd ${wrksrc}/ncurses-build
|
||||||
# non-widec build
|
# non-widec build
|
||||||
../configure ${configure_args} --with-shared \
|
../configure ${configure_args} --with-shared \
|
||||||
--without-debug --without-ada --without-tests \
|
--without-debug --without-ada --without-tests \
|
||||||
--enable-pc-files PKG_CONFIG=/usr/bin/pkg-config
|
--enable-pc-files --with-pkg-config-libdir=/usr/lib/pkgconfig \
|
||||||
|
ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
|
||||||
}
|
}
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
|
@ -83,10 +82,8 @@ do_install() {
|
||||||
# Remove broken symlink.
|
# Remove broken symlink.
|
||||||
rm -f ${DESTDIR}/usr/lib/terminfo
|
rm -f ${DESTDIR}/usr/lib/terminfo
|
||||||
|
|
||||||
ln -sfr ${DESTDIR}/usr/bin/ncursesw6-config \
|
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncursesw5-config
|
||||||
${DESTDIR}/usr/bin/ncursesw5-config
|
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncurses5-config
|
||||||
ln -sfr ${DESTDIR}/usr/bin/ncursesw6-config \
|
|
||||||
${DESTDIR}/usr/bin/ncurses5-config
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ncurses-libs_package() {
|
ncurses-libs_package() {
|
||||||
|
|
Loading…
Reference in a new issue