code:
From 273a133110838ee5702e7eb6409a853c598211b2 Mon Sep 17 00:00:00 2001
From: Ken Sharp <ken.sharp@artifex.com>
Date: Thu, 29 Sep 2016 17:35:05 +0100
Subject: [PATCH] Remove (and re-implement) ConvertUTF.c

Bug #697122 " embedded ConvertUTF.c is buggy and licensed incompatibly with GPL/APGL"

Its not clear that this code is incompatible with GPL, nor do we think
any 'bugginess' in the code affects us, since we are using a comparatively
small part of the included code.

Nevertheless its possible to remove the code, and re-implement the small
part we actually need, and that is done here.

Also removed the DSCEncodingToUnicode option which was insanely difficult
to use, and incorrectly documented.

Yhis shows one difference, 692486_-_heap_overflow_in_pdf_to_ucs2.pdf
now correctly throws an error, because the PDF file contains document
information (Application) which has an invalid UTF16-BE sequence.
---
 base/ConvertUTF.c              | 539 -----------------------------------------
 base/ConvertUTF.h              | 155 ------------
 base/lib.mak                   |   4 -
 devices/devs.mak               |   5 +-
 devices/vector/gdevpdf.c       |  16 +-
 devices/vector/gdevpdfb.h      |   1 -
 devices/vector/gdevpdfe.c      | 270 +++++++++++----------
 devices/vector/gdevpdfp.c      |   1 -
 devices/vector/gdevpdfx.h      |  17 +-
 windows/ghostscript.vcproj     |   8 -
 windows/ghostscript_rt.vcxproj |   2 -
 11 files changed, 155 insertions(+), 863 deletions(-)
 delete mode 100644 base/ConvertUTF.c
 delete mode 100644 base/ConvertUTF.h

