snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

ncurses: drop old .so.5 symlinks and add libncurses.so.6 

These symlinḱs weren't used in any Void package and likely would
cause issues for foreign binaries depending on them. The
libncurses.so.6 symlink was for some reason missing, so add it.

Closes https://github.com/void-linux/void-packages/pull/23660
This commit is contained in:
q66 2020-07-21 17:46:37 +02:00
parent 6183b60e96
commit 854828d619
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/shlibs
View File

@ -69,16 +69,11 @@ 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
libncurses.so.6 ncurses-libs-6.0_1 ignore libncurses.so.6 ncurses-libs-6.0_1 ignore
libncurses.so.5 ncurses-libs-6.0_1 ignore
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
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2 libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
libnetcdf.so.15 netcdf-4.7.0_1 libnetcdf.so.15 netcdf-4.7.0_1
libformw.so.5 ncurses-libs-5.9_13 ignore
libformw.so.6 ncurses-libs-5.8_1 ignore libformw.so.6 ncurses-libs-5.8_1 ignore
libpanelw.so.5 ncurses-libs-5.9_13 ignore
libpanelw.so.6 ncurses-libs-5.8_1 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 libmenuw.so.6 ncurses-libs-5.8_1 ignore
libobjc.so.4 libobjc-4.7.3_12 libobjc.so.4 libobjc-4.7.3_12
libgomp.so.1 libgomp-4.4.0_1 libgomp.so.1 libgomp-4.4.0_1

14
srcpkgs/ncurses/template
View File

@ -1,7 +1,7 @@
# Template file for 'ncurses' # Template file for 'ncurses'
pkgname=ncurses pkgname=ncurses
version=6.2 version=6.2
revision=2 revision=3
bootstrap=yes bootstrap=yes
configure_args="--enable-big-core" configure_args="--enable-big-core"
short_desc="System V Release 4.0 curses emulation library" short_desc="System V Release 4.0 curses emulation library"
@ -78,6 +78,8 @@ do_install() {
cd ${wrksrc}/ncurses-build cd ${wrksrc}/ncurses-build
install -Dm755 lib/libncurses.so.${version} \ install -Dm755 lib/libncurses.so.${version} \
${DESTDIR}/usr/lib/libncurses.so.${version} ${DESTDIR}/usr/lib/libncurses.so.${version}
ln -sf libncurses.so.${version} \
${DESTDIR}/usr/lib/libncurses.so.${version:0:1}
# Create libtinfo symlinks. # Create libtinfo symlinks.
ln -sfr ${DESTDIR}/usr/lib/libncursesw.so \ ln -sfr ${DESTDIR}/usr/lib/libncursesw.so \
@ -89,25 +91,15 @@ do_install() {
ln -sfr ${DESTDIR}/usr/lib/pkgconfig/ncursesw.pc \ ln -sfr ${DESTDIR}/usr/lib/pkgconfig/ncursesw.pc \
${DESTDIR}/usr/lib/pkgconfig/tinfo.pc ${DESTDIR}/usr/lib/pkgconfig/tinfo.pc
# Create compat symlinks.
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
# Remove broken symlink. # Remove broken symlink.
rm -f ${DESTDIR}/usr/lib/terminfo rm -f ${DESTDIR}/usr/lib/terminfo
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncursesw5-config
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncurses5-config
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
sed -i -e "s,-L$XBPS_CROSS_BASE,-L,g" ${DESTDIR}/usr/bin/ncursesw6-config sed -i -e "s,-L$XBPS_CROSS_BASE,-L,g" ${DESTDIR}/usr/bin/ncursesw6-config
fi fi
} }
ncurses-libs_package() { ncurses-libs_package() {
shlib_provides="libformw.so.5 libmenuw.so.5 libpanelw.so.5 libncursesw.so.5"
short_desc+=" -- shared libraries" short_desc+=" -- shared libraries"
pkg_install() { pkg_install() {
vmove "usr/lib/libform*.so.*" vmove "usr/lib/libform*.so.*"