From b981cd19b083603ff3d32dd50b52c5e17862a650897f754b99d99d4b761934ae Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 14 Sep 2023 11:51:32 +0000 Subject: [PATCH] Accepting request 1109774 from home:ateixeira:branches:M17N - Refresh bash-scripts.patch - Add nroff-map-CW-to-R.patch * Fixes man-db build errors OBS-URL: https://build.opensuse.org/request/show/1109774 OBS-URL: https://build.opensuse.org/package/show/M17N/groff?expand=0&rev=93 --- bash-scripts.patch | 8 ++++---- groff.changes | 7 +++++++ groff.spec | 1 + nroff-map-CW-to-R.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 nroff-map-CW-to-R.patch diff --git a/bash-scripts.patch b/bash-scripts.patch index f3056a8..6d90347 100644 --- a/bash-scripts.patch +++ b/bash-scripts.patch @@ -1,4 +1,4 @@ -From b5636fe1b680fff8dbf8c2d002806f37b32a10df Mon Sep 17 00:00:00 2001 +From e3d8901a5e24e11e1fa8a80329309295a20eb47f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 2 Jan 2014 13:13:09 +0000 Subject: The *2graph scripts use $RANDOM, which is bash-specific @@ -14,7 +14,7 @@ Patch-Name: bash-scripts.patch 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/eqn2graph/eqn2graph.sh b/contrib/eqn2graph/eqn2graph.sh -index 3e9c3748..454754b5 100644 +index 3e9c37486..454754b52 100644 --- a/contrib/eqn2graph/eqn2graph.sh +++ b/contrib/eqn2graph/eqn2graph.sh @@ -1,4 +1,4 @@ @@ -24,7 +24,7 @@ index 3e9c3748..454754b5 100644 # eqn2graph -- compile EQN equation descriptions to bitmap images # diff --git a/contrib/grap2graph/grap2graph.sh b/contrib/grap2graph/grap2graph.sh -index 29df25bb..062f2eec 100644 +index 29df25bb1..062f2eecd 100644 --- a/contrib/grap2graph/grap2graph.sh +++ b/contrib/grap2graph/grap2graph.sh @@ -1,4 +1,4 @@ @@ -34,7 +34,7 @@ index 29df25bb..062f2eec 100644 # grap2graph -- compile graph description descriptions to bitmap images # diff --git a/contrib/pic2graph/pic2graph.sh b/contrib/pic2graph/pic2graph.sh -index b2299148..cc92ce07 100644 +index b22991483..cc92ce075 100644 --- a/contrib/pic2graph/pic2graph.sh +++ b/contrib/pic2graph/pic2graph.sh @@ -1,4 +1,4 @@ diff --git a/groff.changes b/groff.changes index 63d8de1..072a639 100644 --- a/groff.changes +++ b/groff.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 8 19:42:28 UTC 2023 - Antonio Teixeira + +- Refresh bash-scripts.patch +- Add nroff-map-CW-to-R.patch + * Fixes man-db build errors + ------------------------------------------------------------------- Tue Aug 29 14:21:17 UTC 2023 - Antonio Teixeira diff --git a/groff.spec b/groff.spec index 7c77cf3..cd90f0d 100644 --- a/groff.spec +++ b/groff.spec @@ -51,6 +51,7 @@ Patch6: groff-force-locale-usage.patch Patch7: 0004-don-t-use-usr-bin-env-in-shebang.patch # Patches from debian Patch100: https://salsa.debian.org/debian/groff/raw/master/debian/patches/bash-scripts.patch +Patch101: https://salsa.debian.org/debian/groff/raw/master/debian/patches/nroff-map-CW-to-R.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison diff --git a/nroff-map-CW-to-R.patch b/nroff-map-CW-to-R.patch new file mode 100644 index 0000000..73b689f --- /dev/null +++ b/nroff-map-CW-to-R.patch @@ -0,0 +1,40 @@ +From 742dfac36f1fd23e17d27dbf83e3793d3f3a063d Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Fri, 14 Jul 2023 12:42:26 +0100 +Subject: Map CW to R for nroff + +Bug-Debian: https://bugs.debian.org/1040975 +Last-Update: 2023-07-14 + +Patch-Name: nroff-map-CW-to-R.patch +--- + tmac/man.local | 2 +- + tmac/mdoc.local | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tmac/man.local b/tmac/man.local +index 0bb667bd4..1aaaadd6a 100644 +--- a/tmac/man.local ++++ b/tmac/man.local +@@ -12,7 +12,7 @@ + .\" Uncomment this to suppress warnings produced by such pages. This + .\" test remaps the font to roman ("R") on nroff (terminal) devices. You + .\" might prefer to remap it to bold ("B") instead. +-.\" .if n .ftr CW R ++.if n .ftr CW R + .\" + .\" A de facto standard URL format for man pages is recognized + .\" everywhere except Apple, where different macOS applications expect +diff --git a/tmac/mdoc.local b/tmac/mdoc.local +index 94688aba0..66dcc423d 100644 +--- a/tmac/mdoc.local ++++ b/tmac/mdoc.local +@@ -6,7 +6,7 @@ + .\" Uncomment this to suppress warnings produced by such pages. This + .\" test remaps the font to roman ("R") on nroff (terminal) devices. You + .\" might prefer to remap it to bold ("B") instead. +-.\" .if n .ftr CW R ++.if n .ftr CW R + .\" + .\" Local Variables: + .\" mode: nroff