[PATCH 11/11] xcursor: Change keithp licensed code from X11 to Expat license

[Pekka Paalanen]

On Wed, 10 Jun 2015 11:55:22 -0700
Bryce Harrington <bryce at osg.samsung.com> wrote:

> The license text for this file mentions Keith Packard specifically,
> however it is otherwise identical to all the other MIT X11 licensed code
> in Wayland, and so can be changed to the substantially identical MIT
> Expat license.
> 
> Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
> ---
>  cursor/xcursor.c | 35 +++++++++++++++++++----------------
>  cursor/xcursor.h | 35 +++++++++++++++++++----------------
>  2 files changed, 38 insertions(+), 32 deletions(-)
> 
> diff --git a/cursor/xcursor.c b/cursor/xcursor.c
> index f9d9669..ca41c4a 100644
> --- a/cursor/xcursor.c
> +++ b/cursor/xcursor.c
> @@ -1,23 +1,26 @@
>  /*
>   * Copyright © 2002 Keith Packard
>   *
> - * Permission to use, copy, modify, distribute, and sell this software and its
> - * documentation for any purpose is hereby granted without fee, provided that
> - * the above copyright notice appear in all copies and that both that
> - * copyright notice and this permission notice appear in supporting
> - * documentation, and that the name of Keith Packard not be used in
> - * advertising or publicity pertaining to distribution of the software without
> - * specific, written prior permission.  Keith Packard makes no
> - * representations about the suitability of this software for any purpose.  It
> - * is provided "as is" without express or implied warranty.
> + * Permission is hereby granted, free of charge, to any person obtaining
> + * a copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sublicense, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
>   *
> - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
> - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
> - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
> - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
> - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
> - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial
> + * portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
> + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
> + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
> + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> + * SOFTWARE.
>   */
>  
>  #include "xcursor.h"
> diff --git a/cursor/xcursor.h b/cursor/xcursor.h
> index f518767..62e2322 100644
> --- a/cursor/xcursor.h
> +++ b/cursor/xcursor.h
> @@ -1,23 +1,26 @@
>  /*
>   * Copyright © 2002 Keith Packard
>   *
> - * Permission to use, copy, modify, distribute, and sell this software and its
> - * documentation for any purpose is hereby granted without fee, provided that
> - * the above copyright notice appear in all copies and that both that
> - * copyright notice and this permission notice appear in supporting
> - * documentation, and that the name of Keith Packard not be used in
> - * advertising or publicity pertaining to distribution of the software without
> - * specific, written prior permission.  Keith Packard makes no
> - * representations about the suitability of this software for any purpose.  It
> - * is provided "as is" without express or implied warranty.
> + * Permission is hereby granted, free of charge, to any person obtaining
> + * a copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sublicense, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
>   *
> - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
> - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
> - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
> - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
> - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
> - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial
> + * portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
> + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
> + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
> + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> + * SOFTWARE.
>   */
>  
>  #ifndef XCURSOR_H

Hi,

the same reasoning here as for patch 10, that these particular licenses
we should not change, I believe.

The files were introduced by:

commit 775002c6c0f841a034a286c756899e6a4371962b
Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
Date:   Tue May 22 15:39:41 2012 +0300

    Introduce libwayland-cursor, a cursor helper library
    
    The purpose of this library is to be the equivalent of libXcursor in
    the X world. This library is compatible with X cursor themes and loads
    them directly into an shm pool making it easy for the clients to get
    buffer for each cursor image.
    
    The code for handling the X cursor theme was taken from libXcursor. The
    files cursor/xcursor.[ch] are a stripped down version of that library
    containing only the interfaces necessary for implementing the wayland
    counterpart.


Thanks,
pq