mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v3] cairo: fix license identifier
@ 2021-07-30  8:31 Bastian Krause
  2021-08-04  6:14 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Bastian Krause @ 2021-07-30  8:31 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 files.

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
Changes since (implicit) v1:
- add CAIRO_LICENSE_FILES pinning down COPYING

Changes since v2:
- add COPYING-LGPL-2.1 and COPYING-MPL-1.1 to CAIRO_LICENSE_FILES
---
 rules/cairo.make | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rules/cairo.make b/rules/cairo.make
index cfaa74518..6d2f05272 100644
--- a/rules/cairo.make
+++ b/rules/cairo.make
@@ -21,7 +21,11 @@ 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 \
+	file://COPYING-LGPL-2.1;md5=c9bb0ee6dbe833915b94063d594c4bfc \
+	file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325
 
 # ----------------------------------------------------------------------------
 # 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] 2+ messages in thread

* Re: [ptxdist] [APPLIED] cairo: fix license identifier
  2021-07-30  8:31 [ptxdist] [PATCH v3] cairo: fix license identifier Bastian Krause
@ 2021-08-04  6:14 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2021-08-04  6:14 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Thanks, applied as 2a1b1370ddd6805041d14af9314aad832aa33c31.

Michael

[sent from post-receive hook]

On Wed, 04 Aug 2021 08:14:10 +0200, Bastian Krause <bst@pengutronix.de> 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 files.
> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20210730083157.7588-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/cairo.make b/rules/cairo.make
> index cfaa745181c9..6d2f05272405 100644
> --- a/rules/cairo.make
> +++ b/rules/cairo.make
> @@ -21,7 +21,11 @@ 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 \
> +	file://COPYING-LGPL-2.1;md5=c9bb0ee6dbe833915b94063d594c4bfc \
> +	file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

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


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

end of thread, other threads:[~2021-08-04  6:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-30  8:31 [ptxdist] [PATCH v3] cairo: fix license identifier Bastian Krause
2021-08-04  6:14 ` [ptxdist] [APPLIED] " 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