[-- Attachment #1: Type: text/plain, Size: 1618 bytes --] There is a new pull request by heliocat against master on the void-packages repository https://github.com/heliocat/void-packages lint_k https://github.com/void-linux/void-packages/pull/30664 Omnibus lint pass for SPDX errors - most packages starting with K <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [x] I built this PR locally for my native architecture, (x86_64) - [x] I built this PR locally for these architectures (if supported. mark crossbuilds): - [x] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/30664.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-lint_k-30664.patch --] [-- Type: text/x-diff, Size: 7401 bytes --] From 482b0d48d068da591423f3190ce48a04f8b60b01 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Sat, 1 May 2021 13:28:28 -0700 Subject: [PATCH 1/6] kinfocenter: fix license --- srcpkgs/kinfocenter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template index f3854c636e4e..825a1234b7ea 100644 --- a/srcpkgs/kinfocenter/template +++ b/srcpkgs/kinfocenter/template @@ -1,7 +1,7 @@ # Template file for 'kinfocenter' pkgname=kinfocenter version=5.21.4 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config qt5-host-tools qt5-qmake" @@ -11,7 +11,7 @@ makedepends="kdoctools plasma-framework-devel kdesignerplugin-devel kcmutils-dev depends="hwids" short_desc="KDE Info Center" maintainer="John <me@johnnynator.dev>" -license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2" +license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only" homepage="https://invent.kde.org/plasma/kinfocenter" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=3e5c3fed0156f3464bb30ebb9e0822c4141d71802dfa8995961f84c548771394 From 7679b01abd8503025369674caacca00fd1dc6b7d Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Sat, 1 May 2021 13:36:47 -0700 Subject: [PATCH 2/6] klystrack: fix license --- srcpkgs/klystrack/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/klystrack/template b/srcpkgs/klystrack/template index 927645f0787c..fa15065adcad 100644 --- a/srcpkgs/klystrack/template +++ b/srcpkgs/klystrack/template @@ -1,14 +1,14 @@ # Template file for 'klystrack' pkgname=klystrack version=1.7.3 -revision=1 +revision=2 _klystronsha=f5114db4de299ece73852becbef56d7d461bf421 create_wrksrc=yes hostmakedepends="SDL2-devel" makedepends="SDL2_image-devel SDL2_mixer-devel" short_desc="Chiptune music tracker" maintainer="allan <mail@may.mooo.com>" -license="BSD" +license="MIT" homepage="http://kometbomb.github.io/klystrack/" distfiles="https://github.com/kometbomb/klystrack/archive/${version}.tar.gz https://github.com/kometbomb/klystron/archive/${_klystronsha}.tar.gz" @@ -45,5 +45,5 @@ do_install() { vcopy key usr/lib/klystrack vmkdir usr/share/examples/klystrack vcopy examples usr/share/examples/klystrack - vlicense linux/copyright + vlicense doc/LICENSE } From 0c8bbb81cf1075b1c8f0e51f9f3d78cbc74fb749 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Sat, 1 May 2021 13:45:54 -0700 Subject: [PATCH 3/6] kmenuedit: fix license --- srcpkgs/kmenuedit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template index 0115325e3485..8809898978b4 100644 --- a/srcpkgs/kmenuedit/template +++ b/srcpkgs/kmenuedit/template @@ -1,7 +1,7 @@ # Template file for 'kmenuedit' pkgname=kmenuedit version=5.21.4 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools @@ -10,7 +10,7 @@ makedepends="kdelibs4support-devel kdesignerplugin-devel kdoctools" depends="khotkeys" short_desc="KDE Menu editor" maintainer="John <me@johnnynator.dev>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kmenuedit" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=d022bb6486663fd1db8b627794be5eb557fa0daa45b27bb69d834fa84494b8c2 From a7582884fc4d87c52aa8d0b76debe92d89a73840 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 3 May 2021 18:24:37 -0700 Subject: [PATCH 4/6] ksysguard: fix license --- srcpkgs/ksysguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template index 3603a4f413c9..8ab3e37792bb 100644 --- a/srcpkgs/ksysguard/template +++ b/srcpkgs/ksysguard/template @@ -1,7 +1,7 @@ # Template file for 'ksysguard' pkgname=ksysguard version=5.21.4 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools @@ -11,7 +11,7 @@ makedepends="knewstuff-devel libksysguard-devel kinit-devel libsensors-devel depends="hicolor-icon-theme lm_sensors" short_desc="KDE program to monitor various elements of your system" maintainer="John <me@johnnynator.dev>" -license="GPL-2.0-or-later, GFDL-1.2" +license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://invent.kde.org/plasma/ksysguard" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=cd1482653c35c5e04e6940346836fcd0655c213fc191da30685cb10cd05ae582 From 4b122afdda2b769d65b0e71c3b60d90220a5683d Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 3 May 2021 18:34:47 -0700 Subject: [PATCH 5/6] ktoblzcheck: fix license, other lint, fix test Test fix is a temporary stand-in until the next version. --- srcpkgs/ktoblzcheck/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/ktoblzcheck/template b/srcpkgs/ktoblzcheck/template index 8d04d9e51f46..45cdb65345e5 100644 --- a/srcpkgs/ktoblzcheck/template +++ b/srcpkgs/ktoblzcheck/template @@ -1,17 +1,21 @@ # Template file for 'ktoblzcheck' pkgname=ktoblzcheck version=1.53 -revision=1 +revision=2 +build_style=cmake +configure_args="-DENABLE_BANKDATA_DOWNLOAD=NO" hostmakedepends="pkg-config python" makedepends="python-devel" -build_style=cmake +short_desc="Tool for verification of account numbers and bank codes" maintainer="Enno Boland <gottox@voidlinux.org>" -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="http://ktoblzcheck.sourceforge.net" -short_desc="Tool for verification of account numbers and bank codes" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=18b9118556fe83240f468f770641d2578f4ff613cdcf0a209fb73079ccb70c55 -configure_args="-DENABLE_BANKDATA_DOWNLOAD=NO" + +post_patch() { + vsed -i src/python/test_ktoblzcheck.py -e 's/Postbank Ndl der DB Privat- und Firmenkundenbank/Postbank Ndl der Deutsche Bank/' +} ktoblzcheck-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 53f1d80706de2570b604607713530fbe99723a8e Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 3 May 2021 18:52:56 -0700 Subject: [PATCH 6/6] kyua: fix license --- srcpkgs/kyua/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kyua/template b/srcpkgs/kyua/template index 77360f078bea..40300e3439b8 100644 --- a/srcpkgs/kyua/template +++ b/srcpkgs/kyua/template @@ -1,7 +1,7 @@ # Template file for 'kyua' pkgname=kyua version=0.13 -revision=2 +revision=3 build_style=gnu-configure configure_args=" kyua_cv_attribute_noreturn=yes kyua_cv_lchmod_works=no @@ -14,7 +14,7 @@ depends="atf>=0.21" checkdepends="atf" short_desc="Kyua (automated testing framework) - Command line interface" maintainer="Orphaned <orphan@voidlinux.org>" -license="2-clause-BSD" +license="BSD-3-Clause" homepage="https://github.com/jmmv/kyua" distfiles="https://github.com/jmmv/kyua/releases/download/kyua-${version}/kyua-${version}.tar.gz" checksum=db6e5d341d5cf7e49e50aa361243e19087a00ba33742b0855d2685c0b8e721d6
[-- Attachment #1: Type: text/plain, Size: 1623 bytes --] There is an updated pull request by heliocat against master on the void-packages repository https://github.com/heliocat/void-packages lint_k https://github.com/void-linux/void-packages/pull/30664 Omnibus lint pass for SPDX errors - most packages starting with K <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [x] I built this PR locally for my native architecture, (x86_64) - [x] I built this PR locally for these architectures (if supported. mark crossbuilds): - [x] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/30664.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-lint_k-30664.patch --] [-- Type: text/x-diff, Size: 6333 bytes --] From 482b0d48d068da591423f3190ce48a04f8b60b01 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Sat, 1 May 2021 13:28:28 -0700 Subject: [PATCH 1/5] kinfocenter: fix license --- srcpkgs/kinfocenter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template index f3854c636e4e..825a1234b7ea 100644 --- a/srcpkgs/kinfocenter/template +++ b/srcpkgs/kinfocenter/template @@ -1,7 +1,7 @@ # Template file for 'kinfocenter' pkgname=kinfocenter version=5.21.4 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config qt5-host-tools qt5-qmake" @@ -11,7 +11,7 @@ makedepends="kdoctools plasma-framework-devel kdesignerplugin-devel kcmutils-dev depends="hwids" short_desc="KDE Info Center" maintainer="John <me@johnnynator.dev>" -license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2" +license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only" homepage="https://invent.kde.org/plasma/kinfocenter" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=3e5c3fed0156f3464bb30ebb9e0822c4141d71802dfa8995961f84c548771394 From 7679b01abd8503025369674caacca00fd1dc6b7d Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Sat, 1 May 2021 13:36:47 -0700 Subject: [PATCH 2/5] klystrack: fix license --- srcpkgs/klystrack/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/klystrack/template b/srcpkgs/klystrack/template index 927645f0787c..fa15065adcad 100644 --- a/srcpkgs/klystrack/template +++ b/srcpkgs/klystrack/template @@ -1,14 +1,14 @@ # Template file for 'klystrack' pkgname=klystrack version=1.7.3 -revision=1 +revision=2 _klystronsha=f5114db4de299ece73852becbef56d7d461bf421 create_wrksrc=yes hostmakedepends="SDL2-devel" makedepends="SDL2_image-devel SDL2_mixer-devel" short_desc="Chiptune music tracker" maintainer="allan <mail@may.mooo.com>" -license="BSD" +license="MIT" homepage="http://kometbomb.github.io/klystrack/" distfiles="https://github.com/kometbomb/klystrack/archive/${version}.tar.gz https://github.com/kometbomb/klystron/archive/${_klystronsha}.tar.gz" @@ -45,5 +45,5 @@ do_install() { vcopy key usr/lib/klystrack vmkdir usr/share/examples/klystrack vcopy examples usr/share/examples/klystrack - vlicense linux/copyright + vlicense doc/LICENSE } From 0c8bbb81cf1075b1c8f0e51f9f3d78cbc74fb749 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Sat, 1 May 2021 13:45:54 -0700 Subject: [PATCH 3/5] kmenuedit: fix license --- srcpkgs/kmenuedit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template index 0115325e3485..8809898978b4 100644 --- a/srcpkgs/kmenuedit/template +++ b/srcpkgs/kmenuedit/template @@ -1,7 +1,7 @@ # Template file for 'kmenuedit' pkgname=kmenuedit version=5.21.4 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools @@ -10,7 +10,7 @@ makedepends="kdelibs4support-devel kdesignerplugin-devel kdoctools" depends="khotkeys" short_desc="KDE Menu editor" maintainer="John <me@johnnynator.dev>" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kmenuedit" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=d022bb6486663fd1db8b627794be5eb557fa0daa45b27bb69d834fa84494b8c2 From a7582884fc4d87c52aa8d0b76debe92d89a73840 Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 3 May 2021 18:24:37 -0700 Subject: [PATCH 4/5] ksysguard: fix license --- srcpkgs/ksysguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template index 3603a4f413c9..8ab3e37792bb 100644 --- a/srcpkgs/ksysguard/template +++ b/srcpkgs/ksysguard/template @@ -1,7 +1,7 @@ # Template file for 'ksysguard' pkgname=ksysguard version=5.21.4 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools @@ -11,7 +11,7 @@ makedepends="knewstuff-devel libksysguard-devel kinit-devel libsensors-devel depends="hicolor-icon-theme lm_sensors" short_desc="KDE program to monitor various elements of your system" maintainer="John <me@johnnynator.dev>" -license="GPL-2.0-or-later, GFDL-1.2" +license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://invent.kde.org/plasma/ksysguard" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=cd1482653c35c5e04e6940346836fcd0655c213fc191da30685cb10cd05ae582 From 4b122afdda2b769d65b0e71c3b60d90220a5683d Mon Sep 17 00:00:00 2001 From: Colin Booth <colin@heliocat.net> Date: Mon, 3 May 2021 18:34:47 -0700 Subject: [PATCH 5/5] ktoblzcheck: fix license, other lint, fix test Test fix is a temporary stand-in until the next version. --- srcpkgs/ktoblzcheck/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/ktoblzcheck/template b/srcpkgs/ktoblzcheck/template index 8d04d9e51f46..45cdb65345e5 100644 --- a/srcpkgs/ktoblzcheck/template +++ b/srcpkgs/ktoblzcheck/template @@ -1,17 +1,21 @@ # Template file for 'ktoblzcheck' pkgname=ktoblzcheck version=1.53 -revision=1 +revision=2 +build_style=cmake +configure_args="-DENABLE_BANKDATA_DOWNLOAD=NO" hostmakedepends="pkg-config python" makedepends="python-devel" -build_style=cmake +short_desc="Tool for verification of account numbers and bank codes" maintainer="Enno Boland <gottox@voidlinux.org>" -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="http://ktoblzcheck.sourceforge.net" -short_desc="Tool for verification of account numbers and bank codes" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=18b9118556fe83240f468f770641d2578f4ff613cdcf0a209fb73079ccb70c55 -configure_args="-DENABLE_BANKDATA_DOWNLOAD=NO" + +post_patch() { + vsed -i src/python/test_ktoblzcheck.py -e 's/Postbank Ndl der DB Privat- und Firmenkundenbank/Postbank Ndl der Deutsche Bank/' +} ktoblzcheck-devel_package() { depends="${sourcepkg}>=${version}_${revision}"
[-- Attachment #1: Type: text/plain, Size: 1461 bytes --] There's a merged pull request on the void-packages repository Omnibus lint pass for SPDX errors - most packages starting with K https://github.com/void-linux/void-packages/pull/30664 Description: <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [x] I built this PR locally for my native architecture, (x86_64) - [x] I built this PR locally for these architectures (if supported. mark crossbuilds): - [x] aarch64-musl - [ ] armv7l - [ ] armv6l-musl