From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/groff/files/, sys-apps/groff/
Date: Thu, 9 Feb 2023 18:07:41 +0000 (UTC) [thread overview]
Message-ID: <1675966044.2e23a14c7fb085f1004612e39cec7cbac96d2119.sam@gentoo> (raw)
commit: 2e23a14c7fb085f1004612e39cec7cbac96d2119
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 18:05:38 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 18:07:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e23a14c
sys-apps/groff: use patch for disabling broken diffutils tests
Avoid maintainer mode.
Fixes: 882ac9b1db71efea7e03c41c12b21278c50461ea
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../groff-1.22.4-skip-broken-diffutils-test.patch | 37 ++++++++++++++++++++++
...off-1.23.0_rc2-skip-broken-diffutils-test.patch | 37 ++++++++++++++++++++++
sys-apps/groff/groff-1.22.4.ebuild | 8 +----
sys-apps/groff/groff-1.23.0_rc2.ebuild | 8 +----
4 files changed, 76 insertions(+), 14 deletions(-)
diff --git a/sys-apps/groff/files/groff-1.22.4-skip-broken-diffutils-test.patch b/sys-apps/groff/files/groff-1.22.4-skip-broken-diffutils-test.patch
new file mode 100644
index 000000000000..c767aa828930
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.22.4-skip-broken-diffutils-test.patch
@@ -0,0 +1,37 @@
+https://savannah.gnu.org/bugs/?63726
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4195,8 +4195,7 @@ SUFFIXES = .roff .in .ps .mom .pdf .me .ms .ps .html .txt .texi .dvi \
+
+ # tests launched by make check
+ check_SCRIPTS =
+-TESTS = contrib/gdiffmk/tests/gdiffmk_tests.sh $(am__append_5) \
+- $(am__append_8)
++TESTS = $(am__append_5) $(am__append_8)
+ AM_TESTS_ENVIRONMENT = \
+ abs_top_srcdir=$(abs_top_srcdir) \
+ abs_top_builddir=$(abs_top_builddir) \
+@@ -9570,13 +9569,6 @@ recheck: all $(check_PROGRAMS) $(check_SCRIPTS)
+ am__force_recheck=am--force-recheck \
+ TEST_LOGS="$$log_list"; \
+ exit $$?
+-contrib/gdiffmk/tests/gdiffmk_tests.sh.log: contrib/gdiffmk/tests/gdiffmk_tests.sh
+- @p='contrib/gdiffmk/tests/gdiffmk_tests.sh'; \
+- b='contrib/gdiffmk/tests/gdiffmk_tests.sh'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+ contrib/hdtbl/examples/test-hdtbl.sh.log: contrib/hdtbl/examples/test-hdtbl.sh
+ @p='contrib/hdtbl/examples/test-hdtbl.sh'; \
+ b='contrib/hdtbl/examples/test-hdtbl.sh'; \
+--- a/contrib/gdiffmk/gdiffmk.am
++++ b/contrib/gdiffmk/gdiffmk.am
+@@ -26,7 +26,6 @@
+ ########################################################################
+ gdiffmk_srcdir = $(top_srcdir)/contrib/gdiffmk
+ bin_SCRIPTS += gdiffmk
+-TESTS += contrib/gdiffmk/tests/gdiffmk_tests.sh
+ man1_MANS += contrib/gdiffmk/gdiffmk.1
+ EXTRA_DIST += \
+ contrib/gdiffmk/gdiffmk.1.man \
diff --git a/sys-apps/groff/files/groff-1.23.0_rc2-skip-broken-diffutils-test.patch b/sys-apps/groff/files/groff-1.23.0_rc2-skip-broken-diffutils-test.patch
new file mode 100644
index 000000000000..171e99608337
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.23.0_rc2-skip-broken-diffutils-test.patch
@@ -0,0 +1,37 @@
+https://savannah.gnu.org/bugs/?63726
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4449,8 +4449,7 @@ SUFFIXES = .roff .in .ps .mom .pdf .me.in .me .man
+
+ # tests launched by make check
+ check_SCRIPTS =
+-TESTS = contrib/gdiffmk/tests/gdiffmk_tests.sh $(hdtbl_TESTS) \
+- $(mm_TESTS) $(am__append_14) $(rfc1345_TESTS) \
++TESTS = $(hdtbl_TESTS) $(mm_TESTS) $(am__append_14) $(rfc1345_TESTS) \
+ $(font_devpdf_TESTS) $(grotty_TESTS) $(eqn_TESTS) \
+ $(preconv_TESTS) $(refer_TESTS) $(tbl_TESTS) $(groff_TESTS) \
+ $(nroff_TESTS) $(grog_TESTS) $(tmac_TESTS)
+@@ -10558,13 +10557,6 @@ recheck: all $(check_PROGRAMS) $(check_SCRIPTS)
+ am__force_recheck=am--force-recheck \
+ TEST_LOGS="$$log_list"; \
+ exit $$?
+-contrib/gdiffmk/tests/gdiffmk_tests.sh.log: contrib/gdiffmk/tests/gdiffmk_tests.sh
+- @p='contrib/gdiffmk/tests/gdiffmk_tests.sh'; \
+- b='contrib/gdiffmk/tests/gdiffmk_tests.sh'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+ contrib/hdtbl/examples/test-hdtbl.sh.log: contrib/hdtbl/examples/test-hdtbl.sh
+ @p='contrib/hdtbl/examples/test-hdtbl.sh'; \
+ b='contrib/hdtbl/examples/test-hdtbl.sh'; \
+--- a/contrib/gdiffmk/gdiffmk.am
++++ b/contrib/gdiffmk/gdiffmk.am
+@@ -22,7 +22,6 @@
+ ########################################################################
+ gdiffmk_srcdir = $(top_srcdir)/contrib/gdiffmk
+ bin_SCRIPTS += gdiffmk
+-TESTS += contrib/gdiffmk/tests/gdiffmk_tests.sh
+ man1_MANS += contrib/gdiffmk/gdiffmk.1
+ EXTRA_DIST += \
+ contrib/gdiffmk/gdiffmk.1.man \
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 81ac61ff2940..94a0763ca900 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -39,6 +39,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
+ "${FILESDIR}"/${PN}-1.22.4-skip-broken-diffutils-test.patch
)
src_prepare() {
@@ -56,13 +57,6 @@ src_prepare() {
.ds default-operating-system Gentoo${pfx}/${KERNEL}
EOF
- # https://savannah.gnu.org/bugs/?63726
- sed -i \
- -e '/TESTS += contrib\/gdiffmk\/tests\/gdiffmk_tests.sh/d' \
- -e '/\tcontrib\/gdiffmk\/tests\/gdiffmk_tests.sh \\/d' \
- contrib/gdiffmk/tests/gdiffmk_tests.sh \
- contrib/gdiffmk/gdiffmk.am || die
-
# make sure we don't get a crappy `g' nameprefix on UNIX systems with real
# troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy)
sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die
diff --git a/sys-apps/groff/groff-1.23.0_rc2.ebuild b/sys-apps/groff/groff-1.23.0_rc2.ebuild
index 7571ab653986..ac8ba6b2371f 100644
--- a/sys-apps/groff/groff-1.23.0_rc2.ebuild
+++ b/sys-apps/groff/groff-1.23.0_rc2.ebuild
@@ -44,6 +44,7 @@ DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README TODO )
PATCHES=(
# bug #16108, bug #17580, bug #121502
"${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch
+ "${FILESDIR}"/${PN}-1.23.0_rc2-skip-broken-diffutils-test.patch
)
src_prepare() {
@@ -61,13 +62,6 @@ src_prepare() {
.ds default-operating-system Gentoo${pfx}/${KERNEL}
EOF
- # https://savannah.gnu.org/bugs/?63726
- sed -i \
- -e '/TESTS += contrib\/gdiffmk\/tests\/gdiffmk_tests.sh/d' \
- -e '/\tcontrib\/gdiffmk\/tests\/gdiffmk_tests.sh \\/d' \
- contrib/gdiffmk/tests/gdiffmk_tests.sh \
- contrib/gdiffmk/gdiffmk.am || die
-
# make sure we don't get a crappy `g' nameprefix on UNIX systems with real
# troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy)
sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die
next reply other threads:[~2023-02-09 18:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-09 18:07 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-21 0:31 [gentoo-commits] repo/gentoo:master commit in: sys-apps/groff/files/, sys-apps/groff/ Sam James
2020-07-21 7:10 Andreas Sturmlechner
2018-09-27 13:51 Lars Wendler
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=1675966044.2e23a14c7fb085f1004612e39cec7cbac96d2119.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.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