From: Dr. Tobias Quathamer Date: Mon, 18 Jul 2016 15:19:17 +0000 (+0200) Subject: Add new patch to support guile-2.0 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=e20e28d59fbaa2af651e2a4ad5474e935dd64878;p=lilypond.git Add new patch to support guile-2.0 --- diff --git a/debian/patches/series b/debian/patches/series index 64f8ef4e0c..8543206854 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ hurd_file_name_support more_debug_output_during_build use_cstring_and_ctype_includes use_debians_help2man +support_guile_2 diff --git a/debian/patches/support_guile_2 b/debian/patches/support_guile_2 index 5a1a509739..90fa086016 100644 --- a/debian/patches/support_guile_2 +++ b/debian/patches/support_guile_2 @@ -4,21 +4,12 @@ Bug-Debian: http://bugs.debian.org/746005 Author: Don Armstrong --- a/configure.ac +++ b/configure.ac -@@ -129,7 +129,7 @@ - STEPMAKE_MSGFMT(REQUIRED) - STEPMAKE_TEXMF(REQUIRED) - STEPMAKE_TEXMF_DIRS(REQUIRED) --STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2, 1.9.0) -+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2, 2.1) - - # check for 3 typedefs added in Guile 1.9 - save_CXXFLAGS="$CXXFLAGS" -@@ -212,7 +212,7 @@ +@@ -219,7 +219,7 @@ STEPMAKE_WINDOWS # guile executable for some scripts -STEPMAKE_GUILE(OPTIONAL, 1.8.2, 1.9.0) -+STEPMAKE_GUILE(OPTIONAL, 1.8.2, 2.1) ++STEPMAKE_GUILE(OPTIONAL, 1.8.2, 2.2.0) # perl for help2man and for mf2pt1.pl STEPMAKE_PERL(REQUIRED)