pdflib-lite-system-libs.patch

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