[Libreoffice] [PUSHED] backport poppler-0.17/poppler-glib fixes to the 3.4 branch

[Tomáš Chvátal]

Ok it took slight messing around and one patch need rework (lots
commit info), because am didn't allow 3way merge.

PUSHED to 3.4 branches of extensions and bootstrap repos respectively.

Dne 29. září 2011 16:14 Tomáš Chvátal <scarabeus at gentoo.org> napsal(a):
> Hi,
> I need these two patches in the 3.4 branch so I don't have to patch it
> on distro side,
> they just add ifdefs to make the thing work on the newest poppler.
>
> This saves me from keeping them in our vcs as patches agains 3.4 series.
>
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=91313fc05abbfe35ee1e0c2464a28dd580780f07
> This one needs only the first part when applying. Second is already there.
>
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=8861df394604fa6dd8c72181a023557d037f7235
>
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=0f862a7432737d16056270cf8fbc29478f988f7d
>
> Please give me your acks so I can do it, thanks.
>
> Cheers
>
> Tom
>