0.4.18 fails to build with_fitz

[ernsteiswuerfel]

qmake CONFIG+="with_fitz" qpdfview.pro
make
[...]
In file included from /usr/include/mupdf/fitz/pixmap.h:8,
                 from /usr/include/mupdf/fitz/image.h:7,
                 from /usr/include/mupdf/fitz/device.h:7,
                 from /usr/include/mupdf/fitz/display-list.h:7,
                 from sources/fitzmodel.cpp:35:
/usr/include/mupdf/fitz/separation.h:39:80: error: 'fz_colorspace' has not been declared
   39 | void fz_add_separation(fz_context *ctx, fz_separations *sep, const char *name, fz_colorspace *cs, int cs_channel);
      | ^~~~~~~~~~~~~
/usr/include/mupdf/fitz/separation.h:54:52: error: 'fz_colorspace' has not been declared
   54 | void fz_convert_separation_colors(fz_context *ctx, fz_colorspace *src_cs, const float *src_color, fz_separations *dst_seps, fz_colorspace *dst_cs, float *dst_color, fz_color_params color_params);
      | ^~~~~~~~~~~~~
/usr/include/mupdf/fitz/separation.h:54:125: error: 'fz_colorspace' has not been declared
   54 | void fz_convert_separation_colors(fz_context *ctx, fz_colorspace *src_cs, const float *src_color, fz_separations *dst_seps, fz_colorspace *dst_cs, float *dst_color, fz_color_params color_params);
      | ^~~~~~~~~~~~~
In file included from /usr/include/mupdf/fitz/pixmap.h:8,
                 from /usr/include/mupdf/fitz/image.h:7,
                 from /usr/include/mupdf/fitz/device.h:7,
                 from /usr/include/mupdf/fitz/display-list.h:7,
                 from sources/fitzmodel.cpp:35:
/usr/include/mupdf/fitz/separation.h:54:166: error: 'fz_color_params' has not been declared
[...]

Installed mupdf on this system is 1.16.1.
This is downstream Gentoo Bug: https://bugs.gentoo.org/697720

[Adam Reichold (adamreichold)]

Hello,

this is already fixed on trunk which should be build fine with MuPDF 1.16.1.

Best regards,
Adam

[Norbert Preining (preining)]

Unfortunately it seems to be broken again with MuPDF 1.17. Now I get

```
In file included from sources/fitzmodel.cpp:37:
/usr/include/mupdf/fitz/document.h:13:16: error: using typedef-name ‘fz_document’ after ‘struct’
   13 | typedef struct fz_document fz_document;
      | ^~~~~~~~~~~
In file included from sources/fitzmodel.cpp:24:
sources/fitzmodel.h:34:30: note: ‘fz_document’ has a previous declaration here
   34 | typedef struct fz_document_s fz_document;
      | ^~~~~~~~~~~
In file included from sources/fitzmodel.cpp:37:
/usr/include/mupdf/fitz/document.h:13:28: error: conflicting declaration ‘typedef int fz_document’
   13 | typedef struct fz_document fz_document;
      | ^~~~~~~~~~~
In file included from sources/fitzmodel.cpp:24:
sources/fitzmodel.h:34:30: note: previous declaration as ‘typedef struct fz_document_s fz_document’
   34 | typedef struct fz_document_s fz_document;
      | ^~~~~~~~~~~
In file included from sources/fitzmodel.cpp:37:
/usr/include/mupdf/fitz/document.h:15:16: error: using typedef-name ‘fz_page’ after ‘struct’
   15 | typedef struct fz_page fz_page;
      | ^~~~~~~
In file included from sources/fitzmodel.cpp:24:
sources/fitzmodel.h:33:26: note: ‘fz_page’ has a previous declaration here
   33 | typedef struct fz_page_s fz_page;
      | ^~~~~~~
In file included from sources/fitzmodel.cpp:37:
/usr/include/mupdf/fitz/document.h:15:24: error: conflicting declaration ‘typedef int fz_page’
   15 | typedef struct fz_page fz_page;
      | ^~~~~~~
In file included from sources/fitzmodel.cpp:24:
sources/fitzmodel.h:33:26: note: previous declaration as ‘typedef struct fz_page_s fz_page’
   33 | typedef struct fz_page_s fz_page;
      | ^~~~~~~
In file included from sources/fitzmodel.cpp:37:
/usr/include/mupdf/fitz/document.h:746:8: error: using typedef-name ‘fz_page’ after ‘struct’
  746 | struct fz_page
      | ^~~~~~~
In file included from sources/fitzmodel.cpp:24:
sources/fitzmodel.h:33:26: note: ‘fz_page’ has a previous declaration here
   33 | typedef struct fz_page_s fz_page;
      | ^~~~~~~
In file included from sources/fitzmodel.cpp:37:
/usr/include/mupdf/fitz/document.h:772:8: error: using typedef-name ‘fz_document’ after ‘struct’
  772 | struct fz_document
      | ^~~~~~~~~~~
In file included from sources/fitzmodel.cpp:24:
sources/fitzmodel.h:34:30: note: ‘fz_document’ has a previous declaration here
   34 | typedef struct fz_document_s fz_document;
      | ^~~~~~~~~~~
sources/fitzmodel.cpp: In member function ‘virtual QList<qpdfview::Model::Link*> qpdfview::Model::FitzPage::links() const’:
sources/fitzmodel.cpp:254:49: error: cannot convert ‘fz_location’ to ‘const int’ in initialization
  254 | const int page = fz_resolve_link(m_parent->m_context, m_parent->m_document, link->uri, &left, &top);
      | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      | ...

[Adam Reichold (adamreichold)]

Trunk revision 2107 has the fix...

[Norbert Preining (preining)]

Thanks a lot, confirmed!