Re: Fix portuguese in all copies of utf-8.ly (issue 571640044 by hanw...@gmail.com)

2020-02-18 Thread thomasmorley65 
On 2020/02/18 07:39:45, lemzwerg wrote:
> > Werner, may I ask you to have a look?
> 
> What exactly shall I check?

If you look at 
https://lsr.di.unimi.it/form.php?type=snippet;id=600;rld=m_snippet
you'll see:

portuguese = \lyricmode {
  à vo -- cê uma can -- ção legal
}

I don't know how to change it, so that 
http://lsr.di.unimi.it/LSR/Snippet?id=600
shows the same as in Han-Wen's patch here.


https://codereview.appspot.com/571640044/

Re: Fix portuguese in all copies of utf-8.ly (issue 571640044 by hanw...@gmail.com)

2020-02-18 Thread lemzwerg--- via Discussions on LilyPond development 
>   à vo -- cê uma can -- ção legal
> 
> I don't know how to change it, so that 
> http://lsr.di.unimi.it/LSR/Snippet?id=600
> shows the same as in Han-Wen's patch here.

This seems to be a bug on LSR webpage: What you see is double-encoded
UTF-8 (see
https://stackoverflow.com/questions/11436594/how-to-fix-double-encoded-utf8-characters-in-an-utf-8-table
for a similar mysql issue) – UTF-8 encoded characters get interpreted as
Latin-1, which in turn get re-interpreted as UTF-8.

Note that in the LSR database itself the problem doesn't happen.

Please contact Sebastiano so that he can comment and probably implement
a fix.


https://codereview.appspot.com/571640044/

Re: Doc: Some miscellaneous suggestions from Peter Toye (issue 579280043 by michael.kaepp...@googlemail.com)

2020-02-18 Thread michael . kaeppler--- via Discussions on LilyPond development 
This patch has already been counted down, however, I would
like to have at least one LGTM to the last version of this patch before
pushing this. 
Knowing that this is only an intermediate state and further
clarification would help.


https://codereview.appspot.com/579280043/

Patchy email

2020-02-18 Thread patchy 
10:35:17 (UTC) Begin LilyPond compile, previous commit at   
b16c3d14f3d1f10aa919e70107e6103c67a9aa01
10:35:20 Merged staging, now at:b16c3d14f3d1f10aa919e70107e6103c67a9aa01
10:35:21Success:./autogen.sh --noconfigure
10:35:34Success:/tmp/lilypond-autobuild/configure 
--enable-checking
10:35:37Success:nice make clean
10:37:17 *** FAILED BUILD ***
nice make -j9 CPU_COUNT=9
Previous good commit:   ce072002412d48f48cc4ff4620d82f700e816225
Current broken commit:  b16c3d14f3d1f10aa919e70107e6103c67a9aa01
10:37:17 *** FAILED STEP ***
merge from staging
Failed runner: nice make -j9 CPU_COUNT=9
See the log file log-staging-nice-make--j9-CPU_COUNT=9.txt
10:37:17 Traceback (most recent call last):
  File 
"/usr/local/tmp/lilypond-extra/patches/compile_lilypond_test/__init__.py", line 
528, in handle_staging
self.build (issue_id=issue_id)
  File 
"/usr/local/tmp/lilypond-extra/patches/compile_lilypond_test/__init__.py", line 
316, in build
issue_id)
  File 
"/usr/local/tmp/lilypond-extra/patches/compile_lilypond_test/__init__.py", line 
266, in runner
raise FailedCommand ("Failed runner: %s\nSee the log file %s" % (command, 
this_logfilename))
FailedCommand: Failed runner: nice make -j9 CPU_COUNT=9
See the log file log-staging-nice-make--j9-CPU_COUNT=9.txt

Staging broken.

2020-02-18 Thread David Kastrup 


Hi, staging does not compile anymore.

