[PATCH 10/11] cursor-data.h: Change SuSE licensed code from X11 to Expat

Thu Jun 11 06:57:32 PDT 2015

On Thu, 11 Jun 2015 15:18:44 +0200
Markus Slopianka <kamikazow at gmx.de> wrote:

> On Thursday 11 June 2015 11:55:48 Pekka Paalanen wrote:
> 
> > I don't think we should change this one at all. As you see from the
> > copyright, this code was copied from elsewhere.
> 
> I think Keith Packard is more than capable to comment on that on his own.

Let's CC Keith then, he won't notice otherwise.

Cheers,
pq

On Thu, 11 Jun 2015 11:55:48 +0300
Pekka Paalanen <ppaalanen at gmail.com> wrote:

> On Wed, 10 Jun 2015 11:55:21 -0700
> Bryce Harrington <bryce at osg.samsung.com> wrote:
> 
> > The license text for this file mentions SuSE 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/cursor-data.h | 34 +++++++++++++++++++---------------
> >  1 file changed, 19 insertions(+), 15 deletions(-)
> > 
> > diff --git a/cursor/cursor-data.h b/cursor/cursor-data.h
> > index b1026d7..0d03cd5 100644
> > --- a/cursor/cursor-data.h
> > +++ b/cursor/cursor-data.h
> > @@ -1,22 +1,26 @@
> >  /*
> >  * Copyright 1999 SuSE, Inc.
> >  *
> > -* 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 SuSE not be used in advertising or
> > -* publicity pertaining to distribution of the software without specific,
> > -* written prior permission.  SuSE 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:
> >  *
> > -* SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
> > -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
> > -* 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.
> >  *
> >  * Author:  Keith Packard, SuSE, Inc.
> >  */
> 
> Hi,
> 
> I don't think we should change this one at all. As you see from the
> copyright, this code was copied from elsewhere. It was definitely not
> written under the assumption that "Wayland is MIT licensed" which we
> use as the reason to be able to change the license text without
> re-licensing.
> 
> cursor-data.h was renamed from cursor_data.c in
> 0371668dcca5aa29c0fc4b59b974e40bcf073563 and the original commit is
> 
> commit 9ce9336c5704510a3f5a57ef377870764217f2ec
> Author: Philipp Brüschweiler <blei42 at gmail.com>
> Date:   Thu Sep 6 18:54:01 2012 +0200
> 
>     cursor: Add a default cursor theme
>     
>     This theme is loaded when the specified cursor theme can not be found.
>     
>     These cursors are extracted from the xorg sources and transformed into
>     raw ARGB data by a small helper program (commited separately).
> 
> 
> Thanks,
> pq

On Thu, 11 Jun 2015 11:57:13 +0300
Pekka Paalanen <ppaalanen at gmail.com> wrote:

> 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