# HG changeset patch # User Mike Sullivan # Date 1348162620 25200 # Node ID 57467415833ab73c6dee85a59be51513b876e953 # Parent f34e7c7efa388711fd9403d59c467725a7289874 7199282 new gpatch finds problems in some patches diff -r f34e7c7efa38 -r 57467415833a components/ghostscript/patches/11-7041017.patch --- a/components/ghostscript/patches/11-7041017.patch Thu Sep 20 09:39:44 2012 -0700 +++ b/components/ghostscript/patches/11-7041017.patch Thu Sep 20 10:37:00 2012 -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 f34e7c7efa38 -r 57467415833a components/python/python26/patches/Python26-01-solaris-lib-dirs.patch --- a/components/python/python26/patches/Python26-01-solaris-lib-dirs.patch Thu Sep 20 09:39:44 2012 -0700 +++ b/components/python/python26/patches/Python26-01-solaris-lib-dirs.patch Thu Sep 20 10:37:00 2012 -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 f34e7c7efa38 -r 57467415833a components/python/python26/patches/Python26-09-ucred.patch --- a/components/python/python26/patches/Python26-09-ucred.patch Thu Sep 20 09:39:44 2012 -0700 +++ b/components/python/python26/patches/Python26-09-ucred.patch Thu Sep 20 10:37:00 2012 -0700 @@ -2375,7 +2375,7 @@ +if __name__ == '__main__': + main() -diff --git Python-2.6.4/Lib/test/ucredtext.py Python-2.6.4/Lib/test/ucredtext.py +diff --git Python-2.6.4/Lib/test/ucredtest.py Python-2.6.4/Lib/test/ucredtest.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 f34e7c7efa38 -r 57467415833a components/python/python26/patches/Python26-16-privrbac.patch --- a/components/python/python26/patches/Python26-16-privrbac.patch Thu Sep 20 09:39:44 2012 -0700 +++ b/components/python/python26/patches/Python26-16-privrbac.patch Thu Sep 20 10:37:00 2012 -0700 @@ -1284,7 +1284,7 @@ # 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 +diff --git Python-2.6.4/Lib/test/privrbactest.py Python-2.6.4/Lib/test/privrbactest.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 diff -r f34e7c7efa38 -r 57467415833a components/python/python27/patches/06-ucred.patch --- a/components/python/python27/patches/06-ucred.patch Thu Sep 20 09:39:44 2012 -0700 +++ b/components/python/python27/patches/06-ucred.patch Thu Sep 20 10:37:00 2012 -0700 @@ -410,7 +410,7 @@ # Thomas Heller's _ctypes module self.detect_ctypes(inc_dirs, lib_dirs) -diff --git Python-2.6.4/Lib/test/ucredtext.py Python-2.6.4/Lib/test/ucredtext.py +diff --git Python-2.6.4/Lib/test/ucredtest.py Python-2.6.4/Lib/test/ucredtest.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 f34e7c7efa38 -r 57467415833a components/python/python27/patches/09-rbac.patch --- a/components/python/python27/patches/09-rbac.patch Thu Sep 20 09:39:44 2012 -0700 +++ b/components/python/python27/patches/09-rbac.patch Thu Sep 20 10:37:00 2012 -0700 @@ -1278,7 +1278,7 @@ # 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 +diff --git Python-2.6.4/Lib/test/privrbactest.py Python-2.6.4/Lib/test/privrbactest.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