Date: prev next · Thread: first prev next last
2016 Archives by date, by thread · List index


Hey,

On Fri, Sep 16, 2016 at 1:38 AM, Kohei Yoshida <libreoffice@kohei.us> wrote:

On Wed, 2016-09-14 at 09:33 +0200, Eike Rathke wrote:

For anyone wondering the only two changes against 1.2.1 are:

https://gitlab.com/mdds/mdds/commit/22c0057292431e76fef690ed2856c3a
cb8eac20e
https://gitlab.com/mdds/mdds/commit/0d840a43d062f0df033c10e115a6d6e
37de754da

I suppose that there is no difference to a normal bug fix at least
for 5.2
as there are no new features in the code. If nobody complains I
would
backport the change to 5-2 soon.
Fine with me.

So, Markus backported the commit to the 5.2, the build of which
initially failed because the 5.2 branch contained a patch that was
already included in mdds 1.2.2 (one from Caolan).  I've removed that
patch and it now builds fine on Linux and Windows.  But it fails on OSX
due to reasons probably unrelated to the mdds change.

http://ci.libreoffice.org/job/lo_gerrit_master/17046/

It's been a while since I handled something like this.  Could someone
remind me what we typically do in such cases?  I would personally think
that it's probably fine to just dismiss the build failure and go on
ahead (given the scope of the change being so limited), but I'd like to
double-check it and see if I'm sane. ;-)



The problem has been solved by a rebase and the patch has been pushed.

Markus

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.