* Re: [PR PATCH] [Updated] dolphin-emu: update to 5.0.14344.
2021-07-28 23:17 [PR PATCH] dolphin-emu: update to 5.0.14344 Hnaguski
2021-07-28 23:34 ` Hnaguski
2021-07-29 17:16 ` ericonr
@ 2021-07-31 13:18 ` Hnaguski
2021-07-31 13:27 ` Hnaguski
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Hnaguski @ 2021-07-31 13:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1751 bytes --]
There is an updated pull request by Hnaguski against master on the void-packages repository
https://github.com/Hnaguski/void-packages dolphin-emu
https://github.com/void-linux/void-packages/pull/32238
dolphin-emu: update to 5.0.14344.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [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
Removed the remaining patch as it was merged upstream: https://github.com/dolphin-emu/dolphin/commit/d456e2e391134742c633b0029251f7ca06bb5204
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/32238.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-emu-32238.patch --]
[-- Type: text/x-diff, Size: 64444 bytes --]
From ed5684e7ca996a061d32ef9b75b0acf9b25e597a Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Wed, 28 Jul 2021 18:09:23 -0400
Subject: [PATCH 01/42] dolphin-emu: update to 5.0.14344.
---
.../dolphin-emu/patches/VkDeviceMemory.patch | 37 -------------------
srcpkgs/dolphin-emu/template | 8 ++--
2 files changed, 4 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
- VkImageViewType view_type, VkImageLayout layout)
- {
- std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
-- tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+ tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
- if (!texture->CreateView(view_type))
- return nullptr;
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
- VkImageView GetView() const { return m_view; }
- VkImageLayout GetLayout() const { return m_layout; }
- VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
-- bool IsAdopted() const { return m_device_memory != nullptr; }
-+ bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
-
- static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
- static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..8ff426ad913e 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,8 +1,8 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14344
revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_commit=acc7d3710d60552769f61f4b44bc8533a940df36
#Version/hash pair can be found at https://dolphin-emu.org/download/
archs="x86_64* aarch64* ppc64le* i686*"
wrksrc="dolphin-${_commit}"
@@ -16,11 +16,11 @@ makedepends="
mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
license="GPL-2.0-or-later"
homepage="http://dolphin-emu.org"
distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+checksum=22075f3b335ba11bbfb34034028e7b9718be4be64dc037453c03359e6191307f
nopie=yes
case "$XBPS_TARGET_MACHINE" in
From 13d27981fce51971e6d43e171361df780820afb8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:44:58 +0200
Subject: [PATCH 02/42] bcc: update to 0.21.0.
---
srcpkgs/bcc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..5fdf8be098b3 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
# Template file for 'bcc'
pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=1
wrksrc="bcc"
build_style=cmake
configure_args="-DREVISION=${version}"
From f69094d6ba6c9fccad9e430af31bd7fb0cdaa39c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:45:58 +0200
Subject: [PATCH 03/42] ipset: update to 7.14.
---
srcpkgs/ipset/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..51150121385d 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
# Template file for 'ipset'
pkgname=ipset
-version=7.13
+version=7.14
revision=1
build_style=gnu-configure
configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
homepage="https://ipset.netfilter.org/"
changelog="https://ipset.netfilter.org/changelog.html"
distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=27031c36d355907031cce41e65553e99bb013d762fcd55392f63d7e84760f900
libipset_package() {
short_desc+=" - library files"
From 13c95918cae4c80928616f0d4d1fb752ffb0cbaf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:47:29 +0200
Subject: [PATCH 04/42] nncp: update to 7.5.0.
---
srcpkgs/nncp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..279d6235b763 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
# Template file for 'nncp'
pkgname=nncp
-version=7.4.0
+version=7.5.0
revision=1
build_style=go
go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-only"
homepage="http://www.nncpgo.org/"
distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=14d92dc5b8164ee44926d7af46da9f230c8f6207350cc7476db5cdfb8e7c3fe4
do_build() {
make
From df70b56a1f3c2c3a7e057f843cc2fbc565b2b6be Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:50:24 +0200
Subject: [PATCH 05/42] perl-PDF-API2: update to 2.041.
---
srcpkgs/perl-PDF-API2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..6c50c810c944 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
# Template file for 'perl-PDF-API2'
pkgname=perl-PDF-API2
-version=2.040
+version=2.041
revision=1
wrksrc="PDF-API2-${version}"
build_style=perl-module
From 4811a483a86700370d368e637e29bd77768c2da8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:53:25 +0200
Subject: [PATCH 06/42] opam: update to 2.1.0.
---
srcpkgs/opam/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
# Template file for 'opam'
pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/${pkgname}"
make_build_args="lib-ext all"
@@ -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=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
nocross=yes
disable_parallel_build=yes
From 2ee8a89cbc8a19bf5c70b969a57c577b47d8a79c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:53:50 +0200
Subject: [PATCH 07/42] linux5.10: update to 5.10.54.
---
srcpkgs/linux5.10/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..2832c9d04add 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.10'
pkgname=linux5.10
-version=5.10.53
+version=5.10.54
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=bf50c63261847187eca4a1793e5df5c1355b21697409589f6ca03e32b629be44
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From 17a7587915368055f80ee8cfb79dc4f6e4b788d8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 15:11:02 +0200
Subject: [PATCH 08/42] perl-PDF-API2: fix checksum.
---
srcpkgs/perl-PDF-API2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 6c50c810c944..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-or-later"
homepage="https://metacpan.org/release/PDF-API2"
distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
From df8d6cba48c26f9ab21eec96fd79e871bb84d2c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 29 Jul 2021 10:15:44 -0300
Subject: [PATCH 09/42] mdBook: update to 0.4.11.
---
srcpkgs/mdBook/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..49e3264c70be 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
# Template file for 'mdBook'
pkgname=mdBook
-version=0.4.10
+version=0.4.11
revision=1
build_style=cargo
short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
homepage="https://github.com/rust-lang/mdBook"
changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=a66b57a2a70fbc8c665898bf952a7f8276e6f400c2d9340dbfd70ddb96b3562e
post_install() {
vlicense LICENSE
From 02afff3663773ca079de63877aeeb336729f0940 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 29 Jul 2021 18:33:03 +0200
Subject: [PATCH 10/42] LuaJIT: switch ppc patches to -p1 (fixes texlive build)
---
.../patches/ppc/musl-ppc-secureplt.patch | 12 ++---
.../patches/ppc64/add-ppc64-support.patch | 48 +++++++++----------
.../patches/ppc64/fix-vm-jit-ppc64.patch | 4 +-
srcpkgs/LuaJIT/template | 2 +-
4 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
This fixes crashes on ppc-musl, as musl only supports secureplt.
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
@@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
#undef GOTFUNC
#endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
}
#if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
@@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
};
#endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
ASMFunction got[LJ_GOT__MAX]; /* Global offset table. */
#endif
#if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
@@ -59,7 +59,12 @@
|.define ENV_OFS, 8
|.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
@@ -257,9 +257,11 @@ map_op = {
addic_3 = "30000000RRI",
["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
end),
diff --git src/Makefile src/Makefile
index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
@@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
DASM_AFLAGS+= -D GPR64
endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
DASM_ARCH= ppc64
diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
@@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
#else
#define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
fprintf(ctx->fp, "\t.text\n");
diff --git src/lj_arch.h src/lj_arch.h
index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
@@ -269,10 +269,18 @@
#if LJ_TARGET_CONSOLE
#define LJ_ARCH_PPC32ON64 1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
#endif
diff --git src/lj_ccall.c src/lj_ccall.c
index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
@@ -369,21 +369,97 @@
#elif LJ_TARGET_PPC
/* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
#if LJ_TARGET_MIPS64
diff --git src/lj_ccall.h src/lj_ccall.h
index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
@@ -86,10 +86,23 @@ typedef union FPRArg {
#elif LJ_TARGET_PPC
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
typedef intptr_t GPRArg;
diff --git src/lj_ccallback.c src/lj_ccallback.c
index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
@@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
#elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
if (ctr->size <= 4 &&
diff --git src/lj_ctype.h src/lj_ctype.h
index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
@@ -153,7 +153,7 @@ typedef struct CType {
/* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
diff --git src/lj_def.h src/lj_def.h
index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
@@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
#define LJ_MAX_IDXCHAIN 100 /* __index/__newindex chain limit. */
#define LJ_STACK_EXTRA (5+2*LJ_FR2) /* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
#define LJ_MIN_GLOBAL 6 /* Min. global table size (hbits). */
diff --git src/lj_frame.h src/lj_frame.h
index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
@@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK }; /* Special continuations. */
#define CFRAME_OFS_MULTRES 408
#define CFRAME_SIZE 384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
#define CFRAME_OFS_NRES 468
diff --git src/lj_target_ppc.h src/lj_target_ppc.h
index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
@@ -30,8 +30,13 @@ enum {
/* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
PPCI_BC = 0x40800000,
diff --git src/vm_ppc.dasc src/vm_ppc.dasc
index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
@@ -22,35 +22,40 @@
|// GPR64 64 bit registers (but possibly 32 bit pointers, e.g. PS3).
|// Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc 2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc 2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc 2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc 2019-06-03 19:44:40.229686143 +0200
@@ -2774,7 +2774,7 @@
|
|->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
msg_normal "patching: $i\n"
- patch -sNp0 -i ${i}
+ patch -sNp1 -i ${i}
done
}
From 5f7b8c45c3700d92e3f069afe7dbd4869f169ad7 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 28 Jul 2021 18:30:08 +0200
Subject: [PATCH 11/42] cozy: update to 1.0.4.
---
srcpkgs/cozy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..b198300da9a4 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
# Template file for 'cozy'
pkgname=cozy
-version=1.0.3
+version=1.0.4
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
@@ -15,4 +15,4 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
license="GPL-3.0-only, LGPL-3.0-only"
homepage="https://github.com/geigi/cozy"
distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=d32b76e0a1506ab72d0b45bb0f5711c490a3105fce1019f173536f19716a07f2
From a3b91853844976aadcc3e130add2b8e240f31052 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Wed, 28 Jul 2021 22:26:57 -0500
Subject: [PATCH 12/42] mesa: update to 21.1.6.
---
srcpkgs/mesa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..8664f4d799bc 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=21.1.5
+version=21.1.6
revision=1
wrksrc="mesa-${version}"
build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -Duse-elf-tls=false"
From 0ec43ece3f4ea7b40322a72339084da3ae873fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 29 Jul 2021 08:28:17 +0200
Subject: [PATCH 13/42] postfix: update to 3.6.2.
---
srcpkgs/postfix/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..4dc1b9e5dad8 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
# Template file for 'postfix'
pkgname=postfix
-version=3.6.1
+version=3.6.2
revision=1
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="IPL-1.0, EPL-2.0"
homepage="http://www.postfix.org/"
distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
system_accounts="postfix"
postfix_homedir="/var/spool/postfix"
From 49241500f7d93191d7b927587e04230939b4a751 Mon Sep 17 00:00:00 2001
From: Dominic Monroe <dominic@dominic.io>
Date: Thu, 29 Jul 2021 10:17:20 +0100
Subject: [PATCH 14/42] clojure: update to 1.10.3.933.
---
srcpkgs/clojure/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
# Template file for 'clojure'
pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
wrksrc="clojure-tools"
depends="virtual?java-environment rlwrap"
short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
license="EPL-1.0"
homepage="https://clojure.org/"
distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
do_install() {
vmkdir /usr/lib/clojure
From 4ee4690ed49f2fa3db882b73da5f0cc4c4e0d700 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 29 Jul 2021 20:13:46 +0200
Subject: [PATCH 15/42] linux5.4: update to 5.4.136.
---
srcpkgs/linux5.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..4fd63332b5c9 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.4'
pkgname=linux5.4
-version=5.4.135
+version=5.4.136
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=4322dd36bf86b82d410fb2d4df196d1f3b78819aa9dd78b555703bcbf49bad16
python_version=3
nodebug=yes # -dbg package is generated below manually
From 56bdecfb924cb8552c8c51cf401aa45780bbed54 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 29 Jul 2021 20:20:36 +0200
Subject: [PATCH 16/42] linux4.19: update to 4.19.199.
---
srcpkgs/linux4.19/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..a6e4f5a686b2 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
# Template file for 'linux4.19'
pkgname=linux4.19
-version=4.19.198
+version=4.19.199
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=3d7babf8d0c6d855b7fd94e831c745e88921798b2366e21e3dece63162e42a9a
python_version=3
nodebug=yes # -dbg package is generated below manually
From f53cbbcee2fab21b79ce66a1d8df97396b2d34c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 29 Jul 2021 16:00:15 -0300
Subject: [PATCH 17/42] yambar: fix launching with --backend=wayland.
Fixes: #32248.
---
.../yambar/patches/0001-bar-fix-typo.patch | 27 +++++++++++++++++++
srcpkgs/yambar/template | 2 +-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+ break;
+
+ case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+ backend_data = bar_backend_wayland_new();
+ backend_iface = &wayland_backend_iface;
+ #else
+--
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
# Template file for 'yambar'
pkgname=yambar
version=1.6.2
-revision=1
+revision=2
wrksrc=$pkgname
build_style=meson
hostmakedepends="pkg-config scdoc wayland-devel"
From f7a9054f1f8bf31605a847487406a4cbf91c64c8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jul 2021 14:07:32 +0200
Subject: [PATCH 18/42] isync: update to 1.4.3.
---
srcpkgs/isync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
# Template file for 'isync'
pkgname=isync
-version=1.4.2
+version=1.4.3
revision=1
build_style=gnu-configure
hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://isync.sourceforge.net/"
changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
post_install() {
vsconf src/mbsyncrc.sample
From f693a202ab88bb43c4bd22738da45a6b66c0bfb9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jul 2021 14:09:51 +0200
Subject: [PATCH 19/42] xorg-server: update to 1.20.13.
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
# Template file for 'xorg-server'
pkgname=xorg-server
-version=1.20.12
+version=1.20.13
revision=1
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT, BSD-3-Clause"
homepage="https://xorg.freedesktop.org"
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
lib32disabled=yes
provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
xserver-abi-video-24_1 xf86-video-modesetting-1_1"
From 6d423500f31cff96993e76c6be2c5251103fc443 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Fri, 30 Jul 2021 07:02:48 +0200
Subject: [PATCH 20/42] python3-pikepdf: update to 2.16.1.
---
srcpkgs/python3-pikepdf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pikepdf'
pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
revision=1
wrksrc="pikepdf-${version}"
build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="MPL-2.0"
homepage="https://github.com/pikepdf/pikepdf"
distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
pre_build() {
vsed -e '/setuptools_scm_git_archive/d' -i setup.py
From 956a57709275b540b6b3ed157f9b634ec4ec3caf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:55:08 +0300
Subject: [PATCH 21/42] sublime-merge-bin: update to 2059.
---
srcpkgs/sublime-merge-bin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
# Template file for 'sublime-merge-bin'
pkgname=sublime-merge-bin
-version=2056
+version=2059
revision=1
archs="x86_64"
wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
homepage="https://www.sublimemerge.com"
changelog="https://www.sublimemerge.com/download"
distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
nopie=yes
repository=nonfree
From 7e9f756d6546ee5478a3451c70b5df26cf56cd09 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:39:19 +0300
Subject: [PATCH 22/42] notcurses: update to 2.3.12.
---
srcpkgs/notcurses/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..4b3563f65ffc 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
# Template file for 'notcurses'
pkgname=notcurses
-version=2.3.11
+version=2.3.12
revision=1
build_style=cmake
configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=ce042908fac11f7df1f9eaa610e46e9c615f53ab036b7c27ae2396292512407b
build_options="man"
desc_option_man="Use pandoc for manpages"
From 92990b29e63acf9180f969035184c552fdafa274 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:28:22 +0300
Subject: [PATCH 23/42] skype: update to 8.74.0.152.
---
srcpkgs/skype/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..d8e2f3a77606 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
# Template file for 'skype'
# This just repackages the rpm package.
pkgname=skype
-version=8.73.0.129
+version=8.74.0.152
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:skype-servicesagreement" # no vlicense
homepage="https://www.skype.com"
distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=1b19fbb55c75815c78e9c20ed29a97c6b11c8b45a2444dd8f1aa51d7ca354039
repository="nonfree"
nostrip="yes"
From 3caf44ab5da967f6fa448727ad9c8f0f37585e99 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 30 Jul 2021 08:35:40 +0200
Subject: [PATCH 24/42] pp: update to 1.0.9.
---
srcpkgs/pp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
# Template file for 'pp'
pkgname=pp
-version=1.0.8
+version=1.0.9
revision=1
wrksrc="${pkgname}"
build_style=gnu-makefile
short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="ISC"
homepage="https://mkws.sh/pp.html"
distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
do_build() {
make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
From 1b25aee532382d91e82d5b7bea057a265ca4de8c Mon Sep 17 00:00:00 2001
From: Will Springer <skirmisher@protonmail.com>
Date: Tue, 27 Jul 2021 12:12:28 -0700
Subject: [PATCH 25/42] OpenRCT2: update to 0.3.4.1
---
srcpkgs/OpenRCT2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..761da7f1e580 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
_objects_version=1.0.21
_titles_version=0.1.2c
_replays_version=0.0.43
-version=0.3.4
+version=0.3.4.1
revision=1
build_style=cmake
configure_args="
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
skip_extraction="objects.zip title-sequences.zip replays.zip"
From e0a12347c0be2c5433824b583838180e94aa533c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 21:05:15 +0300
Subject: [PATCH 26/42] mbedtls: update to 2.16.11.
---
srcpkgs/mbedtls/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
# Template file for 'mbedtls'
pkgname=mbedtls
reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
revision=1
wrksrc="mbedtls-mbedtls-${version}"
build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://tls.mbed.org/"
changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
From 325579f37406cf431506fbd9939deeef78c12403 Mon Sep 17 00:00:00 2001
From: boson-at <boson@gmx.at>
Date: Fri, 30 Jul 2021 06:16:56 +0200
Subject: [PATCH 27/42] osm2pgsql: update to 1.5.1.
---
srcpkgs/osm2pgsql/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
# Template file for 'osm2pgsql'
pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
revision=1
build_style=cmake
hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
license="GPL-3.0-or-later"
homepage="https://osm2pgsql.org"
distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
From 363b58b7b2de840ee8636e04ea4d67758482834e Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:44:40 +0300
Subject: [PATCH 28/42] qalculate: update to 3.20.1
---
common/shlibs | 2 +-
srcpkgs/qalculate/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 04eefcdcbdd1..da24f1de5810 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2996,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
libspectrum.so.8 libspectrum-1.2.2_1
libbearssl.so.0 bearssl-0.3_1
libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
libweston-9.so.0 weston-9.0.0_1
libostree-1.so.1 libostree-2020.8_2
librhash.so.0 rhash-1.3.4_1
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..ac326495fa31 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
# Template file for 'qalculate'
# NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
pkgname=qalculate
-version=3.19.0
+version=3.20.1
revision=1
wrksrc="lib${pkgname}-${version}"
build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
license="GPL-2.0-or-later"
homepage="https://qalculate.github.io"
distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
libqalculate_package() {
short_desc+=" - library files"
From 13b9ec870574a6201df2e99b988dc58cce8e887e Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:39:18 +0300
Subject: [PATCH 29/42] plasma-workspace: revbump for libqalculate.so.22
---
srcpkgs/plasma-workspace/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..fa84666b06fb 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,10 +1,10 @@
# Template file for 'plasma-workspace'
pkgname=plasma-workspace
version=5.22.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
DKF5_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
qt5-wayland plasma-wayland-protocols gettext wayland-devel
From a3aa1aad24ccbd3a57de39301cd6812a297da86c Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:46:26 +0300
Subject: [PATCH 30/42] qalculate-gtk: update to 3.20.1
---
srcpkgs/qalculate-gtk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..f71c085f5e8a 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,7 @@
# Template file for 'qalculate-gtk'
# NOTE: keep this package synchronized with "srcpkgs/qalculate"
pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
revision=1
build_style=gnu-configure
hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
license="GPL-2.0-or-later"
homepage="https://qalculate.github.io"
distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
From 7f104529ec19d3f1672a4ff9e550adbc50291751 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:21:08 +0300
Subject: [PATCH 31/42] New package: qalculate-qt-3.20.1
---
srcpkgs/qalculate-gtk/template | 1 +
srcpkgs/qalculate-qt/template | 16 ++++++++++++++++
srcpkgs/qalculate/template | 1 +
3 files changed, 18 insertions(+)
create mode 100644 srcpkgs/qalculate-qt/template
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index f71c085f5e8a..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,5 +1,6 @@
# Template file for 'qalculate-gtk'
# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
pkgname=qalculate-gtk
version=3.20.1
revision=1
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index ac326495fa31..4d9e490bf26d 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,5 +1,6 @@
# Template file for 'qalculate'
# NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
pkgname=qalculate
version=3.20.1
revision=1
From 56a567d507d480b86fd209ba04fbf17021b8b21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Jul 2021 17:06:48 -0300
Subject: [PATCH 32/42] util-linux: backport fix for su(1).
Since trusting PAM_RUSER is left to administrators, make sure it can be
trusted if necessary.
---
...01-lib-pwdutils-don-t-use-getlogin-3.patch | 47 +++++++++++++++++++
srcpkgs/util-linux/template | 2 +-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ struct passwd *pw = NULL;
+ uid_t ruid;
+- char *user;
+-
+- user = getlogin();
+- if (user)
+- return xstrdup(user);
+
+ /* GNU Hurd implementation has an extension where a process can exist in a
+ * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ * environment.
+ *
+ * http://austingroupbugs.net/view.php?id=511
++ *
++ * The same implementation is useful for other systems, since getlogin(3)
++ * shouldn't be used as actual identification.
+ */
+ errno = 0;
+ ruid = getuid();
+--
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..41bffc545884 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
# Keep this package sync with util-linux-common
pkgname=util-linux
version=2.37.1
-revision=1
+revision=2
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
From 3592ccfda5659876c95ab0ff142dcdaa66d23c74 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Fri, 30 Jul 2021 17:41:13 -0600
Subject: [PATCH 33/42] mu: update to 1.6.1
---
srcpkgs/mu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 6e5e816b5ca9..36d67ef65cba 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -1,16 +1,16 @@
# Template file for 'mu'
pkgname=mu
-version=1.6.0
+version=1.6.1
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config texinfo glib-devel"
makedepends="xapian-core-devel gmime3-devel libuuid-devel"
short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
license="GPL-3.0-or-later"
homepage="https://www.djcbsoftware.nl/code/mu/"
distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+checksum=1c9ca62c50f1f087c15aa94c6c02d206a7f297b7903dfdf67e1ced4460d7c784
if [ ! "$CROSS_BUILD" ]; then
hostmakedepends+=" emacs"
From 87250687a4300626c699b1a09bdb9deb9d5dbfc7 Mon Sep 17 00:00:00 2001
From: jailbird777 <jailbird@fdf.net>
Date: Mon, 26 Jul 2021 19:11:45 -0500
Subject: [PATCH 34/42] New package: dnsdist-1.6.0
---
srcpkgs/dnsdist/files/dnsdist/run | 4 ++++
srcpkgs/dnsdist/template | 36 +++++++++++++++++++++++++++++++
srcpkgs/dnsdist/update | 1 +
3 files changed, 41 insertions(+)
create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
create mode 100644 srcpkgs/dnsdist/template
create mode 100644 srcpkgs/dnsdist/update
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ # This can be removed once MUSL is updated to 1.2.x
+ broken="no y2038 support"
+fi
+
+pre_configure() {
+ export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+ vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+ vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
From 6acfca310e0d69c197b936aa7b7dcef321e67c8e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 27 Jul 2021 11:36:40 +0200
Subject: [PATCH 35/42] libX11: patch for new symbols
Apply upstream merge request to handle the new _EVDEVK xorgproto symbols,
so that xkbcomp does not generate hundreds of warnings.
See https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/79
---
.../handle_new_xorgproto_symbols.patch | 42 +++++++++++++++++++
srcpkgs/libX11/template | 2 +-
2 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+ #define XF86XK_BrightnessAuto _EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+ return 1;
+ }
+
++ /* See if we can parse one of the _EVDEVK symbols */
++ i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++ if (i == 2 && (tmp = strstr(key, "XK_"))) {
++ memcpy(prefix, key, (size_t)(tmp - key));
++ prefix[tmp - key] = '\0';
++ tmp += 3;
++ memmove(key, tmp, strlen(tmp) + 1);
++
++ *val += 0x10081000;
++ return 1;
++ }
++
+ /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+ * immediately: if the target is in the form XF86XK_foo, we need to
+ * canonicalise this to XF86foo before we do the lookup. */
+--
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
# Template file for 'libX11'
pkgname=libX11
version=1.7.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
--enable-static --enable-malloc0returnsnull"
From 1f9a1dceb5a98db5a8f8b993721a5783199def8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Fri, 23 Jul 2021 12:24:43 +0000
Subject: [PATCH 36/42] dnscrypt-proxy: fix logging (redirect stderr to
svlogd).
---
srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run | 1 +
srcpkgs/dnscrypt-proxy/template | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
# Template file for 'dnscrypt-proxy'
pkgname=dnscrypt-proxy
version=2.0.45
-revision=1
+revision=2
build_style=go
go_import_path=github.com/DNSCrypt/dnscrypt-proxy
go_package="${go_import_path}/dnscrypt-proxy"
From 72f3e7de64e4a9dbe50c9ed5d871288f872b4973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gerdau?= <bjoerngerdau@gmx.de>
Date: Wed, 21 Jul 2021 22:21:23 +0200
Subject: [PATCH 37/42] kubernetes: update to 1.21.3.
---
srcpkgs/kubernetes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..08d2f27b3859 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
# Template file for 'kubernetes'
pkgname=kubernetes
-version=1.20.2
+version=1.21.3
revision=1
archs="x86_64* ppc64le*"
build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="http://kubernetes.io"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
nocross=yes
system_accounts="kube"
make_dirs="/var/lib/kubelet 0755 kube kube"
From 8a91de78832f8a1bffcc5ce096411f3abf294879 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, 31 Jul 2021 12:05:35 +0700
Subject: [PATCH 38/42] cryfs: build with NDEBUG defined
Close: #32266
---
srcpkgs/cryfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..6d8f855a80af 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.10.2
-revision=2
+revision=3
create_wrksrc=yes
build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
-DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
hostmakedepends="pkg-config python3"
makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
From ee1cc5e3772640bb232fa0b52df13ffe0b322fe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Wed, 28 Jul 2021 22:15:51 +0000
Subject: [PATCH 39/42] tailscale: update to 1.12.1.
---
srcpkgs/tailscale/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
# Template file for 'tailscale'
pkgname=tailscale
-version=1.10.0
+version=1.12.1
revision=1
build_style=go
go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
license="BSD-3-Clause"
homepage="https://tailscale.com"
distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
post_install() {
vlicense LICENSE
From 05b93c9c709f4390f11f57281c5e7628f9c24546 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 30 Jul 2021 16:56:57 +0200
Subject: [PATCH 40/42] knot-resolver: update to 5.4.0.
---
srcpkgs/knot-resolver/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..b07a400a3a02 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,6 +1,6 @@
# Template file for 'knot-resolver'
pkgname=knot-resolver
-version=5.3.2
+version=5.4.0
revision=1
build_style=meson
configure_args="
@@ -8,17 +8,18 @@ configure_args="
-Dgroup=_knot_resolver
-Duser=_knot_resolver
-Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
hostmakedepends="meson pkg-config protobuf-c"
makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
checkdepends="cmocka-devel"
short_desc="Full caching DNS resolver implementation"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.knot-resolver.cz/"
distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
system_accounts="_knot_resolver"
_knot_resolver_homedir="/var/cache/knot-resolver"
From d84532db2b64d1f59fd35265f9f6ebd498ed18dc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 31 Jul 2021 14:31:05 +0200
Subject: [PATCH 41/42] monit: update to 5.28.1.
---
srcpkgs/monit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
# Template file for 'monit'
pkgname=monit
-version=5.28.0
+version=5.28.1
revision=1
build_style=gnu-configure
configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
homepage="https://mmonit.com/monit/"
changelog="https://mmonit.com/monit/changes/"
distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
pre_configure() {
./bootstrap
From 86f336636b3116f4671e86438718e1d6b90954cf Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Wed, 28 Jul 2021 18:09:23 -0400
Subject: [PATCH 42/42] dolphin-emu: update to 5.0.14344.
---
.../dolphin-emu/patches/VkDeviceMemory.patch | 37 -------------------
srcpkgs/dolphin-emu/template | 8 ++--
2 files changed, 4 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
- VkImageViewType view_type, VkImageLayout layout)
- {
- std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
-- tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+ tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
- if (!texture->CreateView(view_type))
- return nullptr;
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
- VkImageView GetView() const { return m_view; }
- VkImageLayout GetLayout() const { return m_layout; }
- VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
-- bool IsAdopted() const { return m_device_memory != nullptr; }
-+ bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
-
- static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
- static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..8ff426ad913e 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,8 +1,8 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14344
revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_commit=acc7d3710d60552769f61f4b44bc8533a940df36
#Version/hash pair can be found at https://dolphin-emu.org/download/
archs="x86_64* aarch64* ppc64le* i686*"
wrksrc="dolphin-${_commit}"
@@ -16,11 +16,11 @@ makedepends="
mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
license="GPL-2.0-or-later"
homepage="http://dolphin-emu.org"
distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+checksum=22075f3b335ba11bbfb34034028e7b9718be4be64dc037453c03359e6191307f
nopie=yes
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply [flat|nested] 16+ messages in thread