[poppler] [PATCH] upstreaming some LibreOffice patches

Albert Astals Cid aacid at kde.org
Thu Nov 3 22:42:37 UTC 2016


El dimecres, 2 de novembre de 2016, a les 14:40:45 CET, Michael Stahl va 
escriure:
> On 02.11.2016 00:27, Albert Astals Cid wrote:
> > El dimarts, 1 de novembre de 2016, a les 16:10:06 CET, Stephan
> > 
> > Bergmann va escriure:
> >> * For 0004-Work-around-fsanitize-shift.patch, an input file that
> >> shows the error is
> > 
> >> <https://cgit.freedesktop.org/libreoffice/core/plain/sd/qa/unit/data/pdf/
txtpic.pdf?id=acf531be6a423f9b74997b29a8cafe82aa18423c>:
> > Oh, i didn't realize this is for the unmaintained self-grown
> > DCTStream decoder, any reason you're not using the libjpeg based
> > one?
> > 
> > Honestly i'm a bit hesitant to touch code that we recommend people
> > not to use.
> 
> apparently the commit that replaced xpdf with poppler added the
> --disable-libjpeg flag, among others (such as --disable-openjpeg, which
> also prints a warning, but currently we don't bundle "openjpeg" in LO).
> 
> while i don't know the original reason, currently it appears to be "it
> doesn't actually work".... the poppler configure.ac always finds the
> jpeg library on the system, not the one we bundle with LO.
> 
> due to the various autoconf macros it was a bit non-obvious to figure
> out that, unlike LIBJPEG_CFLAGS, LIBJPEG_LIBS is a variable that is
> always overwritten by configure and effectively cannot be set from the
> outside; i could set LIBJPEG_CFLAGS to include the link parameters but i
> can't prevent configure from checking for a libjpeg6b.so so if such
> exists on a system (it doesn't on Fedora) then it's possible that we get
> funny DT_NEEDEDs from "-ljpeg -ljpeg6b".
> 
> so i wrote the attached patch.

I know not enough of autotools to tell if that's right or not and want to know 
even less of it, so i'll leave it to someone else in the community that feels 
like investing time in autotools is a good idea to review it.

Thanks for sending it :)

Cheers,
  Albert

> 
> then it occurred to me that we actually build poppler as a static
> library, so there won't be funny DT_NEEDEDs currently, but ... better
> safe than sorry?
> 
> LO patch to use --enable-libjpeg is at
> https://gerrit.libreoffice.org/30496




More information about the poppler mailing list