groff: update to 1.23.0.
This commit is contained in:
icp
Leah Neukirchen
parent
320cf3b952
commit
20c6682913
|
|
@ -1,79 +0,0 @@
|
|||
--- lib/math.in.h.orig 2019-01-02 16:55:35.064459973 +0100
|
||||
+++ lib/math.in.h 2019-01-02 17:42:43.450242836 +0100
|
||||
@@ -2342,75 +2342,6 @@
|
||||
#endif
|
||||
|
||||
|
||||
-#if @GNULIB_SIGNBIT@
|
||||
-# if (@REPLACE_SIGNBIT_USING_GCC@ \
|
||||
- && (!defined __cplusplus || __cplusplus < 201103))
|
||||
-# undef signbit
|
||||
- /* GCC 4.0 and newer provides three built-ins for signbit. */
|
||||
-# define signbit(x) \
|
||||
- (sizeof (x) == sizeof (long double) ? __builtin_signbitl (x) : \
|
||||
- sizeof (x) == sizeof (double) ? __builtin_signbit (x) : \
|
||||
- __builtin_signbitf (x))
|
||||
-# endif
|
||||
-# if @REPLACE_SIGNBIT@
|
||||
-# undef signbit
|
||||
-_GL_EXTERN_C int gl_signbitf (float arg);
|
||||
-_GL_EXTERN_C int gl_signbitd (double arg);
|
||||
-_GL_EXTERN_C int gl_signbitl (long double arg);
|
||||
-# if __GNUC__ >= 2 && !defined __STRICT_ANSI__
|
||||
-# define _GL_NUM_UINT_WORDS(type) \
|
||||
- ((sizeof (type) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
|
||||
-# if defined FLT_SIGNBIT_WORD && defined FLT_SIGNBIT_BIT && !defined gl_signbitf
|
||||
-# define gl_signbitf_OPTIMIZED_MACRO
|
||||
-# define gl_signbitf(arg) \
|
||||
- ({ union { float _value; \
|
||||
- unsigned int _word[_GL_NUM_UINT_WORDS (float)]; \
|
||||
- } _m; \
|
||||
- _m._value = (arg); \
|
||||
- (_m._word[FLT_SIGNBIT_WORD] >> FLT_SIGNBIT_BIT) & 1; \
|
||||
- })
|
||||
-# endif
|
||||
-# if defined DBL_SIGNBIT_WORD && defined DBL_SIGNBIT_BIT && !defined gl_signbitd
|
||||
-# define gl_signbitd_OPTIMIZED_MACRO
|
||||
-# define gl_signbitd(arg) \
|
||||
- ({ union { double _value; \
|
||||
- unsigned int _word[_GL_NUM_UINT_WORDS (double)]; \
|
||||
- } _m; \
|
||||
- _m._value = (arg); \
|
||||
- (_m._word[DBL_SIGNBIT_WORD] >> DBL_SIGNBIT_BIT) & 1; \
|
||||
- })
|
||||
-# endif
|
||||
-# if defined LDBL_SIGNBIT_WORD && defined LDBL_SIGNBIT_BIT && !defined gl_signbitl
|
||||
-# define gl_signbitl_OPTIMIZED_MACRO
|
||||
-# define gl_signbitl(arg) \
|
||||
- ({ union { long double _value; \
|
||||
- unsigned int _word[_GL_NUM_UINT_WORDS (long double)]; \
|
||||
- } _m; \
|
||||
- _m._value = (arg); \
|
||||
- (_m._word[LDBL_SIGNBIT_WORD] >> LDBL_SIGNBIT_BIT) & 1; \
|
||||
- })
|
||||
-# endif
|
||||
-# endif
|
||||
-# define signbit(x) \
|
||||
- (sizeof (x) == sizeof (long double) ? gl_signbitl (x) : \
|
||||
- sizeof (x) == sizeof (double) ? gl_signbitd (x) : \
|
||||
- gl_signbitf (x))
|
||||
-# endif
|
||||
-# ifdef __cplusplus
|
||||
-# if defined signbit || defined GNULIB_NAMESPACE
|
||||
-_GL_MATH_CXX_REAL_FLOATING_DECL_1 (signbit)
|
||||
-# undef signbit
|
||||
-_GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit)
|
||||
-# endif
|
||||
-# endif
|
||||
-#elif defined GNULIB_POSIXCHECK
|
||||
-# if defined signbit
|
||||
-_GL_WARN_REAL_FLOATING_DECL (signbit);
|
||||
-# undef signbit
|
||||
-# define signbit(x) _GL_WARN_REAL_FLOATING_IMPL (signbit, x)
|
||||
-# endif
|
||||
-#endif
|
||||
-
|
||||
_GL_INLINE_HEADER_END
|
||||
|
||||
#endif /* _@GUARD_PREFIX@_MATH_H */
|
||||
|
||||
|
|
@ -6,11 +6,5 @@
|
|||
. char \- \N'45'
|
||||
. char - \N'45'
|
||||
. char ' \N'39'
|
||||
. char \' \N'39'
|
||||
. \}
|
||||
.
|
||||
. \" Shut off SGR by default (groff colors)
|
||||
. \" Require GROFF_SGR envvar defined to turn it on
|
||||
. if '\V[GROFF_SGR]'' \
|
||||
. output x X tty: sgr 0
|
||||
.\}
|
||||
|
|
|
|||
|
|
@ -1,35 +1,24 @@
|
|||
# Template file for 'groff'
|
||||
pkgname=groff
|
||||
version=1.22.4
|
||||
revision=3
|
||||
version=1.23.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--without-x --disable-rpath"
|
||||
hostmakedepends="texinfo perl bison ghostscript"
|
||||
hostmakedepends="perl bison ghostscript"
|
||||
makedepends="zlib-devel"
|
||||
short_desc="GNU troff text-formatting system"
|
||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="https://www.gnu.org/software/groff/groff.html"
|
||||
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
|
||||
checksum=e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293
|
||||
|
||||
subpackages="libgroff"
|
||||
changelog="https://git.savannah.gnu.org/cgit/groff.git/plain/NEWS"
|
||||
distfiles="${GNU_SITE}/groff/groff-${version}.tar.gz"
|
||||
checksum=6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
hostmakedepends+=" groff"
|
||||
configure_args+=" --with-doc=no"
|
||||
else
|
||||
subpackages+=" groff-doc"
|
||||
make_build_args+=" GROFFBIN=/usr/bin/groff GROFF_BIN_PATH=/usr/bin"
|
||||
fi
|
||||
|
||||
pre_configure() {
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
*musl)
|
||||
patch -p0 -i ${FILESDIR}/musl.patch
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
post_install() {
|
||||
# From Arch:
|
||||
#
|
||||
|
|
@ -41,13 +30,6 @@ post_install() {
|
|||
done
|
||||
}
|
||||
|
||||
libgroff_package() {
|
||||
short_desc+=" - libraries"
|
||||
pkg_install() {
|
||||
vmove usr/lib
|
||||
}
|
||||
}
|
||||
|
||||
groff-doc_package() {
|
||||
short_desc+=" - documentation"
|
||||
pkg_install() {
|
||||
|
|
|
|||
|
|
@ -318,6 +318,7 @@ replaces="
|
|||
libglademm-devel<=2.6.7_6
|
||||
libglademm<=2.6.7_6
|
||||
libglib-static<=2.58.3_5
|
||||
libgroff<=1.22.4_3
|
||||
libgtkhtml<=4.10.0_1
|
||||
liblrzip<=0.641_1
|
||||
libmagick6-devel<=6.9.12.12_2
|
||||
|
|
|
|||
Loading…
Reference in New Issue