guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: screen: Fix info page build failure.


From: Leo Famulari
Subject: 01/01: screen: Fix info page build failure.
Date: Sat, 8 Apr 2017 15:54:05 -0400 (EDT)

lfam pushed a commit to branch master
in repository guix.

commit ea240de4af85ae8ecc0c1afcd4778e01a88e6f5c
Author: Leo Famulari <address@hidden>
Date:   Sat Apr 8 15:52:13 2017 -0400

    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.
---
 gnu/local.mk                                       |  1 +
 .../patches/screen-fix-info-syntax-error.patch     | 47 ++++++++++++++++++++++
 gnu/packages/screen.scm                            |  1 +
 3 files changed, 49 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index ac6a596..a8d0066 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -916,6 +916,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
   %D%/packages/patches/scheme48-tests.patch                    \
   %D%/packages/patches/scotch-test-threading.patch             \
+  %D%/packages/patches/screen-fix-info-syntax-error.patch      \
   %D%/packages/patches/sdl-libx11-1.6.patch                    \
   %D%/packages/patches/seq24-rename-mutex.patch                        \
   %D%/packages/patches/serf-comment-style-fix.patch            \
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 0000000..6ee9091
--- /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 <address@hidden>
+Date: Tue, 28 Feb 2017 19:23:01 +0100
+Subject: [PATCH] fix texinfo syntax errors
+
+thanks to Andreas Stieger <address@hidden>
+---
+ 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 @*
+ ============
+ 
address@hidden
address@hidden
+      Thomas Renninger <address@hidden>,
+      Axel Beckert <address@hidden>,
+      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>.
address@hidden example
address@hidden verbatim
+ 
+ @noindent
+ Version @*
+-- 
+cgit v1.0-41-gc330
+
diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index f5c914e..5ab5351 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]