Author: hdu Date: Thu Aug 15 11:37:39 2013 New Revision: 1514238 URL: http://svn.apache.org/r1514238 Log: #i122829# re-enable python ctypes for Windows build
Patch by: Tsutomu Uchino <[email protected]> Modified: openoffice/branches/AOO401/ (props changed) openoffice/branches/AOO401/main/cui/ (props changed) openoffice/branches/AOO401/main/drawinglayer/ (props changed) openoffice/branches/AOO401/main/python/python-2.7.5-pcbuild.patch openoffice/branches/AOO401/main/vcl/unx/gtk/window/gtkframe.cxx (props changed) openoffice/branches/AOO401/test/ (props changed) openoffice/branches/AOO401/test/testcommon/source/org/openoffice/test/vcl/ (props changed) Propchange: openoffice/branches/AOO401/ ------------------------------------------------------------------------------ Merged /openoffice/trunk:r1513112 Propchange: openoffice/branches/AOO401/main/cui/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/main/cui:r1513112 Propchange: openoffice/branches/AOO401/main/drawinglayer/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/main/drawinglayer:r1513112 Modified: openoffice/branches/AOO401/main/python/python-2.7.5-pcbuild.patch URL: http://svn.apache.org/viewvc/openoffice/branches/AOO401/main/python/python-2.7.5-pcbuild.patch?rev=1514238&r1=1514237&r2=1514238&view=diff ============================================================================== --- openoffice/branches/AOO401/main/python/python-2.7.5-pcbuild.patch (original) +++ openoffice/branches/AOO401/main/python/python-2.7.5-pcbuild.patch Thu Aug 15 11:37:39 2013 @@ -1062,7 +1062,7 @@ diff -u misc/Python-2.7.5/PCbuild/make_v diff -u misc/Python-2.7.5/PCbuild/pcbuild.sln misc/build/Python-2.7.5/PCbuild/pcbuild.sln --- misc/Python-2.7.5/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500 -@@ -38,17 +38,17 @@ +@@ -38,12 +38,12 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject @@ -1072,23 +1072,13 @@ diff -u misc/Python-2.7.5/PCbuild/pcbuil - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection -EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" +# ProjectSection(ProjectDependencies) = postProject +# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} +# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +# EndProjectSection +#EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}" -+# ProjectSection(ProjectDependencies) = postProject -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}" + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} @@ -69,12 +69,12 @@ Propchange: openoffice/branches/AOO401/main/vcl/unx/gtk/window/gtkframe.cxx ------------------------------------------------------------------------------ Merged /openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx:r1513112 Propchange: openoffice/branches/AOO401/test/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test:r1513112 Propchange: openoffice/branches/AOO401/test/testcommon/source/org/openoffice/test/vcl/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1513112