Making lily/out/keyword.o < cc
Making lily/out/simple-spacer-scheme.o < cc
Making lily/out/episema-engraver.o < cc
Making lily/out/lyric-extender.o < cc
Making lily/out/includable-lexer.o < cc
Making lily/out/timing-translator.o < cc
Making lily/out/pango-font.o < cc
Making lily/out/part-combine-part-iterator.o < cc
Making lily/out/horizontal-bracket.o < cc
/tmp/lilypond-autobuild/lily/pango-font.cc: In member function 'Stencil 
Pango_font::pango_item_string_stencil(const PangoGlyphItem*) const':
/tmp/lilypond-autobuild/lily/pango-font.cc:229:28: error: invalid use of 
incomplete type 'PangoFcFont' {aka 'struct _PangoFcFont'}
  229 |   FcPattern *fcpat = fcfont->font_pattern;
  |^~
In file included from /usr/include/pango-1.0/pango/pangoft2.h:29,
 from /tmp/lilypond-autobuild/lily/pango-font.cc:20:
/usr/include/pango-1.0/pango/pangofc-font.h:47:16: note: forward declaration of 
'PangoFcFont' {aka 'struct _PangoFcFont'}
   47 | typedef struct _PangoFcFont  PangoFcFont;
  |^~~~
Making lily/out/clef-engraver.o < cc
Making lily/out/key-performer.o < cc
make[1]: *** [/tmp/lilypond-autobuild/stepmake/stepmake/c++-rules.make:5: 
out/pango-font.o] Error 1
make[1]: *** Waiting for unfinished jobs
make: *** [/tmp/lilypond-autobuild/stepmake/stepmake/generic-targets.make:6: 
all] Error 2

I'll back out the Pango related commit and retry.  It is a bit of a
puzzler to me how this could have passed testing.

-- 
David Kastrup

Re: Staging broken.

2020-02-18 Thread David Kastrup 
David Kastrup  writes:

> Hi, staging does not compile anymore.
>
> Making lily/out/keyword.o < cc
> Making lily/out/simple-spacer-scheme.o < cc
> Making lily/out/episema-engraver.o < cc
> Making lily/out/lyric-extender.o < cc
> Making lily/out/includable-lexer.o < cc
> Making lily/out/timing-translator.o < cc
> Making lily/out/pango-font.o < cc
> Making lily/out/part-combine-part-iterator.o < cc
> Making lily/out/horizontal-bracket.o < cc
> /tmp/lilypond-autobuild/lily/pango-font.cc: In member function
> 'Stencil Pango_font::pango_item_string_stencil(const PangoGlyphItem*)
> const':
> /tmp/lilypond-autobuild/lily/pango-font.cc:229:28: error: invalid use
> of incomplete type 'PangoFcFont' {aka 'struct _PangoFcFont'}
>   229 |   FcPattern *fcpat = fcfont->font_pattern;
>   |^~
> In file included from /usr/include/pango-1.0/pango/pangoft2.h:29,
>  from /tmp/lilypond-autobuild/lily/pango-font.cc:20:
> /usr/include/pango-1.0/pango/pangofc-font.h:47:16: note: forward declaration 
> of 'PangoFcFont' {aka 'struct _PangoFcFont'}
>47 | typedef struct _PangoFcFont  PangoFcFont;
>   |^~~~
> Making lily/out/clef-engraver.o < cc
> Making lily/out/key-performer.o < cc
> make[1]: ***
> [/tmp/lilypond-autobuild/stepmake/stepmake/c++-rules.make:5:
> out/pango-font.o] Error 1
> make[1]: *** Waiting for unfinished jobs
> make: *** [/tmp/lilypond-autobuild/stepmake/stepmake/generic-targets.make:6: 
> all] Error 2
>
> I'll back out the Pango related commit and retry.  It is a bit of a
> puzzler to me how this could have passed testing.

Actually, both Pango related commits.  Turns out that the "Make Pango
>= 1.36 mandatory" commit is responsible, likely by throwing out
required tests/definitions, and it is my guess that the other Pango
commit depends on that.

Probably the tests forgot to reconfigure, and it is in the configuration
phase that the defines were removed.

-- 
David Kastrup

Re: Doc: Some miscellaneous suggestions from Peter Toye (issue 579280043 by michael.kaepp...@googlemail.com)

