mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v2] cairo: fix license identifier
@ 2021-07-28 11:51 Bastian Krause
  2021-07-28 11:55 ` Bastian Krause
  0 siblings, 1 reply; 4+ messages in thread
From: Bastian Krause @ 2021-07-28 11:51 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Cairo is dual-licensed:

"Cairo is free software and is available to be redistributed and/or
modified under the terms of either the GNU Lesser General Public License
(LGPL) version 2.1 or the Mozilla Public License (MPL) version 1.1 at
your option." (https://www.cairographics.org/)

While at it, pin down the COPYING file.

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/cairo.make | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rules/cairo.make b/rules/cairo.make
index cfaa74518..3e52ea233 100644
--- a/rules/cairo.make
+++ b/rules/cairo.make
@@ -21,7 +21,9 @@ CAIRO_SUFFIX	:= tar.xz
 CAIRO_URL	:= http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
 CAIRO_SOURCE	:= $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX)
 CAIRO_DIR	:= $(BUILDDIR)/$(CAIRO)
-CAIRO_LICENSE	:= LGPL-2.1-only AND MPL-1.1
+CAIRO_LICENSE	:= LGPL-2.1-only OR MPL-1.1
+CAIRO_LICENSE_FILES := \
+	file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [PATCH v2] cairo: fix license identifier
  2021-07-28 11:51 [ptxdist] [PATCH v2] cairo: fix license identifier Bastian Krause
@ 2021-07-28 11:55 ` Bastian Krause
  2021-07-28 11:58   ` Bastian Krause
  2021-07-30  8:16   ` Michael Olbrich
  0 siblings, 2 replies; 4+ messages in thread
From: Bastian Krause @ 2021-07-28 11:55 UTC (permalink / raw)
  To: ptxdist


On 7/28/21 1:51 PM, Bastian Krause wrote:
> Cairo is dual-licensed:
> 
> "Cairo is free software and is available to be redistributed and/or
> modified under the terms of either the GNU Lesser General Public License
> (LGPL) version 2.1 or the Mozilla Public License (MPL) version 1.1 at
> your option." (https://www.cairographics.org/)
> 
> While at it, pin down the COPYING file.
> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>

Forgot the changelog:

Changes since (implicit) v1:
- add CAIRO_LICENSE_FILES pinning down COPYING, which states:

"See the following files in this directory for the precise terms and
conditions of either license:

        COPYING-LGPL-2.1
        COPYING-MPL-1.1"

Regards,
Bastian