diff --git a/base/ConvertUTF.c b/base/ConvertUTF.c
deleted file mode 100644
index cb2e2de..0000000
--- a/base/ConvertUTF.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Copyright 2001-2004 Unicode, Inc.
- *
- * Disclaimer
- *
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
- *
- * Limitations on Rights to Redistribute This Code
- *
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
- */
-
-
-/* ---------------------------------------------------------------------
-
-    Conversions between UTF32, UTF-16, and UTF-8. Source code file.
-    Author: Mark E. Davis, 1994.
-    Rev History: Rick McGowan, fixes & updates May 2001.
-    Sept 2001: fixed const & error conditions per
-        mods suggested by S. Parent & A. Lillich.
-    June 2002: Tim Dodd added detection and handling of incomplete
-        source sequences, enhanced error detection, added casts
-        to eliminate compiler warnings.
-    July 2003: slight mods to back out aggressive FFFE detection.
-    Jan 2004: updated switches in from-UTF8 conversions.
-    Oct 2004: updated to use UNI_MAX_LEGAL_UTF32 in UTF-32 conversions.
-
-    See the header file "ConvertUTF.h" for complete documentation.
-
------------------------------------------------------------------------- */
-
-#include "ConvertUTF.h"
-#ifdef CVTUTF_DEBUG
-#include <stdio.h>
-#endif
-
-static const int halfShift  = 10; /* used for shifting by 10 bits */
-
-static const UTF32 halfBase = 0x0010000UL;
-static const UTF32 halfMask = 0x3FFUL;
-
-#define UNI_SUR_HIGH_START  (UTF32)0xD800
-#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
-#define UNI_SUR_LOW_START   (UTF32)0xDC00
-#define UNI_SUR_LOW_END     (UTF32)0xDFFF
-#define false	   0
-#define true	    1
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF32toUTF16 (
-        const UTF32** sourceStart, const UTF32* sourceEnd,
-        UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
-    ConversionResult result = conversionOK;
-    const UTF32* source = *sourceStart;
-    UTF16* target = *targetStart;
-    while (source < sourceEnd) {
-        UTF32 ch;
-        if (target >= targetEnd) {
-            result = targetExhausted; break;
-        }
-        ch = *source++;
-        if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
-            /* UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values */
-            if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-                if (flags == strictConversion) {
-                    --source; /* return to the illegal value itself */
-                    result = sourceIllegal;
-                    break;
-                } else {
-                    *target++ = UNI_REPLACEMENT_CHAR;
-                }
-            } else {
-                *target++ = (UTF16)ch; /* normal case */
-            }
-        } else if (ch > UNI_MAX_LEGAL_UTF32) {
-            if (flags == strictConversion) {
-                result = sourceIllegal;
-            } else {
-                *target++ = UNI_REPLACEMENT_CHAR;
-            }
-        } else {
-            /* target is a character in range 0xFFFF - 0x10FFFF. */
-            if (target + 1 >= targetEnd) {
-                --source; /* Back up source pointer! */
-                result = targetExhausted; break;
-            }
-            ch -= halfBase;
-            *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
-            *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
-        }
-    }
-    *sourceStart = source;
-    *targetStart = target;
-    return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF16toUTF32 (
-        const UTF16** sourceStart, const UTF16* sourceEnd,
-        UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
-    ConversionResult result = conversionOK;
-    const UTF16* source = *sourceStart;
-    UTF32* target = *targetStart;
-    UTF32 ch, ch2;
-    while (source < sourceEnd) {
-        const UTF16* oldSource = source; /*  In case we have to back up because of target overflow. */
-        ch = *source++;
-        /* If we have a surrogate pair, convert to UTF32 first. */
-        if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
-            /* If the 16 bits following the high surrogate are in the source buffer... */
-            if (source < sourceEnd) {
-                ch2 = *source;
-                /* If it's a low surrogate, convert to UTF32. */
-                if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
-                    ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
-                        + (ch2 - UNI_SUR_LOW_START) + halfBase;
-                    ++source;
-                } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
-                    --source; /* return to the illegal value itself */
-                    result = sourceIllegal;
-                    break;
-                }
-            } else { /* We don't have the 16 bits following the high surrogate. */
-                --source; /* return to the high surrogate */
-                result = sourceExhausted;
-                break;
-            }
-        } else if (flags == strictConversion) {
-            /* UTF-16 surrogate values are illegal in UTF-32 */
-            if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
-                --source; /* return to the illegal value itself */
-                result = sourceIllegal;
-                break;
-            }
-        }
-        if (target >= targetEnd) {
-            source = oldSource; /* Back up source pointer! */
-            result = targetExhausted; break;
-        }
-        *target++ = ch;
-    }
-    *sourceStart = source;
-    *targetStart = target;
-#ifdef CVTUTF_DEBUG
-if (result == sourceIllegal) {
-    fprintf(stderr, "ConvertUTF16toUTF32 illegal seq 0x%04x,%04x\n", ch, ch2);
-    fflush(stderr);
-}
-#endif
-    return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Index into the table below with the first byte of a UTF-8 sequence to
- * get the number of trailing bytes that are supposed to follow it.
- * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
- * left as-is for anyone who may want to do such conversion, which was
- * allowed in earlier algorithms.
- */
-static const char trailingBytesForUTF8[256] = {
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-/*
- * Magic values subtracted from a buffer value during UTF8 conversion.
- * This table contains as many values as there might be trailing bytes
- * in a UTF-8 sequence.
- */
-static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
-                     0x03C82080UL, 0xFA082080UL, 0x82082080UL };
-
-/*
- * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
- * into the first byte, depending on how many bytes follow.  There are
- * as many entries in this table as there are UTF-8 sequence types.
- * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
- * for *legal* UTF-8 will be 4 or fewer bytes total.
- */
-static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-/* --------------------------------------------------------------------- */
-
-/* The interface converts a whole buffer to avoid function-call overhead.
- * Constants have been gathered. Loops & conditionals have been removed as
- * much as possible for efficiency, in favor of drop-through switches.
- * (See "Note A" at the bottom of the file for equivalent code.)
- * If your compiler supports it, the "isLegalUTF8" call can be turned
- * into an inline function.
- */
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF16toUTF8 (
-        const UTF16** sourceStart, const UTF16* sourceEnd,
-        UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
-    ConversionResult result = conversionOK;
-    const UTF16* source = *sourceStart;
-    UTF8* target = *targetStart;
-    while (source < sourceEnd) {
-        UTF32 ch;
-        unsigned short bytesToWrite = 0;
-        const UTF32 byteMask = 0xBF;
-        const UTF32 byteMark = 0x80;
-        const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
-        ch = *source++;
-        /* If we have a surrogate pair, convert to UTF32 first. */
-        if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
-            /* If the 16 bits following the high surrogate are in the source buffer... */
-            if (source < sourceEnd) {
-                UTF32 ch2 = *source;
-                /* If it's a low surrogate, convert to UTF32. */
-                if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
-                    ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
-                        + (ch2 - UNI_SUR_LOW_START) + halfBase;
-                    ++source;
-                } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
-                    --source; /* return to the illegal value itself */
-                    result = sourceIllegal;
-                    break;
-                }
-            } else { /* We don't have the 16 bits following the high surrogate. */
-                --source; /* return to the high surrogate */
-                result = sourceExhausted;
-                break;
-            }
-        } else if (flags == strictConversion) {
-            /* UTF-16 surrogate values are illegal in UTF-32 */
-            if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
-                --source; /* return to the illegal value itself */
-                result = sourceIllegal;
-                break;
-            }
-        }
-        /* Figure out how many bytes the result will require */
-        if (ch < (UTF32)0x80) {	     bytesToWrite = 1;
-        } else if (ch < (UTF32)0x800) {     bytesToWrite = 2;
-        } else if (ch < (UTF32)0x10000) {   bytesToWrite = 3;
-        } else if (ch < (UTF32)0x110000) {  bytesToWrite = 4;
-        } else {			    bytesToWrite = 3;
-                                            ch = UNI_REPLACEMENT_CHAR;
-        }
-
-        target += bytesToWrite;
-        if (target > targetEnd) {
-            source = oldSource; /* Back up source pointer! */
-            target -= bytesToWrite; result = targetExhausted; break;
-        }
-        switch (bytesToWrite) { /* note: everything falls through. */
-            case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-            case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-            case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-            case 1: *--target =  (UTF8)(ch | firstByteMark[bytesToWrite]);
-        }
-        target += bytesToWrite;
-    }
-    *sourceStart = source;
-    *targetStart = target;
-    return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Utility routine to tell whether a sequence of bytes is legal UTF-8.
- * This must be called with the length pre-determined by the first byte.
- * If not calling this from ConvertUTF8to*, then the length can be set by:
- *  length = trailingBytesForUTF8[*source]+1;
- * and the sequence is illegal right away if there aren't that many bytes
- * available.
- * If presented with a length > 4, this returns false.  The Unicode
- * definition of UTF-8 goes up to 4-byte sequences.
- */
-
-static Boolean isLegalUTF8(const UTF8 *source, int length) {
-    UTF8 a;
-    const UTF8 *srcptr = source+length;
-    switch (length) {
-    default: return false;
-        /* Everything else falls through when "true"... */
-    case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
-    case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
-    case 2: if ((a = (*--srcptr)) > 0xBF) return false;
-
-        switch (*source) {
-            /* no fall-through in this inner switch */
-            case 0xE0: if (a < 0xA0) return false; break;
-            case 0xED: if (a > 0x9F) return false; break;
-            case 0xF0: if (a < 0x90) return false; break;
-            case 0xF4: if (a > 0x8F) return false; break;
-            default:   if (a < 0x80) return false;
-        }
-
-    case 1: if (*source >= 0x80 && *source < 0xC2) return false;
-    }
-    if (*source > 0xF4) return false;
-    return true;
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Exported function to return whether a UTF-8 sequence is legal or not.
- * This is not used here; it's just exported.
- */
-Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) {
-    int length = trailingBytesForUTF8[*source]+1;
-    if (source+length > sourceEnd) {
-        return false;
-    }
-    return isLegalUTF8(source, length);
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF8toUTF16 (
-        const UTF8** sourceStart, const UTF8* sourceEnd,
-        UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
-    ConversionResult result = conversionOK;
-    const UTF8* source = *sourceStart;
-    UTF16* target = *targetStart;
-    while (source < sourceEnd) {
-        UTF32 ch = 0;
-        unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
-        if (source + extraBytesToRead >= sourceEnd) {
-            result = sourceExhausted; break;
-        }
-        /* Do this check whether lenient or strict */
-        if (! isLegalUTF8(source, extraBytesToRead+1)) {
-            result = sourceIllegal;
-            break;
-        }
-        /*
-         * The cases all fall through. See "Note A" below.
-         */
-        switch (extraBytesToRead) {
-            case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-            case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-            case 3: ch += *source++; ch <<= 6;
-            case 2: ch += *source++; ch <<= 6;
-            case 1: ch += *source++; ch <<= 6;
-            case 0: ch += *source++;
-        }
-        ch -= offsetsFromUTF8[extraBytesToRead];
-
-        if (target >= targetEnd) {
-            source -= (extraBytesToRead+1); /* Back up source pointer! */
-            result = targetExhausted; break;
-        }
-        if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
-            /* UTF-16 surrogate values are illegal in UTF-32 */
-            if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-                if (flags == strictConversion) {
-                    source -= (extraBytesToRead+1); /* return to the illegal value itself */
-                    result = sourceIllegal;
-                    break;
-                } else {
-                    *target++ = UNI_REPLACEMENT_CHAR;
-                }
-            } else {
-                *target++ = (UTF16)ch; /* normal case */
-            }
-        } else if (ch > UNI_MAX_UTF16) {
-            if (flags == strictConversion) {
-                result = sourceIllegal;
-                source -= (extraBytesToRead+1); /* return to the start */
-                break; /* Bail out; shouldn't continue */
-            } else {
-                *target++ = UNI_REPLACEMENT_CHAR;
-            }
-        } else {
-            /* target is a character in range 0xFFFF - 0x10FFFF. */
-            if (target + 1 >= targetEnd) {
-                source -= (extraBytesToRead+1); /* Back up source pointer! */
-                result = targetExhausted; break;
-            }
-            ch -= halfBase;
-            *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
-            *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
-        }
-    }
-    *sourceStart = source;
-    *targetStart = target;
-    return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF32toUTF8 (
-        const UTF32** sourceStart, const UTF32* sourceEnd,
-        UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
-    ConversionResult result = conversionOK;
-    const UTF32* source = *sourceStart;
-    UTF8* target = *targetStart;
-    while (source < sourceEnd) {
-        UTF32 ch;
-        unsigned short bytesToWrite = 0;
-        const UTF32 byteMask = 0xBF;
-        const UTF32 byteMark = 0x80;
-        ch = *source++;
-        if (flags == strictConversion ) {
-            /* UTF-16 surrogate values are illegal in UTF-32 */
-            if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-                --source; /* return to the illegal value itself */
-                result = sourceIllegal;
-                break;
-            }
-        }
-        /*
-         * Figure out how many bytes the result will require. Turn any
-         * illegally large UTF32 things (> Plane 17) into replacement chars.
-         */
-        if (ch < (UTF32)0x80) {	     bytesToWrite = 1;
-        } else if (ch < (UTF32)0x800) {     bytesToWrite = 2;
-        } else if (ch < (UTF32)0x10000) {   bytesToWrite = 3;
-        } else if (ch <= UNI_MAX_LEGAL_UTF32) {  bytesToWrite = 4;
-        } else {			    bytesToWrite = 3;
-                                            ch = UNI_REPLACEMENT_CHAR;
-                                            result = sourceIllegal;
-        }
-
-        target += bytesToWrite;
-        if (target > targetEnd) {
-            --source; /* Back up source pointer! */
-            target -= bytesToWrite; result = targetExhausted; break;
-        }
-        switch (bytesToWrite) { /* note: everything falls through. */
-            case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-            case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-            case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-            case 1: *--target = (UTF8) (ch | firstByteMark[bytesToWrite]);
-        }
-        target += bytesToWrite;
-    }
-    *sourceStart = source;
-    *targetStart = target;
-    return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF8toUTF32 (
-        const UTF8** sourceStart, const UTF8* sourceEnd,
-        UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
-    ConversionResult result = conversionOK;
-    const UTF8* source = *sourceStart;
-    UTF32* target = *targetStart;
-    while (source < sourceEnd) {
-        UTF32 ch = 0;
-        unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
-        if (source + extraBytesToRead >= sourceEnd) {
-            result = sourceExhausted; break;
-        }
-        /* Do this check whether lenient or strict */
-        if (! isLegalUTF8(source, extraBytesToRead+1)) {
-            result = sourceIllegal;
-            break;
-        }
-        /*
-         * The cases all fall through. See "Note A" below.
-         */
-        switch (extraBytesToRead) {
-            case 5: ch += *source++; ch <<= 6;
-            case 4: ch += *source++; ch <<= 6;
-            case 3: ch += *source++; ch <<= 6;
-            case 2: ch += *source++; ch <<= 6;
-            case 1: ch += *source++; ch <<= 6;
-            case 0: ch += *source++;
-        }
-        ch -= offsetsFromUTF8[extraBytesToRead];
-
-        if (target >= targetEnd) {
-            source -= (extraBytesToRead+1); /* Back up the source pointer! */
-            result = targetExhausted; break;
-        }
-        if (ch <= UNI_MAX_LEGAL_UTF32) {
-            /*
-             * UTF-16 surrogate values are illegal in UTF-32, and anything
-             * over Plane 17 (> 0x10FFFF) is illegal.
-             */
-            if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-                if (flags == strictConversion) {
-                    source -= (extraBytesToRead+1); /* return to the illegal value itself */
-                    result = sourceIllegal;
-                    break;
-                } else {
-                    *target++ = UNI_REPLACEMENT_CHAR;
-                }
-            } else {
-                *target++ = ch;
-            }
-        } else { /* i.e., ch > UNI_MAX_LEGAL_UTF32 */
-            result = sourceIllegal;
-            *target++ = UNI_REPLACEMENT_CHAR;
-        }
-    }
-    *sourceStart = source;
-    *targetStart = target;
-    return result;
-}
-
-/* ---------------------------------------------------------------------
-
-    Note A.
-    The fall-through switches in UTF-8 reading code save a
-    temp variable, some decrements & conditionals.  The switches
-    are equivalent to the following loop:
-        {
-            int tmpBytesToRead = extraBytesToRead+1;
-            do {
-                ch += *source++;
-                --tmpBytesToRead;
-                if (tmpBytesToRead) ch <<= 6;
-            } while (tmpBytesToRead > 0);
-        }
-    In UTF-8 writing code, the switches on "bytesToWrite" are
-    similarly unrolled loops.
-
-   --------------------------------------------------------------------- */
diff --git a/base/ConvertUTF.h b/base/ConvertUTF.h
deleted file mode 100644
index 538bec6..0000000
--- a/base/ConvertUTF.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright 2001-2004 Unicode, Inc.
- *
- * Disclaimer
- *
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
- *
- * Limitations on Rights to Redistribute This Code
- *
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
- */
-
-
-#ifndef ConvertUTF_INCLUDED
-#define ConvertUTF_INCLUDED
-
-/* ---------------------------------------------------------------------
-
-    Conversions between UTF32, UTF-16, and UTF-8.  Header file.
-
-    Several funtions are included here, forming a complete set of
-    conversions between the three formats.  UTF-7 is not included
-    here, but is handled in a separate source file.
-
-    Each of these routines takes pointers to input buffers and output
-    buffers.  The input buffers are const.
-
-    Each routine converts the text between *sourceStart and sourceEnd,
-    putting the result into the buffer between *targetStart and
-    targetEnd. Note: the end pointers are *after* the last item: e.g.
-    *(sourceEnd - 1) is the last item.
-
-    The return result indicates whether the conversion was successful,
-    and if not, whether the problem was in the source or target buffers.
-    (Only the first encountered problem is indicated.)
-
-    After the conversion, *sourceStart and *targetStart are both
-    updated to point to the end of last text successfully converted in
-    the respective buffers.
-
-    Input parameters:
-        sourceStart - pointer to a pointer to the source buffer.
-                The contents of this are modified on return so that
-                it points at the next thing to be converted.
-        targetStart - similarly, pointer to pointer to the target buffer.
-        sourceEnd, targetEnd - respectively pointers to the ends of the
-                two buffers, for overflow checking only.
-
-    These conversion functions take a ConversionFlags argument. When this
-    flag is set to strict, both irregular sequences and isolated surrogates
-    will cause an error.  When the flag is set to lenient, both irregular
-    sequences and isolated surrogates are converted.
-
-    Whether the flag is strict or lenient, all illegal sequences will cause
-    an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>,
-    or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code
-    must check for illegal sequences.
-
-    When the flag is set to lenient, characters over 0x10FFFF are converted
-    to the replacement character; otherwise (when the flag is set to strict)
-    they constitute an error.
-
-    Output parameters:
-        The value "sourceIllegal" is returned from some routines if the input
-        sequence is malformed.  When "sourceIllegal" is returned, the source
-        value will point to the illegal value that caused the problem. E.g.,
-        in UTF-8 when a sequence is malformed, it points to the start of the
-        malformed sequence.
-
-    Author: Mark E. Davis, 1994.
-    Rev History: Rick McGowan, fixes & updates May 2001.
-                 Fixes & updates, Sept 2001.
-
------------------------------------------------------------------------- */
-
-/* ---------------------------------------------------------------------
-    The following 4 definitions are compiler-specific.
-    The C standard does not guarantee that wchar_t has at least
-    16 bits, so wchar_t is no less portable than unsigned short!
-    All should be unsigned values to avoid sign extension during
-    bit mask & shift operations.
------------------------------------------------------------------------- */
-
-typedef unsigned long	UTF32;	/* at least 32 bits */
-typedef unsigned short	UTF16;	/* at least 16 bits */
-typedef unsigned char	UTF8;	/* typically 8 bits */
-typedef unsigned char	Boolean; /* 0 or 1 */
-
-/* Some fundamental constants */
-#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
-#define UNI_MAX_BMP (UTF32)0x0000FFFF
-#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
-#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
-#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
-
-typedef enum {
-        conversionOK, 		/* conversion successful */
-        sourceExhausted,	/* partial character in source, but hit end */
-        targetExhausted,	/* insuff. room in target for conversion */
-        sourceIllegal		/* source sequence is illegal/malformed */
-} ConversionResult;
-
-typedef enum {
-        strictConversion = 0,
-        lenientConversion
-} ConversionFlags;
-
-/* This is for C++ and does no harm in C */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-ConversionResult ConvertUTF8toUTF16 (
-                const UTF8** sourceStart, const UTF8* sourceEnd,
-                UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
-
-ConversionResult ConvertUTF16toUTF8 (
-                const UTF16** sourceStart, const UTF16* sourceEnd,
-                UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
-
-ConversionResult ConvertUTF8toUTF32 (
-                const UTF8** sourceStart, const UTF8* sourceEnd,
-                UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
-
-ConversionResult ConvertUTF32toUTF8 (
-                const UTF32** sourceStart, const UTF32* sourceEnd,
-                UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
-
-ConversionResult ConvertUTF16toUTF32 (
-                const UTF16** sourceStart, const UTF16* sourceEnd,
-                UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
-
-ConversionResult ConvertUTF32toUTF16 (
-                const UTF32** sourceStart, const UTF32* sourceEnd,
-                UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
-
-Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* --------------------------------------------------------------------- */
-
-#endif /* ConvertUTF_INCLUDED */
diff --git a/base/lib.mak b/base/lib.mak
index 173e2c6..2de6565 100644
--- a/base/lib.mak
+++ b/base/lib.mak
@@ -52,7 +52,6 @@ GLLCMS2CC=$(CC) $(LCMS2_CFLAGS) $(CFLAGS) $(I_)$(GLI_) $(II)$(LCMS2SRCDIR)$(D)in
 lcms2_h=$(LCMS2SRCDIR)$(D)include$(D)lcms2.h
 lcms2_plugin_h=$(LCMS2SRCDIR)$(D)include$(D)lcms2_plugin.h

-ConvertUTF_h=$(GLSRC)ConvertUTF.h
 gdevdcrd_h=$(GLSRC)gdevdcrd.h
 gdevpccm_h=$(GLSRC)gdevpccm.h

@@ -1097,9 +1096,6 @@ $(GLOBJ)gdevpccm.$(OBJ) : $(GLSRC)gdevpccm.c $(AK)\
  $(gx_h) $(gsmatrix_h) $(gxdevice_h) $(gdevpccm_h) $(LIB_MAK) $(MAKEDIRS)
 	$(GLCC) $(GLO_)gdevpccm.$(OBJ) $(C_) $(GLSRC)gdevpccm.c

-$(GLOBJ)ConvertUTF.$(OBJ) : $(GLSRC)ConvertUTF.c $(ConvertUTF_h) $(LIB_MAK) $(MAKEDIRS)
-	$(GLCC) $(GLO_)ConvertUTF.$(OBJ) $(C_) $(GLSRC)ConvertUTF.c
-
 ### Memory devices

 $(GLOBJ)gdevmem.$(OBJ) : $(GLSRC)gdevmem.c $(AK) $(gx_h) $(gserrors_h) \
diff --git a/devices/devs.mak b/devices/devs.mak
index ea27ab0..51ec363 100644
--- a/devices/devs.mak
+++ b/devices/devs.mak
@@ -835,9 +835,8 @@ pdfwrite5_=$(DEVOBJ)gdevpdfm.$(OBJ)
 pdfwrite6_=$(DEVOBJ)gdevpdfo.$(OBJ) $(DEVOBJ)gdevpdfp.$(OBJ) $(DEVOBJ)gdevpdft.$(OBJ)
 pdfwrite7_=$(DEVOBJ)gdevpdfr.$(OBJ)
 pdfwrite8_=$(DEVOBJ)gdevpdfu.$(OBJ) $(DEVOBJ)gdevpdfv.$(OBJ) $(DEVOBJ)gdevagl.$(OBJ)
-pdfwrite9_= $(GLOBJ)ConvertUTF.$(OBJ)
-pdfwrite10_=$(DEVOBJ)gsflip.$(OBJ)
-pdfwrite11_=$(DEVOBJ)scantab.$(OBJ) $(DEVOBJ)sfilter2.$(OBJ)
+pdfwrite9_=$(DEVOBJ)gsflip.$(OBJ)
+pdfwrite10_=$(DEVOBJ)scantab.$(OBJ) $(DEVOBJ)sfilter2.$(OBJ)
 pdfwrite_=$(pdfwrite1_) $(pdfwrite2_) $(pdfwrite3_) $(pdfwrite4_)\
  $(pdfwrite5_) $(pdfwrite6_) $(pdfwrite7_) $(pdfwrite8_) $(pdfwrite9_)\
  $(pdfwrite10_) $(pdfwrite11_)
diff --git a/devices/vector/gdevpdf.c b/devices/vector/gdevpdf.c
index 2b3186d..20e0ae8 100644
--- a/devices/vector/gdevpdf.c
+++ b/devices/vector/gdevpdf.c
@@ -111,14 +111,13 @@ ENUM_PTRS_WITH(device_pdfwrite_enum_ptrs, gx_device_pdf *pdev)
  ENUM_PTR(32, gx_device_pdf, pres_soft_mask_dict);
  ENUM_PTR(33, gx_device_pdf, PDFXTrimBoxToMediaBoxOffset.data);
  ENUM_PTR(34, gx_device_pdf, PDFXBleedBoxToTrimBoxOffset.data);
- ENUM_PTR(35, gx_device_pdf, DSCEncodingToUnicode.data);
- ENUM_PTR(36, gx_device_pdf, Identity_ToUnicode_CMaps[0]);
- ENUM_PTR(37, gx_device_pdf, Identity_ToUnicode_CMaps[1]);
- ENUM_PTR(38, gx_device_pdf, vgstack);
- ENUM_PTR(39, gx_device_pdf, outline_levels);
- ENUM_PTR(40, gx_device_pdf, EmbeddedFiles);
- ENUM_PTR(41, gx_device_pdf, pdf_font_dir);
- ENUM_PTR(42, gx_device_pdf, ExtensionMetadata);
+ ENUM_PTR(35, gx_device_pdf, Identity_ToUnicode_CMaps[0]);
+ ENUM_PTR(36, gx_device_pdf, Identity_ToUnicode_CMaps[1]);
+ ENUM_PTR(37, gx_device_pdf, vgstack);
+ ENUM_PTR(38, gx_device_pdf, outline_levels);
+ ENUM_PTR(39, gx_device_pdf, EmbeddedFiles);
+ ENUM_PTR(40, gx_device_pdf, pdf_font_dir);
+ ENUM_PTR(41, gx_device_pdf, ExtensionMetadata);
 #define e1(i,elt) ENUM_PARAM_STRING_PTR(i + gx_device_pdf_num_ptrs, gx_device_pdf, elt);
 gx_device_pdf_do_param_strings(e1)
 #undef e1
@@ -165,7 +164,6 @@ static RELOC_PTRS_WITH(device_pdfwrite_reloc_ptrs, gx_device_pdf *pdev)
  RELOC_PTR(gx_device_pdf, pres_soft_mask_dict);
  RELOC_PTR(gx_device_pdf, PDFXTrimBoxToMediaBoxOffset.data);
  RELOC_PTR(gx_device_pdf, PDFXBleedBoxToTrimBoxOffset.data);
- RELOC_PTR(gx_device_pdf, DSCEncodingToUnicode.data);
  RELOC_PTR(gx_device_pdf, Identity_ToUnicode_CMaps[0]);
  RELOC_PTR(gx_device_pdf, Identity_ToUnicode_CMaps[1]);
  RELOC_PTR(gx_device_pdf, vgstack);
diff --git a/devices/vector/gdevpdfb.h b/devices/vector/gdevpdfb.h
index 08f18c5..447f0f5 100644
--- a/devices/vector/gdevpdfb.h
+++ b/devices/vector/gdevpdfb.h
@@ -141,7 +141,6 @@ const gx_device_pdf PDF_DEVICE_IDENT =
  12000,				/* MaxClipPathSize */ /* HP LaserJet 1320 hangs with 14000. */
  256000,			/* MaxShadingBitmapSize */
  PDF_DEVICE_MaxInlineImageSize,	/* MaxInlineImageSize */
- {0, 0},                        /* DSCEncodingToUnicode */
  {0, 0, 0},			/* OwnerPassword */
  {0, 0, 0},			/* UserPassword */
  0,				/* KeyLength */
diff --git a/devices/vector/gdevpdfe.c b/devices/vector/gdevpdfe.c
index 1aa1f25..f23a02d 100644
--- a/devices/vector/gdevpdfe.c
+++ b/devices/vector/gdevpdfe.c
@@ -26,7 +26,6 @@
 #include "gdevpdfx.h"
 #include "gdevpdfg.h"
 #include "gdevpdfo.h"
-#include "ConvertUTF.h"

 char PDFDocEncodingLookup [92] = {
     0x20, 0x22, 0x20, 0x20, 0x20, 0x21, 0x20, 0x26,
@@ -343,155 +342,162 @@ decode_escape(const byte *data, int data_length, int *index)
     return c; /* A wrong escapement sequence. */
 }

-static int
-pdf_xmp_write_translated(gx_device_pdf *pdev, stream *s, const byte *data, int data_length,
-                         void(*write)(stream *s, const byte *data, int data_length))
+/*
+ * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
+ * into the first byte, depending on how many bytes follow.  There are
+ * as many entries in this table as there are UTF-8 sequence types.
+ * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
+ * for *legal* UTF-8 will be 4 or fewer bytes total.
+ */
+static const char firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+static int gs_ConvertUTF16(char *UTF16, int UTF16Len, unsigned char **UTF8Start, int UTF8Len)
 {
-    if (pdev->DSCEncodingToUnicode.data == 0) {
-        int i, j=0;
-        unsigned char *buf0;
+    int i, bytes = 0;
+    short U16;
+    unsigned char *UTF8 = *UTF8Start;
+    unsigned char *UTF8End = UTF8 + UTF8Len;

-        buf0 = (unsigned char *)gs_alloc_bytes(pdev->memory, data_length * sizeof(unsigned char),
-                        "pdf_xmp_write_translated");
-        if (buf0 == NULL)
-            return_error(gs_error_VMerror);
-        for (i = 0; i < data_length; i++) {
-            byte c = data[i];
+    if (fabs(UTF16Len % sizeof(short)) != 0)
+        return gs_note_error(gs_error_rangecheck);
+
+    for (i=0;i<UTF16Len / sizeof(short);i++)
+    {
+        U16 = (*UTF16++) << 8;
+        U16 += *UTF16++;

-            if (c == '\\')
-                c = decode_escape(data, data_length, &i);
-            buf0[j] = c;
-            j++;
+        if (U16 >= 0xD800 && U16 <= 0xDBFF) {
+            return gs_note_error(gs_error_rangecheck);
         }
-        if (buf0[0] != 0xfe || buf0[1] != 0xff) {
-            unsigned char *buf1;
-            /* We must assume that the information is PDFDocEncoding. In this case
-             * we need to convert it into UTF-8. If we just convert it to UTF-16
-             * then we can safely fall through to the code below.
-             */
-            /* NB the code below skips the BOM in positions 0 and 1, so we need
-             * two extra bytes, to be ignored.
-             */
-            buf1 = (unsigned char *)gs_alloc_bytes(pdev->memory, (j * sizeof(UTF16)) + 2,
-                        "pdf_xmp_write_translated");
-            if (buf1 == NULL) {
-                gs_free_object(pdev->memory, buf0, "pdf_xmp_write_translated");
-                return_error(gs_error_VMerror);
-            }
-            memset(buf1, 0x00, (j * sizeof(UTF16)) + 2);
-            for (i = 0; i < j; i++) {
-                if (buf0[i] <= 0x7f || buf0[i] >= 0xAE) {
-                    if (buf0[i] == 0x7f) {
-                        emprintf1(pdev->memory, "PDFDocEncoding %x cannot be represented in Unicode\n",
-                            buf0[i]);
-                    } else
-                        buf1[(i * 2) + 3] = buf0[i];
+        if (U16 >= 0xDC00 && U16 <= 0xDFFF) {
+            return gs_note_error(gs_error_rangecheck);
+        }
+
+        if(U16 < 0x80) {
+            bytes = 1;
+        } else {
+            if (U16 < 0x800) {
+                    bytes = 2;
+            } else {
+                if (U16 < 0x10000) {
+                    bytes = 3;
                 } else {
-                    buf1[(i * 2) + 2] = PDFDocEncodingLookup[(buf0[i] - 0x80) * 2];
-                    buf1[(i * 2) + 3] = PDFDocEncodingLookup[((buf0[i] - 0x80) * 2) + 1];
-                    if (PDFDocEncodingLookup[((buf0[i] - 0x80) * 2) + 1] == 0x00)
-                        emprintf1(pdev->memory, "PDFDocEncoding %x cannot be represented in Unicode\n",
-                            PDFDocEncodingLookup[((buf0[i] - 0x80) * 2) + 1]);
+                    if (U16 < 0x111000) {
+                        bytes = 4;
+                    } else {
+                        bytes = 3;
+                        U16 = 0xFFFD;
+                    }
                 }
             }
+        }
+        if (UTF8 + bytes > UTF8End)
+            return gs_note_error(gs_error_VMerror);
+
+        /* Write from end to beginning, low bytes first */
+        UTF8 += bytes;
+
+        switch(bytes) {
+            case 4:
+                *--UTF8 = (unsigned char)((U16 | 0x80) & 0xBF);
+                U16 >>= 6;
+            case 3:
+                *--UTF8 = (unsigned char)((U16 | 0x80) & 0xBF);
+                U16 >>= 6;
+            case 2:
+                *--UTF8 = (unsigned char)((U16 | 0x80) & 0xBF);
+                U16 >>= 6;
+            case 1:
+                *--UTF8 = (unsigned char)(U16 | firstByteMark[bytes]);
+                break;
+            default:
+                return gs_note_error(gs_error_rangecheck);
+        }
+
+        /* Move to start of next set */
+        UTF8 += bytes;
+    }
+    *UTF8Start = UTF8;
+    return 0;
+}
+
+static int
+pdf_xmp_write_translated(gx_device_pdf *pdev, stream *s, const byte *data, int data_length,
+                         void(*write)(stream *s, const byte *data, int data_length))
+{
+    int i, j=0;
+    unsigned char *buf0;
+
+    buf0 = (unsigned char *)gs_alloc_bytes(pdev->memory, data_length * sizeof(unsigned char),
+                    "pdf_xmp_write_translated");
+    if (buf0 == NULL)
+        return_error(gs_error_VMerror);
+    for (i = 0; i < data_length; i++) {
+        byte c = data[i];
+
+        if (c == '\\')
+            c = decode_escape(data, data_length, &i);
+        buf0[j] = c;
+        j++;
+    }
+    if (buf0[0] != 0xfe || buf0[1] != 0xff) {
+        unsigned char *buf1;
+        /* We must assume that the information is PDFDocEncoding. In this case
+         * we need to convert it into UTF-8. If we just convert it to UTF-16
+         * then we can safely fall through to the code below.
+         */
+        /* NB the code below skips the BOM in positions 0 and 1, so we need
+         * two extra bytes, to be ignored.
+         */
+        buf1 = (unsigned char *)gs_alloc_bytes(pdev->memory, (j * sizeof(short)) + 2,
+                    "pdf_xmp_write_translated");
+        if (buf1 == NULL) {
             gs_free_object(pdev->memory, buf0, "pdf_xmp_write_translated");
-            buf0 = buf1;
-            data_length = j = (j * 2) + 2;
+            return_error(gs_error_VMerror);
         }
-        {
-            /* Its a Unicode (UTF-16BE) string, convert to UTF-8 */
-            UTF16 *buf0b, U16;
-            UTF8 *buf1, *buf1b;
-
-            /* A single UTF-16 (2 bytes) can end up as 4 bytes in UTF-8 */
-            buf1 = (UTF8 *)gs_alloc_bytes(pdev->memory, data_length * 2 * sizeof(unsigned char),
-                        "pdf_xmp_write_translated");
-            if (buf1 == NULL) {
-                gs_free_object(pdev->memory, buf0, "pdf_xmp_write_translated");
-                return_error(gs_error_VMerror);
-            }
-            buf1b = buf1;
-            /* Skip the Byte Order Mark (0xfe 0xff) */
-            buf0b = (UTF16 *)(buf0 + 2);
-            /* ConvertUTF16to UTF8 expects a buffer of UTF16s in the local
-             * endian-ness, but the data is big-endian. In case this is a little-endian
-             * machine, process the buffer from big-endian to whatever is right for this platform.
-             */
-            for (i = 2; i < j; i+=2) {
-                U16 = (buf0[i] << 8) + buf0[i + 1];
-                *(buf0b++) = U16;
-            }
-            buf0b = (UTF16 *)(buf0 + 2);
-            switch (ConvertUTF16toUTF8((const UTF16**)&buf0b, (UTF16 *)(buf0 + j),
-                             &buf1b, buf1 + (data_length * 2 * sizeof(unsigned char)), strictConversion)) {
-                case conversionOK:
-                    write(s, buf1, buf1b - buf1);
-                    gs_free_object(pdev->memory, buf1, "pdf_xmp_write_translated");
-                    break;
-                case sourceExhausted:
-                case targetExhausted:
-                case sourceIllegal:
-                default:
-                    gs_free_object(pdev->memory, buf0, "pdf_xmp_write_translated");
-                    gs_free_object(pdev->memory, buf1, "pdf_xmp_write_translated");
-                    return_error(gs_error_rangecheck);
+        memset(buf1, 0x00, (j * sizeof(short)) + 2);
+        for (i = 0; i < j; i++) {
+            if (buf0[i] <= 0x7f || buf0[i] >= 0xAE) {
+                if (buf0[i] == 0x7f) {
+                    emprintf1(pdev->memory, "PDFDocEncoding %x cannot be represented in Unicode\n",
+                        buf0[i]);
+                } else
+                    buf1[(i * 2) + 3] = buf0[i];
+            } else {
+                buf1[(i * 2) + 2] = PDFDocEncodingLookup[(buf0[i] - 0x80) * 2];
+                buf1[(i * 2) + 3] = PDFDocEncodingLookup[((buf0[i] - 0x80) * 2) + 1];
+                if (PDFDocEncodingLookup[((buf0[i] - 0x80) * 2) + 1] == 0x00)
+                    emprintf1(pdev->memory, "PDFDocEncoding %x cannot be represented in Unicode\n",
+                        PDFDocEncodingLookup[((buf0[i] - 0x80) * 2) + 1]);
             }
         }
         gs_free_object(pdev->memory, buf0, "pdf_xmp_write_translated");
-        return 0;
-    } else {
-        UTF16 *buf0;
-        const UTF16 *buf0b;
-        UTF8 *buf1, *buf1b;
-        int i, j = 0;
-
-        buf0 = (UTF16 *)gs_alloc_bytes(pdev->memory, data_length * sizeof(UTF16),
-                        "pdf_xmp_write_translated");
-        if (buf0 == NULL)
-            return_error(gs_error_VMerror);
-        buf1 = (UTF8 *)gs_alloc_bytes(pdev->memory, data_length * 2,
-                        "pdf_xmp_write_translated");
+        buf0 = buf1;
+        data_length = j = (j * 2) + 2;
+    }
+    {
+        /* Its a Unicode (UTF-16BE) string, convert to UTF-8 */
+        short *buf0b;
+        char *buf1, *buf1b;
+        int code;
+
+        /* A single UTF-16 (2 bytes) can end up as 4 bytes in UTF-8 */
+        buf1 = (char *)gs_alloc_bytes(pdev->memory, data_length * 2 * sizeof(unsigned char),
+                    "pdf_xmp_write_translated");
         if (buf1 == NULL) {
             gs_free_object(pdev->memory, buf0, "pdf_xmp_write_translated");
             return_error(gs_error_VMerror);
         }
-        buf0b = buf0;
         buf1b = buf1;
-        for (i = 0; i < data_length; i++) {
-            byte c = data[i];
-            int v;
-
-            if (c == '\\')
-                c = decode_escape(data, data_length, &i);
-            if (c > pdev->DSCEncodingToUnicode.size) {
-                gs_free_object(pdev->memory, buf0, "pdf_xmp_write_translated");
-                gs_free_object(pdev->memory, buf1, "pdf_xmp_write_translated");
-                return_error(gs_error_rangecheck);
-            }
-
-            v = pdev->DSCEncodingToUnicode.data[c];
-            if (v == -1)
-                v = '?'; /* Arbitrary. */
-            buf0[j] = v;
-            j++;
-        }
-        switch (ConvertUTF16toUTF8(&buf0b, buf0 + j,
-                             &buf1b, buf1 + data_length * 2, strictConversion)) {
-            case conversionOK:
-                write(s, buf1, buf1b - buf1);
-                break;
-            case sourceExhausted:
-            case targetExhausted:
-            case sourceIllegal:
-            default:
-                gs_free_object(pdev->memory, buf0, "pdf_xmp_write_translated");
-                gs_free_object(pdev->memory, buf1, "pdf_xmp_write_translated");
-                return_error(gs_error_rangecheck);
-        }
-        gs_free_object(pdev->memory, buf0, "pdf_xmp_write_translated");
-        gs_free_object(pdev->memory, buf1, "pdf_xmp_write_translated");
-        return 0;
+        /* Skip the Byte Order Mark (0xfe 0xff) */
+        buf0b = (short *)(buf0 + 2);
+        code = gs_ConvertUTF16((char *)buf0b, j - 2, (unsigned char **)&buf1b, data_length * 2 * sizeof(unsigned char));
+        if (code < 0)
+            return code;
+        write(s, (const byte *)buf1, buf1b - buf1);
     }
+    gs_free_object(pdev->memory, buf0, "pdf_xmp_write_translated");
+    return 0;
 }

 static int
diff --git a/devices/vector/gdevpdfp.c b/devices/vector/gdevpdfp.c
index 0fa07e3..6ebcb0d 100644
--- a/devices/vector/gdevpdfp.c
+++ b/devices/vector/gdevpdfp.c
@@ -77,7 +77,6 @@ static const gs_param_item_t pdf_param_items[] = {
     pi("CompressStreams", gs_param_type_bool, CompressStreams),
     pi("PrintStatistics", gs_param_type_bool, PrintStatistics),
     pi("MaxInlineImageSize", gs_param_type_long, MaxInlineImageSize),
-    pi("DSCEncodingToUnicode", gs_param_type_int_array, DSCEncodingToUnicode),

         /* PDF Encryption */
     pi("OwnerPassword", gs_param_type_string, OwnerPassword),
diff --git a/devices/vector/gdevpdfx.h b/devices/vector/gdevpdfx.h
index 308900a..c436220 100644
--- a/devices/vector/gdevpdfx.h
+++ b/devices/vector/gdevpdfx.h
@@ -601,7 +601,6 @@ struct gx_device_pdf_s {
                               a bitmap representation of a shading.
                               (Bigger shadings to be downsampled). */
     long MaxInlineImageSize;
-    gs_param_int_array DSCEncodingToUnicode;
     /* Encryption parameters */
     gs_param_string OwnerPassword;
     gs_param_string UserPassword;
@@ -911,14 +910,14 @@ struct gx_device_pdf_s {
  m(28,sbstack) m(29,substream_Resources) m(30,font3)\
  m(31,accumulating_substream_resource) \
  m(32,pres_soft_mask_dict) m(33,PDFXTrimBoxToMediaBoxOffset.data)\
- m(34,PDFXBleedBoxToTrimBoxOffset.data) m(35, DSCEncodingToUnicode.data)\
- m(36,Identity_ToUnicode_CMaps[0]) m(37,Identity_ToUnicode_CMaps[1])\
- m(38,vgstack)\
- m(39, outline_levels)
- m(40, gx_device_pdf, EmbeddedFiles);
- m(41, gx_device_pdf, pdf_font_dir);
- m(42, gx_device_pdf, Extension_Metadata);*/
-#define gx_device_pdf_num_ptrs 43
+ m(34,PDFXBleedBoxToTrimBoxOffset.data)
+ m(35,Identity_ToUnicode_CMaps[0]) m(36,Identity_ToUnicode_CMaps[1])\
+ m(37,vgstack)\
+ m(38, outline_levels)
+ m(39, gx_device_pdf, EmbeddedFiles);
+ m(40, gx_device_pdf, pdf_font_dir);
+ m(41, gx_device_pdf, Extension_Metadata);*/
+#define gx_device_pdf_num_ptrs 42
 #define gx_device_pdf_do_param_strings(m)\
     m(0, OwnerPassword) m(1, UserPassword) m(2, NoEncrypt)\
     m(3, DocumentUUID) m(4, InstanceUUID)
diff --git a/windows/ghostscript.vcproj b/windows/ghostscript.vcproj
index a96d317..450cb26 100644
--- a/windows/ghostscript.vcproj
+++ b/windows/ghostscript.vcproj
@@ -1794,10 +1794,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\base\ConvertUTF.c"
-				>
-			</File>
-			<File
 				RelativePath="..\base\echogs.c"
 				>
 			</File>
@@ -3330,10 +3326,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\base\ConvertUTF.h"
-				>
-			</File>
-			<File
 				RelativePath="..\base\ctype_.h"
 				>
 			</File>
diff --git a/windows/ghostscript_rt.vcxproj b/windows/ghostscript_rt.vcxproj
index 2348f08..fae2e1f 100644
--- a/windows/ghostscript_rt.vcxproj
+++ b/windows/ghostscript_rt.vcxproj
@@ -427,7 +427,6 @@
   <ItemGroup>
     <ClCompile Include="..\base\aes.c" />
     <ClCompile Include="..\base\bench.c" />
-    <ClCompile Include="..\base\ConvertUTF.c" />
     <ClCompile Include="..\base\echogs.c" />
     <ClCompile Include="..\base\gconf.c" />
     <ClCompile Include="..\base\genarch.c" />
@@ -1689,7 +1688,6 @@
     <ClInclude Include="..\jasper\src\libjasper\ras\ras_enc.h" />
     <ClInclude Include="..\base\aes.h" />
     <ClInclude Include="..\base\assert_.h" />
-    <ClInclude Include="..\base\ConvertUTF.h" />
     <ClInclude Include="..\base\ctype_.h" />
     <ClInclude Include="..\base\dirent_.h" />
     <ClInclude Include="..\base\dos_.h" />
--
2.9.3


code:
From 32d8df77bf3326f708c13d6913547c01ce6d728c Mon Sep 17 00:00:00 2001
From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
Date: Fri, 7 Oct 2016 13:57:01 +0200
Subject: [PATCH] Make sure 'dvipdf' is being run securely

---
 lib/dvipdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dvipdf b/lib/dvipdf
index 802aeab..c92dfb0 100755
--- a/lib/dvipdf
+++ b/lib/dvipdf
@@ -43,4 +43,4 @@ fi

 # We have to include the options twice because -I only takes effect if it
 # appears before other options.
-exec dvips -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -P- -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
+exec dvips -R -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -P- -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
--
2.7.4

repo_name: ayhanyalcinsoy/main


code:
From ea8addd686889af76d70031998680196913243ec Mon Sep 17 00:00:00 2001
From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
Date: Fri, 7 Oct 2016 12:20:29 +0200
Subject: [PATCH 1/2] Fix error when using ImageMagick's convert:

  Error: /undefined in .runlibfileexists
---
 Resource/Init/gs_fonts.ps | 15 ++++++++++++---
 Resource/Init/gs_init.ps  |  9 +++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Resource/Init/gs_fonts.ps b/Resource/Init/gs_fonts.ps
index a3da615..77814b8 100644
--- a/Resource/Init/gs_fonts.ps
+++ b/Resource/Init/gs_fonts.ps
@@ -96,10 +96,19 @@ userdict /.nativeFontmap .FontDirectory maxlength dict put
                 % stack: dict file fontname filename|aliasname
       1 index type /stringtype eq
       1 index type /nametype eq and 1 index xcheck and
-      1 index /run eq 2 index /.runlibfile eq or and {
+      1 index /run eq 2 index /.runlibfile eq 3 index /.runlibfileifexists eq or or and {
                 % This is an inclusion entry.
-        pop findlibfile { exch pop } { file } ifelse
-        2 index exch .readFontmap pop
+        0 index /.runlibfileifexists eq {
+          pop findlibfile {
+            exch pop
+            2 index exch .readFontmap pop
+          } {
+            pop
+          } ifelse
+        } {
+          pop findlibfile { exch pop } { file } ifelse
+          2 index exch .readFontmap pop
+        } ifelse
       } {
                 % This is a real entry.
                 % Read and pop tokens until a semicolon.
diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps
index ab7cfed..f9e035b 100644
--- a/Resource/Init/gs_init.ps
+++ b/Resource/Init/gs_init.ps
@@ -689,6 +689,14 @@ systemdict /internaldict dup .makeinternaldict .makeoperator
            { /undefinedfilename signalerror }
           ifelse
         } bind def
+/runlibfileifexists
+        {		% We don't want to bind 'run' into this procedure,
+                        % since run may get redefined.
+          findlibfile
+           { exch pop /run .systemvar exec }
+           { pop }
+          ifelse
+        } bind def
 /selectdevice
         { finddevice setdevice .setdefaultscreen } bind def
 /signalerror		% <object> <errorname> signalerror -
@@ -857,6 +865,7 @@ userdict /.currentresourcefile //null put
         } bind def
 % Temporarily substitute it for the real runlibfile.
 /.runlibfile /runlibfile load def
+/.runlibfileifexists /runlibfileifexists load def
 /runlibfile /runlibfile0 load def

 % Create the error handling machinery.
--
2.7.4

From 9878f41a229c67aba2e62ee7ab22ff37c2e5a04f Mon Sep 17 00:00:00 2001
From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
Date: Fri, 7 Oct 2016 12:57:06 +0200
Subject: [PATCH 2/2] Make sure customizations to
 /etc/ghostscript/Fontmap.local are used

  For more info, see: https://bugzilla.redhat.com/show_bug.cgi?id=610301
---
 Resource/Init/Fontmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resource/Init/Fontmap b/Resource/Init/Fontmap
index ae5af96..72aeb1f 100644
--- a/Resource/Init/Fontmap
+++ b/Resource/Init/Fontmap
@@ -2,3 +2,5 @@
 % See Fontmap.GS for the syntax of real Fontmap files.
 %% Replace 1 (Fontmap.GS)
 (Fontmap.GS) .runlibfile
+% must be at the bottom of line to allow people overriding everything.
+(Fontmap.local) .runlibfileifexists
--
2.7.4


code:
From 54572e8cf529eeb6a01234341d01a2fd555204e6 Mon Sep 17 00:00:00 2001
From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
Date: Fri, 7 Oct 2016 13:38:13 +0200
Subject: [PATCH] Use old names of urw-fonts

---
 Resource/Init/Fontmap.GS | 78 ++++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 35 deletions(-)

diff --git a/Resource/Init/Fontmap.GS b/Resource/Init/Fontmap.GS
index a9fa335..949c152 100644
--- a/Resource/Init/Fontmap.GS
+++ b/Resource/Init/Fontmap.GS
@@ -81,41 +81,49 @@

 % Aliases

-/AvantGarde-BookOblique		/URWGothic-BookOblique    ;
-/AvantGarde-Book		/URWGothic-Book        ;
-/AvantGarde-DemiOblique		/URWGothic-DemiOblique    ;
-/AvantGarde-Demi		/URWGothic-Demi        ;
-/Bookman-DemiItalic		/URWBookman-DemiItalic	;
-/Bookman-Demi			/URWBookman-Demi	;
-/Bookman-LightItalic		/URWBookman-LightItalic	;
-/Bookman-Light			/URWBookman-Light	;
-/Courier-Bold			/NimbusMonoPS-Bold	;
-/Courier-BoldOblique		/NimbusMonoPS-BoldItalic	;
-/Courier			/NimbusMonoPS-Regular	;
-/Courier-Oblique		/NimbusMonoPS-Italic	;
-/Helvetica-Bold			/NimbusSans-Bold ;
-/Helvetica-BoldOblique		/NimbusSans-BoldOblique      ;
-/Helvetica-Narrow-Bold		/NimbusSansNarrow-Bold    ;
-/Helvetica-Narrow-BoldOblique	/NimbusSansNarrow-BdOblique        ;
-/Helvetica-Narrow		/NimbusSansNarrow-Regular    ;
-/Helvetica-Narrow-Oblique	/NimbusSansNarrow-Oblique        ;
-/Helvetica			/NimbusSans-Regular ;
-/Helvetica-Oblique		/NimbusSans-Oblique      ;
-/NewCenturySchlbk-Bold		/C059-Bold	;
-/NewCenturySchlbk-BoldItalic	/C059-BdIta	;
-/NewCenturySchlbk-Italic	/C059-Italic	;
-/NewCenturySchlbk-Roman		/C059-Roman	;
-/Palatino-BoldItalic		/P052-BoldItalic	;
-/Palatino-Bold			/P052-Bold	;
-/Palatino-Italic		/P052-Italic	;
-/Palatino-Roman			/P052-Roman	;
-/Symbol				/StandardSymbolsPS	;
-/Times-BoldItalic		/NimbusRoman-BoldItalic	;
-/Times-Bold			/NimbusRoman-Bold	;
-/Times-Italic			/NimbusRoman-Italic	;
-/Times-Roman			/NimbusRoman-Regular	;
-/ZapfChancery-MediumItalic	/Z003-MediumItalic	;
-/ZapfDingbats			/D050000L	;
+/AvantGarde-BookOblique		/URWGothicL-BookObli	;
+/AvantGarde-Book		/URWGothicL-Book	;
+/AvantGarde-DemiOblique		/URWGothicL-DemiObli	;
+/AvantGarde-Demi		/URWGothicL-Demi	;
+
+/Bookman-DemiItalic		/URWBookmanL-DemiBoldItal	;
+/Bookman-Demi			/URWBookmanL-DemiBold	;
+/Bookman-LightItalic		/URWBookmanL-LighItal	;
+/Bookman-Light			/URWBookmanL-Ligh	;
+
+/Courier-Bold			/NimbusMonL-Bold	;
+/Courier-BoldOblique		/NimbusMonL-BoldObli	;
+/Courier			/NimbusMonL-Regu	;
+/Courier-Oblique		/NimbusMonL-ReguObli	;
+
+/Helvetica-Bold			/NimbusSanL-Bold	;
+/Helvetica-BoldOblique		/NimbusSanL-BoldItal	;
+/Helvetica-Narrow-Bold		/NimbusSanL-BoldCond	;
+/Helvetica-Narrow-BoldOblique	/NimbusSanL-BoldCondItal	;
+/Helvetica-Narrow		/NimbusSanL-ReguCond	;
+/Helvetica-Narrow-Oblique	/NimbusSanL-ReguCondItal	;
+/Helvetica			/NimbusSanL-Regu	;
+/Helvetica-Oblique		/NimbusSanL-ReguItal	;
+
+/NewCenturySchlbk-Bold		/CenturySchL-Bold	;
+/NewCenturySchlbk-BoldItalic	/CenturySchL-BoldItal	;
+/NewCenturySchlbk-Italic	/CenturySchL-Ital	;
+/NewCenturySchlbk-Roman		/CenturySchL-Roma	;
+
+/Palatino-Roman			/URWPalladioL-Roma	;
+/Palatino-Italic		/URWPalladioL-Ital	;
+/Palatino-Bold			/URWPalladioL-Bold	;
+/Palatino-BoldItalic		/URWPalladioL-BoldItal	;
+
+/Symbol				/StandardSymL	;
+
+/Times-BoldItalic		/NimbusRomNo9L-MediItal	;
+/Times-Bold			/NimbusRomNo9L-Medi	;
+/Times-Italic			/NimbusRomNo9L-ReguItal	;
+/Times-Roman			/NimbusRomNo9L-Regu	;
+
+/ZapfChancery-MediumItalic	/URWChanceryL-MediItal	;
+/ZapfDingbats			/Dingbats	;

 %
 %
--
2.7.4


code:
diff -up ghostscript-9.12/configure.ac.sys-zlib ghostscript-9.12/configure.ac
--- ghostscript-9.12/configure.ac.sys-zlib	2014-03-26 11:48:54.983972222 +0000
+++ ghostscript-9.12/configure.ac	2014-03-26 11:49:36.807230531 +0000
@@ -854,7 +854,7 @@ AC_MSG_CHECKING([for local zlib source])
 dnl zlib is needed for language level 3, and libpng
 # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR)
 # this seems a harmless default
-ZLIBDIR=src
+ZLIBDIR=$includedir
 AUX_SHARED_ZLIB=

 if test -d $srcdir/zlib; then
diff -up ghostscript-9.12/configure.sys-zlib ghostscript-9.12/configure
--- ghostscript-9.12/configure.sys-zlib	2014-03-26 11:49:45.547284521 +0000
+++ ghostscript-9.12/configure	2014-03-26 11:49:56.171350127 +0000
@@ -6254,7 +6254,7 @@ fi
 $as_echo_n "checking for local zlib source... " >&6; }
 # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR)
 # this seems a harmless default
-ZLIBDIR=src
+ZLIBDIR=$includedir
 AUX_SHARED_ZLIB=

 if test -d $srcdir/zlib; then


code:
diff -urNad ghostscript-8.64.dfsg.1~svn9323~/man/gs.1 ghostscript-8.64.dfsg.1~svn9323/man/gs.1
--- ghostscript-8.64.dfsg.1~svn9323~/man/gs.1	2009-01-05 19:08:07.000000000 +0900
+++ ghostscript-8.64.dfsg.1~svn9323/man/gs.1	2009-01-05 19:50:58.000000000 +0900
@@ -295,18 +295,18 @@
 are typically based in \fBC:\\GS\fR, but may be elsewhere, especially if
 you install Ghostscript with \fBGSview\fR.  Run "\fBgs -h\fR" to find the
 location of Ghostscript documentation on your system, from which you can
-get more details.
+get more details. On a Pisi Linux system they are in \fB/usr\fR.
 .TP
-.B /usr/local/share/ghostscript/#.##/*
+.B /usr/share/ghostscript/#.##/*
 Startup files, utilities, and basic font definitions
 .TP
-.B /usr/local/share/ghostscript/fonts/*
+.B /usr/share/fonts/type1/gsfonts/*
 More font definitions
 .TP
-.B /usr/local/share/ghostscript/#.##/examples/*
+.B /usr/share/doc/ghostscript/examples/*
 Ghostscript demonstration files
 .TP
-.B /usr/local/share/ghostscript/#.##/doc/*
+.B /usr/share/doc/ghostscript/*
 Diverse document files
 .SH "INITIALIZATION FILES"
 When looking for the initialization files "gs_*.ps", the files related to
@@ -330,7 +330,8 @@
 Ghostscript makefile when the executable was built.  When \fBgs\fR is built
 on Unix, \fBGS_LIB_DEFAULT\fR is usually
 "/usr/local/share/ghostscript/#.##:/usr/local/share/ghostscript/fonts"
-where "#.##" represents the Ghostscript version number.
+where "#.##" represents the Ghostscript version number.  They are
+"/usr/share/ghostscript/#.##" on a Debian system.
 .PP
 Each of these (\fBGS_LIB_DEFAULT\fR, \fBGS_LIB\fR, and \fB\-I\fR parameter)
 may be either a single directory or a list of directories separated by


code:
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
    <Source>
        <Name>ghostscript</Name>
        <Homepage>http://www.ghostscript.com</Homepage>
        <Packager>
            <Name>PisiLinux Community</Name>
            <Email>admins@pisilinux.org</Email>
        </Packager>
        <License>GPLv3+</License>
        <IsA>library</IsA>
        A PostScript interpreter and renderer
        <Description>ghostscript is a set of software that provides a PostScript interpreter, a set of C procedures and an interpreter for PDF files. ghostscript is normally used to display PostScript files and to print PostScript files to non-PostScript printers.</Description>
        <Archive sha1sum="9dcd527e9bcc636a6a947251a6195f58dd00006b" type="tarxz">https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs922/ghostscript-9.22.tar.xz</Archive>
        <BuildDependencies>
            <Dependency>cups-devel</Dependency>
            <Dependency>tiff-devel</Dependency>
            <Dependency>zlib-devel</Dependency>
            <Dependency>libX11-devel</Dependency>
            <Dependency>libXext-devel</Dependency>
            <Dependency>libSM-devel</Dependency>
            <Dependency>freetype-devel</Dependency>
            <Dependency>libjpeg-turbo-devel</Dependency>
            <Dependency versionFrom="2.8">lcms2-devel</Dependency>
            <Dependency>libXt-devel</Dependency>
            <Dependency>libpng-devel</Dependency>
            <Dependency>libpaper-devel</Dependency>
            <Dependency>fontconfig-devel</Dependency>
            <Dependency>openjpeg-devel</Dependency>
            <Dependency>gnutls-devel</Dependency>
            <Dependency>dbus-devel</Dependency>
            <Dependency>gtk3-devel</Dependency>
            <Dependency>libidn-devel</Dependency>
            <Dependency>freeglut-devel</Dependency>
        </BuildDependencies>
        <Patches>
            <Patch level="1">fedora/ghostscript-sys-zlib.patch</Patch>

            <Patch level="1">fedora/ghostscript-9.20-run-dvipdf-securely.patch</Patch>
            <Patch level="1">fedora/ghostscript-9.20-runlibfileifexists.patch</Patch>

        </Patches>
    </Source>

    <Package>
        <Name>ghostscript</Name>
        <RuntimeDependencies>
            <Dependency>cups</Dependency>
            <Dependency>zlib</Dependency>
            <Dependency>libidn</Dependency>
            <Dependency>libX11</Dependency>
            <Dependency>libpng</Dependency>
            <Dependency>freetype</Dependency>
            <Dependency>libjpeg-turbo</Dependency>
            <Dependency>tiff</Dependency>
            <Dependency versionFrom="2.8">lcms2</Dependency>
            <Dependency>libXt</Dependency>
            <Dependency>libpaper</Dependency>
            <Dependency>fontconfig</Dependency>

            <Dependency>poppler-data</Dependency>
            <Dependency>gnu-gs-fonts-std</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="executable">/usr/bin</Path>
            <Path fileType="library">/usr/lib</Path>
            <Path fileType="man">/usr/share/man</Path>
            <Path fileType="doc">/usr/share/doc</Path>
            <Path fileType="data">/usr/share/cups</Path>
            <Path fileType="data">/usr/share/ghostscript</Path>
        </Files>

    </Package>

    <Package>
        <Name>ghostscript-docs</Name>
        Documentation for ghostscript
        <Files>
            <Path fileType="doc">/usr/share/doc/ghostscript/html</Path>
            <Path fileType="doc">/usr/share/doc/ghostscript/examples</Path>
        </Files>
    </Package>

    <Package>
        <Name>ghostscript-devel</Name>
        Development files for ghostscript
        <RuntimeDependencies>
            <Dependency release="current">ghostscript</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="executable">/usr/bin/ijs-config</Path>
            <Path fileType="header">/usr/include/ghostscript</Path>
            <Path fileType="header">/usr/include/ijs</Path>
            <Path fileType="data">/usr/lib/pkgconfig</Path>
        </Files>
    </Package>

    <Package>
        <Name>ghostscript-32bit</Name>
        <PartOf>emul32</PartOf>
        32-bit shared libraries for ghostscript
        <BuildType>emul32</BuildType>
        <BuildDependencies>
            <Dependency>libjpeg-turbo-32bit</Dependency>
            <Dependency>zlib-32bit</Dependency>
            <Dependency>tiff-32bit</Dependency>
            <Dependency>lcms2-32bit</Dependency>
            <Dependency>libXt-32bit</Dependency>
            <Dependency>libXext-32bit</Dependency>
            <Dependency>libX11-32bit</Dependency>
            <Dependency>libpng-32bit</Dependency>
            <Dependency>libidn-32bit</Dependency>
            <Dependency>freetype-32bit</Dependency>
            <Dependency>fontconfig-32bit</Dependency>
        </BuildDependencies>
        <RuntimeDependencies>
            <Dependency release="current">ghostscript</Dependency>
            <Dependency>libjpeg-turbo-32bit</Dependency>
            <Dependency>zlib-32bit</Dependency>
            <Dependency>libidn-32bit</Dependency>
            <Dependency>tiff-32bit</Dependency>
            <Dependency>lcms2-32bit</Dependency>
            <Dependency>libXt-32bit</Dependency>
            <Dependency>libX11-32bit</Dependency>
            <Dependency>libpng-32bit</Dependency>
            <Dependency>freetype-32bit</Dependency>
            <Dependency>fontconfig-32bit</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library">/usr/lib32</Path>
        </Files>
    </Package>

    <History>
         <Update release="5">
            <Date>2018-02-12</Date>
            <Version>9.22</Version>
            <Comment>Version Bump</Comment>
            <Name>Mustafa Cinasal</Name>
            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="4">
            <Date>2017-02-05</Date>
            <Version>9.20</Version>
            <Comment>Version Bump</Comment>
            <Name>Pisi Linux Community</Name>
            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="3">
            <Date>2016-06-09</Date>
            <Version>9.19</Version>
            <Comment>Release Bump</Comment>
            <Name>Pisi Linux Community</Name>
            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
            <Date>2016-05-01</Date>
            <Version>9.19</Version>
            <Comment>Version bump.</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="1">
            <Date>2016-01-10</Date>
            <Version>9.15</Version>
            <Comment>First release</Comment>
            <Name>Stefan Gronewold(groni)</Name>
            <Email>groni@pisilinux.org</Email>
        </Update>
    </History>
</PISI>


code:
<?xml version="1.0" ?>
<PISI>
    <Source>
        <Name>ghostscript</Name>
        Bir PostScript yorumlayıcısı ve üreticisi
        <Description xml:lang="tr">ghostscript, PostScript yorumlayıcısı, C kitaplığı ve PDF yorumlayıcısı içeren bir yazılım paketidir. ghostscript, PostScript dosyalarının görüntülenmesi ve PostScript olmayan yazıcılardan PostScript dosyalarının çıktılarının alınması için kullanılmaktadır.</Description>
    </Source>

    <Package>
        <Name>ghostscript-docs</Name>
        ghostscript için çeşitli belgeler
    </Package>

    <Package>
        <Name>ghostscript-devel</Name>
        ghostscript için geliştirme dosyaları
    </Package>
</PISI>


code:
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt

from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get

def install():
    autotools.rawInstall("DESTDIR=%s datadir=/usr/share/" % get.installDIR())

    pisitools.dodoc("COPYING*", "README")


code:
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
    <Source>
        <Name>poppler-data</Name>
        <Homepage>http://poppler.freedesktop.org/</Homepage>
        <Packager>
            <Name>PisiLinux Community</Name>
            <Email>admins@pisilinux.org</Email>
        </Packager>
        <License>GPLv2</License>
        <License>BSD</License>
        <IsA>data</IsA>
        <Summary>Poppler encoding files</Summary>
        <Description>poppler-data consists of encoding files for poppler. When installed, the encoding files enables poppler to correctly render CJK and Cyrillic properly.</Description>
        <Archive sha1sum="f8c7c7f0654ddfba19229be5c1fac9be1fcfdcb1" type="targz">http://poppler.freedesktop.org/poppler-data-0.4.8.tar.gz</Archive>
    </Source>

    <Package>
        <Name>poppler-data</Name>
        <Files>
            <Path fileType="doc">/usr/share/doc</Path>
            <Path fileType="data">/usr/share/poppler</Path>
            <Path fileType="data">/usr/share/pkgconfig</Path>
        </Files>
    </Package>

    <History>
        <Update release="4">
            <Date>2018-02-12</Date>
            <Version>0.4.8</Version>
            <Comment>Version Bump.</Comment>
            <Name>Mustafa Cinasal</Name>
            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="3">
            <Date>2017-02-05</Date>
            <Version>0.4.7</Version>
            <Comment>Rebuild.</Comment>
            <Name>Pisi Linux Community</Name>
            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
            <Date>2016-06-09</Date>
            <Version>0.4.7</Version>
            <Comment>Release Bump</Comment>
            <Name>Pisi Linux Community</Name>
            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
            <Date>2015-03-05</Date>
            <Version>0.4.7</Version>
            <Comment>First release</Comment>
            <Name>Stefan Gronewold(groni)</Name>
            <Email>groni@pisilinux.org</Email>
        </Update>
    </History>
</PISI>


code:
<?xml version="1.0" ?>
<PISI>
    <Source>
        <Name>poppler-data</Name>
        <Summary xml:lang="tr">Poppler kodlama dosyaları</Summary>
        <Description xml:lang="tr">poppler-data, poppler için CJK ve Kiril harflerini düzgünce gösterebilmek için gerekli kodlama dosyalarını içerir.</Description>
    </Source>
</PISI>


code:
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt

from pisi.actionsapi import get
from pisi.actionsapi import shelltools
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools

def setup():
    options = "--disable-static \
               --disable-poppler-qt \
               --disable-gtk-doc-html \
               --disable-zlib \
               --enable-libcurl \
               --disable-gtk-test \
               --disable-poppler-qt4 \
               --enable-cairo-output \
               --enable-xpdf-headers \
               --enable-libjpeg \
               --enable-libopenjpeg=openjpeg1"

    if get.buildTYPE() == "emul32":
        options = " --libdir=/usr/lib32 \
                     --disable-libcurl \
                     --disable-utils \
                     --disable-gtk-test \
                     --disable-poppler-cpp \
                     --disable-libopenjpeg \
                     --disable-poppler-qt5"

    autotools.configure(options)

def build():
    autotools.make()

def install():
    if get.buildTYPE() == "emul32":
        pisitools.insinto("/usr/lib32", "poppler/.libs/libpoppler.so*")
        pisitools.insinto("/usr/lib32", "glib/.libs/libpoppler-glib.so*")
        for f in ["poppler.pc", "poppler-glib.pc"]:
            pisitools.insinto("/usr/lib32/pkgconfig", f)
            pisitools.dosed("%s/usr/lib32/pkgconfig/%s" % (get.installDIR(), f), get.emul32prefixDIR(), get.defaultprefixDIR())
        return
    autotools.rawInstall("DESTDIR=%s" % get.installDIR())

    pisitools.removeDir("/usr/share/gtk-doc")
    pisitools.dodoc("README", "AUTHORS", "ChangeLog", "NEWS", "README-XPDF", "TODO")


code:
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
    <Source>
        <Name>poppler</Name>
        <Homepage>http://poppler.freedesktop.org/</Homepage>
        <Packager>
            <Name>PisiLinux Community</Name>
            <Email>admins@pisilinux.org</Email>
        </Packager>
        <License>GPLv2</License>
        <IsA>library</IsA>
        PDF rendering library
        <Description>poppler is a PDF rendering library based on xpdf.</Description>
        <Archive sha1sum="06a9a4ea986c28df770f16b74a1bd7c87a65d3ee" type="tarxz">http://poppler.freedesktop.org/poppler-0.51.0.tar.xz</Archive>
        <BuildDependencies>
            <Dependency>lcms2-devel</Dependency>
            <Dependency>curl-devel</Dependency>
            <Dependency>cairo-devel</Dependency>
            <Dependency>gobject-introspection-devel</Dependency>
            <Dependency>libjpeg-turbo-devel</Dependency>
            <Dependency>freetype-devel</Dependency>
            <Dependency>libpng-devel</Dependency>
            <Dependency>tiff-devel</Dependency>
            <Dependency>fontconfig-devel</Dependency>
            <Dependency>openjpeg-devel</Dependency>
            <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
        </BuildDependencies>
    </Source>

    <Package>
        <Name>poppler</Name>
        <RuntimeDependencies>
            <Dependency>lcms2</Dependency>
            <Dependency>curl</Dependency>
            <Dependency>freetype</Dependency>
            <Dependency>libgcc</Dependency>
            <Dependency>libjpeg-turbo</Dependency>
            <Dependency>libpng</Dependency>
            <Dependency>tiff</Dependency>
            <Dependency>openjpeg</Dependency>
            <Dependency>fontconfig</Dependency>
            <Dependency>poppler-data</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library">/usr/lib</Path>
            <Path fileType="doc">/usr/share/doc</Path>
        </Files>
    </Package>

    <Package>
        <Name>poppler-utils</Name>
        Command line utilities for converting PDF files
        <RuntimeDependencies>
            <Dependency release="current">poppler</Dependency>
            <Dependency>cairo</Dependency>
            <Dependency>lcms2</Dependency>
            <Dependency>freetype</Dependency>
            <Dependency>libgcc</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="executable">/usr/bin</Path>
            <Path fileType="man">/usr/share/man/man1</Path>
        </Files>
    </Package>

    <Package>
        <Name>poppler-qt5</Name>
        Qt wrapper for poppler
        <RuntimeDependencies>
            <Dependency>qt5-base</Dependency>
            <Dependency>libgcc</Dependency>
            <Dependency release="current">poppler</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library">/usr/lib/libpoppler-qt5.so*</Path>
        </Files>
    </Package>

    <Package>
        <Name>poppler-qt5-devel</Name>
        Development files for poppler-qt
        <RuntimeDependencies>
            <Dependency release="current">poppler-qt5</Dependency>
            <Dependency release="current">poppler-devel</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="data">/usr/lib/pkgconfig/poppler-qt5.pc</Path>
        </Files>
     </Package>

    <Package>
        <Name>poppler-cpp</Name>
        Pure C++ wrapper for poppler
        <RuntimeDependencies>
            <Dependency>libgcc</Dependency>
            <Dependency release="current">poppler</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library">/usr/lib/libpoppler-cpp.so*</Path>
        </Files>
    </Package>

    <Package>
        <Name>poppler-cpp-devel</Name>
        Development files for poppler-cpp
        <RuntimeDependencies>
            <Dependency release="current">poppler-cpp</Dependency>
            <Dependency release="current">poppler-devel</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library">/usr/lib/pkgconfig/poppler-cpp.pc</Path>
        </Files>
    </Package>

    <Package>
        <Name>poppler-glib</Name>
        Glib wrapper for poppler
        <RuntimeDependencies>
            <Dependency>libgcc</Dependency>
            <Dependency>cairo</Dependency>
            <Dependency>glib2</Dependency>
            <Dependency>freetype</Dependency>
            <Dependency release="current">poppler</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library">/usr/lib/libpoppler-glib.so*</Path>
            <Path fileType="library">/usr/lib/girepository-1.0/Poppler-0.18.typelib</Path>
        </Files>
    </Package>

    <Package>
        <Name>poppler-glib-devel</Name>
        Development files for poppler-glib
        <RuntimeDependencies>
            <Dependency>gtk2-devel</Dependency>
            <Dependency>cairo-devel</Dependency>
            <Dependency release="current">poppler-glib</Dependency>
            <Dependency release="current">poppler-devel</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library">/usr/lib/pkgconfig/poppler-glib.pc</Path>
            <Path fileType="library">/usr/lib/pkgconfig/poppler-cairo.pc</Path>
            <Path fileType="data">/usr/share/gir-1.0/Poppler-0.18.gir</Path>
            <Path fileType="data">/usr/lib32/pkgconfig/poppler-glib.pc</Path>
        </Files>
    </Package>

    <Package>
        <Name>poppler-devel</Name>
        Development files for poppler
        <RuntimeDependencies>
            <Dependency release="current">poppler</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="header">/usr/include</Path>
            <Path fileType="data">/usr/lib/pkgconfig</Path>
            <Path fileType="data">/usr/lib32/pkgconfig/poppler.pc</Path>
        </Files>
    </Package>

    <Package>
        <Name>poppler-32bit</Name>
        <PartOf>emul32</PartOf>
        32-bit shared libraries for poppler
        <BuildType>emul32</BuildType>
        <BuildDependencies>
            <Dependency>lcms2-32bit</Dependency>
            <Dependency>libjpeg-turbo-32bit</Dependency>
            <Dependency>libpng-32bit</Dependency>
            <Dependency>tiff-32bit</Dependency>
            <Dependency>freetype-32bit</Dependency>
            <Dependency>fontconfig-32bit</Dependency>
        </BuildDependencies>
        <RuntimeDependencies>
            <Dependency release="current">poppler</Dependency>
            <Dependency>libgcc</Dependency>
            <Dependency>lcms2-32bit</Dependency>
            <Dependency>libjpeg-turbo-32bit</Dependency>
            <Dependency>libpng-32bit</Dependency>
            <Dependency>openjpeg-32bit</Dependency>
            <Dependency>tiff-32bit</Dependency>
            <Dependency>freetype-32bit</Dependency>
            <Dependency>fontconfig-32bit</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library">/usr/lib32/libpoppler.so*</Path>
        </Files>
    </Package>

    <Package>
        <Name>poppler-glib-32bit</Name>
        <PartOf>emul32</PartOf>
        32-bit shared libraries for poppler-glib
        <BuildType>emul32</BuildType>
        <BuildDependencies>
            <Dependency>glib2-32bit</Dependency>
            <Dependency>cairo-32bit</Dependency>
            <Dependency>freetype-32bit</Dependency>
        </BuildDependencies>
        <RuntimeDependencies>
            <Dependency release="current">poppler-32bit</Dependency>
            <Dependency>libgcc</Dependency>
            <Dependency>glib2-32bit</Dependency>
            <Dependency>cairo-32bit</Dependency>
            <Dependency>freetype-32bit</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library">/usr/lib32/libpoppler-glib.so*</Path>
        </Files>
    </Package>

    <History>
        <Update release="4">
            <Date>2017-02-21</Date>
            <Version>0.51.0</Version>
            <Comment>Version Bump.</Comment>
            <Name>Ayhan Yalçınsoy</Name>
            <Email>ayhanyalcinsoy@pisilinux.org</Email>
        </Update>
        <Update release="3">
            <Date>2016-06-09</Date>
            <Version>0.34.0</Version>
            <Comment>Release Bump</Comment>
            <Name>Pisi Linux Community</Name>
            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
            <Date>2016-05-25</Date>
            <Version>0.34.0</Version>
            <Comment>Release bump</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="1">
            <Date>2016-05-01</Date>
            <Version>0.34.0</Version>
            <Comment>First release</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
</PISI>


code:
<?xml version="1.0" ?>
<PISI>
    <Source>
        <Name>poppler</Name>
        Xpdf koduna dayanan bir PDF kitaplığı
        Biblioteka renderująca PDF
        <Description xml:lang="tr">Poppler, xpdf koduna dayanan bir PDF hazırlama kitaplığıdır.</Description>
        <Description xml:lang="fr">Poppler est une librairie de rendu PDF basée sur le code source de xpdf-3.0.</Description>
        <Description xml:lang="pl">Wspólna biblioteka renderująca PDF do integrowania oglądania PDF w aplikacjach desktopowych (oparta na kodzie xpdf-3.0).</Description>
    </Source>

    <Package>
        <Name>poppler-utils</Name>
        PDF dönüşüm araçları
    </Package>

    <Package>
        <Name>poppler-devel</Name>
        poppler için geliştirme dosyaları
    </Package>

    <Package>
        <Name>poppler-cpp-devel</Name>
        poppler-cpp için geliştirme dosyaları
    </Package>

    <Package>
        <Name>poppler-glib-devel</Name>
        poppler-glib için geliştirme dosyaları
    </Package>

    <Package>
        <Name>poppler-qt</Name>
        Poppler için Qt bağlayıcısı
    </Package>

    <Package>
        <Name>poppler-qt-devel</Name>
        poppler-qt için geliştirme dosyaları
    </Package>

    <Package>
        <Name>poppler-cpp</Name>
        Poppler için C++ bağlayıcısı
    </Package>

    <Package>
        <Name>poppler-glib</Name>
        Poppler için Glib bağlayıcısı
    </Package>
</PISI>


code:
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt

from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get

def setup():
    autotools.autoreconf()
    autotools.configure("--disable-static \
                         --sysconfdir=/etc/aspell \
                         --enable-docdir=/usr/share/doc/%s" % get.srcNAME())

    pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ")

def build():
    autotools.make()

def install():
    autotools.rawInstall("DESTDIR=%s" % get.installDIR())

    # install ispell/spell compatibility scripts
    pisitools.insinto("/usr/bin","scripts/ispell","ispell-aspell")
    pisitools.insinto("/usr/bin","scripts/spell", "spell-aspell")

    pisitools.dodoc("README*", "TODO")


code:
diff -up aspell-0.60.6.1/manual/Makefile.in.iinfo aspell-0.60.6.1/manual/Makefile.in
--- aspell-0.60.6.1/manual/Makefile.in.iinfo	2011-07-04 10:58:49.000000000 +0200
+++ aspell-0.60.6.1/manual/Makefile.in	2011-08-15 16:29:40.999718535 +0200
@@ -607,16 +607,16 @@ install-info-am: $(INFO_DEPS)
 	    else : ; fi; \
 	  done; \
 	done
-	@$(POST_INSTALL)
-	@if (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-	  list='$(INFO_DEPS)'; \
-	  for file in $$list; do \
-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
-	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
-	  done; \
-	else : ; fi
+#	@$(POST_INSTALL)
+#	@if (install-info --version && \
+#	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+#	  list='$(INFO_DEPS)'; \
+#	  for file in $$list; do \
+#	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
+#	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
+#	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
+#	  done; \
+#	else : ; fi
 install-man: install-man1

 install-pdf: install-pdf-am


code:
diff -up aspell-0.60.6.1/configure.fc aspell-0.60.6.1/configure
--- aspell-0.60.6.1/configure.fc	2011-07-04 10:58:50.000000000 +0200
+++ aspell-0.60.6.1/configure	2011-08-16 11:28:58.626771599 +0200
@@ -839,6 +839,7 @@ MAINTAINER_MODE_FALSE
 MAINT
 pkgdocdir
 pkgdatadir
+pkgdatadir2
 pkglibdir
 CXX
 CXXFLAGS
@@ -2634,18 +2635,21 @@ pkgdatadir=undef
 # Check whether --enable-pkgdatadir was given.
 if test "${enable_pkgdatadir+set}" = set; then
   enableval=$enable_pkgdatadir; pkgdatadir=$enable_pkgdatadir
+  pkgdatadir2=$enable_pkgdatadir
 fi

 # Check whether --enable-pkgdata-dir was given.
 if test "${enable_pkgdata_dir+set}" = set; then
   enableval=$enable_pkgdata_dir; pkgdatadir=$enable_dict_dir
+  pkgdatadir2=$enable_dict_dir
 fi

 if test "$pkgdatadir" = "undef"
 then
   pkgdatadir=\${libdir}/aspell-0.60
+  pkgdatadir2=${exec_prefix}/lib/aspell-0.60:${exec_prefix}/lib64/aspell-0.60
 fi

@@ -20119,6 +20123,7 @@ MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_F
 MAINT!$MAINT$ac_delim
 pkgdocdir!$pkgdocdir$ac_delim
 pkgdatadir!$pkgdatadir$ac_delim
+pkgdatadir2!$pkgdatadir2$ac_delim
 pkglibdir!$pkglibdir$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
@@ -20142,7 +20147,7 @@ ac_ct_CC!$ac_ct_CC$ac_delim
 CCDEPMODE!$CCDEPMODE$ac_delim
 _ACEOF

-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -up aspell-0.60.6.1/Makefile.in.fc aspell-0.60.6.1/Makefile.in
--- aspell-0.60.6.1/Makefile.in.fc	2011-07-04 10:58:49.000000000 +0200
+++ aspell-0.60.6.1/Makefile.in	2011-08-16 11:20:09.030887258 +0200
@@ -344,6 +344,7 @@ distcleancheck_listfiles = find . -type

 # These are needed due to a bug in Automake
 pkgdatadir = @pkgdatadir@
+pkgdatadir2 = @pkgdatadir2@
 pkglibdir = @pkglibdir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -1932,7 +1933,7 @@ gen/dirs.h: gen/mk-dirs_h.pl
 	cd gen; perl mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir}  ${sysconfdir} >  dirs.h

 scripts/run-with-aspell: scripts/run-with-aspell.create
-	sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir} > scripts/run-with-aspell
+	sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir2} > scripts/run-with-aspell
 	chmod 755 scripts/run-with-aspell
 @PSPELL_COMPATIBILITY_TRUE@scripts/pspell-config: scripts/mkconfig
 @PSPELL_COMPATIBILITY_TRUE@	sh ${srcdir}/scripts/mkconfig ${VERSION} ${datadir} ${pkgdatadir}


code:
diff -up aspell-0.60.6.1/configure.mlib aspell-0.60.6.1/configure
--- aspell-0.60.6.1/configure.mlib	2011-08-16 11:40:48.000000000 +0200
+++ aspell-0.60.6.1/configure	2011-08-16 11:41:44.013663519 +0200
@@ -18989,7 +18989,7 @@ rm -f core conftest.err conftest.$ac_obj
 #                                                                 #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

-ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile"
+ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile aspell.pc scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile"

 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -19985,7 +19985,7 @@ do
     "modules/filter/Makefile") CONFIG_FILES="$CONFIG_FILES modules/filter/Makefile" ;;
     "myspell/Makefile") CONFIG_FILES="$CONFIG_FILES myspell/Makefile" ;;
     "lib5/Makefile") CONFIG_FILES="$CONFIG_FILES lib5/Makefile" ;;
-
+    "aspell.pc" ) CONFIG_FILES="$CONFIG_FILES aspell.pc" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
diff -up aspell-0.60.6.1/Makefile.in.mlib aspell-0.60.6.1/Makefile.in
--- aspell-0.60.6.1/Makefile.in.mlib	2011-08-16 11:20:09.000000000 +0200
+++ aspell-0.60.6.1/Makefile.in	2011-08-16 11:46:30.643236786 +0200
@@ -816,6 +816,8 @@ clean-filterLTLIBRARIES:
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
+	mkdir -p $(libdir)/pkgconfig; \
+	cp aspell.pc $(libdir)/pkgconfig/aspell.pc; \
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
diff -up aspell-0.60.6.1/scripts/mkconfig.mlib aspell-0.60.6.1/scripts/mkconfig
--- aspell-0.60.6.1/scripts/mkconfig.mlib	2004-01-03 13:06:24.000000000 +0100
+++ aspell-0.60.6.1/scripts/mkconfig	2011-08-16 11:42:46.810519200 +0200
@@ -15,7 +15,7 @@ case \$1 in
   echo "$2"
   ;;
 --pkgdatadir | pkgdatadir)
-  echo "$3"
+  pkg-config aspell --variable=pkgdatadir
   ;;
 *)
   echo "usage: pspell-config version|datadir|pkgdatadir"
--- /dev/null	2007-01-02 09:09:01.616000852 +0100
+++ aspell-0.60.6.1/aspell.pc.in	2007-01-02 14:59:04.000000000 +0100
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+pkgdatadir=@pkgdatadir@
+
+Name: Aspell
+Description: A spelling checker.
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -laspell
+Cflags: -I${includedir}


code:
diff -up aspell-0.60.6/manual/aspell.1.pom aspell-0.60.6/manual/aspell.1
--- aspell-0.60.6/manual/aspell.1.pom	2006-12-19 11:55:08.000000000 +0100
+++ aspell-0.60.6/manual/aspell.1	2010-08-17 09:42:14.000000000 +0200
@@ -328,7 +328,6 @@ are also allowed.  The \fI/etc/aspell.co
 how to set these options and the Aspell Manual has more detailed info.
 .SH SEE ALSO
 .PP
-.BR aspell\-import (1),
 .BR prezip\-bin (1),
 .BR run\-with\-aspell (1),
 .BR word\-list\-compress (1)
diff -up aspell-0.60.6/manual/prezip-bin.1.pom aspell-0.60.6/manual/prezip-bin.1
--- aspell-0.60.6/manual/prezip-bin.1.pom	2005-10-21 14:18:23.000000000 +0200
+++ aspell-0.60.6/manual/prezip-bin.1	2010-08-17 09:42:21.000000000 +0200
@@ -99,7 +99,6 @@ the output file is not complete.
 .SH SEE ALSO
 .PP
 .BR aspell (1),
-.BR aspell\-import (1),
 .BR run\-with\-aspell (1),
 .BR word\-list\-compress (1)
 .PP
diff -up aspell-0.60.6/manual/run-with-aspell.1.pom aspell-0.60.6/manual/run-with-aspell.1
--- aspell-0.60.6/manual/run-with-aspell.1.pom	2004-03-05 05:05:02.000000000 +0100
+++ aspell-0.60.6/manual/run-with-aspell.1	2010-08-17 09:42:28.000000000 +0200
@@ -28,7 +28,6 @@ such as ispell's own scripts.
 .SH SEE ALSO
 .PP
 .BR aspell (1),
-.BR aspell\-import (1),
 .BR word\-list\-compress (1)
 .PP
 Aspell is fully documented in its Texinfo manual.  See the
diff -up aspell-0.60.6/manual/word-list-compress.1.pom aspell-0.60.6/manual/word-list-compress.1
--- aspell-0.60.6/manual/word-list-compress.1.pom	2005-10-21 14:18:23.000000000 +0200
+++ aspell-0.60.6/manual/word-list-compress.1	2010-08-17 09:42:35.000000000 +0200
@@ -80,7 +80,6 @@ be written to.
 .SH SEE ALSO
 .PP
 .BR aspell (1),
-.BR aspell\-import (1),
 .BR prezip\-bin (1),
 .BR run\-with\-aspell (1)
 .PP


code:
diff -up aspell-0.60.6/common/convert.cpp.zero aspell-0.60.6/common/convert.cpp
--- aspell-0.60.6/common/convert.cpp.zero	2007-12-03 07:55:45.000000000 +0100
+++ aspell-0.60.6/common/convert.cpp	2008-09-01 12:04:39.000000000 +0200
@@ -813,6 +813,7 @@ namespace acommon {
   {
     ToUniLookup lookup;
     void decode(const char * in, int size, FilterCharVector & out) const {
+      if (size == 0) return; // if size == 0 then while loop cause SIGSEGV
       const char * stop = in + size; // this is OK even if size == -1
       while (*in && in != stop) {
         out.append(from_utf8(in, stop));


code:
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
    <Source>
        <Name>aspell</Name>
        <Homepage>http://aspell.net/</Homepage>
        <Packager>
            <Name>PisiLinux Community</Name>
            <Email>admins@pisilinux.org</Email>
        </Packager>
        <License>LGPLv2</License>
        <IsA>app:console</IsA>
        A multi-language spellchecker
        <Description>Aspell is a spellchecker that has dictionaries for more than one language and is written as a replacement to ispell.</Description>
        <Archive sha1sum="ff1190db8de279f950c242c6f4c5d5cdc2cbdc49" type="targz">mirrors://gnu/aspell/aspell-0.60.6.1.tar.gz</Archive>
        <Patches>
            <Patch level="1">fedora/aspell-0.60.3-install_info.patch</Patch>
            <Patch level="1">fedora/aspell-0.60.5-fileconflict.patch</Patch>
            <Patch level="1">fedora/aspell-0.60.5-pspell_conf.patch</Patch>
            <Patch level="1">fedora/aspell-0.60.6-mp.patch</Patch>
            <Patch level="1">fedora/aspell-0.60.6-zero.patch</Patch>
        </Patches>
    </Source>

    <Package>
        <Name>aspell</Name>
        <RuntimeDependencies>
            <Dependency>libgcc</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="executable">/usr/bin</Path>
            <Path fileType="library">/usr/lib</Path>
            <Path fileType="data">/usr/share/aspell</Path>
            <Path fileType="doc">/usr/share/doc</Path>
            <Path fileType="man">/usr/share/man</Path>
            <Path fileType="info">/usr/share/info</Path>
            <Path fileType="localedata">/usr/share/locale</Path>
        </Files>
    </Package>

    <Package>
        <Name>aspell-devel</Name>
        Development files for aspell
        <RuntimeDependencies>
            <Dependency release="current">aspell</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="header">/usr/include</Path>
            <Path fileType="info">/usr/share/info/aspell-dev.info</Path>
        </Files>
    </Package>

    <History>
        <Update release="3">
            <Date>2017-02-28</Date>
            <Version>0.60.6.1</Version>
            <Comment>Rebuild for new toolchain.</Comment>
            <Name>Pisi Linux Community</Name>
            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
            <Date>2016-06-09</Date>
            <Version>0.60.6.1</Version>
            <Comment>Release Bump</Comment>
            <Name>Pisi Linux Community</Name>
            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
            <Date>2014-05-25</Date>
            <Version>0.60.6.1</Version>
            <Comment>First release</Comment>
            <Name>Yusuf Aydemir</Name>
            <Email>yusuf.aydemir@pisilinux.org</Email>
        </Update>
    </History>
</PISI>


code:
<?xml version="1.0" ?>
<PISI>
    <Source>
        <Name>aspell</Name>
        Bir yazım kontrol aracı
        <Description xml:lang="tr">GNU Aspell birden fazla dil destekleyen bir yazım kontrol aracıdır.</Description>
        <Description xml:lang="fr">Ce programme rend possible de vérifier facilement les documents en UTF-8 sans avoir à utiliser un dictionnaire spécial.</Description>
    </Source>

    <Package>
        <Name>aspell-devel</Name>
        aspell için geliştirme dosyaları
    </Package>
</PISI>


code:
<PISI>
    <Name>office.spellcheck</Name>
</PISI>


code:
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt

from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get

def setup():
    autotools.autoreconf("-fvi")
    autotools.configure("--disable-static \
                         --enable-aspell \
                         --enable-zemberek \
                         --enable-myspell \
                         --with-myspell-dir=/usr/share/hunspell \
                         --disable-ispell \
                         --disable-uspell \
                         --disable-hspell")

def build():
    autotools.make()

def install():
    autotools.rawInstall("DESTDIR=%s" % get.installDIR())

    pisitools.dodoc("AUTHORS", "NEWS", "README", "TODO", "HACKING", "MAINTAINERS")