pdflib-lite-system-libs.patch

   1 diff -urNp -x '*.orig' PDFlib-Lite-7.0.5p3.org/configure.in PDFlib-Lite-7.0.5p3/configure.in
   2 --- PDFlib-Lite-7.0.5p3.org/configure.in        2021-05-07 23:10:37.493352323 +0200
   3 +++ PDFlib-Lite-7.0.5p3/configure.in    2021-05-07 23:10:37.633354886 +0200
   4 @@ -1136,7 +1136,7 @@ if test -d libs/flate ; then
   5      LIBTARGETS="$LIBTARGETS flate"
   6  else
   7      FLATELIBINC=""
   8 -    FLATELIBLINK=""
   9 +    FLATELIBLINK="-lz"
  10  fi
  11  AC_SUBST(FLATELIBLINK)
  12  AC_SUBST(FLATELIBINC)
  13 @@ -1148,7 +1148,7 @@ if test -d libs/png ; then
  14      LIBTARGETS="$LIBTARGETS png"
  15  else
  16      PNGLIBINC=""
  17 -    PNGLIBLINK=""
  18 +    PNGLIBLINK="-lpng"
  19  fi
  20  AC_SUBST(PNGLIBINC)
  21  AC_SUBST(PNGLIBLINK)
  22 @@ -1160,7 +1160,7 @@ if test -d libs/tiff ; then
  23      LIBTARGETS="$LIBTARGETS tiff"
  24  else
  25      TIFFLIBINC=""
  26 -    TIFFLIBLINK=""
  27 +    TIFFLIBLINK="-ltiff"
  28  fi
  29  AC_SUBST(TIFFLIBINC)
  30  AC_SUBST(TIFFLIBLINK)
  31 @@ -1172,7 +1172,7 @@ if test -d libs/jpeg ; then
  32      LIBTARGETS="$LIBTARGETS jpeg"
  33  else
  34      JPEGLIBINC=""
  35 -    JPEGLIBLINK=""
  36 +    JPEGLIBLINK="-ljpeg"
  37  fi
  38  AC_SUBST(JPEGLIBINC)
  39  AC_SUBST(JPEGLIBLINK)
  40 @@ -1184,7 +1184,7 @@ if test -d libs/expat ; then
  41      LIBTARGETS="$LIBTARGETS expat"
  42  else
  43      EXPATLIBINC=""
  44 -    EXPATLIBLINK=""
  45 +    EXPATLIBLINK="-lexpat"
  46  fi
  47  AC_SUBST(EXPATLIBINC)
  48  AC_SUBST(EXPATLIBLINK)
  49 @@ -1204,7 +1204,8 @@ if test "$WITH_OPENSSL" != "no" ; then
  50      OPENSSLLIBLINK="-L/usr/local/ssl/lib -lcrypto -lssl"
  51      LIBTARGETS="$LIBTARGETS expat"
  52    else
  53 -    WITH_OPENSLL=no
  54 +    OPENSSLLIBINC="-DPDF_FEATURE_DIGSIG -I/usr/include/openssl"
  55 +    OPENSSLLIBLINK="-lcrypto -lssl"
  56    fi
  57  fi
  58  AC_SUBST(OPENSSLLIBINC)
  59 @@ -1235,7 +1236,8 @@ if test "$WITH_ICU" = "yes"; then
  60             LIBTARGETS="$LIBTARGETS icutle"
  61         fi
  62      else
  63 -       WITH_ICU=no
  64 +        ICULIBINC="-I/usr/include/unicode"
  65 +        ICULIBLINK="-licuio -licuuc -licui18n -licudata -licule -liculx"
  66      fi
  67  fi
  68
  69 @@ -1619,7 +1621,7 @@ fi
  70
  71  CFLAGS="$CFLAGS $PLATFORM"
  72
  73 -PDFLIBCONVENIENT="$PDFLIB_LINK \$(top_builddir)/libs/pdflib/\$(OO)/pdflib\$(LO) $PDCORELIBLINK $PNGLIBLINK $FLATELIBLINK $TIFFLIBLINK $PDILIBLINK $JPEGLIBLINK $PLOPLIB_LINK $FONTLIBLINK $PDPAGELIBLINK $EXPATLIBLINK"
  74 +PDFLIBCONVENIENT="$PDFLIB_LINK \$(top_builddir)/libs/pdflib/\$(OO)/pdflib\$(LO) $PDCORELIBLINK $PNGLIBLINK $FLATELIBLINK $TIFFLIBLINK $PDILIBLINK $JPEGLIBLINK $PLOPLIB_LINK $FONTLIBLINK $PDPAGELIBLINK"
  75
  76  if test "$WITH_SHARED" = "no"; then
  77      dnl We can generate a static lib only, but not a shared
  78 diff -urNp -x '*.orig' PDFlib-Lite-7.0.5p3.org/libs/pdflib/p_jpeg.c PDFlib-Lite-7.0.5p3/libs/pdflib/p_jpeg.c
  79 --- PDFlib-Lite-7.0.5p3.org/libs/pdflib/p_jpeg.c        2012-06-06 13:59:00.000000000 +0200
  80 +++ PDFlib-Lite-7.0.5p3/libs/pdflib/p_jpeg.c    2021-05-07 23:10:37.633354886 +0200
  81 @@ -52,7 +52,7 @@ pdf_cleanup_jpeg(PDF *p, pdf_image *imag
  82
  83  #else
  84
  85 -#include "jinclude.h"
  86 +#include "jconfig.h"
  87  #include "jpeglib.h"
  88
  89  /*
  90 @@ -302,7 +302,7 @@ pdf_jpeg_pdcread_src(j_decompress_ptr ci
  91
  92      cinfo->src = (struct jpeg_source_mgr *)
  93              (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
  94 -                                        SIZEOF(pdf_source_mgr));
  95 +                                        sizeof(pdf_source_mgr));
  96
  97      src = (pdf_src_ptr) cinfo->src;
  98      src->pub.init_source = pdf_init_JPEG_source;
  99 @@ -345,7 +345,7 @@ pdf_init_JPEG_destination (j_compress_pt
 100
 101      dest->buffer = (JOCTET *)
 102          (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
 103 -                                  OUTPUT_BUF_SIZE * SIZEOF(JOCTET));
 104 +                                  OUTPUT_BUF_SIZE * sizeof(JOCTET));
 105
 106      dest->pub.next_output_byte = dest->buffer;
 107      dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
 108 @@ -381,7 +381,7 @@ pdf_jpeg_pdcwrite_dest(j_compress_ptr ci
 109
 110      cinfo->dest = (struct jpeg_destination_mgr *)
 111        (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
 112 -                                  SIZEOF(pdf_destination_mgr));
 113 +                                  sizeof(pdf_destination_mgr));
 114
 115      dest = (pdf_dest_ptr) cinfo->dest;
 116      dest->pub.init_destination = pdf_init_JPEG_destination;
 117 diff -urNp -x '*.orig' PDFlib-Lite-7.0.5p3.org/libs/pdflib/p_png.c PDFlib-Lite-7.0.5p3/libs/pdflib/p_png.c
 118 --- PDFlib-Lite-7.0.5p3.org/libs/pdflib/p_png.c 2012-06-06 13:59:00.000000000 +0200
 119 +++ PDFlib-Lite-7.0.5p3/libs/pdflib/p_png.c     2021-05-07 23:10:37.633354886 +0200
 120 @@ -78,7 +78,7 @@ pdf_data_source_PNG_terminate(PDF *p, PD
 121  static void
 122  pdf_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 123  {
 124 -    pdc_file *fp = (pdc_file *) png_ptr->io_ptr;
 125 +    pdc_file *fp = (pdc_file *) png_get_io_ptr(png_ptr);
 126      char *filename = (char *) pdc_file_name(fp);
 127
 128      if (!PDC_OK_FREAD(fp, data, length))
 129 @@ -96,14 +96,14 @@ pdf_png_read_data(png_structp png_ptr, p
 130  static void
 131  pdf_libpng_warning_handler(png_structp png_ptr, png_const_charp message)
 132  {
 133 -    PDF *p = (PDF *)png_ptr->mem_ptr;
 134 +    PDF *p = (PDF *)png_get_mem_ptr(png_ptr);
 135      pdc_logg_cond(p->pdc, 5, trc_image, "\tlibpng warning: %s\n", message);
 136  }
 137
 138  static void
 139  pdf_libpng_error_handler(png_structp png_ptr, png_const_charp message)
 140  {
 141 -    PDF *p = (PDF *)png_ptr->mem_ptr;
 142 +    PDF *p = (PDF *)png_get_mem_ptr(png_ptr);
 143
 144      pdc_logg_cond(p->pdc, 5, trc_image, "\tlibpng error: %s\n", message);
 145
 146 @@ -114,7 +114,7 @@ pdf_libpng_error_handler(png_structp png
 147  static void *
 148  pdf_libpng_malloc(png_structp png_ptr, size_t size)
 149  {
 150 -    PDF *p = (PDF *)png_ptr->mem_ptr;
 151 +    PDF *p = (PDF *)png_get_mem_ptr(png_ptr);
 152
 153      return pdc_malloc(p->pdc, size, "libpng");
 154  }
 155 @@ -122,7 +122,7 @@ pdf_libpng_malloc(png_structp png_ptr, s
 156  static void
 157  pdf_libpng_free(png_structp png_ptr, void *mem)
 158  {
 159 -    PDF *p = (PDF *)png_ptr->mem_ptr;
 160 +    PDF *p = (PDF *)png_get_mem_ptr(png_ptr);
 161
 162      pdc_free(p->pdc, mem);
 163  }