Re: I cannot run make check since Issue 5450: relocate.cc: Introduce new command `set?'

[David Kastrup]

Werner LEMBERG <address@hidden> writes:

>>> -> I suspect that stable/2.20 fails because patch
>>> 2c7277e0014b8d1d22ef5a1caa69a2f86bcfb964 is missing ...
>> 
>> Patch does not apply (upon cherry-pick) so I guess that this builds on
>> some previous patch.  Would we be needing both then?
>
> Yes, 430fcf895a49d8159413f194488b8474d4ae6be6 is also needed.

Doesn't apply either.

diff --cc scripts/build/output-distance.py
index 625ce12a1e,8b9f12572c..0000000000
--- a/scripts/build/output-distance.py
+++ b/scripts/build/output-distance.py
@@@ -636,15 -651,23 +651,33 @@@ class SignatureFileLink (FileLink)
                  data_option = ''
                  if options.local_data_dir:
                      data_option = 
('-slilypond-datadir=%s/share/lilypond/current '
-                                    % os.path.dirname(infile))
+                                    % dir)
  
++<<<<<<< HEAD
 +                mkdir (os.path.split (outfile)[0])
 +                cmd = ('gs -sDEVICE=png16m -dGraphicsAlphaBits=4 
-dTextAlphaBits=4 '
 +                       ' %(data_option)s '
 +                       ' -r101 '
 +                       ' -dAutoRotatePages=/None '
 +                       ' -sOutputFile=%(outfile)s -dNOSAFER -dEPSCrop -q 
-dNOPAUSE '
 +                       ' %(infile)s  -c quit ') % locals ()
++=======
+                 cmd = ('gs'
+                        ' -sDEVICE=png16m'
+                        ' -dGraphicsAlphaBits=4'
+                        ' -dTextAlphaBits=4'
+                        ' %(data_option)s'
+                        ' -r101'
+                        ' -dAutoRotatePages=/None'
+                        ' -dPrinted=false'
+                        ' -sOutputFile=%(outfile)s'
+                        ' -dNOSAFER'
+                        ' -dEPSCrop'
+                        ' -q'
+                        ' -dNOPAUSE'
+                        ' %(f)s'
+                        ' -c quit') % locals ()
++>>>>>>> 430fcf895a... Issue 5456: output-distance.py: Support relative font 
paths
  
                  files_created[oldnew].append (outfile)
                  system (cmd)

-- 
David Kastrup