Skip to content

Commit 42f8de2

Browse files
authored
Update zlib to v1.3.0.1+ (#3058)
Update zlib to v1.3.0.1+ * We are matching the last tagged pdfium's version. * There was a commit that made zlib only work with newer clangs, so we are piking just before that for now * Removed the old UWP compat things as they edit files
1 parent 528dc00 commit 42f8de2

File tree

13 files changed

+131
-42
lines changed

13 files changed

+131
-42
lines changed

native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@
2626
34C7D67123FFE9A60044EF37 /* sk_compatpaint.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C7D66F23FFE9A60044EF37 /* sk_compatpaint.h */; };
2727
34C7D67423FFE9B60044EF37 /* SkCompatPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C7D67223FFE9B60044EF37 /* SkCompatPaint.cpp */; };
2828
34C7D67523FFE9B60044EF37 /* sk_compatpaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C7D67323FFE9B60044EF37 /* sk_compatpaint.cpp */; };
29-
34CB9ACA205699BC00BACCBA /* WinRTCompat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34CB9AC3205699BC00BACCBA /* WinRTCompat.cpp */; };
3029
34CB9ACB205699BC00BACCBA /* sk_managedstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34CB9AC4205699BC00BACCBA /* sk_managedstream.cpp */; };
3130
34CB9ACC205699BC00BACCBA /* SkManagedStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34CB9AC5205699BC00BACCBA /* SkManagedStream.cpp */; };
3231
34CB9ACD205699BC00BACCBA /* sk_xamarin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34CB9AC6205699BC00BACCBA /* sk_xamarin.cpp */; };
3332
34CB9ACF205699BC00BACCBA /* SkiaKeeper.c in Sources */ = {isa = PBXBuildFile; fileRef = 34CB9AC8205699BC00BACCBA /* SkiaKeeper.c */; };
3433
34CB9AD8205699C400BACCBA /* SkManagedStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 34CB9AD2205699C300BACCBA /* SkManagedStream.h */; };
3534
34CB9AD9205699C400BACCBA /* sk_managedstream.h in Headers */ = {isa = PBXBuildFile; fileRef = 34CB9AD3205699C400BACCBA /* sk_managedstream.h */; };
3635
34CB9ADB205699C400BACCBA /* sk_xamarin.h in Headers */ = {isa = PBXBuildFile; fileRef = 34CB9AD5205699C400BACCBA /* sk_xamarin.h */; };
37-
34CB9ADC205699C400BACCBA /* WinRTCompat.h in Headers */ = {isa = PBXBuildFile; fileRef = 34CB9AD6205699C400BACCBA /* WinRTCompat.h */; };
3836
34ED40A92A8178A6007F12FA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34ED40A82A8178A6007F12FA /* UIKit.framework */; };
3937
/* End PBXBuildFile section */
4038

@@ -60,15 +58,13 @@
6058
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>"; };
6159
34C7D67223FFE9B60044EF37 /* SkCompatPaint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkCompatPaint.cpp; path = ../../../../externals/skia/src/xamarin/SkCompatPaint.cpp; sourceTree = "<group>"; };
6260
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>"; };
63-
34CB9AC3205699BC00BACCBA /* WinRTCompat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WinRTCompat.cpp; path = ../../../../externals/skia/src/xamarin/WinRTCompat.cpp; sourceTree = "<group>"; };
6461
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>"; };
6562
34CB9AC5205699BC00BACCBA /* SkManagedStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkManagedStream.cpp; path = ../../../../externals/skia/src/xamarin/SkManagedStream.cpp; sourceTree = "<group>"; };
6663
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>"; };
6764
34CB9AC8205699BC00BACCBA /* SkiaKeeper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkiaKeeper.c; path = ../../../../externals/skia/src/xamarin/SkiaKeeper.c; sourceTree = "<group>"; };
6865
34CB9AD2205699C300BACCBA /* SkManagedStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkManagedStream.h; path = ../../../../externals/skia/include/xamarin/SkManagedStream.h; sourceTree = "<group>"; };
6966
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>"; };
7067
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>"; };
71-
34CB9AD6205699C400BACCBA /* WinRTCompat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WinRTCompat.h; path = ../../../../externals/skia/include/xamarin/WinRTCompat.h; sourceTree = "<group>"; };
7268
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; };
7369
/* End PBXFileReference section */
7470

