Skip to content

Commit fef345b

Browse files
Damon Nguyenprrace
Damon Nguyen
authored andcommittedOct 6, 2022
8293672: Update freetype md file
Reviewed-by: prr
1 parent 5c030cc commit fef345b

File tree

1 file changed

+82
-41
lines changed

1 file changed

+82
-41
lines changed
 

‎src/java.desktop/share/legal/freetype.md

+82-41
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,27 @@ which fits your needs best.
2020

2121
### FreeType License
2222
```
23+
24+
Copyright (C) 1996-2022 by David Turner, Robert Wilhelm, and Werner Lemberg.
25+
Copyright (C) 2007-2022 by Dereg Clegg and Michael Toftdal.
26+
Copyright (C) 1996-2022 by Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.
27+
Copyright (C) 2004-2022 by Masatake YAMATO and Redhat K.K.
28+
Copyright (C) 2007-2022 by Derek Clegg and Michael Toftdal.
29+
Copyright (C) 2007-2022 by David Turner.
30+
Copyright (C) 2022 by David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
31+
Copyright (C) 2007-2022 by Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>.
32+
Copyright (C) 2008-2022 by David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya.
33+
Copyright (C) 2019-2022 by Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
34+
Copyright (C) 2009-2022 by Oran Agra and Mickey Gabel.
35+
Copyright (C) 2004-2022 by David Turner, Robert Wilhelm, Werner Lemberg, and George Williams.
36+
Copyright (C) 2004-2022 by Masatake YAMATO, Red Hat K.K.,
37+
Copyright (C) 2003-2022 by Masatake YAMATO, Redhat K.K.,
38+
Copyright (C) 2013-2022 by Google, Inc.
39+
Copyright (C) 2018-2022 by David Turner, Robert Wilhelm, Dominik Röttsches, and Werner Lemberg.
40+
Copyright (C) 2005-2022 by David Turner, Robert Wilhelm, and Werner Lemberg.
41+
Copyright 2013 by Google, Inc.
42+
43+
2344
The FreeType Project LICENSE
2445
----------------------------
2546
@@ -533,46 +554,34 @@ consider it more useful to permit linking proprietary applications with the
533554
library. If this is what you want to do, use the GNU Library General
534555
Public License instead of this License.
535556
536-
#########################################################################
537-
538-
--- fthash.c and fthash.h are covered by the following notices ---
539-
540-
/*
541-
* Copyright 2000 Computing Research Labs, New Mexico State University
542-
* Copyright 2001-2015
543-
* Francesco Zappa Nardelli
544-
*
545-
* Permission is hereby granted, free of charge, to any person obtaining a
546-
* copy of this software and associated documentation files (the "Software"),
547-
* to deal in the Software without restriction, including without limitation
548-
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
549-
* and/or sell copies of the Software, and to permit persons to whom the
550-
* Software is furnished to do so, subject to the following conditions:
551-
*
552-
* The above copyright notice and this permission notice shall be included in
553-
* all copies or substantial portions of the Software.
554-
*
555-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
556-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
557-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
558-
* THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
559-
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
560-
* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
561-
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
562-
*/
563-
564-
/**************************************************************************
565-
*
566-
* This file is based on code from bdf.c,v 1.22 2000/03/16 20:08:50
567-
*
568-
* taken from Mark Leisher's xmbdfed package
569-
*
570-
*/
571-
572-
#########################################################################
573-
574-
575-
--- FreeType 2 PSaux module is covered by the following notices ---
557+
```
558+
559+
### Additional Freetype Attributions
560+
```
561+
562+
---------------------------------
563+
The below license applies to the following files:
564+
libfreetype/src/psaux/psarrst.c
565+
libfreetype/src/psaux/psarrst.h
566+
libfreetype/src/psaux/psblues.c
567+
libfreetype/src/psaux/psblues.h
568+
libfreetype/src/psaux/pserror.c
569+
libfreetype/src/psaux/pserror.h
570+
libfreetype/src/psaux/psfixed.h
571+
libfreetype/src/psaux/psfont.c
572+
libfreetype/src/psaux/psfont.h
573+
libfreetype/src/psaux/psft.c
574+
libfreetype/src/psaux/psft.h
575+
libfreetype/src/psaux/psglue.h
576+
libfreetype/src/psaux/pshints.c
577+
libfreetype/src/psaux/pshints.h
578+
libfreetype/src/psaux/psintrp.c
579+
libfreetype/src/psaux/psintrp.h
580+
libfreetype/src/psaux/psread.c
581+
libfreetype/src/psaux/psread.h
582+
libfreetype/src/psaux/psstack.c
583+
libfreetype/src/psaux/psstack.h
584+
libfreetype/src/psaux/pstypes.h
576585
577586
Copyright 2006-2014 Adobe Systems Incorporated.
578587
@@ -603,7 +612,39 @@ have read and understood the terms and conditions of the
603612
FreeType Project License as well as those provided in this section,
604613
and you accept them fully.
605614
606-
#########################################################################
607615
608616
```
609617

618+
### MIT License
619+
```
620+
621+
---------------------------------
622+
The below license applies to the following files:
623+
libfreetype/include/freetype/internal/fthash.h
624+
libfreetype/src/base/fthash.c
625+
626+
Copyright 2000 Computing Research Labs, New Mexico State University
627+
Copyright 2001-2015
628+
629+
Francesco Zappa Nardelli
630+
631+
Permission is hereby granted, free of charge, to any person obtaining a
632+
copy of this software and associated documentation files (the "Software"),
633+
to deal in the Software without restriction, including without limitation
634+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
635+
and/or sell copies of the Software, and to permit persons to whom the
636+
Software is furnished to do so, subject to the following conditions:
637+
638+
The above copyright notice and this permission notice shall be included in
639+
all copies or substantial portions of the Software.
640+
641+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
642+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
643+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
644+
THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
645+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
646+
OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
647+
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
648+
649+
650+
```

0 commit comments

Comments
 (0)
Please sign in to comment.