From ccea8618ae922694c1a9df1d80286fd00c344232b5df327cb3ae4551cbe998c2 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 12 Sep 2023 11:10:20 +0000 Subject: [PATCH] Accepting request 1109775 from home:ateixeira:branches:Base:System - Add groff-1.23.0-warnings.patch * Fix build errors with groff 1.23.0 OBS-URL: https://build.opensuse.org/request/show/1109775 OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=148 --- man-db-groff-1.23.0-warnings.patch | 29 +++++++++++++++++++++++++++++ man.changes | 6 ++++++ man.spec | 3 +++ 3 files changed, 38 insertions(+) create mode 100644 man-db-groff-1.23.0-warnings.patch diff --git a/man-db-groff-1.23.0-warnings.patch b/man-db-groff-1.23.0-warnings.patch new file mode 100644 index 0000000..5aff45e --- /dev/null +++ b/man-db-groff-1.23.0-warnings.patch @@ -0,0 +1,29 @@ +From b12ffb9df7a6a8956b08206c36be70fac78508bd Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Thu, 20 Jul 2023 00:18:59 +0100 +Subject: [PATCH] Update warning regex for groff 1.23.0 + +Part of https://gitlab.com/man-db/man-db/-/issues/25. + +* man/check-man: groff 1.23.0 says "cannot break line" rather than +"can't break line"; update regular expression. +--- + man/check-man | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/check-man b/man/check-man +index a58b7f9d..f8985a0d 100755 +--- a/man/check-man ++++ b/man/check-man +@@ -31,7 +31,7 @@ errors="$(LC_ALL=C MANWIDTH=80 MAN_KEEP_FORMATTING=1 "$top_builddir/libtool" \ + # Indeed, even for other languages we're going to get "cannot adjust line" + # if %manpath_config_file% expands to something long. Hmm. We'll just ignore + # this across the board for now. +-errors="$(echo "$errors" | $EGREP -v "(cannot adjust line|can't break line)")" || true ++errors="$(echo "$errors" | $EGREP -v "(cannot adjust line|(can't|cannot) break line)")" || true + + if [ "$code" != 0 ]; then + echo "man -E UTF-8 -l $1 failed with exit status $code and error output:" +-- +GitLab + diff --git a/man.changes b/man.changes index 29562bf..32f2811 100644 --- a/man.changes +++ b/man.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 8 19:48:53 UTC 2023 - Antonio Teixeira + +- Add groff-1.23.0-warnings.patch + * Fix build errors with groff 1.23.0 + ------------------------------------------------------------------- Sat Aug 26 12:20:42 UTC 2023 - Avinesh Kumar diff --git a/man.spec b/man.spec index e45e4ff..b4ddc07 100644 --- a/man.spec +++ b/man.spec @@ -59,6 +59,8 @@ Patch9: man-db-2.6.3-man0.dif Patch10: man-db-2.9.4-alternitive.dif # PATCH-FEATURE-OPENSUSE -- Propose to read man pages online Patch12: man-propose-online.patch +# PATCH-FIX-UPSTREAM -- Update warning regex for groff 1.23.0 +Patch13: man-db-groff-1.23.0-warnings.patch BuildRequires: automake BuildRequires: flex BuildRequires: gdbm-devel @@ -109,6 +111,7 @@ printer (using groff). %patch10 -b .libalernative rm -f configure %patch12 -p1 -b .p12 +%patch13 -p1 -b .p13 %build %global optflags %{optflags} -funroll-loops -pipe -Wall