Compare commits
No commits in common. '34af643e5407ba13787464c607398f10af3e0c60' and '0594da15afc658a1d141f091bdb7c344ff61dd96' have entirely different histories.
34af643e54
...
0594da15af
@ -1,101 +1,59 @@
|
||||
# Maintainer: David Runge <dvzrv@archlinux.org>
|
||||
# Contributor: Allan McRae <allan@archlinux.org>
|
||||
# Maintainer: Allan McRae <allan@archlinux.org>
|
||||
# Contributor: judd <jvinet@zeroflux.org>
|
||||
|
||||
_name=ncurses
|
||||
pkgname=lib32-${_name}
|
||||
pkgver=6.5
|
||||
_pkgbasename=ncurses
|
||||
pkgname=lib32-${_pkgbasename}
|
||||
pkgver=6.1
|
||||
pkgrel=1
|
||||
pkgdesc='System V Release 4.0 curses emulation library (32-bit)'
|
||||
arch=(x86_64)
|
||||
url='https://invisible-island.net/ncurses/ncurses.html'
|
||||
license=(MIT)
|
||||
depends=(lib32-gcc-libs lib32-glibc $_name=$pkgver)
|
||||
provides=(libncurses++w.so libformw.so libmenuw.so libpanelw.so libncursesw.so)
|
||||
source=(
|
||||
$_name::https://invisible-island.net/archives/${_name}/${_name}-${pkgver}.tar.gz
|
||||
$_name.asc::https://invisible-island.net/archives/${_name}/${_name}-${pkgver}.tar.gz.asc
|
||||
$_name-6.3-libs.patch
|
||||
$_name-6.3-pkgconfig.patch
|
||||
)
|
||||
sha512sums=('fc5a13409d2a530a1325776dcce3a99127ddc2c03999cfeb0065d0eee2d68456274fb1c7b3cc99c1937bc657d0e7fca97016e147f93c7821b5a4a6837db821e8'
|
||||
'96a9cb7b3e8a0c4d058129d4aadbc4388b4f022eee6605cca8d270f31c54d1f06429a7c1af09e7de13f2bfeee71fc33d9581b0773830914c8a431be7e7f0e6ba'
|
||||
'adb02b838c40f1e58a1b31c26d5cd0f2a1c43f3b6d68e839981764c0f6c905a9eb51dd36ff018628fdeb20747cc7467727d57135408ab4848259384077a52b28'
|
||||
'2d2c0ec3c880e638ab4aa3dbff5e28e4cd233153e24816bd87e077f848aa3edd5114cd0f2a7f6e8869dd1861a2746e512886c18264ff1676927dcc320c5ef958')
|
||||
b2sums=('d0a05c218b5f320ba9abe2f322787baef1d15d764e503c81d49772b54b2927d28ecbeb500c8e514996226b41f69445b4de44ff423cec25b61847307fe61682ec'
|
||||
'079233fb8f52ec596182b69d9a44dd59982d4925715c817d21b5d2f4fc9ef7aa4c9ac2b4e14694ac177e49913a75f46e914fec64136620c5be891ee8c2c1710d'
|
||||
'31bb10e82dd018a75e57252052650d9f0f5eb5e7e887118c2ea40032b11f59ec6aa4d9bae804c615cbecdf3382f3434e0c9e9e8440fdefe66a507be020b8965c'
|
||||
'fb6cf606cf3db7f6b306272696a63bce83d52cfa91e850f9a7bdb9d3d8455a26943529a9cf79731dddc7f763c27211a9afab9c4c31dbb6d12fd720eb390eb0a3')
|
||||
validpgpkeys=('19882D92DDA4C400C22C0D56CC2AF4472167BE03') # Thomas Dickey <dickey@invisible-island.net>
|
||||
|
||||
prepare() {
|
||||
# do not link against test libraries
|
||||
patch -Np1 -d $_name-${pkgver} -i ../$_name-6.3-libs.patch
|
||||
# do not leak build-time LDFLAGS into the pkgconfig files:
|
||||
# https://bugs.archlinux.org/task/68523
|
||||
patch -Np1 -d $_name-${pkgver} -i ../$_name-6.3-pkgconfig.patch
|
||||
# NOTE: can't run autoreconf because the autotools setup is custom and ancient
|
||||
}
|
||||
pkgdesc="System V Release 4.0 curses emulation library (32-bit)"
|
||||
arch=('x86_64')
|
||||
url="http://www.gnu.org/software/ncurses/"
|
||||
license=('MIT')
|
||||
depends=('lib32-glibc' ${_pkgbasename})
|
||||
makedepends=("gcc-multilib")
|
||||
source=(https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$pkgver.tar.gz{,.sig})
|
||||
md5sums=('98c889aaf8d23910d2b92d65be2e737a'
|
||||
'SKIP')
|
||||
validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') # Thomas Dickey
|
||||
|
||||
build() {
|
||||
local configure_options=(
|
||||
--prefix=/usr
|
||||
--libdir=/usr/lib32
|
||||
--disable-db-install
|
||||
--disable-root-access
|
||||
--disable-root-environ
|
||||
--disable-setuid-environ
|
||||
--enable-widec
|
||||
--enable-pc-files
|
||||
--mandir=/usr/share/man
|
||||
--with-cxx-binding
|
||||
--with-cxx-shared
|
||||
--with-pkg-config-libdir=/usr/lib32/pkgconfig
|
||||
--with-shared
|
||||
--with-versioned-syms
|
||||
--without-ada
|
||||
--without-debug
|
||||
--without-manpages
|
||||
--without-progs
|
||||
--without-tack
|
||||
--without-tests
|
||||
)
|
||||
cd ${_pkgbasename}-${pkgver}
|
||||
|
||||
export CC="gcc -m32"
|
||||
export CXX="g++ -m32"
|
||||
export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig'
|
||||
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
|
||||
|
||||
cd $_name-${pkgver}
|
||||
./configure "${configure_options[@]}"
|
||||
./configure --prefix=/usr --mandir=/usr/share/man \
|
||||
--with-pkg-config-libdir=/usr/lib32/pkgconfig \
|
||||
--with-shared --with-normal --without-debug --without-ada \
|
||||
--with-install-prefix=${pkgdir} --enable-widec --libdir=/usr/lib32
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
local _pkgver=${pkgver/_*/}
|
||||
make DESTDIR="$pkgdir" install -C $_name-${pkgver}
|
||||
cd ${_pkgbasename}-${pkgver}
|
||||
make install
|
||||
|
||||
install -vDm 644 $_name-${pkgver}/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
install -dm755 ${pkgdir}/usr/lib32
|
||||
|
||||
# fool packages looking to link to non-wide-character ncurses libraries
|
||||
for lib in ncurses ncurses++ form panel menu; do
|
||||
printf "INPUT(-l%sw)\n" "$lib" > "$pkgdir/usr/lib32/lib$lib.so"
|
||||
ln -sv ${lib}w.pc "$pkgdir/usr/lib32/pkgconfig/$lib.pc"
|
||||
for lib in curses ncurses form panel menu; do
|
||||
rm -f ${pkgdir}/usr/lib32/lib${lib}.so
|
||||
echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib32/lib${lib}.so
|
||||
ln -sf lib${lib}w.a ${pkgdir}/usr/lib32/lib${lib}.a
|
||||
done
|
||||
ln -sf libncurses++w.a ${pkgdir}/usr/lib32/libncurses++.a
|
||||
|
||||
# some packages look for -lcurses during build
|
||||
printf 'INPUT(-lncursesw)\n' > "$pkgdir/usr/lib32/libcursesw.so"
|
||||
ln -sv libncurses.so "$pkgdir/usr/lib32/libcurses.so"
|
||||
|
||||
# tic and ticinfo functionality is built in by default
|
||||
# make sure that anything linking against it links against libncursesw.so instead
|
||||
for lib in tic tinfo; do
|
||||
printf "INPUT(libncursesw.so.%s)\n" "${_pkgver:0:1}" > "${pkgdir}/usr/lib32/lib$lib.so"
|
||||
ln -sv libncursesw.so.${pkgver:0:1} "$pkgdir/usr/lib32/lib$lib.so.${_pkgver:0:1}"
|
||||
ln -fsv ncursesw.pc "$pkgdir/usr/lib32/pkgconfig/$lib.pc"
|
||||
done
|
||||
|
||||
# remove all files conflicting with ncurses
|
||||
rm -frv "$pkgdir/usr/"{bin,include}
|
||||
rm -f ${pkgdir}/usr/lib32/libcursesw.so
|
||||
echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib32/libcursesw.so
|
||||
ln -sf libncurses.so ${pkgdir}/usr/lib32/libcurses.so
|
||||
ln -sf libncursesw.a ${pkgdir}/usr/lib32/libcursesw.a
|
||||
ln -sf libncurses.a ${pkgdir}/usr/lib32/libcurses.a
|
||||
|
||||
rm -rf "${pkgdir}"/usr/{include,share,bin}
|
||||
mkdir -p "$pkgdir/usr/share/licenses"
|
||||
ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
|
||||
}
|
||||
|
||||
# vim: set et ts=2 sw=2:
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
ov0rfNS/zg==
|
||||
=RqVO
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@ -1,58 +0,0 @@
|
||||
diff -ruN a/c++/Makefile.in b/c++/Makefile.in
|
||||
--- a/c++/Makefile.in 2021-07-03 20:53:57.000000000 +0200
|
||||
+++ b/c++/Makefile.in 2021-11-03 10:58:04.147647447 +0100
|
||||
@@ -118,7 +118,7 @@
|
||||
-l@FORM_NAME@@USE_LIB_SUFFIX@ \
|
||||
-l@MENU_NAME@@USE_LIB_SUFFIX@ \
|
||||
-l@PANEL_NAME@@USE_LIB_SUFFIX@ \
|
||||
- -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
|
||||
+ -lncurses@USE_LIB_SUFFIX@
|
||||
|
||||
LIBROOT = ncurses++
|
||||
|
||||
@@ -157,8 +157,7 @@
|
||||
LDFLAGS_DEFAULT = $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@)
|
||||
|
||||
# flags for library built by this makefile
|
||||
-LDFLAGS = $(TEST_ARGS) @LDFLAGS@ \
|
||||
- @LD_MODEL@ $(TEST_LIBS) @LIBS@ $(CXXLIBS)
|
||||
+LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ $(CXXLIBS)
|
||||
|
||||
AUTO_SRC = \
|
||||
etip.h
|
||||
diff -ruN a/form/Makefile.in b/form/Makefile.in
|
||||
--- a/form/Makefile.in 2021-07-03 17:45:33.000000000 +0200
|
||||
+++ b/form/Makefile.in 2021-11-03 10:58:45.301114373 +0100
|
||||
@@ -110,7 +110,7 @@
|
||||
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
|
||||
SHLIB_DIRS = -L../lib
|
||||
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
|
||||
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@
|
||||
|
||||
RPATH_LIST = @RPATH_LIST@
|
||||
RESULTING_SYMS = @RESULTING_SYMS@
|
||||
diff -ruN a/menu/Makefile.in b/menu/Makefile.in
|
||||
--- a/menu/Makefile.in 2021-07-03 17:45:33.000000000 +0200
|
||||
+++ b/menu/Makefile.in 2021-11-03 10:58:59.461160284 +0100
|
||||
@@ -110,7 +110,7 @@
|
||||
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
|
||||
SHLIB_DIRS = -L../lib
|
||||
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
|
||||
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@
|
||||
|
||||
RPATH_LIST = @RPATH_LIST@
|
||||
RESULTING_SYMS = @RESULTING_SYMS@
|
||||
diff -ruN a/panel/Makefile.in b/panel/Makefile.in
|
||||
--- a/panel/Makefile.in 2021-07-03 17:45:33.000000000 +0200
|
||||
+++ b/panel/Makefile.in 2021-11-03 10:59:33.957938691 +0100
|
||||
@@ -112,7 +112,7 @@
|
||||
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
|
||||
SHLIB_DIRS = -L../lib
|
||||
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
|
||||
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@
|
||||
|
||||
RPATH_LIST = @RPATH_LIST@
|
||||
RESULTING_SYMS = @RESULTING_SYMS@
|
||||
@ -1,24 +0,0 @@
|
||||
diff -ruN a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
|
||||
--- a/misc/gen-pkgconfig.in 2021-08-07 23:36:33.000000000 +0200
|
||||
+++ b/misc/gen-pkgconfig.in 2021-11-03 11:12:51.127160950 +0100
|
||||
@@ -83,7 +83,7 @@
|
||||
fi
|
||||
|
||||
lib_flags=
|
||||
-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
|
||||
+for opt in -L$libdir @LIBS@
|
||||
do
|
||||
case $opt in
|
||||
-l*) # LIBS is handled specially below
|
||||
diff -ruN a/misc/ncurses-config.in b/misc/ncurses-config.in
|
||||
--- a/misc/ncurses-config.in 2021-08-07 23:36:14.000000000 +0200
|
||||
+++ b/misc/ncurses-config.in 2021-11-03 11:26:12.393533954 +0100
|
||||
@@ -101,7 +101,7 @@
|
||||
# There is no portable way to find the list of standard library directories.
|
||||
# Require a POSIX shell anyway, to keep this simple.
|
||||
lib_flags=
|
||||
-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ $LIBS
|
||||
+for opt in -L$libdir $LIBS
|
||||
do
|
||||
case $opt in
|
||||
-specs*) # ignore linker specs-files which were used to build library
|
||||
Loading…
Reference in New Issue