Re: pdfium / Re: Building LO6.1.4.2 with pdfium emits “error: invalid conversion from ‘int’ to ‘boolean’ [-fpermissive]”

2019-01-18 Thread Miklos Vajna
Hi,

[ Please let's keep the discussion on the list. ]

On Thu, Jan 17, 2019 at 10:30:11PM +, Дилян Палаузов 
 wrote:
> upstream fx_codec_jpeg.cpp does not exist anymore, it is called now 
> ccodec_jpegmodule.cpp.  This will make backporting
> of the changes in fx_codec_jpeg.cpp, used by LibreOffice, unlikely.  Besides, 
> upstream the change may never be applied.

Upstream may have good reasons for not accepting your patch in its
current form, it's their decision. We usually respect upstream's
decision in this regard. Especially given that pdfium is not a dead
upstream.

As mentioned before, there is a significant maintenance cost of custom
patched externals, I would like to avoid it, based in the painful
experience of cutting down heavily patched pdfium and xmlsec to ~0
patches in the recent past.

> Towards which version of pdfium shall the patch in external/pdfium be 
> generated?

See download.lst in the toplevel directory, currently we bundle pdfium
3667 on LO master, which isn't too old, it's from 2019-01-09.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: pdfium / Re: Building LO6.1.4.2 with pdfium emits “error: invalid conversion from ‘int’ to ‘boolean’ [-fpermissive]”

2019-01-17 Thread Miklos Vajna
Hi,

On Thu, Jan 17, 2019 at 12:01:34PM +, Дилян Палаузов 
 wrote:
> I reported the inability to compile pdfium with jpeg-9c at 
> https://bugs.chromium.org/p/pdfium/issues/detail?id=1228 .
> There is also a proposed fix to make it compile.  Consider integrating that 
> patch in the LO build process.

I spent quite some time on upstreaming existing pdfium patches that we
had in core.git, and today only build fixes are applied.

So the best is to consider your fix for LibreOffice core.git once pdfium
upstream accepted it.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


pdfium / Re: Building LO6.1.4.2 with pdfium emits “error: invalid conversion from ‘int’ to ‘boolean’ [-fpermissive]”

2019-01-17 Thread Дилян Палаузов
Hello,

I reported the inability to compile pdfium with jpeg-9c at 
https://bugs.chromium.org/p/pdfium/issues/detail?id=1228 .
There is also a proposed fix to make it compile.  Consider integrating that 
patch in the LO build process.

Regards
  Дилян


On Thu, 2019-01-17 at 10:54 +0100, Stephan Bergmann wrote:
> On 17/01/2019 10:35, Дилян Палаузов wrote:
> > the problematic call is:
> > 
> > S=/src/libreoffice-6.1.4.2 && B=$S/build && I=$B/instdir && W=$B/workdir && 
> >  mkdir -p
> > $W/GenCxxObject/UnpackedTarball/pdfium/core/fxcodec/codec/
> > $W/Dep/GenCxxObject/UnpackedTarball/pdfium/core/fxcodec/codec/ && cd 
> > /src/libreoffice-6.1.4.2 &&g++
> > -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED -DCPPU_ENV=gcc3 
> > -DLINUX -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DUNIX
> > -DUNX -DX86_64 -D_PTHREADS -D_REENTRANT -DPDFIUM_DLLIMPLEMENTATION 
> > -DUSE_SYSTEM_LCMS2 -DUSE_SYSTEM_LIBJPEG
> > -DUSE_SYSTEM_ZLIB -DMEMORY_TOOL_REPLACES_ALLOCATOR -DUNICODE  -DSYSTEM_ZLIB 
> >  -DDEFINE_PS_TABLES_DATA   -
> > fvisibility=hidden-Wall -Wno-missing-braces -Wnon-virtual-dtor 
> > -Wendif-labels -Wextra -Wundef -Wunreachable-code
> > -Wunused-macros -finput-charset=UTF-8 -fmessage-length=0 -fno-common -pipe  
> > -Wduplicated-cond -Wlogical-op -Wshift-
> > overflow=2 -Wunused-const-variable=1 -Wno-cast-function-type 
> > -fvisibility-inlines-hidden -fstack-protector-strong -fPIC
> > -Wshadow -Woverloaded-virtual -std=gnu++14   -DEXCEPTIONS_ON -fexceptions 
> > -fno-enforce-eh-specs -O3 -pipe   -w  -
> > DLIBO_INTERNAL_ONLY  -c 
> > $W/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp -o
> > $W/GenCxxObject/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.o 
> > -MMD -MT
> > $W/GenCxxObject/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.o 
> > -MP -MF
> > $W/Dep/GenCxxObject/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.d_
> >  -I$W/UnpackedTarball/pdfium
> > -I$W/UnpackedTarball/pdfium/third_party -I$S/include  -I/opt/jdk/include 
> > -I/opt/jdk/include/linux -I$B/config_host-
> > isystem /usr/local/include -Wno-long-long   -isystem 
> > /usr/local/include/freetype2 -isystem /usr/local/include/libpng16
> > -isystem /usr/local/include -isystem /usr/local/include/harfbuzz -isystem 
> > /usr/local/include/glib-2.0 -isystem
> > /usr/local/lib64/glib-2.0/include -isystem /usr/local/include
> > 
> > When I pass -E to the compiler, it prints:
> > 
> > # 317 "/usr/local/include/jmorecfg.h" 3 4
> > typedef enum { FALSE = 0, TRUE = 1 } boolean;
> > # 28 "/usr/local/include/jpeglib.h" 2 3 4
> > 
> > So #include "jpeglib.h" implies #include "jmorecfg.h" and libreoffice-
> > 6.1.4.2/build/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp
> >  does #include "jpeglib.h".
> > 
> > This code:
> > typedef enum { a = 1, b = 2} c;
> > 
> > c x () {  return 2;}
> > 
> > also fails compiling with
> > error: invalid conversion from ‘int’ to ‘c’ [-fpermissive]
> >   c x () {  return 2;}
> >^
> > jmorecfg.h comes from jpeg9-c.  jpeg-turbo-1.5.3 has another jmorecfg.h, 
> > where boolean is defined as int.
> 
> So do whatever it takes to make LO's external/pdfium/ copy work with 
> your system's jpeg9-c (or abandon the idea of building LO against it). 
> Either do it just locally, or, if it requires patching pdfium, we'd also 
> appreciate it if you sent a patch for LO or, even better, sent a patch 
> to the upstream of LO's external/pdfium/ copy.  It is unlikely that 
> anybody else would do the integration work for that specific jpeg9-c for 
> you.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice