* Re: [PR PATCH] [Updated] LibreCAD: fix missing built-in plugins menu
2021-12-24 3:49 [PR PATCH] LibreCAD: fix missing built-in menu hervyqa
` (5 preceding siblings ...)
2021-12-27 14:01 ` [PR PATCH] [Updated] " hervyqa
@ 2021-12-27 14:16 ` hervyqa
2021-12-27 14:40 ` ericonr
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: hervyqa @ 2021-12-27 14:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 618 bytes --]
There is an updated pull request by hervyqa against master on the void-packages repository
https://github.com/hervyqa/void-packages LibreCAD
https://github.com/void-linux/void-packages/pull/34683
LibreCAD: fix missing built-in plugins menu
Solved #32497
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
https://user-images.githubusercontent.com/45872139/147313649-5c5f7710-8f24-4e88-8f6b-b0d7e60a6aee.mp4
A patch file from https://github.com/void-linux/void-packages/pull/34683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-LibreCAD-34683.patch --]
[-- Type: text/x-diff, Size: 81679 bytes --]
From 6daf0ff163ded5b6c84e26e2c4e9bd58fc5ea2d9 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Fri, 24 Dec 2021 10:38:16 +0700
Subject: [PATCH 01/49] LibreCAD: fix missing built-in menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
srcpkgs/LibreCAD/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/LibreCAD/template b/srcpkgs/LibreCAD/template
index 4de5398f119b..36f326bf40ea 100644
--- a/srcpkgs/LibreCAD/template
+++ b/srcpkgs/LibreCAD/template
@@ -1,7 +1,7 @@
# Template file for 'LibreCAD'
pkgname=LibreCAD
version=2.1.3
-revision=4
+revision=5
build_style=qmake
hostmakedepends="qt5-qmake pkg-config ImageMagick qt5-host-tools"
makedepends="qt5-devel qt5-svg-devel boost-devel muparser-devel librsvg-devel"
@@ -46,9 +46,14 @@ do_install() {
vcopy librecad.svg usr/share/icons/hicolor/scalable/apps
# install resources
- for resource in library patterns fonts qm; do
+ for resource in fonts library patterns qm; do
vcopy unix/resources/${resource} usr/share/librecad/
done
- vcopy unix/resources/plugins usr/lib/librecad/
+ # install plugins
+ vmkdir usr/share/librecad/plugins
+ vcopy unix/resources/plugins usr/lib/librecad/
+ for plugin in $DESTDIR/usr/lib/librecad/*.so ; do
+ ln -sf ../../../lib/librecad/$(basename $plugin) ${DESTDIR}/usr/share/librecad/plugins/$(basename $plugin)
+ done
}
From 9d5eb3c5ed5120d974542546c671bc47a5033e23 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 24 Dec 2021 17:40:49 +0100
Subject: [PATCH 02/49] New package: jack_mixer-17
---
srcpkgs/jack_mixer/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/jack_mixer/template
diff --git a/srcpkgs/jack_mixer/template b/srcpkgs/jack_mixer/template
new file mode 100644
index 000000000000..9063688bdcc2
--- /dev/null
+++ b/srcpkgs/jack_mixer/template
@@ -0,0 +1,15 @@
+# Template file for 'jack_mixer'
+pkgname=jack_mixer
+version=17
+revision=1
+build_style=meson
+configure_args="-Dcheck-py-modules=false"
+hostmakedepends="gettext pkg-config"
+makedepends="glib-devel jack-devel python3-devel"
+depends="python3-cairo python3-gobject python3-xdg"
+short_desc="GTK JACK audio mixer with a look similar to its hardware counterpart"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://rdio.space/jackmixer/"
+distfiles="https://github.com/jack-mixer/jack_mixer/releases/download/release-${version}/jack_mixer-${version}.tar.xz"
+checksum=6c8c5735bed05b0a0f8ed7d3d582bc1dd346c2530331e226c86faec7d355e086
From 681336e4283bc30a075845782ab15522de4aad58 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 24 Dec 2021 18:01:00 +0100
Subject: [PATCH 03/49] New package: patchmatrix-0.26.0
---
srcpkgs/patchmatrix/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/patchmatrix/template
diff --git a/srcpkgs/patchmatrix/template b/srcpkgs/patchmatrix/template
new file mode 100644
index 000000000000..d15cb0fd28b1
--- /dev/null
+++ b/srcpkgs/patchmatrix/template
@@ -0,0 +1,13 @@
+# Template file for 'patchmatrix'
+pkgname=patchmatrix
+version=0.26.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config cmake"
+makedepends="lv2 glew-devel jack-devel"
+short_desc="JACK patchbay in flow matrix style"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="Artistic-2.0"
+homepage="https://git.open-music-kontrollers.ch/lad/patchmatrix/about/"
+distfiles="https://git.open-music-kontrollers.ch/lad/patchmatrix/snapshot/patchmatrix-${version}.tar.xz"
+checksum=72a3c70a7ac084707a6b4c663d460e02c65f2ecaa71a95c4b864755ba8ba5bb2
From fb53ef86224661010e5771e32d1f4d9ed1365437 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 15 Dec 2021 20:12:52 -0600
Subject: [PATCH 04/49] zfs: update to 2.1.2.
---
srcpkgs/zfs/patches/musl-seek-constants.patch | 58 ++++++++++++
srcpkgs/zfs/patches/python310.patch | 92 -------------------
srcpkgs/zfs/template | 6 +-
3 files changed, 61 insertions(+), 95 deletions(-)
create mode 100644 srcpkgs/zfs/patches/musl-seek-constants.patch
delete mode 100644 srcpkgs/zfs/patches/python310.patch
diff --git a/srcpkgs/zfs/patches/musl-seek-constants.patch b/srcpkgs/zfs/patches/musl-seek-constants.patch
new file mode 100644
index 000000000000..3d2c563f8c51
--- /dev/null
+++ b/srcpkgs/zfs/patches/musl-seek-constants.patch
@@ -0,0 +1,58 @@
+From 123c87b3c2d75636da79f57a4b0ed60d2a3133a8 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Mon, 20 Dec 2021 12:25:11 -0800
+Subject: [PATCH] zfs-test/mmap_seek: fix build on musl
+
+it needs linux/fs.h for SEEK_DATA and friends
+
+without linux/fs.h:
+
+```
+mmap_seek.c
+mmap_seek.c: In function 'seek_data':
+mmap_seek.c:37:40: error: 'SEEK_DATA' undeclared (first use in this function);
+did you mean 'SEEK_SET'?
+ 37 | off_t data_offset = lseek(fd, offset, SEEK_DATA);
+```
+
+also it needs sys/sysmacros.h for P2ROUNDUP
+without it:
+
+```
+mmap_seek.c: In function 'main':
+mmap_seek.c:122:19: warning:
+implicit declaration of function 'P2ROUNDUP' [-Wimplicit-function-declaration]
+ 122 | seek_hole(fd, 0, P2ROUNDUP(file_size / 2, block_size));
+ | ^~~~~~~~~
+powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.o: in function `main':
+mmap_seek.c:(.text.startup+0x1b8): undefined reference to `P2ROUNDUP'
+powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.c:(.text.startup+0x1d8):
+ undefined reference to `P2ROUNDUP'
+powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.c:(.text.startup+0x21c):
+ undefined reference to `P2ROUNDUP'
+collect2: error: ld returned 1 exit status
+make[5]: *** [Makefile:754: mmap_seek] Error 1
+```
+
+Closes: https://github.com/openzfs/zfs/pull/12891
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ tests/zfs-tests/cmd/mmap_seek/mmap_seek.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
+index f476e1dba9a..bb36527aafe 100644
+--- a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
++++ b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
+@@ -29,7 +29,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/mman.h>
++#include <sys/sysmacros.h>
+ #include <errno.h>
++#ifdef __linux__
++#include <linux/fs.h>
++#endif
+
+ static void
+ seek_data(int fd, off_t offset, off_t expected)
diff --git a/srcpkgs/zfs/patches/python310.patch b/srcpkgs/zfs/patches/python310.patch
deleted file mode 100644
index e4d42b121274..000000000000
--- a/srcpkgs/zfs/patches/python310.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Most fo the patch taken from
-
- https://github.com/openzfs/zfs/commit/08cd0717359b1a18693e3c8e6d6e5a2819b35a48
-
-but this fix still missed the `print (sys.version[[:3]])"` part of the test,
-which extracts "3.1" on Python 3.10. The right fix is to properly split
-sys.version on '.' and rejoin the first two components.
-
-diff -ur a/config/always-pyzfs.m4 b/config/always-pyzfs.m4
---- a/config/always-pyzfs.m4 2021-09-15 16:30:47.164862738 -0400
-+++ b/config/always-pyzfs.m4 2021-09-29 14:34:51.288636042 -0400
-@@ -47,6 +47,21 @@
- AC_SUBST(DEFINE_PYZFS)
-
- dnl #
-+ dnl # Python "packaging" (or, failing that, "distlib") module is required to build and install pyzfs
-+ dnl #
-+ AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [
-+ ZFS_AC_PYTHON_MODULE([packaging], [], [
-+ ZFS_AC_PYTHON_MODULE([distlib], [], [
-+ AS_IF([test "x$enable_pyzfs" = xyes], [
-+ AC_MSG_ERROR("Python $PYTHON_VERSION packaging and distlib modules are not installed")
-+ ], [test "x$enable_pyzfs" != xno], [
-+ enable_pyzfs=no
-+ ])
-+ ])
-+ ])
-+ ])
-+
-+ dnl #
- dnl # Require python-devel libraries
- dnl #
- AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [
-diff -ur a/config/ax_python_devel.m4 b/config/ax_python_devel.m4
---- a/config/ax_python_devel.m4 2021-09-15 16:30:47.164862738 -0400
-+++ b/config/ax_python_devel.m4 2021-09-29 14:40:23.293455112 -0400
-@@ -97,9 +97,18 @@
- # Check for a version of Python >= 2.1.0
- #
- AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
-- ac_supports_python_ver=`$PYTHON -c "import sys; \
-- ver = sys.version.split ()[[0]]; \
-- print (ver >= '2.1.0')"`
-+ ac_supports_python_ver=`cat<<EOD | $PYTHON -
-+from __future__ import print_function;
-+import sys;
-+try:
-+ from packaging import version;
-+except ImportError:
-+ from distlib import version;
-+ver = sys.version.split ()[[0]];
-+(tst_cmp, tst_ver) = ">= '2.1.0'".split ();
-+tst_ver = tst_ver.strip ("'");
-+eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))")
-+EOD`
- if test "$ac_supports_python_ver" != "True"; then
- if test -z "$PYTHON_NOVERSIONCHECK"; then
- AC_MSG_RESULT([no])
-@@ -126,9 +135,21 @@
- #
- if test -n "$1"; then
- AC_MSG_CHECKING([for a version of Python $1])
-- ac_supports_python_ver=`$PYTHON -c "import sys; \
-- ver = sys.version.split ()[[0]]; \
-- print (ver $1)"`
-+ # Why the strip ()? Because if we don't, version.parse
-+ # will, for example, report 3.10.0 >= '3.11.0'
-+ ac_supports_python_ver=`cat<<EOD | $PYTHON -
-+
-+from __future__ import print_function;
-+import sys;
-+try:
-+ from packaging import version;
-+except ImportError:
-+ from distlib import version;
-+ver = sys.version.split ()[[0]];
-+(tst_cmp, tst_ver) = "$1".split ();
-+tst_ver = tst_ver.strip ("'");
-+eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))")
-+EOD`
- if test "$ac_supports_python_ver" = "True"; then
- AC_MSG_RESULT([yes])
- else
-@@ -203,7 +224,7 @@
- ac_python_version=$PYTHON_VERSION
- else
- ac_python_version=`$PYTHON -c "import sys; \
-- print (sys.version[[:3]])"`
-+ print ('.'.join(sys.version.split('.')[[:2]]))"`
- fi
- fi
-
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index de2ca4b5c9e1..1ee0ad44e676 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
# Template file for 'zfs'
pkgname=zfs
-version=2.1.1
-revision=2
+version=2.1.2
+revision=1
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
--with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="CDDL-1.0"
homepage="https://openzfs.github.io/openzfs-docs/"
distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=bd4f48d009f3b5e291390bde62b0131b8bf3fab09f4fc0fa3591b1f2e7074cff
+checksum=258cf1d17a1f668a3b99b61eaf14be06c614df42503db0319bef1b9fc4c8b9e7
# dkms must be before initramfs-regenerate to build modules before images
triggers="dkms initramfs-regenerate"
dkms_modules="zfs ${version}"
From cb2350c3237ea1fab92c75e1577d87a0fdee3d30 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 24 Dec 2021 15:08:26 -0600
Subject: [PATCH 05/49] QMPlay2: update to 21.12.24.
---
srcpkgs/QMPlay2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 1bfcbdb56e18..463afde3a834 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
-version=21.12.07
+version=21.12.24
revision=1
wrksrc="${pkgname}-src-${version}"
build_style=cmake
@@ -15,7 +15,7 @@ license="LGPL-3.0-only"
homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=3b5e75227cecfb600956b371ae3768d653fe6bf301a4603a6ad0b7d617dd686d
+checksum=92e5fa7f7df43a83f72bf9e87366ebae71148bc683db0556447981f0dd8e5f2d
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From d4482f38d904fb6df761463dc0408ad31e7e768c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 24 Dec 2021 15:25:49 -0600
Subject: [PATCH 06/49] New package: python3-waitress-2.0.0
---
srcpkgs/python3-waitress/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/python3-waitress/template
diff --git a/srcpkgs/python3-waitress/template b/srcpkgs/python3-waitress/template
new file mode 100644
index 000000000000..d3cc687e412e
--- /dev/null
+++ b/srcpkgs/python3-waitress/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-waitress'
+pkgname=python3-waitress
+version=2.0.0
+revision=1
+wrksrc="waitress-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest-cov"
+short_desc="Pure-Python WSGI server"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="ZPL-2.1"
+homepage="https://github.com/Pylons/waitress"
+distfiles="${PYPI_SITE}/w/waitress/waitress-2.0.0.tar.gz"
+checksum=69e1f242c7f80273490d3403c3976f3ac3b26e289856936d1f620ed48f321897
From 0bdc121867aa641d0e3e1bea5560745ad75897af Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 24 Dec 2021 15:28:28 -0600
Subject: [PATCH 07/49] python3-requests-unixsocket: update to 0.3.0.
---
srcpkgs/python3-requests-unixsocket/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-requests-unixsocket/template b/srcpkgs/python3-requests-unixsocket/template
index dc0155c26dd6..12e599d203f7 100644
--- a/srcpkgs/python3-requests-unixsocket/template
+++ b/srcpkgs/python3-requests-unixsocket/template
@@ -1,15 +1,15 @@
# Template file for 'python3-requests-unixsocket'
pkgname=python3-requests-unixsocket
-version=0.2.0
-revision=4
+version=0.3.0
+revision=1
wrksrc="requests-unixsocket-${version}"
build_style=python3-module
-pycompile_module="requests_unixsocket"
hostmakedepends="python3-setuptools python3-pbr"
depends="python3-requests python3-urllib3"
+checkdepends="$depends python3-waitress python3-pytest"
short_desc="Use requests to talk HTTP via a UNIX domain socket"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/msabramo/requests-unixsocket"
distfiles="${PYPI_SITE}/r/requests-unixsocket/requests-unixsocket-${version}.tar.gz"
-checksum=9e5c1a20afc3cf786197ae59c79bcdb0e7565f218f27df5f891307ee8817c1ea
+checksum=28304283ea9357d45fff58ad5b11e47708cfbf5806817aa59b2a363228ee971e
From e99adf0d1f0593c150d76c495915c040284bbe0d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 24 Dec 2021 15:29:51 -0600
Subject: [PATCH 08/49] wimlib: update to 1.13.5.
---
srcpkgs/wimlib/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wimlib/template b/srcpkgs/wimlib/template
index 768626a6413d..145b6a24c750 100644
--- a/srcpkgs/wimlib/template
+++ b/srcpkgs/wimlib/template
@@ -1,7 +1,7 @@
# Template file for 'wimlib'
pkgname=wimlib
-version=1.13.4
-revision=2
+version=1.13.5
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libxml2-devel ntfs-3g-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wimlib.net/"
distfiles="${homepage}/downloads/wimlib-${version}.tar.gz"
-checksum=4b87dd0ad9cc1a58cee5721afebb98011dab549e72f2b55533f315f08b2ede12
+checksum=32fcc9e9b144b7cb1db4c86e104ca78283cdc225e13fe82b273660586aefe323
make_check=extended
wimlib-devel_package() {
From 5df2e4a8297d57056f0f77624088ff29937272a8 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 24 Dec 2021 15:31:00 -0600
Subject: [PATCH 09/49] xlockmore: update to 5.68.
---
srcpkgs/xlockmore/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template
index 3764f1a66f87..b79c581190bd 100644
--- a/srcpkgs/xlockmore/template
+++ b/srcpkgs/xlockmore/template
@@ -1,6 +1,6 @@
# Template file for 'xlockmore'
pkgname=xlockmore
-version=5.67
+version=5.68
revision=1
build_style=gnu-configure
configure_args="--with-xinerama $(vopt_if opengl '--with-opengl --with-mesa')"
@@ -13,7 +13,7 @@ license="MIT"
homepage="http://sillycycle.com/xlockmore.html"
changelog="http://sillycycle.com/xlock/xlockmore.README"
distfiles="http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"
-checksum=a8607e170e0df4af8f707d3b38f7ceb0d0e128773d7e175e202092695f7f234c
+checksum=30731fdcb203f16eb5c1c43c05d42e452ad0eb4555c97c55566a6ecb1877cd6e
CFLAGS="-D_DEFAULT_SOURCE"
build_options="opengl"
From 65cc26e4b3cda3727788077a2ce73a7f4b895add Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Dec 2021 13:45:01 +0100
Subject: [PATCH 10/49] youtube-viewer: update to 3.9.7.
---
srcpkgs/youtube-viewer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 1753562f6547..bdf304f9de86 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'youtube-viewer'
pkgname=youtube-viewer
-version=3.9.6
+version=3.9.7
revision=1
build_style=perl-ModuleBuild
configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
homepage="https://github.com/trizen/youtube-viewer"
changelog="https://github.com/trizen/youtube-viewer/releases"
distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=d8cc6a8611688507117d3d2fe492d70c436e81f2599485f943a5f01a5ef515db
+checksum=0b7ccf18e7aa71b2b82214e3a5614e3036bc98d94951b9bd7aba8da952486257
gtk-youtube-viewer_package() {
depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
From d0cad2db79111039f7c8a3c5f34bb999cb606e09 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Dec 2021 17:48:23 +0100
Subject: [PATCH 11/49] perl-IO-Socket-SSL: update to 2.073.
---
srcpkgs/perl-IO-Socket-SSL/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..e725375e8a30 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
# Template file for 'perl-IO-Socket-SSL'
pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.073
revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/IO-Socket-SSL"
distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=b2c0b34df97cb1aa816221cee2454a1efd89b86ccbda810389a30e0d08cf57c8
From 6e6a5663ab190be6eb38945a5e52e25fa56f8203 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Dec 2021 17:49:26 +0100
Subject: [PATCH 12/49] ts: update to 1.0.2.
---
srcpkgs/ts/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ts/template b/srcpkgs/ts/template
index 348bc33d6393..5cb4a5395ffd 100644
--- a/srcpkgs/ts/template
+++ b/srcpkgs/ts/template
@@ -1,6 +1,6 @@
# Template file for 'ts'
pkgname=ts
-version=1.0.1
+version=1.0.2
revision=1
build_style=gnu-makefile
short_desc="Simple unix task spool system"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="http://vicerveza.homeunix.net/~viric/soft/ts/"
distfiles="http://vicerveza.homeunix.net/~viric/soft/ts/${pkgname}-${version}.tar.gz"
-checksum=f41ef307b0b9c7424398813b9c6e39d37a970831071e301842ba4b1145d56278
+checksum=f73452aed80e2f9a7764883e9353aa7f40e65d3c199ad1f3be60fd58b58eafec
do_install() {
make PREFIX="$DESTDIR/usr" install
From 3e38077c2bbe15fcc2d1b6df78088787888672e1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Dec 2021 17:51:03 +0100
Subject: [PATCH 13/49] python3-drgn: update to 0.0.16.
---
srcpkgs/python3-drgn/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-drgn/template b/srcpkgs/python3-drgn/template
index 9834bd20f034..6cf3af1f568b 100644
--- a/srcpkgs/python3-drgn/template
+++ b/srcpkgs/python3-drgn/template
@@ -1,7 +1,7 @@
# Template file for 'python3-drgn'
pkgname=python3-drgn
-version=0.0.14
-revision=2
+version=0.0.16
+revision=1
wrksrc="drgn-${version}"
build_style=python3-module
hostmakedepends="automake libtool pkg-config python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/osandov/drgn/"
distfiles="https://github.com/osandov/drgn/archive/refs/tags/v${version}.tar.gz"
-checksum=97088c7f32fcfbad0795159807e3290794cacc011228bd27e86510eb62e73bc3
+checksum=8dee0e92babc456ecf9228dc5f5433ae78fb2d6215d035bef79f29afaecd4433
pre_build() {
if [ "$CROSS_BUILD" ]; then
From 129bf9201530376cfffc7ba241b896350c703d88 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 00:14:49 +0100
Subject: [PATCH 14/49] libkdumpfile: set nocross.
---
srcpkgs/libkdumpfile/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libkdumpfile/template b/srcpkgs/libkdumpfile/template
index 3e8de1a72cd3..86a4d0a6b194 100644
--- a/srcpkgs/libkdumpfile/template
+++ b/srcpkgs/libkdumpfile/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/ptesarik/libkdumpfile"
distfiles="https://github.com/ptesarik/libkdumpfile/archive/refs/tags/v${version}.tar.gz"
checksum=766bc76a360f269f8bc3e0833e31f142efa1c7dcc4b7036df912bb5f5ef494d6
+nocross="python3-module inside"
pre_configure() {
autoreconf -fi
From d8e82e75e18cfecf6f72c8b598b9d9409ff88a0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 23 Dec 2021 16:32:32 +0100
Subject: [PATCH 15/49] krita: update to 5.0.0.
---
common/shlibs | 1 +
srcpkgs/krita-devel | 1 +
...5beaa1fdba03d38f887b93a15a58fc0830c7.patch | 50 +++++++++++++++++++
srcpkgs/krita/patches/aarch64.patch | 19 -------
srcpkgs/krita/patches/cross.patch | 13 -----
srcpkgs/krita/template | 19 +++++--
6 files changed, 67 insertions(+), 36 deletions(-)
create mode 120000 srcpkgs/krita-devel
create mode 100644 srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch
delete mode 100644 srcpkgs/krita/patches/aarch64.patch
delete mode 100644 srcpkgs/krita/patches/cross.patch
diff --git a/common/shlibs b/common/shlibs
index 86b3a4f42422..a05a5fff92d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3945,6 +3945,7 @@ libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
libKSeExpr.so.4.0.1.0 seexpr-krita-4.0.1.0_1
+libkritaqmicinterface.so.17 krita-5.0.0_1
liburing.so.2 liburing-2.0_1
libbson-1.0.so.0 libbson-1.17.4_2
libsonic.so.0 libsonic-0.2.0_1
diff --git a/srcpkgs/krita-devel b/srcpkgs/krita-devel
new file mode 120000
index 000000000000..12b23cdf747f
--- /dev/null
+++ b/srcpkgs/krita-devel
@@ -0,0 +1 @@
+krita
\ No newline at end of file
diff --git a/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch b/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch
new file mode 100644
index 000000000000..6c9c71d4fca2
--- /dev/null
+++ b/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch
@@ -0,0 +1,50 @@
+From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
+From: Sharaf Zaman <shzam@sdf.org>
+Date: Wed, 27 Oct 2021 22:19:07 +0000
+Subject: [PATCH] Fix build on linux clang targets
+
+In CheckAtomic.cmake we include is_lock_free because these routines
+don't seem to be included in the compiler's "simple atomics". This
+triggers a failure in clang toolchain, forcing it to link libatomic.
+
+Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
+
+CCBUG:444247
+CCBUG:444547
+---
+ cmake/modules/CheckAtomic.cmake | 1 +
+ libs/image/CMakeLists.txt | 6 ++----
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
+index b061e2d65b..df6b70504c 100644
+--- a/cmake/modules/CheckAtomic.cmake
++++ b/cmake/modules/CheckAtomic.cmake
+@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
+ std::atomic<uint64_t> x (0);
+ int main() {
+ uint64_t i = x.load(std::memory_order_relaxed);
++ x.is_lock_free();
+ return 0;
+ }
+ " ${varname})
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index e883c7f1c8..43c945fad3 100644
+--- a/libs/image/CMakeLists.txt
++++ b/libs/image/CMakeLists.txt
+@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
+
+ target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
+
+-if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+- if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+- target_link_libraries(kritaimage PUBLIC atomic)
+- endif()
++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
++ target_link_libraries(kritaimage PUBLIC atomic)
+ endif()
+
+ if(OpenEXR_FOUND)
+--
+GitLab
+
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt 2021-08-03 10:57:54.000000000 +0200
-+++ - 2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
- ${OCIO_INCLUDE_DIR}
- )
-
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
-- add_definitions(-DQT_OPENGL_ES_3)
-- add_definitions(-DHAS_ONLY_OPENGL_ES)
-- include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
-
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake 2021-08-03 10:57:54.000000000 +0200
-+++ - 2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
-
- else()
-- find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
-- find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+ find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+ find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-
- macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)
- get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 1e3ec253c1db..835ed0cfa749 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
-version=4.4.8
-revision=2
+version=5.0.0
+revision=1
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -14,15 +14,17 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
- libopenjpeg2-devel"
+ libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
+ qt5-plugin-pgsql qt5-plugin-tds libwebp-devel libmypaint-devel"
short_desc="Painting and image editing program"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-only"
homepage="https://krita.org/"
distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=bcc68a5711d92515d6553611a0bddd53f3259843fd3534b9b3e535d7ed430df8
+checksum=84d5833dbcab3fd3a418f4c37670d82ad919430f0c6d0a57b993907471eecc57
python_version=3
replaces="calligra-krita>=0"
+make_check=no
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) makedepends+=" vc";;
@@ -39,3 +41,12 @@ pre_configure() {
configure_args+=" -D_find_pyqt5_py=$wrksrc/cmake/modules/FindPyQt5.py"
fi
}
+
+krita-devel_package() {
+ depends="krita>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
From a062e421b48160ccaadfebf62262f800c3c0ac1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 25 Dec 2021 18:06:10 +0100
Subject: [PATCH 16/49] gmic: switch gmic-krita to the krita patchset
krita>5.0.0 does require gmic to be a krita plugin
instead of a standalone bin, upstream gmic doesn't
support this (yet (?))
---
srcpkgs/gmic-krita | 1 -
srcpkgs/gmic-krita/template | 20 ++++++++++++++++++++
srcpkgs/gmic/template | 10 +---------
3 files changed, 21 insertions(+), 10 deletions(-)
delete mode 120000 srcpkgs/gmic-krita
create mode 100644 srcpkgs/gmic-krita/template
diff --git a/srcpkgs/gmic-krita b/srcpkgs/gmic-krita
deleted file mode 120000
index 433883885ce6..000000000000
--- a/srcpkgs/gmic-krita
+++ /dev/null
@@ -1 +0,0 @@
-gmic
\ No newline at end of file
diff --git a/srcpkgs/gmic-krita/template b/srcpkgs/gmic-krita/template
new file mode 100644
index 000000000000..e7d1cb154902
--- /dev/null
+++ b/srcpkgs/gmic-krita/template
@@ -0,0 +1,20 @@
+# Template file for 'gmic-krita'
+pkgname=gmic-krita
+version=3.0.0.1
+revision=1
+_krita_version=5.0.0
+wrksrc=gmic-${version}-patched
+build_wrksrc="gmic-qt"
+build_style=cmake
+configure_args="-DGMIC_QT_HOST=krita-plugin
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo"
+hostmakedepends="pkg-config extra-cmake-modules qt5-qmake
+ qt5-host-tools kcoreaddons"
+makedepends="fftw-devel qt5-devel qt5-tools-devel
+ kcoreaddons-devel krita-devel"
+short_desc="GREYC's Magic for Image Computing - Krita plugin"
+maintainer="John <me@johnnynator.dev>"
+license="CECILL-2.1"
+homepage="http://gmic.eu/"
+distfiles="https://files.kde.org/krita/build/dependencies/gmic-${version}-patched.tar.gz"
+checksum=05e25367af01039a97c52d48694f00daf36ee180fa68220f72522aaf245a782b
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 8c1fa6962d8d..46ce0133821f 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -42,7 +42,7 @@ do_build() {
CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
cli lib libc
- for _target in gimp krita gmic_qt zart; do
+ for _target in gimp gmic_qt zart; do
make $_target
done
}
@@ -59,14 +59,6 @@ gmic-gimp_package() {
}
}
-gmic-krita_package() {
- short_desc+=" - Krita plugin"
- depends="krita ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/bin/gmic_krita_qt
- }
-}
-
gmic-zart_package() {
short_desc+=" - ZArt tool"
depends="${sourcepkg}>=${version}_${revision}"
From 2b3d6c9fd1c334698b8a4b5b13c0acece3edcf79 Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Sun, 26 Dec 2021 00:00:17 +0100
Subject: [PATCH 17/49] ART: update to 1.11.1.
---
srcpkgs/ART/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
index 671695939be7..ac737186f7bf 100644
--- a/srcpkgs/ART/template
+++ b/srcpkgs/ART/template
@@ -1,6 +1,6 @@
# Template file for 'ART'
pkgname=ART
-version=1.11
+version=1.11.1
revision=1
build_style=cmake
hostmakedepends="pkg-config"
@@ -12,4 +12,4 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
license="GPL-3.0-or-later"
homepage="https://bitbucket.org/agriggio/art/wiki/Home"
distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=6458cdb7b8aa1afdb767c3aaaf5549e8892e2d6ecf0d29029fa32f82078dd568
+checksum=cfbd36a5a0a060098f43c5fab6494fe390e376e3dd557ffd1555b807cf295b89
From fc42e68974b2636ba1baafb8940bda9670936c00 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Sat, 25 Dec 2021 01:33:57 +0100
Subject: [PATCH 18/49] noto-fonts-emoji: update to 2.034.
---
srcpkgs/noto-fonts-emoji/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/noto-fonts-emoji/template b/srcpkgs/noto-fonts-emoji/template
index d245d4d2c957..abd24f9b0ef3 100644
--- a/srcpkgs/noto-fonts-emoji/template
+++ b/srcpkgs/noto-fonts-emoji/template
@@ -2,7 +2,7 @@
pkgname=noto-fonts-emoji
reverts="20200916_1 20200722_2 20200722_1 20191016_1 20180810_2 20180810_1
20180301_1 20170311_1 20161020_1"
-version=2.028
+version=2.034
revision=1
wrksrc=noto-emoji-${version}
depends="font-util"
@@ -11,7 +11,7 @@ maintainer="Peter Bui <pnutzh4x0r@gmail.com>"
license="OFL-1.1"
homepage="https://www.google.com/get/noto/"
distfiles="https://github.com/googlefonts/noto-emoji/archive/v${version}.tar.gz"
-checksum=731f3d5eacbe789a72b35180c0ca813ba024609a77788fbb128f5c232e0d09c5
+checksum=a5af92ba8e297e447562d7bdb11453fa40be6d88655e4a647976f0c9be4245ab
font_dirs="/usr/share/fonts/noto"
do_install() {
From 7d2f10a4ea7b34e4bebe3b9efd7115234c39823e Mon Sep 17 00:00:00 2001
From: AI-nsley69 <62105998+AI-nsley69@users.noreply.github.com>
Date: Fri, 24 Dec 2021 22:36:11 +0100
Subject: [PATCH 19/49] python3-injector: update to 0.19.0
---
srcpkgs/python3-injector/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-injector/template b/srcpkgs/python3-injector/template
index daf71c0e3760..cde75620e4df 100644
--- a/srcpkgs/python3-injector/template
+++ b/srcpkgs/python3-injector/template
@@ -1,7 +1,7 @@
# Template file for 'python3-injector'
pkgname=python3-injector
-version=0.18.4
-revision=2
+version=0.19.0
+revision=1
wrksrc="injector-${version}"
build_style=python3-module
hostmakedepends="python3-typing_extensions python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Duje Mihanovic <mihaduje@pm.me>"
license="BSD-3-Clause"
homepage="https://github.com/alecthomas/injector"
distfiles="https://github.com/alecthomas/injector/archive/${version}.tar.gz"
-checksum=9f00f16bb667142a076073af0df2c30013b1fc4c032c49029ad2f9bcba88d3b9
+checksum=ecc568a4ccb405b7f759db3fdd7c65a6f0435e3ee67ab6149e244f3c214e55bb
post_install() {
vlicense COPYING
From 136541a7133466153ba7a08406730b573ffbfc7b Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 24 Dec 2021 14:07:35 +0100
Subject: [PATCH 20/49] procs: update to 0.11.13.
---
srcpkgs/procs/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index cee5b7f47fe9..fad24562d427 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,6 +1,6 @@
# Template file for 'procs'
pkgname=procs
-version=0.11.12
+version=0.11.13
revision=1
build_style=cargo
build_helper=qemu
@@ -10,19 +10,19 @@ license="MIT"
homepage="https://github.com/dalance/procs"
changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md"
distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz"
-checksum=ff1a293d84cc0160cc92b4530ee93cedf530796e80130df74b0490c3e884efb6
+checksum=b769ddf1b2faeca4e9fb22e8e0248f5d69b4b88bd51fb37c8510d2e6a8e897d3
post_build() {
PROCS="target/${RUST_TARGET}/release/procs"
- vtargetrun ${PROCS} --completion bash
- vtargetrun ${PROCS} --completion fish
- vtargetrun ${PROCS} --completion zsh
+ vtargetrun ${PROCS} --completion-out bash >procs.bash
+ vtargetrun ${PROCS} --completion-out fish >procs.fish
+ vtargetrun ${PROCS} --completion-out zsh >procs.zsh
}
post_install() {
vcompletion procs.bash bash
vcompletion procs.fish fish
- vcompletion _procs zsh
+ vcompletion procs.zsh zsh
vlicense LICENSE
}
From efaeae45822b93b6d1ece023ed8e9e03a7b11e26 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 24 Dec 2021 07:44:40 +0100
Subject: [PATCH 21/49] praat: update to 6.2.04
---
srcpkgs/praat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 64ebebb04ab0..b64c721ab717 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
# Template file for 'praat'
pkgname=praat
-version=6.2.03
+version=6.2.04
revision=1
create_wrksrc=yes
hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.praat.org/"
changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=c15c1d1500e13cc98f757bf2de04901d41d7310e774df435d3a0c8b8b0f471c6
+checksum=65c8a70d02760fdf36e04d892412441d8d338867db30d593aea1c202aa937c24
# there are a number of pre-defined Makefiles for certain configurations
# build options are used to choose which one to use among a selected few
From 894243df00111c193ff01699d2572cb20f2d6d1e Mon Sep 17 00:00:00 2001
From: Huy Ngo <huyngo@disroot.org>
Date: Thu, 23 Dec 2021 22:14:06 +0700
Subject: [PATCH 22/49] mtxclient: update to 0.6.1
---
common/shlibs | 2 +-
srcpkgs/mtxclient/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a05a5fff92d3..e1a175684656 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -420,7 +420,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
libMAC.so.6 libMAC-5.28_1
libmad.so.0 libmad-0.15.1b_1
libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.6.0 mtxclient-0.6.0_1
+libmatrix_client.so.0.6.1 mtxclient-0.6.1_1
libebml.so.5 libebml-1.4.0_1
libdvdread.so.8 libdvdread-6.1.1_1
libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 9c8c1e3a9efe..0afdff448cff 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,6 +1,6 @@
# Template file for 'mtxclient'
pkgname=mtxclient
-version=0.6.0
+version=0.6.1
revision=1
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
@@ -11,7 +11,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
license="MIT"
homepage="https://github.com/Nheko-Reborn/mtxclient"
distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=4245feb0bd4ae8e026c01f546a6bea45bc9d9d57d13430b8ba446b0aec4915c4
+checksum=d0c3d86898ade0a0680f57cb920e11f07901085403ebaaa0b085e0067a78529c
post_install() {
vlicense LICENSE
From 1cbe61920f1921f3e4b6bdb8b75ac048855deab3 Mon Sep 17 00:00:00 2001
From: Huy Ngo <huyngo@disroot.org>
Date: Thu, 23 Dec 2021 22:09:00 +0700
Subject: [PATCH 23/49] nheko: update to 0.9.1
---
srcpkgs/nheko/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index deaf85713976..bba8c978a395 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,6 +1,6 @@
# Template file for 'nheko'
pkgname=nheko
-version=0.9.0
+version=0.9.1
revision=1
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/Nheko-Reborn/nheko"
changelog="https://github.com/Nheko-Reborn/nheko/blob/master/CHANGELOG.md"
distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=309505f13d3b65ea23c0db19e59e469905b1ae437d2d6c7d1b496ac0921fb141
+checksum=f8261131ed10816bdae568e5d88f6f41adc6cc2564f2f57b07266103a4972776
case "$XBPS_TARGET_MACHINE" in
armv*-musl)
From 6bf5f24c4fb2f77c28e0e8776e91ae701bfebd19 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Tue, 21 Dec 2021 10:21:39 +0100
Subject: [PATCH 24/49] cgrep: update to 6.7.1.
---
srcpkgs/cgrep/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 15eda3bafd0e..c987e67725b0 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,16 +1,16 @@
# Template file for 'cgrep'
pkgname=cgrep
-version=6.6.33
-revision=2
+version=6.7.1
+revision=1
build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.6"
makedepends="pcre-devel pkg-config"
short_desc="Context-aware grep for source codes"
maintainer="slotThe <soliditsallgood@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://awgn.github.io/cgrep/"
distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"
-checksum=f0d7114e9c26dc3ff3515711cce63864f3995ac06ed3743acf2560fc5a1eb78e
+checksum=ba38c17ad5e6601c5d6bec371940898b713f74c910f755f5f743a52998ac5efd
nocross=yes
nopie_files="/usr/bin/cgrep"
conflicts="codesearch"
From 8359f6e0f5287adb85cda992aeb68c4c239bbe0f Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 24 Dec 2021 07:38:13 +0100
Subject: [PATCH 25/49] libthai: update to 0.1.29
---
srcpkgs/libthai/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libthai/template b/srcpkgs/libthai/template
index 79334c58eb18..dd9c37dc6388 100644
--- a/srcpkgs/libthai/template
+++ b/srcpkgs/libthai/template
@@ -1,6 +1,6 @@
# Template file for 'libthai'
pkgname=libthai
-version=0.1.28
+version=0.1.29
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Thai language support routines"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="LGPL-2.1-or-later"
homepage="https://linux.thai.net/projects/libthai"
-distfiles="http://linux.thai.net/pub/ThaiLinux/software/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=ffe0a17b4b5aa11b153c15986800eca19f6c93a4025ffa5cf2cab2dcdf1ae911
+changelog="https://raw.githubusercontent.com/tlwg/libthai/master/ChangeLog"
+distfiles="http://linux.thai.net/pub/ThaiLinux/software/libthai/libthai-${version}.tar.xz"
+checksum=fc80cc7dcb50e11302b417cebd24f2d30a8b987292e77e003267b9100d0f4bcd
# the ‘trietool’ binary is used to create the dictionary
if [ "$CROSS_BUILD" ]; then
From 23bc50170f6c4dc0702d10d703c0851845dff993 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 24 Dec 2021 13:53:26 +0100
Subject: [PATCH 26/49] shfmt: update to 3.4.2.
---
srcpkgs/shfmt/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 96d51f68abf5..eb08353dea7b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,11 +1,12 @@
# Template file for 'shfmt'
pkgname=shfmt
-version=3.4.1
+version=3.4.2
revision=1
wrksrc="sh-${version}"
build_style=go
go_import_path=mvdan.cc/sh/v3
go_package="${go_import_path}/cmd/shfmt"
+go_ldflags="-X main.version=${version}"
hostmakedepends="scdoc"
short_desc="Shell parser and formatter"
maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
@@ -13,7 +14,7 @@ license="BSD-3-Clause"
homepage="https://github.com/mvdan/sh"
changelog="https://raw.githubusercontent.com/mvdan/sh/master/CHANGELOG.md"
distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=a9e7a09dd0b099b8699b54af0e5911c19412dc7cea206e32377d974427688be1
+checksum=2000656613bc4165fb1d419bedec08fcb23a625274f4505e303d18b204d8f5ee
post_install() {
scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
From 1470453dd12af743ce9c7cab8a8f37c45e7d6668 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 25 Dec 2021 22:48:48 +0100
Subject: [PATCH 27/49] scummvm: update to 2.5.1.
---
srcpkgs/scummvm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index f096aaacee70..dd2342798054 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
# Template file for 'scummvm'
pkgname=scummvm
-version=2.5.0
-revision=2
+version=2.5.1
+revision=1
build_style=configure
configure_args="--prefix=/usr --enable-release-mode --enable-all-engines"
hostmakedepends="pkg-config nasm"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://www.scummvm.org/"
distfiles="https://downloads.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=b47ee4b195828d2c358e38a4088eda49886dc37a04f1cc17b981345a59e0d623
+checksum=9fd8db38e4456144bf8c34dacdf7f204e75f18e8e448ec01ce08ce826a035f01
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*);;
From 83e6aebe389566fe1ace42aa4d71d07589966962 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 14:07:06 +0100
Subject: [PATCH 28/49] bmake: update to 20211221.
---
srcpkgs/bmake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index c8cac35c76c0..3691468271d4 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
# Template file for 'bmake'
pkgname=bmake
-version=20211212
+version=20211221
revision=1
create_wrksrc=yes
short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://www.crufty.net/help/sjg/bmake.html"
distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=ad75925b3d123f5d107f58b8137569f6d58259df6b7bcf371aa57877f4e49e9e
+checksum=c48476c1c52493e61a5342d7d8541608f7852244f3c74ffd7676b6537c475bfb
python_version=3
do_configure() {
From 7fcb324baa9a93a1c3e056105cc178102ca62c22 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 14:08:17 +0100
Subject: [PATCH 29/49] byacc: update to 20211224.
---
srcpkgs/byacc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..8b37abc77b10 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
# Template file for 'byacc'
pkgname=byacc
-version=20210808
+version=20211224
revision=1
build_style=gnu-configure
configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Public Domain"
homepage="http://invisible-island.net/byacc/"
distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=7bc42867a095df2189618b64497016298818e88e513fca792cb5adc9a68ebfb8
alternatives="
yacc:yacc:/usr/bin/byacc
From 067b1ab5795eb272feaa366889095e77ab583140 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 14:09:53 +0100
Subject: [PATCH 30/49] opam: update to 2.1.2.
---
srcpkgs/opam/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 6e63a805d798..236a2f963b70 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,6 +1,6 @@
# Template file for 'opam'
pkgname=opam
-version=2.1.1
+version=2.1.2
revision=1
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-3.0-only"
homepage="http://opam.ocamlpro.com"
distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=196d81e644e35e7f2fee54aa5de4fc91c374208bc441294b6047731ac8534126
+checksum=735e717532f135064940fe3fef573acce6b1bbdc5e146470c2ac20fc8510a470
nocross=yes
disable_parallel_build=yes
From ec650b3ad6ab47335d5f27176929fed0d2fbf6ac Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 14:15:43 +0100
Subject: [PATCH 31/49] z3: update to 4.8.14.
---
srcpkgs/z3/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index fb8aca291c2b..a907482b751d 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
-version=4.8.13
-revision=4
+version=4.8.14
+revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/Z3Prover/z3"
distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=59a0b35711fa7ae48dd535116d2067a6a16955fcbf2623c516a3f630cd2832d8
+checksum=96a1f49a7701120cc38bfa63c02ff93be4d64c7926cea41977dedec7d87a1364
build_options="ocaml"
desc_option_ocaml="Enable support for OCaml bindings"
From 941d16c247b16dfc0b688c678668a1235e640b80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 25 Dec 2021 22:48:48 +0100
Subject: [PATCH 32/49] scream: update to 3.8.
closes #22252
---
srcpkgs/scream-alsa | 1 +
srcpkgs/scream-alsa-ivshmem | 1 +
srcpkgs/scream-alsa-ivshmem/template | 20 ---------
srcpkgs/scream-alsa/template | 20 ---------
srcpkgs/scream-pulseaudio | 1 +
srcpkgs/scream-pulseaudio-ivshmem | 1 +
srcpkgs/scream-pulseaudio-ivshmem/template | 19 --------
srcpkgs/scream-pulseaudio/template | 19 --------
srcpkgs/scream-raw | 1 +
srcpkgs/scream-raw-ivshmem | 1 +
srcpkgs/scream-raw-ivshmem/template | 19 --------
srcpkgs/scream-raw/template | 18 --------
srcpkgs/scream/template | 51 ++++++++++++++++++++++
13 files changed, 57 insertions(+), 115 deletions(-)
create mode 120000 srcpkgs/scream-alsa
create mode 120000 srcpkgs/scream-alsa-ivshmem
delete mode 100644 srcpkgs/scream-alsa-ivshmem/template
delete mode 100644 srcpkgs/scream-alsa/template
create mode 120000 srcpkgs/scream-pulseaudio
create mode 120000 srcpkgs/scream-pulseaudio-ivshmem
delete mode 100644 srcpkgs/scream-pulseaudio-ivshmem/template
delete mode 100644 srcpkgs/scream-pulseaudio/template
create mode 120000 srcpkgs/scream-raw
create mode 120000 srcpkgs/scream-raw-ivshmem
delete mode 100644 srcpkgs/scream-raw-ivshmem/template
delete mode 100644 srcpkgs/scream-raw/template
create mode 100644 srcpkgs/scream/template
diff --git a/srcpkgs/scream-alsa b/srcpkgs/scream-alsa
new file mode 120000
index 000000000000..288e393f77d1
--- /dev/null
+++ b/srcpkgs/scream-alsa
@@ -0,0 +1 @@
+scream
\ No newline at end of file
diff --git a/srcpkgs/scream-alsa-ivshmem b/srcpkgs/scream-alsa-ivshmem
new file mode 120000
index 000000000000..288e393f77d1
--- /dev/null
+++ b/srcpkgs/scream-alsa-ivshmem
@@ -0,0 +1 @@
+scream
\ No newline at end of file
diff --git a/srcpkgs/scream-alsa-ivshmem/template b/srcpkgs/scream-alsa-ivshmem/template
deleted file mode 100644
index 8b745493688c..000000000000
--- a/srcpkgs/scream-alsa-ivshmem/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'scream-${_recieverName}'
-_recieverName=alsa-ivshmem
-pkgname=scream-${_recieverName}
-version=3.4
-revision=1
-wrksrc=scream-$version
-build_wrksrc=Receivers/${_recieverName}
-build_style=gnu-makefile
-makedepends="alsa-lib-devel"
-short_desc="Virtual network sound card for Microsoft Windows - alsa-ivshmem"
-maintainer="Anjandev Momi <anjan@momi.ca>"
-license="MS-PL"
-homepage="https://github.com/duncanthrax/scream"
-distfiles="https://github.com/duncanthrax/scream/archive/${version}.tar.gz"
-checksum=3441d38b3a4c76ac4ca883a939542c9cf3701a386356feddba43b40c3a2bdb5e
-
-do_install() {
- vbin scream-ivshmem-alsa
- vdoc README.md
-}
diff --git a/srcpkgs/scream-alsa/template b/srcpkgs/scream-alsa/template
deleted file mode 100644
index 44a4ac52ce7b..000000000000
--- a/srcpkgs/scream-alsa/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'scream-${_recieverName}'
-_recieverName=alsa
-pkgname=scream-${_recieverName}
-version=3.4
-revision=1
-wrksrc=scream-$version
-build_wrksrc=Receivers/${_recieverName}
-build_style=gnu-makefile
-makedepends="${_recieverName}-lib-devel"
-short_desc="Virtual network sound card for Microsoft Windows - alsa reciever"
-maintainer="Anjandev Momi <anjan@momi.ca>"
-license="MS-PL"
-homepage="https://github.com/duncanthrax/scream"
-distfiles="https://github.com/duncanthrax/scream/archive/${version}.tar.gz"
-checksum=3441d38b3a4c76ac4ca883a939542c9cf3701a386356feddba43b40c3a2bdb5e
-
-do_install() {
- vbin scream-${_recieverName}
- vdoc README.md
-}
diff --git a/srcpkgs/scream-pulseaudio b/srcpkgs/scream-pulseaudio
new file mode 120000
index 000000000000..288e393f77d1
--- /dev/null
+++ b/srcpkgs/scream-pulseaudio
@@ -0,0 +1 @@
+scream
\ No newline at end of file
diff --git a/srcpkgs/scream-pulseaudio-ivshmem b/srcpkgs/scream-pulseaudio-ivshmem
new file mode 120000
index 000000000000..288e393f77d1
--- /dev/null
+++ b/srcpkgs/scream-pulseaudio-ivshmem
@@ -0,0 +1 @@
+scream
\ No newline at end of file
diff --git a/srcpkgs/scream-pulseaudio-ivshmem/template b/srcpkgs/scream-pulseaudio-ivshmem/template
deleted file mode 100644
index 62d3dc7f6c68..000000000000
--- a/srcpkgs/scream-pulseaudio-ivshmem/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'scream-pulseaudio-ivshmem'
-pkgname=scream-pulseaudio-ivshmem
-version=3.4
-revision=1
-wrksrc=scream-$version
-build_wrksrc=Receivers/pulseaudio-ivshmem
-build_style=gnu-makefile
-makedepends="pulseaudio-devel"
-short_desc="Virtual network sound card for Microsoft Windows - pulse-ivshmem"
-maintainer="Anjandev Momi <anjan@momi.ca>"
-license="MS-PL"
-homepage="https://github.com/duncanthrax/scream"
-distfiles="https://github.com/duncanthrax/scream/archive/${version}.tar.gz"
-checksum=3441d38b3a4c76ac4ca883a939542c9cf3701a386356feddba43b40c3a2bdb5e
-
-do_install() {
- vbin scream-ivshmem-pulse
- vdoc README.md
-}
diff --git a/srcpkgs/scream-pulseaudio/template b/srcpkgs/scream-pulseaudio/template
deleted file mode 100644
index e463d73566d1..000000000000
--- a/srcpkgs/scream-pulseaudio/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'scream-pulseaudio'
-pkgname=scream-pulseaudio
-version=3.4
-revision=1
-wrksrc=scream-$version
-build_wrksrc=Receivers/pulseaudio
-build_style=gnu-makefile
-makedepends="pulseaudio-devel"
-short_desc="Virtual network sound card for Microsoft Windows - pulseaudio reciever"
-maintainer="Anjandev Momi <anjan@momi.ca>"
-license="MS-PL"
-homepage="https://github.com/duncanthrax/scream"
-distfiles="https://github.com/duncanthrax/scream/archive/${version}.tar.gz"
-checksum=3441d38b3a4c76ac4ca883a939542c9cf3701a386356feddba43b40c3a2bdb5e
-
-do_install() {
- vbin scream-pulse
- vdoc README.md
-}
diff --git a/srcpkgs/scream-raw b/srcpkgs/scream-raw
new file mode 120000
index 000000000000..288e393f77d1
--- /dev/null
+++ b/srcpkgs/scream-raw
@@ -0,0 +1 @@
+scream
\ No newline at end of file
diff --git a/srcpkgs/scream-raw-ivshmem b/srcpkgs/scream-raw-ivshmem
new file mode 120000
index 000000000000..288e393f77d1
--- /dev/null
+++ b/srcpkgs/scream-raw-ivshmem
@@ -0,0 +1 @@
+scream
\ No newline at end of file
diff --git a/srcpkgs/scream-raw-ivshmem/template b/srcpkgs/scream-raw-ivshmem/template
deleted file mode 100644
index a5e77da01b9a..000000000000
--- a/srcpkgs/scream-raw-ivshmem/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'scream-${_recieverName}'
-_recieverName=raw-ivshmem
-pkgname=scream-${_recieverName}
-version=3.4
-revision=1
-wrksrc=scream-$version
-build_wrksrc=Receivers/${_recieverName}
-build_style=gnu-makefile
-short_desc="Virtual network sound card for Microsoft Windows - raw-ivshmem reciever"
-maintainer="Anjandev Momi <anjan@momi.ca>"
-license="MS-PL"
-homepage="https://github.com/duncanthrax/scream"
-distfiles="https://github.com/duncanthrax/scream/archive/${version}.tar.gz"
-checksum=3441d38b3a4c76ac4ca883a939542c9cf3701a386356feddba43b40c3a2bdb5e
-
-do_install() {
- vbin scream-ivshmem-raw
- vdoc README.md
-}
diff --git a/srcpkgs/scream-raw/template b/srcpkgs/scream-raw/template
deleted file mode 100644
index ec7d3bb6a535..000000000000
--- a/srcpkgs/scream-raw/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'scream-raw'
-pkgname=scream-raw
-version=3.4
-revision=1
-wrksrc=scream-$version
-build_wrksrc=Receivers/raw
-build_style=gnu-makefile
-short_desc="Virtual network sound card for Microsoft Windows - raw reciever"
-maintainer="Anjandev Momi <anjan@momi.ca>"
-license="MS-PL"
-homepage="https://github.com/duncanthrax/scream"
-distfiles="https://github.com/duncanthrax/scream/archive/${version}.tar.gz"
-checksum=3441d38b3a4c76ac4ca883a939542c9cf3701a386356feddba43b40c3a2bdb5e
-
-do_install() {
- vbin scream-raw
- vdoc README.md
-}
diff --git a/srcpkgs/scream/template b/srcpkgs/scream/template
new file mode 100644
index 000000000000..384f5ecf468d
--- /dev/null
+++ b/srcpkgs/scream/template
@@ -0,0 +1,51 @@
+# Template file for 'scream'
+pkgname=scream
+version=3.8
+revision=1
+wrksrc=scream-$version
+build_wrksrc=Receivers/unix
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="alsa-lib-devel pulseaudio-devel jack-devel libsoxr-devel"
+short_desc="Virtual network sound card for Microsoft Windows - Unix reciever"
+maintainer="John <me@johnnynator.dev>"
+license="MS-PL"
+homepage="https://github.com/duncanthrax/scream"
+distfiles="https://github.com/duncanthrax/scream/archive/${version}.tar.gz"
+checksum=d338e947115ca2967e0428fe4dfa060f31ffb123d7cd391ab94b48a8a6337dc3
+
+scream-alsa_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_des+=" - transitional dummy package"
+ build_style=meta
+}
+
+scream-alsa-ivshmem_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_des+=" - transitional dummy package"
+ build_style=meta
+}
+
+scream-pulseaudio_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_des+=" - transitional dummy package"
+ build_style=meta
+}
+
+scream-pulseaudio-ivshmem_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_des+=" - transitional dummy package"
+ build_style=meta
+}
+
+scream-raw-ivshmem_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_des+=" - transitional dummy package"
+ build_style=meta
+}
+
+scream-raw_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_des+=" - transitional dummy package"
+ build_style=meta
+}
From ccc7ab2837327988c9e5f3af62ab299276888784 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 26 Dec 2021 14:31:25 +0100
Subject: [PATCH 33/49] New package: drumkv1-0.9.23
---
srcpkgs/drumkv1/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/drumkv1/template
diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template
new file mode 100644
index 000000000000..d24397eaef1e
--- /dev/null
+++ b/srcpkgs/drumkv1/template
@@ -0,0 +1,15 @@
+# Template file for 'drumkv1'
+pkgname=drumkv1
+version=0.9.23
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="alsa-lib-devel jack-devel liblo-devel libsndfile-devel lv2
+ qt5-devel"
+short_desc="Old-school drum-kit sampler"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://drumkv1.sourceforge.io/"
+changelog="https://github.com/rncbc/drumkv1/raw/master/ChangeLog"
+distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz"
+checksum=80db1cb2a1a911f53508d243941033ba6f4cd2fcc94a6e96c796ffce13adfac9
From b4752881803227526fc48fb1bf8b5badac223266 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 26 Dec 2021 14:31:38 +0100
Subject: [PATCH 34/49] New package: padthv1-0.9.23
---
srcpkgs/padthv1/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/padthv1/template
diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template
new file mode 100644
index 000000000000..06a29e63219b
--- /dev/null
+++ b/srcpkgs/padthv1/template
@@ -0,0 +1,15 @@
+# Template file for 'padthv1'
+pkgname=padthv1
+version=0.9.23
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="alsa-lib-devel fftw-devel jack-devel liblo-devel lv2
+ qt5-devel"
+short_desc="Old-school polyphonic additive synthesizer"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://padthv1.sourceforge.io/"
+changelog="https://github.com/rncbc/padthv1/raw/master/ChangeLog"
+distfiles="https://download.sourceforge.net/padthv1/padthv1-${version}.tar.gz"
+checksum=f7215fbe5b243989c6adaa2ed92dd07df97c468609a84d309c394e3fc9b14208
From 08e89cce79f093221b50e39294bffc1eddbd548c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 26 Dec 2021 14:31:47 +0100
Subject: [PATCH 35/49] New package: samplv1-0.9.23
---
srcpkgs/samplv1/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/samplv1/template
diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template
new file mode 100644
index 000000000000..34835b18bb7b
--- /dev/null
+++ b/srcpkgs/samplv1/template
@@ -0,0 +1,15 @@
+# Template file for 'samplv1'
+pkgname=samplv1
+version=0.9.23
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="alsa-lib-devel fftw-devel jack-devel liblo-devel
+ libsndfile-devel lv2 qt5-devel rubberband-devel"
+short_desc="Old-school polyphonic sampler"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://samplv1.sourceforge.io/"
+changelog="https://github.com/rncbc/samplv1/raw/master/ChangeLog"
+distfiles="https://download.sourceforge.net/samplv1/samplv1-${version}.tar.gz"
+checksum=78903a8b11f6d16bfe703d82286a269dcc9f278b5fa4e2f752b4de0a46f9fead
From 77fa0c7969e1e5fca7e9d840e878ce11935e19e3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 26 Dec 2021 14:31:51 +0100
Subject: [PATCH 36/49] New package: synthv1-0.9.23
---
srcpkgs/synthv1/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/synthv1/template
diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template
new file mode 100644
index 000000000000..839e2f1dd69d
--- /dev/null
+++ b/srcpkgs/synthv1/template
@@ -0,0 +1,14 @@
+# Template file for 'synthv1'
+pkgname=synthv1
+version=0.9.23
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="alsa-lib-devel jack-devel liblo-devel lv2 qt5-devel"
+short_desc="Old-school polyphonic synthesizer"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://synthv1.sourceforge.io/"
+changelog="https://github.com/rncbc/synthv1/raw/master/ChangeLog"
+distfiles="https://download.sourceforge.net/synthv1/synthv1-${version}.tar.gz"
+checksum=d15ef64f9d62713fedf5f25fe26c1c31864b8f34cf9e68826d4f817709c29b0e
From e6075ef77fd23e6cfa48172ef2695ff4de013dd0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:00:18 +0100
Subject: [PATCH 37/49] vim: update to 8.2.3902.
---
srcpkgs/vim/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 39edc3d83b6d..d8cbe2252bc2 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,6 +1,6 @@
# Template file for 'vim'
pkgname=vim
-version=8.2.3565
+version=8.2.3902
revision=1
hostmakedepends="gettext glib-devel pkg-config"
makedepends="acl-devel ncurses-devel
@@ -13,7 +13,7 @@ maintainer="Neel Chotai <neel@chot.ai>"
license="Vim"
homepage="https://www.vim.org"
distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=ac2264c45684218232ec49a6ae8b88b9a68312b664b93b811868d24c39d8dc11
+checksum=582d983eefe7e9da805e110ea171d5e847e1253ae77ee549d3bc70765224184e
python_version=3
build_options="x11 gtk3 huge"
From 62414514ef528b8028ade686cf02a8093c51d012 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 22 Dec 2021 23:25:59 +0100
Subject: [PATCH 38/49] meson: update to 0.60.3.
---
srcpkgs/meson/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 2ac20eb33795..67fa3514289f 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
# Template file for 'meson'
pkgname=meson
-version=0.60.2
+version=0.60.3
revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921
+checksum=87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From 5af43a53d497147c13304706cf81b4a8ddb40177 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 22 Dec 2021 23:36:03 +0100
Subject: [PATCH 39/49] chrony: update to 4.2.
---
srcpkgs/chrony/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chrony/template b/srcpkgs/chrony/template
index 6e1ee72a66a4..54ebbcf9e6c1 100644
--- a/srcpkgs/chrony/template
+++ b/srcpkgs/chrony/template
@@ -1,7 +1,7 @@
# Template file for 'chrony'
# When Updating: Please confirm the upstream config still refers to make_dirs
pkgname=chrony
-version=4.1
+version=4.2
revision=1
build_style=gnu-configure
configure_args="--without-nss --enable-scfilter
@@ -15,7 +15,7 @@ license="GPL-2.0-only"
homepage="https://chrony.tuxfamily.org/"
changelog="https://chrony.tuxfamily.org/news.html"
distfiles="https://download.tuxfamily.org/chrony/${pkgname}-${version}.tar.gz"
-checksum=ed76f2d3f9347ac6221a91ad4bd553dd0565ac188cd7490d0801d08f7171164c
+checksum=273f9fd15c328ed6f3a5f6ba6baec35a421a34a73bb725605329b1712048db9a
system_accounts="chrony"
chrony_homedir="/var/lib/chrony"
From adb686595870ad5ba511b81bc600261142e11ffc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 26 Dec 2021 21:10:05 +0100
Subject: [PATCH 40/49] persepolis: remove pulseaudio dependency
persepolis uses paplay which was moved to pulseaudio-utils, so there is
no need to depend on pulseaudio
---
srcpkgs/persepolis/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/persepolis/template b/srcpkgs/persepolis/template
index fdb5309f0c93..81d5b3414851 100644
--- a/srcpkgs/persepolis/template
+++ b/srcpkgs/persepolis/template
@@ -1,11 +1,11 @@
# Template file for 'persepolis'
pkgname=persepolis
version=3.2.0
-revision=4
+revision=5
build_style=python3-module
hostmakedepends="python3-setuptools python3-setproctitle python3-requests
- python3-psutil aria2 ffmpeg libnotify pulseaudio youtube-dl
- sound-theme-freedesktop python3-PyQt5-tools qt5-svg"
+ python3-psutil aria2 ffmpeg libnotify pulseaudio-utils youtube-dl
+ sound-theme-freedesktop python3-PyQt5-tools qt5-svg"
depends="${hostmakedepends/python3-setuptools/}"
short_desc="Download manager and GUI for Aria2"
maintainer="Nathan Owens <ndowens04@gmail.com>"
From 3e9cb53403edc1242c263cc4108a6c50a6c020eb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Dec 2021 21:48:48 -0500
Subject: [PATCH 41/49] alsa-lib: update to 1.2.6.1
---
srcpkgs/alsa-lib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template
index b687456db813..588169cb9b04 100644
--- a/srcpkgs/alsa-lib/template
+++ b/srcpkgs/alsa-lib/template
@@ -1,6 +1,6 @@
# Template file for 'alsa-lib'
pkgname=alsa-lib
-version=1.2.5.1
+version=1.2.6.1
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config libtool"
@@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="LGPL-2.1-or-later"
homepage="http://www.alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/lib/${pkgname}-${version}.tar.bz2"
-checksum=628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e
+checksum=ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f
alsa-lib-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 24574c97d80b5cc65bd6db320d849eeaee2b0f06 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Dec 2021 21:49:09 -0500
Subject: [PATCH 42/49] alsa-utils: update to 1.2.6
---
srcpkgs/alsa-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template
index 7cefc15ef2b1..41482fdd427c 100644
--- a/srcpkgs/alsa-utils/template
+++ b/srcpkgs/alsa-utils/template
@@ -1,6 +1,6 @@
# Template file for 'alsa-utils'
pkgname=alsa-utils
-version=1.2.5.1
+version=1.2.6
revision=1
build_style=gnu-configure
configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d --disable-alsaconf
@@ -14,7 +14,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="GPL-2.0-only"
homepage="http://www.alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/utils/${pkgname}-${version}.tar.bz2"
-checksum=9c169ae37a49295f9b97b92ace772803daf6b6510a19574e0b78f87e562118d0
+checksum=6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d
post_install() {
# Install required udev rules file.
From 260904cacb89f69ed5c5a1d696e3cc35d1cbf486 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Dec 2021 21:49:33 -0500
Subject: [PATCH 43/49] alsa-plugins: update to 1.2.6
---
srcpkgs/alsa-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index 731664697790..0a03eaf9d8f0 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -1,6 +1,6 @@
# Template file for 'alsa-plugins'
pkgname=alsa-plugins
-version=1.2.5
+version=1.2.6
revision=1
build_style=gnu-configure
configure_args="--disable-maemo-plugin"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://www.alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/plugins/${pkgname}-${version}.tar.bz2"
-checksum=42eef98433d2c8d11f1deeeb459643619215a75aa5a5bbdd06a794e4c413df20
+checksum=068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0
post_install() {
rm -rfv ${DESTDIR}/etc/alsa/conf.d
From 127f6726687cf49b803d62c57fba298a09a64e61 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Dec 2021 21:49:53 -0500
Subject: [PATCH 44/49] alsa-ucm-conf: update to 1.2.6.3
---
srcpkgs/alsa-ucm-conf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-ucm-conf/template b/srcpkgs/alsa-ucm-conf/template
index b77f180ee40f..43e25c39c650 100644
--- a/srcpkgs/alsa-ucm-conf/template
+++ b/srcpkgs/alsa-ucm-conf/template
@@ -1,13 +1,13 @@
# Template file for 'alsa-ucm-conf'
pkgname=alsa-ucm-conf
-version=1.2.5.1
+version=1.2.6.3
revision=1
short_desc="ALSA Use Case Manager topology configurations"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/alsa-project/alsa-ucm-conf"
distfiles="https://github.com/alsa-project/${pkgname}/archive/refs/tags/v${version}.tar.gz"
-checksum=d4016aaf8c84218713ba9e2098424a219b597e508bcddeac193fc28daf47c4e0
+checksum=37ce894d5b420660a4483cf503fd3c33937697e0ed6962f47c42d4aed6d24199
do_install() {
vdoc ucm2/README.md
From 3ffc0982870c460156a312a463a43a615218b666 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 26 Dec 2021 00:07:38 +0100
Subject: [PATCH 45/49] mc: update to 4.8.27.
---
srcpkgs/mc/patches/mc-mksh-subshell-v2.patch | 64 +++++++++-----------
srcpkgs/mc/template | 4 +-
2 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/srcpkgs/mc/patches/mc-mksh-subshell-v2.patch b/srcpkgs/mc/patches/mc-mksh-subshell-v2.patch
index 76c8470804aa..183542dcd7eb 100644
--- a/srcpkgs/mc/patches/mc-mksh-subshell-v2.patch
+++ b/srcpkgs/mc/patches/mc-mksh-subshell-v2.patch
@@ -1,17 +1,15 @@
---- a/lib/shell.c 2016-09-22 18:24:12.000000000 +0000
-+++ b/lib/shell.c 2017-02-16 13:47:34.933939000 +0000
-@@ -66,6 +66,10 @@
- /* 3rd choice: look for existing shells supported as MC subshells. */
- if (access ("/bin/bash", X_OK) == 0)
+--- a/lib/shell.c
++++ b/lib/shell.c
+@@ -68,6 +68,8 @@ mc_shell_get_installed_in_system (void)
mc_shell->path = g_strdup ("/bin/bash");
-+ else if (access ("/usr/local/bin/mksh", X_OK) == 0)
-+ mc_shell->path = g_strdup ("/usr/local/bin/mksh");
-+ else if (access ("/bin/mksh", X_OK) == 0)
-+ mc_shell->path = g_strdup ("/bin/mksh");
else if (access ("/bin/ash", X_OK) == 0)
mc_shell->path = g_strdup ("/bin/ash");
++ else if (access ("/bin/mksh", X_OK) == 0)
++ mc_shell->path = g_strdup ("/bin/mksh");
else if (access ("/bin/dash", X_OK) == 0)
-@@ -149,6 +153,12 @@
+ mc_shell->path = g_strdup ("/bin/dash");
+ else if (access ("/bin/busybox", X_OK) == 0)
+@@ -149,6 +151,12 @@ mc_shell_recognize_real_path (mc_shell_t * mc_shell)
mc_shell->type = SHELL_ZSH;
mc_shell->name = "zsh";
}
@@ -24,34 +22,31 @@
else if (strstr (mc_shell->path, "/tcsh") != NULL
|| strstr (mc_shell->real_path, "/tcsh") != NULL)
{
-diff -Naur mc-4.8.18.orig/lib/shell.h mc-4.8.18/lib/shell.h
---- a/lib/shell.h 2016-03-12 15:45:47.000000000 +0000
-+++ b/lib/shell.h 2017-02-15 21:57:39.000000000 +0000
-@@ -12,6 +12,7 @@
- typedef enum
- {
- SHELL_NONE,
-+ SHELL_MKSH,
- SHELL_SH,
+--- a/lib/shell.h
++++ b/lib/shell.h
+@@ -16,6 +16,7 @@ typedef enum
SHELL_BASH,
SHELL_ASH_BUSYBOX, /* BusyBox default shell (ash) */
-diff -Naur mc-4.8.18.orig/src/subshell/common.c mc-4.8.18/src/subshell/common.c
---- a/src/subshell/common.c 2016-09-22 18:24:12.000000000 +0000
-+++ b/src/subshell/common.c 2017-02-20 18:48:22.681514000 +0000
-@@ -320,6 +320,12 @@
-
+ SHELL_DASH, /* Debian variant of ash */
++ SHELL_MKSH,
+ SHELL_TCSH,
+ SHELL_ZSH,
+ SHELL_FISH
+--- a/src/subshell/common.c
++++ b/src/subshell/common.c
+@@ -378,6 +378,11 @@ init_subshell_child (const char *pty_name)
+ }
break;
+ case SHELL_MKSH:
+ init_file = g_strdup (".shrc");
-+ putenv_str = g_strconcat ("ENV=", init_file, (char *) NULL);
-+ putenv (putenv_str);
++ g_setenv ("ENV", init_file, TRUE);
+ break;
+
- /* TODO: Find a way to pass initfile to TCSH, ZSH and FISH */
+ /* TODO: Find a way to pass initfile to TCSH and FISH */
case SHELL_TCSH:
- case SHELL_ZSH:
-@@ -367,6 +373,7 @@
+ case SHELL_FISH:
+@@ -427,6 +432,7 @@ init_subshell_child (const char *pty_name)
case SHELL_ASH_BUSYBOX:
case SHELL_DASH:
@@ -59,15 +54,14 @@ diff -Naur mc-4.8.18.orig/src/subshell/common.c mc-4.8.18/src/subshell/common.c
case SHELL_TCSH:
case SHELL_FISH:
execl (mc_global.shell->path, mc_global.shell->path, (char *) NULL);
-@@ -801,6 +808,11 @@
- "PS1='\\u@\\h:\\w\\$ '\n", subshell_pipe[WRITE]);
+@@ -1091,6 +1097,10 @@ init_subshell_precmd (char *precmd, size_t buff_size)
+ "PS1='\\u@\\h:\\w\\$ '\n", command_buffer_pipe[WRITE],
+ command_buffer_pipe[WRITE], subshell_pipe[WRITE]);
break;
-
+ case SHELL_MKSH:
+ g_snprintf (precmd, buff_size,
-+ "PS1='$(pwd>&%d; kill -STOP $$)'\"$((( USER_ID )) && print '$ ' || print '# ')\"\n", subshell_pipe[WRITE]);
++ "PS1='$(pwd>&%d; kill -STOP $$)'\"$((( USER_ID )) && print '$ ' || print '# ')\"\n", subshell_pipe[WRITE]);
+ break;
-+
+
case SHELL_ASH_BUSYBOX:
/* BusyBox ash needs a somewhat complicated precmd emulation via PS1, and it is vital
- * that BB be built with active CONFIG_ASH_EXPAND_PRMT, but this is the default anyway.
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index ebf5141eb482..5360fd9e89ec 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -1,6 +1,6 @@
# Template file for 'mc'
pkgname=mc
-version=4.8.26
+version=4.8.27
revision=1
build_style=gnu-configure
configure_args="--with-screen=slang --without-x"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://midnight-commander.org/"
distfiles="https://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
#distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
-checksum=c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27
+checksum=31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4
python_version=2
conf_files="
From 89d9129f3aef7a95c0cc31f40f3ca43ad1bdf815 Mon Sep 17 00:00:00 2001
From: Nulo <git@nulo.in>
Date: Sat, 25 Dec 2021 22:13:44 -0300
Subject: [PATCH 46/49] gitea: upgrade to 1.15.8
---
srcpkgs/gitea/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 1e8fe628361f..2d998594cc15 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
# Template file for 'gitea'
pkgname=gitea
-version=1.15.6
+version=1.15.8
revision=1
create_wrksrc=yes
build_style=go
@@ -32,7 +32,7 @@ license="MIT"
homepage="https://gitea.io"
changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=14c33f89003125cca6bf88d80736815c6d14cbc5311e1f6015607983357d727d
+checksum=a05745e5c1b5e9b51caa3d96fd93689176689865a0c249aa477d411e5c082045
system_accounts="_gitea"
_gitea_homedir="/var/lib/gitea"
From 7dd5bfe59471e68644bd7909cd43d81609fb5519 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sun, 26 Dec 2021 16:51:44 -0300
Subject: [PATCH 47/49] icewm: update to 2.9.3.
---
srcpkgs/icewm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 7d15ec3906f0..6b1efbef2219 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
# Template file for 'icewm'
pkgname=icewm
-version=2.9.2
+version=2.9.3
revision=1
build_style=cmake
make_cmd=make
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="https://ice-wm.org/"
changelog="https://raw.githubusercontent.com/ice-wm/icewm/master/NEWS"
distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=5fc9050508fe1f4a55f47899389a42e7d04be3b202de2c053113775e7b6de867
+checksum=0aeebdd403a3307a2ea83809055dabaab893193470dec930b25a5072f0c2d4d6
# broken tests
make_check=no
From eeedd4ec54443d197c382443338d403905854d2b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 27 Dec 2021 13:53:01 +0100
Subject: [PATCH 48/49] python3-pipx: update to 0.16.5.
---
srcpkgs/python3-pipx/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index c9b4d8eaccee..be16f6f57f6a 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pipx'
pkgname=python3-pipx
-version=0.16.4
-revision=2
+version=0.16.5
+revision=1
wrksrc="pipx-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://pypa.github.io/pipx/"
changelog="https://pypa.github.io/pipx/changelog/"
distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=2a12ee8911d36c0fc08ad3dba78c7d002797810e562739a34e1a2ce6acd85019
post_install() {
vlicense LICENSE
From 6e7bcfb517cb8d2acd835800918f2b5f23884b83 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 27 Dec 2021 15:04:13 +0100
Subject: [PATCH 49/49] solvespace: fix build on targets without 64-bit atomics
---
srcpkgs/solvespace/template | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index ffa61af5ee6e..fa97e2ead290 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -19,6 +19,11 @@ checksum="04cda618fbbbe2db92713adf2fff4264017f858bac6f737c9da11efab693be4f
448ac898c72468c4f632a0818cc4b8ec83a4669402ee059d74df35f94f3e2f34"
nocross="https://travis-ci.org/bobertlo/void-packages/jobs/487251265"
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+ configure_args=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic'"
+fi
+
post_extract() {
rmdir "${wrksrc}/extlib/libdxfrw"
mv "${XBPS_BUILDDIR}/libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
^ permalink raw reply [flat|nested] 15+ messages in thread