OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Oct-2006 20:48:11
Branch: HEAD Handle: 2006101219481100
Modified files:
openpkg-src/pdflib pdflib.patch pdflib.spec
Log:
remove crap from patch and fix building under Solaris
Summary:
Revision Changes Path
1.8 +13 -50 openpkg-src/pdflib/pdflib.patch
1.50 +1 -1 openpkg-src/pdflib/pdflib.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pdflib/pdflib.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 pdflib.patch
--- openpkg-src/pdflib/pdflib.patch 17 Dec 2004 11:50:48 -0000 1.7
+++ openpkg-src/pdflib/pdflib.patch 12 Oct 2006 18:48:11 -0000 1.8
@@ -15,6 +15,19 @@
diff -Nau configure.orig configure
--- configure.orig 2004-07-07 20:29:08.000000000 +0200
+++ configure 2004-10-27 17:04:45.110483011 +0200
+@@ -3183,12 +3183,9 @@
+ fi;
+
+ ac_sys_arch=`uname -p`
+- DEFINES="$DEFINES -mt"
+- EXTERNALLIBS="$EXTERNALLIBS -mt"
+
+ if test "$WITH_64BIT" = "yes"; then
+ PLATFORM="-DPDF_PLATFORM=\\\"\"SunOS64\"\\\""
+- DEFINES="$DEFINES -xarch=v9";
+ if test "$ac_sys_arch" = "sparc" ; then
+ DEFINES="$DEFINES -DPDC_PF_SOLARIS_SPARC64"
+ fi
@@ -8908,6 +8908,7 @@
@@ -70,53 +83,3 @@
-Index: libs/tiff/tif_ojpeg.c
-diff -Nau libs/tiff/tif_ojpeg.c.orig libs/tiff/tif_ojpeg.c
---- libs/tiff/tif_ojpeg.c.orig 2004-07-07 20:29:14 +0200
-+++ libs/tiff/tif_ojpeg.c 2004-10-28 12:27:57 +0200
-@@ -140,9 +140,6 @@
- #undef JPEG_CJPEG_DJPEG
- #undef JPEG_INTERNALS
-
--/* Hack for files produced by Wang Imaging application on Microsoft Windows
*/
--extern void jpeg_reset_huff_decode(j_decompress_ptr);
--
- /* PDFlib GmbH */
- #if defined(__ia64__) && defined (__linux__)
- #define PDFLIB_ALIGN16
-@@ -1085,17 +1082,6 @@
- buf += bytesperline;
- ++tif->tif_row;
- };
--
-- /* BEWARE OF KLUDGE: If our input file was produced by Microsoft's Wang
-- Imaging for Windows application, the DC coefficients
of
-- each JPEG image component (Y,Cb,Cr) must be reset at the end of each
TIFF
-- "strip", and any JPEG data bits remaining in the current Byte of the
-- decoder's input buffer must be discarded. To do so, we create an "ad
hoc"
-- interface in the "jdhuff.c" module of IJG JPEG Library Version 6 (module
-- "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and
we
-- invoke that interface here after decoding each "strip".
-- */
-- if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d);
- return 1;
- }
-
-@@ -1184,17 +1170,6 @@
- buf += sp->bytesperline;
- ++tif->tif_row;
- };
--
-- /* BEWARE OF KLUDGE: If our input file was produced by Microsoft's Wang
-- Imaging for Windows application, the DC coefficients
of
-- each JPEG image component (Y,Cb,Cr) must be reset at the end of each
TIFF
-- "strip", and any JPEG data bits remaining in the current Byte of the
-- decoder's input buffer must be discarded. To do so, we create an "ad
hoc"
-- interface in the "jdhuff.c" module of IJG JPEG Library Version 6 (module
-- "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and
we
-- invoke that interface here after decoding each "strip".
-- */
-- if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d);
- return 1;
- }
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pdflib/pdflib.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 pdflib.spec
--- openpkg-src/pdflib/pdflib.spec 10 Oct 2006 06:56:32 -0000 1.49
+++ openpkg-src/pdflib/pdflib.spec 12 Oct 2006 18:48:11 -0000 1.50
@@ -37,7 +37,7 @@
Group: Postscript
License: PDFlib
Version: %{V_long}
-Release: 20061010
+Release: 20061012
# list of sources
Source0:
http://www.pdflib.de/binaries/PDFlib/%{V_comp}/PDFlib-Lite-%{V_long}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
