Skip to content

Update zlib to v1.3.0.1+ #3058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Aug 22, 2025
Merged

Update zlib to v1.3.0.1+ #3058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1d40a3c
Update zlib to v1.3.0.1+
mattleibow Nov 7, 2024
175d58b
Merge branch 'main' into dev/update-zlib
mattleibow Feb 28, 2025
1ff193c
Try update clang to fix the ARM builds
mattleibow Feb 28, 2025
6c5dc8e
Merge branch 'main' into dev/update-zlib
mattleibow Aug 19, 2025
f91f679
We need later clangs and debians
mattleibow Aug 19, 2025
8e5df1d
archives
mattleibow Aug 19, 2025
4451255
and this
mattleibow Aug 19, 2025
4c61d5d
docs
mattleibow Aug 19, 2025
5bc774b
singles
mattleibow Aug 19, 2025
174a08e
llvm
mattleibow Aug 19, 2025
e7b62a9
oops
mattleibow Aug 19, 2025
d19cca5
llvm
mattleibow Aug 19, 2025
1d73427
archives
mattleibow Aug 19, 2025
61bc5ff
oks
mattleibow Aug 19, 2025
4d68a31
try this now
mattleibow Aug 19, 2025
11bb29e
Try again!
mattleibow Aug 20, 2025
906f781
Update externals
mattleibow Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion externals/skia
Open in desktop
Submodule skia updated 7 files
+1 −2 BUILD.gn
+1 −1 DEPS
+1 −1 gn/BUILDCONFIG.gn
+0 −2 gn/skia/BUILD.gn
+0 −34 gn/xamarin_inject_compat.py
+0 −84 include/xamarin/WinRTCompat.h
+0 −79 src/xamarin/WinRTCompat.cpp
8 changes: 0 additions & 8 deletions native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,13 @@
34C7D67123FFE9A60044EF37 /* sk_compatpaint.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C7D66F23FFE9A60044EF37 /* sk_compatpaint.h */; };
34C7D67423FFE9B60044EF37 /* SkCompatPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C7D67223FFE9B60044EF37 /* SkCompatPaint.cpp */; };
34C7D67523FFE9B60044EF37 /* sk_compatpaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C7D67323FFE9B60044EF37 /* sk_compatpaint.cpp */; };
34CB9ACA205699BC00BACCBA /* WinRTCompat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34CB9AC3205699BC00BACCBA /* WinRTCompat.cpp */; };
34CB9ACB205699BC00BACCBA /* sk_managedstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34CB9AC4205699BC00BACCBA /* sk_managedstream.cpp */; };
34CB9ACC205699BC00BACCBA /* SkManagedStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34CB9AC5205699BC00BACCBA /* SkManagedStream.cpp */; };
34CB9ACD205699BC00BACCBA /* sk_xamarin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34CB9AC6205699BC00BACCBA /* sk_xamarin.cpp */; };
34CB9ACF205699BC00BACCBA /* SkiaKeeper.c in Sources */ = {isa = PBXBuildFile; fileRef = 34CB9AC8205699BC00BACCBA /* SkiaKeeper.c */; };
34CB9AD8205699C400BACCBA /* SkManagedStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 34CB9AD2205699C300BACCBA /* SkManagedStream.h */; };
34CB9AD9205699C400BACCBA /* sk_managedstream.h in Headers */ = {isa = PBXBuildFile; fileRef = 34CB9AD3205699C400BACCBA /* sk_managedstream.h */; };
34CB9ADB205699C400BACCBA /* sk_xamarin.h in Headers */ = {isa = PBXBuildFile; fileRef = 34CB9AD5205699C400BACCBA /* sk_xamarin.h */; };
34CB9ADC205699C400BACCBA /* WinRTCompat.h in Headers */ = {isa = PBXBuildFile; fileRef = 34CB9AD6205699C400BACCBA /* WinRTCompat.h */; };
34ED40A92A8178A6007F12FA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34ED40A82A8178A6007F12FA /* UIKit.framework */; };
/* End PBXBuildFile section */

