jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "ncurses: enable tinfo"

Browse source 
This reverts commit ea207d9177.

Does not work with libraries depending on tgetent being in libncurses(w).
This commit is contained in:
Jürgen Buchmüller 2019-05-16 18:17:49 +02:00
parent 74a3920175
commit d0bbb4eac5
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/shlibs
View file

@ -79,10 +79,6 @@ libpanelw.so.5 ncurses-libs-5.9_13 ignore
libpanelw.so.6 ncurses-libs-5.8_1 ignore
libmenuw.so.5 ncurses-libs-5.9_13 ignore
libmenuw.so.6 ncurses-libs-5.8_1 ignore
libtinfow.so.6 ncurses-libs-6.1_3 ignore
libtinfow.so.5 ncurses-libs-6.1_3 ignore
libtinfo.so.6 ncurses-libs-6.1_3 ignore
libtinfo.so.5 ncurses-libs-6.1_3 ignore
libobjc.so.4 libobjc-4.7.3_12
libgomp.so.1 libgomp-4.4.0_1
libgps.so.24 gpsd-3.18.1_1

31
srcpkgs/ncurses/template
View file

@ -1,15 +1,11 @@
# Template file for 'ncurses'
# Template build file for 'ncurses'.
pkgname=ncurses
version=6.1
revision=3
configure_args="--with-shared --without-debug --with-manpage-symlinks
--with-manpage-format=normal --with-termlib --without-ada --without-tests
--enable-pc-files --with-pkg-config-libdir=/usr/lib/pkgconfig
ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config"
short_desc="System V Release 4.0 curses emulation library"
revision=2
short_desc="A System V Release 4.0 curses emulation library"
maintainer="Juan RP <xtraeme@voidlinux.org>"
license="MIT"
homepage="http://www.gnu.org/software/ncurses/"
license="MIT"
distfiles="${GNU_SITE}/ncurses/$pkgname-$version.tar.gz"
checksum=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17
@ -26,15 +22,24 @@ do_configure() {
export BUILD_CFLAGS="$BUILD_CFLAGS -fPIC"
mkdir -p ncurses-build ncursesw-build
cd ${wrksrc}/ncursesw-build
# widec build
../configure ${configure_args} \
--enable-widec --enable-ext-colors \
--enable-widec --with-shared --without-debug \
--with-manpage-symlinks --with-manpage-format=normal \
--without-ada --enable-ext-colors \
--without-tests --enable-pc-files \
--with-pkg-config-libdir=/usr/lib/pkgconfig \
ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config \
BUILD_CFLAGS="$BUILD_CFLAGS"
cd ${wrksrc}/ncurses-build
# non-widec build
../configure ${configure_args} \
../configure ${configure_args} --with-shared \
--without-debug --without-ada --without-tests \
--enable-pc-files --with-pkg-config-libdir=/usr/lib/pkgconfig \
ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config \
BUILD_CFLAGS="$BUILD_CFLAGS"
}
@ -73,11 +78,9 @@ do_install() {
cd ${wrksrc}/ncurses-build
install -Dm755 lib/libncurses.so.${version} \
${DESTDIR}/usr/lib/libncurses.so.${version}
install -Dm755 lib/libtinfo.so.${version} \
${DESTDIR}/usr/lib/libtinfo.so.${version}
# Create compat symlinks.
for f in ncurses form panel menu tinfo; do
for f in ncurses form panel menu; do
ln -sfr ${DESTDIR}/usr/lib/lib${f}w.so.6 \
${DESTDIR}/usr/lib/lib${f}w.so.5
done
@ -90,7 +93,7 @@ do_install() {
}
ncurses-libs_package() {
shlib_provides="libformw.so.5 libmenuw.so.5 libpanelw.so.5 libncursesw.so.5 libtinfow.so.5"
shlib_provides="libformw.so.5 libmenuw.so.5 libpanelw.so.5 libncursesw.so.5"
short_desc+=" -- shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"