Skip to content

Commit 84ac38d

Browse files
isurufisuruf
committed
fix patches
1 parent e789fcf commit 84ac38d

8 files changed

Lines changed: 26 additions & 26 deletions

‎recipe/patches/0002-Win32-Do-not-download-externals.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ index 6c76f09a071..3dc802b8cef 100644
2424
call "%dir%find_msbuild.bat" %MSBUILD%
2525
if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2)
2626
%MSBUILD% "%dir%pythoncore.vcxproj" /t:ShowVersionInfo /v:m /nologo %1 %2 %3 %4 %5 %6 %7 %8 %9
27-
-if ERRORLEVEL 1 exit /b 3
27+
-if ERRORLEVEL 1 exit /b 3
2828
\ No newline at end of file
2929
+if ERRORLEVEL 1 exit /b 3

‎recipe/patches/0005-Unvendor-openssl.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ index 716a69a41af..7e8e5800a0d 100644
4545
<Filter>Resource Files</Filter>
4646
</ResourceCompile>
4747
</ItemGroup>
48-
-</Project>
48+
-</Project>
4949
\ No newline at end of file
5050
+</Project>
5151
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
@@ -153,7 +153,7 @@ index 0da6f674958..b79f35b2c7d 100644
153153
</Target>
154154

155155
<Target Name="ResolveAssemblyReferences" />
156-
-</Project>
156+
-</Project>
157157
\ No newline at end of file
158158
+</Project>
159159
diff --git a/PCbuild/python.props b/PCbuild/python.props
@@ -219,6 +219,6 @@ index d08c210ef8a..58a9e852bed 100644
219219
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
220220
<ImportGroup Label="ExtensionTargets">
221221
</ImportGroup>
222-
-</Project>
222+
-</Project>
223223
\ No newline at end of file
224224
+</Project>

‎recipe/patches/0006-Unvendor-sqlite3.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ index 9ae0a0fc3a0..f482734ba1d 100644
3939
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
4040
<ImportGroup Label="ExtensionTargets">
4141
</ImportGroup>
42-
-</Project>
42+
-</Project>
4343
\ No newline at end of file
4444
+</Project>
4545
diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln

