Re: Build fix for stable 2.20 on openSuSE Tumbleweed

[Knut Petersen]

Hi everybody!

> Attached is bc4f5fdc299 of master ported to stable/2.20.
> Cherry picking did not work as the aclocal.m4 files diverged to much.
Please do not apply the patch attached to my previous message.
Instead I recommend to update aclocal.m4 to the code used in master.

   git cherry-pick -x \
   58f25aaf939fc4e00618f7178da9095dfeed00d7 \
   fd4ec3ef3d9150ff13b54125aa902671c6da4106 \
   59bf9a378d5d1e3b6bbd21f76f2c5019b64dae8f \
   0e1eeb7838eec11220858d4d9e541d20f948a794 \
   bc4f5fdc299ff21d0ee2de4462af30b22e1321c1

Reason: The fourth commit is only a whitespace / formatting clean up,
the four other commits address real build problems. So there is no reason
to skip the four older commits and only apply the patch attached to the
last message. Have a look at the history (f75eceb27a is the last change
of aclocal.m4 in stable/2.20):

'git log f75eceb27a..master -- aclocal.m4' gives

   commit bc4f5fdc299ff21d0ee2de4462af30b22e1321c1
   Author: Knut Petersen <address@hidden>
   Date:   Sun Jun 16 19:55:21 2019 +0100

        Add glib-2.0 and gobject-2.0 library dependency

        For a long time we relied
        on pango/pangoft2 to pull
        in the glib and gobject
        libraries. That worked as
        long as every distribution
        used a pangoft2.pc file
        that included both libs in
        the 'Required:' line.

        According to the pkg-config
        documentation that was
        definitely wrong, and the
        problem was corrected on
        opensuse tumbleweed
        recently.

        As a consequence building
        lilypond failed with a
        linker error as we use
        symbols from both libs
        directly in our c++ source
        code.

        Signed-off-by: Knut Petersen <address@hidden>

   commit 0e1eeb7838eec11220858d4d9e541d20f948a794
   Author: Werner Lemberg <address@hidden>
   Date:   Sat Jun 15 17:59:15 2019 +0200

        aclocal.m4: Whitespace and formatting.

        - replace all tabs with spaces
        - avoid overlong lines
        - fix and improve indentation
        - other minor whitespace improvements

        No functional change.

   commit 59bf9a378d5d1e3b6bbd21f76f2c5019b64dae8f
   Author: Werner Lemberg <address@hidden>
   Date:   Sun Dec 2 11:55:27 2018 +0100

        Isse 5443: aclocal.m4: STEPMAKE_PROGS: Add test for maximum version

   commit fd4ec3ef3d9150ff13b54125aa902671c6da4106
   Author: Werner Lemberg <address@hidden>
   Date:   Sun Dec 2 11:52:00 2018 +0100

        Issue 5443: aclocal.m4: STEPMAKE_CHECK_VERSION: Add test for maximum 
version

        This replaces the optional $4 argument with a required maximum version
        (instead of a supplied version number).

        Also remove unused function STEPMAKE_CHECK_VERSION_UNSUPPORTED.

   commit 58f25aaf939fc4e00618f7178da9095dfeed00d7
   Author: Werner Lemberg <address@hidden>
   Date:   Sat Nov 17 08:19:25 2018 +0100

        Issue 5442: aclocal.m4: Improve $PYTHON_CFLAGS massaging

        The macports port of python contains '-Wstrict-prototypes' in
        $PYTHON_CFLAGS.  Since we are going to add $PYTHON_CFLAGS to $CPPFLAGS, 
we
        have to remove it because it isn't a valid g++ option.

        This patch also cleans up the code; in particular it avoids the use of
        autoconf's ugly quadrigraphs.

Knut