Skip to content

Commit 4072e73

Browse files
carlossanlopjkotas
andauthored
Migrate to zlib-ng, part 3: Remove zlib and zlib-intel source code and license mentions (second attempt) (#105371)
* Remove zlib/ * Remove zlib-intel/ * Remove third party notice * Remove patches * Remove version txts * Remove cgmanifest.json entries * Remove installer third party notice * Update docs --------- Co-authored-by: Jan Kotas <[email protected]>
1 parent 54a9efd commit 4072e73

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+0
-53330
lines changed

THIRD-PARTY-NOTICES.TXT

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -66,38 +66,6 @@ shall not be used in advertising or otherwise to promote the sale,
6666
use or other dealings in these Data Files or Software without prior
6767
written authorization of the copyright holder.
6868

69-
License notice for Zlib
70-
-----------------------
71-
72-
https://github.com/madler/zlib
73-
https://zlib.net/zlib_license.html
74-
75-
/* zlib.h -- interface of the 'zlib' general purpose compression library
76-
version 1.3.1, January 22nd, 2024
77-
78-
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
79-
80-
This software is provided 'as-is', without any express or implied
81-
warranty. In no event will the authors be held liable for any damages
82-
arising from the use of this software.
83-
84-
Permission is granted to anyone to use this software for any purpose,
85-
including commercial applications, and to alter it and redistribute it
86-
freely, subject to the following restrictions:
87-
88-
1. The origin of this software must not be misrepresented; you must not
89-
claim that you wrote the original software. If you use this software
90-
in a product, an acknowledgment in the product documentation would be
91-
appreciated but is not required.
92-
2. Altered source versions must be plainly marked as such, and must not be
93-
misrepresented as being the original software.
94-
3. This notice may not be removed or altered from any source distribution.
95-
96-
Jean-loup Gailly Mark Adler
97-
98-
99-
*/
100-
10169
License notice for zlib-ng
10270
-----------------------
10371

src/installer/pkg/THIRD-PARTY-NOTICES.TXT

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -65,38 +65,6 @@ shall not be used in advertising or otherwise to promote the sale,
6565
use or other dealings in these Data Files or Software without prior
6666
written authorization of the copyright holder.
6767

68-
License notice for Zlib
69-
-----------------------
70-
71-
https://github.com/madler/zlib
72-
https://zlib.net/zlib_license.html
73-
74-
/* zlib.h -- interface of the 'zlib' general purpose compression library
75-
version 1.2.13, October 13th, 2022
76-
77-
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
78-
79-
This software is provided 'as-is', without any express or implied
80-
warranty. In no event will the authors be held liable for any damages
81-
arising from the use of this software.
82-
83-
Permission is granted to anyone to use this software for any purpose,
84-
including commercial applications, and to alter it and redistribute it
85-
freely, subject to the following restrictions:
86-
87-
1. The origin of this software must not be misrepresented; you must not
88-
claim that you wrote the original software. If you use this software
89-
in a product, an acknowledgment in the product documentation would be
90-
appreciated but is not required.
91-
2. Altered source versions must be plainly marked as such, and must not be
92-
misrepresented as being the original software.
93-
3. This notice may not be removed or altered from any source distribution.
94-
95-
Jean-loup Gailly Mark Adler
96-
97-
98-
*/
99-
10068
License notice for Mono
10169
-------------------------------
10270

src/native/external/cgmanifest.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,6 @@
4141
},
4242
"DevelopmentDependency": false
4343
},
44-
{
45-
"Component": {
46-
"Type": "git",
47-
"Git": {
48-
"RepositoryUrl": "https://github.com/madler/zlib",
49-
"CommitHash": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"
50-
}
51-
},
52-
"DevelopmentDependency": false
53-
},
54-
{
55-
"Component": {
56-
"Type": "git",
57-
"Git": {
58-
"RepositoryUrl": "https://github.com/intel/zlib",
59-
"CommitHash": "6160a8f20c3626aec2f8b0fda5bf2e65bfe31781"
60-
}
61-
},
62-
"DevelopmentDependency": false
63-
},
6444
{
6545
"Component": {
6646
"Type": "git",

src/native/external/patches/zlib-intel/0001-Make-zlib-intel-compile-clean-against-C4244.patch

Lines changed: 0 additions & 75 deletions
This file was deleted.

src/native/external/patches/zlib/0001-Make-zlib-compile-clean-against-C4244.patch

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/native/external/zlib-intel-version.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/native/external/zlib-intel/README.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)