From 3210a2c7315b9f49809d21e5ff4646b68d106682 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Dec 2019 23:29:14 +0100 Subject: [PATCH] package/qpdf: fix license qpdf is also licensed under Apache-2.0 since version 7.0.0 and https://github.com/qpdf/qpdf/commit/07c8bb2843f1a975a27d396da33d813a1537ee3a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 984bdfb0276e313c770061c7793fa8b30f34f04a) Signed-off-by: Peter Korsgaard --- package/qpdf/qpdf.hash | 1 + package/qpdf/qpdf.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/qpdf/qpdf.hash b/package/qpdf/qpdf.hash index 4bf2d3b30d..6109306720 100644 --- a/package/qpdf/qpdf.hash +++ b/package/qpdf/qpdf.hash @@ -1,4 +1,5 @@ # From https://sourceforge.net/projects/qpdf/files/qpdf/8.2.1/qpdf-8.2.1.sha512/download sha512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c qpdf-8.2.1.tar.gz # Locally computed: +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt sha256 fb929ac30decb4dc3a2eea2bec6c43296a797c5d2d602deb3784ee39430583d5 Artistic-2.0 diff --git a/package/qpdf/qpdf.mk b/package/qpdf/qpdf.mk index 2f6efdd73e..7bdac5f74e 100644 --- a/package/qpdf/qpdf.mk +++ b/package/qpdf/qpdf.mk @@ -7,8 +7,8 @@ QPDF_VERSION = 8.2.1 QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION) QPDF_INSTALL_STAGING = YES -QPDF_LICENSE = Artistic-2.0 -QPDF_LICENSE_FILES = Artistic-2.0 +QPDF_LICENSE = Apache-2.0 or Artistic-2.0 +QPDF_LICENSE_FILES = LICENSE.txt Artistic-2.0 QPDF_DEPENDENCIES = pcre zlib jpeg QPDF_CONF_OPTS = --without-random