From 1ad35b70998f62c3b0877f4a303e0780d06ff9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 1 Oct 2020 23:01:02 +0700 Subject: [PATCH 1/3] numlockx: released under MIT not JSON JSON is non-free-license. --- srcpkgs/numlockx/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/numlockx/template b/srcpkgs/numlockx/template index c219eb2e32a542..12669f492c4adf 100644 --- a/srcpkgs/numlockx/template +++ b/srcpkgs/numlockx/template @@ -1,12 +1,12 @@ # Template file for 'numlockx' pkgname=numlockx version=1.2 -revision=4 +revision=5 build_style=gnu-configure makedepends="libX11-devel libSM-devel libXext-devel libXtst-devel" short_desc="Activate NumLock at startup" -maintainer="Carlo Dormeletti " -license="JSON" +maintainer="Carlo Dormeletti " +license="MIT" homepage="http://www.mike-devlin.com/linux/README-numlockx.htm" distfiles="${DEBIAN_SITE}/main/n/${pkgname}/${pkgname}_${version}.orig.tar.gz" checksum=e468eb9121c94c9089dc6a287eeb347e900ce04a14be37da29d7696cbce772e4 From a29769553fb978c703098028fe83eb0d92af3b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 1 Oct 2020 23:07:45 +0700 Subject: [PATCH 2/3] rapidjson: clear all JSON licensed code --- srcpkgs/rapidjson/template | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/srcpkgs/rapidjson/template b/srcpkgs/rapidjson/template index 6bc0b221f886f6..84a5e608777c7e 100644 --- a/srcpkgs/rapidjson/template +++ b/srcpkgs/rapidjson/template @@ -1,18 +1,25 @@ -# Template build file for 'rapidjson'. +# Template file for 'rapidjson' pkgname=rapidjson version=1.1.0 -revision=2 +revision=3 build_style=cmake -archs=noarch -short_desc="A fast JSON parser/generator for C++ with both SAX/DOM style API" +short_desc="Fast JSON parser/generator for C++ with both SAX/DOM style API" maintainer="Alexander Egorenkov " -license="BSD, MIT" +license="BSD-3-Clause, MIT" homepage="https://github.com/miloyip/rapidjson" distfiles="https://github.com/miloyip/${pkgname}/archive/v${version}.tar.gz" checksum=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e CXXFLAGS="-Wno-type-limits" +post_patch() { + # Remove bin/jsonchecker, which is the JSON licensed files + rm -rf bin/jsonchecker + vsed -i license.txt \ + -e 's/To avoid the problematic JSON.*//' \ + -e '/Under the JSON License/,/OTHER DEALINGS IN THE SOFTWARE/d' +} + post_install() { vlicense license.txt } From 11de32a59094d844595ef6649c5f7bc48c5eea87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 1 Oct 2020 23:18:37 +0700 Subject: [PATCH 3/3] rlottie: clear JSON license mention The tarball never contains any non-free JSON licensed code. --- srcpkgs/rlottie/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rlottie/template b/srcpkgs/rlottie/template index c4c9b65ff1e4c8..8902680b215f56 100644 --- a/srcpkgs/rlottie/template +++ b/srcpkgs/rlottie/template @@ -2,19 +2,23 @@ pkgname=rlottie _commit=f6fc61f214945ac9961ba49fdfc9a3d3336e999b version=0.0.20200110 -revision=1 +revision=2 wrksrc="rlottie-${_commit}" build_style=cmake configure_args="-DLOTTIE_CACHE=OFF" short_desc="Platform independent standalone library that plays Lottie Animation" maintainer="John " -license="LGPL-2.1-or-later, FTL, MIT, JSON, BSD-3-Clause" +license="LGPL-2.1-or-later, FTL, MIT, BSD-3-Clause" homepage="https://github.com/Samsung/rlottie" distfiles="https://github.com/Samsung/rlottie/archive/${_commit}.tar.gz" checksum=399bb06d8d2120f794eff8bc3e4cbbee13b9f22abcfd9f3f746f595d43ea0b42 post_patch() { vsed -e 's/c++14/c++17/g' -i CMakeLists.txt + # No JSON licensed source code included + vsed -i licenses/COPYING.RPD \ + -e 's/To avoid the problematic JSON.*//' \ + -e '/Under the JSON License/,/OTHER DEALINGS IN THE SOFTWARE/d' } post_install() {