‎recipe/patches/0008-Doing-d1trimfile.patch‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ index e0dc6ec187a..30ad0dc4864 100644
9797
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9898
<ImportGroup Label="ExtensionTargets">
9999
</ImportGroup>
100-
-</Project>
100+
-</Project>
101101
\ No newline at end of file
102102
+</Project>
103103
diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj
@@ -150,7 +150,7 @@ index 97354739c09..b200d592906 100644
150150
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
151151
<ImportGroup Label="ExtensionTargets">
152152
</ImportGroup>
153-
-</Project>
153+
-</Project>
154154
\ No newline at end of file
155155
+</Project>
156156
diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj
@@ -265,7 +265,7 @@ index a65397f532a..451ca375990 100644
265265
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
266266
<ImportGroup Label="ExtensionTargets">
267267
</ImportGroup>
268-
-</Project>
268+
-</Project>
269269
\ No newline at end of file
270270
+</Project>
271271
diff --git a/PCbuild/_overlapped.vcxproj b/PCbuild/_overlapped.vcxproj
@@ -295,7 +295,7 @@ index 224bf05d530..f7efa63f562 100644
295295
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
296296
<ImportGroup Label="ExtensionTargets">
297297
</ImportGroup>
298-
-</Project>
298+
-</Project>
299299
\ No newline at end of file
300300
+</Project>
301301
diff --git a/PCbuild/_queue.vcxproj b/PCbuild/_queue.vcxproj
@@ -356,7 +356,7 @@ index 41af0895921..45ecbcc4641 100644
356356
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
357357
<ImportGroup Label="ExtensionTargets">
358358
</ImportGroup>
359-
-</Project>
359+
-</Project>
360360
\ No newline at end of file
361361
+</Project>
362362
diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj
@@ -432,7 +432,7 @@ index 4e721e8ce09..3fec7516ed5 100644
432432
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
433433
<ImportGroup Label="ExtensionTargets">
434434
</ImportGroup>
435-
-</Project>
435+
-</Project>
436436
\ No newline at end of file
437437
+</Project>
438438
diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj
@@ -485,7 +485,7 @@ index 69d312b17a5..bee3326ef8d 100644
485485
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
486486
<ImportGroup Label="ExtensionTargets">
487487
</ImportGroup>
488-
-</Project>
488+
-</Project>
489489
\ No newline at end of file
490490
+</Project>
491491
diff --git a/PCbuild/_testembed.vcxproj b/PCbuild/_testembed.vcxproj
@@ -507,7 +507,7 @@ index a7ea8787e0c..e8edb3dd752 100644
507507
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
508508
<ImportGroup Label="ExtensionTargets">
509509
</ImportGroup>
510-
-</Project>
510+
-</Project>
511511
\ No newline at end of file
512512
+</Project>
513513
diff --git a/PCbuild/_testimportmultiple.vcxproj b/PCbuild/_testimportmultiple.vcxproj
@@ -591,7 +591,7 @@ index e730fe308ab..a6f13ef31dc 100644
591591
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
592592
<ImportGroup Label="ExtensionTargets">
593593
</ImportGroup>
594-
-</Project>
594+
-</Project>
595595
\ No newline at end of file
596596
+</Project>
597597
diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj
@@ -613,7 +613,7 @@ index 117488a0162..5ca877b5f2e 100644
613613
<Target Name="_CleanTCL_LIBRARY" BeforeTargets="Clean">
614614
<Delete Files="$(OutDir)TCL_LIBRARY.env" />
615615
</Target>
616-
-</Project>
616+
-</Project>
617617
\ No newline at end of file
618618
+</Project>
619619
diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj
@@ -680,7 +680,7 @@ index ea432d6bc9a..50397324a20 100644
680680
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
681681
<ImportGroup Label="ExtensionTargets">
682682
</ImportGroup>
683-
-</Project>
683+
-</Project>
684684
\ No newline at end of file
685685
+</Project>
686686
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
@@ -717,7 +717,7 @@ index 235ea1cf9d3..d861f6c6a43 100644
717717
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
718718
<ImportGroup Label="ExtensionTargets">
719719
</ImportGroup>
720-
-</Project>
720+
-</Project>
721721
\ No newline at end of file
722722
+</Project>
723723
diff --git a/PCbuild/python_uwp.vcxproj b/PCbuild/python_uwp.vcxproj
@@ -801,7 +801,7 @@ index e50b69aefe2..d64a06b5e6e 100644
801801
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
802802
<ImportGroup Label="ExtensionTargets">
803803
</ImportGroup>
804-
-</Project>
804+
-</Project>
805805
\ No newline at end of file
806806
+</Project>
807807
diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj
@@ -831,7 +831,7 @@ index d7448fd4d72..9fab5e8a638 100644
831831
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
832832
<ImportGroup Label="ExtensionTargets">
833833
</ImportGroup>
834-
-</Project>
834+
-</Project>
835835
\ No newline at end of file
836836
+</Project>
837837
diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj
@@ -869,7 +869,7 @@ index 781f938e2ab..3870c85adf7 100644
869869
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
870870
<ImportGroup Label="ExtensionTargets">
871871
</ImportGroup>
872-
-</Project>
872+
-</Project>
873873
\ No newline at end of file
874874
+</Project>
875875
diff --git a/PCbuild/venvlauncher.vcxproj b/PCbuild/venvlauncher.vcxproj
@@ -929,7 +929,7 @@ index c26029b15a3..1e543b31c41 100644
929929
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
930930
<ImportGroup Label="ExtensionTargets">
931931
</ImportGroup>
932-
-</Project>
932+
-</Project>
933933
\ No newline at end of file
934934
+</Project>
935935
diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj

‎recipe/patches/0012-Unvendor-bzip2.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ index 7c0b5162537..ed9510978f1 100644
8989
<Filter>Resource Files</Filter>
9090
</ResourceCompile>
9191
</ItemGroup>
92-
-</Project>
92+
-</Project>
9393
\ No newline at end of file
9494
+</Project>

‎recipe/patches/0013-Unvendor-libffi.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ index 22c9550e2c0..40ddb08d2b0 100644
3434
- <Target Name="_CleanLIBFFIDLL" BeforeTargets="Clean">
3535
- <Delete Files="@(_LIBFFIDLL->'$(OutDir)%(Filename)%(Extension)')" TreatErrorsAsWarnings="true" />
3636
- </Target>
37-
-</Project>
37+
-</Project>
3838
\ No newline at end of file
3939
+</Project>

‎recipe/patches/0018-Unvendor-expat.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ index bc14e31f32b..7cc8e9a3b9b 100644
129129
<Filter>Resource Files</Filter>
130130
</ResourceCompile>
131131
</ItemGroup>
132-
-</Project>
132+
-</Project>
133133
\ No newline at end of file
134134
+</Project>
135135
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
@@ -199,6 +199,6 @@ index fd22fc8c477..41c73b434b9 100644
199199
<Filter>Resource Files</Filter>
200200
</ResourceCompile>
201201
</ItemGroup>
202-
-</Project>
202+
-</Project>
203203
\ No newline at end of file
204204
+</Project>

‎recipe/patches/make-mixed-crlf-patch.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def main(argv):
4242
line.startswith('+++ ') or \
4343
line.startswith('@@ ') or \
4444
line.startswith('index ') or \
45-
(i < len(lines) - 1 and lines[i+1].startswith(" No newline at end of file")):
45+
(i < len(lines) - 1 and lines[i+1].startswith(r"\ No newline at end of file")):
4646
fo.write((line + '\n').encode('utf-8'))
4747
else:
4848
fo.write((line + '\r\n').encode('utf-8'))

0 commit comments

Comments
 (0)