2020-02-18 Thread nine . fierce . ballads 
On 2020/02/18 10:20:31, michael.kaeppler wrote:
> This patch has already been counted down, however, I would
> like to have at least one LGTM to the last version of this patch
before pushing
> this. 
> Knowing that this is only an intermediate state and further
clarification would
> help.

I skimmed it.  LGTM.

https://codereview.appspot.com/579280043/

Re: Staging broken.

2020-02-18 Thread James 

Hello,

On 18.02.2020 11:59, David Kastrup wrote:

David Kastrup  writes:


Hi, staging does not compile anymore.

Making lily/out/keyword.o < cc
Making lily/out/simple-spacer-scheme.o < cc
Making lily/out/episema-engraver.o < cc
Making lily/out/lyric-extender.o < cc
Making lily/out/includable-lexer.o < cc
Making lily/out/timing-translator.o < cc
Making lily/out/pango-font.o < cc
Making lily/out/part-combine-part-iterator.o < cc
Making lily/out/horizontal-bracket.o < cc
/tmp/lilypond-autobuild/lily/pango-font.cc: In member function
'Stencil Pango_font::pango_item_string_stencil(const PangoGlyphItem*)
const':
/tmp/lilypond-autobuild/lily/pango-font.cc:229:28: error: invalid use
of incomplete type 'PangoFcFont' {aka 'struct _PangoFcFont'}
  229 |   FcPattern *fcpat = fcfont->font_pattern;
  |^~
In file included from /usr/include/pango-1.0/pango/pangoft2.h:29,
 from /tmp/lilypond-autobuild/lily/pango-font.cc:20:
/usr/include/pango-1.0/pango/pangofc-font.h:47:16: note: forward 
declaration of 'PangoFcFont' {aka 'struct _PangoFcFont'}

   47 | typedef struct _PangoFcFont  PangoFcFont;
  |^~~~
Making lily/out/clef-engraver.o < cc
Making lily/out/key-performer.o < cc
make[1]: ***
[/tmp/lilypond-autobuild/stepmake/stepmake/c++-rules.make:5:
out/pango-font.o] Error 1
make[1]: *** Waiting for unfinished jobs
make: *** 
[/tmp/lilypond-autobuild/stepmake/stepmake/generic-targets.make:6: 
all] Error 2


I'll back out the Pango related commit and retry.  It is a bit of a
puzzler to me how this could have passed testing.


Actually if you look on the tracker you'll see that I wrote

'Passes make, make test-baseline, and a full make doc.'

This is probably my fault misunderstanding what can and what cannot be 
'tested' after 'configure' has been run.


For example, as far as I can remember/tell if I *.ac files are patched 
then when I run


./autogen.sh --noconfigure
mkdir build
cd build
../configure
make
make test-baseline

and THEN I try to apply the diff, I get some 'error' about the file 
being newer (or something, I cannot recall without doing it) as when you 
run the patch tests you are not re-running autogen/configure.


I am not versed enough to probably articulate myself here, but anyway, I 
assumed that I could never patch any of the make/config files because 
they never get re-done for the workflow that I have been using.


So I just apply these 'make file' patches to master and build from that 
without the make check (this way I figured at least that I'd test most 
of the patch because it would still have to build the reg tests and the 
docs).


So sorry for that. Obviously I need some education here.

James
---
Regards

James

Re: Staging broken.

2020-02-18 Thread David Kastrup 
James  writes:

