Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/ghostscript/patches/6886857,7068679.patch
author sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
Thu, 28 Jul 2011 22:39:02 -0700
changeset 440 e5f5d16a151f
child 7819 b1bca76ec901
permissions -rw-r--r--
7068679 Ghostscript should use system shared libpng and zlib 6886857 statically linked libjpeg in libgs.so causes crash in evince
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
440
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     1
 
--- ghostscript-9.00/base/ugcclib.mak.orig	Tue Jul 26 01:47:52 2011
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     2
 
+++ ghostscript-9.00/base/ugcclib.mak	Tue Jul 26 01:55:16 2011
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     3
 
@@ -42,7 +42,7 @@
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     4
 
 PGRELDIR=.
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     5
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     6
 
 JSRCDIR=jpeg
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     7
 
-SHARE_JPEG=0
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     8
 
+SHARE_JPEG=1
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     9
 
 JPEG_NAME=jpeg
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    10
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    11
 
 PNGSRCDIR=libpng
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    12
 
--- ghostscript-9.00/base/unix-gcc.mak.orig	Tue Jul 26 01:48:14 2011
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    13
 
+++ ghostscript-9.00/base/unix-gcc.mak	Tue Jul 26 01:56:23 2011
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    14
 
@@ -138,7 +138,7 @@
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    15
 
 # some older JPEG streams that violate the standard. If the JPEG
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    16
 
 # library built from local sources, the patch will be applied.
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    17
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    18
 
-SHARE_JPEG=0
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    19
 
+SHARE_JPEG=1
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    20
 
 JPEG_NAME=jpeg
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    21
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    22
 
 # Define the directory where the PNG library sources are stored,
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    23
 
@@ -152,7 +152,7 @@
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    24
 
 # what its name is.
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    25
 
 # See gs.mak and Make.htm for more information.
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    26
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    27
 
-SHARE_LIBPNG=0
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    28
 
+SHARE_LIBPNG=1
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    29
 
 LIBPNG_NAME=png
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    30
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    31
 
 # Define whether to use a shared version of libtiff and where
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    32
 
@@ -173,7 +173,7 @@
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    33
 
 # what its name is (usually libz, but sometimes libgz).
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    34
 
 # See gs.mak and Make.htm for more information.
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    35
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    36
 
-SHARE_ZLIB=0
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    37
 
+SHARE_ZLIB=1
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    38
 
 #ZLIB_NAME=gz
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    39
 
 ZLIB_NAME=z
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    40
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    41
 
--- ghostscript-9.00/base/unixansi.mak.orig	Tue Jul 26 01:48:19 2011
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    42
 
+++ ghostscript-9.00/base/unixansi.mak	Tue Jul 26 01:57:00 2011
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    43
 
@@ -123,7 +123,7 @@
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    44
 
 # some older JPEG streams that violate the standard. If the JPEG
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    45
 
 # library built from local sources, the patch will be applied.
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    46
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    47
 
-SHARE_JPEG=0
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    48
 
+SHARE_JPEG=1
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    49
 
 JPEG_NAME=jpeg
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    50
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    51
 
 # Define the directory where the PNG library sources are stored,
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    52
 
@@ -137,7 +137,7 @@
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    53
 
 # what its name is.
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    54
 
 # See gs.mak and Make.htm for more information.
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    55
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    56
 
-SHARE_LIBPNG=0
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    57
 
+SHARE_LIBPNG=1
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    58
 
 LIBPNG_NAME=png
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    59
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    60
 
 # Define whether to use a shared version of libtiff and where
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    61
 
@@ -158,7 +158,7 @@
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    62
 
 # what its name is (usually libz, but sometimes libgz).
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    63
 
 # See gs.mak and Make.htm for more information.
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    64
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    65
 
-SHARE_ZLIB=0
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    66
 
+SHARE_ZLIB=1
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    67
 
 #ZLIB_NAME=gz
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    68
 
 ZLIB_NAME=z
e5f5d16a151f 7068679 Ghostscript should use system shared libpng and zlib
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    69
upstream/oracle/userland-gate