?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
...originally probably replaced an en-dash (thanks Roman Eisele).
[LibreOffice.git] / python / Python-2.6.1.patch
blobac70bab33f70d4b626f5dc641541d99db5f150c8
1 --- misc/Python-2.6.1/Include/pyport.h 2008-06-11 09:41:16.000000000 +0200
2 +++ misc/build/Python-2.6.1/Include/pyport.h 2011-06-06 17:31:17.000000000 +0200
3 @@ -449,11 +449,6 @@
4 in platform-specific #ifdefs.
5 **************************************************************************/
6
7 -#ifdef SOLARIS
8 -/* Unchecked */
9 -extern int gethostname(char *, int);
10 -#endif
11 -
12 #ifdef __BEOS__
13 /* Unchecked */
14 /* It's in the libs, but not the headers... - [cjh] */
15 --- misc/Python-2.6.1/PCbuild/pcbuild.sln 2008-06-27 04:30:34.000000000 +0200
16 +++ misc/build/Python-2.6.1/PCbuild/pcbuild.sln 2011-06-06 17:31:17.000000000 +0200
17 @@ -15,16 +15,6 @@
18 {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD}
19 EndProjectSection
20 EndProject
21 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
22 - ProjectSection(ProjectDependencies) = postProject
23 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
24 - EndProjectSection
25 -EndProject
26 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"
27 - ProjectSection(ProjectDependencies) = postProject
28 - {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
29 - EndProjectSection
30 -EndProject
31 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
32 EndProject
33 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}"
34 @@ -38,12 +28,6 @@
35 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
36 EndProjectSection
37 EndProject
38 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
39 - ProjectSection(ProjectDependencies) = postProject
40 - {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
41 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
42 - EndProjectSection
43 -EndProject
44 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
45 ProjectSection(ProjectDependencies) = postProject
46 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
47 @@ -69,12 +53,6 @@
48 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
49 EndProjectSection
50 EndProject
51 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
52 - ProjectSection(ProjectDependencies) = postProject
53 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
54 - {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
55 - EndProjectSection
56 -EndProject
57 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
58 ProjectSection(ProjectDependencies) = postProject
59 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
60 @@ -87,16 +65,6 @@
61 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
62 EndProjectSection
63 EndProject
64 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
65 - ProjectSection(ProjectDependencies) = postProject
66 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
67 - EndProjectSection
68 -EndProject
69 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
70 - ProjectSection(ProjectDependencies) = postProject
71 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
72 - EndProjectSection
73 -EndProject
74 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
75 ProjectSection(ProjectDependencies) = postProject
76 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
77 @@ -112,19 +80,6 @@
78 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
79 EndProjectSection
80 EndProject
81 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
82 -EndProject
83 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
84 - ProjectSection(ProjectDependencies) = postProject
85 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
86 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
87 - EndProjectSection
88 -EndProject
89 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
90 - ProjectSection(ProjectDependencies) = postProject
91 - {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
92 - EndProjectSection
93 -EndProject
94 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
95 ProjectSection(ProjectDependencies) = postProject
96 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
97 @@ -162,20 +117,20 @@
98 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64
99 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
100 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32
101 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32
102 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32
103 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|x64
104 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|x64
105 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32
106 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32
107 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32
108 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32
109 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64
110 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|x64
111 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32
112 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32
113 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32
114 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32
115 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|x64
116 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|x64
117 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32
118 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32
119 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32
120 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32
121 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|x64
122 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|x64
123 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32
124 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32
125 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64
126 @@ -226,20 +181,20 @@
127 {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64
128 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32
129 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32
130 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32
131 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32
132 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|x64
133 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|x64
134 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32
135 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32
136 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32
137 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32
138 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64
139 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|x64
140 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32
141 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32
142 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32
143 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32
144 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|x64
145 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|x64
146 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32
147 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32
148 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32
149 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32
150 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|x64
151 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|x64
152 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32
153 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32
154 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64
155 @@ -481,7 +436,7 @@
156 {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.ActiveCfg = Release|x64
157 {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.Build.0 = Release|x64
158 {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|Win32.ActiveCfg = Release|Win32
159 - {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.ActiveCfg = Release|x64
160 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.ActiveCfg = Debug|x64
161 {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|Win32.ActiveCfg = Release|Win32
162 {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.ActiveCfg = Release|x64
163 {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|Win32.ActiveCfg = Release|Win32
164 --- misc/Python-2.6.1/PCbuild/make_versioninfo.vcproj 2008-06-12 23:58:20.000000000 +0200
165 +++ misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj 2011-06-06 17:31:17.000000000 +0200
166 @@ -124,6 +124,8 @@
167 InlineFunctionExpansion="1"
168 EnableIntrinsicFunctions="true"
169 PreprocessorDefinitions="_CONSOLE"
170 + RuntimeLibrary="2"
171 + CompileAs="0"
172 />
173 <Tool
174 Name="VCManagedResourceCompilerTool"
175 @@ -137,6 +139,8 @@
176 <Tool
177 Name="VCLinkerTool"
178 OutputFile="$(SolutionDir)make_versioninfo.exe"
179 + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
180 + SubSystem="1"
181 />
182 <Tool
183 Name="VCALinkTool"
184 @@ -175,7 +179,7 @@
185 <Tool
186 Name="VCCustomBuildTool"
187 Description="Build PC/pythonnt_rc(_d).h"
188 - CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
189 + CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
190 Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
191 />
192 <Tool
193 @@ -210,7 +214,7 @@
194 />
195 <Tool
196 Name="VCLinkerTool"
197 - OutputFile="$(SolutionDir)make_versioninfo_d.exe"
198 + OutputFile="$(SolutionDir)make_versioninfo.exe"
199 ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
200 SubSystem="1"
201 BaseAddress="0x1d000000"
202 @@ -235,7 +239,7 @@
203 />
204 <Tool
205 Name="VCPostBuildEventTool"
206 - CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
207 + CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
208 />
209 </Configuration>
210 <Configuration
211 @@ -249,7 +253,7 @@
212 <Tool
213 Name="VCCustomBuildTool"
214 Description="Build PC/pythonnt_rc(_d).h"
215 - CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
216 + CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
217 Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
218 />
219 <Tool
220 @@ -268,6 +272,8 @@
221 InlineFunctionExpansion="1"
222 EnableIntrinsicFunctions="false"
223 PreprocessorDefinitions="_CONSOLE"
224 + RuntimeLibrary="2"
225 + CompileAs="0"
226 />
227 <Tool
228 Name="VCManagedResourceCompilerTool"
229 @@ -280,8 +286,9 @@
230 />
231 <Tool
232 Name="VCLinkerTool"
233 - OutputFile="$(SolutionDir)make_versioninfo_d.exe"
234 - TargetMachine="17"
235 + OutputFile="$(SolutionDir)make_versioninfo.exe"
236 + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
237 + SubSystem="1"
238 />
239 <Tool
240 Name="VCALinkTool"
241 @@ -303,7 +310,7 @@
242 />
243 <Tool
244 Name="VCPostBuildEventTool"
245 - CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
246 + CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
247 />
248 </Configuration>
249 </Configurations>
250 --- misc/Python-2.6.1/PCbuild/make_buildinfo.vcproj 2007-11-30 20:18:08.000000000 +0100
251 +++ misc/build/Python-2.6.1/PCbuild/make_buildinfo.vcproj 2011-06-06 17:31:17.000000000 +0200
252 @@ -119,6 +119,9 @@
253 />
254 <Tool
255 Name="VCLinkerTool"
256 + OutputFile="$(OutDir)/make_buildinfo.exe"
257 + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
258 + SubSystem="1"
259 />
260 <Tool
261 Name="VCALinkTool"
262 --- misc/Python-2.6.1/PCbuild/x64.vsprops 2008-02-29 19:54:45.000000000 +0100
263 +++ misc/build/Python-2.6.1/PCbuild/x64.vsprops 2011-06-06 17:31:17.000000000 +0200
264 @@ -3,7 +3,7 @@
265 ProjectType="Visual C++"
266 Version="8.00"
267 Name="amd64"
268 - OutputDirectory="$(SolutionDir)\amd64\"
269 + OutputDirectory="$(SolutionDir)"
270 IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\"
271 >
272 <Tool
273 @@ -15,8 +15,4 @@
274 Name="VCLinkerTool"
275 TargetMachine="17"
276 />
277 - <UserMacro
278 - Name="PythonExe"
279 - Value="$(HOST_PYTHON)"
280 - />
281 </VisualStudioPropertySheet>
282 --- misc/Python-2.6.1/PCbuild/debug.vsprops 2008-04-03 20:27:06.000000000 +0200
283 +++ misc/build/Python-2.6.1/PCbuild/debug.vsprops 2011-06-06 17:31:17.000000000 +0200
284 @@ -10,6 +10,6 @@
285 />
286 <UserMacro
287 Name="KillPythonExe"
288 - Value="$(OutDir)\kill_python_d.exe"
289 + Value="$(OutDir)\kill_python.exe"
290 />
291 </VisualStudioPropertySheet>
292 --- misc/Python-2.6.1/PCbuild/kill_python.vcproj 2008-06-14 00:38:33.000000000 +0200
293 +++ misc/build/Python-2.6.1/PCbuild/kill_python.vcproj 2011-06-06 17:31:17.000000000 +0200
294 @@ -54,7 +54,7 @@
295 />
296 <Tool
297 Name="VCLinkerTool"
298 - OutputFile="$(OutDir)\$(ProjectName)_d.exe"
299 + OutputFile="$(OutDir)\$(ProjectName).exe"
300 SubSystem="1"
301 />
302 <Tool
303 @@ -115,7 +115,7 @@
304 />
305 <Tool
306 Name="VCLinkerTool"
307 - OutputFile="$(OutDir)\$(ProjectName)_d.exe"
308 + OutputFile="$(OutDir)\$(ProjectName).exe"
309 SubSystem="1"
310 />
311 <Tool
312 --- misc/Python-2.6.1/PCbuild/pyd_d.vsprops 2008-11-06 18:29:54.000000000 +0100
313 +++ misc/build/Python-2.6.1/PCbuild/pyd_d.vsprops 2011-06-06 17:31:17.000000000 +0200
314 @@ -11,13 +11,13 @@
315 InlineFunctionExpansion="0"
316 EnableIntrinsicFunctions="false"
317 PreprocessorDefinitions="Py_BUILD_CORE_MODULE"
318 - RuntimeLibrary="3"
319 + RuntimeLibrary="2"
320 />
321 <Tool
322 Name="VCLinkerTool"
323 - OutputFile="$(OutDir)\$(ProjectName)_d.pyd"
324 + OutputFile="$(OutDir)\$(ProjectName).pyd"
325 LinkIncremental="1"
326 - ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"
327 + ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
328 ImportLibrary="$(OutDir)\$(TargetName).lib"
329 GenerateManifest="false"
330 />
331 @@ -31,6 +31,6 @@
332 />
333 <UserMacro
334 Name="PythonExe"
335 - Value="$(SolutionDir)python_d.exe"
336 + Value="$(SolutionDir)python.exe"
337 />
338 </VisualStudioPropertySheet>
339 --- misc/Python-2.6.1/PCbuild/python.vcproj 2008-06-12 23:58:20.000000000 +0200
340 +++ misc/build/Python-2.6.1/PCbuild/python.vcproj 2011-06-06 17:31:17.000000000 +0200
341 @@ -191,7 +191,7 @@
342 EnableIntrinsicFunctions="false"
343 AdditionalIncludeDirectories=""
344 PreprocessorDefinitions="_CONSOLE"
345 - RuntimeLibrary="3"
346 + RuntimeLibrary="2"
347 BrowseInformation="1"
348 CompileAs="0"
349 />
350 @@ -209,7 +209,7 @@
351 />
352 <Tool
353 Name="VCLinkerTool"
354 - OutputFile="$(OutDir)\python_d.exe"
355 + OutputFile="$(OutDir)\python.exe"
356 SubSystem="1"
357 StackReserveSize="2000000"
358 BaseAddress="0x1d000000"
359 @@ -266,7 +266,7 @@
360 EnableIntrinsicFunctions="false"
361 AdditionalIncludeDirectories=""
362 PreprocessorDefinitions="_CONSOLE"
363 - RuntimeLibrary="3"
364 + RuntimeLibrary="2"
365 BrowseInformation="1"
366 CompileAs="0"
367 />
368 @@ -284,9 +284,9 @@
369 />
370 <Tool
371 Name="VCLinkerTool"
372 - OutputFile="$(OutDir)\python_d.exe"
373 + OutputFile="$(OutDir)\python.exe"
374 SubSystem="1"
375 - StackReserveSize="2100000"
376 + StackReserveSize="2000000"
377 BaseAddress="0x1d000000"
378 />
379 <Tool
380 --- misc/Python-2.6.1/PCbuild/pythoncore.vcproj 2008-06-10 23:23:22.000000000 +0200
381 +++ misc/build/Python-2.6.1/PCbuild/pythoncore.vcproj 2011-06-06 17:31:17.000000000 +0200
382 @@ -198,7 +198,7 @@
383 EnableIntrinsicFunctions="false"
384 AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
385 PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
386 - RuntimeLibrary="3"
387 + RuntimeLibrary="2"
388 />
389 <Tool
390 Name="VCManagedResourceCompilerTool"
391 @@ -217,11 +217,11 @@
392 <Tool
393 Name="VCLinkerTool"
394 AdditionalDependencies="getbuildinfo.o"
395 - OutputFile="$(OutDir)\$(PyDllName)_d.dll"
396 + OutputFile="$(OutDir)\$(PyDllName).dll"
397 IgnoreDefaultLibraryNames="libc"
398 - ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
399 + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
400 BaseAddress="0x1e000000"
401 - ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
402 + ImportLibrary="$(OutDir)$(PyDllName).lib"
403 />
404 <Tool
405 Name="VCALinkTool"
406 @@ -276,7 +276,7 @@
407 EnableIntrinsicFunctions="false"
408 AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
409 PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
410 - RuntimeLibrary="3"
411 + RuntimeLibrary="2"
412 />
413 <Tool
414 Name="VCManagedResourceCompilerTool"
415 @@ -295,11 +295,11 @@
416 <Tool
417 Name="VCLinkerTool"
418 AdditionalDependencies="getbuildinfo.o"
419 - OutputFile="$(OutDir)\$(PyDllName)_d.dll"
420 + OutputFile="$(OutDir)\$(PyDllName).dll"
421 IgnoreDefaultLibraryNames="libc"
422 - ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
423 + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
424 BaseAddress="0x1e000000"
425 - ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
426 + ImportLibrary="$(OutDir)$(PyDllName).lib"
427 />
428 <Tool
429 Name="VCALinkTool"
430 --- misc/Python-2.6.1/PCbuild/make_buildinfo.c 2007-12-06 22:13:06.000000000 +0100
431 +++ misc/build/Python-2.6.1/PCbuild/make_buildinfo.c 2011-06-06 17:31:17.000000000 +0200
432 @@ -65,7 +65,7 @@
433 strcat_s(command, CMD_SIZE, "-MD ");
434 }
435 else if (strcmp(argv[1], "Debug") == 0) {
436 - strcat_s(command, CMD_SIZE, "-D_DEBUG -MDd ");
437 + strcat_s(command, CMD_SIZE, "-D_DEBUG -MD ");
438 }
439 else if (strcmp(argv[1], "ReleaseItanium") == 0) {
440 strcat_s(command, CMD_SIZE, "-MD /USECL:MS_ITANIUM ");
441 --- misc/Python-2.6.1/Objects/exceptions.c 2008-07-30 19:45:10.000000000 +0200
442 +++ misc/build/Python-2.6.1/Objects/exceptions.c 2011-06-06 17:31:17.000000000 +0200
443 @@ -2157,8 +2157,6 @@
444 #if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__)
445 /* Set CRT argument error handler */
446 prevCrtHandler = _set_invalid_parameter_handler(InvalidParameterHandler);
447 - /* turn off assertions in debug mode */
448 - prevCrtReportMode = _CrtSetReportMode(_CRT_ASSERT, 0);
449 #endif
450 }
451
452 @@ -2170,6 +2168,5 @@
453 #if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__)
454 /* reset CRT error handling */
455 _set_invalid_parameter_handler(prevCrtHandler);
456 - _CrtSetReportMode(_CRT_ASSERT, prevCrtReportMode);
457 #endif
458 }
459 --- misc/Python-2.6.1/Lib/test/test_threading.py 2008-09-30 22:41:13.000000000 +0200
460 +++ misc/build/Python-2.6.1/Lib/test/test_threading.py 2011-06-06 17:31:17.000000000 +0200
461 @@ -382,7 +382,7 @@
462 return
463 # Skip platforms with known problems forking from a worker thread.
464 # See http://bugs.python.org/issue3863.
465 - if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'os2emx'):
466 + if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'os2emx'):
467 print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread'
468 ' due to known OS bugs on'), sys.platform
469 return
470 --- misc/Python-2.6.1/Modules/_ctypes/libffi/configure 2008-05-23 17:06:50.000000000 +0200
471 +++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure 2011-06-06 17:31:17.000000000 +0200
472 @@ -4725,7 +4725,7 @@
473 rm -rf conftest*
474 ;;
475
476 -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
477 +amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
478 s390*-*linux*|sparc*-*linux*)
479 # Find out which ABI we are using.
480 echo 'int i;' > conftest.$ac_ext
481 --- misc/Python-2.6.1/Python/thread_pthread.h 2006-06-13 17:04:24.000000000 +0200
482 +++ misc/build/Python-2.6.1/Python/thread_pthread.h 2011-06-06 17:33:34.000000000 +0200
483 @@ -26,6 +26,10 @@
484 #endif
485 #endif
486
487 +#ifdef __FreeBSD__
488 +#include <osreldate.h>
489 +#endif
490 +
491 /* The POSIX spec says that implementations supporting the sem_*
492 family of functions must indicate this by defining
493 _POSIX_SEMAPHORES. */
494 @@ -44,7 +48,6 @@
495 in default setting. So the process scope is preferred to get
496 enough number of threads to work. */
497 #ifdef __FreeBSD__
498 -#include <osreldate.h>
499 #if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101
500 #undef PTHREAD_SYSTEM_SCHED_SUPPORTED
501 #endif
502 @@ -149,6 +152,9 @@
503 {
504 pthread_t th;
505 int status;
506 +#ifdef __FreeBSD__
507 + sigset_t set, oset;
508 +#endif
509 #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
510 pthread_attr_t attrs;
511 #endif
512 @@ -177,7 +183,10 @@
513 #if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
514 pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
515 #endif
516 -
517 +#ifdef __FreeBSD__
518 + sigfillset(&set);
519 + SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset);
520 +#endif
521 status = pthread_create(&th,
522 #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
523 &attrs,
524 @@ -188,6 +197,9 @@
525 (void *)arg
526 );
527
528 +#ifdef __FreeBSD__
529 + SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
530 +#endif
531 #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
532 pthread_attr_destroy(&attrs);
533 #endif
534 --- misc/Python-2.6.1/configure 2008-11-16 18:57:10.000000000 +0100
535 +++ misc/build/Python-2.6.1/configure 2011-06-06 17:31:17.000000000 +0200
536 @@ -4102,7 +4102,7 @@
537 ;;
538 SunOS*)
539 LDLIBRARY='libpython$(VERSION).so'
540 - BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
541 + BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
542 RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
543 INSTSONAME="$LDLIBRARY".$SOVERSION
544 ;;
545 @@ -4110,11 +4110,6 @@
546 LDLIBRARY='libpython$(VERSION).so'
547 BLDLIBRARY='-L. -lpython$(VERSION)'
548 RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
549 - case $ac_sys_system in
550 - FreeBSD*)
551 - SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
552 - ;;
553 - esac
554 INSTSONAME="$LDLIBRARY".$SOVERSION
555 ;;
556 hp*|HP*)
557 --- misc/Python-2.6.1/PC/pyconfig.h 2008-06-13 02:42:22.000000000 +0200
558 +++ misc/build/Python-2.6.1/PC/pyconfig.h 2011-06-06 17:31:17.000000000 +0200
559 @@ -322,11 +322,7 @@
560 /* So MSVC users need not specify the .lib file in
561 their Makefile (other compilers are generally
562 taken care of by distutils.) */
563 -# ifdef _DEBUG
564 -# pragma comment(lib,"python26_d.lib")
565 -# else
566 -# pragma comment(lib,"python26.lib")
567 -# endif /* _DEBUG */
568 +# pragma comment(lib,"python26.lib")
569 # endif /* _MSC_VER */
570 # endif /* Py_BUILD_CORE */
571 #endif /* MS_COREDLL */
FREE OFFICE SUITE