Expand All @@ -60,15 +58,13 @@
34C7D66F23FFE9A60044EF37 /* sk_compatpaint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sk_compatpaint.h; path = ../../../../externals/skia/include/xamarin/sk_compatpaint.h; sourceTree = "<group>"; };
34C7D67223FFE9B60044EF37 /* SkCompatPaint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkCompatPaint.cpp; path = ../../../../externals/skia/src/xamarin/SkCompatPaint.cpp; sourceTree = "<group>"; };
34C7D67323FFE9B60044EF37 /* sk_compatpaint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_compatpaint.cpp; path = ../../../../externals/skia/src/xamarin/sk_compatpaint.cpp; sourceTree = "<group>"; };
34CB9AC3205699BC00BACCBA /* WinRTCompat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WinRTCompat.cpp; path = ../../../../externals/skia/src/xamarin/WinRTCompat.cpp; sourceTree = "<group>"; };
34CB9AC4205699BC00BACCBA /* sk_managedstream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_managedstream.cpp; path = ../../../../externals/skia/src/xamarin/sk_managedstream.cpp; sourceTree = "<group>"; };
34CB9AC5205699BC00BACCBA /* SkManagedStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkManagedStream.cpp; path = ../../../../externals/skia/src/xamarin/SkManagedStream.cpp; sourceTree = "<group>"; };
34CB9AC6205699BC00BACCBA /* sk_xamarin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_xamarin.cpp; path = ../../../../externals/skia/src/xamarin/sk_xamarin.cpp; sourceTree = "<group>"; };
34CB9AC8205699BC00BACCBA /* SkiaKeeper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkiaKeeper.c; path = ../../../../externals/skia/src/xamarin/SkiaKeeper.c; sourceTree = "<group>"; };
34CB9AD2205699C300BACCBA /* SkManagedStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkManagedStream.h; path = ../../../../externals/skia/include/xamarin/SkManagedStream.h; sourceTree = "<group>"; };
34CB9AD3205699C400BACCBA /* sk_managedstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sk_managedstream.h; path = ../../../../externals/skia/include/xamarin/sk_managedstream.h; sourceTree = "<group>"; };
34CB9AD5205699C400BACCBA /* sk_xamarin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sk_xamarin.h; path = ../../../../externals/skia/include/xamarin/sk_xamarin.h; sourceTree = "<group>"; };
34CB9AD6205699C400BACCBA /* WinRTCompat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WinRTCompat.h; path = ../../../../externals/skia/include/xamarin/WinRTCompat.h; sourceTree = "<group>"; };
34ED40A82A8178A6007F12FA /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk/System/iOSSupport/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -131,8 +127,6 @@
34CB9AD2205699C300BACCBA /* SkManagedStream.h */,
34B07C3824EF0BE700FE3EC9 /* SkManagedTraceMemoryDump.cpp */,
34B07C3724EF0BE700FE3EC9 /* SkManagedTraceMemoryDump.h */,
34CB9AC3205699BC00BACCBA /* WinRTCompat.cpp */,
34CB9AD6205699C400BACCBA /* WinRTCompat.h */,
);
name = Source;
path = libSkiaSharp;
Expand Down Expand Up @@ -160,7 +154,6 @@
buildActionMask = 2147483647;
files = (
3419BFDF21D405AA0067DAFB /* SkManagedDrawable.h in Headers */,
34CB9ADC205699C400BACCBA /* WinRTCompat.h in Headers */,
34C0C90420573CBE00DFDB22 /* libSkiaSharp.h in Headers */,
34C7D67123FFE9A60044EF37 /* sk_compatpaint.h in Headers */,
34C7D67023FFE9A60044EF37 /* SkCompatPaint.h in Headers */,
Expand Down Expand Up @@ -246,7 +239,6 @@
34CB9ACD205699BC00BACCBA /* sk_xamarin.cpp in Sources */,
34B07C3D24EF0BE700FE3EC9 /* sk_managedtracememorydump.cpp in Sources */,
3419BFE321D405B20067DAFB /* SkManagedDrawable.cpp in Sources */,
34CB9ACA205699BC00BACCBA /* WinRTCompat.cpp in Sources */,
34CB9ACC205699BC00BACCBA /* SkManagedStream.cpp in Sources */,
34B07C3C24EF0BE700FE3EC9 /* SkManagedTraceMemoryDump.cpp in Sources */,
34CB9ACB205699BC00BACCBA /* sk_managedstream.cpp in Sources */,
Expand Down
8 changes: 0 additions & 8 deletions native/macos/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@
34565A1F24EF0CD3002C994A /* sk_managedtracememorydump.h in Headers */ = {isa = PBXBuildFile; fileRef = 34565A1B24EF0CD3002C994A /* sk_managedtracememorydump.h */; };
34565A2024EF0CD3002C994A /* sk_managedtracememorydump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34565A1C24EF0CD3002C994A /* sk_managedtracememorydump.cpp */; };
34565A2124EF0CD3002C994A /* SkManagedTraceMemoryDump.h in Headers */ = {isa = PBXBuildFile; fileRef = 34565A1D24EF0CD3002C994A /* SkManagedTraceMemoryDump.h */; };
3459E843205698C7003EAD17 /* WinRTCompat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3459E83C205698C6003EAD17 /* WinRTCompat.cpp */; };
3459E844205698C7003EAD17 /* sk_managedstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3459E83D205698C6003EAD17 /* sk_managedstream.cpp */; };
3459E845205698C7003EAD17 /* SkManagedStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3459E83E205698C6003EAD17 /* SkManagedStream.cpp */; };
3459E846205698C7003EAD17 /* sk_xamarin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3459E83F205698C6003EAD17 /* sk_xamarin.cpp */; };
3459E848205698C7003EAD17 /* SkiaKeeper.c in Sources */ = {isa = PBXBuildFile; fileRef = 3459E841205698C7003EAD17 /* SkiaKeeper.c */; };
3459E851205698D2003EAD17 /* SkManagedStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 3459E84B205698D2003EAD17 /* SkManagedStream.h */; };
3459E852205698D2003EAD17 /* sk_managedstream.h in Headers */ = {isa = PBXBuildFile; fileRef = 3459E84C205698D2003EAD17 /* sk_managedstream.h */; };
3459E854205698D2003EAD17 /* sk_xamarin.h in Headers */ = {isa = PBXBuildFile; fileRef = 3459E84E205698D2003EAD17 /* sk_xamarin.h */; };
3459E855205698D2003EAD17 /* WinRTCompat.h in Headers */ = {isa = PBXBuildFile; fileRef = 3459E84F205698D2003EAD17 /* WinRTCompat.h */; };
346D1BC321D405D30066C82D /* SkManagedDrawable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346D1BBF21D405D30066C82D /* SkManagedDrawable.cpp */; };
346D1BC421D405D30066C82D /* sk_manageddrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 346D1BC021D405D30066C82D /* sk_manageddrawable.h */; };
346D1BC521D405D30066C82D /* sk_manageddrawable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346D1BC121D405D30066C82D /* sk_manageddrawable.cpp */; };
Expand All @@ -51,15 +49,13 @@
34565A1B24EF0CD3002C994A /* sk_managedtracememorydump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sk_managedtracememorydump.h; path = ../../../../externals/skia/include/xamarin/sk_managedtracememorydump.h; sourceTree = "<group>"; };
34565A1C24EF0CD3002C994A /* sk_managedtracememorydump.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_managedtracememorydump.cpp; path = ../../../../externals/skia/src/xamarin/sk_managedtracememorydump.cpp; sourceTree = "<group>"; };
34565A1D24EF0CD3002C994A /* SkManagedTraceMemoryDump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkManagedTraceMemoryDump.h; path = ../../../../externals/skia/include/xamarin/SkManagedTraceMemoryDump.h; sourceTree = "<group>"; };
3459E83C205698C6003EAD17 /* WinRTCompat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WinRTCompat.cpp; path = ../../../../externals/skia/src/xamarin/WinRTCompat.cpp; sourceTree = "<group>"; };
3459E83D205698C6003EAD17 /* sk_managedstream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_managedstream.cpp; path = ../../../../externals/skia/src/xamarin/sk_managedstream.cpp; sourceTree = "<group>"; };
3459E83E205698C6003EAD17 /* SkManagedStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkManagedStream.cpp; path = ../../../../externals/skia/src/xamarin/SkManagedStream.cpp; sourceTree = "<group>"; };
3459E83F205698C6003EAD17 /* sk_xamarin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_xamarin.cpp; path = ../../../../externals/skia/src/xamarin/sk_xamarin.cpp; sourceTree = "<group>"; };
3459E841205698C7003EAD17 /* SkiaKeeper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkiaKeeper.c; path = ../../../../externals/skia/src/xamarin/SkiaKeeper.c; sourceTree = "<group>"; };
3459E84B205698D2003EAD17 /* SkManagedStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkManagedStream.h; path = ../../../../externals/skia/include/xamarin/SkManagedStream.h; sourceTree = "<group>"; };
3459E84C205698D2003EAD17 /* sk_managedstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sk_managedstream.h; path = ../../../../externals/skia/include/xamarin/sk_managedstream.h; sourceTree = "<group>"; };
3459E84E205698D2003EAD17 /* sk_xamarin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sk_xamarin.h; path = ../../../../externals/skia/include/xamarin/sk_xamarin.h; sourceTree = "<group>"; };
3459E84F205698D2003EAD17 /* WinRTCompat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WinRTCompat.h; path = ../../../../externals/skia/include/xamarin/WinRTCompat.h; sourceTree = "<group>"; };
346D1BBF21D405D30066C82D /* SkManagedDrawable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkManagedDrawable.cpp; path = ../../../../externals/skia/src/xamarin/SkManagedDrawable.cpp; sourceTree = "<group>"; };
346D1BC021D405D30066C82D /* sk_manageddrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sk_manageddrawable.h; path = ../../../../externals/skia/include/xamarin/sk_manageddrawable.h; sourceTree = "<group>"; };
346D1BC121D405D30066C82D /* sk_manageddrawable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_manageddrawable.cpp; path = ../../../../externals/skia/src/xamarin/sk_manageddrawable.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -144,8 +140,6 @@
3459E84B205698D2003EAD17 /* SkManagedStream.h */,
34565A1A24EF0CD3002C994A /* SkManagedTraceMemoryDump.cpp */,
34565A1D24EF0CD3002C994A /* SkManagedTraceMemoryDump.h */,
3459E83C205698C6003EAD17 /* WinRTCompat.cpp */,
3459E84F205698D2003EAD17 /* WinRTCompat.h */,
);
path = Source;
sourceTree = "<group>";
Expand All @@ -164,7 +158,6 @@
34C7D67D23FFE9F20044EF37 /* SkCompatPaint.h in Headers */,
346D1BC421D405D30066C82D /* sk_manageddrawable.h in Headers */,
3459E852205698D2003EAD17 /* sk_managedstream.h in Headers */,
3459E855205698D2003EAD17 /* WinRTCompat.h in Headers */,
3459E854205698D2003EAD17 /* sk_xamarin.h in Headers */,
34565A2124EF0CD3002C994A /* SkManagedTraceMemoryDump.h in Headers */,
);
Expand Down Expand Up @@ -232,7 +225,6 @@
3459E846205698C7003EAD17 /* sk_xamarin.cpp in Sources */,
34565A2024EF0CD3002C994A /* sk_managedtracememorydump.cpp in Sources */,
346D1BC321D405D30066C82D /* SkManagedDrawable.cpp in Sources */,
3459E843205698C7003EAD17 /* WinRTCompat.cpp in Sources */,
3459E845205698C7003EAD17 /* SkManagedStream.cpp in Sources */,
34565A1E24EF0CD3002C994A /* SkManagedTraceMemoryDump.cpp in Sources */,
3459E844205698C7003EAD17 /* sk_managedstream.cpp in Sources */,
Expand Down
Loading