* Re: [PR PATCH] [Updated] Easystroke
2021-07-22 20:57 [PR PATCH] Easystroke gtryujb
` (6 preceding siblings ...)
2021-07-23 19:57 ` [PR PATCH] [Updated] Easystroke gtryujb
@ 2021-07-25 12:39 ` gtryujb
2021-07-25 14:03 ` [PR REVIEW] Easystroke gtryujb
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: gtryujb @ 2021-07-25 12:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1128 bytes --]
There is an updated pull request by gtryujb against master on the void-packages repository
https://github.com/gtryujb/void-packages easystroke
https://github.com/void-linux/void-packages/pull/32150
Easystroke
#### General
- [x] 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
#### 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, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
- [x] x86_64
- [x] i686
A patch file from https://github.com/void-linux/void-packages/pull/32150.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-easystroke-32150.patch --]
[-- Type: text/x-diff, Size: 47697 bytes --]
From 9d4d8d636332b12df83e3bbec988884b9f9cd169 Mon Sep 17 00:00:00 2001
From: gtryujb <gtryujb@users.noreply.github.com>
Date: Thu, 22 Jul 2021 18:36:27 +0100
Subject: [PATCH 01/22] New package: easystroke-0.6.0
---
srcpkgs/easystroke/patches/git.patch | 20 ++++++++++++++++++++
srcpkgs/easystroke/template | 21 +++++++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 srcpkgs/easystroke/patches/git.patch
create mode 100644 srcpkgs/easystroke/template
diff --git a/srcpkgs/easystroke/patches/git.patch b/srcpkgs/easystroke/patches/git.patch
new file mode 100644
index 000000000000..98bfe3eeb7d1
--- /dev/null
+++ b/srcpkgs/easystroke/patches/git.patch
@@ -0,0 +1,20 @@
+diff -urb patched-easystroke-master.orig/easystroke/Makefile patched-easystroke-master/easystroke/Makefile
+--- patched-easystroke-master.orig/easystroke/Makefile 2021-07-19 17:16:39.949855973 +0100
++++ patched-easystroke-master/easystroke/Makefile 2021-07-19 17:17:43.041490580 +0100
+@@ -45,7 +45,7 @@
+ GENFILES = gui.c desktop.c po/POTFILES.in easystroke.desktop
+ GZFILES = $(wildcard *.gz)
+
+-VERSION = $(shell test -e debian/changelog && grep '(.*)' debian/changelog | sed 's/.*(//' | sed 's/).*//' | head -n1 || (test -e version && cat version || git describe))
++VERSION =
+ GIT = $(wildcard .git/index version)
+ DIST = easystroke-$(VERSION)
+
+@@ -141,7 +141,6 @@
+ tmp/$(DIST): $(GIT)
+ $(RM) -r tmp
+ mkdir tmp
+- git archive --format=tar --prefix=$(DIST)/ HEAD | (cd tmp && tar x)
+ echo $(VERSION) > $@/version
+ $(RM) $@/.gitignore $@/release
+
diff --git a/srcpkgs/easystroke/template b/srcpkgs/easystroke/template
new file mode 100644
index 000000000000..e089276abe4f
--- /dev/null
+++ b/srcpkgs/easystroke/template
@@ -0,0 +1,21 @@
+# Template file for 'easystroke'
+pkgname=easystroke
+version=0.6.0
+revision=1
+archs="i686 x86_64"
+wrksrc=patched-easystroke-master
+build_wrksrc=easystroke
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="boost-devel dbus-glib-devel gtkmm-devel xorg-server-devel"
+short_desc="Gesture recognition application for X11"
+maintainer="lopid <github23429@rainslide.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/thjaeger/easystroke/wiki/"
+distfiles="http://openartisthq.org/easystroke/patched-easystroke-master.tar.bz2"
+checksum=18bf167eaf7c41d91e6c17b1f8436eeb0988d34d47f523ef03789caab81e902a
+tags="mouse gestures"
+
+do_build() {
+ make PREFIX=/usr
+}
From 53073cb75d3b9cfcb1bbb60f2344db0295d4bdf0 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 21 Jul 2021 16:34:12 +0300
Subject: [PATCH 02/22] nvidia: update to 470.57.02.
---
srcpkgs/nvidia/template | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index c659027b1bda..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
_desc="NVIDIA drivers for linux"
pkgname=nvidia
-version=460.84
-revision=2
+version=470.57.02
+revision=1
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom:NVIDIA Proprietary"
homepage="https://www.nvidia.com"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
_pkg="NVIDIA-Linux-x86_64-${version}"
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=a10d2171d6b2c55f63791f58264f9e92829ee4b2779b9b1d011274e63b46b960
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
# subpackages need to be processed in this specific order
subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
depends="nvidia-libs-${version}_${revision}
@@ -122,6 +122,9 @@ do_install() {
# X driver
vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers
+ # firmware
+ vinstall firmware/gsp.bin 644 usr/lib/firmware/nvidia/${version}
+
# GLX extension module for X
vinstall libglxserver_nvidia.so.${version} 755 usr/lib/nvidia/xorg
ln -sf libglxserver_nvidia.so.${version} \
@@ -129,8 +132,8 @@ do_install() {
ln -sf libglxserver_nvidia.so.${version} \
${DESTDIR}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1
- vinstall libnvidia-egl-wayland.so.1.1.5 755 usr/lib
- ln -sf libnvidia-egl-wayland.so.1.1.5 \
+ vinstall libnvidia-egl-wayland.so.1.1.7 755 usr/lib
+ ln -sf libnvidia-egl-wayland.so.1.1.7 \
${DESTDIR}/usr/lib/libnvidia-egl-wayland.so.1
vinstall 10_nvidia.json 755 usr/share/glvnd/egl_vendor.d
@@ -207,6 +210,17 @@ do_install() {
vinstall libnvidia-rtcore.so.${version} 755 usr/lib
vinstall libnvidia-cbl.so.${version} 755 usr/lib
+ # ngx
+ vbin nvidia-ngx-updater
+ vinstall libnvidia-ngx.so.${version} 755 usr/lib
+ ln -sf libnvidia-ngx.so.${version} \
+ ${DESTDIR}/usr/lib/libnvidia-ngx.so.1
+ ln -sf libnvidia-ngx.so.1 \
+ ${DESTDIR}/usr/lib/libnvidia-ngx.so
+
+ vinstall _nvngx.dll 755 usr/lib/nvidia/wine
+ vinstall nvngx.dll 755 usr/lib/nvidia/wine
+
# optix ray racing engine
vinstall libnvoptix.so.${version} 755 usr/lib
ln -sf libnvoptix.so.${version} /usr/lib/libnvoptix.so
@@ -237,12 +251,12 @@ do_install() {
vdoc README.txt README
vdoc NVIDIA_Changelog
- # ngx is 64-bit only
- vinstall libnvidia-ngx.so.${version} 755 usr/lib
- ln -sf libnvidia-ngx.so.${version} \
- ${DESTDIR}/usr/lib/libnvidia-ngx.so.1
- ln -sf libnvidia-ngx.so.1 \
- ${DESTDIR}/usr/lib/libnvidia-ngx.so
+ # nvvm compiler
+ vinstall libnvidia-nvvm.so.4.0.0 755 usr/lib
+ ln -sf libnvidia-nvvm.so.4.0.0 \
+ ${DESTDIR}/usr/lib/libnvidia-nvvm.so.4
+ ln -sf libnvidia-nvvm.so.4 \
+ ${DESTDIR}/usr/lib/libnvidia-nvvm.so
# Libraries (64bit)
_install_libs usr/lib
@@ -271,6 +285,7 @@ nvidia-libs-32bit_package() {
nvidia-libs_package() {
short_desc="${_desc} - common libraries"
depends="libglvnd"
+ nostrip_files="gsp.bin"
pkg_install() {
vmove usr/lib
}
From c40d1173656a0a1a04cecaadfa31b95257c79009 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 23 Jul 2021 22:13:58 +0300
Subject: [PATCH 03/22] gallery-dl: update to 1.18.2
---
srcpkgs/gallery-dl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 4feb10d00424..280c5fa4d755 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
# Template file for 'gallery-dl'
pkgname=gallery-dl
-version=1.18.1
+version=1.18.2
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/mikf/gallery-dl"
changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
distfiles="https://github.com/mikf/gallery-dl/archive/v${version}.tar.gz"
-checksum=8a13b9d9f9de5280f22b6816958750921080e9794ef50702bbfdfe5c2157c39b
+checksum=72025323ea9835cc72db18d07e50e126eba3ae3e35369315299aec1977dc9f5e
do_check() {
make test
From 50eb38daa340a1a276e1396b065ce82ef2797121 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 29 Jun 2021 13:57:18 +0200
Subject: [PATCH 04/22] xkbcomp: update to 1.4.5
---
srcpkgs/xkbcomp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xkbcomp/template b/srcpkgs/xkbcomp/template
index 6965ccf7a860..29d1760dff72 100644
--- a/srcpkgs/xkbcomp/template
+++ b/srcpkgs/xkbcomp/template
@@ -1,15 +1,16 @@
# Template file for 'xkbcomp'
pkgname=xkbcomp
-version=1.4.2
+version=1.4.5
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bison"
makedepends="libX11-devel libxkbfile-devel"
short_desc="XKBD keymap compiler"
-homepage="https://www.x.org/"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
+homepage="https://www.x.org/"
distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=6dd8bcb9be7e85bd7294abe261b8c7b0539d2fc93e41b80fb8bd013767ce8424
+checksum=6851086c4244b6fd0cc562880d8ff193fb2bbf1e141c73632e10731b31d4b05e
post_install() {
vlicense COPYING LICENSE
From 9b4eff7e48b8974b3b4065d1abfae9e7160c6e43 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 7 Jul 2021 21:15:39 +0200
Subject: [PATCH 05/22] libX11: revbump for xorgproto
---
srcpkgs/libX11/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 6c4750068490..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
# Template file for 'libX11'
pkgname=libX11
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
--enable-static --enable-malloc0returnsnull"
From f4cea34c149544ab909d68d8c0a9dbc3c2bcc37e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 7 Jul 2021 21:15:49 +0200
Subject: [PATCH 06/22] xorgproto: update to 2021.4
---
srcpkgs/xorgproto/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index b909c82665e5..2014581a3825 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,6 +1,6 @@
# Template file for 'xorgproto'
pkgname=xorgproto
-version=2020.1
+version=2021.4
revision=1
build_style=gnu-configure
configure_args="--enable-legacy"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://xorg.freedesktop.org"
distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.gz"
-checksum=6265b11b125df2f4853eec4895b14067d5621f813553fa077bebef20d7542418
+checksum=9de0babd3d8cb16b0c1c47b8389a52f3e1326bb0bc9a9ab34a9500778448a2bd
replaces="bigreqsproto>=0 compositeproto>=0 damageproto>=0 dmxproto>=0 dri2proto>=0
dri3proto>=0 fixesproto>=0 fontsproto>=0 glproto>=0 inputproto>=0 kbproto>=0 presentproto>=0
printproto>=0 randrproto>=0 recordproto>=0 renderproto>=0 resourceproto>=0 scrnsaverproto>=0
From 66dfcaaf5fc6ca2f3d4bfeb5e70e4a39f865ea3c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 7 Jul 2021 21:19:47 +0200
Subject: [PATCH 07/22] xkeyboard-config: revbump for libX11, add makedeps
---
srcpkgs/xkeyboard-config/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template
index 5eb196360bc6..1c0a4848714f 100644
--- a/srcpkgs/xkeyboard-config/template
+++ b/srcpkgs/xkeyboard-config/template
@@ -1,11 +1,11 @@
# Template file for 'xkeyboard-config'
pkgname=xkeyboard-config
version=2.33
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules"
hostmakedepends="pkg-config libxslt intltool python3"
-makedepends="libX11-devel"
+makedepends="libX11-devel xkbcomp"
depends="xkbcomp"
short_desc="X Keyboard Configuration Database"
maintainer="skmpz <dem.procopiou@gmail.com>"
From d2c0b6809290dea5cca943e116c0643755ffddb2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 7 Jul 2021 21:21:16 +0200
Subject: [PATCH 08/22] libxkbcommon: revbump for xorgproto, add makedeps
---
srcpkgs/libxkbcommon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 3cfefeb295d2..5cdadd1db7db 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,13 +1,13 @@
# Template file for 'libxkbcommon'
pkgname=libxkbcommon
version=1.3.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname#lib}-${version}"
build_style=meson
configure_args="-Denable-x11=true -Denable-docs=false
-Denable-wayland=true -Denable-xkbregistry=false"
hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols"
+makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols xorgproto"
depends="xkeyboard-config"
short_desc="Library to handle keyboard descriptions"
maintainer="Isaac Freund <ifreund@ifreund.xyz>"
From aa5027926923d2b2f8e1136f7116f7204447ccdd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 14 Apr 2021 11:02:42 -0700
Subject: [PATCH 09/22] iat: fix license, description
---
srcpkgs/iat/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/iat/template b/srcpkgs/iat/template
index f7921c53bf14..7d0dd685d250 100644
--- a/srcpkgs/iat/template
+++ b/srcpkgs/iat/template
@@ -1,11 +1,11 @@
# Template file for 'iat'
pkgname=iat
version=0.1.7
-revision=3
+revision=4
build_style=gnu-configure
-short_desc="A tool for detecting the structure of many types of CD/DVD image"
+short_desc="Tool for detecting the structure of many types of CD/DVD image"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="http://sourceforge.net/projects/iat.berlios/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}.berlios/${pkgname}-${version}.tar.gz"
checksum=b25d57fde28a02b2d87cd49fd1478b039adbd836351879a654fea14c27764b21
From 06e990b4aa2dacf706385ea259115b2e0572752c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 14 Apr 2021 11:02:42 -0700
Subject: [PATCH 10/22] iat: fix license, short desc
The license is a bit out of the norm for this. The software claims to be
GPL 2, the license file that the bundle with it is the GPL 3 license,
and it has the BSD-2-Clause license bundling requirements and
disclaimer. I'm giving it a custom license to cover all of the angles
but there is a chance that one half or the other entirely supersedes the
rest.
---
srcpkgs/iat/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/iat/template b/srcpkgs/iat/template
index 7d0dd685d250..2bd0c6e84cf2 100644
--- a/srcpkgs/iat/template
+++ b/srcpkgs/iat/template
@@ -5,11 +5,13 @@ revision=4
build_style=gnu-configure
short_desc="Tool for detecting the structure of many types of CD/DVD image"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
+license="custom:GPL-2.0-or-later-with-BSD-attribution-requirement"
homepage="http://sourceforge.net/projects/iat.berlios/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}.berlios/${pkgname}-${version}.tar.gz"
checksum=b25d57fde28a02b2d87cd49fd1478b039adbd836351879a654fea14c27764b21
post_install() {
+ sed '2,34p;d' src/main.c > LICENSE
+ vlicense LICENSE
rm -rf ${DESTDIR}/usr/include
}
From 25a24b886dcd02ed2dbe2744735cfc3e767f0326 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 23 Jul 2021 17:39:47 +0200
Subject: [PATCH 11/22] squashfs-tools: update to 4.5.
---
srcpkgs/squashfs-tools/template | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index d49d6c5602a8..35022327c734 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -1,25 +1,22 @@
# Template file for 'squashfs-tools'
pkgname=squashfs-tools
-version=4.4
-revision=2
-wrksrc="squashfs${version}"
+version=4.5
+revision=1
build_wrksrc="squashfs-tools"
build_style=gnu-makefile
+make_use_env=yes
+make_build_args="XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1"
makedepends="zlib-devel lzo-devel liblzma-devel liblz4-devel libzstd-devel"
-license="GPL-2.0-or-later"
-homepage="http://squashfs.sf.net/"
short_desc="Tool to create and append to squashfs filesystems"
maintainer="Duncaen <duncaen@voidlinux.org>"
-distfiles="${SOURCEFORGE_SITE}/squashfs/squashfs${version}.tar.gz"
-checksum=a981b3f3f2054b5a2e658851a3c06a2460ad04a9a8a645e0afe063a63fdbb07e
-
-CFLAGS="-fcommon"
-
-do_build() {
- make ${makejobs} XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1
-}
+license="GPL-2.0-or-later"
+homepage="https://github.com/plougher/squashfs-tools"
+distfiles="https://github.com/plougher/squashfs-tools/archive/refs/tags/${version}.tar.gz"
+checksum=b9e16188e6dc1857fe312633920f7d71cc36b0162eb50f3ecb1f0040f02edddd
do_install() {
vbin mksquashfs
vbin unsquashfs
+ ln -sf mkshquashfs ${DESTDIR}/usr/bin/sqfstar
+ ln -sf unshquashfs ${DESTDIR}/usr/bin/sqfscat
}
From 3531cf644ca55b243e3932e28535a704e8e22993 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 24 Jul 2021 15:36:55 +0200
Subject: [PATCH 12/22] openradtool: update to 0.13.7.
---
srcpkgs/openradtool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 4aa00af8d94e..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
# Template file for 'openradtool'
pkgname=openradtool
-version=0.13.5
+version=0.13.7
revision=1
build_style=configure
configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
homepage="https://kristaps.bsd.lv/openradtool/"
changelog="https://kristaps.bsd.lv/openradtool/archive.html"
distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=0fe2389ee9341a7ac32b55c6fb49314b9cd17f3e30773b65a1cccfa2a5055873
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
post_install() {
sed -n '2,16p' main.c >LICENSE
From 848c50c8540796db02d4045e7b67ba72763b1e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 17:10:18 +0700
Subject: [PATCH 13/22] calligra: fix build, and switch to ninja
---
.../patches/macro-optional-find-package.patch | 31 ++++++++++
srcpkgs/calligra/template | 59 +++++++++----------
2 files changed, 59 insertions(+), 31 deletions(-)
create mode 100644 srcpkgs/calligra/patches/macro-optional-find-package.patch
diff --git a/srcpkgs/calligra/patches/macro-optional-find-package.patch b/srcpkgs/calligra/patches/macro-optional-find-package.patch
new file mode 100644
index 000000000000..68fb499d5af8
--- /dev/null
+++ b/srcpkgs/calligra/patches/macro-optional-find-package.patch
@@ -0,0 +1,31 @@
+Index: calligra-3.2.1/cmake/modules/MacroOptionalFindPackage.cmake
+===================================================================
+--- calligra-3.2.1.orig/cmake/modules/MacroOptionalFindPackage.cmake
++++ calligra-3.2.1/cmake/modules/MacroOptionalFindPackage.cmake
+@@ -25,11 +25,26 @@ macro(_MOFP_SET_EMPTY_IF_DEFINED _name _
+ endif(DEFINED ${_nameUpper}_${_var})
+ endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
+
++macro(_MOFP_DEFINE_BOTH_IF_DEFINED _name _var)
++ if (DEFINED ${_name}_${_var})
++ string(TOUPPER ${_name} _nameUpper)
++ set(${_nameUpper}_${_var} "${${_name}_${_var}}")
++ endif()
++endmacro()
+
+ macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
+ option(WITH_${_name} "Search for ${_name} package" ON)
+ if (WITH_${_name})
+ find_package(${_name} ${ARGN})
++ _mofp_define_both_if_defined(${_name} FOUND)
++ _mofp_define_both_if_defined(${_name} INCLUDE_DIRS)
++ _mofp_define_both_if_defined(${_name} INCLUDE_DIR)
++ _mofp_define_both_if_defined(${_name} INCLUDES)
++ _mofp_define_both_if_defined(${_name} LIBRARY)
++ _mofp_define_both_if_defined(${_name} LIBRARIES)
++ _mofp_define_both_if_defined(${_name} LIBS)
++ _mofp_define_both_if_defined(${_name} FLAGS)
++ _mofp_define_both_if_defined(${_name} DEFINITIONS)
+ else (WITH_${_name})
+ string(TOUPPER ${_name} _nameUpper)
+ set(${_name}_FOUND FALSE)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 6c34e0438ab8..8954565f7a00 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -5,7 +5,6 @@ revision=4
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
-make_cmd=make
hostmakedepends="perl pkg-config extra-cmake-modules gettext"
makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
exiv2-devel kactivities5-devel gsl-devel qt5-declarative-devel
@@ -31,8 +30,6 @@ replaces="calligra-braindump>=0 calligra-flow>=0"
build_options="webengine"
desc_option_webengine="Use Qt5 WebEngine for Calligra Gemini"
-export CMAKE_GENERATOR="Unix Makefiles"
-
if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
# webengine does not cross-build from 64bit to 32bit, use webkit
if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
@@ -74,31 +71,31 @@ calligra-filters_package() {
short_desc+=" - filters"
depends="pstoedit"
pkg_install() {
- cd ${wrksrc}/build/filters
- make DESTDIR=$PKGDESTDIR install
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/filters/cmake_install.cmake
}
}
calligra-libs_package() {
short_desc+=" - libraries"
pkg_install() {
for d in interfaces libs pics servicetypes; do
- cd ${wrksrc}/build/${d}
- make DESTDIR=$PKGDESTDIR install
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/${d}/cmake_install.cmake
done
}
}
calligra-plugins_package() {
short_desc+=" - plugins"
pkg_install() {
- cd ${wrksrc}/build/plugins
- make DESTDIR=$PKGDESTDIR install
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/plugins/cmake_install.cmake
}
}
calligra-karbon_package() {
short_desc+=" - Create scalable vector drawings"
pkg_install() {
- cd ${wrksrc}/build/karbon
- make DESTDIR=$PKGDESTDIR install
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/karbon/cmake_install.cmake
}
}
calligra-kexi_package() {
@@ -109,8 +106,8 @@ calligra-kexi_package() {
calligra-stage_package() {
short_desc+=" - Write presentation documents"
pkg_install() {
- cd ${wrksrc}/build/stage
- make DESTDIR=$PKGDESTDIR install
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/stage/cmake_install.cmake
}
}
calligra-krita_package() {
@@ -121,42 +118,42 @@ calligra-krita_package() {
calligra-sheets_package() {
short_desc+=" - Write spreadsheet documents"
pkg_install() {
- cd ${wrksrc}/build/sheets
- make DESTDIR=$PKGDESTDIR install
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/sheets/cmake_install.cmake
}
}
calligra-words_package() {
short_desc+=" - Word Processor"
depends="calligra-plugins"
pkg_install() {
- cd ${wrksrc}/build/words
- make DESTDIR=$PKGDESTDIR install
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/words/cmake_install.cmake
}
}
calligra-handbook_package() {
build_style=meta
short_desc+=" - Documentation (removed temporarily)"
#pkg_install() {
- # cd ${wrksrc}/build/doc/calligra
- # make DESTDIR=$PKGDESTDIR install
+ # DESTDIR=$PKGDESTDIR \
+ # cmake -P ${wrksrc}/build/doc/calligra/cmake_install.cmake
#}
}
calligra-extras_package() {
short_desc+=" - Extras"
pkg_install() {
- cd ${wrksrc}/build/extras
- make DESTDIR=$PKGDESTDIR install
- cd ${wrksrc}/build/data
- make DESTDIR=$PKGDESTDIR install
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/extras/cmake_install.cmake
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/data/cmake_install.cmake
}
}
calligra-devtools_package() {
short_desc+=" - Developer tools"
pkg_install() {
- cd ${wrksrc}/build/devtools
- make DESTDIR=$PKGDESTDIR install
- vbin rng2cpp/rng2cpp
- vbin ../filters/sheets/excel/sidewinder/recordsxml2cpp
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/devtools/cmake_install.cmake
+ vbin build/devtools/rng2cpp/rng2cpp
+ vbin build/filters/sheets/excel/sidewinder/recordsxml2cpp
}
}
calligra-gemini_package() {
@@ -168,9 +165,9 @@ calligra-gemini_package() {
depends+=" qt5-webkit"
fi
pkg_install() {
- cd ${wrksrc}/build/components
- make DESTDIR=$PKGDESTDIR install
- cd ${wrksrc}/build/gemini
- make DESTDIR=$PKGDESTDIR install
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/components/cmake_install.cmake
+ DESTDIR=$PKGDESTDIR \
+ cmake -P ${wrksrc}/build/gemini/cmake_install.cmake
}
}
From 5691a78c42526350948748fe6564d55c59321d60 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sat, 24 Jul 2021 16:48:36 +0200
Subject: [PATCH 14/22] fcft: update to 2.4.4.
---
srcpkgs/fcft/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 89f624db093f..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
# Template file for 'fcft'
pkgname=fcft
-version=2.4.2
+version=2.4.4
revision=1
wrksrc=$pkgname
build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
license="MIT"
homepage="https://codeberg.org/dnkl/fcft"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=2fd05bde524aff59b6f3742471415316bffc18670eba2e743abf723ec45e7dfd
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
build_options="harfbuzz"
build_options_default="harfbuzz"
From edc6d057776f13b408e2986b39e5dc8f9181c3d5 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 24 Jul 2021 17:01:06 +0200
Subject: [PATCH 15/22] yq-go: update to 4.11.2.
---
srcpkgs/yq-go/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 790c4a2c3b3c..855a18fe069b 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
# Template file for 'yq-go'
pkgname=yq-go
-version=4.11.1
+version=4.11.2
revision=1
wrksrc="yq-${version}"
build_style=go
@@ -10,7 +10,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
license="MIT"
homepage="https://github.com/mikefarah/yq"
distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=0a4cb1e93114334ccbbffd468f29b27d0fae4857865ae91c570c06ef94a9bd33
+checksum=910f64ceceabed5f63550a29923c158612be94f2855b0d10fdb549d8ad826a5f
do_check() {
go test -v
From f96e1d4d94e8c11795bb13673bb1f0a95111e52d Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Sat, 24 Jul 2021 22:27:33 +0530
Subject: [PATCH 16/22] python3-dotenv: update to 0.19.0.
---
srcpkgs/python3-dotenv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-dotenv/template b/srcpkgs/python3-dotenv/template
index 0620617cd637..d71df0b9fb62 100644
--- a/srcpkgs/python3-dotenv/template
+++ b/srcpkgs/python3-dotenv/template
@@ -1,6 +1,6 @@
# Template file for 'python3-dotenv'
pkgname=python3-dotenv
-version=0.18.0
+version=0.19.0
revision=1
wrksrc="python-dotenv-${version}"
build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/theskumar/python-dotenv"
distfiles="https://github.com/theskumar/python-dotenv/archive/v${version}.tar.gz"
-checksum=8bc6225d158a8f27f693596eeefaee4243a2581b1522b0d464066fa327c630ef
+checksum=4a85022352fbbc689f5ec95a2c61df2ed6ef5a51820832d6fdc32f9d29f11653
post_install() {
vlicense LICENSE
From 9be8d07f1cab8360030ff8b25723f4213b0e90d9 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 21:34:09 +0400
Subject: [PATCH 17/22] curl: update to 7.78.0.
---
srcpkgs/curl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index d1531465db05..831c656e3c6d 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
# Template file for 'curl'
pkgname=curl
-version=7.77.0
-revision=2
+version=7.78.0
+revision=1
build_style=gnu-configure
configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
$(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -24,7 +24,7 @@ license="MIT"
homepage="https://curl.haxx.se"
changelog="https://curl.haxx.se/changes.html#${version//./_}"
distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=6c0c28868cb82593859fc43b9c8fdb769314c855c05cf1b56b023acf855df8ea
+checksum=98530b317dc95ccb324bbe4f834f07bb642fbc393b794ddf3434f246a71ea44a
build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
build_options_default="ssh ssl zstd"
vopt_conflict ssl gnutls
From 4b5b87eacfbd581bfeb271e0b46956d5fed00ed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 23 Jul 2021 18:43:11 +0700
Subject: [PATCH 18/22] util-linux-common: update to 2.37.1.
Rename the ${sourcepkg} to util-linux-common to avoid the trickiness
of do_configure. When util-linux-libs was invented, I was puzzled
about picking something to be the ${sourcepkg} but none of them
can satisfy the requirements.
Turn out, some of util-linux's libraries use those translated messages.
Let's invent a new package: util-linux-common, and make it the sourcepkg
for those libraries.
This package will contain all the translated message for util-linux.
---
srcpkgs/libblkid | 2 +-
srcpkgs/libblkid-devel | 2 +-
srcpkgs/libfdisk | 2 +-
srcpkgs/libfdisk-devel | 2 +-
srcpkgs/libmount | 2 +-
srcpkgs/libmount-devel | 2 +-
srcpkgs/libsmartcols | 2 +-
srcpkgs/libsmartcols-devel | 2 +-
srcpkgs/libuuid | 2 +-
srcpkgs/libuuid-devel | 2 +-
.../template | 96 +++++++++----------
.../update | 0
srcpkgs/util-linux-libs | 1 +
srcpkgs/util-linux-libs/patches | 1 -
14 files changed, 54 insertions(+), 64 deletions(-)
rename srcpkgs/{util-linux-libs => util-linux-common}/template (58%)
rename srcpkgs/{util-linux-libs => util-linux-common}/update (100%)
create mode 120000 srcpkgs/util-linux-libs
delete mode 120000 srcpkgs/util-linux-libs/patches
diff --git a/srcpkgs/libblkid b/srcpkgs/libblkid
index d3d5b40f1ef2..9b5553747383 120000
--- a/srcpkgs/libblkid
+++ b/srcpkgs/libblkid
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libblkid-devel b/srcpkgs/libblkid-devel
index d3d5b40f1ef2..9b5553747383 120000
--- a/srcpkgs/libblkid-devel
+++ b/srcpkgs/libblkid-devel
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libfdisk b/srcpkgs/libfdisk
index d3d5b40f1ef2..9b5553747383 120000
--- a/srcpkgs/libfdisk
+++ b/srcpkgs/libfdisk
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libfdisk-devel b/srcpkgs/libfdisk-devel
index d3d5b40f1ef2..9b5553747383 120000
--- a/srcpkgs/libfdisk-devel
+++ b/srcpkgs/libfdisk-devel
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libmount b/srcpkgs/libmount
index d3d5b40f1ef2..9b5553747383 120000
--- a/srcpkgs/libmount
+++ b/srcpkgs/libmount
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libmount-devel b/srcpkgs/libmount-devel
index d3d5b40f1ef2..9b5553747383 120000
--- a/srcpkgs/libmount-devel
+++ b/srcpkgs/libmount-devel
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libsmartcols b/srcpkgs/libsmartcols
index d3d5b40f1ef2..9b5553747383 120000
--- a/srcpkgs/libsmartcols
+++ b/srcpkgs/libsmartcols
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libsmartcols-devel b/srcpkgs/libsmartcols-devel
index d3d5b40f1ef2..9b5553747383 120000
--- a/srcpkgs/libsmartcols-devel
+++ b/srcpkgs/libsmartcols-devel
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libuuid b/srcpkgs/libuuid
index d3d5b40f1ef2..9b5553747383 120000
--- a/srcpkgs/libuuid
+++ b/srcpkgs/libuuid
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libuuid-devel b/srcpkgs/libuuid-devel
index d3d5b40f1ef2..9b5553747383 120000
--- a/srcpkgs/libuuid-devel
+++ b/srcpkgs/libuuid-devel
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/util-linux-libs/template b/srcpkgs/util-linux-common/template
similarity index 58%
rename from srcpkgs/util-linux-libs/template
rename to srcpkgs/util-linux-common/template
index ad8c4512a35c..4edf7bb75564 100644
--- a/srcpkgs/util-linux-libs/template
+++ b/srcpkgs/util-linux-common/template
@@ -1,59 +1,31 @@
-# Template file for 'util-linux-libs'
+# Template file for 'util-linux-common'
# Keep this package sync with util-linux
-pkgname=util-linux-libs
-version=2.36.2
+pkgname=util-linux-common
+version=2.37.1
revision=1
wrksrc="util-linux-$version"
-build_style=meta
-hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
+build_style=gnu-configure
+configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
+ --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
+ --enable-vipw --enable-newgrp --enable-chfn-chsh --with-systemdsystemunitdir=no
+ --without-udev --without-python --enable-write"
+hostmakedepends="gettext pkg-config"
makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
-depends="libfdisk-${version}_${revision} libblkid-${version}_${revision}
- libmount-${version}_${revision} libsmartcols-${version}_${revision}
- libuuid-${version}_${revision}"
-short_desc="Miscellaneous linux utilities - meta libraries"
+checkdepends="xz tar iproute2 socat procps-ng bc"
+short_desc="Miscellaneous linux utilities - common files"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
-checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
+checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
-pre_configure() {
- local _cfgdir="$XBPS_COMMONDIR/environment/configure"
- NOCONFIGURE=1 ./autogen.sh
- for f in ./**/*config*.sub; do
- if [ -f "$f" ]; then
- cp -f "$_cfgdir/automake/config.sub" "$f"
- fi
- done
- for f in ./**/*config*.guess; do
- if [ -f "$f" ]; then
- cp -f "$_cfgdir/automake/config.guess" "$f"
- fi
- done
- # We want to keep basepkg as meta but we also needs below helper
- unset build_style
- . "$_cfgdir/gnu-configure-args.sh"
-}
-
-do_configure() {
- ./configure ${configure_args} \
- --exec-prefix=/usr --libdir=/usr/lib \
- --bindir=/usr/bin --sbindir=/usr/bin \
- --enable-libuuid --disable-makeinstall-chown \
- --enable-libblkid --enable-fsck --disable-rpath \
- --enable-fs-paths-extra=/usr/sbin:/usr/bin \
- --enable-vipw --enable-newgrp --enable-chfn-chsh \
- --with-systemdsystemunitdir=no \
- --without-udev --without-python \
- --enable-write
-}
-
-do_build() {
- make ${makejobs}
-}
-
-do_check() {
- make -k check
+post_extract() {
+ # hung inside xbps-src
+ rm -f tests/ts/lsns/ioctl_ns
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ # Known broken
+ rm -f tests/ts/col/multibyte
+ fi
}
do_install() {
@@ -64,18 +36,30 @@ do_install() {
rm -rf "$DESTDIR/usr/share/man/man5"
rm -rf "$DESTDIR/usr/share/man/man8"
rm -rf "$DESTDIR/usr/share/bash-completion"
- rm -rf "$DESTDIR/usr/share/locale"
rm -rf "$DESTDIR/usr/share/doc/"
+ # Some libraries have i18n text
+ # rm -rf "$DESTDIR/usr/share/locale"
+}
+
+util-linux-libs_package() {
+ short_desc+=" - meta libraries"
+ build_style=meta
+ depends="libfdisk-${version}_${revision} libblkid-${version}_${revision}
+ libmount-${version}_${revision} libsmartcols-${version}_${revision}
+ libuuid-${version}_${revision}"
}
libfdisk_package() {
short_desc="Library for fdisk(8)"
+ depends="${sourcepkg}>=${version}_1<=${version}_9999"
pkg_install() {
vmove "usr/lib/libfdisk.so.*"
}
}
+
libfdisk-devel_package() {
- depends="libblkid-devel-${version}_${revision} libfdisk-${version}_${revision}"
+ depends="libblkid-devel>=${version}_1<=${version}_9999
+ libfdisk>=${version}_1<=${version}_9999"
short_desc="Library for fdisk(8) - development files"
pkg_install() {
vmove usr/lib/libfdisk.a
@@ -86,12 +70,14 @@ libfdisk-devel_package() {
}
libmount_package() {
short_desc="Library for mount(8)"
+ depends="${sourcepkg}>=${version}_1<=${version}_9999"
pkg_install() {
vmove "usr/lib/libmount.so.*"
}
}
libmount-devel_package() {
- depends="libblkid-devel-${version}_${revision} libmount-${version}_${revision}"
+ depends="libblkid-devel>=${version}_1<=${version}_9999
+ libmount>=${version}_1<=${version}_9999"
short_desc="Library for mount(8) - development files"
pkg_install() {
vmove usr/lib/libmount.a
@@ -102,12 +88,14 @@ libmount-devel_package() {
}
libblkid_package() {
short_desc="Library to handle device identification"
+ depends="${sourcepkg}>=${version}_1<=${version}_9999"
pkg_install() {
vmove "usr/lib/libblkid.so.*"
}
}
libblkid-devel_package() {
- depends="zlib-devel libuuid-devel-${version}_${revision} libblkid-${version}_${revision}"
+ depends="zlib-devel libuuid-devel>=${version}_1<=${version}_9999
+ libblkid>=${version}_1<=${version}_9999"
short_desc="Library to handle device identification - development files"
pkg_install() {
vmove usr/include/blkid
@@ -119,12 +107,13 @@ libblkid-devel_package() {
}
libuuid_package() {
short_desc="UUID library"
+ depends="${sourcepkg}>=${version}_1<=${version}_9999"
pkg_install() {
vmove "usr/lib/libuuid.so.*"
}
}
libuuid-devel_package() {
- depends="libuuid-${version}_${revision}"
+ depends="libuuid>=${version}_${revision}<=${version}_9999"
short_desc="UUID library development files"
pkg_install() {
vmove usr/lib/libuuid.a
@@ -135,7 +124,7 @@ libuuid-devel_package() {
}
}
libsmartcols-devel_package() {
- depends="libsmartcols>=${version}_${revision}"
+ depends="libsmartcols>=${version}_${revision}<=${version}_9999"
short_desc="Table or Tree library from util-linux - development files"
pkg_install() {
vmove usr/lib/libsmartcols.a
@@ -146,6 +135,7 @@ libsmartcols-devel_package() {
}
libsmartcols_package() {
short_desc="Table or Tree library from util-linux"
+ depends="${sourcepkg}>=${version}_1<=${version}_9999"
pkg_install() {
vmove usr/lib/libsmartcols.so.*
}
diff --git a/srcpkgs/util-linux-libs/update b/srcpkgs/util-linux-common/update
similarity index 100%
rename from srcpkgs/util-linux-libs/update
rename to srcpkgs/util-linux-common/update
diff --git a/srcpkgs/util-linux-libs b/srcpkgs/util-linux-libs
new file mode 120000
index 000000000000..9b5553747383
--- /dev/null
+++ b/srcpkgs/util-linux-libs
@@ -0,0 +1 @@
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/util-linux-libs/patches b/srcpkgs/util-linux-libs/patches
deleted file mode 120000
index 33edac3e5923..000000000000
--- a/srcpkgs/util-linux-libs/patches
+++ /dev/null
@@ -1 +0,0 @@
-../util-linux/patches
\ No newline at end of file
From 8a694b0ea6be3a002cc9ae8fa9e4948ec847f98c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 23 Jul 2021 18:43:23 +0700
Subject: [PATCH 19/22] util-linux: update to 2.37.1.
---
srcpkgs/util-linux/patches/fix-musl.patch | 20 ---------
srcpkgs/util-linux/template | 53 ++++++++++-------------
2 files changed, 24 insertions(+), 49 deletions(-)
delete mode 100644 srcpkgs/util-linux/patches/fix-musl.patch
diff --git a/srcpkgs/util-linux/patches/fix-musl.patch b/srcpkgs/util-linux/patches/fix-musl.patch
deleted file mode 100644
index 8d1eeb9d2740..000000000000
--- a/srcpkgs/util-linux/patches/fix-musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Define __SWORD_TYPE for musl.
-
---- a/sys-utils/switch_root.c.orig 2014-09-20 21:33:27.551345526 +0200
-+++ b/sys-utils/switch_root.c 2014-09-20 21:34:17.958584374 +0200
-@@ -47,6 +47,15 @@
- #define MNT_DETACH 0x00000002 /* Just detach from the tree */
- #endif
-
-+#ifndef __SWORD_TYPE
-+# if __WORDSIZE == 32 /* System word size */
-+# define __SWORD_TYPE int
-+# else /* __WORDSIZE == 64 */
-+# define __SWORD_TYPE long int
-+# endif
-+#endif
-+
-+
- /* remove all files/directories below dirName -- don't cross mountpoints */
- static int recursiveRemove(int fd)
- {
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 4fb8292531ba..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,19 +1,28 @@
# Template file for 'util-linux'
-# Keep this package sync with util-linux-libs
+# Keep this package sync with util-linux-common
pkgname=util-linux
-version=2.36.2
+version=2.37.1
revision=1
-hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
+build_style=gnu-configure
+configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
+ --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
+ --enable-vipw --enable-newgrp --enable-chfn-chsh --with-systemdsystemunitdir=no
+ --with-udev --without-python --enable-write"
+hostmakedepends="gettext pkg-config"
makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
eudev-libudev-devel"
-# FIXME: don't be so strict on the dependency
-depends="util-linux-libs-${version}_${revision}"
+depends="libfdisk>=${version}_1<=${version}_9999
+ libblkid>=${version}_1<=${version}_9999
+ libmount>=${version}_1<=${version}_9999
+ libsmartcols>=${version}_1<=${version}_9999
+ libuuid>=${version}_1<=${version}_9999"
+checkdepends="xz tar iproute2 socat procps-ng bc"
short_desc="Miscellaneous linux utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
+checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
# Create uuidd system account for uuidd.
system_accounts="_uuidd"
@@ -30,29 +39,13 @@ alternatives="
logger:logger.1:/usr/share/man/man1/${pkgname}-logger.1
"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
-
-do_configure() {
- ./configure ${configure_args} \
- --exec-prefix=/usr --libdir=/usr/lib \
- --bindir=/usr/bin --sbindir=/usr/bin \
- --enable-libuuid --disable-makeinstall-chown \
- --enable-libblkid --enable-fsck --disable-rpath \
- --enable-fs-paths-extra=/usr/sbin:/usr/bin \
- --enable-vipw --enable-newgrp --enable-chfn-chsh \
- --with-systemdsystemunitdir=no \
- --with-udev --without-python \
- --enable-write
-}
-
-do_build() {
- make ${makejobs}
-}
-
-do_check() {
- make -k check
+post_extract() {
+ # hung inside xbps-src
+ rm -f tests/ts/lsns/ioctl_ns
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ # Known broken
+ rm -f tests/ts/col/multibyte
+ fi
}
do_install() {
@@ -75,4 +68,6 @@ do_install() {
rm -rf "$DESTDIR/usr/include"
rm -rf "$DESTDIR/usr/lib"
rm -rf "$DESTDIR/usr/share/man/man3"
+ # Provided by util-linux-common
+ rm -rf "$DESTDIR/usr/share/locale"
}
From 950ddc69130b13ae9cdaa1036f8b294cd28f6047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 11:15:02 +0700
Subject: [PATCH 20/22] android-tools: update to 31.0.2.
---
srcpkgs/android-tools/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 6eccbf0b3b1f..20ffbbb80366 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,10 +1,10 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=31.0.0p1
-revision=3
+version=31.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le*"
build_style=cmake
-hostmakedepends="perl go protobuf"
+hostmakedepends="perl go protobuf pkg-config"
makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel"
short_desc="Android platform tools (adb and fastboot)"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="http://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=51a4c3ba5f16945905449c4bd2c1c781a4df7469f6b7362f8837f4f640d8c7b6
+checksum=61b3bf6c240cb0b4d0ccfef696c55986e06657843627df950fdcf6881af0f8d4
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 6753e27f69fea875b59ebe71923113e58f768281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 09:47:13 +0700
Subject: [PATCH 21/22] python3-Sphinx: update to 4.1.1.
---
srcpkgs/python3-Sphinx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
index 859db888c1f5..66798b38a2cc 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,6 +1,6 @@
# Template file for 'python3-Sphinx'
pkgname=python3-Sphinx
-version=4.0.2
+version=4.1.1
revision=1
wrksrc=Sphinx-${version}
build_style=python3-module
@@ -18,7 +18,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-3-Clause"
homepage="http://sphinx-doc.org"
distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
-checksum=b5c2ae4120bf00c799ba9b3699bc895816d272d120080fbc967292f29b52b48c
+checksum=23c846a1841af998cb736218539bb86d16f5eb95f5760b1966abcd2d584e62b8
conflicts="python-Sphinx>=0"
post_install() {
From 05e6839fc087f52ced50aab5fd50b38ee0407f84 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 15 Jan 2021 00:05:29 -0800
Subject: [PATCH 22/22] New package: rock64-base-0.1
---
srcpkgs/rock64-base/INSTALL | 5 +++++
srcpkgs/rock64-base/template | 12 ++++++++++++
2 files changed, 17 insertions(+)
create mode 100644 srcpkgs/rock64-base/INSTALL
create mode 100644 srcpkgs/rock64-base/template
diff --git a/srcpkgs/rock64-base/INSTALL b/srcpkgs/rock64-base/INSTALL
new file mode 100644
index 000000000000..e3c9b3bafa26
--- /dev/null
+++ b/srcpkgs/rock64-base/INSTALL
@@ -0,0 +1,5 @@
+if [ "${UPDATE}" = "no" ] && [ "${ACTION}" = "post" ]; then
+ mkdir -p etc/runit/runsvdir/default/
+ ln -sf /etc/sv/sshd etc/runit/runsvdir/default/
+ ln -sf /etc/sv/dhcpcd etc/runit/runsvdir/default/
+fi
diff --git a/srcpkgs/rock64-base/template b/srcpkgs/rock64-base/template
new file mode 100644
index 000000000000..6f885e79783f
--- /dev/null
+++ b/srcpkgs/rock64-base/template
@@ -0,0 +1,12 @@
+# Template file for 'rock64-base'
+pkgname=rock64-base
+version=0.1
+revision=1
+archs="aarch64*"
+build_style=meta
+# Linux 5.10 used for USB3 support and stability
+depends="rock64-uboot u-boot-menu linux5.10 dracut"
+short_desc="Void Linux Rock64 platform package"
+maintainer="Cameron Nemo <cnemo@tutanota.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org"
^ permalink raw reply [flat|nested] 12+ messages in thread