Date: Monday, January 2, 2023 @ 12:51:29
Author: dvzrv
Revision: 1372903
archrelease: copy trunk to multilib-staging-x86_64
Added:
lib32-ncurses/repos/multilib-staging-x86_64/
lib32-ncurses/repos/multilib-staging-x86_64/PKGBUILD
(from rev 1372902, lib32-ncurses/trunk/PKGBUILD)
lib32-ncurses/repos/multilib-staging-x86_64/keys/
lib32-ncurses/repos/multilib-staging-x86_64/ncurses-6.3-libs.patch
(from rev 1372902, lib32-ncurses/trunk/ncurses-6.3-libs.patch)
lib32-ncurses/repos/multilib-staging-x86_64/ncurses-6.3-pkgconfig.patch
(from rev 1372902, lib32-ncurses/trunk/ncurses-6.3-pkgconfig.patch)
-----------------------------+
PKGBUILD | 97 ++++++++++++++++++++++++++++++++++++++++++
ncurses-6.3-libs.patch | 58 +++++++++++++++++++++++++
ncurses-6.3-pkgconfig.patch | 24 ++++++++++
3 files changed, 179 insertions(+)
Copied: lib32-ncurses/repos/multilib-staging-x86_64/PKGBUILD (from rev 1372902,
lib32-ncurses/trunk/PKGBUILD)
===================================================================
--- multilib-staging-x86_64/PKGBUILD (rev 0)
+++ multilib-staging-x86_64/PKGBUILD 2023-01-02 12:51:29 UTC (rev 1372903)
@@ -0,0 +1,97 @@
+# Maintainer: David Runge <[email protected]>
+# Contributor: Allan McRae <[email protected]>
+# Contributor: judd <[email protected]>
+
+_name=ncurses
+pkgname=lib32-${_name}
+pkgver=6.4
+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)
+options=(debug)
+source=(
+ https://invisible-mirror.net/archives/$_name/$_name-$pkgver.tar.gz{,.asc}
+ $_name-6.3-libs.patch
+ $_name-6.3-pkgconfig.patch
+)
+sha512sums=('1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34'
+ 'SKIP'
+
'adb02b838c40f1e58a1b31c26d5cd0f2a1c43f3b6d68e839981764c0f6c905a9eb51dd36ff018628fdeb20747cc7467727d57135408ab4848259384077a52b28'
+
'2d2c0ec3c880e638ab4aa3dbff5e28e4cd233153e24816bd87e077f848aa3edd5114cd0f2a7f6e8869dd1861a2746e512886c18264ff1676927dcc320c5ef958')
+b2sums=('47fd9c2d27f44fa9942552881a471e5067465dbace40bf68b28998dded0556127a1d8662b96de4de4fd76c1c8b98bdae796036553ab4b05ca9f160839d841ba3'
+ 'SKIP'
+
'31bb10e82dd018a75e57252052650d9f0f5eb5e7e887118c2ea40032b11f59ec6aa4d9bae804c615cbecdf3382f3434e0c9e9e8440fdefe66a507be020b8965c'
+
'fb6cf606cf3db7f6b306272696a63bce83d52cfa91e850f9a7bdb9d3d8455a26943529a9cf79731dddc7f763c27211a9afab9c4c31dbb6d12fd720eb390eb0a3')
+validpgpkeys=('19882D92DDA4C400C22C0D56CC2AF4472167BE03') # Thomas Dickey
<[email protected]>
+
+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
+}
+
+build() {
+ local configure_options=(
+ --prefix=/usr
+ --libdir=/usr/lib32
+ --disable-db-install
+ --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
+ )
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig'
+
+ cd $_name-$pkgver
+ ./configure "${configure_options[@]}"
+ make
+}
+
+package() {
+ make DESTDIR="$pkgdir" install -C $_name-$pkgver
+
+ install -vDm 644 $_name-$pkgver/COPYING -t
"$pkgdir/usr/share/licenses/$pkgname/"
+
+ # 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"
+ done
+
+ # 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}
+}
+
+# vim: set et ts=2 sw=2:
Copied: lib32-ncurses/repos/multilib-staging-x86_64/ncurses-6.3-libs.patch
(from rev 1372902, lib32-ncurses/trunk/ncurses-6.3-libs.patch)
===================================================================
--- multilib-staging-x86_64/ncurses-6.3-libs.patch
(rev 0)
+++ multilib-staging-x86_64/ncurses-6.3-libs.patch 2023-01-02 12:51:29 UTC
(rev 1372903)
@@ -0,0 +1,58 @@
+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@
Copied: lib32-ncurses/repos/multilib-staging-x86_64/ncurses-6.3-pkgconfig.patch
(from rev 1372902, lib32-ncurses/trunk/ncurses-6.3-pkgconfig.patch)
===================================================================
--- multilib-staging-x86_64/ncurses-6.3-pkgconfig.patch
(rev 0)
+++ multilib-staging-x86_64/ncurses-6.3-pkgconfig.patch 2023-01-02 12:51:29 UTC
(rev 1372903)
@@ -0,0 +1,24 @@
+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
