* [ptxdist] [PATCH] cairo: fix license identifier @ 2021-07-28 9:01 Bastian Krause 2021-07-28 9:49 ` Roland Hieber 0 siblings, 1 reply; 6+ messages in thread From: Bastian Krause @ 2021-07-28 9:01 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/) Signed-off-by: Bastian Krause <bst@pengutronix.de> --- rules/cairo.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/cairo.make b/rules/cairo.make index cfaa74518..cbcb76b5f 100644 --- a/rules/cairo.make +++ b/rules/cairo.make @@ -21,7 +21,7 @@ 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 # ---------------------------------------------------------------------------- # 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] 6+ messages in thread
* Re: [ptxdist] [PATCH] cairo: fix license identifier 2021-07-28 9:01 [ptxdist] [PATCH] cairo: fix license identifier Bastian Krause @ 2021-07-28 9:49 ` Roland Hieber 2021-07-28 10:39 ` Michael Olbrich 2021-07-28 11:48 ` Bastian Krause 0 siblings, 2 replies; 6+ messages in thread From: Roland Hieber @ 2021-07-28 9:49 UTC (permalink / raw) To: Bastian Krause; +Cc: ptxdist On Wed, Jul 28, 2021 at 11:01:07AM +0200, 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/) > > Signed-off-by: Bastian Krause <bst@pengutronix.de> > --- > rules/cairo.make | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rules/cairo.make b/rules/cairo.make > index cfaa74518..cbcb76b5f 100644 > --- a/rules/cairo.make > +++ b/rules/cairo.make > @@ -21,7 +21,7 @@ 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 Is there anything that you can pin down for CAIRO_LICENSE_FILES? - Roland > > # ---------------------------------------------------------------------------- > # Prepare > -- > 2.30.2 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de > -- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://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] 6+ messages in thread
* Re: [ptxdist] [PATCH] cairo: fix license identifier 2021-07-28 9:49 ` Roland Hieber @ 2021-07-28 10:39 ` Michael Olbrich 2021-07-28 11:54 ` Bastian Krause 2021-07-28 11:48 ` Bastian Krause 1 sibling, 1 reply; 6+ messages in thread From: Michael Olbrich @ 2021-07-28 10:39 UTC (permalink / raw) To: ptxdist On Wed, Jul 28, 2021 at 11:49:28AM +0200, Roland Hieber wrote: > On Wed, Jul 28, 2021 at 11:01:07AM +0200, 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/) > > > > Signed-off-by: Bastian Krause <bst@pengutronix.de> > > --- > > rules/cairo.make | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/rules/cairo.make b/rules/cairo.make > > index cfaa74518..cbcb76b5f 100644 > > --- a/rules/cairo.make > > +++ b/rules/cairo.make > > @@ -21,7 +21,7 @@ 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 > > Is there anything that you can pin down for CAIRO_LICENSE_FILES? Yes please. And include the file/lines of the quote above. Michael > - Roland > > > > > # ---------------------------------------------------------------------------- > > # Prepare > > -- > > 2.30.2 > > > > > > _______________________________________________ > > ptxdist mailing list > > ptxdist@pengutronix.de > > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de > > > > -- > Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | > Steuerwalder Str. 21 | https://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] 6+ messages in thread
* Re: [ptxdist] [PATCH] cairo: fix license identifier 2021-07-28 10:39 ` Michael Olbrich @ 2021-07-28 11:54 ` Bastian Krause 0 siblings, 0 replies; 6+ messages in thread From: Bastian Krause @ 2021-07-28 11:54 UTC (permalink / raw) To: ptxdist On 7/28/21 12:39 PM, Michael Olbrich wrote: > On Wed, Jul 28, 2021 at 11:49:28AM +0200, Roland Hieber wrote: >> On Wed, Jul 28, 2021 at 11:01:07AM +0200, 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/) >>> >>> Signed-off-by: Bastian Krause <bst@pengutronix.de> >>> --- >>> rules/cairo.make | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/rules/cairo.make b/rules/cairo.make >>> index cfaa74518..cbcb76b5f 100644 >>> --- a/rules/cairo.make >>> +++ b/rules/cairo.make >>> @@ -21,7 +21,7 @@ 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 >> >> Is there anything that you can pin down for CAIRO_LICENSE_FILES? > > Yes please. And include the file/lines of the quote above. The quote above is from the website. A similar clarification is in the COPYING file itself. Regards, Bastian -- 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] 6+ messages in thread
* Re: [ptxdist] [PATCH] cairo: fix license identifier 2021-07-28 9:49 ` Roland Hieber 2021-07-28 10:39 ` Michael Olbrich @ 2021-07-28 11:48 ` Bastian Krause 2021-07-28 12:02 ` Roland Hieber 1 sibling, 1 reply; 6+ messages in thread From: Bastian Krause @ 2021-07-28 11:48 UTC (permalink / raw) To: Roland Hieber; +Cc: ptxdist On 7/28/21 11:49 AM, Roland Hieber wrote: > On Wed, Jul 28, 2021 at 11:01:07AM +0200, 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/) >> >> Signed-off-by: Bastian Krause <bst@pengutronix.de> >> --- >> rules/cairo.make | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/rules/cairo.make b/rules/cairo.make >> index cfaa74518..cbcb76b5f 100644 >> --- a/rules/cairo.make >> +++ b/rules/cairo.make >> @@ -21,7 +21,7 @@ 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 > > Is there anything that you can pin down for CAIRO_LICENSE_FILES? I can pin the COPYING file, will send a v2. Note that the licensing did not change, the specifier was simply wrong in the first place. This seems to be a result of 00c6e91b6 ("License report: unify all license lists"). This commit seems to replace all occurrences of ", " with " AND ", not considering dual-licensing at all. Regards, Bastian -- 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] 6+ messages in thread
* Re: [ptxdist] [PATCH] cairo: fix license identifier 2021-07-28 11:48 ` Bastian Krause @ 2021-07-28 12:02 ` Roland Hieber 0 siblings, 0 replies; 6+ messages in thread From: Roland Hieber @ 2021-07-28 12:02 UTC (permalink / raw) To: Bastian Krause; +Cc: ptxdist On Wed, Jul 28, 2021 at 01:48:09PM +0200, Bastian Krause wrote: > > On 7/28/21 11:49 AM, Roland Hieber wrote: > > On Wed, Jul 28, 2021 at 11:01:07AM +0200, 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/) > >> > >> Signed-off-by: Bastian Krause <bst@pengutronix.de> > >> --- > >> rules/cairo.make | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/rules/cairo.make b/rules/cairo.make > >> index cfaa74518..cbcb76b5f 100644 > >> --- a/rules/cairo.make > >> +++ b/rules/cairo.make > >> @@ -21,7 +21,7 @@ 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 > > > > Is there anything that you can pin down for CAIRO_LICENSE_FILES? > > I can pin the COPYING file, will send a v2. Note that the licensing did > not change, the specifier was simply wrong in the first place. > > This seems to be a result of 00c6e91b6 ("License report: unify all > license lists"). This commit seems to replace all occurrences of ", " > with " AND ", not considering dual-licensing at all. Yes, I already saw a few commits by Michael recently correcting other such occurences in the code base… - Roland -- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://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] 6+ messages in thread
end of thread, other threads:[~2021-07-28 12:02 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-07-28 9:01 [ptxdist] [PATCH] cairo: fix license identifier Bastian Krause 2021-07-28 9:49 ` Roland Hieber 2021-07-28 10:39 ` Michael Olbrich 2021-07-28 11:54 ` Bastian Krause 2021-07-28 11:48 ` Bastian Krause 2021-07-28 12:02 ` Roland Hieber
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox