# HG changeset patch
# User April Chin <april.chin@oracle.com>
# Date 1413830834 25200
# Node ID ccfa5fe625dbb93275a7ab447a980cd18f9c7086
# Parent  110b254c69b8566d9410c3a1d77ff21a2fc2b285
15816774 SUNBT7199282 new gpatch finds problems in some patches

diff -r 110b254c69b8 -r ccfa5fe625db components/ghostscript/patches/11-7041017.patch
--- a/components/ghostscript/patches/11-7041017.patch	Fri Oct 17 12:09:53 2014 -0700
+++ b/components/ghostscript/patches/11-7041017.patch	Mon Oct 20 11:47:14 2014 -0700
@@ -1,5 +1,5 @@
---- ghostscript-9.00/configure.ac.orig	Tue Apr 26 00:22:10 2011
-+++ ghostscript-9.00/configure.ac	Tue Apr 26 00:22:31 2011
+--- ghostscript-9.00/base/configure.ac.orig	Tue Apr 26 00:22:10 2011
++++ ghostscript-9.00/base/configure.ac	Tue Apr 26 00:22:31 2011
 @@ -984,7 +984,7 @@
  IBM_DEVS="ibmpro jetp3852"
  OKI_DEVS="oki182 okiibm oki4w"
diff -r 110b254c69b8 -r ccfa5fe625db components/python/python26/patches/Python26-01-solaris-lib-dirs.patch
--- a/components/python/python26/patches/Python26-01-solaris-lib-dirs.patch	Fri Oct 17 12:09:53 2014 -0700
+++ b/components/python/python26/patches/Python26-01-solaris-lib-dirs.patch	Mon Oct 20 11:47:14 2014 -0700
@@ -13,7 +13,6 @@
  #include "structmember.h"
  #include "pythread.h"
 diff --git Python-2.6.4/setup.py Python-2.6.4/setup.py
-new file mode 100644
 --- Python-2.6.4/setup.py
 +++ Python-2.6.4/setup.py
 @@ -355,10 +355,10 @@
diff -r 110b254c69b8 -r ccfa5fe625db components/python/python26/patches/Python26-09-ucred.patch
--- a/components/python/python26/patches/Python26-09-ucred.patch	Fri Oct 17 12:09:53 2014 -0700
+++ b/components/python/python26/patches/Python26-09-ucred.patch	Mon Oct 20 11:47:14 2014 -0700
@@ -2375,7 +2375,6 @@
 +if __name__ == '__main__':
 +    main()
 
-diff --git Python-2.6.4/Lib/test/ucredtext.py Python-2.6.4/Lib/test/ucredtext.py
 new file mode 100644
 --- /dev/null	2011-02-12 03:14:16.000000000 -0600
 +++ Python-2.6.4/Lib/test/ucredtest.py	2011-01-20 13:52:42.945657919 -0600
diff -r 110b254c69b8 -r ccfa5fe625db components/python/python26/patches/Python26-16-privrbac.patch
--- a/components/python/python26/patches/Python26-16-privrbac.patch	Fri Oct 17 12:09:53 2014 -0700
+++ b/components/python/python26/patches/Python26-16-privrbac.patch	Mon Oct 20 11:47:14 2014 -0700
@@ -1284,7 +1284,6 @@
          # Thomas Heller's _ctypes module
          self.detect_ctypes(inc_dirs, lib_dirs)
  
-diff --git Python-2.6.4/Lib/test/privrbac.py Python-2.6.4/Lib/test/privrbac.py
 new file mode 100644
 --- /dev/null	2011-02-12 03:13:57.000000000 -0600
 +++ Python-2.6.4/Lib/test/privrbactest.py	2011-01-20 13:52:42.862305331 -0600