mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cursor: Update printed license from MIT "X11" to MIT "Expat"

Browse source 
The code generates a cursor-data.h file, with licensing information.
Change this from the MIT "X11" license to MIT "Expat" license for
consistency with the rest of Wayland.

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Bryce Harrington 2015-06-12 16:44:16 -07:00 • committed by Pekka Paalanen
parent 40925634e6
commit a8a86010a6
1 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

52
cursor/convert_font.c
View file

@ -333,30 +333,38 @@ reconstruct_glyph(struct glyph *cursor, struct glyph *mask, char *name,
} }
} }
/* From http://cgit.freedesktop.org/xorg/lib/libXfont/tree/src/builtins/fonts.c */ /*
* Originally from
* http://cgit.freedesktop.org/xorg/lib/libXfont/tree/src/builtins/fonts.c
* Changed to the MIT "Expat" style license for Wayland..
*/
static const char cursor_licence[] = static const char cursor_licence[] =
"/*\n" "/*\n"
"* Copyright 1999 SuSE, Inc.\n" "* Copyright 1999 SuSE, Inc.\n"
"*\n" "*\n"
"* Permission to use, copy, modify, distribute, and sell this software and its\n" "* Permission is hereby granted, free of charge, to any person obtaining\n"
"* documentation for any purpose is hereby granted without fee, provided that\n" "* a copy of this software and associated documentation files (the\n"
"* the above copyright notice appear in all copies and that both that\n" "* \"Software\"), to deal in the Software without restriction, including\n"
"* copyright notice and this permission notice appear in supporting\n" "* without limitation the rights to use, copy, modify, merge, publish,\n"
"* documentation, and that the name of SuSE not be used in advertising or\n" "* distribute, sublicense, and/or sell copies of the Software, and to\n"
"* publicity pertaining to distribution of the software without specific,\n" "* permit persons to whom the Software is furnished to do so, subject to\n"
"* written prior permission. SuSE makes no representations about the\n" "* the following conditions:\n"
"* suitability of this software for any purpose. It is provided \"as is\"\n" "*\n"
"* without express or implied warranty.\n" "* The above copyright notice and this permission notice (including the\n"
"*\n" "* next paragraph) shall be included in all copies or substantial\n"
"* SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL\n" "* portions of the Software.\n"
"* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE\n" "*\n"
"* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\n" "* THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n"
"* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION\n" "* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n"
"* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN\n" "* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n"
"* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n" "* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\n"
"*\n" "* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\n"
"* Author: Keith Packard, SuSE, Inc.\n" "* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\n"
"*/\n"; "* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n"
"* SOFTWARE.\n"
"*\n"
"* Author: Keith Packard, SuSE, Inc.\n"
"*/\n";
static void static void
write_output_file(struct reconstructed_glyph *glyphs, int n) write_output_file(struct reconstructed_glyph *glyphs, int n)