From 22b8345ebc0c131d5ac51674ec7ae468b4c5d652 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 1 Apr 2021 10:25:33 -0700 Subject: [PATCH 1/4] CellWriter: fix license --- srcpkgs/CellWriter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/CellWriter/template b/srcpkgs/CellWriter/template index 13f6816868f4..fbaefb338aca 100644 --- a/srcpkgs/CellWriter/template +++ b/srcpkgs/CellWriter/template @@ -1,14 +1,14 @@ # Template file for 'CellWriter' pkgname=CellWriter version=1.3.6 -revision=1 +revision=2 wrksrc=cellwriter-${version} build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtk+-devel libXtst-devel" short_desc="Grid-entry natural handwriting input panel" maintainer="Michael Aldridge " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/risujin/cellwriter" distfiles="https://github.com/risujin/cellwriter/archive/${version}.tar.gz" checksum=17bb07226d4680b565b18a60494cb19cdf9067b427c8df7454c16d809de9963b From 813c569166b8603d1f6bc3c2562d976c984944a9 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Fri, 2 Apr 2021 23:41:45 -0700 Subject: [PATCH 2/4] GConf: fix license, verify python version --- srcpkgs/GConf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template index c107d556988c..4365c11e5844 100644 --- a/srcpkgs/GConf/template +++ b/srcpkgs/GConf/template @@ -1,7 +1,7 @@ # Template file for 'GConf' pkgname=GConf version=3.2.6 -revision=10 +revision=11 build_style=gnu-configure build_helper="gir" configure_args="--without-openldap --enable-gtk --enable-defaults-service @@ -13,11 +13,11 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel" depends="dconf" short_desc="Process-transparent configuration system" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://projects.gnome.org/gconf" distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz" checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c -python_version=2 #unverified +python_version=2 make_dirs="/usr/share/gconf/schemas 0755 root root /etc/gconf/gconf.xml.defaults 0755 root root /etc/gconf/gconf.xml.mandatory 0755 root root From 62ec2994c71ae8fff2ff12c49bd5632c888a3d0a Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Fri, 2 Apr 2021 23:44:24 -0700 Subject: [PATCH 3/4] GCP-base: fix license --- srcpkgs/GCP-base/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/GCP-base/template b/srcpkgs/GCP-base/template index 2bc890b9ce49..cd2477e3644a 100644 --- a/srcpkgs/GCP-base/template +++ b/srcpkgs/GCP-base/template @@ -1,7 +1,7 @@ # Template file for 'GCP-base' pkgname=GCP-base version=1 -revision=2 +revision=3 archs="x86_64*" build_style=meta depends="grub GCP-Guest-Environment" @@ -11,5 +11,5 @@ short_desc="Base components for the Google Cloud Platform images" # when I have free time. I use my work email for this only because it # makes a little more sense to me than my VoidLinux email. maintainer="Michael Aldridge " -license="GPL-3" +license="GPL-3.0-only" homepage="http://cloud.google.com/" From 45bdc03d626deaa110a5f8f62a847832587535d4 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sat, 3 Apr 2021 09:41:59 -0700 Subject: [PATCH 4/4] OpenCPN: fix license --- srcpkgs/OpenCPN/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/OpenCPN/template b/srcpkgs/OpenCPN/template index 7ba81e8fb966..ee67dbaff01c 100644 --- a/srcpkgs/OpenCPN/template +++ b/srcpkgs/OpenCPN/template @@ -1,7 +1,7 @@ # Template file for 'OpenCPN' pkgname=OpenCPN version=5.2.0 -revision=1 +revision=2 build_style=cmake build_helper=cmake-wxWidgets-gtk3 configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON @@ -16,7 +16,7 @@ depends="gpsd hicolor-icon-theme OpenCPN-tcdata-${version}_${revision} OpenCPN-gshhs-crude" short_desc="Concise ChartPlotter/Navigator" maintainer="John " -license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, wxWidgets, JasPer-2.0, BSD-3-Clause, SGI-B-2.0" +license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, WxWindows-exception-3.1, JasPer-2.0, BSD-3-Clause, SGI-B-2.0" homepage="https://opencpn.org/" distfiles="https://github.com/OpenCPN/OpenCPN/archive/v${version}.tar.gz" checksum=f6ec38989bc38f5a7f63234c5e0230adeb73f5626b4e3d3dfa680f0c240badc7