> Hello,
>
> On 18.02.2020 11:59, David Kastrup wrote:
>> David Kastrup  writes:
>> 
>>> Hi, staging does not compile anymore.
>>> Making lily/out/keyword.o < cc
>>> Making lily/out/simple-spacer-scheme.o < cc
>>> Making lily/out/episema-engraver.o < cc
>>> Making lily/out/lyric-extender.o < cc
>>> Making lily/out/includable-lexer.o < cc
>>> Making lily/out/timing-translator.o < cc
>>> Making lily/out/pango-font.o < cc
>>> Making lily/out/part-combine-part-iterator.o < cc
>>> Making lily/out/horizontal-bracket.o < cc
>>> /tmp/lilypond-autobuild/lily/pango-font.cc: In member function
>>> 'Stencil Pango_font::pango_item_string_stencil(const PangoGlyphItem*)
>>> const':
>>> /tmp/lilypond-autobuild/lily/pango-font.cc:229:28: error: invalid use
>>> of incomplete type 'PangoFcFont' {aka 'struct _PangoFcFont'}
>>>   229 |   FcPattern *fcpat = fcfont->font_pattern;
>>>   |^~
>>> In file included from /usr/include/pango-1.0/pango/pangoft2.h:29,
>>>  from /tmp/lilypond-autobuild/lily/pango-font.cc:20:
>>> /usr/include/pango-1.0/pango/pangofc-font.h:47:16: note: forward
>>> declaration of 'PangoFcFont' {aka 'struct _PangoFcFont'}
>>>47 | typedef struct _PangoFcFont  PangoFcFont;
>>>   |^~~~
>>> Making lily/out/clef-engraver.o < cc
>>> Making lily/out/key-performer.o < cc
>>> make[1]: ***
>>> [/tmp/lilypond-autobuild/stepmake/stepmake/c++-rules.make:5:
>>> out/pango-font.o] Error 1
>>> make[1]: *** Waiting for unfinished jobs
>>> make: ***
>>> [/tmp/lilypond-autobuild/stepmake/stepmake/generic-targets.make:6: 
>>> all] Error 2
>>> I'll back out the Pango related commit and retry.  It is a bit of a
>>> puzzler to me how this could have passed testing.
>
> Actually if you look on the tracker you'll see that I wrote
>
> 'Passes make, make test-baseline, and a full make doc.'
>
> This is probably my fault misunderstanding what can and what cannot be
> 'tested' after 'configure' has been run.

Everything?

> For example, as far as I can remember/tell if I *.ac files are patched
> then when I run
>
> ./autogen.sh --noconfigure
> mkdir build
> cd build
> ../configure
> make
> make test-baseline
>
> and THEN I try to apply the diff, I get some 'error' about the file
> being newer (or something, I cannot recall without doing it) as when
> you run the patch tests you are not re-running autogen/configure.

Why would you not rerun autogen/configure?

The procedure for a patch would be

git apply --index .diff
./autogen.sh --noconf
cd build
../configure --enable-checking  # and/or other desired options
make clean test-clean doc-clean
CPU_COUNT=9 make -j9 # or whatever other options
CPU_COUNT=9 make -j9 check
CPU_COUNT=9 make -j9 doc

If you want to be sure to rerun configure with the same options, you can
use

../config.status --recheck

assuming that you still have the results from last run.

> I am not versed enough to probably articulate myself here, but anyway,
> I assumed that I could never patch any of the make/config files
> because they never get re-done for the workflow that I have been
> using.

Well, I have no idea what went wrong when you tried redoing them.  We
probably need to figure that out.  I think you already reported this but
got no response or helpful suggestions at that time.

> So sorry for that. Obviously I need some education here.

I think we just need to figure out where and when and why things went
off-rail.  It's probably something simple that should have been easy to
fix long ago if I or somebody else had bothered listening.  Sorry.

-- 
David Kastrup
My replies have a tendency to cause friction.  To help mitigating
damage, feel free to forward problematic posts to me adding a subject
like "timeout 1d" (for a suggested timeout of 1 day) or "offensive".

Re: Staging broken.

2020-02-18 Thread Han-Wen Nienhuys 
This surprises me greatly. I just checked
out b16c3d14f3d1f10aa919e70107e6103c67a9aa01 which is what I pushed this
morning,  and I can execute

 ./autogen.sh ; make -j4

just fine. In fact, I actually did test this before pushing this morning.

Could it be that you forgot to run autogen.sh ?


On Tue, Feb 18, 2020 at 11:51 AM David Kastrup  wrote:

