applied_patches/0906-sdext-system-zlib.diff

   1 --- sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx.orig       2009-06-11 18:24:02.000000000 +0100
   2 +++ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx    2009-06-11 18:24:13.000000000 +0100
   3 @@ -30,7 +30,11 @@
   4
   5  #include "pnghelper.hxx"
   6
   7 -#include "zlib/zlib.h"
   8 +#ifdef SYSTEM_ZLIB
   9 +#include "zlib.h"
  10 +#else
  11 +#include <zlib/zlib.h>
  12 +#endif
  13
  14  using namespace pdfi;
  15
  16 --- sdext/source/pdfimport/xpdfwrapper/makefile.mk.orig 2009-06-11 18:24:29.000000000 +0100
  17 +++ sdext/source/pdfimport/xpdfwrapper/makefile.mk      2009-06-11 18:24:46.000000000 +0100
  18 @@ -41,6 +41,10 @@
  19
  20  .INCLUDE: settings.mk
  21
  22 +.IF "$(SYSTEM_ZLIB)" == "YES"
  23 +CFLAGS+=-DSYSTEM_ZLIB
  24 +.ENDIF
  25 +
  26  .IF "$(ENABLE_PDFIMPORT)" == "NO"
  27  @all:
  28         @echo "PDF Import extension disabled."