Skip to contentSkip to conversation

libgdiplus: fix license

PATCH New Fabrice Fontaine 2 participants 3 messages May 2, 2018 – Dec 16, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 libgdiplus: fix license

libgdiplus is licensed under LGPL-2.1 or MPL-1.1 and not MIT, see:
http://patchwork.ozlabs.org/patch/906830

---
Changes v1 -> v2 (after review of Thomas Petazzoni and Sergio Prado):
- Fix license from MIT to LGPL-2.1 or MPL-1.1 (in a separate patch)

 package/libgdiplus/libgdiplus.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
package/libgdiplus/libgdiplus.mk +2 -7
index eb1858574d..52032d4f07 100644
@@ -6,13 +6,8 @@
 
 LIBGDIPLUS_VERSION = 5.4
 LIBGDIPLUS_SITE = $(call github,mono,libgdiplus,$(LIBGDIPLUS_VERSION))
-
-# Although there is a LICENSE file thas specifies LGPL or MPL-1.1,
-# looks like it is incorrect. The actual source files specify that
-# they're licensed under MIT, and so does the COPYING file (and they
-# all predate the addition of the LICENSE file).
-LIBGDIPLUS_LICENSE = MIT
-LIBGDIPLUS_LICENSE_FILES = COPYING src/carbon-private.h
+LIBGDIPLUS_LICENSE = LGPL-2.1 or MPL-1.1
+LIBGDIPLUS_LICENSE_FILES = LICENSE
 
 LIBGDIPLUS_INSTALL_STAGING = YES
 
Signature · 1 line
2.14.1
#1 lore raw

PATCH v2 2/2 libgdiplus: bump to version 5.6

Add hash for license file

---
Changes v1 -> v2 (after review of Thomas Petazzoni and Sergio Prado):
- Fix license from MIT to LGPL-2.1 or MPL-1.1 (in a separate patch)

 package/libgdiplus/libgdiplus.hash | 3 ++-
 package/libgdiplus/libgdiplus.mk   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
package/libgdiplus/libgdiplus.hash +2 -1
index 740fefd986..434fda8bd9 100644
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256 ce31da0c6952c8fd160813dfa9bf4a9a871bfe7284e9e3abff9a8ee689acfe58 libgdiplus-5.4.tar.gz
+sha256 6a75e4a476695cd6a1475fd6b989423ecf73978fd757673669771d8a6e13f756 libgdiplus-5.6.tar.gz
+sha256 91f86875b1116ec9644f2a07a00f2046534fbe1658fd571100602c71655aca6c LICENSE
package/libgdiplus/libgdiplus.mk +1 -1
index 52032d4f07..18da651d7b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGDIPLUS_VERSION = 5.4
+LIBGDIPLUS_VERSION = 5.6
 LIBGDIPLUS_SITE = $(call github,mono,libgdiplus,$(LIBGDIPLUS_VERSION))
 LIBGDIPLUS_LICENSE = LGPL-2.1 or MPL-1.1
 LIBGDIPLUS_LICENSE_FILES = LICENSE
Signature · 1 line
2.14.1
#2 lore raw

PATCH v2 2/2 libgdiplus: bump to version 5.6

Hello,

Quoted 6 lines · Fabrice Fontaine

Add hash for license file

---
Changes v1 -> v2 (after review of Thomas Petazzoni and Sergio Prado):
- Fix license from MIT to LGPL-2.1 or MPL-1.1 (in a separate patch)

I applied to master. I backported two upstream patches that fix the license file, so that it is consistent with the comments in the source code that says the license is MIT. So everything is clear in terms of licensing now.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com