>
> Hi, staging does not compile anymore.
>
> Making lily/out/keyword.o < cc
> Making lily/out/simple-spacer-scheme.o < cc
> Making lily/out/episema-engraver.o < cc
> Making lily/out/lyric-extender.o < cc
> Making lily/out/includable-lexer.o < cc
> Making lily/out/timing-translator.o < cc
> Making lily/out/pango-font.o < cc
> Making lily/out/part-combine-part-iterator.o < cc
> Making lily/out/horizontal-bracket.o < cc
> /tmp/lilypond-autobuild/lily/pango-font.cc: In member function 'Stencil
> Pango_font::pango_item_string_stencil(const PangoGlyphItem*) const':
> /tmp/lilypond-autobuild/lily/pango-font.cc:229:28: error: invalid use of
> incomplete type 'PangoFcFont' {aka 'struct _PangoFcFont'}
>   229 |   FcPattern *fcpat = fcfont->font_pattern;
>   |^~
> In file included from /usr/include/pango-1.0/pango/pangoft2.h:29,
>  from /tmp/lilypond-autobuild/lily/pango-font.cc:20:
> /usr/include/pango-1.0/pango/pangofc-font.h:47:16: note: forward
> declaration of 'PangoFcFont' {aka 'struct _PangoFcFont'}
>47 | typedef struct _PangoFcFont  PangoFcFont;
>   |^~~~
> Making lily/out/clef-engraver.o < cc
> Making lily/out/key-performer.o < cc
> make[1]: *** [/tmp/lilypond-autobuild/stepmake/stepmake/c++-rules.make:5:
> out/pango-font.o] Error 1
> make[1]: *** Waiting for unfinished jobs
> make: ***
> [/tmp/lilypond-autobuild/stepmake/stepmake/generic-targets.make:6: all]
> Error 2
>
> I'll back out the Pango related commit and retry.  It is a bit of a
> puzzler to me how this could have passed testing.
>
> --
> David Kastrup
>
>

-- 
Han-Wen Nienhuys - hanw...@gmail.com - http://www.xs4all.nl/~hanwen

Re: Staging broken.

2020-02-18 Thread Han-Wen Nienhuys 
I double checked, and it compiles at
b16c3d14f3d1f10aa919e70107e6103c67a9aa01 without error in a clean directory
as well.

Could you provide instructions how I can reproduce this build breakage?

thanks,

On Tue, Feb 18, 2020 at 10:56 PM Han-Wen Nienhuys  wrote:

> This surprises me greatly. I just checked
> out b16c3d14f3d1f10aa919e70107e6103c67a9aa01 which is what I pushed this
> morning,  and I can execute
>
>  ./autogen.sh ; make -j4
>
> just fine. In fact, I actually did test this before pushing this morning.
>
> Could it be that you forgot to run autogen.sh ?
>
>
> On Tue, Feb 18, 2020 at 11:51 AM David Kastrup  wrote:
>
>>
>> Hi, staging does not compile anymore.
>>
>> Making lily/out/keyword.o < cc
>> Making lily/out/simple-spacer-scheme.o < cc
>> Making lily/out/episema-engraver.o < cc
>> Making lily/out/lyric-extender.o < cc
>> Making lily/out/includable-lexer.o < cc
>> Making lily/out/timing-translator.o < cc
>> Making lily/out/pango-font.o < cc
>> Making lily/out/part-combine-part-iterator.o < cc
>> Making lily/out/horizontal-bracket.o < cc
>> /tmp/lilypond-autobuild/lily/pango-font.cc: In member function 'Stencil
>> Pango_font::pango_item_string_stencil(const PangoGlyphItem*) const':
>> /tmp/lilypond-autobuild/lily/pango-font.cc:229:28: error: invalid use of
>> incomplete type 'PangoFcFont' {aka 'struct _PangoFcFont'}
>>   229 |   FcPattern *fcpat = fcfont->font_pattern;
>>   |^~
>> In file included from /usr/include/pango-1.0/pango/pangoft2.h:29,
>>  from /tmp/lilypond-autobuild/lily/pango-font.cc:20:
>> /usr/include/pango-1.0/pango/pangofc-font.h:47:16: note: forward
>> declaration of 'PangoFcFont' {aka 'struct _PangoFcFont'}
>>47 | typedef struct _PangoFcFont  PangoFcFont;
>>   |^~~~
>> Making lily/out/clef-engraver.o < cc
>> Making lily/out/key-performer.o < cc
>> make[1]: *** [/tmp/lilypond-autobuild/stepmake/stepmake/c++-rules.make:5:
>> out/pango-font.o] Error 1
>> make[1]: *** Waiting for unfinished jobs
>> make: ***
>> [/tmp/lilypond-autobuild/stepmake/stepmake/generic-targets.make:6: all]
>> Error 2
>>
>> I'll back out the Pango related commit and retry.  It is a bit of a
>> puzzler to me how this could have passed testing.
>>
>> --
>> David Kastrup
>>
>>
>
> --
> Han-Wen Nienhuys - hanw...@gmail.com - http://www.xs4all.nl/~hanwen
>


