LibreOffice - Human icons theme disabled, patch needs an update

[Matthias Klose]

the Human icons theme is disabled, the patch needs an update, or maybe better, integrate in LO upstream.

[Matthias Klose (doko)]

this increase the size of the CD by 20MB in libreoffice-common (see around line 3200 in the rules file)

[Matthias Klose (doko)]

wrong, the increase of the CD size is another issue.

[Martin Pitt (pitti)]

Bjoern, we currently use the Tango icon theme, as this seems to be the upstream default when running under GNOME. Can you please check if it's feasible to bring back the Human icon theme for LibO?

[Björn Michaelsen (bjoern-michaelsen)]

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.

[Björn Michaelsen (bjoern-michaelsen)]

reviewed and cherry-picked for 3.3:
http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?h=libreoffice-3-3&id=462b3d61e352189d3d4c71acb7f62f6919381fd1
http://cgit.freedesktop.org/libreoffice/libs-core/commit/?h=libreoffice-3-3&id=d18c9a17f33c100fa38e65209f4353cad63ba0af
http://cgit.freedesktop.org/libreoffice/components/commit/?h=libreoffice-3-3&id=c1d45fdb7f6380a0e6640a336cd790027e903b4f

reviewed and cherry-picked for 3.3.1:
http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?h=libreoffice-3-3-1&id=204b4ff9089332c833fea834b15c0fc3a3ead439
http://cgit.freedesktop.org/libreoffice/libs-core/commit/?h=libreoffice-3-3-1&id=7e065099543a70ab6866f8301a25100b63f6b479
http://cgit.freedesktop.org/libreoffice/components/commit/?h=libreoffice-3-3-1&id=d7771bc638587e49ea7225312933c73cfc041439

[Björn Michaelsen (bjoern-michaelsen)]

Fixed in 3.3.1-1ubuntu1 on natty.

[Björn Michaelsen (bjoern-michaelsen)]

Fix released in 1:3.3.1-1ubuntu3 for natty