* Re: [PR PATCH] [Updated] groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
@ 2023-07-28 18:52 ` icp1994
2023-07-28 18:58 ` icp1994
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: icp1994 @ 2023-07-28 18:52 UTC (permalink / raw)
To: ml
[-- 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() {
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
2023-07-28 18:52 ` [PR PATCH] [Updated] " icp1994
@ 2023-07-28 18:58 ` icp1994
2023-07-28 19:25 ` icp1994
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: icp1994 @ 2023-07-28 18:58 UTC (permalink / raw)
To: ml
[-- 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: 5918 bytes --]
From 76a6e0546110bdadd971d46953f7accab3c8dca7 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 | 31 +++----------
3 files changed, 6 insertions(+), 110 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..bf53e472a40c6 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -1,35 +1,23 @@
# 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"
fi
-pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- *musl)
- patch -p0 -i ${FILESDIR}/musl.patch
- ;;
- esac
-}
-
post_install() {
# From Arch:
#
@@ -41,13 +29,6 @@ post_install() {
done
}
-libgroff_package() {
- short_desc+=" - libraries"
- pkg_install() {
- vmove usr/lib
- }
-}
-
groff-doc_package() {
short_desc+=" - documentation"
pkg_install() {
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
2023-07-28 18:52 ` [PR PATCH] [Updated] " icp1994
2023-07-28 18:58 ` icp1994
@ 2023-07-28 19:25 ` icp1994
2023-07-28 19:32 ` icp1994
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: icp1994 @ 2023-07-28 19:25 UTC (permalink / raw)
To: ml
[-- 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: 6085 bytes --]
From ba284c4db48038e14bcfcf09f89bb5479ce6079b 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 | 39 ++++++-----------
3 files changed, 12 insertions(+), 112 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..8cfe6d078bbe8 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -1,33 +1,25 @@
# 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
-
-pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- *musl)
- patch -p0 -i ${FILESDIR}/musl.patch
- ;;
- esac
+post_patch() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i Makefile.in \
+ -e 's|GROFF_COMMAND_PREFIX=|&/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static|'
+ fi
}
post_install() {
@@ -41,13 +33,6 @@ post_install() {
done
}
-libgroff_package() {
- short_desc+=" - libraries"
- pkg_install() {
- vmove usr/lib
- }
-}
-
groff-doc_package() {
short_desc+=" - documentation"
pkg_install() {
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
` (2 preceding siblings ...)
2023-07-28 19:25 ` icp1994
@ 2023-07-28 19:32 ` icp1994
2023-08-01 3:00 ` g-branden-robinson
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: icp1994 @ 2023-07-28 19:32 UTC (permalink / raw)
To: ml
[-- 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: 6048 bytes --]
From 6d1b4135c59e99c6aad919d43510c30590990686 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 | 34 ++++-----------
3 files changed, 9 insertions(+), 110 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..5d59ac15d2138 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -1,35 +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
-
-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"
+ vsed -i Makefile.in \
+ -e 's|GROFF_COMMAND_PREFIX=|&/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static|'
fi
-pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- *musl)
- patch -p0 -i ${FILESDIR}/musl.patch
- ;;
- esac
-}
-
post_install() {
# From Arch:
#
@@ -41,13 +32,6 @@ post_install() {
done
}
-libgroff_package() {
- short_desc+=" - libraries"
- pkg_install() {
- vmove usr/lib
- }
-}
-
groff-doc_package() {
short_desc+=" - documentation"
pkg_install() {
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
` (3 preceding siblings ...)
2023-07-28 19:32 ` icp1994
@ 2023-08-01 3:00 ` g-branden-robinson
2023-08-01 10:36 ` [PR PATCH] [Updated] " icp1994
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: g-branden-robinson @ 2023-08-01 3:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]
New comment by g-branden-robinson on void-packages repository
https://github.com/void-linux/void-packages/pull/45300#issuecomment-1659491401
Comment:
Hi there,
Interested novelist here.
> * `--with-doc` configure option removed upstream, builds/installs docs by default
Half-true. Docs are built by the default `make` target, but `install-doc` is still required to install them. This is an Automake convention that I am not thrilled with.
> * `${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))
It wasn't ever supposed to be there. `libgroff`, like a handful of others in the _groff_ source tree, is internal. It has no published or supported API, it is not documented at all, it is built as a static object, and it is statically linked with the executables that need it. If anyone was ever shipping `libgroff.a`, they were in error.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
` (4 preceding siblings ...)
2023-08-01 3:00 ` g-branden-robinson
@ 2023-08-01 10:36 ` icp1994
2023-08-01 10:54 ` icp1994
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: icp1994 @ 2023-08-01 10:36 UTC (permalink / raw)
To: ml
[-- 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: 6443 bytes --]
From b9bd18e560cda43f36ba3af6b2653253f79f1968 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 | 32 +++----------
srcpkgs/removed-packages/template | 1 +
4 files changed, 8 insertions(+), 110 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..b49430410cd03 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -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() {
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5b0e0047ee3e6..455f95d65d25f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -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
libgtkhtml<=4.10.0_1
liblrzip<=0.641_1
libmagick6-devel<=6.9.12.12_2
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
` (5 preceding siblings ...)
2023-08-01 10:36 ` [PR PATCH] [Updated] " icp1994
@ 2023-08-01 10:54 ` icp1994
2023-08-01 11:24 ` g-branden-robinson
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: icp1994 @ 2023-08-01 10:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 891 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/45300#issuecomment-1660071990
Comment:
Thank you for your inputs. The `libgroff` package in Void wasn't actually shipping `libgroff.a`, rather the following files (i.e., everything installed under "$destdir/usr/lib")
```
/usr/lib/groff/glilypond/args.pl
/usr/lib/groff/glilypond/oop_fh.pl
/usr/lib/groff/glilypond/subs.pl
/usr/lib/groff/gpinyin/subs.pl
/usr/lib/groff/groff_opts_no_arg.txt
/usr/lib/groff/groff_opts_with_arg.txt
/usr/lib/groff/groffer/main_subs.pl
/usr/lib/groff/groffer/man.pl
/usr/lib/groff/groffer/split_env.sh
/usr/lib/groff/groffer/subs.pl
/usr/lib/groff/groffer/version.sh
/usr/lib/groff/grog/subs.pl
```
The changelog mentions that groffer/*, groff_opts_{no,with}_arg.txt, and grog/subs.pl were all removed. Although not sure about the other ones.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
` (6 preceding siblings ...)
2023-08-01 10:54 ` icp1994
@ 2023-08-01 11:24 ` g-branden-robinson
2023-08-01 11:25 ` g-branden-robinson
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: g-branden-robinson @ 2023-08-01 11:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2474 bytes --]
New comment by g-branden-robinson on void-packages repository
https://github.com/void-linux/void-packages/pull/45300#issuecomment-1660120152
Comment:
> Thank you for your inputs. The `libgroff` package in Void wasn't actually shipping `libgroff.a`, rather the following files (i.e., everything installed under "$destdir/usr/lib")
Ah, thanks, I had forgotten about those since refactoring them away.
> The changelog mentions that groffer/*, groff_opts_{no,with}_arg.txt, and grog/subs.pl were all removed. Although not sure about the other ones.
Yes, `grog`, `groffer`, `gpinyin`, and `glilypond` (all written by the same contributor) had a similar structure, and on the _groff_ development mailing list we thought it would be simpler if these programs all became stand-alone scripts. So everything they need is now embedded in their executables in `$DESTDIR/bin`. Except for `groffer`, which we withdrew entirely.
You didn't find them in the `ChangeLog` because items in the `contrib` directory in _groff_'s source distribution (usually) maintain their own change log files as a consequence of their somewhat independent history. [Our LICENSES file](https://git.savannah.gnu.org/cgit/groff.git/tree/LICENSES?h=1.23.0#n31) talks about this.
The Git history is probably easier to search because it records the changes to *everything*.
```
commit 427a5cb1fc6761a0fd6e338d23732522b02804b0
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sun Oct 9 07:00:05 2022 -0500
[glilypond]: Make script stand alone.
* contrib/glilypond/args.pl:
* contrib/glilypond/oop_fh.pl
* contrib/glilypond/subs.pl: Delete, moving their content into...
* contrib/glilypond/glilypond.pl: ...here. Also bump overall license to
GPLv3 from GPLv2 because all of the deleted files were GPLv3.
* contrib/glilypond/glilypond.am (dist_glilypond_DATA): Delete.
```
```
commit 92c5da8134a0209b7bf34e6f92bfa8218197d485
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sun Oct 9 05:56:36 2022 -0500
[gpinyin]: Make script stand alone.
* contrib/gpinyin/subs.pl: Delete, moving its content into...
* contrib/gpinyin/gpinyin.pl: ...here.
(vowel_t): Use explicit list with `my`.
(vowel_n, vowel_t): Declare local scalar $vowel_with_tone using `my`.
* contrib/gpinyin/gpinyin.am (dist_gpinyin_DATA): Delete.
```
Does this help?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
` (7 preceding siblings ...)
2023-08-01 11:24 ` g-branden-robinson
@ 2023-08-01 11:25 ` g-branden-robinson
2023-08-01 11:27 ` g-branden-robinson
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: g-branden-robinson @ 2023-08-01 11:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2487 bytes --]
New comment by g-branden-robinson on void-packages repository
https://github.com/void-linux/void-packages/pull/45300#issuecomment-1660120152
Comment:
> Thank you for your inputs. The `libgroff` package in Void wasn't actually shipping `libgroff.a`, rather the following files (i.e., everything installed under "$destdir/usr/lib")
Ah, thanks, I had forgotten about those since refactoring them away.
> The changelog mentions that groffer/*, groff_opts_{no,with}_arg.txt, and grog/subs.pl were all removed. Although not sure about the other ones.
Yes, `grog`, `groffer`, `gpinyin`, and `glilypond` (all written by the same contributor) had a similar structure, and on the _groff_ development mailing list we thought it would be simpler if these programs all became stand-alone scripts. So everything they need is now embedded in their executables in `$DESTDIR/bin`. Except for `groffer`, which we withdrew entirely.
You didn't find them in the `ChangeLog` because items in the `contrib` directory in _groff_'s source distribution (usually) maintain their own change log files as a consequence of their somewhat independent history. [Our LICENSES file](https://git.savannah.gnu.org/cgit/groff.git/tree/LICENSES?h=1.23.0#n31) talks about this.
The Git history is probably easier to search because it records the changes to *everything* in one place.
```
commit 427a5cb1fc6761a0fd6e338d23732522b02804b0
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sun Oct 9 07:00:05 2022 -0500
[glilypond]: Make script stand alone.
* contrib/glilypond/args.pl:
* contrib/glilypond/oop_fh.pl
* contrib/glilypond/subs.pl: Delete, moving their content into...
* contrib/glilypond/glilypond.pl: ...here. Also bump overall license to
GPLv3 from GPLv2 because all of the deleted files were GPLv3.
* contrib/glilypond/glilypond.am (dist_glilypond_DATA): Delete.
```
```
commit 92c5da8134a0209b7bf34e6f92bfa8218197d485
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sun Oct 9 05:56:36 2022 -0500
[gpinyin]: Make script stand alone.
* contrib/gpinyin/subs.pl: Delete, moving its content into...
* contrib/gpinyin/gpinyin.pl: ...here.
(vowel_t): Use explicit list with `my`.
(vowel_n, vowel_t): Declare local scalar $vowel_with_tone using `my`.
* contrib/gpinyin/gpinyin.am (dist_gpinyin_DATA): Delete.
```
Does this help?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
` (8 preceding siblings ...)
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
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: g-branden-robinson @ 2023-08-01 11:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2614 bytes --]
New comment by g-branden-robinson on void-packages repository
https://github.com/void-linux/void-packages/pull/45300#issuecomment-1660120152
Comment:
> Thank you for your inputs. The `libgroff` package in Void wasn't actually shipping `libgroff.a`, rather the following files (i.e., everything installed under "$destdir/usr/lib")
Ah, thanks, I had forgotten about those since refactoring them away.
> The changelog mentions that groffer/*, groff_opts_{no,with}_arg.txt, and grog/subs.pl were all removed. Although not sure about the other ones.
Yes, `grog`, `groffer`, `gpinyin`, and `glilypond` (all written by the same contributor) had a similar structure, and on the _groff_ development mailing list we thought it would be simpler if these programs all became stand-alone scripts. So everything they need is now embedded in their executables in `$DESTDIR/bin`. Except for `groffer`, which we withdrew entirely.
You didn't find them in the `ChangeLog` because items in the `contrib` directory in _groff_'s source distribution (usually) maintain their own change log files as a consequence of their somewhat independent history. [Our LICENSES file](https://git.savannah.gnu.org/cgit/groff.git/tree/LICENSES?h=1.23.0#n31) suggests the basis for this, and [our HACKING file](https://git.savannah.gnu.org/cgit/groff.git/tree/HACKING?h=1.23.0#n46) covers it explicitly.
The Git history is probably easier to search because it records the changes to *everything* in one place.
```
commit 427a5cb1fc6761a0fd6e338d23732522b02804b0
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sun Oct 9 07:00:05 2022 -0500
[glilypond]: Make script stand alone.
* contrib/glilypond/args.pl:
* contrib/glilypond/oop_fh.pl
* contrib/glilypond/subs.pl: Delete, moving their content into...
* contrib/glilypond/glilypond.pl: ...here. Also bump overall license to
GPLv3 from GPLv2 because all of the deleted files were GPLv3.
* contrib/glilypond/glilypond.am (dist_glilypond_DATA): Delete.
```
```
commit 92c5da8134a0209b7bf34e6f92bfa8218197d485
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sun Oct 9 05:56:36 2022 -0500
[gpinyin]: Make script stand alone.
* contrib/gpinyin/subs.pl: Delete, moving its content into...
* contrib/gpinyin/gpinyin.pl: ...here.
(vowel_t): Use explicit list with `my`.
(vowel_n, vowel_t): Declare local scalar $vowel_with_tone using `my`.
* contrib/gpinyin/gpinyin.am (dist_gpinyin_DATA): Delete.
```
Does this help?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
` (9 preceding siblings ...)
2023-08-01 11:27 ` g-branden-robinson
@ 2023-08-01 14:00 ` icp1994
2023-08-01 14:00 ` icp1994
2023-08-05 18:50 ` [PR PATCH] [Merged]: " leahneukirchen
12 siblings, 0 replies; 14+ messages in thread
From: icp1994 @ 2023-08-01 14:00 UTC (permalink / raw)
To: ml
[-- 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: 6445 bytes --]
From a29da3d153041791d73b75e633e59f2f59008da8 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 | 32 +++----------
srcpkgs/removed-packages/template | 1 +
4 files changed, 8 insertions(+), 110 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..b49430410cd03 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -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() {
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5b0e0047ee3e6..545ba64bb3602 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
` (10 preceding siblings ...)
2023-08-01 14:00 ` [PR PATCH] [Updated] " icp1994
@ 2023-08-01 14:00 ` icp1994
2023-08-05 18:50 ` [PR PATCH] [Merged]: " leahneukirchen
12 siblings, 0 replies; 14+ messages in thread
From: icp1994 @ 2023-08-01 14:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/45300#issuecomment-1660394429
Comment:
Yes, appreciate the explanation.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Merged]: groff: update to 1.23.0.
2023-07-28 17:20 [PR PATCH] groff: update to 1.23.0 icp1994
` (11 preceding siblings ...)
2023-08-01 14:00 ` icp1994
@ 2023-08-05 18:50 ` leahneukirchen
12 siblings, 0 replies; 14+ messages in thread
From: leahneukirchen @ 2023-08-05 18:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
There's a merged pull request on the void-packages repository
groff: update to 1.23.0.
https://github.com/void-linux/void-packages/pull/45300
Description:
#### 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))
^ permalink raw reply [flat|nested] 14+ messages in thread