-- 
Han-Wen Nienhuys - hanw...@gmail.com - http://www.xs4all.nl/~hanwen

Re: Staging broken.

2020-02-18 Thread David Kastrup 
Han-Wen Nienhuys  writes:

> This surprises me greatly. I just checked
> out b16c3d14f3d1f10aa919e70107e6103c67a9aa01 which is what I pushed this
> morning,  and I can execute
>
>  ./autogen.sh ; make -j4
>
> just fine. In fact, I actually did test this before pushing this morning.
>
> Could it be that you forgot to run autogen.sh ?

lilypond-patchy-staging starts from a fresh directory, so no.  It
wouldn't get anywhere without running autogen.sh.

I cannot vouch for all software versions being the same as yours,
obviously.

Did you run make clean ?

Versions installed here:

ii  libpango1.0-dev:amd64  1.42.4-7amd64Development files 
for the Pango

Also libguile-1.8, but I consider it unlikely that this changes the used
include files.

You removed several defines that I think Werner added at some point of
time in order to deal with newer versions of Freetype.

I read in the patch:

 AC_DEFUN(STEPMAKE_PANGO_FT2, [
 PKG_CHECK_MODULES(PANGO_FT2, $1 >= $3, have_pangoft2=yes, true)
 if test "$have_pangoft2" = yes ; then
-AC_DEFINE(HAVE_PANGO16)
-AC_DEFINE(HAVE_PANGO_FT2)
 # Do not pollute user-CPPFLAGS with configure-CPPFLAGS
 save_CPPFLAGS="$CPPFLAGS"
 save_LIBS="$LIBS"
@@ -1328,8 +1300,6 @@ AC_DEFUN(STEPMAKE_PANGO_FT2_WITH_OTF_FEATURE, [
 PKG_CHECK_MODULES(PANGO_FT2, $1 >= $3,
 have_pangoft2_with_otf_feature=yes, true)
 if test "$have_pangoft2_with_otf_feature" = yes; then
-AC_DEFINE(HAVE_PANGO16)
-AC_DEFINE(HAVE_PANGO_FT2)
 AC_DEFINE(HAVE_PANGO_FT2_WITH_OTF_FEATURE)


Any reason for that?

-- 
David Kastrup

Re: Staging broken.

2020-02-18 Thread Han-Wen Nienhuys 
On Tue, Feb 18, 2020 at 11:08 PM David Kastrup  wrote:

> Han-Wen Nienhuys  writes:
>
> > This surprises me greatly. I just checked
> > out b16c3d14f3d1f10aa919e70107e6103c67a9aa01 which is what I pushed this
> > morning,  and I can execute
> >
> >  ./autogen.sh ; make -j4
> >
> > just fine. In fact, I actually did test this before pushing this morning.
> >
> > Could it be that you forgot to run autogen.sh ?
>
> lilypond-patchy-staging starts from a fresh directory, so no.  It
> wouldn't get anywhere without running autogen.sh.
>

The build log talks about

autogen.sh --noconfigure

can you confirm that with "   ./autogen.sh && make -j4" it also fails?

I cannot vouch for all software versions being the same as yours,
> obviously.
>

Can you provide me with some recipe to reproduce the problem? Can you tell
me what distribution you use? I could use Docker to recreate your setup.


> Did you run make clean ?
>

I ran from a clean checkout as well.


> Versions installed here:
>
> ii  libpango1.0-dev:amd64  1.42.4-7amd64Development
> files for the Pango
>
> Also libguile-1.8, but I consider it unlikely that this changes the used
> include files.
>
> You removed several defines that I think Werner added at some point of
> time in order to deal with newer versions of Freetype.
>
> I read in the patch:
>
>  AC_DEFUN(STEPMAKE_PANGO_FT2, [
>  PKG_CHECK_MODULES(PANGO_FT2, $1 >= $3, have_pangoft2=yes, true)
>  if test "$have_pangoft2" = yes ; then
> -AC_DEFINE(HAVE_PANGO16)
> -AC_DEFINE(HAVE_PANGO_FT2)
>  # Do not pollute user-CPPFLAGS with configure-CPPFLAGS
>  save_CPPFLAGS="$CPPFLAGS"
>  save_LIBS="$LIBS"
> @@ -1328,8 +1300,6 @@ AC_DEFUN(STEPMAKE_PANGO_FT2_WITH_OTF_FEATURE, [
>  PKG_CHECK_MODULES(PANGO_FT2, $1 >= $3,
>  have_pangoft2_with_otf_feature=yes, true)
>  if test "$have_pangoft2_with_otf_feature" = yes; then
> -AC_DEFINE(HAVE_PANGO16)
> -AC_DEFINE(HAVE_PANGO_FT2)
>  AC_DEFINE(HAVE_PANGO_FT2_WITH_OTF_FEATURE)
>
>
> Any reason for that?
>

HAVE_PANGO16 was unused.

I effectively made HAVE_PANGO_FT2 always be true.

-- 
Han-Wen Nienhuys - hanw...@gmail.com - http://www.xs4all.nl/~hanwen

Re: Staging broken.

2020-02-18 Thread David Kastrup 
Han-Wen Nienhuys  writes:

> On Tue, Feb 18, 2020 at 11:08 PM David Kastrup  wrote:
>
>> Han-Wen Nienhuys  writes:
>>
>> > This surprises me greatly. I just checked
>> > out b16c3d14f3d1f10aa919e70107e6103c67a9aa01 which is what I pushed this
>> > morning,  and I can execute
>> >
>> >  ./autogen.sh ; make -j4
>> >
>> > just fine. In fact, I actually did test this before pushing this morning.
>> >
>> > Could it be that you forgot to run autogen.sh ?
>>
>> lilypond-patchy-staging starts from a fresh directory, so no.  It
>> wouldn't get anywhere without running autogen.sh.
>>
>
> The build log talks about
>
> autogen.sh --noconfigure
>
> can you confirm that with "   ./autogen.sh && make -j4" it also fails?
>
> I cannot vouch for all software versions being the same as yours,
>> obviously.
>>
>
> Can you provide me with some recipe to reproduce the problem? Can you tell
> me what distribution you use? I could use Docker to recreate your setup.

Just current Ubuntu eoan.

dak@lola:/usr/local/tmp/lilypond$ git worktree add ../lilypond3 bad-staging
Preparing worktree (checking out 'bad-staging')
HEAD is now at b16c3d14f3 Fix portuguese in input/regression/utf-8.ly
dak@lola:/usr/local/tmp/lilypond$ cd ../lilypond3/
dak@lola:/usr/local/tmp/lilypond3$ ./autogen.sh 
GUILE_CONFIG=/usr/local/tmp/guile-1.8/bin/guile-config GUILE=/usr/bin/guile

[...]

configure: creating ./config.status
config.status: creating config.make
config.status: creating config.hh

WARNING: Please consider installing optional programs or files:  URW++ OTF 
fonts (download OTF files from 
'http://git.ghostscript.com/?p=urw-core35-fonts.git;a=tree;hb=91edd6ece36e84a1c6d63a1cf63a1a6d84bd443a'
 and put them under '~/.local/share/fonts' etc., or use --with-urwotf-dir) 
guile < 1.9.0 (installed: 2.2.6) tidy

See INSTALL.txt for more information on how to build LilyPond

Type:
make all   to build LilyPond
make install   to install LilyPond
make help  to see all possible targets

Edit local.make for local Makefile overrides.

make -j4

[...]

Making lily/out/relocate.o < cc
Making lily/out/pango-font.o < cc
Making lily/out/part-combine-part-iterator.o < cc
pango-font.cc: In member function 'Stencil 
Pango_font::pango_item_string_stencil(const PangoGlyphItem*) const':
pango-font.cc:229:28: error: invalid use of incomplete type 'PangoFcFont' {aka 
'struct _PangoFcFont'}
  229 |   FcPattern *fcpat = fcfont->font_pattern;
  |^~
In file included from /usr/include/pango-1.0/pango/pangoft2.h:29,
 from pango-font.cc:20:
/usr/include/pango-1.0/pango/pangofc-font.h:47:16: note: forward declaration of 
'PangoFcFont' {aka 'struct _PangoFcFont'}
   47 | typedef struct _PangoFcFont  PangoFcFont;
  |^~~~
make[1]: *** [/usr/local/tmp/lilypond3/stepmake/stepmake/c++-rules.make:5: 
out/pango-font.o] Error 1
make[1]: *** Waiting for unfinished jobs
make: *** [/usr/local/tmp/lilypond3/stepmake/stepmake/generic-targets.make:6: 
all] Error 2


By the way, I'd configure using --enable-checking (which is implied when
using --disable-optimising) but it bombs out either way.

-- 
David Kastrup
My replies have a tendency to cause friction.  To help mitigating
damage, feel free to forward problematic posts to me adding a subject
like "timeout 1d" (for a suggested timeout of 1 day) or "offensive".

Re: Staging broken.

2020-02-18 Thread David Kastrup 
David Kastrup  writes:

> Han-Wen Nienhuys  writes:
>
>> On Tue, Feb 18, 2020 at 11:08 PM David Kastrup  wrote:
>>
>>> Han-Wen Nienhuys  writes:
>>>
>>> > This surprises me greatly. I just checked
>>> > out b16c3d14f3d1f10aa919e70107e6103c67a9aa01 which is what I pushed this
>>> > morning,  and I can execute
>>> >
>>> >  ./autogen.sh ; make -j4
>>> >
>>> > just fine. In fact, I actually did test this before pushing this morning.
>>> >
>>> > Could it be that you forgot to run autogen.sh ?
>>>
>>> lilypond-patchy-staging starts from a fresh directory, so no.  It
>>> wouldn't get anywhere without running autogen.sh.
>>>
>>
>> The build log talks about
>>
>> autogen.sh --noconfigure
>>
>> can you confirm that with "   ./autogen.sh && make -j4" it also fails?
>>
>> I cannot vouch for all software versions being the same as yours,
>>> obviously.
>>>
>>
>> Can you provide me with some recipe to reproduce the problem? Can you tell
>> me what distribution you use? I could use Docker to recreate your setup.
>
> Just current Ubuntu eoan.

The following patch makes the commit you pushed compile:

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 8eece690c8..587ed3d4f3 100644
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -17,6 +17,10 @@
   along with LilyPond.  If not, see .
 */
 
+// Necessary for supporting pango_context_new() and
+// pango_context_set_font_map() in Pango < 1.22
+#define PANGO_ENABLE_BACKEND
+
 #include 
 #include "freetype.hh"
 #include FT_XFREE86_H


Never trust a comment.  It would seem that without that define, one
would need to include more/other/different headers to get the used types
defined.  At least in the Pango version I have installed.

-- 
David Kastrup

Re: Staging broken.

2020-02-18 Thread Lukas-Fabian Moser 




The build log talks about

autogen.sh --noconfigure

can you confirm that with "   ./autogen.sh && make -j4" it also fails?


Fwiw, I had the same compile error as David yesterday. (It had been 
quite a while since I last pulled & compiled, so I was not very much 
surprised when make didn't succeed - I was halfway into trying to bisect 
to find out just when in the last few months it stopped working on my 
system when David's staging-broken alert arrived.)


My system is a down-to-earth Mint 19.3.

Lukas