aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-04-08 15:52:13 -0400
committerLeo Famulari <leo@famulari.name>2017-04-08 15:53:00 -0400
commitea240de4af85ae8ecc0c1afcd4778e01a88e6f5c (patch)
tree0f1027b01fbb839051b5403ab91566006029fca4 /gnu/packages
parentb496bfea415750d710dd3ead4bc2ded9d4a6e71d (diff)
downloadpatches-ea240de4af85ae8ecc0c1afcd4778e01a88e6f5c.tar
patches-ea240de4af85ae8ecc0c1afcd4778e01a88e6f5c.tar.gz
screen: Fix info page build failure.
* gnu/packages/patches/screen-fix-info-syntax-error.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/screen.scm (screen)[source]: Use it.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/patches/screen-fix-info-syntax-error.patch47
-rw-r--r--gnu/packages/screen.scm1
2 files changed, 48 insertions, 0 deletions
diff --git a/gnu/packages/patches/screen-fix-info-syntax-error.patch b/gnu/packages/patches/screen-fix-info-syntax-error.patch
new file mode 100644
index 0000000000..6ee9091daa
--- /dev/null
+++ b/gnu/packages/patches/screen-fix-info-syntax-error.patch
@@ -0,0 +1,47 @@
+Fix errors when building the info manual:
+
+[...]
+./screen.texinfo:5799: unknown command `suse'
+./screen.texinfo:5800: unknown command `deuxchevaux'
+make[2]: *** [Makefile:31: screen.info] Error 1
+[...]
+
+Patch copied from upstream source repository:
+
+http://git.savannah.gnu.org/cgit/screen.git/commit/?id=a7d2f9e6ecfa794dd0bd3dbeaf6780c88a6f3152
+
+From a7d2f9e6ecfa794dd0bd3dbeaf6780c88a6f3152 Mon Sep 17 00:00:00 2001
+From: Andreas Stieger <astieger@suse.com>
+Date: Tue, 28 Feb 2017 19:23:01 +0100
+Subject: [PATCH] fix texinfo syntax errors
+
+thanks to Andreas Stieger <astieger@suse.com>
+---
+ src/doc/screen.texinfo | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/doc/screen.texinfo b/src/doc/screen.texinfo
+index bc4cbae..aadad33 100644
+--- a/doc/screen.texinfo
++++ b/doc/screen.texinfo
+@@ -5795,7 +5795,7 @@ and Alexander Naumov <alexander_naumov@@opensuse.org>.
+ Contributors @*
+ ============
+
+-@example
++@verbatim
+ Thomas Renninger <treen@suse.com>,
+ Axel Beckert <abe@deuxchevaux.org>,
+ Ken Beal <kbeal@@amber.ssd.csd.harris.com>,
+@@ -5826,7 +5826,7 @@ Contributors @*
+ Jason Merrill <jason@@jarthur.Claremont.EDU>,
+ Johannes Zellner <johannes@@zellner.org>,
+ Pablo Averbuj <pablo@@averbuj.com>.
+-@end example
++@end verbatim
+
+ @noindent
+ Version @*
+--
+cgit v1.0-41-gc330
+
diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index f5c914e88a..5ab5351e35 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -40,6 +40,7 @@
(method url-fetch)
(uri (string-append "mirror://gnu/screen/screen-"
version ".tar.gz"))
+ (patches (search-patches "screen-fix-info-syntax-error.patch"))
(sha256
(base32 "0bbv16gpxrh64sn4bvjy3qjy7jsxjlqlilyysin02fwnvla23nwp"))))
(build-system gnu-build-system)