From: meator <meator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] keepassxc: remove newline in licenses
Date: Sat, 10 Dec 2022 18:04:51 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40996@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3226 bytes --]
There is a new pull request by meator against master on the void-packages repository
https://github.com/meator/void-packages keepassxc
https://github.com/void-linux/void-packages/pull/40996
keepassxc: remove newline in licenses
I was parsing the entire void-packages repo and I have noticed that the keepassxc template behaves differently than all other 13 000 packages.
When You run `./xbps-src show <package>`, You (and I) would expect that `xbps-src` will display its arguments in the form `key: value` for every line printed. For example for the linux metapackage:
```
> ./xbps-src show linux
pkgname: linux
version: 6.0
revision: 1
maintainer: Leah Neukirchen <leah@vuxu.org>
Upstream URL: http://www.voidlinux.org/
License(s): Public Domain
build_style: meta
short_desc: Linux kernel meta package
subpackages: linux-headers
```
Literally every package behaves like this except keepassxc. keepassxc does this:
```
> ./xbps-src show keepassxc
pkgname: keepassxc
version: 2.7.4
revision: 1
distfiles: https://github.com/keepassxreboot/keepassxc/releases/download/2.7.4/keepassxc-2.7.4-src.tar.xz
checksum: 560052961da0389327e759171f660230dfa4e0f4e1fab6139600fb85c6e5dece
maintainer: Piraty <mail@piraty.dev>
Upstream URL: https://keepassxc.org/
License(s): GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,
LGPL-3.0-or-later, Nokia-Qt-exception-1.1, MIT, BSL-1.0
Changelog: https://raw.githubusercontent.com/keepassxreboot/keepassxc/2.7.4/CHANGELOG.md
build_style: cmake
configure_args: -DWITH_TESTS=ON
configure_args: -DWITH_XC_UPDATECHECK=OFF
configure_args: -DWITH_XC_DOCS=ON
configure_args: -DWITH_XC_AUTOTYPE=ON
configure_args: -DWITH_XC_BROWSER=ON
configure_args: -DWITH_XC_FDOSECRETS=ON
configure_args: -DWITH_XC_KEESHARE=ON
configure_args: -DWITH_XC_NETWORKING=ON
configure_args: -DWITH_XC_SSHAGENT=ON
configure_args: -DWITH_XC_YUBIKEY=ON
short_desc: KeePassXC is a cross-platform port of “Keepass Password Safe”
```
For the sake of consistency, I'm removing the newline. This isn't really a bug but as I said this is the only package that does this and it can break parsing of the output of `./xbps-src show`.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40996.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-keepassxc-40996.patch --]
[-- Type: text/x-diff, Size: 1163 bytes --]
From 60a2970dde268871d66b4e168e6115f4a5d938cd Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sat, 10 Dec 2022 17:53:05 +0100
Subject: [PATCH] keepassxc: remove newline in licenses
This newline produces unexpected output of xbps-src show keepassxc. This
is the only package that has this issue.
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..6936032f375f 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -21,7 +21,7 @@ makedepends="qt5-tools-devel qt5-svg-devel botan-devel libargon2-devel
checkdepends="xvfb-run"
short_desc="KeePassXC is a cross-platform port of “Keepass Password Safe”"
maintainer="Piraty <mail@piraty.dev>"
-license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,
+license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,\
LGPL-3.0-or-later, Nokia-Qt-exception-1.1, MIT, BSL-1.0"
homepage="https://keepassxc.org/"
changelog="https://raw.githubusercontent.com/keepassxreboot/keepassxc/${version}/CHANGELOG.md"
next reply other threads:[~2022-12-10 17:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-10 17:04 meator [this message]
2022-12-12 6:25 ` classabbyamp
2022-12-15 20:49 ` [PR PATCH] [Closed]: " meator
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40996@inbox.vuxu.org \
--to=meator@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).