* [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with X
@ 2021-07-01 2:27 heliocat
2021-07-01 2:42 ` [PR PATCH] [Updated] " heliocat
2021-08-22 9:38 ` [PR PATCH] [Merged]: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: heliocat @ 2021-07-01 2:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is a new pull request by heliocat against master on the void-packages repository
https://github.com/heliocat/void-packages lint_x
https://github.com/void-linux/void-packages/pull/31728
Omnibus lint pass for SPDX warnings - packages starting with X
<!-- 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/31728.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_x-31728.patch --]
[-- Type: text/x-diff, Size: 37812 bytes --]
From 66d5762521231ea5bc19f97038fe1256788466dd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 00:42:17 -0700
Subject: [PATCH 01/32] x2vnc: fix license, template layout
---
srcpkgs/x2vnc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/x2vnc/template b/srcpkgs/x2vnc/template
index 54485d5905eb..b810f5c5ae9f 100644
--- a/srcpkgs/x2vnc/template
+++ b/srcpkgs/x2vnc/template
@@ -1,14 +1,14 @@
# Template file for 'x2vnc'
pkgname=x2vnc
version=1.7.2
-revision=1
+revision=2
hostmakedepends="imake"
makedepends="libXrandr-devel libXxf86dga-devel libX11-devel libXScrnSaver-devel"
depends="libXrandr libXxf86dga libX11 libXScrnSaver"
short_desc="Connect mouse via VNC"
maintainer="teldra <teldra@rotce.de>"
+license="GPL-2.0-or-later"
homepage="http://fredrik.hubbe.net/x2vnc.html"
-license="GPL-2"
distfiles="http://fredrik.hubbe.net/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=dc076dc0dad1ae4ebf5bc95bf792812b2639e92e127efb9c68de6a53874c7001
From 3e295a2c5a5808e63e9771d03719969c601ebeed Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 00:47:06 -0700
Subject: [PATCH 02/32] x48: fix license, vsed
---
srcpkgs/x48/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/x48/template b/srcpkgs/x48/template
index a8915322c01b..9272ba0d9c3f 100644
--- a/srcpkgs/x48/template
+++ b/srcpkgs/x48/template
@@ -1,14 +1,14 @@
# Template file for 'x48'
pkgname=x48
version=0.6.4
-revision=2
+revision=3
create_wrksrc=yes
build_style=gnu-configure
hostmakedepends="automake pkg-config"
makedepends="libXt-devel libXext-devel"
short_desc="HP48 CPU Emulator"
maintainer="allan <mail@may.mooo.com>"
-license="GPL-3"
+license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/x48.berlios/"
distfiles="${SOURCEFORGE_SITE}/x48.berlios/files/$pkgname-$version.tar.bz2"
checksum=dd42fb3dfde860abb758f8e6d5ccd01845bbf0dcd808b87786eec3ef7091067f
@@ -18,9 +18,9 @@ pre_configure() {
}
pre_build() {
- sed -i '698s/inline/static inline/' src/emulate.c
+ vsed -i '698s/inline/static inline/' src/emulate.c
}
pre_install() {
- sed -i 's:helvetica:fixed:' X48
+ vsed -i 's:helvetica:fixed:' X48
}
From 2dc4cb5358c9dc1fc8df43753b56fa54a76d876c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 00:51:39 -0700
Subject: [PATCH 03/32] xautolock: fix license
---
srcpkgs/xautolock/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xautolock/template b/srcpkgs/xautolock/template
index 673e57c9a787..77cea8f39374 100644
--- a/srcpkgs/xautolock/template
+++ b/srcpkgs/xautolock/template
@@ -1,12 +1,12 @@
# Template file for 'xautolock'
pkgname=xautolock
version=2.2
-revision=6
+revision=7
hostmakedepends="imake xorg-cf-files"
makedepends="libXScrnSaver-devel xorgproto"
short_desc="Autolock utility for X"
maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
-license="GPL-2"
+license="GPL-2.0-only"
homepage="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
distfiles="${homepage}/${pkgname}-${version}.tgz"
checksum=11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2
From e8e335b29ae7fd73af2e74fed34c86db28b0cb51 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 10:45:31 -0700
Subject: [PATCH 04/32] xbattmon: fix license
---
srcpkgs/xbattmon/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xbattmon/template b/srcpkgs/xbattmon/template
index d3f92968b1b6..37e759f77f32 100644
--- a/srcpkgs/xbattmon/template
+++ b/srcpkgs/xbattmon/template
@@ -1,13 +1,13 @@
# Template file for 'xbattmon'
pkgname=xbattmon
version=1.1
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="PREFIX=/usr"
makedepends="libX11-devel"
short_desc="Simple battery monitor"
maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-3"
+license="ISC"
homepage="http://git.2f30.org/xbattmon/"
distfiles="http://dl.2f30.org/releases/${pkgname}-${version}.tar.gz"
checksum=4ff7b156c69a56e4e6649a9f3bf5ee72858f856e7aad3614e8b3275a29f226ff
@@ -16,3 +16,7 @@ pre_build() {
[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
sed -i '/^PREFIX =*/d' config.mk
}
+
+post_install() {
+ vlicense LICENSE
+{
From ed2a7b1c54f8f1a7107c21b7f40baa688735a1b7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 10:48:57 -0700
Subject: [PATCH 05/32] xcalib: fix license, homepage, vsed
---
srcpkgs/xcalib/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xcalib/template b/srcpkgs/xcalib/template
index ddbe46399064..7315107e7e43 100644
--- a/srcpkgs/xcalib/template
+++ b/srcpkgs/xcalib/template
@@ -1,18 +1,18 @@
# Template file for 'xcalib'
pkgname=xcalib
version=0.8
-revision=4
+revision=5
build_style="gnu-makefile"
makedepends="libX11-devel libXxf86vm-devel"
short_desc="Tiny monitor calibration loader for X.org"
maintainer="Steven R <dev@styez.com>"
-license="GPL-2"
-homepage="http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/"
+license="GPL-2.0-or-later"
+homepage="http://xcalib.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/xcalib/xcalib-source-${version}.tar.gz"
checksum="8a112ee710e5446f6c36e62345b2066f10639d500259db8c48bf1716caea06e6"
post_extract() {
- sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile
+ vsed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile
}
do_install() {
vbin xcalib
From db8422a33cdd31f8b629f605b4afc2c9bab1a621 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 10:54:07 -0700
Subject: [PATCH 06/32] xcape: fix license
---
srcpkgs/xcape/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xcape/template b/srcpkgs/xcape/template
index 3bf3372fdd49..0c84278738fa 100644
--- a/srcpkgs/xcape/template
+++ b/srcpkgs/xcape/template
@@ -1,12 +1,12 @@
# Template file for 'xcape'
pkgname=xcape
version=1.2
-revision=1
+revision=2
hostmakedepends="pkg-config"
makedepends="libXtst-devel libXi-devel"
short_desc="Allows you to use a single press of a modifier key as another key"
maintainer="Matt Carroll <oholiab@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/alols/xcape"
distfiles="https://github.com/alols/xcape/archive/v${version}.tar.gz"
checksum=a27ed884fd94f03058af65a39edfe3af3f2f8fbb76ba9920002a76be07fb2821
From 73678f161e6e3c33842283458ddf44ccfd299f31 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:14:47 -0700
Subject: [PATCH 07/32] xcb-util: fix license, http->https
---
srcpkgs/xcb-util/template | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xcb-util/template b/srcpkgs/xcb-util/template
index 86d4d0b585b9..26da06907d2f 100644
--- a/srcpkgs/xcb-util/template
+++ b/srcpkgs/xcb-util/template
@@ -1,18 +1,22 @@
# Template file for 'xcb-util'
pkgname=xcb-util
version=0.4.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config gperf"
makedepends="libxcb-devel"
short_desc="XCB utilities library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
+license="X11"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
checksum=46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9
+post_install() {
+ vlicense COPYING LICENSE
+}
+
xcb-util-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" -- development files"
From b532a1104cf1160c622da7f81c4be2e3ceae928a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:51:36 -0700
Subject: [PATCH 08/32] xcb-util-image: fix license, description, http->https
---
srcpkgs/xcb-util-image/template | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xcb-util-image/template b/srcpkgs/xcb-util-image/template
index dbd6e284204a..007dac1fd7de 100644
--- a/srcpkgs/xcb-util-image/template
+++ b/srcpkgs/xcb-util-image/template
@@ -1,18 +1,22 @@
# Template file for 'xcb-util-image'
pkgname=xcb-util-image
version=0.4.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="xcb-util-devel"
-short_desc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions"
+short_desc="Utility libraries for XCB - XImage and XShmImage functions"
maintainer="Orphaned <orphan@voidlinux.org>"
license="X11"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/xcb-util-image-${version}.tar.bz2"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/xcb-util-image-${version}.tar.bz2"
checksum=2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc
+post_install() {
+ vlicense COPYING LICENSE
+}
+
xcb-util-image-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 86c54c115452c0fc1cc263b5dbb226b8489edfe0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:52:19 -0700
Subject: [PATCH 09/32] xcb-util-keysyms: fix license, description, http->https
---
srcpkgs/xcb-util-keysyms/template | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xcb-util-keysyms/template b/srcpkgs/xcb-util-keysyms/template
index 7c932ded1944..185b6f09868c 100644
--- a/srcpkgs/xcb-util-keysyms/template
+++ b/srcpkgs/xcb-util-keysyms/template
@@ -1,18 +1,23 @@
# Template file for 'xcb-util-keysyms'
pkgname=xcb-util-keysyms
version=0.4.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="libxcb-devel xcb-util-devel"
-short_desc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes"
+short_desc="Utility libraries for XCB - key constants and keycode conversion"
maintainer="Orphaned <orphan@voidlinux.org>"
license="X11"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/xcb-util-keysyms-${version}.tar.bz2"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/xcb-util-keysyms-${version}.tar.bz2"
checksum=0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9
+post_install() {
+ head -n30 keysyms/keysyms.c > LICENSE
+ vlicense LICENSE
+}
+
xcb-util-keysyms-devel_package() {
depends="libxcb-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 5cde7bb96a3f656c59573c1e11c56cbdfcecb8ba Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:52:49 -0700
Subject: [PATCH 10/32] xcb-util-renderutil: fix license, description,
http->https
---
srcpkgs/xcb-util-renderutil/template | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xcb-util-renderutil/template b/srcpkgs/xcb-util-renderutil/template
index 512b29b8e180..abe2903c5776 100644
--- a/srcpkgs/xcb-util-renderutil/template
+++ b/srcpkgs/xcb-util-renderutil/template
@@ -1,18 +1,22 @@
# Template file for 'xcb-util-renderutil'
pkgname=xcb-util-renderutil
version=0.3.9
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="libxcb-devel xcb-util-devel"
-short_desc="Utility libraries for XC Binding - Convenience functions for the Render extension"
+short_desc="Utility libraries for XCB - Render extension convenience functions"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="X11"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/xcb-util-renderutil-${version}.tar.bz2"
+license="X11, MIT"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/xcb-util-renderutil-${version}.tar.bz2"
checksum=c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b
+post_install() {
+ vlicense COPYING LICENSE
+}
+
xcb-util-renderutil-devel_package() {
depends="libxcb-devel ${sourcepkg}>=${version}"
short_desc+=" - development files"
From 0710c9de1bfd362210ac7c044a01371b4fc6b29b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:53:09 -0700
Subject: [PATCH 11/32] xdaliclock: fix license
---
srcpkgs/xdaliclock/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/xdaliclock/template b/srcpkgs/xdaliclock/template
index 5fb668427d18..4c397c59eb42 100644
--- a/srcpkgs/xdaliclock/template
+++ b/srcpkgs/xdaliclock/template
@@ -1,7 +1,7 @@
# Template file for 'xdaliclock'
pkgname=xdaliclock
version=2.44
-revision=1
+revision=2
build_wrksrc=X11
build_style=gnu-configure
makedepends="libXext-devel libXt-devel"
@@ -12,6 +12,10 @@ homepage="http://www.jwz.org/xdaliclock/"
distfiles="http://www.jwz.org/xdaliclock/xdaliclock-${version}.tar.gz"
checksum=800db9ad00adaeb73079370fb64452230ff186e670b6fbd36315506caab64fbf
+post_install() {
+ vlicense LICENSE
+}
+
pre_configure() {
sed -i -e '/a trivial ANSI C/,+10s/ { (exit 1); exit 1; };//' \
-e '/INCLUDES=/s/.*/:/' \
From 978e604bf7e3fbced492ca218248cfb6d3134edb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:53:26 -0700
Subject: [PATCH 12/32] xdu: fix license
---
srcpkgs/xdu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdu/template b/srcpkgs/xdu/template
index d7d31bf5d79c..7a3f447d340b 100644
--- a/srcpkgs/xdu/template
+++ b/srcpkgs/xdu/template
@@ -1,12 +1,12 @@
# Template file for 'xdu'
pkgname=xdu
version=3.1
-revision=2
+revision=3
build_style=gnu-makefile
makedepends="libXaw-devel"
short_desc="Display the output of du(1) in an X window"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT/X11"
+license="MIT, X11"
homepage="https://github.com/leahneukirchen/xdu"
distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
checksum=13035b0642b1042debf6c84d0963b3fd3914f76c8dfb9c8c6f852ee1451eea1f
From 0d03e1e09c2b21188edff28210b7fe05d97d03cc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:53:52 -0700
Subject: [PATCH 13/32] xorg-cf-files: fix license, homepage
---
srcpkgs/xorg-cf-files/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-cf-files/template b/srcpkgs/xorg-cf-files/template
index aea5c85748e2..b7b8a7c1dac2 100644
--- a/srcpkgs/xorg-cf-files/template
+++ b/srcpkgs/xorg-cf-files/template
@@ -1,16 +1,20 @@
# Template file for 'xorg-cf-files'
pkgname=xorg-cf-files
version=1.0.6
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config automake xorg-util-macros font-util"
short_desc="X.Org imake program and related utilities"
maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
license="X11"
-homepage="http://xorg.freedesktop.org/"
+homepage="https://www.x.org/wiki/"
distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2"
checksum=4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d
pre_configure() {
autoreconf -fi
}
+
+post_install() {
+ vlicense COPYING
+}
From ea412c34a292663ca8705da4732e3162c1759848 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:01:10 -0700
Subject: [PATCH 14/32] xcb-util-wm: fix license, description, http->https,
template layout
---
srcpkgs/xcb-util-wm/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xcb-util-wm/template b/srcpkgs/xcb-util-wm/template
index 2a5ebf64d0c0..3a804063244b 100644
--- a/srcpkgs/xcb-util-wm/template
+++ b/srcpkgs/xcb-util-wm/template
@@ -1,17 +1,20 @@
-# Template build for 'xcb-util-wm'.
+# Template file for 'xcb-util-wm'
pkgname=xcb-util-wm
version=0.4.1
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="m4 pkg-config"
makedepends="libxcb-devel xcb-util-devel"
-short_desc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM"
+short_desc="Utility libraries for XC Binding - window-manager helpers for ICCCM"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://xcb.freedesktop.org"
-license="GPL-2"
-distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
+license="X11"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
checksum=28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f
+post_install() {
+ vlicense COPYING LICENSE
+}
xcb-util-wm-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From e2ca662ae23c58b1017e91c759c42bddcb3f610d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:06:29 -0700
Subject: [PATCH 15/32] xclip: fix license, template layout
---
srcpkgs/xclip/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xclip/template b/srcpkgs/xclip/template
index b307cbca33f3..399b445370a2 100644
--- a/srcpkgs/xclip/template
+++ b/srcpkgs/xclip/template
@@ -1,14 +1,14 @@
# Template file for 'xclip'
pkgname=xclip
version=0.13
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake"
makedepends="libXmu-devel"
+short_desc="Command line interface to the X11 clipboard"
maintainer="Steven R <dev@styez.com>"
+license="GPL-2.0-or-later"
homepage="https://github.com/astrand/xclip"
-license="GPL-2"
-short_desc="Command line interface to the X11 clipboard"
distfiles="https://github.com/astrand/xclip/archive/${version}.tar.gz"
checksum=ca5b8804e3c910a66423a882d79bf3c9450b875ac8528791fb60ec9de667f758
From 6944d9bcb8132d2289ad3859d9256eee34f3d204 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:29:39 -0700
Subject: [PATCH 16/32] xcompmgr: fix license, homepage
---
srcpkgs/xcompmgr/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xcompmgr/template b/srcpkgs/xcompmgr/template
index dd5eed8438cd..14d486fa14eb 100644
--- a/srcpkgs/xcompmgr/template
+++ b/srcpkgs/xcompmgr/template
@@ -1,14 +1,14 @@
# Template file for 'xcompmgr'
pkgname=xcompmgr
version=1.1.8
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXcomposite-devel libXdamage-devel libXrender-devel libXext-devel"
short_desc="Composite Window-effects manager for X.org"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="custom"
-homepage="http://xorg.freedesktop.org"
+license="HPND"
+homepage="https://www.x.org/wiki/"
distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
checksum=0b89daf4f060fa3fa83cca862c45d531fef7121b5d06552c1d73d396ad9a7243
From 33a5e1f3e2445c9aa939c67d52abf065ad44d2f2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:51:35 -0700
Subject: [PATCH 17/32] xdo: fix license, vsed
---
srcpkgs/xdo/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xdo/template b/srcpkgs/xdo/template
index 38ad79065d86..8f63746ea125 100644
--- a/srcpkgs/xdo/template
+++ b/srcpkgs/xdo/template
@@ -1,18 +1,18 @@
# Template file for 'xdo'
pkgname=xdo
version=0.5.7
-revision=2
+revision=3
build_style=gnu-makefile
makedepends="libxcb-devel xcb-util-wm-devel"
short_desc="Small X utility to perform elementary actions on windows"
maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="BSD"
+license="BSD-2-Clause"
homepage="https://github.com/baskerville/xdo"
distfiles="https://github.com/baskerville/${pkgname}/archive/${version}.tar.gz"
checksum=b661229f0457939d3867cca1664c5671ae959b309feb58abe9142229c8c7ffb4
post_extract() {
- sed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
+ vsed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
}
post_install() {
From 6a2c909cb24877c975ab480048bd7bdc5fbbfdb5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 13:13:31 -0700
Subject: [PATCH 18/32] xfig: fix license, description, vsed
---
srcpkgs/xfig/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xfig/template b/srcpkgs/xfig/template
index 4c316f35b32d..1ae7e04a4363 100644
--- a/srcpkgs/xfig/template
+++ b/srcpkgs/xfig/template
@@ -1,21 +1,21 @@
# Template file for 'xfig'
pkgname=xfig
version=3.2.8a
-revision=1
+revision=2
build_style="gnu-configure"
hostmakedepends="fig2dev ghostscript netpbm"
makedepends="libXaw-devel libXaw3d-devel libXi-devel libXmu-devel libXpm-devel
libXt-devel libjpeg-turbo-devel libpng-devel"
depends="gsfonts fig2dev"
-short_desc="An interactive drawing tool"
+short_desc="Interactive drawing tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT-like"
+license="custom:xfig"
homepage="http://mcj.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-${version}.tar.xz"
checksum=ba43c0ea85b230d3efa5a951a3239e206d0b033d044c590a56208f875f888578
post_extract() {
- sed -i 's/spell/aspell/' app-defaults/Fig.in
+ vsed -i 's/spell/aspell/' app-defaults/Fig.in
}
post_install() {
From ab3e42a19f694ae6869f8bf1cbe8fa2382886a11 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 21:20:47 -0700
Subject: [PATCH 19/32] xgalaga++: fix license, description, vsed
The version of the GPL is entirely a guess. The package itself says:
"This software is released under the GNU General Public License."
So I'm assuming that it's bound by whatever the latest GPL is.
---
srcpkgs/xgalaga++/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xgalaga++/template b/srcpkgs/xgalaga++/template
index 811098be45a5..0f426f0f70e2 100644
--- a/srcpkgs/xgalaga++/template
+++ b/srcpkgs/xgalaga++/template
@@ -1,23 +1,23 @@
# Template file for 'xgalaga++'
pkgname=xgalaga++
version=0.9
-revision=1
+revision=2
build_style=gnu-makefile
make_build_target="all"
_high_scores_dir="/var/games/xgalaga++"
make_dirs="$_high_scores_dir 0775 root users"
makedepends="libX11-devel libXpm-devel"
-short_desc="A classic single screen vertical shoot ’em up"
+short_desc="Classic single screen vertical shoot ’em up"
maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="http://marc.mongenet.ch/OSS/XGalaga/"
distfiles="http://marc.mongenet.ch/OSS/XGalaga/xgalaga++_${version}.tar.gz"
checksum=c8db4bb9808c1cbbd001533b08318f6ab76b877ab6ed313d977d6a8546cc7fc9
post_extract() {
- sed -i -e 's|$(installprefix)/games|$(installprefix)/bin|' \
- -e 's|EXE_GROUP=games|EXE_GROUP=users|' \
- -e "s|HIGH_SCORES_FILE=.*|HIGH_SCORES_FILE=$_high_scores_dir/scores|" Makefile
+ vsed -i -e 's|$(installprefix)/games|$(installprefix)/bin|' \
+ -e 's|EXE_GROUP=games|EXE_GROUP=users|' \
+ -e "s|HIGH_SCORES_FILE=.*|HIGH_SCORES_FILE=$_high_scores_dir/scores|" Makefile
}
do_install() {
From 442f92c5aaf87e7616e9147f938fda2969d8e5d9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 22:09:51 -0700
Subject: [PATCH 20/32] xmp: fix license, layout
---
srcpkgs/xmp/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xmp/template b/srcpkgs/xmp/template
index bdf701b3c59b..918df2068cb7 100644
--- a/srcpkgs/xmp/template
+++ b/srcpkgs/xmp/template
@@ -2,14 +2,13 @@
pkgname=xmp
version=4.1.0
revision=1
-short_desc="Extended module player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-homepage="http://xmp.sourceforge.net"
-license="GPL-2"
+build_style=gnu-configure
conf_files="/etc/xmp/xmp.conf /etc/xmp/modules.conf"
hostmakedepends="pkg-config"
makedepends="libxmp-devel alsa-lib-devel pulseaudio-devel"
-build_style=gnu-configure
+short_desc="Extended module player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-only"
+homepage="http://xmp.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
checksum=1dbd61074783545ac7bef5b5daa772fd2110764cb70f937af8c3fad30f73289e
-
From 56eaaa92c68fba6a1594ec69cc795557f504c4a3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 23:33:59 -0700
Subject: [PATCH 21/32] xnp2: fix license, description
---
srcpkgs/xnp2/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
index 1070cad41c20..7ae496fc224e 100644
--- a/srcpkgs/xnp2/template
+++ b/srcpkgs/xnp2/template
@@ -1,15 +1,15 @@
# Template file for 'xnp2'
pkgname=xnp2
version=0.86
-revision=1
+revision=2
build_wrksrc=x11
build_style=gnu-configure
configure_args="--enable-ia32 --enable-build-all"
hostmakedepends="pkg-config nasm"
makedepends="gtk+-devel SDL2-devel"
-short_desc="A port for UNIX with X11 of the Neko Project II PC-9801 emulator"
+short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD"
+license="BSD-2-Clause"
homepage="https://www.nonakap.org/np2"
distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
From 340880c97ecbe165c743842ccd25030bcb950b99 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 23:38:51 -0700
Subject: [PATCH 22/32] xorg-apps: fix license
---
srcpkgs/xorg-apps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xorg-apps/template b/srcpkgs/xorg-apps/template
index ac4fd4cc5b0a..49baec9cd9de 100644
--- a/srcpkgs/xorg-apps/template
+++ b/srcpkgs/xorg-apps/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-apps'
pkgname=xorg-apps
version=7.6
-revision=8
+revision=9
build_style=meta
# xinit is not in xorg-7.5 app directory?!!
depends="iceauth>=1.0.4 oclock>=1.0.3 sessreg>=1.0.6 setxkbmap>=1.2.0
@@ -16,5 +16,5 @@ depends="iceauth>=1.0.4 oclock>=1.0.3 sessreg>=1.0.6 setxkbmap>=1.2.0
xwd>=1.0.4 xwininfo>=1.1.1 xwud>=1.0.3"
short_desc="X.org applications"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
-homepage="http://xorg.freedesktop.org/"
+license="Public Domain"
+homepage="https://www.x.org/wiki/"
From 331a6686e03281342e8c52261c6137e522a28ccd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 23:41:06 -0700
Subject: [PATCH 23/32] xorg: fix license
---
srcpkgs/xorg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xorg/template b/srcpkgs/xorg/template
index 82497c6eb383..5bc0aadbffa4 100644
--- a/srcpkgs/xorg/template
+++ b/srcpkgs/xorg/template
@@ -1,10 +1,10 @@
# Template file for 'xorg'
pkgname=xorg
version=7.6
-revision=5
+revision=6
build_style=meta
depends="xorg-fonts xorg-server xorg-apps xorg-input-drivers xorg-video-drivers"
short_desc="X.org meta-package"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="metapackage"
-homepage="http://xorg.freedesktop.org"
+license="Public Domain"
+homepage="https://www.x.org/wiki/"
From 56599a1443d0ef895944dcf588c85e897a3acca3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:26:49 -0700
Subject: [PATCH 24/32] xplanet: fix license, vsed
---
srcpkgs/xplanet/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xplanet/template b/srcpkgs/xplanet/template
index 4650dd2556ca..4418dc58cf5a 100644
--- a/srcpkgs/xplanet/template
+++ b/srcpkgs/xplanet/template
@@ -1,14 +1,14 @@
# Template file for 'xplanet'
pkgname=xplanet
version=1.3.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-freetype"
hostmakedepends="pkg-config"
makedepends="pango-devel freetype-devel giflib-devel tiff-devel libXScrnSaver-devel"
short_desc="Planetary body renderer"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
homepage="http://xplanet.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=4380d570a8bf27b81fb629c97a636c1673407f4ac4989ce931720078a90aece7
@@ -16,5 +16,5 @@ checksum=4380d570a8bf27b81fb629c97a636c1673407f4ac4989ce931720078a90aece7
pre_configure() {
# make it build with giflib-5.1.0
# see http://wiki.linuxfromscratch.org/blfs/ticket/5076#comment:2
- sed -i "/[DE]GifCloseFile/s:GifFile:&, NULL:g" src/libimage/gif.c
+ vsed -i "/[DE]GifCloseFile/s:GifFile:&, NULL:g" src/libimage/gif.c
}
From fd0f944acaca96336fcedd9ad02a3ade19d708ef Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:30:16 -0700
Subject: [PATCH 25/32] xrick: fix license, template layout
---
srcpkgs/xrick/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xrick/template b/srcpkgs/xrick/template
index 42b8a0febe94..3b751dcc6774 100644
--- a/srcpkgs/xrick/template
+++ b/srcpkgs/xrick/template
@@ -1,17 +1,17 @@
# Template file for 'xrick'
pkgname=xrick
version=021212
-revision=1
+revision=2
build_style=gnu-makefile
make_use_env=1
makedepends="SDL-devel zlib-devel"
short_desc="Clone of Rick Dangerous"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-ish"
-restricted=yes
+license="custom:GPL-ish"
homepage="http://www.bigorno.net/xrick/"
distfiles="https://www.bigorno.net/xrick/xrick-${version}.tgz"
checksum=aa8542120bec97a730258027a294bd16196eb8b3d66134483d085f698588fc2b
+restricted=yes
CFLAGS=-fcommon
From 6b89cfcb8c3a18ce0cda464d56fedffcf0d7b0bf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:37:27 -0700
Subject: [PATCH 26/32] xsel: fix license
---
srcpkgs/xsel/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xsel/template b/srcpkgs/xsel/template
index edc001dba405..614585a5facb 100644
--- a/srcpkgs/xsel/template
+++ b/srcpkgs/xsel/template
@@ -1,12 +1,16 @@
# Template file for 'xsel'
pkgname=xsel
version=1.2.0
-revision=4
+revision=5
build_style="gnu-configure"
makedepends="libXt-devel"
short_desc="Command-line getting and setting the contents of the X selection"
maintainer="Steven R <dev@styez.com>"
-license="custom"
+license="HPND-sell-variant"
homepage="http://www.vergenet.net/~conrad/software/xsel/"
distfiles="http://www.vergenet.net/~conrad/software/xsel/download/xsel-${version}.tar.gz"
checksum=b927ce08dc82f4c30140223959b90cf65e1076f000ce95e520419ec32f5b141c
+
+post_install() {
+ vlicense COPYING LICENSE
+}
From 33943b02d4fc5a02f1f0d0003032972b0bd27f96 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:43:49 -0700
Subject: [PATCH 27/32] xsnow: fix license
---
srcpkgs/xsnow/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index a65da4fb2947..965986d92842 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,12 +1,12 @@
# Template file for 'xsnow'
pkgname=xsnow
version=1.42
-revision=2
+revision=3
hostmakedepends="imake xorg-cf-files"
makedepends="libXext-devel libXpm-devel libXt-devel"
short_desc="Snow for your X11 sessions"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="xsnow"
+license="custom:xsnow"
homepage="https://janswaal.home.xs4all.nl/Xsnow"
distfiles="https://janswaal.home.xs4all.nl/Xsnow/${pkgname}-${version}.tar.gz"
checksum=d0d7c8f1fb91ca096995b1c30797e8f443c2e97d6f1e5f574b31318ed05d561a
From 9f2a2021c62f7b7322bebe3b44e1642911bb54a4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:46:14 -0700
Subject: [PATCH 28/32] xspringies: fix license, vsed
---
srcpkgs/xspringies/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xspringies/template b/srcpkgs/xspringies/template
index d9175aee26b0..e01e7d1edafa 100644
--- a/srcpkgs/xspringies/template
+++ b/srcpkgs/xspringies/template
@@ -1,17 +1,17 @@
# Template file for 'xspringies'
pkgname=xspringies
version=1.12
-revision=4
+revision=5
makedepends="libX11-devel"
short_desc="Mass and spring simulation system"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-1"
+license="GPL-1.0-or-later"
homepage="https://web.archive.org/web/20170303034329/http://www.cs.rutgers.edu/~decarlo/software.html"
distfiles="http://distcache.freebsd.org/ports-distfiles/${pkgname}-${version}.tar.Z>${pkgname}-${version}.tar.gz"
checksum=08a3e9f60d1f1e15d38d62dd62baab18f6ad57ee139b0ef41452be66e4ad6a28
post_extract() {
- sed -i '/^CFLAGS/s/=/+=/' Makefile.std
+ vsed -i '/^CFLAGS/s/=/+=/' Makefile.std
}
do_build() {
make ${makejobs} -f Makefile.std DDIR=/usr/ LIBS="$LDFLAGS -lm -lX11"
@@ -22,5 +22,4 @@ do_install() {
vmkdir usr/lib
cp -r lib ${DESTDIR}/usr/lib/xspringies
vman xspringies.man xspringies.1
- vlicense COPYING LICENSE
}
From aae29340158605f01a84cc9b297ca9c4734f49a0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:57:23 -0700
Subject: [PATCH 29/32] xstow: fix license, template layout
---
srcpkgs/xstow/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xstow/template b/srcpkgs/xstow/template
index 3f3ba847bd40..1e6cea814ce3 100644
--- a/srcpkgs/xstow/template
+++ b/srcpkgs/xstow/template
@@ -1,12 +1,12 @@
-# Template build file for 'xstow'.
+# Template file for 'xstow'
pkgname=xstow
version=1.0.2
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-curses"
short_desc="Replacement of GNU Stow written in C++"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
homepage="http://xstow.sourceforge.net"
-license="GPL-2"
distfiles="$SOURCEFORGE_SITE/xstow/xstow-$version.tar.bz2"
checksum=6f041f19a5d71667f6a9436d56f5a50646b6b8c055ef5ae0813dcecb35a3c6ef
From 94d967c7f941c7d16c266bdd7870400019d58f4c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 01:00:28 -0700
Subject: [PATCH 30/32] xxkb: fix license
---
srcpkgs/xxkb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xxkb/template b/srcpkgs/xxkb/template
index 22d09e1a5dd9..0a0e13b3fe20 100644
--- a/srcpkgs/xxkb/template
+++ b/srcpkgs/xxkb/template
@@ -1,14 +1,14 @@
# Template file for 'xxkb'
pkgname=xxkb
version=1.11.1
-revision=1
+revision=2
build_style=gnu-makefile
make_install_target="install install.man"
hostmakedepends="imake"
makedepends="libX11-devel libXt-devel libXext-devel libXpm-devel"
short_desc="Keyboard layout switcher and indicator"
maintainer="Andrey Raugas <kainonergon@gmail.com>"
-license="PerlArtistic"
+license="Artistic-2.0"
homepage="https://sourceforge.net/projects/xxkb/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.gz"
checksum=ceaa33bed81d8ae5bf77e89787d0736f7564c3de047c35a57bcbf6f4d1888142
From 005fffb246615765f193cf5702b554cd9e35643f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 18:51:26 -0700
Subject: [PATCH 31/32] xz: fix license, description
---
srcpkgs/xz/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template
index 103308ee4d7e..b7cb987bcff8 100644
--- a/srcpkgs/xz/template
+++ b/srcpkgs/xz/template
@@ -1,12 +1,12 @@
# Template file for 'xz'
pkgname=xz
version=5.2.5
-revision=1
+revision=2
bootstrap=yes
build_style=gnu-configure
-short_desc="The XZ compression utilities"
+short_desc="XZ compression utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="Public domain, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
+license="Public Domain, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://tukaani.org/xz"
distfiles="https://tukaani.org/xz/xz-${version}.tar.bz2"
checksum=5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df
From 0544c05474c841152851068dc03e2622bdcec1b9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 19:25:46 -0700
Subject: [PATCH 32/32] xzoom: fix license, update homepage and disfiles links,
vsed
---
srcpkgs/xzoom/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xzoom/template b/srcpkgs/xzoom/template
index fd5c19eb6bed..eaa30662bd6e 100644
--- a/srcpkgs/xzoom/template
+++ b/srcpkgs/xzoom/template
@@ -1,19 +1,19 @@
# Template file for 'xzoom'
pkgname=xzoom
version=0.3
-revision=1
+revision=2
hostmakedepends="imake"
makedepends="libXt-devel libXext-devel"
short_desc="Magnify part of X display, with real-time updates"
maintainer="Daniel Santana <daniel@santana.tech>"
-license="Custom"
-homepage="http://sunsite.unc.edu/pub/linux/libs/X/"
-distfiles="http://webdiis.unizar.es/pub/unix/X11/${pkgname}-${version}.tgz"
+license="custom:xzoom"
+homepage="http://www.ibiblio.org/pub/linux/libs/X/"
+distfiles="http://www.ibiblio.org/pub/linux/libs/X/xzoom-${version}.tgz"
checksum=b26bfd692d3e1d30e8d524d4018fc3f0fe847983a2778a4a2496784bfc2df44b
do_build() {
CC=cc xmkmf
- sed -i "s@-O2@$CFLAGS@" ./Makefile
+ vsed -i "s@-O2@$CFLAGS@" ./Makefile
make CC=$CC CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX warnings - packages starting with X
2021-07-01 2:27 [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with X heliocat
@ 2021-07-01 2:42 ` heliocat
2021-08-22 9:38 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: heliocat @ 2021-07-01 2:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
There is an updated pull request by heliocat against master on the void-packages repository
https://github.com/heliocat/void-packages lint_x
https://github.com/void-linux/void-packages/pull/31728
Omnibus lint pass for SPDX warnings - packages starting with X
<!-- 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/31728.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_x-31728.patch --]
[-- Type: text/x-diff, Size: 37812 bytes --]
From 66d5762521231ea5bc19f97038fe1256788466dd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 00:42:17 -0700
Subject: [PATCH 01/32] x2vnc: fix license, template layout
---
srcpkgs/x2vnc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/x2vnc/template b/srcpkgs/x2vnc/template
index 54485d5905eb..b810f5c5ae9f 100644
--- a/srcpkgs/x2vnc/template
+++ b/srcpkgs/x2vnc/template
@@ -1,14 +1,14 @@
# Template file for 'x2vnc'
pkgname=x2vnc
version=1.7.2
-revision=1
+revision=2
hostmakedepends="imake"
makedepends="libXrandr-devel libXxf86dga-devel libX11-devel libXScrnSaver-devel"
depends="libXrandr libXxf86dga libX11 libXScrnSaver"
short_desc="Connect mouse via VNC"
maintainer="teldra <teldra@rotce.de>"
+license="GPL-2.0-or-later"
homepage="http://fredrik.hubbe.net/x2vnc.html"
-license="GPL-2"
distfiles="http://fredrik.hubbe.net/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=dc076dc0dad1ae4ebf5bc95bf792812b2639e92e127efb9c68de6a53874c7001
From 3e295a2c5a5808e63e9771d03719969c601ebeed Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 00:47:06 -0700
Subject: [PATCH 02/32] x48: fix license, vsed
---
srcpkgs/x48/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/x48/template b/srcpkgs/x48/template
index a8915322c01b..9272ba0d9c3f 100644
--- a/srcpkgs/x48/template
+++ b/srcpkgs/x48/template
@@ -1,14 +1,14 @@
# Template file for 'x48'
pkgname=x48
version=0.6.4
-revision=2
+revision=3
create_wrksrc=yes
build_style=gnu-configure
hostmakedepends="automake pkg-config"
makedepends="libXt-devel libXext-devel"
short_desc="HP48 CPU Emulator"
maintainer="allan <mail@may.mooo.com>"
-license="GPL-3"
+license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/x48.berlios/"
distfiles="${SOURCEFORGE_SITE}/x48.berlios/files/$pkgname-$version.tar.bz2"
checksum=dd42fb3dfde860abb758f8e6d5ccd01845bbf0dcd808b87786eec3ef7091067f
@@ -18,9 +18,9 @@ pre_configure() {
}
pre_build() {
- sed -i '698s/inline/static inline/' src/emulate.c
+ vsed -i '698s/inline/static inline/' src/emulate.c
}
pre_install() {
- sed -i 's:helvetica:fixed:' X48
+ vsed -i 's:helvetica:fixed:' X48
}
From 2dc4cb5358c9dc1fc8df43753b56fa54a76d876c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 00:51:39 -0700
Subject: [PATCH 03/32] xautolock: fix license
---
srcpkgs/xautolock/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xautolock/template b/srcpkgs/xautolock/template
index 673e57c9a787..77cea8f39374 100644
--- a/srcpkgs/xautolock/template
+++ b/srcpkgs/xautolock/template
@@ -1,12 +1,12 @@
# Template file for 'xautolock'
pkgname=xautolock
version=2.2
-revision=6
+revision=7
hostmakedepends="imake xorg-cf-files"
makedepends="libXScrnSaver-devel xorgproto"
short_desc="Autolock utility for X"
maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
-license="GPL-2"
+license="GPL-2.0-only"
homepage="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
distfiles="${homepage}/${pkgname}-${version}.tgz"
checksum=11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2
From 334fa95695e5301b5f093e8df9719d9edc22a945 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 10:45:31 -0700
Subject: [PATCH 04/32] xbattmon: fix license
---
srcpkgs/xbattmon/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xbattmon/template b/srcpkgs/xbattmon/template
index d3f92968b1b6..848444e3da79 100644
--- a/srcpkgs/xbattmon/template
+++ b/srcpkgs/xbattmon/template
@@ -1,13 +1,13 @@
# Template file for 'xbattmon'
pkgname=xbattmon
version=1.1
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="PREFIX=/usr"
makedepends="libX11-devel"
short_desc="Simple battery monitor"
maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-3"
+license="ISC"
homepage="http://git.2f30.org/xbattmon/"
distfiles="http://dl.2f30.org/releases/${pkgname}-${version}.tar.gz"
checksum=4ff7b156c69a56e4e6649a9f3bf5ee72858f856e7aad3614e8b3275a29f226ff
@@ -16,3 +16,7 @@ pre_build() {
[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
sed -i '/^PREFIX =*/d' config.mk
}
+
+post_install() {
+ vlicense LICENSE
+}
From 98a4d81b3904c0215d0fb4c4a300baa791b96ff3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 10:48:57 -0700
Subject: [PATCH 05/32] xcalib: fix license, homepage, vsed
---
srcpkgs/xcalib/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xcalib/template b/srcpkgs/xcalib/template
index ddbe46399064..7315107e7e43 100644
--- a/srcpkgs/xcalib/template
+++ b/srcpkgs/xcalib/template
@@ -1,18 +1,18 @@
# Template file for 'xcalib'
pkgname=xcalib
version=0.8
-revision=4
+revision=5
build_style="gnu-makefile"
makedepends="libX11-devel libXxf86vm-devel"
short_desc="Tiny monitor calibration loader for X.org"
maintainer="Steven R <dev@styez.com>"
-license="GPL-2"
-homepage="http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/"
+license="GPL-2.0-or-later"
+homepage="http://xcalib.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/xcalib/xcalib-source-${version}.tar.gz"
checksum="8a112ee710e5446f6c36e62345b2066f10639d500259db8c48bf1716caea06e6"
post_extract() {
- sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile
+ vsed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile
}
do_install() {
vbin xcalib
From 0d3928579d3348b8a0b5e4cc514c5b46df607adb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 10:54:07 -0700
Subject: [PATCH 06/32] xcape: fix license
---
srcpkgs/xcape/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xcape/template b/srcpkgs/xcape/template
index 3bf3372fdd49..0c84278738fa 100644
--- a/srcpkgs/xcape/template
+++ b/srcpkgs/xcape/template
@@ -1,12 +1,12 @@
# Template file for 'xcape'
pkgname=xcape
version=1.2
-revision=1
+revision=2
hostmakedepends="pkg-config"
makedepends="libXtst-devel libXi-devel"
short_desc="Allows you to use a single press of a modifier key as another key"
maintainer="Matt Carroll <oholiab@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/alols/xcape"
distfiles="https://github.com/alols/xcape/archive/v${version}.tar.gz"
checksum=a27ed884fd94f03058af65a39edfe3af3f2f8fbb76ba9920002a76be07fb2821
From e0116eab3fdda70dc1c167386a430394cd02e529 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:14:47 -0700
Subject: [PATCH 07/32] xcb-util: fix license, http->https
---
srcpkgs/xcb-util/template | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xcb-util/template b/srcpkgs/xcb-util/template
index 86d4d0b585b9..26da06907d2f 100644
--- a/srcpkgs/xcb-util/template
+++ b/srcpkgs/xcb-util/template
@@ -1,18 +1,22 @@
# Template file for 'xcb-util'
pkgname=xcb-util
version=0.4.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config gperf"
makedepends="libxcb-devel"
short_desc="XCB utilities library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
+license="X11"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
checksum=46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9
+post_install() {
+ vlicense COPYING LICENSE
+}
+
xcb-util-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" -- development files"
From e3c23c0e6bbda9132850cb6db5c6266a5714e176 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:51:36 -0700
Subject: [PATCH 08/32] xcb-util-image: fix license, description, http->https
---
srcpkgs/xcb-util-image/template | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xcb-util-image/template b/srcpkgs/xcb-util-image/template
index dbd6e284204a..007dac1fd7de 100644
--- a/srcpkgs/xcb-util-image/template
+++ b/srcpkgs/xcb-util-image/template
@@ -1,18 +1,22 @@
# Template file for 'xcb-util-image'
pkgname=xcb-util-image
version=0.4.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="xcb-util-devel"
-short_desc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions"
+short_desc="Utility libraries for XCB - XImage and XShmImage functions"
maintainer="Orphaned <orphan@voidlinux.org>"
license="X11"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/xcb-util-image-${version}.tar.bz2"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/xcb-util-image-${version}.tar.bz2"
checksum=2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc
+post_install() {
+ vlicense COPYING LICENSE
+}
+
xcb-util-image-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From d533e64ac13afc89577d54c60aa13ef7f9560c2d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:52:19 -0700
Subject: [PATCH 09/32] xcb-util-keysyms: fix license, description, http->https
---
srcpkgs/xcb-util-keysyms/template | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xcb-util-keysyms/template b/srcpkgs/xcb-util-keysyms/template
index 7c932ded1944..185b6f09868c 100644
--- a/srcpkgs/xcb-util-keysyms/template
+++ b/srcpkgs/xcb-util-keysyms/template
@@ -1,18 +1,23 @@
# Template file for 'xcb-util-keysyms'
pkgname=xcb-util-keysyms
version=0.4.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="libxcb-devel xcb-util-devel"
-short_desc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes"
+short_desc="Utility libraries for XCB - key constants and keycode conversion"
maintainer="Orphaned <orphan@voidlinux.org>"
license="X11"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/xcb-util-keysyms-${version}.tar.bz2"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/xcb-util-keysyms-${version}.tar.bz2"
checksum=0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9
+post_install() {
+ head -n30 keysyms/keysyms.c > LICENSE
+ vlicense LICENSE
+}
+
xcb-util-keysyms-devel_package() {
depends="libxcb-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 810bcb1c33241ea684bcbcabfcc72c633c030225 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:52:49 -0700
Subject: [PATCH 10/32] xcb-util-renderutil: fix license, description,
http->https
---
srcpkgs/xcb-util-renderutil/template | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xcb-util-renderutil/template b/srcpkgs/xcb-util-renderutil/template
index 512b29b8e180..abe2903c5776 100644
--- a/srcpkgs/xcb-util-renderutil/template
+++ b/srcpkgs/xcb-util-renderutil/template
@@ -1,18 +1,22 @@
# Template file for 'xcb-util-renderutil'
pkgname=xcb-util-renderutil
version=0.3.9
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="libxcb-devel xcb-util-devel"
-short_desc="Utility libraries for XC Binding - Convenience functions for the Render extension"
+short_desc="Utility libraries for XCB - Render extension convenience functions"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="X11"
-homepage="http://xcb.freedesktop.org"
-distfiles="http://xcb.freedesktop.org/dist/xcb-util-renderutil-${version}.tar.bz2"
+license="X11, MIT"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/xcb-util-renderutil-${version}.tar.bz2"
checksum=c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b
+post_install() {
+ vlicense COPYING LICENSE
+}
+
xcb-util-renderutil-devel_package() {
depends="libxcb-devel ${sourcepkg}>=${version}"
short_desc+=" - development files"
From 55614d42ca0773e84ff39c38f1309787e2719a51 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:53:09 -0700
Subject: [PATCH 11/32] xdaliclock: fix license
---
srcpkgs/xdaliclock/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/xdaliclock/template b/srcpkgs/xdaliclock/template
index 5fb668427d18..4c397c59eb42 100644
--- a/srcpkgs/xdaliclock/template
+++ b/srcpkgs/xdaliclock/template
@@ -1,7 +1,7 @@
# Template file for 'xdaliclock'
pkgname=xdaliclock
version=2.44
-revision=1
+revision=2
build_wrksrc=X11
build_style=gnu-configure
makedepends="libXext-devel libXt-devel"
@@ -12,6 +12,10 @@ homepage="http://www.jwz.org/xdaliclock/"
distfiles="http://www.jwz.org/xdaliclock/xdaliclock-${version}.tar.gz"
checksum=800db9ad00adaeb73079370fb64452230ff186e670b6fbd36315506caab64fbf
+post_install() {
+ vlicense LICENSE
+}
+
pre_configure() {
sed -i -e '/a trivial ANSI C/,+10s/ { (exit 1); exit 1; };//' \
-e '/INCLUDES=/s/.*/:/' \
From 06bf3ab571e7f4a56f0c55b771a0811c964bf9e3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:53:26 -0700
Subject: [PATCH 12/32] xdu: fix license
---
srcpkgs/xdu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdu/template b/srcpkgs/xdu/template
index d7d31bf5d79c..7a3f447d340b 100644
--- a/srcpkgs/xdu/template
+++ b/srcpkgs/xdu/template
@@ -1,12 +1,12 @@
# Template file for 'xdu'
pkgname=xdu
version=3.1
-revision=2
+revision=3
build_style=gnu-makefile
makedepends="libXaw-devel"
short_desc="Display the output of du(1) in an X window"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT/X11"
+license="MIT, X11"
homepage="https://github.com/leahneukirchen/xdu"
distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
checksum=13035b0642b1042debf6c84d0963b3fd3914f76c8dfb9c8c6f852ee1451eea1f
From a317951bebedf5976f2eb1a00fb7be741d59ac1a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 11:53:52 -0700
Subject: [PATCH 13/32] xorg-cf-files: fix license, homepage
---
srcpkgs/xorg-cf-files/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-cf-files/template b/srcpkgs/xorg-cf-files/template
index aea5c85748e2..b7b8a7c1dac2 100644
--- a/srcpkgs/xorg-cf-files/template
+++ b/srcpkgs/xorg-cf-files/template
@@ -1,16 +1,20 @@
# Template file for 'xorg-cf-files'
pkgname=xorg-cf-files
version=1.0.6
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config automake xorg-util-macros font-util"
short_desc="X.Org imake program and related utilities"
maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
license="X11"
-homepage="http://xorg.freedesktop.org/"
+homepage="https://www.x.org/wiki/"
distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2"
checksum=4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d
pre_configure() {
autoreconf -fi
}
+
+post_install() {
+ vlicense COPYING
+}
From 70fd828040e277e42bad589ef29595234aff993f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:01:10 -0700
Subject: [PATCH 14/32] xcb-util-wm: fix license, description, http->https,
template layout
---
srcpkgs/xcb-util-wm/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xcb-util-wm/template b/srcpkgs/xcb-util-wm/template
index 2a5ebf64d0c0..3a804063244b 100644
--- a/srcpkgs/xcb-util-wm/template
+++ b/srcpkgs/xcb-util-wm/template
@@ -1,17 +1,20 @@
-# Template build for 'xcb-util-wm'.
+# Template file for 'xcb-util-wm'
pkgname=xcb-util-wm
version=0.4.1
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="m4 pkg-config"
makedepends="libxcb-devel xcb-util-devel"
-short_desc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM"
+short_desc="Utility libraries for XC Binding - window-manager helpers for ICCCM"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://xcb.freedesktop.org"
-license="GPL-2"
-distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
+license="X11"
+homepage="https://xcb.freedesktop.org"
+distfiles="https://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
checksum=28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f
+post_install() {
+ vlicense COPYING LICENSE
+}
xcb-util-wm-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 2d31ec28be11f793308ff00d4670daf001ffd1e3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:06:29 -0700
Subject: [PATCH 15/32] xclip: fix license, template layout
---
srcpkgs/xclip/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xclip/template b/srcpkgs/xclip/template
index b307cbca33f3..399b445370a2 100644
--- a/srcpkgs/xclip/template
+++ b/srcpkgs/xclip/template
@@ -1,14 +1,14 @@
# Template file for 'xclip'
pkgname=xclip
version=0.13
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake"
makedepends="libXmu-devel"
+short_desc="Command line interface to the X11 clipboard"
maintainer="Steven R <dev@styez.com>"
+license="GPL-2.0-or-later"
homepage="https://github.com/astrand/xclip"
-license="GPL-2"
-short_desc="Command line interface to the X11 clipboard"
distfiles="https://github.com/astrand/xclip/archive/${version}.tar.gz"
checksum=ca5b8804e3c910a66423a882d79bf3c9450b875ac8528791fb60ec9de667f758
From 464a1f093b3a5c2b80bdb223ed262d9f37290894 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:29:39 -0700
Subject: [PATCH 16/32] xcompmgr: fix license, homepage
---
srcpkgs/xcompmgr/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xcompmgr/template b/srcpkgs/xcompmgr/template
index dd5eed8438cd..14d486fa14eb 100644
--- a/srcpkgs/xcompmgr/template
+++ b/srcpkgs/xcompmgr/template
@@ -1,14 +1,14 @@
# Template file for 'xcompmgr'
pkgname=xcompmgr
version=1.1.8
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXcomposite-devel libXdamage-devel libXrender-devel libXext-devel"
short_desc="Composite Window-effects manager for X.org"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="custom"
-homepage="http://xorg.freedesktop.org"
+license="HPND"
+homepage="https://www.x.org/wiki/"
distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
checksum=0b89daf4f060fa3fa83cca862c45d531fef7121b5d06552c1d73d396ad9a7243
From 87e874fb057ba200d6ef5251b374b8e1cf95ebc1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 12:51:35 -0700
Subject: [PATCH 17/32] xdo: fix license, vsed
---
srcpkgs/xdo/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xdo/template b/srcpkgs/xdo/template
index 38ad79065d86..8f63746ea125 100644
--- a/srcpkgs/xdo/template
+++ b/srcpkgs/xdo/template
@@ -1,18 +1,18 @@
# Template file for 'xdo'
pkgname=xdo
version=0.5.7
-revision=2
+revision=3
build_style=gnu-makefile
makedepends="libxcb-devel xcb-util-wm-devel"
short_desc="Small X utility to perform elementary actions on windows"
maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="BSD"
+license="BSD-2-Clause"
homepage="https://github.com/baskerville/xdo"
distfiles="https://github.com/baskerville/${pkgname}/archive/${version}.tar.gz"
checksum=b661229f0457939d3867cca1664c5671ae959b309feb58abe9142229c8c7ffb4
post_extract() {
- sed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
+ vsed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
}
post_install() {
From d3db0eb27874fc4560cf2334f3d6229631fda07d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 13:13:31 -0700
Subject: [PATCH 18/32] xfig: fix license, description, vsed
---
srcpkgs/xfig/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xfig/template b/srcpkgs/xfig/template
index 4c316f35b32d..1ae7e04a4363 100644
--- a/srcpkgs/xfig/template
+++ b/srcpkgs/xfig/template
@@ -1,21 +1,21 @@
# Template file for 'xfig'
pkgname=xfig
version=3.2.8a
-revision=1
+revision=2
build_style="gnu-configure"
hostmakedepends="fig2dev ghostscript netpbm"
makedepends="libXaw-devel libXaw3d-devel libXi-devel libXmu-devel libXpm-devel
libXt-devel libjpeg-turbo-devel libpng-devel"
depends="gsfonts fig2dev"
-short_desc="An interactive drawing tool"
+short_desc="Interactive drawing tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT-like"
+license="custom:xfig"
homepage="http://mcj.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-${version}.tar.xz"
checksum=ba43c0ea85b230d3efa5a951a3239e206d0b033d044c590a56208f875f888578
post_extract() {
- sed -i 's/spell/aspell/' app-defaults/Fig.in
+ vsed -i 's/spell/aspell/' app-defaults/Fig.in
}
post_install() {
From 90cfee52d9fc14f4051891dfd4d7294fc65f29c0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 21:20:47 -0700
Subject: [PATCH 19/32] xgalaga++: fix license, description, vsed
The version of the GPL is entirely a guess. The package itself says:
"This software is released under the GNU General Public License."
So I'm assuming that it's bound by whatever the latest GPL is.
---
srcpkgs/xgalaga++/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xgalaga++/template b/srcpkgs/xgalaga++/template
index 811098be45a5..0f426f0f70e2 100644
--- a/srcpkgs/xgalaga++/template
+++ b/srcpkgs/xgalaga++/template
@@ -1,23 +1,23 @@
# Template file for 'xgalaga++'
pkgname=xgalaga++
version=0.9
-revision=1
+revision=2
build_style=gnu-makefile
make_build_target="all"
_high_scores_dir="/var/games/xgalaga++"
make_dirs="$_high_scores_dir 0775 root users"
makedepends="libX11-devel libXpm-devel"
-short_desc="A classic single screen vertical shoot ’em up"
+short_desc="Classic single screen vertical shoot ’em up"
maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="http://marc.mongenet.ch/OSS/XGalaga/"
distfiles="http://marc.mongenet.ch/OSS/XGalaga/xgalaga++_${version}.tar.gz"
checksum=c8db4bb9808c1cbbd001533b08318f6ab76b877ab6ed313d977d6a8546cc7fc9
post_extract() {
- sed -i -e 's|$(installprefix)/games|$(installprefix)/bin|' \
- -e 's|EXE_GROUP=games|EXE_GROUP=users|' \
- -e "s|HIGH_SCORES_FILE=.*|HIGH_SCORES_FILE=$_high_scores_dir/scores|" Makefile
+ vsed -i -e 's|$(installprefix)/games|$(installprefix)/bin|' \
+ -e 's|EXE_GROUP=games|EXE_GROUP=users|' \
+ -e "s|HIGH_SCORES_FILE=.*|HIGH_SCORES_FILE=$_high_scores_dir/scores|" Makefile
}
do_install() {
From 141bd85e77780b2e1ab62e721edf153d586f9699 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 22:09:51 -0700
Subject: [PATCH 20/32] xmp: fix license, layout
---
srcpkgs/xmp/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xmp/template b/srcpkgs/xmp/template
index bdf701b3c59b..918df2068cb7 100644
--- a/srcpkgs/xmp/template
+++ b/srcpkgs/xmp/template
@@ -2,14 +2,13 @@
pkgname=xmp
version=4.1.0
revision=1
-short_desc="Extended module player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-homepage="http://xmp.sourceforge.net"
-license="GPL-2"
+build_style=gnu-configure
conf_files="/etc/xmp/xmp.conf /etc/xmp/modules.conf"
hostmakedepends="pkg-config"
makedepends="libxmp-devel alsa-lib-devel pulseaudio-devel"
-build_style=gnu-configure
+short_desc="Extended module player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-only"
+homepage="http://xmp.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
checksum=1dbd61074783545ac7bef5b5daa772fd2110764cb70f937af8c3fad30f73289e
-
From 626ab7f9efcf0bee3008017c195bc97e746a05a1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 23:33:59 -0700
Subject: [PATCH 21/32] xnp2: fix license, description
---
srcpkgs/xnp2/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
index 1070cad41c20..7ae496fc224e 100644
--- a/srcpkgs/xnp2/template
+++ b/srcpkgs/xnp2/template
@@ -1,15 +1,15 @@
# Template file for 'xnp2'
pkgname=xnp2
version=0.86
-revision=1
+revision=2
build_wrksrc=x11
build_style=gnu-configure
configure_args="--enable-ia32 --enable-build-all"
hostmakedepends="pkg-config nasm"
makedepends="gtk+-devel SDL2-devel"
-short_desc="A port for UNIX with X11 of the Neko Project II PC-9801 emulator"
+short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD"
+license="BSD-2-Clause"
homepage="https://www.nonakap.org/np2"
distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
From bf188483a22884a3212c466ae7c7d448658d4386 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 23:38:51 -0700
Subject: [PATCH 22/32] xorg-apps: fix license
---
srcpkgs/xorg-apps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xorg-apps/template b/srcpkgs/xorg-apps/template
index ac4fd4cc5b0a..49baec9cd9de 100644
--- a/srcpkgs/xorg-apps/template
+++ b/srcpkgs/xorg-apps/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-apps'
pkgname=xorg-apps
version=7.6
-revision=8
+revision=9
build_style=meta
# xinit is not in xorg-7.5 app directory?!!
depends="iceauth>=1.0.4 oclock>=1.0.3 sessreg>=1.0.6 setxkbmap>=1.2.0
@@ -16,5 +16,5 @@ depends="iceauth>=1.0.4 oclock>=1.0.3 sessreg>=1.0.6 setxkbmap>=1.2.0
xwd>=1.0.4 xwininfo>=1.1.1 xwud>=1.0.3"
short_desc="X.org applications"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
-homepage="http://xorg.freedesktop.org/"
+license="Public Domain"
+homepage="https://www.x.org/wiki/"
From 22e842b8e373ceb65b5b0c8a1990d39a703799f6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 29 Jun 2021 23:41:06 -0700
Subject: [PATCH 23/32] xorg: fix license
---
srcpkgs/xorg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xorg/template b/srcpkgs/xorg/template
index 82497c6eb383..5bc0aadbffa4 100644
--- a/srcpkgs/xorg/template
+++ b/srcpkgs/xorg/template
@@ -1,10 +1,10 @@
# Template file for 'xorg'
pkgname=xorg
version=7.6
-revision=5
+revision=6
build_style=meta
depends="xorg-fonts xorg-server xorg-apps xorg-input-drivers xorg-video-drivers"
short_desc="X.org meta-package"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="metapackage"
-homepage="http://xorg.freedesktop.org"
+license="Public Domain"
+homepage="https://www.x.org/wiki/"
From 335ffb7c533caab381ad1034d94d043a13c20742 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:26:49 -0700
Subject: [PATCH 24/32] xplanet: fix license, vsed
---
srcpkgs/xplanet/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xplanet/template b/srcpkgs/xplanet/template
index 4650dd2556ca..4418dc58cf5a 100644
--- a/srcpkgs/xplanet/template
+++ b/srcpkgs/xplanet/template
@@ -1,14 +1,14 @@
# Template file for 'xplanet'
pkgname=xplanet
version=1.3.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-freetype"
hostmakedepends="pkg-config"
makedepends="pango-devel freetype-devel giflib-devel tiff-devel libXScrnSaver-devel"
short_desc="Planetary body renderer"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
homepage="http://xplanet.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=4380d570a8bf27b81fb629c97a636c1673407f4ac4989ce931720078a90aece7
@@ -16,5 +16,5 @@ checksum=4380d570a8bf27b81fb629c97a636c1673407f4ac4989ce931720078a90aece7
pre_configure() {
# make it build with giflib-5.1.0
# see http://wiki.linuxfromscratch.org/blfs/ticket/5076#comment:2
- sed -i "/[DE]GifCloseFile/s:GifFile:&, NULL:g" src/libimage/gif.c
+ vsed -i "/[DE]GifCloseFile/s:GifFile:&, NULL:g" src/libimage/gif.c
}
From a8e9ef260511dbbfc168242f3c7c97f46ae31c83 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:30:16 -0700
Subject: [PATCH 25/32] xrick: fix license, template layout
---
srcpkgs/xrick/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xrick/template b/srcpkgs/xrick/template
index 42b8a0febe94..3b751dcc6774 100644
--- a/srcpkgs/xrick/template
+++ b/srcpkgs/xrick/template
@@ -1,17 +1,17 @@
# Template file for 'xrick'
pkgname=xrick
version=021212
-revision=1
+revision=2
build_style=gnu-makefile
make_use_env=1
makedepends="SDL-devel zlib-devel"
short_desc="Clone of Rick Dangerous"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-ish"
-restricted=yes
+license="custom:GPL-ish"
homepage="http://www.bigorno.net/xrick/"
distfiles="https://www.bigorno.net/xrick/xrick-${version}.tgz"
checksum=aa8542120bec97a730258027a294bd16196eb8b3d66134483d085f698588fc2b
+restricted=yes
CFLAGS=-fcommon
From c31db43df47e76b1fbf0e59003040a6942464451 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:37:27 -0700
Subject: [PATCH 26/32] xsel: fix license
---
srcpkgs/xsel/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xsel/template b/srcpkgs/xsel/template
index edc001dba405..614585a5facb 100644
--- a/srcpkgs/xsel/template
+++ b/srcpkgs/xsel/template
@@ -1,12 +1,16 @@
# Template file for 'xsel'
pkgname=xsel
version=1.2.0
-revision=4
+revision=5
build_style="gnu-configure"
makedepends="libXt-devel"
short_desc="Command-line getting and setting the contents of the X selection"
maintainer="Steven R <dev@styez.com>"
-license="custom"
+license="HPND-sell-variant"
homepage="http://www.vergenet.net/~conrad/software/xsel/"
distfiles="http://www.vergenet.net/~conrad/software/xsel/download/xsel-${version}.tar.gz"
checksum=b927ce08dc82f4c30140223959b90cf65e1076f000ce95e520419ec32f5b141c
+
+post_install() {
+ vlicense COPYING LICENSE
+}
From 4a765fe5ac8c70fd9c2d39677f7ecd451d885592 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:43:49 -0700
Subject: [PATCH 27/32] xsnow: fix license
---
srcpkgs/xsnow/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index a65da4fb2947..965986d92842 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,12 +1,12 @@
# Template file for 'xsnow'
pkgname=xsnow
version=1.42
-revision=2
+revision=3
hostmakedepends="imake xorg-cf-files"
makedepends="libXext-devel libXpm-devel libXt-devel"
short_desc="Snow for your X11 sessions"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="xsnow"
+license="custom:xsnow"
homepage="https://janswaal.home.xs4all.nl/Xsnow"
distfiles="https://janswaal.home.xs4all.nl/Xsnow/${pkgname}-${version}.tar.gz"
checksum=d0d7c8f1fb91ca096995b1c30797e8f443c2e97d6f1e5f574b31318ed05d561a
From 643a92011c24922c76e262bbd18d2c8a12835c83 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:46:14 -0700
Subject: [PATCH 28/32] xspringies: fix license, vsed
---
srcpkgs/xspringies/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xspringies/template b/srcpkgs/xspringies/template
index d9175aee26b0..e01e7d1edafa 100644
--- a/srcpkgs/xspringies/template
+++ b/srcpkgs/xspringies/template
@@ -1,17 +1,17 @@
# Template file for 'xspringies'
pkgname=xspringies
version=1.12
-revision=4
+revision=5
makedepends="libX11-devel"
short_desc="Mass and spring simulation system"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-1"
+license="GPL-1.0-or-later"
homepage="https://web.archive.org/web/20170303034329/http://www.cs.rutgers.edu/~decarlo/software.html"
distfiles="http://distcache.freebsd.org/ports-distfiles/${pkgname}-${version}.tar.Z>${pkgname}-${version}.tar.gz"
checksum=08a3e9f60d1f1e15d38d62dd62baab18f6ad57ee139b0ef41452be66e4ad6a28
post_extract() {
- sed -i '/^CFLAGS/s/=/+=/' Makefile.std
+ vsed -i '/^CFLAGS/s/=/+=/' Makefile.std
}
do_build() {
make ${makejobs} -f Makefile.std DDIR=/usr/ LIBS="$LDFLAGS -lm -lX11"
@@ -22,5 +22,4 @@ do_install() {
vmkdir usr/lib
cp -r lib ${DESTDIR}/usr/lib/xspringies
vman xspringies.man xspringies.1
- vlicense COPYING LICENSE
}
From 8236b64e91a4698f7a6614d258e2d5967d8030d9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 00:57:23 -0700
Subject: [PATCH 29/32] xstow: fix license, template layout
---
srcpkgs/xstow/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xstow/template b/srcpkgs/xstow/template
index 3f3ba847bd40..1e6cea814ce3 100644
--- a/srcpkgs/xstow/template
+++ b/srcpkgs/xstow/template
@@ -1,12 +1,12 @@
-# Template build file for 'xstow'.
+# Template file for 'xstow'
pkgname=xstow
version=1.0.2
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-curses"
short_desc="Replacement of GNU Stow written in C++"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
homepage="http://xstow.sourceforge.net"
-license="GPL-2"
distfiles="$SOURCEFORGE_SITE/xstow/xstow-$version.tar.bz2"
checksum=6f041f19a5d71667f6a9436d56f5a50646b6b8c055ef5ae0813dcecb35a3c6ef
From 64c3efa3b094dc0cefa03f434d22155228ae982d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 01:00:28 -0700
Subject: [PATCH 30/32] xxkb: fix license
---
srcpkgs/xxkb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xxkb/template b/srcpkgs/xxkb/template
index 22d09e1a5dd9..0a0e13b3fe20 100644
--- a/srcpkgs/xxkb/template
+++ b/srcpkgs/xxkb/template
@@ -1,14 +1,14 @@
# Template file for 'xxkb'
pkgname=xxkb
version=1.11.1
-revision=1
+revision=2
build_style=gnu-makefile
make_install_target="install install.man"
hostmakedepends="imake"
makedepends="libX11-devel libXt-devel libXext-devel libXpm-devel"
short_desc="Keyboard layout switcher and indicator"
maintainer="Andrey Raugas <kainonergon@gmail.com>"
-license="PerlArtistic"
+license="Artistic-2.0"
homepage="https://sourceforge.net/projects/xxkb/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.gz"
checksum=ceaa33bed81d8ae5bf77e89787d0736f7564c3de047c35a57bcbf6f4d1888142
From 34584f1a2659dbc2a4cbcec5d5c0fef49113f4d9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 18:51:26 -0700
Subject: [PATCH 31/32] xz: fix license, description
---
srcpkgs/xz/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template
index 103308ee4d7e..b7cb987bcff8 100644
--- a/srcpkgs/xz/template
+++ b/srcpkgs/xz/template
@@ -1,12 +1,12 @@
# Template file for 'xz'
pkgname=xz
version=5.2.5
-revision=1
+revision=2
bootstrap=yes
build_style=gnu-configure
-short_desc="The XZ compression utilities"
+short_desc="XZ compression utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="Public domain, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
+license="Public Domain, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://tukaani.org/xz"
distfiles="https://tukaani.org/xz/xz-${version}.tar.bz2"
checksum=5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df
From 967644c39a53697e67fe0f32aa4f0dd722568408 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 30 Jun 2021 19:25:46 -0700
Subject: [PATCH 32/32] xzoom: fix license, update homepage and disfiles links,
vsed
---
srcpkgs/xzoom/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xzoom/template b/srcpkgs/xzoom/template
index fd5c19eb6bed..eaa30662bd6e 100644
--- a/srcpkgs/xzoom/template
+++ b/srcpkgs/xzoom/template
@@ -1,19 +1,19 @@
# Template file for 'xzoom'
pkgname=xzoom
version=0.3
-revision=1
+revision=2
hostmakedepends="imake"
makedepends="libXt-devel libXext-devel"
short_desc="Magnify part of X display, with real-time updates"
maintainer="Daniel Santana <daniel@santana.tech>"
-license="Custom"
-homepage="http://sunsite.unc.edu/pub/linux/libs/X/"
-distfiles="http://webdiis.unizar.es/pub/unix/X11/${pkgname}-${version}.tgz"
+license="custom:xzoom"
+homepage="http://www.ibiblio.org/pub/linux/libs/X/"
+distfiles="http://www.ibiblio.org/pub/linux/libs/X/xzoom-${version}.tgz"
checksum=b26bfd692d3e1d30e8d524d4018fc3f0fe847983a2778a4a2496784bfc2df44b
do_build() {
CC=cc xmkmf
- sed -i "s@-O2@$CFLAGS@" ./Makefile
+ vsed -i "s@-O2@$CFLAGS@" ./Makefile
make CC=$CC CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: Omnibus lint pass for SPDX warnings - packages starting with X
2021-07-01 2:27 [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with X heliocat
2021-07-01 2:42 ` [PR PATCH] [Updated] " heliocat
@ 2021-08-22 9:38 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-08-22 9:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]
There's a merged pull request on the void-packages repository
Omnibus lint pass for SPDX warnings - packages starting with X
https://github.com/void-linux/void-packages/pull/31728
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-22 9:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-01 2:27 [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with X heliocat
2021-07-01 2:42 ` [PR PATCH] [Updated] " heliocat
2021-08-22 9:38 ` [PR PATCH] [Merged]: " sgn
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).