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. ;-) Kohei _______________________________________________ LibreOffice mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice
