Comment 4 for bug 696527

Revision history for this message
Björn Michaelsen (bjoern-michaelsen) wrote :

This issue is about two patches in the LO build repo:
http://cgit.freedesktop.org/libreoffice/build/tree/patches/dev300/human-icons-add.diff
http://cgit.freedesktop.org/libreoffice/build/tree/patches/dev300/human-icons-i18n.diff

The first one is disabled in the apply file as it does not match the source anymore. The second one is still active for Ubuntu.

I have updated the human-icons-add.diff and commited the changes as:
http://cgit.freedesktop.org/libreoffice/libs-core/commit/?id=f6a16194d1348cb1c679acec5cd9e014ca3f3104
http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=00b43fc0d82950e2abc57cca3746d395252bc9e0
http://cgit.freedesktop.org/libreoffice/components/commit/?id=cfa7e88f5959a8b3b729107d61351410be80f49b

on the LO master branch (of which LO 3.4 will be branched off). A few of the changes have been obsoleted by refactoring in the code by now.

I now will adjust the changes for the LO 3.3 release branch to and submit them for review. As 3.3.1 has been branched off yesterday the changes will then be in the 3.3.2 release.

When this has been done, the human-icons-add.diff patch can be completely removed from the LO build repo as its changes are completely upstream.