From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 04 Aug 2021 08:14:50 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mBAB0-0004ZG-1y for lore@lore.pengutronix.de; Wed, 04 Aug 2021 08:14:50 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mBAAz-0007Jy-QP; Wed, 04 Aug 2021 08:14:49 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mBAAN-0007Jn-3i; Wed, 04 Aug 2021 08:14:11 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mBAAM-0008GW-Jf; Wed, 04 Aug 2021 08:14:10 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1mBAAM-00FM7V-Iv; Wed, 04 Aug 2021 08:14:10 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 4 Aug 2021 08:14:10 +0200 Message-Id: <20210804061410.3658705-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210730083157.7588-1-bst@pengutronix.de> References: <20210730083157.7588-1-bst@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] cairo: fix license identifier X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Bastian Krause Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 2a1b1370ddd6805041d14af9314aad832aa33c31. Michael [sent from post-receive hook] On Wed, 04 Aug 2021 08:14:10 +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/) > > While at it, pin down the copying files. > > Signed-off-by: Bastian Krause > Message-Id: <20210730083157.7588-1-bst@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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