Update DEPS to pull in libtess2, sqlite, and, inja.#30334
Update DEPS to pull in libtess2, sqlite, and, inja.#30334chinmaygarde merged 4 commits intoflutter:mainfrom
Conversation
|
It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat. If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix? Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. |
e75b88e to
5d0e9d1
Compare
|
Sorry, I got distracted by other unrelated issues. To fix the script for libtess2, just add the following to @@ -1573,20 +1593,27 @@ final List<RegExp> csLicenses = <RegExp>[
r'|'
r'\1\2 '
r'The above copyright notice and this permission notice'
r'(?: \(including the next paragraph\))? '
r'shall be included in all copies or substantial portions '
r'of the (?:Software|Materials)\.'
r'|'
+ r'\1\2 '
+ r'The above copyright notice including the dates of first publication and either this '
+ r'permission notice or a reference to .+ shall be '
+ r'included in all copies or substantial portions of the Software.'
+
+ r'|'
+
r'\1\2 '
r'In addition, the following condition applies:'
r'|'
r'\1\2 '
r'All redistributions must retain an intact copy of this copyright notice and disclaimer\.'
r'|'
@@ -1606,20 +1633,27 @@ final List<RegExp> csLicenses = <RegExp>[
r'OR FITNESS FOR A PARTICULAR PURPOSE\.'
r'|'
r'\1\2 '
r'IN NO EVENT SHALL .+ BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL '
r'DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, '
r'WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING '
r'OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE\.'
+ r'|'
+
+ r'\1\2 '
+ r'Except as contained in this notice, the name of .+ shall not '
+ r'be used in advertising or otherwise to promote the sale, use or other dealings in '
+ r'this Software without prior written authorization from .+\.'
+
.replaceAll(' ', _linebreak)
)
+
r')*',
multiLine: true,
caseSensitive: false
),
// BISON LICENSE
// Seen in some ANGLE source. The usage falls under the "special exception" clause.To skip INJA, add the following to + && entry.name != 'inja' // build-time only according to chinmayThat should get you far enough to add the dependencies without the CI failing. I'll submit a follow-up patch shortly that cleans up some of the issues I ran into. I don't think they're actually causing us to show the wrong licenses; I think they're causing us to show the right licenses but for the wrong reasons. |
Also updates the license script to appropriately handle these dependencies.
9f1272c to
03158b7
Compare
|
Thanks for the help! The patch should be good for a review now. |
|
Don't forget to also update the actual LICENSE file, that's the one that matters the most. |
|
Done. |
Also updates the license script to appropriately handle these
dependencies.