Quellcode durchsuchen

port again to standard jpeg library by using new jinclude.h from >= jpeg-6b-20041217, and... upgrading package: pdflib 6.0.0p1 -> 6.0.1

Michael Schloh von Bennewitz vor 21 Jahren
Ursprung
Commit
061dbafcfe
2 geänderte Dateien mit 13 neuen und 13 gelöschten Zeilen
  1. 10 10
      pdflib/pdflib.patch
  2. 3 3
      pdflib/pdflib.spec

+ 10 - 10
pdflib/pdflib.patch

@@ -15,7 +15,7 @@ Index: configure
 diff -Nau configure.orig configure
 --- configure.orig	2004-07-07 20:29:08.000000000 +0200
 +++ configure	2004-10-27 17:04:45.110483011 +0200
-@@ -8853,6 +8853,7 @@
+@@ -8908,6 +8908,7 @@
  
  
  # zlib
@@ -23,7 +23,7 @@ diff -Nau configure.orig configure
  if test -d libs/flate ; then
      FLATELIBINC="-I\$(top_builddir)/libs/flate"
      FLATELIBLINK="\$(top_builddir)/libs/flate/libz\$(LA)"
-@@ -8862,10 +8863,12 @@
+@@ -8917,10 +8918,12 @@
      FLATELIBINC=""
      FLATELIBLINK=""
  fi
@@ -36,7 +36,7 @@ diff -Nau configure.orig configure
  if test -d libs/png ; then
      PNGLIBINC="-I\$(top_builddir)/libs/png"
      PNGLIBLINK="\$(top_builddir)/libs/png/libpng\$(LA)"
-@@ -8875,10 +8878,12 @@
+@@ -8930,10 +8933,12 @@
      PNGLIBINC=""
      PNGLIBLINK=""
  fi
@@ -49,7 +49,7 @@ diff -Nau configure.orig configure
  if test -d libs/tiff ; then
      TIFFLIBINC="-I\$(top_builddir)/libs/tiff"
      TIFFLIBLINK="\$(top_builddir)/libs/tiff/libtiff\$(LA)"
-@@ -8888,10 +8893,12 @@
+@@ -8943,10 +8948,12 @@
      TIFFLIBINC=""
      TIFFLIBLINK=""
  fi
@@ -62,7 +62,7 @@ diff -Nau configure.orig configure
  if test -d libs/jpeg ; then
      JPEGLIBINC="-I\$(top_builddir)/libs/jpeg"
      JPEGLIBLINK="\$(top_builddir)/libs/jpeg/libjpeg\$(LA)"
-@@ -8901,6 +8908,7 @@
+@@ -8956,6 +8963,7 @@
      JPEGLIBINC=""
      JPEGLIBLINK=""
  fi
@@ -81,10 +81,10 @@ diff -Nau libs/tiff/tif_ojpeg.c.orig libs/tiff/tif_ojpeg.c
 -/* Hack for files produced by Wang Imaging application on Microsoft Windows */
 -extern void jpeg_reset_huff_decode(j_decompress_ptr);
 -
- /* On some machines, it may be worthwhile to use "_setjmp()" or "sigsetjmp()"
-    instead of "setjmp()".  These macros make it easier:
- */
-@@ -1042,17 +1039,6 @@
+ /* PDFlib GmbH */
+ #if defined(__ia64__) && defined (__linux__)
+ #define PDFLIB_ALIGN16
+@@ -1085,17 +1082,6 @@
          buf += bytesperline;
          ++tif->tif_row;
        };
@@ -102,7 +102,7 @@ diff -Nau libs/tiff/tif_ojpeg.c.orig libs/tiff/tif_ojpeg.c
      return 1;
    }
  
-@@ -1138,17 +1124,6 @@
+@@ -1184,17 +1170,6 @@
          buf += sp->bytesperline;
          ++tif->tif_row;
        };

+ 3 - 3
pdflib/pdflib.spec

@@ -24,8 +24,8 @@
 ##
 
 #   package version
-%define       V_long 6.0.0p1
-%define       V_comp 600p1
+%define       V_long 6.0.1
+%define       V_comp 601
 
 #   package information
 Name:         pdflib
@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Graphics
 License:      PDFlib
 Version:      %{V_long}
-Release:      20041028
+Release:      20041217
 
 #   list of sources
 Source0:      http://www.pdflib.com/products/pdflib/download/%{V_comp}src/PDFlib-Lite-%{V_long}.tar.gz