> ---
>  rules/cairo.make | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/cairo.make b/rules/cairo.make
> index cfaa74518..3e52ea233 100644
> --- a/rules/cairo.make
> +++ b/rules/cairo.make
> @@ -21,7 +21,9 @@ CAIRO_SUFFIX	:= tar.xz
>  CAIRO_URL	:= http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
>  CAIRO_SOURCE	:= $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX)
>  CAIRO_DIR	:= $(BUILDDIR)/$(CAIRO)
> -CAIRO_LICENSE	:= LGPL-2.1-only AND MPL-1.1
> +CAIRO_LICENSE	:= LGPL-2.1-only OR MPL-1.1
> +CAIRO_LICENSE_FILES := \
> +	file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> 


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [PATCH v2] cairo: fix license identifier
  2021-07-28 11:55 ` Bastian Krause
@ 2021-07-28 11:58   ` Bastian Krause
  2021-07-30  8:16   ` Michael Olbrich
  1 sibling, 0 replies; 4+ messages in thread
From: Bastian Krause @ 2021-07-28 11:58 UTC (permalink / raw)
  To: ptxdist


On 7/28/21 1:55 PM, Bastian Krause wrote:
> 
> On 7/28/21 1:51 PM, Bastian Krause wrote:
>> Cairo is dual-licensed:
>>
>> "Cairo is free software and is available to be redistributed and/or
>> modified under the terms of either the GNU Lesser General Public License
>> (LGPL) version 2.1 or the Mozilla Public License (MPL) version 1.1 at
>> your option." (https://www.cairographics.org/)
>>
>> While at it, pin down the COPYING file.
>>
>> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> 
> Forgot the changelog:
> 
> Changes since (implicit) v1:
> - add CAIRO_LICENSE_FILES pinning down COPYING, which states:
> 
> "See the following files in this directory for the precise terms and
> conditions of either license:
> 
>         COPYING-LGPL-2.1
>         COPYING-MPL-1.1"

For the record: A better quote from COPYING regarding dual-licensing:

"Every source file in the implementation[*] of cairo is available to be
redistributed and/or modified under the terms of either the GNU Lesser
General Public License (LGPL) version 2.1 or the Mozilla Public
License (MPL) version 1.1.  Some files are available under more
liberal terms, but we believe that in all cases, each file may be used
under either the LGPL or the MPL."

Regards,
Bastian

> 
>> ---
>>  rules/cairo.make | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/rules/cairo.make b/rules/cairo.make
>> index cfaa74518..3e52ea233 100644
>> --- a/rules/cairo.make
>> +++ b/rules/cairo.make
>> @@ -21,7 +21,9 @@ CAIRO_SUFFIX	:= tar.xz
>>  CAIRO_URL	:= http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
>>  CAIRO_SOURCE	:= $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX)
>>  CAIRO_DIR	:= $(BUILDDIR)/$(CAIRO)
>> -CAIRO_LICENSE	:= LGPL-2.1-only AND MPL-1.1
>> +CAIRO_LICENSE	:= LGPL-2.1-only OR MPL-1.1
>> +CAIRO_LICENSE_FILES := \
>> +	file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77
>>  
>>  # ----------------------------------------------------------------------------
>>  # Prepare
>>
> 
> 


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [PATCH v2] cairo: fix license identifier
  2021-07-28 11:55 ` Bastian Krause
  2021-07-28 11:58   ` Bastian Krause
@ 2021-07-30  8:16   ` Michael Olbrich
  1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2021-07-30  8:16 UTC (permalink / raw)
  To: Bastian Krause; +Cc: ptxdist

On Wed, Jul 28, 2021 at 01:55:30PM +0200, Bastian Krause wrote:
> 
> On 7/28/21 1:51 PM, Bastian Krause wrote:
> > Cairo is dual-licensed:
> > 
> > "Cairo is free software and is available to be redistributed and/or
> > modified under the terms of either the GNU Lesser General Public License
> > (LGPL) version 2.1 or the Mozilla Public License (MPL) version 1.1 at
> > your option." (https://www.cairographics.org/)
> > 
> > While at it, pin down the COPYING file.
> > 
> > Signed-off-by: Bastian Krause <bst@pengutronix.de>
> 
> Forgot the changelog:
> 
> Changes since (implicit) v1:
> - add CAIRO_LICENSE_FILES pinning down COPYING, which states:
> 
> "See the following files in this directory for the precise terms and
> conditions of either license:
> 
>         COPYING-LGPL-2.1
>         COPYING-MPL-1.1"

Those should be listed in CAIRO_LICENSE_FILES as well.

Michael

> > ---
> >  rules/cairo.make | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/rules/cairo.make b/rules/cairo.make
> > index cfaa74518..3e52ea233 100644
> > --- a/rules/cairo.make
> > +++ b/rules/cairo.make
> > @@ -21,7 +21,9 @@ CAIRO_SUFFIX	:= tar.xz
> >  CAIRO_URL	:= http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
> >  CAIRO_SOURCE	:= $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX)
> >  CAIRO_DIR	:= $(BUILDDIR)/$(CAIRO)
> > -CAIRO_LICENSE	:= LGPL-2.1-only AND MPL-1.1
> > +CAIRO_LICENSE	:= LGPL-2.1-only OR MPL-1.1
> > +CAIRO_LICENSE_FILES := \
> > +	file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77
> >  
> >  # ----------------------------------------------------------------------------
> >  # Prepare
> > 
> 
> 
> -- 
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-07-30  8:17 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-28 11:51 [ptxdist] [PATCH v2] cairo: fix license identifier Bastian Krause
2021-07-28 11:55 ` Bastian Krause
2021-07-28 11:58   ` Bastian Krause
2021-07-30  8:16   ` Michael Olbrich

mailarchive of the ptxdist mailing list

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lore.ptxdist.org/ptxdist/0 ptxdist/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ptxdist ptxdist/ https://lore.ptxdist.org/ptxdist \
		ptxdist@pengutronix.de
	public-inbox-index ptxdist

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git