From: icp1994 <icp1994@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] groff: update to 1.23.0.
Date: Fri, 28 Jul 2023 20:52:51 +0200 [thread overview]
Message-ID: <20230728185251.44Ypeysq2u2hbeTm2GxZr5-y2C6K1RQIuNCu_Rh_XXs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45300@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 889 bytes --]
There is an updated pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages groff
https://github.com/void-linux/void-packages/pull/45300
groff: update to 1.23.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
* `site.tmac` changes from [Arch repo](https://gitlab.archlinux.org/archlinux/packaging/packages/groff/-/blob/main/site.tmac)
* `--with-doc` configure option removed upstream, builds/installs docs by default
* `${DESTDIR}/usr/lib` is empty, so no more `libgroff` - although can't find it mentioned in the changelog (which is [a whole novel](https://git.savannah.gnu.org/cgit/groff.git/tree/ChangeLog.123))
A patch file from https://github.com/void-linux/void-packages/pull/45300.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-groff-45300.patch --]
[-- Type: text/x-diff, Size: 5990 bytes --]
From 6321c51d5ab6a500348477c99634a4ad4cd898b7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 28 Jul 2023 22:32:09 +0530
Subject: [PATCH] groff: update to 1.23.0.
---
srcpkgs/groff/files/musl.patch | 79 ----------------------------------
srcpkgs/groff/files/site.tmac | 6 ---
srcpkgs/groff/template | 33 ++++++--------
3 files changed, 13 insertions(+), 105 deletions(-)
delete mode 100644 srcpkgs/groff/files/musl.patch
diff --git a/srcpkgs/groff/files/musl.patch b/srcpkgs/groff/files/musl.patch
deleted file mode 100644
index 9d2b322a9976b..0000000000000
--- a/srcpkgs/groff/files/musl.patch
+++ /dev/null
@@ -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 */
-
diff --git a/srcpkgs/groff/files/site.tmac b/srcpkgs/groff/files/site.tmac
index 8ef1040ca4a04..7c04fdc543e7e 100644
--- a/srcpkgs/groff/files/site.tmac
+++ b/srcpkgs/groff/files/site.tmac
@@ -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
.\}
diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template
index 88923c6874b5e..6abad6b298475 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -1,26 +1,26 @@
# Template file for 'groff'
pkgname=groff
-version=1.22.4
-revision=3
+version=1.23.0
+revision=1
build_style=gnu-configure
+build_helper="qemu"
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
+changelog="https://git.savannah.gnu.org/cgit/groff.git/plain/NEWS"
+distfiles="${GNU_SITE}/groff/groff-${version}.tar.gz"
+checksum=6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13
-subpackages="libgroff"
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" groff"
- configure_args+=" --with-doc=no"
-else
- subpackages+=" groff-doc"
-fi
+post_patch() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i Makefile.in \
+ -e "s|\$(GROFF_V)|/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static &|"
+ fi
+}
pre_configure() {
case "$XBPS_TARGET_MACHINE" in
@@ -41,13 +41,6 @@ post_install() {
done
}
-libgroff_package() {
- short_desc+=" - libraries"
- pkg_install() {
- vmove usr/lib
- }
-}
-
groff-doc_package() {
short_desc+=" - documentation"
pkg_install() {
next prev parent reply other threads:[~2023-07-28 18:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 17:20 [PR PATCH] " icp1994
2023-07-28 18:52 ` icp1994 [this message]
2023-07-28 18:58 ` [PR PATCH] [Updated] " icp1994
2023-07-28 19:25 ` icp1994
2023-07-28 19:32 ` icp1994
2023-08-01 3:00 ` g-branden-robinson
2023-08-01 10:36 ` [PR PATCH] [Updated] " icp1994
2023-08-01 10:54 ` icp1994
2023-08-01 11:24 ` g-branden-robinson
2023-08-01 11:25 ` g-branden-robinson
2023-08-01 11:27 ` g-branden-robinson
2023-08-01 14:00 ` [PR PATCH] [Updated] " icp1994
2023-08-01 14:00 ` icp1994
2023-08-05 18:50 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230728185251.44Ypeysq2u2hbeTm2GxZr5-y2C6K1RQIuNCu_Rh_XXs@z \
--to=icp1994@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).