@@ -131,8 +127,6 @@
131127
34CB9AD2205699C300BACCBA /* SkManagedStream.h */,
132128
34B07C3824EF0BE700FE3EC9 /* SkManagedTraceMemoryDump.cpp */,
133129
34B07C3724EF0BE700FE3EC9 /* SkManagedTraceMemoryDump.h */,
134-
34CB9AC3205699BC00BACCBA /* WinRTCompat.cpp */,
135-
34CB9AD6205699C400BACCBA /* WinRTCompat.h */,
136130
);
137131
name = Source;
138132
path = libSkiaSharp;
@@ -160,7 +154,6 @@
160154
buildActionMask = 2147483647;
161155
files = (
162156
3419BFDF21D405AA0067DAFB /* SkManagedDrawable.h in Headers */,
163-
34CB9ADC205699C400BACCBA /* WinRTCompat.h in Headers */,
164157
34C0C90420573CBE00DFDB22 /* libSkiaSharp.h in Headers */,
165158
34C7D67123FFE9A60044EF37 /* sk_compatpaint.h in Headers */,
166159
34C7D67023FFE9A60044EF37 /* SkCompatPaint.h in Headers */,
@@ -246,7 +239,6 @@
246239
34CB9ACD205699BC00BACCBA /* sk_xamarin.cpp in Sources */,
247240
34B07C3D24EF0BE700FE3EC9 /* sk_managedtracememorydump.cpp in Sources */,
248241
3419BFE321D405B20067DAFB /* SkManagedDrawable.cpp in Sources */,
249-
34CB9ACA205699BC00BACCBA /* WinRTCompat.cpp in Sources */,
250242
34CB9ACC205699BC00BACCBA /* SkManagedStream.cpp in Sources */,
251243
34B07C3C24EF0BE700FE3EC9 /* SkManagedTraceMemoryDump.cpp in Sources */,
252244
34CB9ACB205699BC00BACCBA /* sk_managedstream.cpp in Sources */,

native/macos/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717
34565A1F24EF0CD3002C994A /* sk_managedtracememorydump.h in Headers */ = {isa = PBXBuildFile; fileRef = 34565A1B24EF0CD3002C994A /* sk_managedtracememorydump.h */; };
1818
34565A2024EF0CD3002C994A /* sk_managedtracememorydump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34565A1C24EF0CD3002C994A /* sk_managedtracememorydump.cpp */; };
1919
34565A2124EF0CD3002C994A /* SkManagedTraceMemoryDump.h in Headers */ = {isa = PBXBuildFile; fileRef = 34565A1D24EF0CD3002C994A /* SkManagedTraceMemoryDump.h */; };
20-
3459E843205698C7003EAD17 /* WinRTCompat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3459E83C205698C6003EAD17 /* WinRTCompat.cpp */; };
2120
3459E844205698C7003EAD17 /* sk_managedstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3459E83D205698C6003EAD17 /* sk_managedstream.cpp */; };
2221
3459E845205698C7003EAD17 /* SkManagedStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3459E83E205698C6003EAD17 /* SkManagedStream.cpp */; };
2322
3459E846205698C7003EAD17 /* sk_xamarin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3459E83F205698C6003EAD17 /* sk_xamarin.cpp */; };
2423
3459E848205698C7003EAD17 /* SkiaKeeper.c in Sources */ = {isa = PBXBuildFile; fileRef = 3459E841205698C7003EAD17 /* SkiaKeeper.c */; };
2524
3459E851205698D2003EAD17 /* SkManagedStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 3459E84B205698D2003EAD17 /* SkManagedStream.h */; };
2625
3459E852205698D2003EAD17 /* sk_managedstream.h in Headers */ = {isa = PBXBuildFile; fileRef = 3459E84C205698D2003EAD17 /* sk_managedstream.h */; };
2726
3459E854205698D2003EAD17 /* sk_xamarin.h in Headers */ = {isa = PBXBuildFile; fileRef = 3459E84E205698D2003EAD17 /* sk_xamarin.h */; };
28-
3459E855205698D2003EAD17 /* WinRTCompat.h in Headers */ = {isa = PBXBuildFile; fileRef = 3459E84F205698D2003EAD17 /* WinRTCompat.h */; };
2927
346D1BC321D405D30066C82D /* SkManagedDrawable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346D1BBF21D405D30066C82D /* SkManagedDrawable.cpp */; };
3028
346D1BC421D405D30066C82D /* sk_manageddrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 346D1BC021D405D30066C82D /* sk_manageddrawable.h */; };
3129
346D1BC521D405D30066C82D /* sk_manageddrawable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346D1BC121D405D30066C82D /* sk_manageddrawable.cpp */; };
@@ -51,15 +49,13 @@
5149
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>"; };
5250
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>"; };
5351
34565A1D24EF0CD3002C994A /* SkManagedTraceMemoryDump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkManagedTraceMemoryDump.h; path = ../../../../externals/skia/include/xamarin/SkManagedTraceMemoryDump.h; sourceTree = "<group>"; };
54-
3459E83C205698C6003EAD17 /* WinRTCompat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WinRTCompat.cpp; path = ../../../../externals/skia/src/xamarin/WinRTCompat.cpp; sourceTree = "<group>"; };
5552
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>"; };
5653
3459E83E205698C6003EAD17 /* SkManagedStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkManagedStream.cpp; path = ../../../../externals/skia/src/xamarin/SkManagedStream.cpp; sourceTree = "<group>"; };
5754
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>"; };
5855
3459E841205698C7003EAD17 /* SkiaKeeper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkiaKeeper.c; path = ../../../../externals/skia/src/xamarin/SkiaKeeper.c; sourceTree = "<group>"; };
5956
3459E84B205698D2003EAD17 /* SkManagedStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkManagedStream.h; path = ../../../../externals/skia/include/xamarin/SkManagedStream.h; sourceTree = "<group>"; };
6057
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>"; };
6158
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>"; };
62-
3459E84F205698D2003EAD17 /* WinRTCompat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WinRTCompat.h; path = ../../../../externals/skia/include/xamarin/WinRTCompat.h; sourceTree = "<group>"; };
6359
346D1BBF21D405D30066C82D /* SkManagedDrawable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkManagedDrawable.cpp; path = ../../../../externals/skia/src/xamarin/SkManagedDrawable.cpp; sourceTree = "<group>"; };
6460
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>"; };
6561
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>"; };
@@ -144,8 +140,6 @@
144140
3459E84B205698D2003EAD17 /* SkManagedStream.h */,
145141
34565A1A24EF0CD3002C994A /* SkManagedTraceMemoryDump.cpp */,
146142
34565A1D24EF0CD3002C994A /* SkManagedTraceMemoryDump.h */,
147-
3459E83C205698C6003EAD17 /* WinRTCompat.cpp */,
148-
3459E84F205698D2003EAD17 /* WinRTCompat.h */,
149143
);
150144
path = Source;
151145
sourceTree = "<group>";
@@ -164,7 +158,6 @@
164158
34C7D67D23FFE9F20044EF37 /* SkCompatPaint.h in Headers */,
165159
346D1BC421D405D30066C82D /* sk_manageddrawable.h in Headers */,
166160
3459E852205698D2003EAD17 /* sk_managedstream.h in Headers */,
167-
3459E855205698D2003EAD17 /* WinRTCompat.h in Headers */,
168161
3459E854205698D2003EAD17 /* sk_xamarin.h in Headers */,
169162
34565A2124EF0CD3002C994A /* SkManagedTraceMemoryDump.h in Headers */,
170163
);
@@ -232,7 +225,6 @@
232225
3459E846205698C7003EAD17 /* sk_xamarin.cpp in Sources */,
233226
34565A2024EF0CD3002C994A /* sk_managedtracememorydump.cpp in Sources */,
234227
346D1BC321D405D30066C82D /* SkManagedDrawable.cpp in Sources */,
235-
3459E843205698C7003EAD17 /* WinRTCompat.cpp in Sources */,
236228
3459E845205698C7003EAD17 /* SkManagedStream.cpp in Sources */,
237229
34565A1E24EF0CD3002C994A /* SkManagedTraceMemoryDump.cpp in Sources */,
238230
3459E844205698C7003EAD17 /* sk_managedstream.cpp in Sources */,

0 commit comments

Comments
 (0)