Re: Commit (STABLE): Back out 3351, fix stable builds.

From: Martin Sevior (msevior@mccubbin.ph.unimelb.edu.au)
Date: Mon Jun 17 2002 - 08:47:10 EDT

  • Next message: Hubert Figuiere: "Re: Commit (STABLE): Back out 3351, fix stable builds."

    On Mon, 17 Jun 2002, Hubert Figuiere wrote:

    > On Mon, 2002-06-10 at 23:40, Mark Gilbert wrote:
    > > Reverted fv_View.cpp and ap_EditMethods.cpp.
    > > Let this be a lesson to be more cautious about backporting things from
    > > HEAD as it diverges farther and farther from STABLE.
    > >
    > > Now, if someone could fix the bug AND not break the builds...
    >
    > The breakage is like the following:
    >
    > ../../../../../../abi/src/text/fmt/xp/fv_View.cpp: In method `bool FV_View::setBlockFormat(const XML_Char **)':
    > ../../../../../../abi/src/text/fmt/xp/fv_View.cpp:3864: no matching
    > function for call to `fl_BlockLayout::getLastContainer ()'
    > ../../../../../../abi/src/text/fmt/xp/fv_View.cpp:3868: no matching
    > function for call to `fl_BlockLayout::getLastContainer ()'
    > make[4]: *** [fv_View.o] Error 1
    >

    Just replace getLastContainer() with getLastLine()

    as a general rule do a swap container ==> line for backports.

    Sorry I can't do this myself right now.

    Cheers

    Martin

    This archive was generated by hypermail 2.1.4 : Mon Jun 17 2002 - 08:49:33 EDT