[PR PATCH] New package: obsidian-0.11.13

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] New package: obsidian-0.11.13
@ 2021-04-18 11:45 DerNuntius
  2021-04-18 14:28 ` [PR PATCH] [Updated] " DerNuntius
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: DerNuntius @ 2021-04-18 11:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

There is a new pull request by DerNuntius against master on the void-packages repository

https://github.com/DerNuntius/void-packages master
https://github.com/void-linux/void-packages/pull/30292

New package: obsidian-0.11.13
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/30292.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-30292.patch --]
[-- Type: text/x-diff, Size: 59017 bytes --]

From fb9a2326820af9efc273633bc2de98009e5b395a Mon Sep 17 00:00:00 2001
From: Nuntius <admin@nuntius.dev>
Date: Sun, 18 Apr 2021 13:24:07 +0200
Subject: [PATCH] New package: obsidian-0.11.13

---
 srcpkgs/obsidian/files/LICENSE                |   1 +
 .../icons/hicolor/128x128/apps/obsidian.png   | Bin 0 -> 6643 bytes
 .../icons/hicolor/16x16/apps/obsidian.png     | Bin 0 -> 737 bytes
 .../icons/hicolor/256x256/apps/obsidian.png   | Bin 0 -> 13026 bytes
 .../icons/hicolor/32x32/apps/obsidian.png     | Bin 0 -> 1553 bytes
 .../icons/hicolor/48x48/apps/obsidian.png     | Bin 0 -> 2390 bytes
 .../icons/hicolor/512x512/apps/obsidian.png   | Bin 0 -> 14664 bytes
 .../icons/hicolor/64x64/apps/obsidian.png     | Bin 0 -> 3241 bytes
 srcpkgs/obsidian/files/obsidian.desktop       |  10 +++++
 srcpkgs/obsidian/template                     |  36 ++++++++++++++++++
 srcpkgs/obsidian/update                       |   2 +
 11 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/obsidian/files/LICENSE
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/obsidian.desktop
 create mode 100644 srcpkgs/obsidian/template
 create mode 100644 srcpkgs/obsidian/update

diff --git a/srcpkgs/obsidian/files/LICENSE b/srcpkgs/obsidian/files/LICENSE
new file mode 100644
index 000000000000..2300567c2323
--- /dev/null
+++ b/srcpkgs/obsidian/files/LICENSE
@@ -0,0 +1 @@
+The current version of this license can be found at: https://obsidian.md/eula 
diff --git a/srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f23a08dc5d95965149978e4cf1677f4e317d873
GIT binary patch
literal 6643
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde9f6b77036ae1beefb1e539b32b128562ff9d1
GIT binary patch
literal 737
zcmV<70v`Q|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00080Nkl<Zc${QX
zO-~$05UuJS7D#5o0tqBptso&Nuu=deh$Od2$sdT6OQIYSCBGnvqU2`#Xd&5_eDK9W
z{sq4H;F~4;<_}~cu#II{K(<*}zSfI(rf0gUtZwh}p`BCp=+&!N?^OWJ@0-sqLjU`D
z5b;k00L{!cm+ORlZ}?rY_~E0kX2z@Q<q8ac^07z#_<IPdMPRM<eVZ@0u(PYv0c;Qi
zV{shM5z(!wFUKwvijm~=k#_jFk@~(Pg64<w8~+Lu4FJF_0L(M<Z-EXtm+SbYT1kE_
z6#LyItpjyTFg-jAh=|q_42A!_6UWJIMEu(r(_JWhM5WR=te1DWcF?%2l=>6^SZk$D
zDG(7IMWOWf_Whj1=5uB?qoX4-H8r8#xWjtF8*BSL3-iy<Irzrfp6?A#$fqa@6)OBo
zL}YUEi;ls80W>BBcFqa_5lh`9H3zQ0N=|v;jFF|q$3Fo;$w`dDNF_-MmKc}>tYt@l
zBJj|;FAS#$Tx`HB-z%l0(THWWybgd0$a1S$xtc65|NrNrS96lUKM?V%m!q}X+N!`|
z{k5M&mW3=UOKdE0d2(jR|2s)Qu1*qjS48f(L`-U^QrQF%1Zzp$DrEVE&1mz3!LUt%
zud~b_$0cS)tu$13wxQ98ff>ZhCway!_U82kB?4^()YsRGM0^7PRzyIhsbNO~f@0t9
z|0D>s^F%3)$0pui`^Wo0#9C{eipUkGLMff@?QL_C7?*@tqNSD9r`}kXOxr0VBE1`S
zW0qytl)^e9cA3nm{ev9^ppYyrH`9{ya}(_Z)>?_)3n7WqY7ppeMdYkPd{C?Jsw^|B
zfOt<poOV7ku2nSG00fktp2&fg0N_k%<m+i`vmf?r)jwFc0pf2)T77Q<00960{UVcZ
T40Dqb00000NkvXXu0mjfExuZt

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..5662efa89974184dc76b3fbb00ec90c558d5d537
GIT binary patch
literal 13026
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
SRtNA8psQu5`SFfj%>Mw>2Z?V0

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..0306b0322ee61667012fe3e5abbe54fc28172552
GIT binary patch
literal 1553
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
DTv_9J

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..bea7b668e4e382d660af3815a683d925d52d0594
GIT binary patch
literal 2390
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
IM6N<$f;x+SXaE2J

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dc489bfb99f441d2c9b07a7732898663884cc12
GIT binary patch
literal 14664
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..edf7310010543ab673fcb7edf3478d966426558c
GIT binary patch
literal 3241
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
b00960OfSclv?Uml00000NkvXXu0mjfMT7o2

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/obsidian.desktop b/srcpkgs/obsidian/files/obsidian.desktop
new file mode 100644
index 000000000000..faf569631b21
--- /dev/null
+++ b/srcpkgs/obsidian/files/obsidian.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Obsidian
+Exec=/opt/Obsidian/obsidian %U
+Terminal=false
+Type=Application
+Icon=obsidian
+StartupWMClass=obsidian
+Comment=Obsidian
+MimeType=x-scheme-handler/obsidian;
+Categories=Office;
diff --git a/srcpkgs/obsidian/template b/srcpkgs/obsidian/template
new file mode 100644
index 000000000000..054d5509d3fd
--- /dev/null
+++ b/srcpkgs/obsidian/template
@@ -0,0 +1,36 @@
+# Template file for 'obsidian'
+pkgname=obsidian
+version=0.11.13
+revision=1
+archs="x86_64"
+wrksrc="obsidian-${version}"
+short_desc="Chat and VOIP application"
+maintainer="Hugo Melder <contact@nuntius.dev>"
+license="custom:Proprietary"
+homepage="https://obsidian.md"
+distfiles="https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"
+checksum=d102f5acfdfba6674874633d7876bb3df5b5195aef9f67d7e1b40fa90f053a92
+repository=nonfree
+restricted=yes
+nopie=yes
+
+do_install() {
+	local package_location="usr/lib/$pkgname" item
+	vmkdir usr/share
+	vcopy $FILESDIR/icons /usr/share
+	vmkdir usr/share/applications
+	vcopy $FILESDIR/obsidian.desktop /usr/share/applications/
+	vmkdir ${package_location}
+	chmod +x obsidian
+	for item in locales resources obsidian libffmpeg.so snapshot_blob.bin \
+	icudtl.dat libEGL.so libGLESv2.so chrome_100_percent.pak chrome_200_percent.pak \
+	chrome-sandbox resources.pak swiftshader v8_context_snapshot.bin \
+	libvk_swiftshader.so libvulkan.so; do
+		vcopy "${item}" "${package_location}"
+	done
+	vmkdir usr/bin
+	ln -sfr $DESTDIR/${package_location}/obsidian $DESTDIR/usr/bin/obsidian
+}
+post_install() {
+	vlicense $FILESDIR/LICENSE
+}
diff --git a/srcpkgs/obsidian/update b/srcpkgs/obsidian/update
new file mode 100644
index 000000000000..ed82c41bd17c
--- /dev/null
+++ b/srcpkgs/obsidian/update
@@ -0,0 +1,2 @@
+site="https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json"
+pattern="\"latestVersion\":\s*\"\K[\d.]+(?=\")"

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] New package: obsidian-0.11.13
  2021-04-18 11:45 [PR PATCH] New package: obsidian-0.11.13 DerNuntius
@ 2021-04-18 14:28 ` DerNuntius
  2021-04-30 20:32 ` DerNuntius
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: DerNuntius @ 2021-04-18 14:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]

There is an updated pull request by DerNuntius against master on the void-packages repository

https://github.com/DerNuntius/void-packages master
https://github.com/void-linux/void-packages/pull/30292

New package: obsidian-0.11.13
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/30292.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-30292.patch --]
[-- Type: text/x-diff, Size: 59017 bytes --]

From fb9a2326820af9efc273633bc2de98009e5b395a Mon Sep 17 00:00:00 2001
From: Nuntius <admin@nuntius.dev>
Date: Sun, 18 Apr 2021 13:24:07 +0200
Subject: [PATCH] New package: obsidian-0.11.13

---
 srcpkgs/obsidian/files/LICENSE                |   1 +
 .../icons/hicolor/128x128/apps/obsidian.png   | Bin 0 -> 6643 bytes
 .../icons/hicolor/16x16/apps/obsidian.png     | Bin 0 -> 737 bytes
 .../icons/hicolor/256x256/apps/obsidian.png   | Bin 0 -> 13026 bytes
 .../icons/hicolor/32x32/apps/obsidian.png     | Bin 0 -> 1553 bytes
 .../icons/hicolor/48x48/apps/obsidian.png     | Bin 0 -> 2390 bytes
 .../icons/hicolor/512x512/apps/obsidian.png   | Bin 0 -> 14664 bytes
 .../icons/hicolor/64x64/apps/obsidian.png     | Bin 0 -> 3241 bytes
 srcpkgs/obsidian/files/obsidian.desktop       |  10 +++++
 srcpkgs/obsidian/template                     |  36 ++++++++++++++++++
 srcpkgs/obsidian/update                       |   2 +
 11 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/obsidian/files/LICENSE
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/obsidian.desktop
 create mode 100644 srcpkgs/obsidian/template
 create mode 100644 srcpkgs/obsidian/update

diff --git a/srcpkgs/obsidian/files/LICENSE b/srcpkgs/obsidian/files/LICENSE
new file mode 100644
index 000000000000..2300567c2323
--- /dev/null
+++ b/srcpkgs/obsidian/files/LICENSE
@@ -0,0 +1 @@
+The current version of this license can be found at: https://obsidian.md/eula 
diff --git a/srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f23a08dc5d95965149978e4cf1677f4e317d873
GIT binary patch
literal 6643
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde9f6b77036ae1beefb1e539b32b128562ff9d1
GIT binary patch
literal 737
zcmV<70v`Q|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00080Nkl<Zc${QX
zO-~$05UuJS7D#5o0tqBptso&Nuu=deh$Od2$sdT6OQIYSCBGnvqU2`#Xd&5_eDK9W
z{sq4H;F~4;<_}~cu#II{K(<*}zSfI(rf0gUtZwh}p`BCp=+&!N?^OWJ@0-sqLjU`D
z5b;k00L{!cm+ORlZ}?rY_~E0kX2z@Q<q8ac^07z#_<IPdMPRM<eVZ@0u(PYv0c;Qi
zV{shM5z(!wFUKwvijm~=k#_jFk@~(Pg64<w8~+Lu4FJF_0L(M<Z-EXtm+SbYT1kE_
z6#LyItpjyTFg-jAh=|q_42A!_6UWJIMEu(r(_JWhM5WR=te1DWcF?%2l=>6^SZk$D
zDG(7IMWOWf_Whj1=5uB?qoX4-H8r8#xWjtF8*BSL3-iy<Irzrfp6?A#$fqa@6)OBo
zL}YUEi;ls80W>BBcFqa_5lh`9H3zQ0N=|v;jFF|q$3Fo;$w`dDNF_-MmKc}>tYt@l
zBJj|;FAS#$Tx`HB-z%l0(THWWybgd0$a1S$xtc65|NrNrS96lUKM?V%m!q}X+N!`|
z{k5M&mW3=UOKdE0d2(jR|2s)Qu1*qjS48f(L`-U^QrQF%1Zzp$DrEVE&1mz3!LUt%
zud~b_$0cS)tu$13wxQ98ff>ZhCway!_U82kB?4^()YsRGM0^7PRzyIhsbNO~f@0t9
z|0D>s^F%3)$0pui`^Wo0#9C{eipUkGLMff@?QL_C7?*@tqNSD9r`}kXOxr0VBE1`S
zW0qytl)^e9cA3nm{ev9^ppYyrH`9{ya}(_Z)>?_)3n7WqY7ppeMdYkPd{C?Jsw^|B
zfOt<poOV7ku2nSG00fktp2&fg0N_k%<m+i`vmf?r)jwFc0pf2)T77Q<00960{UVcZ
T40Dqb00000NkvXXu0mjfExuZt

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..5662efa89974184dc76b3fbb00ec90c558d5d537
GIT binary patch
literal 13026
zcmZu&cQ~A1u>N)}R$aY|-fIv<7etK``H2?22GOFo)k_G8POuUrLZS=NR*8rbLX@bh
z3&D!E>fSH+xqsgMXLq0HeCL}vGv}T6%*;tPHq@pdWg!IsfI?SC^F9DTz@HERP6U2g
z`@M4k0I5n{P4x%Cul{t9Wbr->;J@rhs;++jac{e$>67K_$!DL-bAF~BSuy0rO0oq?
zUR$)=*?Y?Jz=$PJ?4_CdhtcK^ymd+U2#Clx@|Zb#0pjPQ`OKcNw{9TjW+uJfl($t?
zeLfkUm0m17v}w;hlagv4P8~>14Yn=W9!?5oX3l3mZ982ETk2pSCnqN*(*THw2otyf
zf>>xT6*5{q+8&NZqtKEtJ3C`LCaB~VbFu$i@5=t-sR8Es8^p_pT{za0Tvb^OTwT=Z
z3CHopUs96seKJWwq85yZWdEPm))fD>Er|7JZ;|J0swrfd((-;sEbX}etS&-}v@|N0
z80|8=w_*@zA`H;y`}n&oFe-vbzy9*EX!W~edhzC0izV?!l%y#T`v5f@L85<sJN(Uq
zdfQH~@S)S7KQkxgw&B~AVJ#TjpsmM-l(_TF_gC$Idb+8Q>aVeIl^2#JgI%r=+<w-$
zgcU<;skQj+TZx@f5fO(uKYqL@VDr#HCH|XR6La%8x#Hk#=^n61h~Zn|<jOKh@M|TX
zt8bp++u^!{eE{tIZE_JF<6$C0qdbCTB6Ue6881BmB>+QwA9ofx$kZTz_wJDO>NI>n
z7ue6Np*}6EgN70~LYSVCM-g+h2z61Q3)hxZLgrsMYOZ~&7fVegkG=mmHp$T&f)xXn
zOgC3}?OsEF_kfbmVd0(S?%~gupx8u!a>(n}r%#h)Opdi)WWBx4*RR}66O5oO^yu~i
zQYIQ5#sq-eq1Uz8sLbDpjR<Q9d>Zm{{(dp<NFGO(n(70kQq1bY=mLA$ybc~^4jDA5
z2s9@Rq&R{<zQp5C7Zgh&bUC={P0Ux|Tl&e1Rb!pYo<c{ECYTSI``DCd6`?~7&VPrR
z6Q^etMT$O!DB1GBM7BFuq>Myk#NPDUrILE6H3;HD_K0h36-&6Hv+ODWqE5IE_MmG4
z*dxNa0CVfU0tTx)KJi5kElRxA03wUN7J>c>QF^#1UD};xCkn*!<D9V6LRr=pm*Pkc
zXmAZ(q&BI`Gv37L!mIFWBTwj*@KlOtF;8-T9Fb|91-TO^X7yL%1}5yq(Vr#ZPwZ)I
zv(Qg~tgNgr2E87<M;57j3fZ#z>rH|70wTGWjI7g>NqLE-2?gcvNZ~k(LapaiO`n*K
zFpk}98Aebby6fR=iRTANQfHrlU^seW?N)xJT92eD63W9HyDy1MERWsKzd>yK(2R%6
zk5p2Le5n4i0w7IEiiDus?mggSXMzfHDjkNe|Ehtsz|e_+61U^Qn2h(GQ&PyA2RJ}<
zj<f(O2(BqH^6h|!%rz2bUjY!tq`Q{rK|~0GDUhFru&kF-xR+2aSTB!r29r9$nH&t$
z02o5w6^M4P*}+i&xS*9G*ZOOE9fgfo5a#fOSdZ`^b~TGNpfArvPy~Z&G+eZ+hh@g*
zL)Vz7Jq}BVFl|65f4nW?cR2(5`x*i&vS=oq_MrQ`*ihydlGn&MJ2+<|Tz6qT#-9f%
z0l~2XLH)W5_gHeAlQmIEXI+%a`dHfWhxYX_S|k_pRkv$#4GixGM3G|lf%ZE$f>z4*
z_(^UOVqjzDa5_d|1cpWzYQRGjOKA`16u=(*(ICY!AwTJkURybNE*zxpFt?2PLz&o_
z8JyG{zC(C_&f~Sl-QDY9ZE^Oa5N%DOB@rj0B?`Z`DSgu=GVz_~8g<T|bTznR*EiNT
zXd;oarS-7Zz7nX<tP@EfB`qP7v8EGNS^wimRLZ>JWCI6>rd!0vE1s9g9-|c+bPG9!
z%A+A;8H*UN9s>vwIW=WxVcA2x)qPyp9_AU8F;oQ~M1pb*X)3$rpJ+fMWf~2NZHF9t
zaxh|}h+9FLB-qzcqIQPvUn7HtwDb~S3dnpYIq+GiGoO!&TMz0O9BjS@m480*k+$~t
z)4w(37-_#rOu;uAPecMBmHOnFw+lkk3IBTs_{<5oMW(Mx>0|Hl>(?qf4Jyg_EK83*
zw0Xi$<{WPOaZ0h;8Jk`I?zn?90~}2o&Yl9>%b|}m$gyLUgk^B?J_?uiaI+*<bNoP%
zL;%`E-J*WjiKIV{3z^E9wo+&j=S=;BX80C9Q}M&4;l~_a&<PxSaKL$LV~V#6^<%Cv
zoeOugFRHUG7lPwQjuujC{9qbj6+--TsMgCW;1YuLSU-5~fpsPkhs*^3(BJFpjA%2i
zntXXgsHP7q$Tf+U=GT{G>xXXLR1odVw;zoRs}&{V>DAEH1TIm+O#3g%5{j1(sF{K#
zef$U1wfbf+=OE#%=;?CogiZCxK3_|%=^z@P_MGyqQ2JwGpSRX9=hsj!N!S>{(Hopg
z4my6xm(4s5^Er0<wdDexlbuCngr@UJmr)LN6*CPsF&|o%ltJF9zcxO<M1bP2AlSu_
zK^d<{Mp&9XnZF#cK6hB^?8wXih_bZk{kY)B#4bWM>zKuN_U*rkak2VUtSO|ruu@IL
zFQCDh5b{ONLi1o`{)*u}$w0Ako6kz$&D1n6YA5t*8(B2GIW668bMGd3wwG}te+0>`
z$~6`4uEWqAlrQ}Az{0(0BTac+Op5o$o}AC-#e=-7hqfIY+UYk)hp#qGA#G0fn;&m_
zE~!Ax`<jSeLMA%#VBjg{igsDs+t?xIp4w2oM|xf4r}!xb5z*;waR-ZFn~`X~&9&82
z^Gu#G_z9IKvq;-SjM$SbPMaSX9YHX1=@IX=N0Mj>KvrP}K=zlEU~9{2^SF#*x}`t2
z=FhJA?`muN?tJ)!DeyRX=H)$*{@W<;LScy8++q=Z)<D)G|0sS{(!5;riIM)$yY`2j
zRjvDcejz+3G;b-xVOF1>sJp+@oH8@}byB1#?wZ;`f%Yh;B@Go6PB-ouiNAWOf3l1_
z;OY7OcH;sYy2vdW{<TyvSAV9-)c^<Q%uM<WObnbl1D%g6pyK4T{K(Q$uCVFFB2TBM
zN58Yi4L}*`e};FNRV`z>J$(MIk))=k%DjruTg*RU1nf_w<&*|&qn0nZ`A5a<B08qv
z%z-v{4YYv0TuSo>y8$Y-Ak3^S5*c}{SRydFJ;-shUp$lRZS%zjf~5uN-wlQ;0Yf%M
z|HvOsW4@Zl2nLO<N#B};hZ8Z6o!K{Ulzjd3<-PU2nYthE{RmDVxE2e^wH_+9)7sHj
zk*P)P=efm}Rg-&mskh@YmfM%ih5J5v&6&*y&WW{bzZZ#{a(VFm^o>jtUFfj{+!}Ls
z+g04m_oOc5f$&ZYlS7BLNY*brTkF_+taG1VL}o?u=M&;;%aPLZmsh#r3at@eWnG<|
z`u6<37g)SwQeiw9lIWuQn$DpW(vmvsk{YjUpxk%yB=0mp%EE09Cm6WTt`Rar6rdn3
z(#g+AepNO=mXJy~#@;8~dH-7{HJVJYe7N#<;9n2xddRJ%O_&c3t3K~HlqN`#{W{(@
z|BQNeQM%pvT&--w*3!D0HvPN96Bmm=-qPjf6pK&{SN^O2W-37hr$o6&4OkuBcw$3C
zWm$FGy*glD@n?9Hn;TqiDV&FrT|uz@_-AQ%568stbb>aHVxFK`3-gnyLO>*V<;QJN
z3Gbh832%0V(X(6<TKv~iOO`+mc}m$qI->ujNY~DHBCo#B)bfJ#*3wd)V`9?2ZRl@4
z?lodDm^rZr!=<2P4JPsVQ;v5}mn`^VCMWMLv*s08Lj`OVBlnQp(Ln<@NSnCN3CJOh
zB=;_=6!B?(>ggJAt}F$qw-Hz|y@xFeXV=$P4_Ce!buxo)OW(sGh)Z@4yDBq?a#Q&8
zIMOci33EC=oRX|z$U(8cQ7!*UqrP{nrMXLz7mS_KTU_N2w|_ZXpDErdaO!C5R4YI7
zD{Z?z?`=8gcjTU*&Kez^l|G!CI2pd6BAu%@o_i`85=r99VTIlvtVrTavQyW|P`88-
zJ6rf#%H#|FOuR?+K5klskL0H}8)-^GW^iRy@g1>cc4p@8Z<%t-vjXhMow>0);Ux0M
zQ0-<eTt?iAA(_*jS^!15s=~A1Wcu9YGve{r3@I=h2@xs!K@Q25Aa@SVk*MP$-v<0w
zsj6ywh-AW#AJm>pHy6FmAKPNSpUTw+?cXRpwz?lWhcgH$O~0`okrd*$AKc34f6bPd
zBI^`(;`If0Vp3P4&^ehj`O1q0O>(A_Ld7D(pmt$Ai(emy%s9vjd)?MCKDe^{kl^vL
z)pGcBN2sH|%KO!5Rz?2)q0}gZ#3CZvh)h=Qu{^#H`dvjO{kZ8~R$1oQp~=szJsJ!B
zT1ktTRy<O-d-Zaae?=A2vgjSa%viAy7MODTkdrF9VE=GOIrJ#Q2j@$3D85V)E9Wlo
z^a1zmqAP+-iCd=YQGIRLD1!+yjy8ItK(lNZKRw76Jukr|#h?~uOrdB4$C!_e-+!1%
zc{fbq))EKnT#V`4C;g!5lQV2zz3&j4RT(cVDQk8uEwq{8lPeG2zC)OPHOH32Fn#Gq
zoW+N=2d3${{+ppvBX^s%CB!X>azyMq>OC@57;>}eX=5~s{HyzCzExuwze*ZuY1r`u
zrn+@0d@I(7Y|2dTpwID8{<N>1v+F)jkXi)Rmzjla@ZtfQN-bP)7ylIKdiO!%R4Yde
zdH0)mN-S{+uhhlhdg;Jj_JzJZ$1`Ze*RVy&aA{n-o2FROdb4mziEZ~Ayh3cg`@^=O
zd5Atg;R07?oSzrrTF$SRF`Zl5q*v1&%iIzzXV&7mb^g;Q#Wo&nEkYfX2?=^F*XKMf
zD=9;97~=fPgN>7|-<O@SLkAIrFQ!<^(KAz0CpMoc=9(!Ez3vLViA!3-2?3FL(}WuR
z&?MsH)urlNTjW2lg}sZ%HCgQfDd<;NIhInayp@whYTA_~%jN!)R`v3#aSva5=(dX6
zY}VJT76|^cwBd98hg(4BzA%YDiacS|ExX7sm(LB(2`ko8W%C{%3{Q;lc<{B-xo2Q}
z^TK+o73)uf{eC(Zv>o8KAt3+hRMi_T0{uSJnB}0tjywBpF+3`6H4m-z^m}#lq*Tmm
zaGsm$Z+(6HjbmM6q6FY|X(JwDVf20aa6eu!lioEgd=M+Xtn9ne0zW-)N7~eQkG%@L
z-t;oUUiD|`<@k^nM}!w!!KMZW6HJAF1=W1;QaOE3;OH<bCzDlj$EZTu7zk&$^4V3L
zHH<bAIJ?W}rG8KA?%lgSe`ZXUcZ1&0R@>A_r2Ahqf8SyMy4ILR^+4FeDI}!m&!S@g
z$)AN2&VV=x%<D(>ALPw2oS@C+kI3tmlB%vsS9W?3V<i`w*;|WE9>mW%RQdISlFwAQ
zq#7i)$-mHqFC-Wnn?zTB)AI^(U)?_YwXXWBBWP#e^NEvU-y9`5Bu*nfZVy`fY2ojp
zVN#H?n9Tbl1@1Td11~gs)*kjC_Fv92JQc@<P=$6KXz-DVh_HGF1USy^byyvYsurbu
z{u>>A0KutQ9rY4MvLdIy&2csJRt3%&erRGhvosd!xICDt<B^ZN45f1T_A0KHyWo++
zv1Od9hJV-+!QS(hRb~Pn2DzdEBiqaO9|RF|t-equGESz)`CCKf1hu;xH@Nv`e2w`v
zDsxFZ%8s6sb}u!!8Z8WQ7^w9Rr=OW^2dNV1!qvTRyGg<@(E__c<`q}X<yQeeWhY7`
z-k)7Bc7(-mEY&;9@Rm=*BVN&lkdu)a%p+(y!iQjMht_B+r0P%M+RbnDQS1*>Oi0w-
z)%JVBMs7V^9V^}0&QYtvvUaEYzeY~@i29PDJE)25l3fj$pktUH*VZwMEUtqr2^D$@
zBzHzm^}*eKIw(@}E;IW5`t(-9By0C*>DZ9iUF*XVF=wti5nU#zTm1NS&|v+K(r1x9
zD2dO^EW&(dtZMm}tE+RM7aTj#mk9s-MHTt8%7)2nY0AA_G3)rNSCn4geQs&O0d|?)
znkTVgN^|V$|NUBqjft^53X#=vf1<J^k(*eKeY33KecD6Di@O<b6IBuTDkmRZcfXsM
zke_^p{L9{3K*{PF_b5KRg(k3J|FblEfXB+`9m<uyWY)Md+bZ2<SBkUrTdpRn7wwz^
zf7``~e_9aq1XFu61|<d#<RtPhhU|0o?Rm&@4ot^YXy8Q8u14!uyr(0sTKjL@VDA53
zw94N0{OF_7*XQi?%4f22vI|YS*xy|oq3Up^5>+n_zXCM7Snk*DFY4ZoXdYPYV!%@A
zygA@PI)<dV7J%UJ>m6fF@qJAVJli{^Z_2wLcXl~`rTmeUIeH;CCC4Jv;cJxj8nbDz
zb@g3@8yIKJ5FtZh!2{^l=IQLCBU;Lpld(6HdVGq_^qd<PSt**YMQU2C%Z?~1vg0<0
zlPizYnh^`s8rb}HiSI4EYO{4sM9_EvfF$C_s5f8v6+M%GF45ubuve@)M!%KAw-l&X
zg9N|0%r`pl;Gz{B;2o5MPB0|)B3AO*#sCDa0R+4YS*(Km(KEbgGyX3on^E=X&RTfX
z)2A?yYj<}>gstDXQF8ayJ@4_Ou~5!Mm()Yb;<2x+`~EG<SjFAh#9<<xk8sqO3E=eu
zk)3U4`zAjkx%7vtge9)Ec7MK=_N`$Nc*F@~Ik-aUJEVmK?}&}AJn5GQ;cKP%(>hS4
zZ{B`T`j%v#T3H2ixfj(uFMaUwf-;#s<gkF13{|(aIqmeeM6;<Y<}vG@z`%%pa81v0
zZ(^V2Q+$?9GP(PuwcEv%fI%UPVLQG!YWZTT?Gg6?1*txu@+@*OFX2S{5qhC{xq0Ca
zvGG*2vjumZEB;y}exkOLtmaNaoXSyqtQgK_O%{serbWheZf%+u?3RKLJlX3kAPLUJ
z?#(t0WsX<b%pW0h2o7W;#0M3{@i82xTVEjjJOH`*U<rOni;D#P=BgEqkDTqQnUkIG
zPMWGICc6NYj&JaO`m{{^5_)$_BdDxw_xM0>(+G(iUGQrnQY+1XahCdh-iP^k6wGos
z*r+>s0o*+?;oqZnn}{`CZ>*oyoG!}6aJ0N3j@iEwe9OnT`IrKEXZbY%h6vI3qqZ;K
zO|q4)d(HKy$+0nhSNWle+W1KpAhl#w{AIy2o()~F=TY*oPg&xS)O0iCOmyS<)&XSG
zJA%f$oopRm96YLx;CU;J?6Cv}Uxi5_T>~4|<isB&dGAbpXjx9!sf)NcxogI8P;tcK
z#o--}UJh*Rz)MzW1B*eYs)rE|Xw*L%3qrBKkNndwDIdFAX$%f8)kUzi1@83?ZWmxL
z<$B?f?FW!VM|h;c6JztoKOw_L^qlPRg;2NQNI1G?z>4cwxaRVDxdQ*oKhylZ__NKC
z=4$?q?m`uT9RA3=xl1l1!w9?-Ywy|q7bZmwp+_lf%4k7y2u}1oB-Z*!BdkfZzzX8w
zv6H8yN;216AWfhw=du>@9@eE5cllKdbS^dNBF%J!@;%J|YMw6i!;4g<3?t&Y6c_&F
zOEWVOc{~?DQhp_oJ)&YR(M2#BxP5tcXl`K<tyOIek2GtFc$#T?dyzi0C}T2n!ml8w
zPzA7|O9LLLeBFo6Eb8yppuOK^Xa8qV+{IY|$s%Ogr4TF~eV5M>q<y!kW2rP0hUqxv
zP`7DPO}S64V|7IE>-XkY;N&g)#c9laVbV}fX4WqQ1GVN@$HZIt_V*CW!cxJ~Yk-G;
z_?9~~2$WoY{+xFMmr-|6z)fRu(Pcxp)q!C9_J|T7b%DGKnfKOP4mv+LYkj_c$M%D`
zqu<{c1Bxe2lMU~8i5G^`HCNkg9fYA7j%1vtFpR}tMed@gYL2P&#i|k`!tX_j>Bq+b
z=9>HvXU`}9i)aK+8yCgqw1FQ;jU!)#K{JeReqtOjRIT<dDY|thW@u=rMP8X;XzBw}
zo$9iC?BqqvD5kC%#zGAoyjlmhPdhD=;oNlN+UnxUaoek>MGM>4+AuRe@AmU}dbxF(
zU>^^V7>o{|&avotar8yFRYUAr(*VwWa1S)%C)Qt=T)Ri{<@~+7Zl>m38B<y5e$XCy
z=%P3GX^%;#`*ivwlECXWM<MPF@pDe^2%vpn7xwk-6#f&SB=R9e)feqO?$?@H)YkmW
z>pya*@Nl+I^WmnB)?2!lL9kB#K5}nY?IRqr_k)qc^K|*B`C)5@)5e#6P8<NyJQ0RE
z65qbx{iZb)KmiQMg02IOL*~CBw)Z~YeQD9lSliN)l%M}A)CP$sOKaBlbLrey8&U9?
z1{#0)J5#;Thhjy~?ft&hyuY4M9e9skWHrY@zZcUJYJ?9VovpExrKt+X+{98-4uS)4
zwQF#EhH(Yn1dtexIT5%az^P=0o}X{uAww-Hnv+DxI-bV9+a>6q<^e2U=G6g2Bp{60
zOz&u^nqb>1&pHn`zqj`6?|mz4{)#5)>}p2fR3>vHEIlVKKSGQL*daQCyHQ%I3|Db6
zOY>Q`^3N|_B(nALiVA!G%vZZ{Rn$<sMMgw5U19RiZhjy*MTvbi_^0_m+ljVI9Cygp
zv&jC2va4RS_qG4#_cKLkTC>sMFrvk-TPP<LFlgVTP+e`S<c*o<eh9-%{N4;&8!cpB
z-eg=IGqWxGOE^3-LKcPWl0cm)Sx{g8al2r0QL+5MK00%k1NofwGlJ4j3!oYF_0N3;
zJ$m}ZR?gUi@O!cH=A61<mCH5o_yT#aZj(G?Usz3n=#JzH2&vlThX{-DYvVg=1TZ~I
zh_tkHfCze;(Qfz>7sG+twdxYfM|Deb6=z;*0~rF~!n$`!yj<=wc#M~{H~tl!$tVsi
z?x``4oe;QgTzH??#ps<Yi+ShIgQK;Ux1gH*=cxmICByY{+2!4rC~oM)#KgM?!nI<o
z)k4&hZWrRi;dsbitXR51JKk}cXY>~EbS(|Qr3W%2GyN1zH&hE?ytwfPh-lC%-+b(A
zms#3-4?BfOBV8IJ8uK|Cza6On`;iNyxF>_jocjZ`5J7*uNh_B4m*@Ig31zj01%%Pn
zrMAA_x`y)=cu1hJ7(Xdpt%GftK?W~`)#8<?0T~etmzSa`)h-_T3OTY02XpQ|dzT?p
zLxZW!+8czb_vbE(Z0mNIjX%-)m}JO7jUgxA0Pcm$lryPsoVEqT)YSB~UxwGOJ%Qg1
z&7+<993B&4s5&Avb+TG~62NH$!w$UhHZ_`j-(@tkJA9QPQ$h5f89JVfQIkSlwW@Ju
zRwYy|4zpuLMU8wpBd7@jLbw5nl#wpD-Q$cog{pSs@89m#A3o^PVBNYRNh6n<BCK2@
zldcd}ADdp`R*h`Zxt##vwG^O?9$hvz3c<xFWeGu1hL`m)>#c_mAKtuun`Ef)#=N(5
zlw?!K=wuy;n2&0%gj6;0INGyxfYTd>QoouHXQ>re1Q5JcRWvJ%6&1Ce%^M_SMD6`~
zXZEu;*EjbAQsBron4RQ)wqeFYs4-V}6a+gx+u7MWa+)sWLjykE+$>xHEq}RdYsBg0
zrRwGqiP>W~F=maggqHCH!BDpe{*&2+oaN<@&gxc$7_wzD^2eKIsJhy43D!3wZc}mN
z9yd@!>`-ND)PR$&;C&>IE+z`V5w}XvngNNQ1a-E|KfD<Dc|_;gQDkllQ+1qGd7jT9
zS$r$CV&c9t9Y2VUG)Nah^Otay;>t2qOV8FnCL&?y?>O;Dd|pmE%C0G5D3}Yomzj(R
z|I3t8cJ<;RbPOePJq;-3WcP7Sb<3z(Kqep4OG`6a6{dvtGkh8L)}FigvmxQXPm+)v
z)VU!Lj>y(DhOgxSN?hG33^c>AUehUN1c@zrt;}4stb*!u#pnl93AK#5A19*0iSMAA
ztOBCse)<5*PsF*qE-Y{<%8Bb;QM*Ait<^`n$jI+vOm`e<bSWE^UowU_ZJ(0Yw!*ru
zQ*Uci!`0$pXLOjZfrtn%D(=1RmY5v^6}+lyhz%WO@>AYGPMpQ$346hry|>PKh!#ES
zwHA;O1jWX|lAjWdiw1`(-jn?xM`K~x_veqNzv+*2)ZXyryJbkB#q`PSUT7x$2Ly72
z<08`bh^3VupwL^zvm^ICCS%W`;<Z^nX6)7QnE+!2{}(#7SBdl!!`>Qm9v#`+j#+4<
zaBL~7iOg;~Hx*KVci;dOK5S@Sd+%L&kG}phb8~Yl{dfY_WEq?Fs(;}Tu~-@?m)w#2
zXxjt0#vZGJ#F3ao;RcRkgSu4!pm;ofW$Qfax^ySz{bi6qE1)3gocBrzA<&4{iEQlH
z--CCjcS`;uMp@!RN#pNOAsJ{yA?5^F=8$($s=>MY)!`7bXJkDzZfk^+yA%qvm(`Ci
zC`T?)h>x8gq_Z;7=-JqXQYz57-7ga%qDRuaTe~##ByekehsTfWEpVB?Go*cH7rzdl
z#w%Id5^xqH7$u;{7#e`_oDArEy}NU}k790}4p|aw1!?ea=pm)*1X$L|2A<_F<urS%
z3~x(proR;nvR&o|1Zf~{-_-)1DZx-vHT#@~_G9wK*Kyy-GVSaGJ<FPunOq_hXFEd@
z$*gV^;WCZbwO_mkeuE^-%{W;d5639_*^X+&RQEo>OdaajqI;Bba;u)$s9DX1Q8g;h
z`fh)@?QKerQVl*%KU3MJQLp>Q2zALr-$_tt>OA#Eo)~V*(&QHuczz=>cGJc-yxwh-
zI^+o)aMd49gO?^z10b7{k^gH5mP$%a6nJ%L{Gh_`+L8Icm>-Dz_o*n)mghyDOXLpg
zk@j4W^M>}jsMabI!gm=fwrWsp7Gep8C23tawBi&Z1I9_;P0ITEy0CDX?TuUpHbzY3
zT$J608l!Ikr13le#Wp`q3i-P@5$0To{Wu<7X!zA`j&FF_z%gLbOJM4!E^l$bqQ7(r
zm|Xd~V6yahVZ_%m@**B&1n*#&N_t6=FgPdKmph-M-FUgfA&m2%qg8rjl4eyFLmWvu
z??h0b6ICJzQr=&gJOKA?B+h8?@3L|O6jvxO^9vJO3l(LRZeXly{!H`?Cqr}4mT|*9
ztZeJ2MpZt?Q=5u#74p2`uip5ieH6#}FvT_F3xB#I;OOu2(%1=wXp&ZKUET9%4HHjH
zO;lAi;yB-y?^><N0wf+6Q~qt@c)l@*0O*N^Jqh}4IPR;`TxE<dhZ@UflPD|W+qbpN
zd(E`ZqzH(5hxc{nJ{9ZbKmbQqyC3EKKOA1yg8r9{z_S9X4@^GWwEMm^0oeZ~nnu5W
zZ<#>W-sL86+z4w14~+QWsVxFyEF4HN1d1&omoB(0US#n+Rn|>jI+z=jcC*RnU`0k&
zj({b3ZD#nCW9bO?npTq5HqxF45L5tN$#S`>KG1HPJ)Sim`FmL2bB<vd{j7m;q2hIb
z2&X0XqGq>E`p^PLwnL4K!vAtGgN&O5|3i$kSJ=b9#)EQq>wlwd1V!vZLqQhcX2Ze8
zjq6tYxflK8L`;J@mQT3;rorWPRb*cmjc_t5Lr@8PWzg^@P+i7OLnm}0Bo7Hls(4)`
z@`S`!r0j)GVGPGD@#_#p#>>3f&YQ)zKAc*;{I3+OixUv8Q=Q*Nc4b}Mf5exUbK(u<
z$}8^V9FIG$?p2pNT&<7S#!fce351@+asl}NVmNlR&U^}1=zy`=WU+@g<y47>#3!F6
z$`Y-A9}fB|y+nV_55+`tAzhr_hX>!s6yR5e>Db;fv{=t*$u>o_xkSR>zUO(n?pVqL
zfaN(g)xktlfruyWGV~vkUUTi;w;#<5e;lSdGk&0Oz@ZYv6D8VslE?+vI#q-RkLMM1
za?T}p8~q{H!#cW!jRr@D(xW~t9Y_5m8>j(E7^*aPy?4Pf^7lDF_mjKyaRA9PeX?55
zeD(pN>0$59hOkaYIjGu>x2+o!6sv7Cn0VR??U0vV52Sl8l;<1dG%%dIY6Y|PN`kAY
z&jF49a!a9RDoWp8bC&KC1ics=AAgN&_+w@`^uF1<cNn4n@o@?u>A?L@la%5dgwbvC
zE#kp<<~(Chna?IpA{k2qpbYyqI5+_2=(vynE>~|(0Mm@M4=mKmEg>)NY3<a@tHp4X
z?iNa*uacU>6%LjYjnHmUV7o>5*wEi)nbK>(S6xk$@AWfAi5A7D%QdRsKt2-zxmReg
z54&uBculLS$wy7ck^uC)cyi|BD=iS%9PBOh0U7`0w&+7A9_qW&A9jB{$6R;|C&2-C
zav>#h2n@xz-uvaAURa5P8l3tJkoGsdcMPw8zYFH82ioM$fiZ_u2o@}4$=ny?SWLH;
z`R`76q&?+i_WLCG*nnBj><)-%$}t>LHvP)^76kunO;z?t<yCV0??wT8HHim2FY=#F
zP-XiP>0*1EI$YJ>AfyQlW0N>WH3437NMG#d(NG%|B{9&o?R_adJgT_0(LvT-BbO&l
z5wy3z)g23~ah$a$16z_XDnw-#;^Bvmiza@pTl7Wwg)w}rIl@l5bJ|^PT^Ns7Ch0)?
zvD^Y2$s5ztOQi<8FTt^>{iw{0^!vz&UBE&UbUWsi*V|%OBu(gs>f!<yH$eB<-VSU^
zP`NL}QS6k9F+^1(f3-fVFEaPg8GA-9e;m^oF}Ae<N2;?Y01liZf0rp3|BJ%N($q<+
zs>TLP>hSt_a*SNI%yv2}m5qOeMHw2vP$UV!tj5ZE@5KvZ3?bt=c*3+NY=NQ9prLC&
zpV6%a&o1uIZ|fNjwJm4@GEC5<<i^27*HXbW4??Qpkx@HGM~xiO(P~qPlQX_;Y9t;P
zUuf4DB@Gs;5CH@Mwkog6=2%f5^y@r5J*({_?adSj-qcij8+POzL~jQ10I4RDvIjX!
zxTVYa2Q<;3F`j3bpZUCm2-tzR2Jim!r_qNrfluK0S0&?8fm`0q3WOTyjg8Tu5Di(O
zux7Hk`nu-Ml(Tr|R-JbiX6KJLz8<s7D2n~GpCIN05&#7azxCc7ubzuh;Nx&hC(`l*
ze{YP??c>>7hgWii5}n5^LZ;M!d#e_sh6n>VadKo9VxK+FQ}{FY{W!6quBH~YS^u{-
ztTDFfz`(u#n^T*6z4wfLd+g8A4U>8qX~hLM-f<aJjbTT>);YX$G}vk{4>zIOW?_AY
z(p<rW3AzQStoN#lAlA|CPRCO#`q^3sY{lh0%#$Z0it}<GYaqdgHF%yS?frF4JL5zy
z<Q_;P83EBi8X7wNm<AdWtes0B>2r;Rc4QWzD#UB4{f#gB2m%LJYY)W@xI!*ln`@Mv
zI1y@zmb{Ja)?Ze}+XtxOH(sUY@B339G<D#0f8MVMg>hOf`N@LSJ`G$J0-u!%YrHBN
zPmP0EbxX=cnTS(8zWp;wT6K+rS?NEdCI>RLz%l}Cq1Y>>iM?h-?hi)Pb%dr-Sv51E
z?;*tPLt42lQ<7u2?rj9yz6vdkS$g_k>aAmlBsCBP>I;Q5L1%?I#2t2(x2b1HT24xe
z3Za=VQcl7lorUM$+HM`L+fP|SHLVDI_8Gl%!Wy*dEx-b-6R39-0k$DfBgTS0av;zl
zd!6q=t_Y`n2xQ9;+ctjkLBI}#%&^FjG+_Spi`7abwg)Uk<YI+5t~2JJi%tIG0~k~9
z4~q@M*bMrI5el|Db7yX0C3Sw&G}+XEOE|I<Y#3oX%CNIq?{&Xx1|w28hh!6q)(qU`
zZfuGRJ~vdJvi>F#-tK2qTsO>uG-iV8{EMFcKqoKaOCgbyIqp$Qnx>2E+lcs10mF_l
zInUeGudgj(XmcPEoLTfJ0~2aJDm|k1AIhgC1d_eYZD#gRlZSfgbAh|U@yh2LEY;n<
zmV0v4NC2FgL6{dOZK3jtZ^5L+)@LqxQt}g~nZf(zA#C_kys=}c6^yOvk-r(3b~(st
z8Fi`twIo;;p>2t<UTJhtdkcoZ{a?RwDb;slY*(YN5^pL<k?IxYSiK8Spo;8d(C79G
zUpvd6+tvx+|8z4!8y<c9L!xB(bN(bFSl<W{Ov5V!cq#$jJZEAQ<qyN*N_+bsY4BRf
z66<=yj+xDAeuTah1=BF-XP_6rmMiHojkGjnS<Z`4Di4?_>oa|S^Cfdy57@cG#zg_-
z_;5-QLJRH>ngn1x+D7Hl+UX1%sE<9Ne*Hqn%e0!B6ZWC!PwYp~S61`+_mA%#D;r6=
zC_uEksnmM@*{@cKE|^v-pG*=?Wd_vs33sQZ1(;tt-X)EU(0)Bz-2EvmKh)(M=mXv4
z2=%1T=&KONUfYWJ8_t|~OD}?F&-`Ck3KkTk)IT4-#ITPLE6pw<j^XI2^TSNZSyeVr
zs8}ggj%?>%DtU^5V15+i6M9E|d4g%VX~>Y?Nab__rs@rY+!b?g--1L~TvXFPFhY<+
z%7Bu;%ZRvmf-lO-cKVZAigjrL%Ty00V<&vJ3G>dbH@#c#8*m`=K;w%)(7}4Y8B9cE
zKsZqaDdOVaUpKds(7e3=@@4b%$MWl|${!$jfwdbQl7DEx#bL#(^^?#^<`4`z@{nq;
zYKJ<h%{fESVocE6U1jfI)`aj1Qe!$$2E?s>e5l-dZv)((kV^k4&HLL=6zfh#E}w%5
z%QG;U$H)(*f@lCjJ*Fz*x88-zGqP=uMf<^oeMCTXrpVsD(@P4UT&aY2&epEyC0}&C
z<_2P&|2qc5ZfNYsp+r}DJ;BXQSIvUjE(uN(Y1M&hDxzeA%DmuJ{RKGs%J%l;y1=j;
zIpm1w1t`NTD<{j|{pF@KXA_yeX3unFMa6Dxe<57$UoV!_N)Cc?))#mSsJ*G&S{bi)
z^Y3q0Pzdqbms`{X6hPZ8ay5p_4~3g#NJ`H1^>15F9urcDNC}{>2lpB~o}aS-yKOfN
z?(TAduLFF+#e9GA(AfVX{!6~OQw|EVBN3MjG!kn79a?s0*s&Xz1Q5BKZUJ7*Lsj$#
z?arE~E|E;&;qV4-TL|1VV53=RT<zawZgTlrL$r$z4XqhcZ-k6~<=?_3Z$|)&xN&Wq
zif}TT69x`VNB><GZBT};#(G?@XQ$wJ`u0!sH0OxBHGx@h3*6uaB`<-(MeNYbz}~pa
zG^yKcVOH~Lg#MWuH{b;_jwn<j%rO_iL1&(mmOYu0L~71(FcNOq0)LqdJOzt3SL*s_
zK1A}ABU*&M_Fs&*?My5odNj0BhgWvo06REA`m(7ACUZBC?z_r-#p}szEo%DOvCsD<
z?epMji6BW+g$EeHsn>g%9U00A9x#g1e59{^kndl0^p=<wvIR{5&VddyfUC?z#X1gh
z9^$MU)6FgWeu!+w+?IaSGy#+X0Hq)-&vFQE5e1p+py$g>OUOSaEIN`zVyJg@8{`9I
zAb!(=5LtfzkssTpeGrkF-<yuSMrckhqt*y8BqxFLFg{Z*mZe6X*uznHyYv#(XHAm<
zCMvI5Rr~}b<m%=OJxv)9P2+w<f0HNh*`p)M3q-@YlTl-~m-r_Qf%~&(Zr_@_z6*-z
z*2s2MdK4tE>iCEtsaUhO*<@wSBBtR_142*R-UGPT^SOmW4<zhX$|L&D;`cFs*+=_k
zW*CgWayicRUl-qO2JDED`nR}^osjC}jFxfe(p%<%B#u`73($Ap!pWWgMp-jh*4=}l
zltI8F;Eby+FsJDI9=l8cJR$T^L?WQLIySTM$eLMB3&M}|cBS`=zHV%U-tPqHuUBXB
zHoB<<heb|=;Hsu---sy8V@yx?*7BNIPO0OK0HP3>M_}`5Fe&n)(csg|z+ME5*{5`~
zr|Us>Cvs0Be{dfo4cr(tZCbYh4NHU_;h5*U(RDoFEfUTD_mj}K@?JbG+6tHlFrYIL
zW8>K5sGLAHS3dY^OT;bU)1RBh7p#X}%1qD!I33A=_6hjB)-9>p^(6)5J|vhHxdTx$
zl4T2-*C3L4_5wD<4QB1toI}**iP~zRsV7Eof=y##mVa&NF?6^$F3ji&2TyWz14Jpe
z3x-zNWtx<6S&H)R7feXF>$AR2tawZ)IQ0%H|Iy-3|JgJol`z9MSd2gj_x!7rIT7|2
zPy_XWq4gn`gvgLH);UYto=!`m9Oq|csP~IHWy(yuC7kCUsmT>$8{u?GIgqzxy(;e1
z*e+M-%tv-p2F+11f<eKAp*KCGZqjUSjZr-yQV{g<##XJ-Er$S+Bxti;bE9v_f$W%z
zlSlEpb0^4g%lS_MVB=}Y)0ElmSqjKgA`RenEP{FFCH$$>j6^c#AutcIGgma5NaAd|
zctaq9cEi(w#P}<mlb{BHQP3rl$oi(OF<bX@08GN=+V}x;&3kmCJRmbAm4q2n!7|iG
zr2h~B5*cwmdI|LObj-YK^8Bdb?k%jDwePPcli0KqBNBd6W2*2&;-KHugcT%R<s|3n
z&gTcaF98+K)0-s^*2I<fK^$&67S4H?^ZHIq|6vJDDxtAmupc?fJ$OM%P*)0L)?EXY
zuV!~Fa9`~1ShIvUzM1nm<C`YpBVyhy;r_qTm~Sc%a@6lx<@!L;MN(HMPfsfc4BW1>
zn}p4#F6WZLk>aU@c4N?zKN>5J%;W^YEJ((0O0ie7H|YbCoSBXFzDO+(NwoHR5Q2t~
z`ZqL2c8U*dFWrH#Wtzq%0tW6=8r1<L)`$LNb^#F<=g@5pP(9{;sAN)F-VRM5fO8fj
zxH<J1HYnJfw%b>J@sS}CGX5?NG*t?CsbP#7T8~)fihTqWOGs0dK<wTI4$EC&Q-+G;
ze!RG8ye$vh^u=d^cOXz6jjiI#U&dd^SFo@4P$o`Q@6H9j&_A^qVVfoeqp&l0H$sQb
ztBhM!`<$Y<A``;Z*Sb<4`?O3+K{MZ<Lk;xXf1ULAHHIIodHly4jhtT|o5h|SD7QH6
z|2Jvrb;!iEMsi2=&6Q~k7Z6*_$-qoytt}L>Xk2+Y7|~XPd(x_Oe$pCGcCxtekY%@o
zh8)6l#CAgp>%<{tev)xD9Tg@Q)>{)<C?<NZ;gO>Ft)3DZgBwWo(PfKVwT>N{scADd
z%w6HRauz10HTFT_maBopgUdO5YWpQ~6kqe?n`rQ(4mQ32{}(?lyTI!zc>LYCP1ZW&
SRtNA8psQu5`SFfj%>Mw>2Z?V0

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..0306b0322ee61667012fe3e5abbe54fc28172552
GIT binary patch
literal 1553
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
DTv_9J

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..bea7b668e4e382d660af3815a683d925d52d0594
GIT binary patch
literal 2390
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
IM6N<$f;x+SXaE2J

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dc489bfb99f441d2c9b07a7732898663884cc12
GIT binary patch
literal 14664
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..edf7310010543ab673fcb7edf3478d966426558c
GIT binary patch
literal 3241
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
b00960OfSclv?Uml00000NkvXXu0mjfMT7o2

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/obsidian.desktop b/srcpkgs/obsidian/files/obsidian.desktop
new file mode 100644
index 000000000000..faf569631b21
--- /dev/null
+++ b/srcpkgs/obsidian/files/obsidian.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Obsidian
+Exec=/opt/Obsidian/obsidian %U
+Terminal=false
+Type=Application
+Icon=obsidian
+StartupWMClass=obsidian
+Comment=Obsidian
+MimeType=x-scheme-handler/obsidian;
+Categories=Office;
diff --git a/srcpkgs/obsidian/template b/srcpkgs/obsidian/template
new file mode 100644
index 000000000000..054d5509d3fd
--- /dev/null
+++ b/srcpkgs/obsidian/template
@@ -0,0 +1,36 @@
+# Template file for 'obsidian'
+pkgname=obsidian
+version=0.11.13
+revision=1
+archs="x86_64"
+wrksrc="obsidian-${version}"
+short_desc="Chat and VOIP application"
+maintainer="Hugo Melder <contact@nuntius.dev>"
+license="custom:Proprietary"
+homepage="https://obsidian.md"
+distfiles="https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"
+checksum=d102f5acfdfba6674874633d7876bb3df5b5195aef9f67d7e1b40fa90f053a92
+repository=nonfree
+restricted=yes
+nopie=yes
+
+do_install() {
+	local package_location="usr/lib/$pkgname" item
+	vmkdir usr/share
+	vcopy $FILESDIR/icons /usr/share
+	vmkdir usr/share/applications
+	vcopy $FILESDIR/obsidian.desktop /usr/share/applications/
+	vmkdir ${package_location}
+	chmod +x obsidian
+	for item in locales resources obsidian libffmpeg.so snapshot_blob.bin \
+	icudtl.dat libEGL.so libGLESv2.so chrome_100_percent.pak chrome_200_percent.pak \
+	chrome-sandbox resources.pak swiftshader v8_context_snapshot.bin \
+	libvk_swiftshader.so libvulkan.so; do
+		vcopy "${item}" "${package_location}"
+	done
+	vmkdir usr/bin
+	ln -sfr $DESTDIR/${package_location}/obsidian $DESTDIR/usr/bin/obsidian
+}
+post_install() {
+	vlicense $FILESDIR/LICENSE
+}
diff --git a/srcpkgs/obsidian/update b/srcpkgs/obsidian/update
new file mode 100644
index 000000000000..ed82c41bd17c
--- /dev/null
+++ b/srcpkgs/obsidian/update
@@ -0,0 +1,2 @@
+site="https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json"
+pattern="\"latestVersion\":\s*\"\K[\d.]+(?=\")"

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] New package: obsidian-0.11.13
  2021-04-18 11:45 [PR PATCH] New package: obsidian-0.11.13 DerNuntius
  2021-04-18 14:28 ` [PR PATCH] [Updated] " DerNuntius
@ 2021-04-30 20:32 ` DerNuntius
  2021-05-13 14:18 ` DerNuntius
  2021-05-13 14:19 ` [PR PATCH] [Closed]: " DerNuntius
  3 siblings, 0 replies; 5+ messages in thread
From: DerNuntius @ 2021-04-30 20:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]

There is an updated pull request by DerNuntius against master on the void-packages repository

https://github.com/DerNuntius/void-packages master
https://github.com/void-linux/void-packages/pull/30292

New package: obsidian-0.11.13
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/30292.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-30292.patch --]
[-- Type: text/x-diff, Size: 59017 bytes --]

From fb9a2326820af9efc273633bc2de98009e5b395a Mon Sep 17 00:00:00 2001
From: Nuntius <admin@nuntius.dev>
Date: Sun, 18 Apr 2021 13:24:07 +0200
Subject: [PATCH] New package: obsidian-0.11.13

---
 srcpkgs/obsidian/files/LICENSE                |   1 +
 .../icons/hicolor/128x128/apps/obsidian.png   | Bin 0 -> 6643 bytes
 .../icons/hicolor/16x16/apps/obsidian.png     | Bin 0 -> 737 bytes
 .../icons/hicolor/256x256/apps/obsidian.png   | Bin 0 -> 13026 bytes
 .../icons/hicolor/32x32/apps/obsidian.png     | Bin 0 -> 1553 bytes
 .../icons/hicolor/48x48/apps/obsidian.png     | Bin 0 -> 2390 bytes
 .../icons/hicolor/512x512/apps/obsidian.png   | Bin 0 -> 14664 bytes
 .../icons/hicolor/64x64/apps/obsidian.png     | Bin 0 -> 3241 bytes
 srcpkgs/obsidian/files/obsidian.desktop       |  10 +++++
 srcpkgs/obsidian/template                     |  36 ++++++++++++++++++
 srcpkgs/obsidian/update                       |   2 +
 11 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/obsidian/files/LICENSE
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/obsidian.desktop
 create mode 100644 srcpkgs/obsidian/template
 create mode 100644 srcpkgs/obsidian/update

diff --git a/srcpkgs/obsidian/files/LICENSE b/srcpkgs/obsidian/files/LICENSE
new file mode 100644
index 000000000000..2300567c2323
--- /dev/null
+++ b/srcpkgs/obsidian/files/LICENSE
@@ -0,0 +1 @@
+The current version of this license can be found at: https://obsidian.md/eula 
diff --git a/srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f23a08dc5d95965149978e4cf1677f4e317d873
GIT binary patch
literal 6643
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde9f6b77036ae1beefb1e539b32b128562ff9d1
GIT binary patch
literal 737
zcmV<70v`Q|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00080Nkl<Zc${QX
zO-~$05UuJS7D#5o0tqBptso&Nuu=deh$Od2$sdT6OQIYSCBGnvqU2`#Xd&5_eDK9W
z{sq4H;F~4;<_}~cu#II{K(<*}zSfI(rf0gUtZwh}p`BCp=+&!N?^OWJ@0-sqLjU`D
z5b;k00L{!cm+ORlZ}?rY_~E0kX2z@Q<q8ac^07z#_<IPdMPRM<eVZ@0u(PYv0c;Qi
zV{shM5z(!wFUKwvijm~=k#_jFk@~(Pg64<w8~+Lu4FJF_0L(M<Z-EXtm+SbYT1kE_
z6#LyItpjyTFg-jAh=|q_42A!_6UWJIMEu(r(_JWhM5WR=te1DWcF?%2l=>6^SZk$D
zDG(7IMWOWf_Whj1=5uB?qoX4-H8r8#xWjtF8*BSL3-iy<Irzrfp6?A#$fqa@6)OBo
zL}YUEi;ls80W>BBcFqa_5lh`9H3zQ0N=|v;jFF|q$3Fo;$w`dDNF_-MmKc}>tYt@l
zBJj|;FAS#$Tx`HB-z%l0(THWWybgd0$a1S$xtc65|NrNrS96lUKM?V%m!q}X+N!`|
z{k5M&mW3=UOKdE0d2(jR|2s)Qu1*qjS48f(L`-U^QrQF%1Zzp$DrEVE&1mz3!LUt%
zud~b_$0cS)tu$13wxQ98ff>ZhCway!_U82kB?4^()YsRGM0^7PRzyIhsbNO~f@0t9
z|0D>s^F%3)$0pui`^Wo0#9C{eipUkGLMff@?QL_C7?*@tqNSD9r`}kXOxr0VBE1`S
zW0qytl)^e9cA3nm{ev9^ppYyrH`9{ya}(_Z)>?_)3n7WqY7ppeMdYkPd{C?Jsw^|B
zfOt<poOV7ku2nSG00fktp2&fg0N_k%<m+i`vmf?r)jwFc0pf2)T77Q<00960{UVcZ
T40Dqb00000NkvXXu0mjfExuZt

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..5662efa89974184dc76b3fbb00ec90c558d5d537
GIT binary patch
literal 13026
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
SRtNA8psQu5`SFfj%>Mw>2Z?V0

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..0306b0322ee61667012fe3e5abbe54fc28172552
GIT binary patch
literal 1553
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
DTv_9J

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..bea7b668e4e382d660af3815a683d925d52d0594
GIT binary patch
literal 2390
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
IM6N<$f;x+SXaE2J

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dc489bfb99f441d2c9b07a7732898663884cc12
GIT binary patch
literal 14664
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..edf7310010543ab673fcb7edf3478d966426558c
GIT binary patch
literal 3241
zcmV;a3|8}rP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000bdNkl<Zc%0N*
zeT-aH+5eq$@9s=@+iqz~d3pQwhL5)UwxwlTD7?uF0p&v?Ac`ggqliYq5I_;535fwU
z_76}SDpmxF;`c}3FXRv7M`AD#)Dld~riyf_`_<jq-I@KEnS1Yf%sKa*J7@0PncbPW
zQ|pu6`8adu-t+vP-}80O9T#Vi+_3Li^_<Vo!gU<JY4d-xd+xtUTzU<o-#kya`WBY@
zHO~kDjN)2YU*8HoTbK*v8^-~D@l>A8&zI==!?U>MW6M*$Hc$0zO^Q_9Ql4ppP!I%x
z5Mm1$p8M+?V^;)$py89_jyy<$kf!`w7!b3#6serFxDVhQ$8jFaWHWbh#(Gz+T6sya
zSRPo}x4fi5N|gzxodGfB9j%m9ei?wz0yqNT0S4CVb~z=^+19Qu=dnztJJ83cDyI#A
z7~Q#Lbpmi3fIk6v48VU$CJ+&2vzZL%T(aUW0PocdN!1lP4nTsRO9g~h{%Qcf2k;{R
z{RR-m;1Y;smu0{h<3tLi?*cem1E%Jk1_&LC0rAML75BB07Xf$(zz6l`fpttM1T4#D
z<S5slOJ*Db@Buw<k;XhzXF$y2&`Ob3em#H#0AAI~lUB~DnF|B55&(+MA;15A0C(!w
z%6RRvAXNYo6o*!D1%NN;0Cz8dOrq5-VT>V@?FJEnvFLo#>fZ!#o(7?9S4a(jE4M$P
zo~Nf~SP%r<Qt%EP;JyZ6t)4hFQe248>^(hMqdZIs)L<Ug@40?%SyBOD@BcgsGgIz3
zq%CzlfS2`TFSHbQ>rGlJ@B69%#K6Es2s{_3#`55tsehu#6|T^XYC9{W#sJP4E0xMT
z)7^a*=llf#zXEWXW`by>IJENRvWMQ@9$a?$CD^oS1IlF|<6{M!9Gb%Xd>M|*CC(0!
zI_D!2r*=U|4S?c8(V3r{7x{eQ?jQ(mW{i1S@!9~FAmwry=bn2GF8{wv(6@3Wip5em
zL5E>s-owcgQy3ebK@bpgTppIqgzqtitUiSTw^<O{20+mtV4mj(M6_H8@o8DhFGX=_
zbs6O3;aj#`fIWM5!*yJEo~J(pNQB2p?Q)ZIIPumbrgQV0bLMl0?GS?YcW2yyai&;6
z)ZF~jVt^AiG2(U*)(3tdsk*50zVE|v91INX!q%-9s`nvwq4M&9%)jakIXo}G@X09*
z{UhfV7d+o}o%_6UaP6MUdXy_jH#zw5J4>E;TZNFZzV`DjBKnM+yXOb2ktK}3uUfSd
zyLRosiWMtRDwWlEsC?zi(Mt^iRJ`FR6pEOgE%7yLdui>u6;J1<aZ&H`?DYIxi3MWm
zJV>JwG?Dox09z#(zVADfFb6|<>F*mhtjG54+oZ`97*h9I#mW5XLHQTH(^-L!jTC~}
zLTN*8V)mftdmnb)F6kb@QYYWC3ux;@2RdoG2g5p^K?FkmGdqbhhCq%Bf&Tuj*tKgX
zq-Xn{S5cV4X9^#}*Qkt<8Pl;rzIR>5=I6>ZHd45>ToUY=LoWx#1#iiEw95d~(Om^#
zpNaZXNk0hSxK5<J^zTe2gPl9KW8J#7D3{71ZaUaCvUcJ)Md%C0nG2%V8E4|g_w96=
zVL(d&Sk^c5`n>&KD&%`Uve|B>q@?_sHLI2KJv}|4ze`^?2U`k8VAzW52Wl_|U{C}k
zt4L-l$)!j;S-><o7X!G~%K6G4q{XE&(!V!v-h{n-2awHX)q54_kWBMvOjy*1MSYVU
z^qA!~NAG`RvwHpD{_~csMAHngtPc&q0~*MvIgtoR0OZFzcJyP@rj3db0g38hXVJV8
z?NMv(dgI}PqmLPU_}(`SES&>D3)dDuAHc2g=0^Iw=lSUG@5jcC>t&S~^$L;Img4iZ
zG_SZ#<ty^Uc_N%(VY}4SIzdw|U|HXEX7ScG0zeit`I$UqQ50FtE^I6%%@`J^dBsJ-
zanj!%5)@2?*fht0R$_p${yG33O=@lB9At$z^v+4l&o4yzzs8T_sm&;uq_`ai5P>H2
z*m2+UNeCp?ADsX|Ugc8&`r_6%B9$%{i}>g8FdXiLJ^m7cnw{fokJU^O77Ice9P92@
zizm#kJvspZ)4{G6z}@x&Wn4lQa10NRV18i%jMrg742-z76I}!rgM>Qf=$9Vfran;5
z9R$Eo{SyGr)vi$Y9E@?rf|22oS{5{*J|)Eq9r0pgj{er*Lw6l*Is>!<fVsfCwDR>Y
zD48mq(s3|6GNSr>6AKyywTiWo6fdl}5Dv<wD^DWK0Muj#XaxWxPwDU0{k~ck69U}f
z$^}NpMim%xtU*vq04Kpkh!7o47-E7=DDR{O21yA3)A+my;7$FyF6u@hhjWaKjG$C5
zR~9<z1hopyQ8iWz1_?cWoP7CCIL)iynhTir_lZRT5TT`|<>%(+Fg`vG&fN+Nl7d<_
z&8w7#HD=We$Iz{wSu5+qt+;?mdp`s)Y4rqE!VInTGgmAaR?A&x#U~-C)datKV1(&X
zjUD~+q5oB%$>)v&@Y>s-gT;azfFD>ZLNy2os?@rY1+%lWn3y<a#e!-D>juQC@dzMC
zA2#^KkH1k>Rd);kOH3^IHUO{QCP%y~Q!E%A(Tx&IRJ_L8sLcc#8+n2}5uMN-R!e(@
z?EoOZJE+(HO@UMmfUuXiNVA}TTrQ{T0$IDp+uj-$gfxe!21EA%7@`2W2RKa(&~9MM
zfqLh%bGi|k1x81Q5r{xFa#hwA34KBh1JtoX<8VCiWCDm<;-;mY1rZYre+S?%NwFZV
zykS9pHjk;PDU}{cP)&rdNBycAA^hGkx0{7M!080QVu9JQJs59@m}T9#$OFg5M^tG{
zjY?yx6t_vOGyzBVKeJPPzW?c+t*FxW#)x6T&jE~BfP{sasEy5GN_3IW&tPU|8eGPL
z$ing3zZM*Q4o8DD_`pYwG`$93OUnSnQer{x0wZ1+sU@2jLCvz**r}0Z%U07o&H{Bx
z)dNuLJ%Eukw#LlGp9HXA7e-;bT5Fsr7UZW<DC8{`P(0mLz^Q-{tpZWtO+*)JQPKiH
zDt!XL3-MrBZ<os42r)h}YQ=#XYbTY<La&1yCr?P*w{`1WTL2`a#K-OPCZ$0mh6OV-
zQ<$48RIwl)2kLZ%$5?ll$^h-?kk;;SpwIP3eOHLNMW!J;Lly{}nivBRV?pAYp*0R1
zeeAi56+n-Ee|O6hZyNxM1?F6j+n+ZAAYws&N_C5j@u~s{@dhbeLvS=0gZJI`=awtL
z_@vVilM-bdcw5E=Rk2m>@=6r5gg%)Y4{L|S&M*Rl6y<dfpjVjMx?eCA0AeYzs51go
z3|wTN&ahxQpTk0NLERTwqj<CiK*kG(C}0!e3C<h_z)FdSb#34*ihyB(?;|%g9@|5x
zi2*{79rpv-1BjM;03)3MK(b(zG5nM<S+LNeTh$Q@W^yQ&iWOH#XoR#Y9P4t!RiJi%
zLy{T*v6RRd<KGHh086rxx`!a}Fg1ND3Wl})fC;K}^uSLB6#ozWc%ZF$cj9hw6%2C|
z(?^Ktw?ra&#V97KM_?Q?`5a2+l45~~tp<lZK$rpU`Os@^X8@!PfSnROuPk%?0ee|&
z(aA6l&o5(UW-?@fsHz1>XPLaNI+4a5<DL4wfWNi>0yaJ|{t|#e9lRI4aYyQ?SWuWm
z*(=AJC<EgV5Uv6>+?ZLSqz-^#f#>^9x#)Y2<2*q`E`Tn5h~LO^iUnQ?`Ft*9K}AQi
z6ZKZoj&!Tiu^&vhjuUL(v5oaCTXvW+wi>|A0Cro~B&&pu3=y`^9Qnc|`c|%1ueC61
zIX*Q>|Cfkb-o5)tbZ5HN>#!PBm)Zy5763N_uov-#wb06C01SkWb!#_ZRo^=KI$%&p
zybfTG29FN@Y;W81?D%hn78Z)kvid9fHuqfs{vW_M0Q^nQ!!<Ww5XfhY(R6+iLilFO
zM?QRIu^s7VrDFj6`p75M^Ri`GVvPCL^;{hX{-A#*w^I^EZ?&B;$8hGba(O`%W~a-X
zJDiA)=strlC9N)1I_3g#N%#>JPuNfB1#qSQVbpa*Vtsd478}=Zku11%rZD--l`B@O
zn={j(KTanAw$uRwwq*&_$H1>561ShdX8l<=U3blOho1Y6*mnM2l@|V^0kEY$7_x_8
zs+NA~)jKiq3gJDse---%u1`&QoC&`kfAN(&qSrU<dzLCJP-(+)xU0s#{^Z{~a{Ye=
b00960OfSclv?Uml00000NkvXXu0mjfMT7o2

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/obsidian.desktop b/srcpkgs/obsidian/files/obsidian.desktop
new file mode 100644
index 000000000000..faf569631b21
--- /dev/null
+++ b/srcpkgs/obsidian/files/obsidian.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Obsidian
+Exec=/opt/Obsidian/obsidian %U
+Terminal=false
+Type=Application
+Icon=obsidian
+StartupWMClass=obsidian
+Comment=Obsidian
+MimeType=x-scheme-handler/obsidian;
+Categories=Office;
diff --git a/srcpkgs/obsidian/template b/srcpkgs/obsidian/template
new file mode 100644
index 000000000000..054d5509d3fd
--- /dev/null
+++ b/srcpkgs/obsidian/template
@@ -0,0 +1,36 @@
+# Template file for 'obsidian'
+pkgname=obsidian
+version=0.11.13
+revision=1
+archs="x86_64"
+wrksrc="obsidian-${version}"
+short_desc="Chat and VOIP application"
+maintainer="Hugo Melder <contact@nuntius.dev>"
+license="custom:Proprietary"
+homepage="https://obsidian.md"
+distfiles="https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"
+checksum=d102f5acfdfba6674874633d7876bb3df5b5195aef9f67d7e1b40fa90f053a92
+repository=nonfree
+restricted=yes
+nopie=yes
+
+do_install() {
+	local package_location="usr/lib/$pkgname" item
+	vmkdir usr/share
+	vcopy $FILESDIR/icons /usr/share
+	vmkdir usr/share/applications
+	vcopy $FILESDIR/obsidian.desktop /usr/share/applications/
+	vmkdir ${package_location}
+	chmod +x obsidian
+	for item in locales resources obsidian libffmpeg.so snapshot_blob.bin \
+	icudtl.dat libEGL.so libGLESv2.so chrome_100_percent.pak chrome_200_percent.pak \
+	chrome-sandbox resources.pak swiftshader v8_context_snapshot.bin \
+	libvk_swiftshader.so libvulkan.so; do
+		vcopy "${item}" "${package_location}"
+	done
+	vmkdir usr/bin
+	ln -sfr $DESTDIR/${package_location}/obsidian $DESTDIR/usr/bin/obsidian
+}
+post_install() {
+	vlicense $FILESDIR/LICENSE
+}
diff --git a/srcpkgs/obsidian/update b/srcpkgs/obsidian/update
new file mode 100644
index 000000000000..ed82c41bd17c
--- /dev/null
+++ b/srcpkgs/obsidian/update
@@ -0,0 +1,2 @@
+site="https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json"
+pattern="\"latestVersion\":\s*\"\K[\d.]+(?=\")"

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] New package: obsidian-0.11.13
  2021-04-18 11:45 [PR PATCH] New package: obsidian-0.11.13 DerNuntius
  2021-04-18 14:28 ` [PR PATCH] [Updated] " DerNuntius
  2021-04-30 20:32 ` DerNuntius
@ 2021-05-13 14:18 ` DerNuntius
  2021-05-13 14:19 ` [PR PATCH] [Closed]: " DerNuntius
  3 siblings, 0 replies; 5+ messages in thread
From: DerNuntius @ 2021-05-13 14:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]

There is an updated pull request by DerNuntius against master on the void-packages repository

https://github.com/DerNuntius/void-packages master
https://github.com/void-linux/void-packages/pull/30292

New package: obsidian-0.11.13
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/30292.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-30292.patch --]
[-- Type: text/x-diff, Size: 924679 bytes --]

From fb9a2326820af9efc273633bc2de98009e5b395a Mon Sep 17 00:00:00 2001
From: Nuntius <admin@nuntius.dev>
Date: Sun, 18 Apr 2021 13:24:07 +0200
Subject: [PATCH 001/447] New package: obsidian-0.11.13

---
 srcpkgs/obsidian/files/LICENSE                |   1 +
 .../icons/hicolor/128x128/apps/obsidian.png   | Bin 0 -> 6643 bytes
 .../icons/hicolor/16x16/apps/obsidian.png     | Bin 0 -> 737 bytes
 .../icons/hicolor/256x256/apps/obsidian.png   | Bin 0 -> 13026 bytes
 .../icons/hicolor/32x32/apps/obsidian.png     | Bin 0 -> 1553 bytes
 .../icons/hicolor/48x48/apps/obsidian.png     | Bin 0 -> 2390 bytes
 .../icons/hicolor/512x512/apps/obsidian.png   | Bin 0 -> 14664 bytes
 .../icons/hicolor/64x64/apps/obsidian.png     | Bin 0 -> 3241 bytes
 srcpkgs/obsidian/files/obsidian.desktop       |  10 +++++
 srcpkgs/obsidian/template                     |  36 ++++++++++++++++++
 srcpkgs/obsidian/update                       |   2 +
 11 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/obsidian/files/LICENSE
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/obsidian.desktop
 create mode 100644 srcpkgs/obsidian/template
 create mode 100644 srcpkgs/obsidian/update

diff --git a/srcpkgs/obsidian/files/LICENSE b/srcpkgs/obsidian/files/LICENSE
new file mode 100644
index 000000000000..2300567c2323
--- /dev/null
+++ b/srcpkgs/obsidian/files/LICENSE
@@ -0,0 +1 @@
+The current version of this license can be found at: https://obsidian.md/eula 
diff --git a/srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f23a08dc5d95965149978e4cf1677f4e317d873
GIT binary patch
literal 6643
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde9f6b77036ae1beefb1e539b32b128562ff9d1
GIT binary patch
literal 737
zcmV<70v`Q|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00080Nkl<Zc${QX
zO-~$05UuJS7D#5o0tqBptso&Nuu=deh$Od2$sdT6OQIYSCBGnvqU2`#Xd&5_eDK9W
z{sq4H;F~4;<_}~cu#II{K(<*}zSfI(rf0gUtZwh}p`BCp=+&!N?^OWJ@0-sqLjU`D
z5b;k00L{!cm+ORlZ}?rY_~E0kX2z@Q<q8ac^07z#_<IPdMPRM<eVZ@0u(PYv0c;Qi
zV{shM5z(!wFUKwvijm~=k#_jFk@~(Pg64<w8~+Lu4FJF_0L(M<Z-EXtm+SbYT1kE_
z6#LyItpjyTFg-jAh=|q_42A!_6UWJIMEu(r(_JWhM5WR=te1DWcF?%2l=>6^SZk$D
zDG(7IMWOWf_Whj1=5uB?qoX4-H8r8#xWjtF8*BSL3-iy<Irzrfp6?A#$fqa@6)OBo
zL}YUEi;ls80W>BBcFqa_5lh`9H3zQ0N=|v;jFF|q$3Fo;$w`dDNF_-MmKc}>tYt@l
zBJj|;FAS#$Tx`HB-z%l0(THWWybgd0$a1S$xtc65|NrNrS96lUKM?V%m!q}X+N!`|
z{k5M&mW3=UOKdE0d2(jR|2s)Qu1*qjS48f(L`-U^QrQF%1Zzp$DrEVE&1mz3!LUt%
zud~b_$0cS)tu$13wxQ98ff>ZhCway!_U82kB?4^()YsRGM0^7PRzyIhsbNO~f@0t9
z|0D>s^F%3)$0pui`^Wo0#9C{eipUkGLMff@?QL_C7?*@tqNSD9r`}kXOxr0VBE1`S
zW0qytl)^e9cA3nm{ev9^ppYyrH`9{ya}(_Z)>?_)3n7WqY7ppeMdYkPd{C?Jsw^|B
zfOt<poOV7ku2nSG00fktp2&fg0N_k%<m+i`vmf?r)jwFc0pf2)T77Q<00960{UVcZ
T40Dqb00000NkvXXu0mjfExuZt

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..5662efa89974184dc76b3fbb00ec90c558d5d537
GIT binary patch
literal 13026
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
SRtNA8psQu5`SFfj%>Mw>2Z?V0

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..0306b0322ee61667012fe3e5abbe54fc28172552
GIT binary patch
literal 1553
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
DTv_9J

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..bea7b668e4e382d660af3815a683d925d52d0594
GIT binary patch
literal 2390
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
IM6N<$f;x+SXaE2J

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dc489bfb99f441d2c9b07a7732898663884cc12
GIT binary patch
literal 14664
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..edf7310010543ab673fcb7edf3478d966426558c
GIT binary patch
literal 3241
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
b00960OfSclv?Uml00000NkvXXu0mjfMT7o2

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/obsidian.desktop b/srcpkgs/obsidian/files/obsidian.desktop
new file mode 100644
index 000000000000..faf569631b21
--- /dev/null
+++ b/srcpkgs/obsidian/files/obsidian.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Obsidian
+Exec=/opt/Obsidian/obsidian %U
+Terminal=false
+Type=Application
+Icon=obsidian
+StartupWMClass=obsidian
+Comment=Obsidian
+MimeType=x-scheme-handler/obsidian;
+Categories=Office;
diff --git a/srcpkgs/obsidian/template b/srcpkgs/obsidian/template
new file mode 100644
index 000000000000..054d5509d3fd
--- /dev/null
+++ b/srcpkgs/obsidian/template
@@ -0,0 +1,36 @@
+# Template file for 'obsidian'
+pkgname=obsidian
+version=0.11.13
+revision=1
+archs="x86_64"
+wrksrc="obsidian-${version}"
+short_desc="Chat and VOIP application"
+maintainer="Hugo Melder <contact@nuntius.dev>"
+license="custom:Proprietary"
+homepage="https://obsidian.md"
+distfiles="https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"
+checksum=d102f5acfdfba6674874633d7876bb3df5b5195aef9f67d7e1b40fa90f053a92
+repository=nonfree
+restricted=yes
+nopie=yes
+
+do_install() {
+	local package_location="usr/lib/$pkgname" item
+	vmkdir usr/share
+	vcopy $FILESDIR/icons /usr/share
+	vmkdir usr/share/applications
+	vcopy $FILESDIR/obsidian.desktop /usr/share/applications/
+	vmkdir ${package_location}
+	chmod +x obsidian
+	for item in locales resources obsidian libffmpeg.so snapshot_blob.bin \
+	icudtl.dat libEGL.so libGLESv2.so chrome_100_percent.pak chrome_200_percent.pak \
+	chrome-sandbox resources.pak swiftshader v8_context_snapshot.bin \
+	libvk_swiftshader.so libvulkan.so; do
+		vcopy "${item}" "${package_location}"
+	done
+	vmkdir usr/bin
+	ln -sfr $DESTDIR/${package_location}/obsidian $DESTDIR/usr/bin/obsidian
+}
+post_install() {
+	vlicense $FILESDIR/LICENSE
+}
diff --git a/srcpkgs/obsidian/update b/srcpkgs/obsidian/update
new file mode 100644
index 000000000000..ed82c41bd17c
--- /dev/null
+++ b/srcpkgs/obsidian/update
@@ -0,0 +1,2 @@
+site="https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json"
+pattern="\"latestVersion\":\s*\"\K[\d.]+(?=\")"

From 13ff046bd91c0b0f8fa0399d9a29e69d6b28b3c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:10:44 -0400
Subject: [PATCH 002/447] python3-virtualenv: update to 20.4.4.

---
 srcpkgs/python3-virtualenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 44a63a2f74e3..65a094f1d0a1 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.4.2
+version=20.4.4
 revision=1
 wrksrc="virtualenv-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://virtualenv.pypa.io/"
 changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=147b43894e51dd6bba882cf9c282447f780e2251cd35172403745fc381a0a80d
+checksum=09c61377ef072f43568207dc8e46ddeac6bcdcaf288d49011bda0e7f4d38c4a2
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
 do_check() {

From 36fee677656fd644e581ffc39c6f0c76c285383f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:13:49 -0400
Subject: [PATCH 003/447] python-urllib3: update to 1.26.4.

---
 srcpkgs/python-urllib3/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template
index 4888a2760953..430c93c8e557 100644
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@@ -1,17 +1,20 @@
 # Template file for 'python-urllib3'
 pkgname=python-urllib3
-version=1.26.3
+version=1.26.4
 revision=1
 wrksrc="urllib3-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-six"
+checkdepends="python-pytest python3-pytest python-six python3-six"
 short_desc="HTTP library with thread-safe connection pooling (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://urllib3.readthedocs.io/"
 distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz"
-checksum=de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73
+checksum=e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937
+# Checks depend on unpackaged "trustme"
+make_check=no
 
 post_install() {
 	for sitelib in ${py3_sitelib} ${py2_sitelib}; do

From 26b46dc3cc1096db51ab9f099491a0fabcb69994 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:16:38 -0400
Subject: [PATCH 004/447] python-lxml: update to 4.6.3.

---
 srcpkgs/python-lxml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template
index eec5e36d0bf3..8095f7c7e40f 100644
--- a/srcpkgs/python-lxml/template
+++ b/srcpkgs/python-lxml/template
@@ -1,6 +1,6 @@
 # Template file for 'python-lxml'
 pkgname=python-lxml
-version=4.6.2
+version=4.6.3
 revision=1
 wrksrc="lxml-lxml-${version}"
 build_style=python-module
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause, custom:ElementTree"
 homepage="https://lxml.de/"
 distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
-checksum=31eff968b5fb7f0dc6f2dedff071f179c17df5ada2c3fd613f79a5f14a94490a
+checksum=5955ed615b7be9407d9eab83edde8f1818c94224d762d1d6355bf0371f220bd6
 
 do_check() {
 	cp -f build-3.*/lib.linux-*/lxml/*.so src/lxml

From ced7406d2884d2717632f7f4644b357c1ad96353 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:21:02 -0400
Subject: [PATCH 005/447] khal: update to 0.10.3.

---
 srcpkgs/khal/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 361776c7bfb5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,18 +1,19 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.2
-revision=2
+version=0.10.3
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-click python3-click-log python3-configobj
  python3-dateutil python3-icalendar python3-pytz python3-tzlocal
  python3-urwid python3-xdg python3-atomicwrites"
+checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
 short_desc="Command-line calendar build around CalDAV"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=494f215c3d1cb7a1f8d756b440809d255bd20e2937f98bd0b5d44e42d4cb1087
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \

From c185c58b0252e2c93023fd1dd815cabf6cb376f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:23:01 -0400
Subject: [PATCH 006/447] python3-josepy: update to 1.8.0.

---
 srcpkgs/python3-josepy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index dc4c6602ac97..048606e2d7c7 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
-version=1.7.0
+version=1.8.0
 revision=1
 wrksrc="josepy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-cryptography python3-openssl python3-setuptools python3-six"
-checkdepends="python3-pytest python3-mock $depends"
+checkdepends="python3-pytest-flake8 python3-mock $depends"
 short_desc="JOSE protocol implementation in Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/josepy"
 distfiles="${PYPI_SITE}/j/josepy/josepy-${version}.tar.gz"
-checksum=d265414fa16d7a8b7a1d1833b4ebb19a22bd0deae5d44413cf9040fd8491d85a
+checksum=a5a182eb499665d99e7ec54bb3fe389f9cbc483d429c9651f20384ba29564269
 
 pre_check() {
 	vsed -e '/addopts/d' -i pytest.ini

From eb6d8335904483fe5ad63932ebff18195c2ca324 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:25:20 -0400
Subject: [PATCH 007/447] python3-hyperframe: update to 6.0.1.

---
 srcpkgs/python3-hyperframe/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hyperframe/template b/srcpkgs/python3-hyperframe/template
index 4c3eca278d8a..172c3ba23ccc 100644
--- a/srcpkgs/python3-hyperframe/template
+++ b/srcpkgs/python3-hyperframe/template
@@ -1,17 +1,22 @@
 # Template file for 'python3-hyperframe'
 pkgname=python3-hyperframe
-version=6.0.0
+version=6.0.1
 revision=1
 wrksrc=hyperframe-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Pure-Python HTTP/2 framing (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://python-hyper.org/hyperframe/"
 distfiles="https://github.com/python-hyper/hyperframe/archive/v${version}.tar.gz"
-checksum=85f749fcb81630cc10e770af970b6b31be64de204c6cae852fc0f06b685e9d96
+checksum=a126e1e0fb24135aa7ac53cefe11ad197d0c9a5e74f495c1236022b1e578a7a8
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest
+}
 
 post_install() {
 	vlicense LICENSE

From fcb6fa497896e7df4b172c6e4c3b7ef0a92da33b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:26:29 -0400
Subject: [PATCH 008/447] python3-ConfigArgParse: update to 1.4.

---
 srcpkgs/python3-ConfigArgParse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ConfigArgParse/template b/srcpkgs/python3-ConfigArgParse/template
index ccd04b6a3dba..2132e58fe20a 100644
--- a/srcpkgs/python3-ConfigArgParse/template
+++ b/srcpkgs/python3-ConfigArgParse/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ConfigArgParse'
 pkgname=python3-ConfigArgParse
-version=1.3
+version=1.4
 revision=1
 wrksrc="ConfigArgParse-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/bw2/ConfigArgParse"
 distfiles="${PYPI_SITE}/C/ConfigArgParse/ConfigArgParse-${version}.tar.gz"
-checksum=0428b975ab6c48bb101ccb732e1b5cb616296e28268e032aa806f32b647a1cc1
+checksum=abef9ff44fb0091f0e3bb2ee7e5b26a02b5b62d45408a5272a9bd461f5b59b4b
 
 post_install() {
 	vlicense LICENSE

From 226af66fe7396ab20944db6cd93154c64ddebafa Mon Sep 17 00:00:00 2001
From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com>
Date: Fri, 30 Apr 2021 19:47:35 +0000
Subject: [PATCH 009/447] lollypop: update to 1.4.19

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 1c38cb23aea4..a294bdb652a2 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.16
+version=1.4.19
 revision=1
 build_style=meson
 hostmakedepends="cmake git glib-devel gobject-introspection intltool itstool pkg-config"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
-checksum=7384c57e4f8922c8e5e3b4b2a93e4bc15cc019579fdf1f99d0c42555e1238222
+checksum=38bc38181e93ad989cb42d8efb2b8dc96223486eb200863d81f3a0b7573e3830

From 9309b445a14e62daf690ed392745600f9d20442e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 1 May 2021 01:21:40 +0200
Subject: [PATCH 010/447] thermald: update to 2.4.4.

---
 srcpkgs/thermald/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index ecc17f3f7e32..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.2
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=02deb2127934eec036771ec4028c106fb156d85784f58ac6e9906f7aa142793c
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then

From 025ffa91f32df87badd14d8f01971fd7f79d7989 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 1 May 2021 01:25:18 +0200
Subject: [PATCH 011/447] terraform: update to 0.15.1.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index ee187a2a91cb..3533faa5ffc3 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=0.15.0
+version=0.15.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=89e1d82ee6f02bb9c280f1d9ab0c0edc6061c4442bf43af0f4e4f1001730188e
+checksum=ec4926ff56952ddc43d15523ea7c359e260139d33d938057b19ff05b695722cd

From 89423a636e9d1b343f62ba7749caa840110a220b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 1 May 2021 01:27:59 +0200
Subject: [PATCH 012/447] terragrunt: update to 0.29.1.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 45f0b1a575b8..8cdce268b452 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.28.7
+version=0.29.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=e84d4ade9ffbc1ca9e0a2b9cf594915a9515d331cfcc65f78b6c36b0cb3b53cc
+checksum=f33da3e49d3d6b8cb989a07961c2192026bc9475e2a839070ee013c4dbc19f37
 
 post_install() {
 	vlicense LICENSE.txt

From 568bc837cd8f48d57b806045fda2bd0dcaaacdb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Apr 2021 22:53:14 +0700
Subject: [PATCH 013/447] mozc: update to 2.26.4353.100.

---
 srcpkgs/fcitx5-mozc                           |   1 +
 srcpkgs/mozc/patches/abseil.patch             |  73 ++++
 srcpkgs/mozc/patches/cross.patch              |  10 +-
 srcpkgs/mozc/patches/cxx-stdlib.patch         |  29 ++
 .../default_hiragana_from_environment.patch   |  20 --
 srcpkgs/mozc/patches/fcitx.patch              |  13 +
 srcpkgs/mozc/patches/no-parallel.patch        |   6 +-
 srcpkgs/mozc/patches/protobuf-370.patch       | 327 ------------------
 srcpkgs/mozc/patches/unsigned-int.patch       | 210 +++++++++++
 srcpkgs/mozc/template                         | 109 ++++--
 srcpkgs/mozc/update                           |   2 +
 11 files changed, 409 insertions(+), 391 deletions(-)
 create mode 120000 srcpkgs/fcitx5-mozc
 create mode 100644 srcpkgs/mozc/patches/abseil.patch
 create mode 100644 srcpkgs/mozc/patches/cxx-stdlib.patch
 delete mode 100644 srcpkgs/mozc/patches/default_hiragana_from_environment.patch
 create mode 100644 srcpkgs/mozc/patches/fcitx.patch
 delete mode 100644 srcpkgs/mozc/patches/protobuf-370.patch
 create mode 100644 srcpkgs/mozc/patches/unsigned-int.patch
 create mode 100644 srcpkgs/mozc/update

diff --git a/srcpkgs/fcitx5-mozc b/srcpkgs/fcitx5-mozc
new file mode 120000
index 000000000000..6874ca426b5f
--- /dev/null
+++ b/srcpkgs/fcitx5-mozc
@@ -0,0 +1 @@
+mozc
\ No newline at end of file
diff --git a/srcpkgs/mozc/patches/abseil.patch b/srcpkgs/mozc/patches/abseil.patch
new file mode 100644
index 000000000000..22510299dc9f
--- /dev/null
+++ b/srcpkgs/mozc/patches/abseil.patch
@@ -0,0 +1,73 @@
+
+Ported from grpc's patches
+
+An all-in-one patch that fixes several issues:
+
+1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
+2) powerpc stacktrace implementation only works on glibc (disabled on musl)
+3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
+4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
+
+--- mozc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ mozc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- mozc/src/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
++++ mozc/src/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
+@@ -27,6 +27,10 @@
+ #include <csignal>
+ #include <cstdio>
+ 
++#if defined(__powerpc__)
++#include <asm/ptrace.h>
++#endif
++
+ #include "absl/base/attributes.h"
+ #include "absl/base/internal/raw_logging.h"
+ #include "absl/base/macros.h"
+@@ -55,8 +59,10 @@
+     return reinterpret_cast<void*>(context->uc_mcontext.pc);
+ #elif defined(__powerpc64__)
+     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
+-#elif defined(__powerpc__)
++#elif defined(__powerpc__) && defined(__GLIBC__)
+     return reinterpret_cast<void*>(context->uc_mcontext.regs->nip);
++#elif defined(__powerpc__)
++    return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->nip);
+ #elif defined(__riscv)
+     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
+ #elif defined(__s390__) && !defined(__s390x__)
+--- mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -64,7 +64,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
++++ mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
+@@ -130,8 +130,13 @@
+         StacktracePowerPCGetLR(new_sp) == kernel_sigtramp_rt64_address) {
+       const ucontext_t* signal_context =
+           reinterpret_cast<const ucontext_t*>(uc);
++#if defined(__powerpc64__)
+       void **const sp_before_signal =
+           reinterpret_cast<void**>(signal_context->uc_mcontext.gp_regs[PT_R1]);
++#else
++      void **const sp_before_signal =
++          reinterpret_cast<void**>(signal_context->uc_mcontext.uc_regs->gregs[PT_R1]);
++#endif
+       // Check that alleged sp before signal is nonnull and is reasonably
+       // aligned.
+       if (sp_before_signal != nullptr &&
diff --git a/srcpkgs/mozc/patches/cross.patch b/srcpkgs/mozc/patches/cross.patch
index 17d47a900eb9..d73c5f82b430 100644
--- a/srcpkgs/mozc/patches/cross.patch
+++ b/srcpkgs/mozc/patches/cross.patch
@@ -1,7 +1,9 @@
---- mozc/src/gyp/common.gypi
+Index: mozc/src/gyp/common.gypi
+===================================================================
+--- mozc/src/gyp/common.gypi.orig
 +++ mozc/src/gyp/common.gypi
-@@ -444,12 +444,12 @@
-     }],
+@@ -409,12 +409,12 @@
+   'conditions': [
      ['target_platform=="Linux"', {
        'make_global_settings': [
 -        ['AR', '<!(which ar)'],
@@ -19,7 +21,7 @@
        ],
      }],
      ['target_platform=="Android"', {
-@@ -494,12 +494,12 @@
+@@ -459,12 +459,12 @@
          ['LD', '<(ndk_bin_dir)/<(toolchain_prefix)-ld'],
          ['NM', '<(ndk_bin_dir)/<(toolchain_prefix)-nm'],
          ['READELF', '<(ndk_bin_dir)/<(toolchain_prefix)-readelf'],
diff --git a/srcpkgs/mozc/patches/cxx-stdlib.patch b/srcpkgs/mozc/patches/cxx-stdlib.patch
new file mode 100644
index 000000000000..0bccaf8ddc4f
--- /dev/null
+++ b/srcpkgs/mozc/patches/cxx-stdlib.patch
@@ -0,0 +1,29 @@
+Index: mozc/src/gyp/common.gypi
+===================================================================
+--- mozc/src/gyp/common.gypi
++++ mozc/src/gyp/common.gypi
+@@ -105,7 +105,7 @@
+     ],
+     # Libraries for GNU/Linux environment.
+     'linux_ldflags': [
+-      '-lc++',
++      '-lstdc++',
+       '-pthread',
+     ],
+ 
+@@ -205,7 +205,6 @@
+               '-Wtype-limits',
+             ],
+             'cflags_cc': [
+-              '-stdlib=libc++',
+               '-Wno-covered-switch-default',
+               '-Wno-unnamed-type-template-args',
+               '-Wno-c++11-narrowing',
+@@ -225,7 +224,6 @@
+               '-Wtype-limits',
+             ],
+             'cflags_cc': [
+-              '-stdlib=libc++',
+               '-Wno-covered-switch-default',
+               '-Wno-unnamed-type-template-args',
+               '-Wno-c++11-narrowing',
diff --git a/srcpkgs/mozc/patches/default_hiragana_from_environment.patch b/srcpkgs/mozc/patches/default_hiragana_from_environment.patch
deleted file mode 100644
index d733635ac5a1..000000000000
--- a/srcpkgs/mozc/patches/default_hiragana_from_environment.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozc/src/unix/ibus/property_handler.cc
-+++ mozc/src/unix/ibus/property_handler.cc
-@@ -40,6 +40,8 @@
- #include "unix/ibus/mozc_engine_property.h"
- #include "unix/ibus/path_util.h"
- 
-+#include <cstdlib>
-+
- // On Gnome Shell with IBus 1.5, new property named "symbol" is used to
- // represent the mode indicator on the system panel. Note that "symbol" does
- // not exist in IBus 1.4.x.
-@@ -80,7 +82,7 @@ bool GetDisabled(IBusEngine *engine) {
- // On IBus 1.4.x, IBus expects that an IME should always be turned on and
- // IME on/off keys are handled by IBus itself rather than each IME.
- #if IBUS_CHECK_VERSION(1, 5, 0)
--const bool kActivatedOnLaunch = false;
-+const bool kActivatedOnLaunch = !!::std::getenv("IBUS_MOZC_DEFAULT_HIRAGANA");
- #else
- const bool kActivatedOnLaunch = true;
- #endif  // IBus>=1.5.0
diff --git a/srcpkgs/mozc/patches/fcitx.patch b/srcpkgs/mozc/patches/fcitx.patch
new file mode 100644
index 000000000000..1ed6d01516f5
--- /dev/null
+++ b/srcpkgs/mozc/patches/fcitx.patch
@@ -0,0 +1,13 @@
+Index: mozc/src/unix/fcitx/fcitx.gyp
+===================================================================
+--- mozc/src/unix/fcitx/fcitx.gyp.orig
++++ mozc/src/unix/fcitx/fcitx.gyp
+@@ -96,7 +96,7 @@
+         '<@(fcitx_dep_include_dirs)',
+       ],
+       'defines': [
+-        'LOCALEDIR="<!@(fcitx4-config --prefix)/share/locale/"',
++        'LOCALEDIR="/usr/share/locale/"',
+       ],
+     },
+   ],
diff --git a/srcpkgs/mozc/patches/no-parallel.patch b/srcpkgs/mozc/patches/no-parallel.patch
index 14b23367f09e..5952cbc6a040 100644
--- a/srcpkgs/mozc/patches/no-parallel.patch
+++ b/srcpkgs/mozc/patches/no-parallel.patch
@@ -1,6 +1,8 @@
---- mozc/src/build_mozc.py
+Index: mozc/src/build_mozc.py
+===================================================================
+--- mozc/src/build_mozc.py.orig
 +++ mozc/src/build_mozc.py
-@@ -728,6 +728,7 @@ def GypMain(options, unused_args):
+@@ -496,6 +496,7 @@ def GypMain(options, unused_args):
    gyp_options.extend(['--generator-output=.'])
    short_basename = GetBuildShortBaseName(target_platform)
    gyp_options.extend(['-G', 'output_dir=%s' % short_basename])
diff --git a/srcpkgs/mozc/patches/protobuf-370.patch b/srcpkgs/mozc/patches/protobuf-370.patch
deleted file mode 100644
index 59d4e0bb995d..000000000000
--- a/srcpkgs/mozc/patches/protobuf-370.patch
+++ /dev/null
@@ -1,327 +0,0 @@
---- mozc/src/dictionary/user_dictionary.cc
-+++ mozc/src/dictionary/user_dictionary.cc
-@@ -289,7 +289,7 @@ class UserDictionary::UserDictionaryReloader : public Thread {
-     }
- 
-     auto_register_mode_ = false;
--    dic_->Load(*(storage.get()));
-+    dic_->Load(*(storage->storage()));
-   }
- 
-  private:
---- mozc/src/dictionary/user_dictionary_session.cc
-+++ mozc/src/dictionary/user_dictionary_session.cc
-@@ -144,7 +144,7 @@ class UndoRenameDictionaryCommand : public UserDictionarySession::UndoCommand {
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            storage->storage(), dictionary_id_);
-     if (dictionary == NULL) {
-       return false;
-     }
-@@ -169,7 +169,7 @@ class UndoAddEntryCommand : public UserDictionarySession::UndoCommand {
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            storage->storage(), dictionary_id_);
-     if (dictionary == NULL || dictionary->entries_size() == 0) {
-       return false;
-     }
-@@ -195,7 +195,7 @@ class UndoEditEntryCommand : public UserDictionarySession::UndoCommand {
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            storage->storage(), dictionary_id_);
-     if (dictionary == NULL ||
-         index_ < 0 || dictionary->entries_size() <= index_) {
-       return false;
-@@ -240,7 +240,7 @@ class UndoDeleteEntryCommand : public UserDictionarySession::UndoCommand {
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            storage->storage(), dictionary_id_);
-     if (dictionary == NULL) {
-       return false;
-     }
-@@ -306,7 +306,7 @@ class UndoImportFromStringCommand : public UserDictionarySession::UndoCommand {
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            storage->storage(), dictionary_id_);
-     if (dictionary == NULL) {
-       return false;
-     }
-@@ -345,7 +345,7 @@ UserDictionarySession::~UserDictionarySession() {
- 
- // TODO(hidehiko) move this to header.
- const UserDictionaryStorage &UserDictionarySession::storage() const {
--  return *storage_;
-+  return *storage_->storage();
- }
- mozc::UserDictionaryStorage *UserDictionarySession::mutable_storage() {
-   return storage_.get();
-@@ -464,7 +464,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::CreateDictionary(
-     const string &dictionary_name, uint64 *new_dictionary_id) {
-   UserDictionaryCommandStatus::Status status =
-       UserDictionaryUtil::CreateDictionary(
--          storage_.get(), dictionary_name, new_dictionary_id);
-+          storage_->storage(), dictionary_name, new_dictionary_id);
-   if (status == UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) {
-     AddUndoCommand(new UndoCreateDictionaryCommand);
-   }
-@@ -488,7 +488,7 @@ UserDictionarySession::DeleteDictionaryInternal(
-   int original_index;
-   UserDictionary *deleted_dictionary;
-   if (!UserDictionaryUtil::DeleteDictionary(
--          storage_.get(), dictionary_id,
-+          storage_->storage(), dictionary_id,
-           &original_index, &deleted_dictionary)) {
-     // Failed to delete the dictionary.
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-@@ -510,7 +510,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::RenameDictionary(
-     uint64 dictionary_id, const string &dictionary_name) {
-   string original_name;
-   const UserDictionary *dictionary =
--      UserDictionaryUtil::GetUserDictionaryById(*storage_, dictionary_id);
-+      UserDictionaryUtil::GetUserDictionaryById(*storage_->storage(), dictionary_id);
-   if (dictionary != NULL) {
-     // Note that if dictionary is null, it means the dictionary_id is invalid
-     // so following RenameDictionary will fail, and error handling is done
-@@ -547,7 +547,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::AddEntry(
-     uint64 dictionary_id, const UserDictionary::Entry &entry) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          storage_->storage(), dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -575,7 +575,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::EditEntry(
-     uint64 dictionary_id, int index, const UserDictionary::Entry &entry) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          storage_->storage(), dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -604,7 +604,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::DeleteEntry(
-     uint64 dictionary_id, const std::vector<int> &index_list) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          storage_->storage(), dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -644,7 +644,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::ImportFromString(
-     uint64 dictionary_id, const string &data) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          storage_->storage(), dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -699,7 +699,7 @@ UserDictionarySession::ImportToNewDictionaryFromString(
-     uint64 *new_dictionary_id) {
-   UserDictionaryCommandStatus::Status status =
-       UserDictionaryUtil::CreateDictionary(
--          storage_.get(), dictionary_name, new_dictionary_id);
-+          storage_->storage(), dictionary_name, new_dictionary_id);
-   if (status != UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) {
-     return status;
-   }
-@@ -709,7 +709,7 @@ UserDictionarySession::ImportToNewDictionaryFromString(
- 
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), *new_dictionary_id);
-+          storage_->storage(), *new_dictionary_id);
-   if (dictionary == NULL) {
-     // The dictionary should be always found.
-     return UserDictionaryCommandStatus::UNKNOWN_ERROR;
-@@ -728,7 +728,7 @@ bool UserDictionarySession::EnsureNonEmptyStorage() {
-   uint64 new_dictionary_id;
-   UserDictionaryCommandStatus::Status status =
-       UserDictionaryUtil::CreateDictionary(
--          storage_.get(), default_dictionary_name_, &new_dictionary_id);
-+          storage_->storage(), default_dictionary_name_, &new_dictionary_id);
-   CHECK_EQ(
-       status, UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS);
-   return true;
---- mozc/src/dictionary/user_dictionary_storage.cc
-+++ mozc/src/dictionary/user_dictionary_storage.cc
-@@ -109,7 +109,7 @@ bool UserDictionaryStorage::LoadInternal() {
-   mozc::protobuf::io::IstreamInputStream zero_copy_input(&ifs);
-   mozc::protobuf::io::CodedInputStream decoder(&zero_copy_input);
-   decoder.SetTotalBytesLimit(kDefaultTotalBytesLimit, -1);
--  if (!ParseFromCodedStream(&decoder)) {
-+  if (!storage_.ParseFromCodedStream(&decoder)) {
-     LOG(ERROR) << "Failed to parse";
-     if (!decoder.ConsumedEntireMessage() || !ifs.eof()) {
-       LOG(ERROR) << "ParseFromStream failed: file seems broken";
-@@ -141,7 +141,7 @@ bool UserDictionaryStorage::Load() {
-     const UserDictionary &dict = dictionaries(i);
-     if (dict.id() == 0) {
-       mutable_dictionaries(i)->set_id(
--          UserDictionaryUtil::CreateNewDictionaryId(*this));
-+          UserDictionaryUtil::CreateNewDictionaryId(storage_));
-     }
-   }
- 
-@@ -171,7 +171,7 @@ bool UserDictionaryStorage::Save() {
-       return false;
-     }
- 
--    if (!SerializeToOstream(&ofs)) {
-+    if (!storage_.SerializeToOstream(&ofs)) {
-       LOG(ERROR) << "SerializeToString failed";
-       last_error_type_ = SYNC_FAILURE;
-       return false;
-@@ -241,7 +241,7 @@ bool UserDictionaryStorage::ExportDictionary(
- bool UserDictionaryStorage::CreateDictionary(
-     const string &dic_name, uint64 *new_dic_id) {
-   UserDictionaryCommandStatus::Status status =
--      UserDictionaryUtil::CreateDictionary(this, dic_name, new_dic_id);
-+      UserDictionaryUtil::CreateDictionary(&storage_, dic_name, new_dic_id);
-   // Update last_error_type_
-   switch (status) {
-     case UserDictionaryCommandStatus::DICTIONARY_NAME_EMPTY:
-@@ -273,7 +273,7 @@ bool UserDictionaryStorage::CreateDictionary(
- }
- 
- bool UserDictionaryStorage::DeleteDictionary(uint64 dic_id) {
--  if (!UserDictionaryUtil::DeleteDictionary(this, dic_id, NULL, NULL)) {
-+  if (!UserDictionaryUtil::DeleteDictionary(&storage_, dic_id, NULL, NULL)) {
-     // Failed to delete dictionary.
-     last_error_type_ = INVALID_DICTIONARY_ID;
-     return false;
-@@ -318,7 +318,7 @@ bool UserDictionaryStorage::RenameDictionary(uint64 dic_id,
- }
- 
- int UserDictionaryStorage::GetUserDictionaryIndex(uint64 dic_id) const {
--  return UserDictionaryUtil::GetUserDictionaryIndexById(*this, dic_id);
-+  return UserDictionaryUtil::GetUserDictionaryIndexById(storage_, dic_id);
- }
- 
- bool UserDictionaryStorage::GetUserDictionaryId(const string &dic_name,
-@@ -335,7 +335,7 @@ bool UserDictionaryStorage::GetUserDictionaryId(const string &dic_name,
- 
- user_dictionary::UserDictionary *UserDictionaryStorage::GetUserDictionary(
-     uint64 dic_id) {
--  return UserDictionaryUtil::GetMutableUserDictionaryById(this, dic_id);
-+  return UserDictionaryUtil::GetMutableUserDictionaryById(&storage_, dic_id);
- }
- 
- UserDictionaryStorage::UserDictionaryStorageErrorType
-@@ -361,14 +361,14 @@ bool UserDictionaryStorage::AddToAutoRegisteredDictionary(
- 
-   UserDictionary *dic = NULL;
-   if (auto_index == -1) {
--    if (UserDictionaryUtil::IsStorageFull(*this)) {
-+    if (UserDictionaryUtil::IsStorageFull(storage_)) {
-       last_error_type_ = TOO_MANY_DICTIONARIES;
-       LOG(ERROR) << "too many dictionaries";
-       UnLock();
-       return false;
-     }
-     dic = add_dictionaries();
--    dic->set_id(UserDictionaryUtil::CreateNewDictionaryId(*this));
-+    dic->set_id(UserDictionaryUtil::CreateNewDictionaryId(storage_));
-     dic->set_name(kAutoRegisteredDictionaryName);
-   } else {
-     dic = mutable_dictionaries(auto_index);
-@@ -410,7 +410,7 @@ bool UserDictionaryStorage::AddToAutoRegisteredDictionary(
- }
- 
- bool UserDictionaryStorage::ConvertSyncDictionariesToNormalDictionaries() {
--  if (CountSyncableDictionaries(*this) == 0) {
-+  if (CountSyncableDictionaries(storage_) == 0) {
-     return false;
-   }
- 
-@@ -445,7 +445,7 @@ bool UserDictionaryStorage::ConvertSyncDictionariesToNormalDictionaries() {
-           kDictionaryNameConvertedFromSyncableDictionary;
-       int index = 0;
-       while (UserDictionaryUtil::ValidateDictionaryName(
--                 *this, new_dictionary_name)
-+                 storage_, new_dictionary_name)
-              != UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) {
-         ++index;
-         new_dictionary_name = Util::StringPrintf(
-@@ -456,7 +456,7 @@ bool UserDictionaryStorage::ConvertSyncDictionariesToNormalDictionaries() {
-     dic->set_syncable(false);
-   }
- 
--  DCHECK_EQ(0, CountSyncableDictionaries(*this));
-+  DCHECK_EQ(0, CountSyncableDictionaries(storage_));
- 
-   return true;
- }
---- mozc/src/dictionary/user_dictionary_storage.h
-+++ mozc/src/dictionary/user_dictionary_storage.h
-@@ -74,8 +74,20 @@ class ProcessMutex;
- 
- // Inherit from ProtocolBuffer
- // TODO(hidehiko): Get rid of this implementation.
--class UserDictionaryStorage : public user_dictionary::UserDictionaryStorage {
-+class UserDictionaryStorage {
-+ private:
-+  user_dictionary::UserDictionaryStorage storage_;
-  public:
-+  static const user_dictionary::UserDictionaryStorage& default_instance() { return user_dictionary::UserDictionaryStorage::default_instance(); }
-+  user_dictionary::UserDictionaryStorage *storage() { return &storage_; }
-+  int dictionaries_size() const { return storage_.dictionaries_size(); }
-+  void clear_dictionaries() { storage_.clear_dictionaries(); }
-+  user_dictionary::UserDictionary* mutable_dictionaries(int index) { return storage_.mutable_dictionaries(index); }
-+  ::google::protobuf::RepeatedPtrField<user_dictionary::UserDictionary >* mutable_dictionaries() { return storage_.mutable_dictionaries(); }
-+  const ::google::protobuf::RepeatedPtrField<user_dictionary::UserDictionary >& dictionaries() const { return storage_.dictionaries(); }
-+  const user_dictionary::UserDictionary& dictionaries(int index) const { return storage_.dictionaries(index); }
-+  user_dictionary::UserDictionary* add_dictionaries() { return storage_.add_dictionaries(); }
-+
-   typedef user_dictionary::UserDictionary UserDictionary;
-   typedef user_dictionary::UserDictionary::Entry UserDictionaryEntry;
- 
---- mozc/src/prediction/user_history_predictor.cc
-+++ mozc/src/prediction/user_history_predictor.cc
-@@ -291,7 +291,7 @@ bool UserHistoryStorage::Load() {
-     return false;
-   }
- 
--  if (!ParseFromString(input)) {
-+  if (!userHistory_.ParseFromString(input)) {
-     LOG(ERROR) << "ParseFromString failed. message looks broken";
-     return false;
-   }
-@@ -307,7 +307,7 @@ bool UserHistoryStorage::Save() const {
-   }
- 
-   string output;
--  if (!AppendToString(&output)) {
-+  if (!userHistory_.AppendToString(&output)) {
-     LOG(ERROR) << "AppendToString failed";
-     return false;
-   }
---- mozc/src/prediction/user_history_predictor.h
-+++ mozc/src/prediction/user_history_predictor.h
-@@ -61,8 +61,13 @@ class Segments;
- class UserHistoryPredictorSyncer;
- 
- // Added serialization method for UserHistory.
--class UserHistoryStorage : public mozc::user_history_predictor::UserHistory {
-+class UserHistoryStorage {
-+ private:
-+  user_history_predictor::UserHistory userHistory_;
-  public:
-+  int entries_size() const { return userHistory_.entries_size(); }
-+  const user_history_predictor::UserHistory_Entry& entries(int index) const { return userHistory_.entries(index); }
-+  user_history_predictor::UserHistory_Entry* add_entries() { return userHistory_.add_entries(); }
-   explicit UserHistoryStorage(const string &filename);
-   ~UserHistoryStorage();
- 
diff --git a/srcpkgs/mozc/patches/unsigned-int.patch b/srcpkgs/mozc/patches/unsigned-int.patch
new file mode 100644
index 000000000000..823db9f21993
--- /dev/null
+++ b/srcpkgs/mozc/patches/unsigned-int.patch
@@ -0,0 +1,210 @@
+Index: mozc/src/gui/word_register_dialog/word_register_dialog.cc
+===================================================================
+--- mozc/src/gui/word_register_dialog/word_register_dialog.cc
++++ mozc/src/gui/word_register_dialog/word_register_dialog.cc
+@@ -94,7 +94,7 @@ QString GetEnv(const char *envname) {
+       return QString::fromUtf16(reinterpret_cast<const ushort *>(buffer.get()));
+     } else {
+       // This is a fallback just in case.
+-      return QString::fromUcs4(reinterpret_cast<const uint *>(buffer.get()));
++      return QString::fromUcs4(reinterpret_cast<const unsigned *>(buffer.get()));
+     }
+   }
+   return QLatin1String("");
+Index: mozc/src/unix/fcitx/surrounding_text_util.cc
+===================================================================
+--- mozc/src/unix/fcitx/surrounding_text_util.cc
++++ mozc/src/unix/fcitx/surrounding_text_util.cc
+@@ -41,10 +41,10 @@
+ namespace mozc {
+ namespace fcitx {
+ 
+-bool SurroundingTextUtil::GetSafeDelta(uint from, uint to, int32 *delta) {
++bool SurroundingTextUtil::GetSafeDelta(unsigned from, unsigned to, int32 *delta) {
+   DCHECK(delta);
+ 
+-  static_assert(sizeof(int64) >= sizeof(uint),
++  static_assert(sizeof(int64) >= sizeof(unsigned),
+                 "int64 must be sufficient to store a guint value.");
+   static_assert(sizeof(int64) == sizeof(llabs(0)),
+                 "|llabs(0)| must returns a 64-bit integer.");
+@@ -113,8 +113,8 @@ bool SearchAnchorPosForward(
+     const std::string &surrounding_text,
+     const std::string &selected_text,
+     size_t selected_chars_len,
+-    uint cursor_pos,
+-    uint *anchor_pos) {
++    unsigned cursor_pos,
++    unsigned *anchor_pos) {
+ 
+   ConstChar32Iterator iter(surrounding_text);
+   // Move |iter| to cursor pos.
+@@ -137,15 +137,15 @@ bool SearchAnchorPosBackward(
+     const std::string &surrounding_text,
+     const std::string &selected_text,
+     size_t selected_chars_len,
+-    uint cursor_pos,
+-    uint *anchor_pos) {
++    unsigned cursor_pos,
++    unsigned *anchor_pos) {
+   if (cursor_pos < selected_chars_len) {
+     return false;
+   }
+ 
+   ConstChar32Iterator iter(surrounding_text);
+   // Skip |iter| to (potential) anchor pos.
+-  const uint skip_count = cursor_pos - selected_chars_len;
++  const unsigned skip_count = cursor_pos - selected_chars_len;
+   DCHECK_LE(skip_count, cursor_pos);
+   if (!Skip(&iter, skip_count)) {
+     return false;
+@@ -164,8 +164,8 @@ bool SearchAnchorPosBackward(
+ bool SurroundingTextUtil::GetAnchorPosFromSelection(
+     const std::string &surrounding_text,
+     const std::string &selected_text,
+-    uint cursor_pos,
+-    uint *anchor_pos) {
++    unsigned cursor_pos,
++    unsigned *anchor_pos) {
+   DCHECK(anchor_pos);
+ 
+   if (surrounding_text.empty()) {
+@@ -196,8 +196,8 @@ bool GetSurroundingText(FcitxInstance* i
+         return false;
+     }
+ 
+-    uint cursor_pos = 0;
+-    uint anchor_pos = 0;
++    unsigned cursor_pos = 0;
++    unsigned anchor_pos = 0;
+     char* str = NULL;
+ 
+     if (!FcitxInstanceGetSurroundingText(instance, ic, &str, &cursor_pos, &anchor_pos)) {
+@@ -211,7 +211,7 @@ bool GetSurroundingText(FcitxInstance* i
+         const char* primary = NULL;
+ 
+         if ((primary = FcitxClipboardGetPrimarySelection(instance, NULL)) != NULL) {
+-            uint new_anchor_pos = 0;
++            unsigned new_anchor_pos = 0;
+             const std::string primary_text(primary);
+             if (SurroundingTextUtil::GetAnchorPosFromSelection(
+                 surrounding_text, primary_text,
+Index: mozc/src/unix/fcitx/surrounding_text_util.h
+===================================================================
+--- mozc/src/unix/fcitx/surrounding_text_util.h
++++ mozc/src/unix/fcitx/surrounding_text_util.h
+@@ -55,7 +55,7 @@ class SurroundingTextUtil {
+   // Returns true when neither |abs(delta)| nor |-delta| does not cause
+   // integer overflow, that is, |delta| is in a safe range.
+   // Returns false otherwise.
+-  static bool GetSafeDelta(uint from, uint to, int32 *delta);
++  static bool GetSafeDelta(unsigned from, unsigned to, int32 *delta);
+ 
+   // Returns true if
+   // 1. |surrounding_text| contains |selected_text|
+@@ -71,8 +71,8 @@ class SurroundingTextUtil {
+   static bool GetAnchorPosFromSelection(
+       const std::string &surrounding_text,
+       const std::string &selected_text,
+-      uint cursor_pos,
+-      uint *anchor_pos);
++      unsigned cursor_pos,
++      unsigned *anchor_pos);
+ 
+  private:
+   DISALLOW_IMPLICIT_CONSTRUCTORS(SurroundingTextUtil);
+Index: mozc/src/unix/fcitx5/surrounding_text_util.cc
+===================================================================
+--- mozc/src/unix/fcitx5/surrounding_text_util.cc
++++ mozc/src/unix/fcitx5/surrounding_text_util.cc
+@@ -43,10 +43,10 @@ namespace fcitx {
+ 
+ using namespace mozc;
+ 
+-bool SurroundingTextUtil::GetSafeDelta(uint from, uint to, int32 *delta) {
++bool SurroundingTextUtil::GetSafeDelta(unsigned from, unsigned to, int32 *delta) {
+   DCHECK(delta);
+ 
+-  static_assert(sizeof(int64) >= sizeof(uint),
++  static_assert(sizeof(int64) >= sizeof(unsigned),
+                 "int64 must be sufficient to store a guint value.");
+   static_assert(sizeof(int64) == sizeof(llabs(0)),
+                 "|llabs(0)| must returns a 64-bit integer.");
+@@ -110,8 +110,8 @@ bool StartsWith(ConstChar32Iterator *ite
+ // Otherwise returns false.
+ bool SearchAnchorPosForward(const std::string &surrounding_text,
+                             const std::string &selected_text,
+-                            size_t selected_chars_len, uint cursor_pos,
+-                            uint *anchor_pos) {
++                            size_t selected_chars_len, unsigned cursor_pos,
++                            unsigned *anchor_pos) {
+   ConstChar32Iterator iter(surrounding_text);
+   // Move |iter| to cursor pos.
+   if (!Skip(&iter, cursor_pos)) {
+@@ -131,15 +131,15 @@ bool SearchAnchorPosForward(const std::s
+ // Otherwise returns false.
+ bool SearchAnchorPosBackward(const std::string &surrounding_text,
+                              const std::string &selected_text,
+-                             size_t selected_chars_len, uint cursor_pos,
+-                             uint *anchor_pos) {
++                             size_t selected_chars_len, unsigned cursor_pos,
++                             unsigned *anchor_pos) {
+   if (cursor_pos < selected_chars_len) {
+     return false;
+   }
+ 
+   ConstChar32Iterator iter(surrounding_text);
+   // Skip |iter| to (potential) anchor pos.
+-  const uint skip_count = cursor_pos - selected_chars_len;
++  const unsigned skip_count = cursor_pos - selected_chars_len;
+   DCHECK_LE(skip_count, cursor_pos);
+   if (!Skip(&iter, skip_count)) {
+     return false;
+@@ -157,7 +157,7 @@ bool SearchAnchorPosBackward(const std::
+ 
+ bool SurroundingTextUtil::GetAnchorPosFromSelection(
+     const std::string &surrounding_text, const std::string &selected_text,
+-    uint cursor_pos, uint *anchor_pos) {
++    unsigned cursor_pos, unsigned *anchor_pos) {
+   DCHECK(anchor_pos);
+ 
+   if (surrounding_text.empty()) {
+@@ -187,13 +187,13 @@ bool GetSurroundingText(InputContext *ic
+   }
+ 
+   const auto surrounding_text = ic->surroundingText().text();
+-  uint cursor_pos = ic->surroundingText().cursor();
+-  uint anchor_pos = ic->surroundingText().anchor();
++  unsigned cursor_pos = ic->surroundingText().cursor();
++  unsigned anchor_pos = ic->surroundingText().anchor();
+ 
+   if (cursor_pos == anchor_pos && clipboard) {
+     std::string primary = clipboard->call<IClipboard::primary>(ic);
+     if (!primary.empty()) {
+-      uint new_anchor_pos = 0;
++      unsigned new_anchor_pos = 0;
+       if (SurroundingTextUtil::GetAnchorPosFromSelection(
+               surrounding_text, primary, cursor_pos, &new_anchor_pos)) {
+         anchor_pos = new_anchor_pos;
+Index: mozc/src/unix/fcitx5/surrounding_text_util.h
+===================================================================
+--- mozc/src/unix/fcitx5/surrounding_text_util.h
++++ mozc/src/unix/fcitx5/surrounding_text_util.h
+@@ -56,7 +56,7 @@ class SurroundingTextUtil {
+   // Returns true when neither |abs(delta)| nor |-delta| does not cause
+   // integer overflow, that is, |delta| is in a safe range.
+   // Returns false otherwise.
+-  static bool GetSafeDelta(uint from, uint to, int32 *delta);
++  static bool GetSafeDelta(unsigned from, unsigned to, int32 *delta);
+ 
+   // Returns true if
+   // 1. |surrounding_text| contains |selected_text|
+@@ -71,7 +71,7 @@ class SurroundingTextUtil {
+   // Otherwise returns false.
+   static bool GetAnchorPosFromSelection(const std::string &surrounding_text,
+                                         const std::string &selected_text,
+-                                        uint cursor_pos, uint *anchor_pos);
++                                        unsigned cursor_pos, unsigned *anchor_pos);
+ 
+  private:
+   DISALLOW_IMPLICIT_CONSTRUCTORS(SurroundingTextUtil);
diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 71d32eb5b9cd..1a78d407f471 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -1,33 +1,36 @@
 # Template file for 'mozc'
 pkgname=mozc
-version=2.23.2815.102
-revision=10
+# src/data/version/mozc_version_template.bzl
+version=2.26.4353.100
+revision=1
 create_wrksrc=yes
 build_wrksrc=mozc/src
-hostmakedepends="gettext ninja pkg-config protobuf protobuf-devel python which"
+hostmakedepends="gettext ninja pkg-config protobuf protobuf-devel
+ python3-six which qt5-qmake qt5-host-tools"
 makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel
- fcitx-devel"
+ fcitx-devel libfcitx5-devel"
 depends="tegaki-zinnia-japanese>=0.3"
 short_desc="Japanese IME (Open Source version of Google Japanese Input)"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="BSD-3-Clause"
 homepage="https://github.com/google/mozc"
 distfiles="
- https://gitlab.com/fcitx/mozc/repository/dad94584ea5012110ad1d204e433964243a1639d/archive.tar.bz2>${pkgname}-${version}.tar.bz2
- https://github.com/bnoordhuis/gyp/archive/c6f471687407bf28ddfc63f1a8f47aeb7bf54edc.tar.gz
+ https://github.com/fcitx/mozc/archive/d384c3b3e7eed1aa54a6af3363781604fe538d65.tar.gz
+ https://github.com/abseil/abseil-cpp/archive/0f3bb466b868b523cf1dc9b2aaaed65c77b28862.tar.gz
+ ${DEBIAN_SITE}/main/g/gyp/gyp_0.1+20200513gitcaa6002.orig.tar.gz
  https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz
 "
-checksum="
- e38457e63a7fa8d62d87b4f8b3e89fe5f6939d92e3c4fd287a93358375693892
- 882f074cbb3a4f2bba550fb615e63949c0fbf39eeb1718a0330b4a545ab97616
- 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1
-"
+checksum="69cb26e1f9c03e20715356ef568b583f2baf996df5fd8536aca2ed8e7bd9444f
+ 3d74cdc98b42fd4257d91f652575206de195e2c824fcd8d6e6d227f85cb143ef
+ 8d531bc7d3302461d76a32367453cec60ed08b455f27a53d8f313d81761713a8
+ 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1"
 
 CXXFLAGS="-D_GNU_SOURCE"
+patch_args=-Np0
+lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-	subpackages="ibus-mozc fcitx-mozc"
+	subpackages="ibus-mozc fcitx-mozc fcitx5-mozc"
 fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
@@ -35,45 +38,43 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 fi
 
 post_extract() {
-	ln -s mozc-* mozc
-	rm -rf mozc/src/unix/fcitx5
+	mv mozc-* mozc
 
 	# symlink "submodules" into place
-	for _src_dest in gyp japanese-usage-dictionary:japanese_usage_dictionary; do
+	for _src_dest in gyp \
+		abseil-cpp \
+		japanese-usage-dictionary:japanese_usage_dictionary
+	do
 		_src=${_src_dest%:*}
 		_dst=mozc/src/third_party/${_src_dest#*:}
 		rmdir $_dst
 		ln -sr $_src-* $_dst
 	done
+}
 
-	if [ "$CROSS_BUILD" ]; then
-		# find fcitx4-config
-		sed -i -e "s;fcitx4-config;${XBPS_CROSS_BASE}/usr/bin/fcitx4-config;" mozc/src/unix/fcitx/fcitx.gyp
+post_patch() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		vsed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|g' base/mutex.cc
 	fi
 }
 
 do_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) sed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|g' base/mutex.cc ;;
-	esac
 	GYP_DEFINES="
 	 document_dir=/usr/share/licenses/${pkgname}
 	 use_libprotobuf=1
 	 use_libzinnia=1
-	" python2 build_mozc.py gyp --target_platform=Linux
+	" python3 build_mozc.py gyp --target_platform=Linux
 }
 
 do_build() {
-	local targets
-	targets="
-	 server/server.gyp:mozc_server
-	 gui/gui.gyp:mozc_tool
-	 unix/emacs/emacs.gyp:mozc_emacs_helper
-	 unix/ibus/ibus.gyp:ibus_mozc
-	 renderer/renderer.gyp:mozc_renderer
-	 unix/fcitx/fcitx.gyp:fcitx-mozc
-	"
-	python2 build_mozc.py build -c Release $targets
+	python3 build_mozc.py build -c Release \
+		server/server.gyp:mozc_server \
+		gui/gui.gyp:mozc_tool \
+		unix/emacs/emacs.gyp:mozc_emacs_helper \
+		unix/ibus/ibus.gyp:ibus_mozc \
+		renderer/renderer.gyp:mozc_renderer \
+		unix/fcitx/fcitx.gyp:fcitx-mozc \
+		unix/fcitx5/fcitx5.gyp:fcitx5-mozc
 
 	sed -i 's|/usr/libexec/|/usr/lib/ibus-mozc/|g' out_linux/Release/gen/unix/ibus/mozc.xml
 }
@@ -82,15 +83,16 @@ do_install() {
 	vinstall out_linux/Release/mozc_server 755 usr/lib/mozc
 	vinstall out_linux/Release/mozc_tool 755 usr/lib/mozc
 
-	head -n 29 server/mozc_server.cc > LICENSE
-	for i in LICENSE data/installer/*.html; do
-		vlicense "$i"
-	done
+	head -n 29 unix/fcitx5/fcitx_key_translator.cc >mozc.LICENSE
+	vlicense mozc.LICENSE
+	vlicense data/installer/credits_en.html
+	vlicense third_party/japanese_usage_dictionary/LICENSE dict.LICENSE
 }
 
 ibus-mozc_package() {
 	short_desc="Mozc engine for IBus - Client of the Mozc input method"
 	depends="${sourcepkg}-${version}_${revision} ibus>=1.5.14"
+	lib32disabled=yes
 	pkg_install() {
 		vinstall out_linux/Release/ibus_mozc 755 usr/lib/ibus-mozc ibus-engine-mozc
 		vinstall out_linux/Release/gen/unix/ibus/mozc.xml 644 usr/share/ibus/component
@@ -105,6 +107,7 @@ ibus-mozc_package() {
 emacs-mozc_package() {
 	pkgdesc="Mozc for Emacs"
 	depends="${sourcepkg}-${version}_${revision} emacs"
+	lib32disabled=yes
 	pkg_install() {
 		vbin out_linux/Release/mozc_emacs_helper
 		vinstall unix/emacs/mozc.el 644 usr/share/emacs/site-lisp/emacs-mozc
@@ -115,10 +118,40 @@ fcitx-mozc_package() {
 	short_desc="Mozc engine for fcitx - Client of the Mozc input method"
 	depends="${sourcepkg}-${version}_${revision} fcitx>=4.2.9"
 	homepage="https://fcitx-im.org/"
-	license="GPL-2.0-or-later"
+	lib32disabled=yes
 	pkg_install() {
+		local _file _lang
 		vinstall out_linux/Release/fcitx-mozc.so 644 usr/lib/fcitx
 		vinstall unix/fcitx/fcitx-mozc.conf 644 usr/share/fcitx/addon
 		vinstall unix/fcitx/mozc.conf 644 usr/share/fcitx/inputmethod
+		vinstall data/images/unix/ime_product_icon_opensource-32.png \
+			644 usr/share/fcitx/icon mozc.png
+		for _file in out_linux/Release/gen/unix/fcitx/po/*.mo
+		do
+			_lang=${_file##*/}
+			_lang=${_lang%.mo}
+			vinstall "$_file" 644 usr/share/locale/$_lang fcitx-mozc.mo
+		done
+	}
+}
+
+fcitx5-mozc_package() {
+	short_desc="Mozc engine for fcitx v5"
+	depends="${sourcepkg}-${version}_${revision} fcitx5"
+	homepage="https://fcitx-im.org/"
+	lib32disabled=yes
+	pkg_install() {
+		local _file _lang
+		vinstall out_linux/Release/fcitx5-mozc.so 644 usr/lib/fcitx5
+		vinstall unix/fcitx5/mozc-addon.conf 644 \
+			usr/share/fcitx5/addon mozc.conf
+		vinstall unix/fcitx5/mozc.conf 644 usr/share/fcitx5/inputmethod
+		for _file in unix/fcitx5/po/*.po
+		do
+			_lang=${_file##*/}
+			_lang=${_lang%.po}
+			vmkdir usr/share/locale/$_lang
+			msgfmt "$_file" -o $PKGDESTDIR/usr/share/locale/$_lang/fcitx5-mozc.mo
+		done
 	}
 }
diff --git a/srcpkgs/mozc/update b/srcpkgs/mozc/update
new file mode 100644
index 000000000000..5a7df464ba79
--- /dev/null
+++ b/srcpkgs/mozc/update
@@ -0,0 +1,2 @@
+# Google never tags any releases.
+ignore="*"

From 73e49657f80b27598edf0ed6bdce747526f81a30 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, 1 May 2021 10:07:53 +0700
Subject: [PATCH 014/447] mozc: fix build with platform not have atomic8_*

---
 srcpkgs/mozc/patches/latomic.patch | 150 +++++++++++++++++++++++++++++
 srcpkgs/mozc/template              |   5 +
 2 files changed, 155 insertions(+)
 create mode 100644 srcpkgs/mozc/patches/latomic.patch

diff --git a/srcpkgs/mozc/patches/latomic.patch b/srcpkgs/mozc/patches/latomic.patch
new file mode 100644
index 000000000000..2a30432a821e
--- /dev/null
+++ b/srcpkgs/mozc/patches/latomic.patch
@@ -0,0 +1,150 @@
+Index: mozc/src/gui/gui.gyp
+===================================================================
+--- mozc/src/gui/gui.gyp.orig
++++ mozc/src/gui/gui.gyp
+@@ -790,6 +790,13 @@
+             'tool/mozc_tool_main_noqt.cc',
+           ],
+         }],
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
+         # For Mac, ConfigDialog is the host app for necessary frameworks.
+         ['OS=="win"', {
+           'product_name': '<(tool_product_name_win)',
+Index: mozc/src/gyp/defines.gypi
+===================================================================
+--- mozc/src/gyp/defines.gypi.orig
++++ mozc/src/gyp/defines.gypi
+@@ -68,6 +68,9 @@
+     # use_libibus represents if ibus library is used or not.
+     # This option is only for Linux.
+     'use_libibus%': '0',
++
++    # use_libatomic represents if libatomic is required or not
++    'use_libatomic%': '0',
+   },
+   'target_defaults': {
+     'defines': [
+Index: mozc/src/renderer/renderer.gyp
+===================================================================
+--- mozc/src/renderer/renderer.gyp.orig
++++ mozc/src/renderer/renderer.gyp
+@@ -592,6 +592,15 @@
+             '../base/base.gyp:crash_report_handler',
+             'mozc_renderer_lib',
+           ],
++          'conditions': [
++            ['use_libatomic==1', {
++              'link_settings': {
++                'libraries': [
++                  '-latomic',
++                ],
++              },
++            }],
++          ],
+         },
+         {
+           'target_name': 'gtk_renderer_test',
+Index: mozc/src/server/server.gyp
+===================================================================
+--- mozc/src/server/server.gyp.orig
++++ mozc/src/server/server.gyp
+@@ -55,6 +55,13 @@
+         'mozc_server_lib',
+       ],
+       'conditions': [
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
+         ['OS=="mac"', {
+           'product_name': '<(branding)Converter',
+           'sources': [
+Index: mozc/src/unix/emacs/emacs.gyp
+===================================================================
+--- mozc/src/unix/emacs/emacs.gyp.orig
++++ mozc/src/unix/emacs/emacs.gyp
+@@ -46,6 +46,15 @@
+         '../../protocol/protocol.gyp:config_proto',
+         'mozc_emacs_helper_lib',
+       ],
++      'conditions': [
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
++      ],
+     },
+     {
+       'target_name': 'mozc_emacs_helper_lib',
+Index: mozc/src/unix/fcitx/fcitx.gyp
+===================================================================
+--- mozc/src/unix/fcitx/fcitx.gyp.orig
++++ mozc/src/unix/fcitx/fcitx.gyp
+@@ -98,6 +98,15 @@
+       'defines': [
+         'LOCALEDIR="/usr/share/locale/"',
+       ],
++      'conditions': [
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
++      ],
+     },
+   ],
+   }, {
+Index: mozc/src/unix/fcitx5/fcitx5.gyp
+===================================================================
+--- mozc/src/unix/fcitx5/fcitx5.gyp.orig
++++ mozc/src/unix/fcitx5/fcitx5.gyp
+@@ -105,6 +105,15 @@
+       'defines': [
+         'FCITX_GETTEXT_DOMAIN="fcitx5-mozc"',
+       ],
++      'conditions': [
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
++      ],
+     },
+   ],
+   }, {
+Index: mozc/src/unix/ibus/ibus.gyp
+===================================================================
+--- mozc/src/unix/ibus/ibus.gyp.orig
++++ mozc/src/unix/ibus/ibus.gyp
+@@ -239,6 +239,15 @@
+         'ibus_mozc_lib',
+         'ibus_mozc_metadata',
+       ],
++      'conditions': [
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
++      ],
+     },
+     {
+       'target_name': 'ibus_mozc_test',
diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 1a78d407f471..bcab66eeaf11 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -37,6 +37,10 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="Does not build"
 fi
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 post_extract() {
 	mv mozc-* mozc
 
@@ -63,6 +67,7 @@ do_configure() {
 	 document_dir=/usr/share/licenses/${pkgname}
 	 use_libprotobuf=1
 	 use_libzinnia=1
+	 ${XBPS_TARGET_NO_ATOMIC8:+use_libatomic=1}
 	" python3 build_mozc.py gyp --target_platform=Linux
 }
 

From 196e45aa0bf1cfe49fa2054abbff0567d82fa5c8 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Sat, 1 May 2021 10:40:57 +0900
Subject: [PATCH 015/447] terraform-ls: update to 0.16.1

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 srcpkgs/terraform-ls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 4b83363eb3ae..27576807d2b2 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
-version=0.15.0
+version=0.16.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,7 +9,7 @@ maintainer="Sora Morimoto <sora@morimoto.io>"
 license="MPL-2.0"
 homepage="https://github.com/hashicorp/terraform-ls"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=1efa538816c8678fe1e1243bdd99b913056d64826d631dfd7a6795c37573ed97
+checksum=e466d782fd1e2bede2f90e5677e1fd18df4a23476ebb08212502a3e955667736
 
 post_install() {
 	vlicense LICENSE

From a6375a4e8654423c260c5ed6f81cc9269d04aac7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 May 2021 11:25:36 +0200
Subject: [PATCH 016/447] mcelog: update to 176.

---
 srcpkgs/mcelog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index 0e0d77b4b7a4..3c7ce0131db7 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
 # Template file for 'mcelog'
 pkgname=mcelog
-version=175
+version=176
 revision=1
 archs="i686* x86_64*"
 conf_files="/etc/mcelog/mcelog.conf"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://www.mcelog.org/"
 distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz"
-checksum=ed25a39bb20178e79e18cc5d3202b198868986ec3e964b6285f6a7bac8469fdf
+checksum=995a88c19b640f9de7755581bf3bb37d2315a949f39f06870e88f50e147487a4
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From b9b4729b577643b51212304958056e337abcfc58 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 May 2021 11:26:50 +0200
Subject: [PATCH 017/447] xlbiff: update to 4.5.2.

---
 srcpkgs/xlbiff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlbiff/template b/srcpkgs/xlbiff/template
index 563bc5830192..7dc9ba798055 100644
--- a/srcpkgs/xlbiff/template
+++ b/srcpkgs/xlbiff/template
@@ -1,6 +1,6 @@
 # Template file for 'xlbiff'
 pkgname=xlbiff
-version=4.5.1
+version=4.5.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-xmhformdir=/etc/nmh"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.edsantiago.com/xlbiff/"
 distfiles="https://github.com/edsantiago/xlbiff/archive/${version}.tar.gz"
-checksum=96e72a0f30452d39ee9b37b4147cf89681b31546fb4fec607324349531f744cd
+checksum=f1da27a0cd526100d60f7087d6c88a90a0fef21412bcb7e536a85df0be381e20
 
 pre_configure() {
 	autoreconf -fi

From af2498b3766d7ec21fa3efba594c53cfdee7d846 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Wed, 28 Apr 2021 23:55:10 +0300
Subject: [PATCH 018/447] wlsunset: generate man page

---
 .../patches/fix-scdoc-cross-compiling.patch   | 55 +++++++++++++++++++
 srcpkgs/wlsunset/template                     |  5 +-
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch

diff --git a/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch b/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
new file mode 100644
index 000000000000..f9189f0e700d
--- /dev/null
+++ b/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
@@ -0,0 +1,55 @@
+From 7be432057f268fff6e68928f3c3f3b4b70d67368 Mon Sep 17 00:00:00 2001
+From: Kenny Levinsen <kl@kl.wtf>
+Date: Fri, 30 Apr 2021 20:02:02 +0200
+Subject: [PATCH] meson: Copy seatd's scdoc handling
+
+This fixes cross-compiling, and avoids unnecessary search for a shell.
+---
+ meson.build | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 23d24c5..9a02caf 100644
+--- a/meson.build
++++ b/meson.build
+@@ -3,7 +3,7 @@ project(
+ 	'c',
+ 	version: '0.2.0',
+ 	license: 'MIT',
+-	meson_version: '>=0.53.0',
++	meson_version: '>=0.56.0',
+ 	default_options: [
+ 		'c_std=c11',
+ 		'warning_level=3',
+@@ -56,16 +56,13 @@ executable(
+ 	install: true,
+ )
+ 
+-scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7')
++scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7', native: true)
+ 
+ if scdoc.found()
+-	sh = find_program('sh')
+-
+-	man_pages = ['wlsunset.1.scd']
+-
++	scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
+ 	mandir = get_option('mandir')
+ 
+-	foreach src : man_pages
++	foreach src : ['wlsunset.1.scd']
+ 		topic = src.split('.')[0]
+ 		section = src.split('.')[1]
+ 		output = '@0@.@1@'.format(topic, section)
+@@ -75,7 +72,7 @@ if scdoc.found()
+ 			input: src,
+ 			output: output,
+ 			command: [
+-				sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.get_pkgconfig_variable('scdoc'), output)
++				'sh', '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output)
+ 			],
+ 			install: true,
+ 			install_dir: '@0@/man@1@'.format(mandir, section)
+-- 
+2.30.2
+
diff --git a/srcpkgs/wlsunset/template b/srcpkgs/wlsunset/template
index 3c5cc4170a20..5ec0aa3d8c45 100644
--- a/srcpkgs/wlsunset/template
+++ b/srcpkgs/wlsunset/template
@@ -1,9 +1,9 @@
 # Template file for 'wlsunset'
 pkgname=wlsunset
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config wayland-devel"
+hostmakedepends="scdoc pkg-config wayland-devel"
 makedepends="pkg-config wayland-devel wayland-protocols"
 short_desc="Day/night gamma adjustments for Wayland compositors"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -11,6 +11,7 @@ license="MIT"
 homepage="https://sr.ht/~kennylevinsen/wlsunset/"
 distfiles="https://git.sr.ht/~kennylevinsen/wlsunset/archive/${version}.tar.gz"
 checksum=88bce695722a09d79545f14d404cc0659f7176bb08d5db5f4f23228b6ba8bb03
+patch_args=-Np1
 
 post_install() {
 	vlicense LICENSE

From 87da7751c1e4bcdd19883372dd03a9794b73417b Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 1 May 2021 12:17:20 +0200
Subject: [PATCH 019/447] python3-pikepdf: update to 2.11.4.

---
 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 d16b86b156a3..2db7128c706c 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.11.2
+version=2.11.4
 revision=2
 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=0958a07ebf12d62427babadd6a922409cb358d0415a5219a9269d8fab2aa487e
+checksum=7352ccda2eba78aab4d0e780de0ea4f7f84df0e6a5889ccc9b33d2aa6df3a54d
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 27c7e6973b3a52773a28275c144f1461eef92fc2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 1 May 2021 10:02:44 -0400
Subject: [PATCH 020/447] endless-sky: update to 0.9.13.

---
 srcpkgs/endless-sky-data                |  1 -
 srcpkgs/endless-sky/patches/paths.patch | 22 +++++++++++-----------
 srcpkgs/endless-sky/template            | 14 ++++----------
 3 files changed, 15 insertions(+), 22 deletions(-)
 delete mode 120000 srcpkgs/endless-sky-data

diff --git a/srcpkgs/endless-sky-data b/srcpkgs/endless-sky-data
deleted file mode 120000
index 9931a47c7f60..000000000000
--- a/srcpkgs/endless-sky-data
+++ /dev/null
@@ -1 +0,0 @@
-endless-sky
\ No newline at end of file
diff --git a/srcpkgs/endless-sky/patches/paths.patch b/srcpkgs/endless-sky/patches/paths.patch
index cf765e07cf9f..8516bdfb9391 100644
--- a/srcpkgs/endless-sky/patches/paths.patch
+++ b/srcpkgs/endless-sky/patches/paths.patch
@@ -1,15 +1,15 @@
---- SConstruct.old	2017-12-06 12:54:20.524502000 -0800
-+++ SConstruct	2017-12-12 12:39:21.764384877 -0800
-@@ -18,7 +18,7 @@
- 	env.Append(LINKFLAGS = ["-static-libstdc++"])
- 
- opts = Variables()
--opts.Add(PathVariable("PREFIX", "Directory to install under", "/usr/local", PathVariable.PathIsDirCreate))
-+opts.Add(PathVariable("PREFIX", "Directory to install under", "/usr", PathVariable.PathIsDirCreate))
- opts.Add(PathVariable("DESTDIR", "Destination root directory", "", PathVariable.PathAccept))
- opts.Add(EnumVariable("mode", "Compilation mode", "release", allowed_values=("release", "debug", "profile")))
+--- SConstruct
++++ SConstruct
+@@ -41,7 +41,7 @@
+ 	PathVariable("BUILDDIR", "Directory to store compiled object files in", "build", PathVariable.PathIsDirCreate),
+ 	PathVariable("BIN_DIR", "Directory to store binaries in", ".", PathVariable.PathIsDirCreate),
+ 	PathVariable("DESTDIR", "Destination root directory, e.g. if building a package", "", PathVariable.PathAccept),
+-	PathVariable("PREFIX", "Directory to install under (will be prefixed by DESTDIR)", "/usr/local", PathVariable.PathIsDirCreate),
++	PathVariable("PREFIX", "Directory to install under (will be prefixed by DESTDIR)", "/usr", PathVariable.PathIsDirCreate),
+ )
  opts.Update(env)
-@@ -66,7 +66,7 @@
+ Help(opts.GenerateHelpText(env))
+@@ -150,7 +150,7 @@
  
  
  # Install the binary:
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index bb0215fd6f0f..11927a76afe6 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
 # Template file for 'endless-sky'
 pkgname=endless-sky
-version=0.9.12
-revision=3
+version=0.9.13
+revision=1
 build_style=scons
 makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
  libopenal-devel libpng-devel"
@@ -11,11 +11,5 @@ maintainer="CoolOhm <micvlas@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://endless-sky.github.io/"
 distfiles="https://github.com/endless-sky/endless-sky/archive/v${version}.tar.gz"
-checksum=31f76ac11666415478678d924174d43a620a7fd1093e95131776aed12b912eb4
-
-endless-sky-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/games/endless-sky
-	}
-}
+checksum=001c8a28bbec7491f2725fbaa52b1ade813d33cec2d16521f241c80d04685b9d
+replaces="endless-sky-data>=0"

From d8f505319f96c2da7400dc68faffbe963ce08fa3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 22:17:06 -0400
Subject: [PATCH 021/447] New package: python3-matplotlib-inline-0.1.2

The inline matplotlib logic in python3-ipython has been refactored into
this separate package that is needed for proper notebook functionality.
---
 srcpkgs/python3-matplotlib-inline/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-matplotlib-inline/template

diff --git a/srcpkgs/python3-matplotlib-inline/template b/srcpkgs/python3-matplotlib-inline/template
new file mode 100644
index 000000000000..82eccf890a57
--- /dev/null
+++ b/srcpkgs/python3-matplotlib-inline/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-matplotlib-inline'
+pkgname=python3-matplotlib-inline
+version=0.1.2
+revision=1
+_pypkg="${pkgname#python3-}"
+wrksrc="${_pypkg}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-traitlets"
+short_desc="Inline Matplotlib backend for Jupyter"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/ipython/matplotlib-inline"
+distfiles="${PYPI_SITE}/m/${_pypkg}/${_pypkg}-${version}.tar.gz"
+checksum=f41d5ff73c9f5385775d5c0bc13b424535c8402fe70ea8210f93e11f3683993e
+# No tests are shipped
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 5152b5e8691451be60b4a4995217cec4a2dc0ed9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 22:19:29 -0400
Subject: [PATCH 022/447] python3-ipython: update to 7.23.0.

---
 srcpkgs/python3-ipython/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 0d1f20a5366d..bf1b012ed3a3 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.22.0
+version=7.23.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-pickleshare python3-simplegeneric python3-traitlets
- python3-pexpect python3-prompt_toolkit python3-Pygments python3-jedi
- python3-backcall"
+depends="python3-setuptools python3-jedi python3-decorator python3-pickleshare
+ python3-traitlets python3-prompt_toolkit python3-Pygments python3-backcall
+ python3-matplotlib-inline python3-pexpect"
 checkdepends="$depends python3-pytest python3-nose python3-matplotlib
  python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
  python3-jupyter_nbformat python3-Pygments python3-Pillow"
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=9c900332d4c5a6de534b4befeeb7de44ad0cc42e8327fa41b7685abde58cec74
+checksum=69178f32bf9c6257430b6f592c3ae230c32861a1966d2facec454e09078e232d
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {

From 2fc5509d64debc4d5578f60159fe48fc69ab5c89 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 1 May 2021 10:19:12 -0400
Subject: [PATCH 023/447] endless-sky: remove stale -data dependency

---
 srcpkgs/endless-sky/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index 11927a76afe6..00583361ce76 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,11 +1,10 @@
 # Template file for 'endless-sky'
 pkgname=endless-sky
 version=0.9.13
-revision=1
+revision=2
 build_style=scons
 makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
  libopenal-devel libpng-devel"
-depends="${pkgname}-data"
 short_desc="Space exploring, trading, and combat game"
 maintainer="CoolOhm <micvlas@gmail.com>"
 license="GPL-3.0-or-later"

From db0d487ae64d8b249adab8030d72da08d78e0673 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 1 May 2021 20:49:08 +0200
Subject: [PATCH 024/447] linux5.10: fix ppc-dotconfig

---
 srcpkgs/linux5.10/files/ppc-dotconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index 32cef8a304dc..7fbdd540c4fc 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.28 Kernel Configuration
+# Linux/powerpc 5.10.33 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8,6 +8,8 @@ CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
@@ -531,6 +533,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y

From dfa09b33f1627016ccaa78fb9e652ae09f4eb378 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 1 May 2021 20:59:17 +0200
Subject: [PATCH 025/447] linux4.19: fix ppc-dotconfig

---
 srcpkgs/linux4.19/files/ppc-dotconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 489d1fbb5b32..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.185 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -540,8 +540,9 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_PLUGIN_HOSTCC=""
+CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -5598,7 +5599,6 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
 # CONFIG_PI433 is not set
-# CONFIG_MTK_MMC is not set
 
 #
 # Gasket devices

From e4f55cc75af600a726a63d72155b7508ec47a517 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 May 2021 21:13:25 +0200
Subject: [PATCH 026/447] libtls: update to 3.2.5.

---
 srcpkgs/libtls/template | 6 +++---
 srcpkgs/libtls/update   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 070ee2d34fd3..cd46d748bb03 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
 # Template file for 'libtls'
 pkgname=libtls
-version=3.2.4
-revision=2
+version=3.2.5
+revision=1
 wrksrc="libressl-${version}"
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -13,7 +13,7 @@ license="OpenSSL, ISC"
 homepage="http://www.libressl.org/"
 changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
-checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+checksum=798a65fd61d385e09d559810cdfa46512f8def5919264cfef241a7b086ce7cfe
 _lssl_asm_ver="1.2.0"
 replaces="libtls20>0"
 
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
index a5d5038a8320..db3a272cb32e 100644
--- a/srcpkgs/libtls/update
+++ b/srcpkgs/libtls/update
@@ -1 +1,2 @@
 ignore="*.0 *.1"
+pattern='libressl-\K[.\d]+'

From 8abca2b2cbccf97f813417e939397961dda35c8d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 1 May 2021 16:23:34 -0400
Subject: [PATCH 027/447] python3-ipython: fix broken matplotlib_inline import

---
 srcpkgs/python3-ipython/patches/mpl_inline_fix.patch | 12 ++++++++++++
 srcpkgs/python3-ipython/template                     |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-ipython/patches/mpl_inline_fix.patch

diff --git a/srcpkgs/python3-ipython/patches/mpl_inline_fix.patch b/srcpkgs/python3-ipython/patches/mpl_inline_fix.patch
new file mode 100644
index 000000000000..4526ce4af0e7
--- /dev/null
+++ b/srcpkgs/python3-ipython/patches/mpl_inline_fix.patch
@@ -0,0 +1,12 @@
+diff --git IPython/core/pylabtools.py IPython/core/pylabtools.py
+index c71b0cdb6..bb815956e 100644
+--- IPython/core/pylabtools.py
++++ IPython/core/pylabtools.py
+@@ -383,6 +383,6 @@ def configure_inline_support(shell, backend):
+         stacklevel=2,
+     )
+ 
+-    from matplotlib_inline.backend_inline import configure_inline_support_orig
++    from matplotlib_inline.backend_inline import configure_inline_support as configure_inline_support_orig
+ 
+     configure_inline_support_orig(shell, backend)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index bf1b012ed3a3..671614a92a1d 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
 version=7.23.0
-revision=1
+revision=2
 wrksrc="ipython-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 31e5a81300d2108ede9764772a12f92caca6f046 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 2 May 2021 11:10:45 +0000
Subject: [PATCH 028/447] nano: update to 5.7.

---
 srcpkgs/nano/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index 980beca9d68e..16808dc277e1 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,6 +1,6 @@
 # Template file for 'nano'
 pkgname=nano
-version=5.6.1
+version=5.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-utf8"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.nano-editor.org/"
 changelog="http://git.savannah.gnu.org/cgit/nano.git/plain/NEWS"
 distfiles="https://www.nano-editor.org/dist/v${version%%.*}/nano-${version}.tar.xz"
-checksum=760d7059e0881ca0ee7e2a33b09d999ec456ff7204df86bee58eb6f523ee8b09
+checksum=d4b181cc2ec11def3711b4649e34f2be7a668e70ab506860514031d069cccafa
 
 post_install() {
 	vsconf syntax/nanorc.nanorc

From b393370212519d8bbba57b50293380124a06bbbb Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 2 May 2021 12:24:08 +0200
Subject: [PATCH 029/447] qemu: update to 6.0.0.

---
 ...l.c-define-__SIGRTMIN-MAX-for-non-GN.patch | 27 ++++++++++--
 .../qemu/patches/ignore-sys-signal_h.patch    | 17 --------
 srcpkgs/qemu/patches/mmap-mremap-efault.patch | 41 -------------------
 srcpkgs/qemu/template                         |  6 +--
 4 files changed, 26 insertions(+), 65 deletions(-)
 delete mode 100644 srcpkgs/qemu/patches/ignore-sys-signal_h.patch
 delete mode 100644 srcpkgs/qemu/patches/mmap-mremap-efault.patch

diff --git a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
index 4acb8e070ce4..9da918e4345f 100644
--- a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+++ b/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
@@ -1,7 +1,23 @@
-Updated version of 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch for qemu-3.0.0
-from alpine, original author Natanael Copa.
---- linux-user/signal.c	2019-08-22 19:46:40.369463327 +0200
-+++ linux-user/signal.c	2019-08-22 19:47:25.176898649 +0200
+From 8fbb4e6797ed67310b74cbaaa061269db45a5b71 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 29 Apr 2014 15:51:31 +0200
+Subject: [PATCH] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU
+ platforms
+
+The __SIGRTMIN and __SIGRTMAX are glibc internals and are not available
+on all platforms, so we define those if they are missing.
+
+This is needed for musl libc.
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ linux-user/signal.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/linux-user/signal.c b/linux-user/signal.c
+index 5ca6d62b15..e917c16d91 100644
+--- linux-user/signal.c
++++ linux-user/signal.c
 @@ -25,6 +25,13 @@
  #include "trace.h"
  #include "signal-common.h"
@@ -16,3 +32,6 @@ from alpine, original author Natanael Copa.
  static struct target_sigaction sigact_table[TARGET_NSIG];
  
  static void host_signal_handler(int host_signum, siginfo_t *info,
+-- 
+2.23.0
+
diff --git a/srcpkgs/qemu/patches/ignore-sys-signal_h.patch b/srcpkgs/qemu/patches/ignore-sys-signal_h.patch
deleted file mode 100644
index 088a0e654c06..000000000000
--- a/srcpkgs/qemu/patches/ignore-sys-signal_h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Not needed. For glibc this has just #include <signal.h> and for musl it prints a warning.
-
---- include/qemu/osdep.h	2020-12-08 17:59:44.000000000 +0100
-+++ include/qemu/osdep.h	2020-12-12 18:41:47.709685865 +0100
-@@ -104,10 +104,6 @@
- #include <setjmp.h>
- #include <signal.h>
- 
--#ifdef HAVE_SYS_SIGNAL_H
--#include <sys/signal.h>
--#endif
--
- #ifndef _WIN32
- #include <sys/wait.h>
- #else
diff --git a/srcpkgs/qemu/patches/mmap-mremap-efault.patch b/srcpkgs/qemu/patches/mmap-mremap-efault.patch
deleted file mode 100644
index a5eaa7906c82..000000000000
--- a/srcpkgs/qemu/patches/mmap-mremap-efault.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: errno=EFAULT when the address passed to mremap(2) is not valid
-
-See Rich Felker's comment at https://www.openwall.com/lists/musl/2017/06/21/2 for
-why we need to return errno as described in man mremap(2) from qemu-user-static.
-Also speed up the loop when checking for increasing the mappings size to go
-in steps of TARGET_PAGE_SIZE and OR-in a check for the very last byte of the range.
-
---- linux-user/mmap.c	2019-04-23 20:14:46.000000000 +0200
-+++ linux-user/mmap.c	2019-06-30 16:31:26.545637450 +0200
-@@ -692,7 +692,7 @@
-     if (!guest_range_valid(old_addr, old_size) ||
-         ((flags & MREMAP_FIXED) &&
-          !guest_range_valid(new_addr, new_size))) {
--        errno = ENOMEM;
-+        errno = EFAULT;
-         return -1;
-     }
- 
-@@ -728,9 +728,10 @@
-             abi_ulong addr;
-             for (addr = old_addr + old_size;
-                  addr < old_addr + new_size;
--                 addr++) {
-+                 addr += TARGET_PAGE_SIZE) {
-                 prot |= page_get_flags(addr);
-             }
-+            prot |= page_get_flags(old_addr + new_size - 1);
-         }
-         if (prot == 0) {
-             host_addr = mremap(g2h(old_addr), old_size, new_size, flags);
-@@ -738,7 +739,7 @@
-                 mmap_reserve(old_addr + old_size, new_size - old_size);
-             }
-         } else {
--            errno = ENOMEM;
-+            errno = EFAULT;
-             host_addr = MAP_FAILED;
-         }
-         /* Check if address fits target address space */
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 83e43ff5cbae..75f57bac755d 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,8 +1,8 @@
 # Template file for 'qemu'
 # This package should be updated together with qemu-user-static
 pkgname=qemu
-version=5.2.0
-revision=2
+version=6.0.0
+revision=1
 build_style=configure
 hostmakedepends="gettext pkg-config perl python3 automake libtool flex
  python3-Sphinx texinfo ninja"
@@ -23,7 +23,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=7bd9334c02edaf02f5b0b52beb19fe7f72556c3ca0180e20f0095f0ef2f25f14
+checksum=7d306a03c67c0b667d21b55e1b172f5e55a9af5ee09cbd739fb2395aeca7860c
 ignore_elf_dirs="/usr/share/qemu"
 nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
  palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf

From 19b42f6580a85e821264e3d8feff48f28a6e7b36 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 2 May 2021 13:21:35 +0200
Subject: [PATCH 030/447] qemu-user-static: update to 6.0.0.

---
 srcpkgs/qemu-user-static/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 396eaeb30591..c6870e38d263 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,8 +1,8 @@
 # Template file for 'qemu-user-static'
 # This package should be updated together with qemu
 pkgname=qemu-user-static
-version=5.2.0
-revision=2
+version=6.0.0
+revision=1
 wrksrc="qemu-${version}"
 build_style=configure
 hostmakedepends="pkg-config automake python3 ninja"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=7bd9334c02edaf02f5b0b52beb19fe7f72556c3ca0180e20f0095f0ef2f25f14
+checksum=7d306a03c67c0b667d21b55e1b172f5e55a9af5ee09cbd739fb2395aeca7860c
 
 _fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
  microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k

From ecb3cfb0a2c13b1d1dd53e55478b56cbf7f8d7c9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 May 2021 15:49:12 +0200
Subject: [PATCH 031/447] cloc: update to 1.90.

---
 srcpkgs/cloc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template
index cf2d1f35d3f3..893b7afa89d7 100644
--- a/srcpkgs/cloc/template
+++ b/srcpkgs/cloc/template
@@ -1,15 +1,15 @@
 # Template file for 'cloc'
 pkgname=cloc
-version=1.88
-revision=2
+version=1.90
+revision=1
 hostmakedepends="perl"
 depends="perl"
 short_desc="Count Lines of Code"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/AlDanial/cloc"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=e85c2d1b3ec389d892955cf20b3fa5c797e81136e231d9a09e4f4c62e272f8cd
+distfiles="https://github.com/AlDanial/cloc/archive/v${version}.tar.gz"
+checksum=60b429dd2aa5cd65707b359dcbcbeb710c8e4db880886528ced0962c67e52548
 
 do_build() {
 	make -C Unix man

From 7cc2f782a334c67d3fc77ecc0050e5984abc5d07 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 May 2021 16:11:44 +0200
Subject: [PATCH 032/447] python3-pwntools: update to 4.5.0.

---
 srcpkgs/python3-pwntools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template
index e55396f0b064..cd8cb3e74172 100644
--- a/srcpkgs/python3-pwntools/template
+++ b/srcpkgs/python3-pwntools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pwntools'
 pkgname=python3-pwntools
-version=4.4.0
+version=4.5.0
 revision=1
 wrksrc="pwntools-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-2-Clause"
 homepage="https://github.com/Gallopsled/pwntools"
 distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz"
-checksum=c51605b538c6394c6c31bc90bb3436224b497be1fe21a0a2420785ca399087e3
+checksum=2161cca2b480486fe9a3c89bd70852df13eea145250f4b5b6d6237e432364886
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From 3c60cb03d67cffb56c5f661bb1beccc251365cb7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 May 2021 16:14:45 +0200
Subject: [PATCH 033/447] linux5.10: update to 5.10.34.

---
 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 4e1423e09098..ddcc5f176e25 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.33
+version=5.10.34
 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=933fdbc36371c0f830b7a6a957a559fca2dad1cc0eaa852ef42fb168185b4315
+checksum=6eeeb7e005bd1d4eb8b10382a35f8cd54ee6692c244ab1362590fa539f3d6582
 python_version=3
 patch_args="-Np1"
 

From d78d198581d66a08b8088fce96b17ea9795a4ba5 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 2 May 2021 11:06:42 +0000
Subject: [PATCH 034/447] skopeo: update to 1.2.3.

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index cac6e3832eb3..9e9a53ff851d 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.2.2
+version=1.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=b9adf2c209f49f79568cd69ee063bac1d61db20d277c20f189784fe39945a0ad
+checksum=bb62a226ad9427aaa0789c429e7f91de9caa8e284ed9227709751cc7d76a0591
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From 5e51a3a82e5da4a16899bff384ea99a2883fb5f4 Mon Sep 17 00:00:00 2001
From: Jaume Devesa <jaume@mailbox.org>
Date: Sun, 2 May 2021 12:54:18 +0200
Subject: [PATCH 035/447] sfeed_curses: update to 0.9.11

---
 srcpkgs/sfeed_curses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index 2ae38ed80866..3e649cb7e5b5 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.10
+version=0.9.11
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d64a64116cd16ba00c592ca08a8d545d2fa91c2cf9cf8673e2f0b6c7b101b2db
+checksum=17885597096c4a1f2146ba2a0b7a439c1deeb814092c4f721e6570506b32a382
 
 post_install() {
 	vlicense LICENSE

From 2f63d187c7789fbb3d5c7bcca8f158950c121bcf Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 2 May 2021 11:05:16 +0000
Subject: [PATCH 036/447] oil: update to 0.8.10.

---
 srcpkgs/oil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 69ea84476e67..ee8ea0497566 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.8.7
+version=0.8.10
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=29c5eed6efccbef6c22dbe5aec3d3d36f7c93da7a8d1cf19fc2cee93b5d1db73
+checksum=11307c062ae512aae8f0251d44cf80b19fee8056bf7e3e76c0257da489ef301d
 register_shell="/usr/bin/osh"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From 6235c26e56f9784db05c443ff4720de07ac88036 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 2 May 2021 11:03:13 +0000
Subject: [PATCH 037/447] celluloid: update to 0.21.

---
 srcpkgs/celluloid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template
index 1ad41decbe8b..0af4a804504d 100644
--- a/srcpkgs/celluloid/template
+++ b/srcpkgs/celluloid/template
@@ -1,6 +1,6 @@
 # Template file for 'celluloid'
 pkgname=celluloid
-version=0.20
+version=0.21
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://celluloid-player.github.io/"
 distfiles="https://github.com/${pkgname}-player/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=63798c4cd7da818aef3ddbfed64d67a6db7b14d3774d143db18cefc6aed8524e
+checksum=2299d8cc1a5a620cc3686495da22ac4ccd6dd020827d9dd27e19a61d83707eb7
 
 gnome-mpv_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From b1b3a7fb1fe0ef366ae2f2b62dd12c6858d16aa0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 2 May 2021 11:02:01 +0000
Subject: [PATCH 038/447] kid3: update to 3.8.6.

---
 srcpkgs/kid3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 3291fe4b1e81..e916cbabed1e 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,6 +1,6 @@
 # Template file for 'kid3'
 pkgname=kid3
-version=3.8.5
+version=3.8.6
 revision=1
 build_style=cmake
 configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
@@ -19,7 +19,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-only"
 homepage="https://kid3.kde.org"
 distfiles="${SOURCEFORGE_SITE}/kid3/kid3-${version}.tar.gz"
-checksum=0c467927541e9dd8172758016778742f0b154cb2f5bcfce727b35cfbdee3141f
+checksum=71ef8c58227302737ebbed3b7f476f9f48e76ea894952d916dc33d9c08f96e08
 
 build_options="KDE mp3 mp4 flac vorbis taglib chromaprint"
 build_options_default="mp3 mp4 flac vorbis taglib chromaprint"

From 92b40a40a051c3cefd61c6f1f15719ce4102446a Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sun, 2 May 2021 11:17:27 +0300
Subject: [PATCH 039/447] zoxide: update to 0.7.0.

---
 srcpkgs/zoxide/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index 22756463b592..f8f8a804618b 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,8 +8,11 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=fe93aa4d1fe8d4f94b302335f30bc543c7a1664df2a3fde73e6253c74f576c35
+checksum=9a9b0aa82a647fa834e4ade483af292e50080758af25c5260c425420879d9691
 
 post_install() {
 	vlicense LICENSE
+	for f in man/*; do
+		vman $f
+	done
 }

From 4f5a9a0009b4846a0604f7d619fd6b43c4caebd6 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 1 May 2021 16:39:03 +0200
Subject: [PATCH 040/447] perl-CryptX: update to 0.072

---
 srcpkgs/perl-CryptX/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-CryptX/template b/srcpkgs/perl-CryptX/template
index 57e4a4306081..3ba6d0af545d 100644
--- a/srcpkgs/perl-CryptX/template
+++ b/srcpkgs/perl-CryptX/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-CryptX'
 pkgname=perl-CryptX
-version=0.071
+version=0.072
 revision=1
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later, Unlicense"
 homepage="https://metacpan.org/release/CryptX"
 distfiles="${CPAN_SITE}/Crypt/${pkgname#perl-}-${version}.tar.gz"
-checksum=7249132e3452fa326d02f242d714a3ede0cca021442bed4fae644d94b0b649be
+checksum=162ffb9306e90dab4743a5b22ede21a53e09de2200d0ea35bd4f13744a161706

From 793995df7efad1319bbee0acce1eeb11748506b9 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 1 May 2021 06:23:09 +0300
Subject: [PATCH 041/447] calibre: update to 5.17.0.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 9546f815e3bd..e5b069b18cef 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.16.1
+version=5.17.0
 revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=9535c25b430634e7b379c6863bd736246538ca5c293e605a3174d8de72cd72b1
+checksum=add8812f7637abfd3015f5861388c69166a4815f2103d1e30dc297b28ead56bb
 lib32disabled=yes
 nocross=yes
 

From 9a12a2e9071b6dce1443b662d3c81044e0bac3ef Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 1 May 2021 13:03:12 +0000
Subject: [PATCH 042/447] yad: update to 9.3.

---
 srcpkgs/yad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index 9e16e76f7a73..c6008b33dfb8 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,6 +1,6 @@
 # Template file for 'yad'
 pkgname=yad
-version=9.1
+version=9.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-icon-browser"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/v1cont/yad"
 changelog="https://raw.githubusercontent.com/v1cont/yad/master/NEWS"
 distfiles="https://github.com/v1cont/yad/releases/download/v${version}/yad-${version}.tar.xz"
-checksum=288142d338c055d3839083d8146c6f270bd5a17f78ff9cd2a3c41a8cf31a0e92
+checksum=d5ca05d7658ac45490f1b49e15d24acd2c2011d88dab3f8dab0431ae9f493319
 
 pre_configure() {
 	autoreconf -ivf

From 525f4fd385e83663eab091543c1d940ac309ff93 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 1 May 2021 13:22:18 +0000
Subject: [PATCH 043/447] amber: update to 0.5.9.

---
 srcpkgs/amber/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/amber/template b/srcpkgs/amber/template
index ef529dfc10a6..7befc2ca47cb 100644
--- a/srcpkgs/amber/template
+++ b/srcpkgs/amber/template
@@ -1,6 +1,6 @@
 # Template file for 'amber'
 pkgname=amber
-version=0.5.8
+version=0.5.9
 revision=1
 build_style=cargo
 short_desc="Code search/replace tool"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/dalance/amber"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f12e0b176273e011209e7d8613d1b9a049e50aeb536871c1f6c05a9d6a494935
+checksum=bf974e997fffa0d54463fc85e44f054563372ca4dade50099fb6ecec0ca8c483
 
 post_install() {
 	vlicense LICENSE

From 26a35531dbeea77fc081c834115ca5d41e14171c Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 1 May 2021 16:22:24 +0200
Subject: [PATCH 044/447] New package: gtkdatabox3-1.0.0

---
 common/shlibs                |  1 +
 srcpkgs/gtkdatabox3-devel    |  1 +
 srcpkgs/gtkdatabox3/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/gtkdatabox3-devel
 create mode 100644 srcpkgs/gtkdatabox3/template

diff --git a/common/shlibs b/common/shlibs
index c39878238889..995c9750a41f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3916,6 +3916,7 @@ libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
+libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/gtkdatabox3-devel b/srcpkgs/gtkdatabox3-devel
new file mode 120000
index 000000000000..78e11676000a
--- /dev/null
+++ b/srcpkgs/gtkdatabox3-devel
@@ -0,0 +1 @@
+gtkdatabox3
\ No newline at end of file
diff --git a/srcpkgs/gtkdatabox3/template b/srcpkgs/gtkdatabox3/template
new file mode 100644
index 000000000000..21d4dcd57561
--- /dev/null
+++ b/srcpkgs/gtkdatabox3/template
@@ -0,0 +1,26 @@
+# Template file for 'gtkdatabox3'
+pkgname=gtkdatabox3
+version=1.0.0
+revision=1
+wrksrc="gtkdatabox-${version}"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="gtk+3-devel"
+short_desc="GTK+-Widget for fast data display"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="GPL-3.0-or-later"
+homepage="https://gtkdatabox3.sourceforge.io/"
+distfiles="${SOURCEFORGE_SITE}/gtkdatabox3/gtkdatabox-${version}.tar.gz"
+checksum=7add2cd8fb4209f3970dbd33f5238e25b43f6251e7534607bf926c7c6175e14b
+
+gtkdatabox3-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share
+	}
+}

From b1e1cff3540fb449b12791260e142d48868ca1df Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 1 May 2021 16:23:25 +0200
Subject: [PATCH 045/447] klavaro: update to 3.12

---
 srcpkgs/klavaro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/klavaro/template b/srcpkgs/klavaro/template
index 6b8cd84c19fa..ade9aa51ab4a 100644
--- a/srcpkgs/klavaro/template
+++ b/srcpkgs/klavaro/template
@@ -1,14 +1,14 @@
 # Template file for 'klavaro'
 pkgname=klavaro
-version=3.11
+version=3.12
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="intltool pkg-config"
-makedepends="gtk+3-devel libcurl-devel"
+makedepends="gtk+3-devel gtkdatabox3-devel libcurl-devel"
 short_desc="Touch typing tutor"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later"
 homepage="http://klavaro.sourceforge.net/en/"
 distfiles="${SOURCEFORGE_SITE}/klavaro/klavaro-${version}.tar.bz2"
-checksum=fc64d3bf9548a5d55af1ba72912024107883a918b95ae60cda95706116567de6
+checksum=c450e27f07d5e7d57818a5a8d428cacad7c17a28dcabe0c2e5694a4fe9abb97a

From 7f59f0c90c333df817aa70f6319788bc263efb2e Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 1 May 2021 17:48:39 +0300
Subject: [PATCH 046/447] hugo: update to 0.83.0

---
 srcpkgs/hugo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 88b46c4c244e..3c1ab0105527 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.82.1
-revision=3
+version=0.83.0
+revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
 go_build_tags="extended"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=3190ae848fdb1a04339c233faab5934c422d85cf85ea3b0c0b5a842239c84e75
+checksum=c22bbbf4f3e12bced1b6b73ed1b31f45b9123c3d37ccacf2d899c06aa07550a9
 
 post_install() {
 	vdoc README.md

From 6dea15aa242b88029133fc2fca0343346f7c09e1 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 1 May 2021 22:34:56 +0200
Subject: [PATCH 047/447] git-toolbelt: update to 1.6.0.

---
 srcpkgs/git-toolbelt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-toolbelt/template b/srcpkgs/git-toolbelt/template
index b3e8202d3e22..1998841827ce 100644
--- a/srcpkgs/git-toolbelt/template
+++ b/srcpkgs/git-toolbelt/template
@@ -1,6 +1,6 @@
 # Template file for 'git-toolbelt'
 pkgname=git-toolbelt
-version=1.5.1
+version=1.6.0
 revision=1
 depends="git moreutils fzf"
 short_desc="Helper tools to make everyday life with Git much easier"
@@ -8,7 +8,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/nvie/git-toolbelt"
 distfiles="https://github.com/nvie/git-toolbelt/archive/v${version}.tar.gz"
-checksum=0fe8551fe5f9c05aaa566aba6f94667240cb0f6221a3c8d0d8cccff31244b1a8
+checksum=@8b0d689fcbda5148d0c8728b542fb691e7bbb91ba438f57db67e7f740819e526
 conflicts="git-extras"
 
 do_install() {

From 7a42efbfe3716542c439410f5ce0f1466b4e3ea0 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 1 May 2021 18:01:42 +0300
Subject: [PATCH 048/447] oksh: update to 6.9

---
 srcpkgs/oksh/patches/cross.patch | 2 +-
 srcpkgs/oksh/template            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/oksh/patches/cross.patch b/srcpkgs/oksh/patches/cross.patch
index 0382ba8d35a7..df00dc4df1d8 100644
--- a/srcpkgs/oksh/patches/cross.patch
+++ b/srcpkgs/oksh/patches/cross.patch
@@ -1,6 +1,6 @@
 --- configure.orig
 +++ configure
-@@ -582,7 +582,7 @@
+@@ -932,7 +932,7 @@
  fi
  
  printf "checking for C compiler... "
diff --git a/srcpkgs/oksh/template b/srcpkgs/oksh/template
index ff2d3d321a7d..84e6085f54f0 100644
--- a/srcpkgs/oksh/template
+++ b/srcpkgs/oksh/template
@@ -1,6 +1,6 @@
 # Template file for 'oksh'
 pkgname=oksh
-version=6.8.1
+version=6.9
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/ibara/oksh"
 distfiles="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz"
-checksum=ddd2b27b99009a4ee58ddf58da73edf83962018066ccf33b2fe1f570a00917b0
+checksum=c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35
 register_shell="/bin/oksh"
 
 alternatives="

From 1c193ee052b774589dbe9d6921d78554e578639c Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 2 May 2021 18:50:23 +0300
Subject: [PATCH 049/447] hugo: update to 0.83.1

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 3c1ab0105527..09710e9fe8c9 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.83.0
+version=0.83.1
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=c22bbbf4f3e12bced1b6b73ed1b31f45b9123c3d37ccacf2d899c06aa07550a9
+checksum=2abc273ffb79576c9347c80d443154db26be9ae15b6ae66f9b75056c3a285157
 
 post_install() {
 	vdoc README.md

From 71f3aa0214c12932772c207ce9279c95b8c4e2be Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 30 Apr 2021 23:09:45 +0200
Subject: [PATCH 050/447] openradtool: update to 0.12.8.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 3ded299505d0..5e3bf13f83bb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.12.7
+version=0.12.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=366657ecd0b417ba1293a946ec05f7372d561aac7d2566504809608fdf5f6baa
+checksum=bf877b1db23f84a897c9c2223aa9ad360a63089b01620f26a7bb9b680cac27d8
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From 3b0e435e4f131f58193ce5ed623c302ec149ade8 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 3 May 2021 02:57:54 +0300
Subject: [PATCH 051/447] font-iosevka: update to 6.1.2

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index e87a1837b5cb..768b5b7ebd9f 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=6.0.1
+version=6.1.2
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -12,8 +12,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 644b3b5695151228657af0df2fd3c8af85d31d01ef3625b603f8d9776754bb6f
- b7f58505f408ed8fafa3312198d06e1312ee6b96eac1456a2597cc4e0a2ca221"
+ 2415cfa67462a913c4e6e4d55f7fa3b64ed0c57694013704579dc18fb925b874
+ 721ab82b60e0168d12731938ec97e0632f8608fd7c6f098ad991946ca1280cd5"
 
 font_dirs="/usr/share/fonts/TTF"
 

From ac68ea01a57ba9344db936fe3c07945313d2c4ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 19:02:03 -0300
Subject: [PATCH 052/447] 0ad: disable generation of -32bit package.

The resulting 0ad-32bit package only contains internal libraries used by
the game.
---
 srcpkgs/0ad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ba58de90f397..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.24b
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
@@ -16,6 +16,7 @@ homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
 checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
+lib32disabled=yes
 
 CXXFLAGS="-fpermissive"
 # Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl

From 2aaeef7cbaafc59e8e085c28ac567a750ce5bcea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 13:49:28 -0300
Subject: [PATCH 053/447] firefox: build with nodejs-lts.

---
 srcpkgs/firefox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 338a2bb5b9e8..bba9994c2a91 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -16,7 +16,7 @@ checksum=6b50dbfb393f843e4401e23965a1d8f7fd44b5a7628d95138294094094eee297
 lib32disabled=yes
 
 hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
- llvm clang nodejs-lts-10 cbindgen python nasm which tar"
+ llvm clang nodejs-lts cbindgen python nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  pixman-devel libevent-devel libnotify-devel libvpx-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std

From f1d6b854ad1d7f26aec2d26a9fa1d617733d2a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 13:49:58 -0300
Subject: [PATCH 054/447] firefox-esr: build with nodejs-lts.

---
 srcpkgs/firefox-esr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index fbd9ed2fb8ec..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -8,7 +8,7 @@ revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
 hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
- llvm clang nodejs-lts-10 cbindgen python nasm which tar"
+ llvm clang nodejs-lts cbindgen python nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  pixman-devel libevent-devel libnotify-devel libvpx-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std

From fa6d7712b57e2b36210599a122455fc6fe694222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 13:47:28 -0300
Subject: [PATCH 055/447] thunderbird: build with nodejs-lts.

Working towards removal of nodejs-lts-10.
---
 srcpkgs/thunderbird/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d65081d6ba32..0c28c456532c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -16,7 +16,7 @@ checksum=65d79a557027a3b52cc672ab9aea8da7131e6373f94657d03f6d6b9c7b36fb45
 lib32disabled=yes
 
 hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
- llvm clang nodejs-lts-10 cbindgen python nasm which tar"
+ llvm clang nodejs-lts cbindgen python nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  pixman-devel libevent-devel libnotify-devel libvpx-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std

From 1dafe58a88655fc282b7ca00c2ec0e27caa7a9e2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 27 Apr 2021 09:13:01 +0200
Subject: [PATCH 056/447] glib-networking: update to 2.68.1.

---
 srcpkgs/glib-networking/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index fdb7fbfe8d1a..e2cec4da596b 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
 # Template file for 'glib-networking'
 pkgname=glib-networking
-version=2.68.0
+version=2.68.1
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
+checksum=d05d8bd124a9f53fc2b93b18f2386d512e4f48bc5a80470a7967224f3bf53b30
 lib32disabled=yes
 
 post_install() {

From 08fae05ecce8e114edb701e85e98d16caf0c6ff0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 20 Apr 2021 09:41:51 +0200
Subject: [PATCH 057/447] bolt: update to 0.9.1.

---
 srcpkgs/bolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bolt/template b/srcpkgs/bolt/template
index 70a3aeb5827a..20bccb2c3e09 100644
--- a/srcpkgs/bolt/template
+++ b/srcpkgs/bolt/template
@@ -1,6 +1,6 @@
 # Template file for 'bolt'
 pkgname=bolt
-version=0.9
+version=0.9.1
 revision=1
 build_style=meson
 configure_args="-Dman=true -Dsystemd=false"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.freedesktop.org/bolt/bolt"
 distfiles="https://gitlab.freedesktop.org/bolt/bolt/-/archive/${version}/bolt-${version}.tar.gz"
-checksum=49fe4cb2cd3361fd104f9c2cd7cbbf791e867038590a968dc39377b27008969a
+checksum=f938db68df79d0ada135a055fd01204f6f3436e17e962dfb8dc6699de77e1895
 patch_args="-Np1"
 
 CFLAGS="-fcommon"

From 6c2a9fea3bfddaafc0f9c64ba4641606fd25cd7f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 3 May 2021 02:51:31 +0300
Subject: [PATCH 058/447] font-sarasa-gothic: update to 0.31.1

---
 srcpkgs/font-sarasa-gothic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 9d689359f0e6..26d2eaa693ab 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.31.0
+version=0.31.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=4d6e520500fef185461457aad8f397fd1f9407b9624cbeff50999650a3f525af
+checksum=893dcad279711cc541a143f4ba2356ee1b8e3ff4ed203a2da00601879adda913
 
 font_dirs="/usr/share/fonts/TTF"
 

From 53382d2e77087e05bd0ce5739da91bc346c7fec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 2 May 2021 22:43:26 -0300
Subject: [PATCH 059/447] glib: update to 2.68.1.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ------------------
 srcpkgs/glib/template                         |   4 +-
 2 files changed, 2 insertions(+), 132 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
deleted file mode 100644
index d3da19b4e10d..000000000000
--- a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <pwithnall@endlessos.org>
-Date: Tue, 23 Mar 2021 16:27:49 +0000
-Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
-
-It should not be possible for `->locales` to be set without
-`->checked_locales` being set, so drop the redundant check. This helps
-with branch code coverage.
-
-Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
----
- glib/gkeyfile.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git glib/gkeyfile.c glib/gkeyfile.c
-index 50859164b..06c4b7c47 100644
---- glib/gkeyfile.c
-+++ glib/gkeyfile.c
-@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
-   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
-     return TRUE;
- 
--  if (!key_file->checked_locales && !key_file->locales)
-+  if (!key_file->checked_locales)
-     {
-       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
-       key_file->checked_locales = TRUE;
--- 
-GitLab
-
-
-From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <pwithnall@endlessos.org>
-Date: Tue, 23 Mar 2021 16:28:31 +0000
-Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
- load
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the same `GKeyFile` is reused to load multiple different key files,
-any loads after the first which encounter translated keys will crash,
-because clearing the data from the first load cleared the cached
-language names, but didn’t clear `checked_locales`, so they were never
-reloaded.
-
-Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
-
-Fixes: #2361
----
- glib/gkeyfile.c      |  1 +
- glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 44 insertions(+)
-
-diff --git glib/gkeyfile.c glib/gkeyfile.c
-index 06c4b7c47..0b58edb3f 100644
---- glib/gkeyfile.c
-+++ glib/gkeyfile.c
-@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
-       g_strfreev (key_file->locales);
-       key_file->locales = NULL;
-     }
-+  key_file->checked_locales = FALSE;
- 
-   if (key_file->parse_buffer)
-     {
-diff --git glib/tests/keyfile.c glib/tests/keyfile.c
-index 7530bc8c3..975ef8167 100644
---- glib/tests/keyfile.c
-+++ glib/tests/keyfile.c
-@@ -758,6 +758,48 @@ test_locale_string (void)
-   g_free (old_locale);
- }
- 
-+static void
-+test_locale_string_multiple_loads (void)
-+{
-+  GKeyFile *keyfile = NULL;
-+  GError *local_error = NULL;
-+  gchar *old_locale = NULL;
-+  guint i;
-+  const gchar *data =
-+    "[valid]\n"
-+    "key1=v1\n"
-+    "key1[de]=v1-de\n"
-+    "key1[de_DE]=v1-de_DE\n"
-+    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
-+    "key1[fr]=v1-fr\n"
-+    "key1[en] =v1-en\n"
-+    "key1[sr@Latn]=v1-sr\n";
-+
-+  g_test_summary ("Check that loading with translations multiple times works");
-+  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
-+
-+  old_locale = g_strdup (setlocale (LC_ALL, NULL));
-+  g_setenv ("LANGUAGE", "de", TRUE);
-+  setlocale (LC_ALL, "");
-+
-+  keyfile = g_key_file_new ();
-+
-+  for (i = 0; i < 3; i++)
-+    {
-+      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
-+      g_assert_no_error (local_error);
-+
-+      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
-+      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
-+      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
-+    }
-+
-+  g_key_file_free (keyfile);
-+
-+  setlocale (LC_ALL, old_locale);
-+  g_free (old_locale);
-+}
-+
- static void
- test_lists (void)
- {
-@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
-   g_test_add_func ("/keyfile/boolean", test_boolean);
-   g_test_add_func ("/keyfile/number", test_number);
-   g_test_add_func ("/keyfile/locale-string", test_locale_string);
-+  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
-   g_test_add_func ("/keyfile/lists", test_lists);
-   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
-   g_test_add_func ("/keyfile/group-remove", test_group_remove);
--- 
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index a412a0fb08a7..449f33846dcf 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.68.0
+version=2.68.1
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
+checksum=241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From f324a97ca2517550c905753ab548118f0480d0d6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 27 Apr 2021 09:28:26 +0200
Subject: [PATCH 060/447] gtk+3: update to 3.24.29.

Enable tests to run, but they don't complete successfully yet.

Closes: #30537 [via git-merge-pr]
---
 srcpkgs/gtk+3/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 60c6459b24b5..be97801ad473 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+3'
 # Revbump gtk-layer-shell when updating, otherwise it presents a warning message
 pkgname=gtk+3
-version=3.24.28
+version=3.24.29
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -23,12 +23,13 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  $(vopt_if cloudproviders 'libcloudproviders-devel')"
 depends="gtk-update-icon-cache adwaita-icon-theme
  librsvg shared-mime-info $(vopt_if x11 'dbus-x11')"
+checkdepends="$depends xvfb-run dbus"
 short_desc="GTK+ toolkit (v3)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6
+checksum=f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"
@@ -39,8 +40,8 @@ desc_option_cloudproviders="Enable integration with cloudproviders, such as Next
 build_options_default="colord cups gir broadway wayland x11"
 
 do_check() {
-	# Requires xserver running
-	:
+	# TODO: don't pass fully
+	xvfb-run dbus-run-session make ${makejobs} check
 }
 
 post_install() {

From a4d13c908ca2fcdcdd2b4c6e961e66b0f2d28277 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 08:56:56 +0200
Subject: [PATCH 061/447] amdvlk: update to 2021.Q2.2.

---
 srcpkgs/amdvlk/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a525ce00ae11..a8b6d0c7fcb8 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q2.1
+version=2021.Q2.2
 revision=1
-_llpc_commit=a8ec3c6e6372dcfd812a2ea592141a821e9584b1
-_xgl_commit=e1be7ee14c39d3a36d9d1aacd00caf3acc437cde
-_pal_commit=83635fbee82fb21662a4737e34437c41172c6fe0
-_llvm_project_commit=b0392f639492720b268697f4261aaccfa3459537
+_llpc_commit=28c4e99487ebe0a8b5801f56b876df6b33903554
+_xgl_commit=f1467f0dfd3dccd643214574ebfbe456a55d03bd
+_pal_commit=0168557a0715bf47a55ffe9858276cde1e74cc1d
+_llvm_project_commit=d2e97f4879565c9292f9177debbc7c65ead6ab84
 _spvgen_commit=59823e6c3557cb7f3fae4a9f2760ad3f6b694997
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="c491929f959404527816ec9a88755916282aceeb191cd7bfb0440682e202e186
- f585fd7d43985cb396f8470781f80229018bedc96aae7939b979015ce1caf064
- a999ff6400b0e16b4f47dd9fb063b071ec5b8226f5bca84d58e6a9f52a36966c
- ad36dab535943239357fc6101e9d4be532e950366d97f761f8cb63a6f4ee755d
- 18665c4ba9bc80179315f18c877c3a9e9790e53e2ceb3090c03bc2510f30652e
+checksum="fab8c7db5600d418178d470d19b5507f8bd6166a1fca05abc595f77b2052865e
+ 0a9eacee11c53af5f3fe39d367571e55da9d20bc97d6a2bd8ccd32655c13db7f
+ 09f8c905367b57a9932a3bc7b5d013045906a515f1c8d34eea37e11ea3f71d38
+ a6450459e839c5ccf546b26115f831dcdc76a7878f91fc589a35bf258474b3a2
+ e108164d5f06412fe8be56afb8f393def6e1a280f511f82061852af9be4dd9b6
  124e37608f2ef49a980c3fff9cc73bcb154c9724ee00397e0dee6cc8cf1b4244
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"

From 3e6bbb6292cab0d387743889ad53252ef9c8de77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 23:36:13 +0200
Subject: [PATCH 062/447] qt5: update to 5.15.3+20210429.

switch to the KDE patchset
---
 srcpkgs/qt5/template | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index c8e93578e94d..08c7badefa18 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,8 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
-version=5.15.2
-revision=5
-wrksrc="qt-everywhere-src-${version}"
+version=5.15.3+20210429
+revision=1
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -21,8 +20,12 @@ short_desc="Cross-platform application and UI framework (QT5)"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
-checksum=3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240
+# https://pypi.org/project/git-archive-all
+# tarball is generated with `git archive-all qt5-$version.tar.gz`
+# to keep the size smaller qtwebengine, qtwebview, qtdocgallery, qtactiveqt and qtpim
+# can be marked with the export-ignore attribute
+distfiles="https://void.johnnynator.dev/distfiles/qt5-${version}.tar.gz"
+checksum=6936ecf7c35162832bde5b5685f24c0924868745983f030e377924c1d80f68d1
 python_version=2 #unverified
 replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
@@ -170,6 +173,12 @@ _msg_cross() {
 	msg_normal "***************************************************\n"
 }
 
+post_extract() {
+	find -maxdepth 1 -type d -exec mkdir -p {}/.git \;
+	# just keep module_version at 5.15.2, since some external modules are still 5.15.2
+	find -maxdepth 1 -type d -exec sed -e "/^MODULE_VERSION/s/5.*/5.15.2/" -i {}/.qmake.conf \;
+}
+
 do_configure() {
 	local opts spec
 
@@ -184,11 +193,6 @@ do_configure() {
 			${wrksrc}/qtbase/mkspecs/common/gcc-base.conf
 		vsed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${XBPS_LDFLAGS}|" \
 			${wrksrc}/qtbase/mkspecs/common/g++-unix.conf
-
-		# Create symbolic links for private include directories
-		for d in $(ls ${wrksrc}/qtbase/include); do
-			ln -sfv ${version}/${d}/private qtbase/include/${d}/private
-		done
 	else
 		# qmake {CXX,L}FLAGS patches
 		vsed -i -e "s|^\(CXXFLAGS =.*\)|\1 ${CXXFLAGS}|" \
@@ -241,6 +245,9 @@ do_configure() {
 	# opts+=" -v"
 	opts+=" -skip qtwebengine"
 	opts+=" -skip qtwebview"
+	opts+=" -skip qtdocgallery"
+	opts+=" -skip qtpim"
+	opts+=" -skip qtsystems"
 	LDFLAGS+=" -Wl,--no-keep-memory"  # needs more than 8GB RAM else
 	if [ "$CROSS_BUILD" ]; then
 		spec=void-${XBPS_CROSS_TRIPLET}-g++

From 58520677b001c9b8ceb438fb63ec7f50e88dc4d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 12:55:04 +0200
Subject: [PATCH 063/447] kwin: rebuild against qt5.15.3

---
 srcpkgs/kwin/template | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 0306c2416f00..4f0312a39da0 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,7 +1,7 @@
 # Template file for 'kwin'
 pkgname=kwin
 version=5.21.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext breeze pkg-config"
@@ -10,7 +10,7 @@ makedepends="plasma-framework-devel kcmutils-devel knewstuff-devel
  kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel
  libICE-devel xcb-util-wm-devel qt5-sensors-devel libcap-devel lcms2-devel
  kwayland-server-devel $(vopt_if pipewire pipewire-devel) krunner-devel"
-depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.15.3"
+depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.16.0"
 short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
@@ -30,19 +30,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-post_extract() {
-	_qt5_dep_ver="${depends#*>=}"
-	_qt5_dep_ver="${_qt5_dep_ver%<*}"
-	_qt5_version="$(xbps-uhelper version qt5-core)"
-
-	if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then
-		echo
-		msg_red "Qt5 version doesn't match version listed in \$depends\\n"
-		msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n"
-		exit 1
-	fi
-}
-
 kwin-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"

From 8e4af7b106e938b87cb05b92a45e837916be55ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 12:55:15 +0200
Subject: [PATCH 064/447] telegram-desktop: rebuild against qt5.15.3

---
 srcpkgs/telegram-desktop/template | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 275c91163861..30a1d2ec6eec 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.7.4
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"
@@ -18,7 +18,7 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
  MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel
  xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel)
  kwayland-devel glibmm-devel tg_owt webkit2gtk-devel"
-depends="qt5-imageformats qt5-core>=5.15.2<5.15.3"
+depends="qt5-imageformats qt5-core>=5.15.2<5.16.0"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, OpenSSL"
@@ -45,16 +45,3 @@ fi
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="UI doesn't go beyond initial screen, also LE specific code in networking"
 fi
-
-post_extract() {
-	_qt5_dep_ver="${depends#*>=}"
-	_qt5_dep_ver="${_qt5_dep_ver%<*}"
-	_qt5_version="$(xbps-uhelper version qt5-core)"
-
-	if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then
-		echo
-		msg_red "Qt5 version doesn't match version listed in \$depends\\n"
-		msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n"
-		exit 1
-	fi
-}

From 20df026e43346bcbe80546b2850a3d1b5e875429 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 12:55:29 +0200
Subject: [PATCH 065/447] qt5-styleplugins: rebuild against qt5.15.3

---
 srcpkgs/qt5-styleplugins/template | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 9e6b476ff2ea..24b958640164 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -7,7 +7,7 @@ wrksrc="qtstyleplugins-${_gitrev}"
 build_style=qmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
-depends="qt5-core>=5.15.2<5.15.3"
+depends="qt5-core>=5.15.2<5.16.0"
 short_desc="Additional style plugins for Qt5"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, LGPL-3.0-only"
@@ -18,19 +18,6 @@ checksum=29ec24fa8df64be161ad06d0e5af3ba1a20bfe265004f5fe4ab9f5f3abf9a5ba
 # Cross builds fail with -fuse-ld=gold
 LDFLAGS="-Wl,-fuse-ld=bfd"
 
-pre_configure() {
-	_qt5_dep_ver="${depends#*>=}"
-	_qt5_dep_ver="${_qt5_dep_ver%<*}"
-	_qt5_version="$(xbps-uhelper version qt5-core)"
-
-	if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then
-		echo
-		msg_red "Qt5 version doesn't match version listed in \$depends\\n"
-		msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n"
-		exit 1
-	fi
-}
-
 qt5-styleplugins-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From fde35fb27bf17ea37dee69c9eee472f74778c648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 3 May 2021 08:18:27 -0300
Subject: [PATCH 066/447] linux5.11: update to 5.11.18.

---
 srcpkgs/linux5.11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 2d3c7f571db3..7947410e0e18 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
-version=5.11.17
+version=5.11.18
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
- b30eb037f7225230cdc4c800fc19447ed0b45220138830c1f3f2c020214a4a0a"
+ 352795f98bb046cfe0fbdf9ed91a50886ad01f05c4496a241e3f182e3784001a"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From b051155bb20681b5476f8691f7357884c47dff9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 3 May 2021 11:16:20 -0300
Subject: [PATCH 067/447] qt5-styleplugins: actually rebuild against qt5.15.3.

---
 srcpkgs/qt5-styleplugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 24b958640164..4399c87d86cd 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-styleplugins'
 pkgname=qt5-styleplugins
 version=5.0.0
-revision=15
+revision=16
 _gitrev=335dbece103e2cbf6c7cf819ab6672c2956b17b3
 wrksrc="qtstyleplugins-${_gitrev}"
 build_style=qmake

From 345efd3beda32d47987c763fd099c48ac2215a17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 16:17:22 +0200
Subject: [PATCH 068/447] re: update to 2.0.1.

---
 common/shlibs       | 2 +-
 srcpkgs/re/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 995c9750a41f..1b284ac33ef2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3366,7 +3366,7 @@ libhtmlcxx.so.3 htmlcxx-0.86_1
 libcss_parser_pp.so.0 htmlcxx-0.86_1
 libcss_parser.so.0 htmlcxx-0.86_1
 libaom.so.2 libaom-2.0.0_1
-libre.so re-1.1.0_2
+libre.so.1 re-2.0.1_1
 libspandsp.so.2 spandsp-0.0.6_1
 libspa-alsa.so libspa-alsa-0.3.6_1
 libspa-audioconvert.so libspa-audioconvert-0.3.6_1
diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 3bef9dc2b477..726ba0360748 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,7 +1,7 @@
 # Template file for 're'
 pkgname=re
-version=1.1.0
-revision=2
+version=2.0.1
+revision=1
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://github.com/baresip/re/"
 distfiles="https://github.com/baresip/re/archive/v${version}.tar.gz"
-checksum=82afc903a6b1e436b357f05eb11560ec681712291dd9c83c408465c895f28b5d
+checksum=43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed
 shlib_provides="libre.so"
 
 case $XBPS_TARGET_MACHINE in

From 8a349a21f590fe0ebbfa96ddbffe42df35d46f2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 16:17:40 +0200
Subject: [PATCH 069/447] baresip: update to 1.1.0.

---
 srcpkgs/baresip/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 7b8adf6f4e08..203250ecebfe 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,18 +1,18 @@
 # Template file for 'baresip'
 pkgname=baresip
-version=1.0.0
-revision=2
+version=1.1.0
+revision=1
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
  LIBRE_SO=${XBPS_CROSS_BASE}/usr/lib LIBDIR=/usr/lib${XBPS_TARGET_WORDSIZE}
- EXTRA_MODULES=$(vopt_if video snapshot) USE_ALSA=yes USE_GST=yes USE_GST_VIDEO=yes
+ USE_SNAPSHOT=$(vopt_if video yes) USE_ALSA=yes USE_GST=yes USE_GST_VIDEO=yes
  USE_OSS=yes USE_SDL=yes $(vopt_if video '' 'USE_AVCODEC=tes USE_AVFORMAT=yes
- USE_CAIRO=yes USE_SDL2=yes USE_V4L2=yes USE_VIDEO=yes USE_VPX=yes USE_X11=yes')
- $(vopt_if gtk '' 'USE_CAIRO=yes USE_GST1=yes USE_GST_VIDEO1=yes USE_GTK=yes')"
+ USE_SDL2=yes USE_V4L2=yes USE_VIDEO=yes USE_VPX=yes USE_X11=yes')
+ $(vopt_if gtk '' 'USE_GST1=yes USE_GST_VIDEO1=yes USE_GTK=yes')"
 make_install_args="$make_build_args"
 make_use_env=1
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config glib-devel"
 makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
@@ -25,7 +25,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://github.com/baresip/baresip"
 distfiles="https://github.com/baresip/baresip/archive/v${version}.tar.gz"
-checksum=7b008c0a5b4fccfa0a4003f86dc4aaafeaabbdd259ece4757898e9cb5f04fdcf
+checksum=f9230b27c4a62f31223847bc485c51f3d960f8a09f36998dedb73358e1784b4e
 
 # Package build options
 build_options="gtk video"

From e8c505f89ede9f1f460b45b032078d1b03ab9c91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 17:03:58 +0200
Subject: [PATCH 070/447] rem: update to 1.0.0.

---
 srcpkgs/rem/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/rem/template b/srcpkgs/rem/template
index 5278bb98653b..ac2b25e44751 100644
--- a/srcpkgs/rem/template
+++ b/srcpkgs/rem/template
@@ -1,7 +1,7 @@
 # Template file for 'rem'
 pkgname=rem
-version=0.6.0
-revision=2
+version=1.0.0
+revision=1
 build_style=gnu-makefile
 make_build_args="EXTRA_CFLAGS=$CFLAGS EXTRA_LFLAGS=$LDFLAGS RELEASE=1
  LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk \
@@ -13,9 +13,9 @@ makedepends="re-devel"
 short_desc="Library for real-time audio and video processing"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
-homepage="https://github.com/creytiv/rem"
-distfiles="https://github.com/creytiv/rem/archive/v${version}.tar.gz"
-checksum=fb04e691161eea23c238362b210351d7a19a23691cf31db7d64e364320f18a33
+homepage="https://github.com/baresip/rem"
+distfiles="https://github.com/baresip/rem/archive/v${version}.tar.gz"
+checksum=bcc91bb521fae183357fb422b00a3981477a22e99d3afe165c4ec50a6bbed9da
 shlib_provides="librem.so"
 
 case $XBPS_TARGET_MACHINE in

From 81a158d9059b2ed1aa47e63ea2b3a5319eae3756 Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Mon, 3 May 2021 15:10:25 +0100
Subject: [PATCH 071/447] strongswan: enable options that are required for
 MSCHAPv2.

According to the documentation [1], StrongSwan needs --enable-md4 for
eap-mschapv2 to work. Moreover, many EAP-MSCHAPv2 based VPNs require
--enable-eap-identity and --enable-eap-dynamic to correctly work. This
commit simply adds these flags in the StrongSwan `template` file.

https://wiki.strongswan.org/projects/strongswan/wiki/AutoConf
---
 srcpkgs/strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/strongswan/template b/srcpkgs/strongswan/template
index f0be1ff9bdc3..e0e416ad5469 100644
--- a/srcpkgs/strongswan/template
+++ b/srcpkgs/strongswan/template
@@ -1,12 +1,12 @@
 # Template file for 'strongswan'
 pkgname=strongswan
 version=5.8.4
-revision=1
+revision=2
 build_style=gnu-configure
 # tpm support waits on libtss2
-configure_args="--disable-static --enable-blowfish --enable-curl
- --enable-eap-radius --enable-eap-mschapv2 --enable-eap-md5 --enable-led
- --enable-ha --enable-dhcp --enable-mediation --enable-soup --disable-des
+configure_args="--disable-static --enable-blowfish --enable-curl --enable-md4
+ --enable-eap-radius --enable-eap-mschapv2 --enable-eap-md5 --enable-eap-identity --enable-eap-dynamic
+ --enable-led --enable-ha --enable-dhcp --enable-mediation --enable-soup --disable-des
  --enable-chapoly --enable-nm"
 hostmakedepends="pkg-config flex bison python"
 makedepends="gmp-devel libsoup-devel libldns-devel unbound-devel libcurl-devel NetworkManager-devel"

From a1c09da786ea345c126c97918130ca5222cc9311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 2 May 2021 10:43:51 +0700
Subject: [PATCH 072/447] libtls: patch for certs.pem

---
 srcpkgs/libtls/patches/fix-cert-perm.patch | 29 ++++++++++++++++++++++
 srcpkgs/libtls/template                    |  8 ++----
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libtls/patches/fix-cert-perm.patch

diff --git a/srcpkgs/libtls/patches/fix-cert-perm.patch b/srcpkgs/libtls/patches/fix-cert-perm.patch
new file mode 100644
index 000000000000..338d25863715
--- /dev/null
+++ b/srcpkgs/libtls/patches/fix-cert-perm.patch
@@ -0,0 +1,29 @@
+Index: libressl-3.2.4/apps/nc/nc.1
+===================================================================
+--- libressl-3.2.4.orig/apps/nc/nc.1
++++ libressl-3.2.4/apps/nc/nc.1
+@@ -219,7 +219,7 @@ Cannot be used together with
+ Load the root CA bundle for TLS certificate verification from
+ .Ar CAfile ,
+ in PEM format, instead of
+-.Pa /etc/ssl/cert.pem .
++.Pa /etc/ssl/certs.pem .
+ Requires
+ .Fl c .
+ .It Fl r
+Index: libressl-3.2.4/tls/Makefile.am
+===================================================================
+--- libressl-3.2.4.orig/tls/Makefile.am
++++ libressl-3.2.4/tls/Makefile.am
+@@ -18,9 +18,9 @@ libtls_la_LIBADD += $(PLATFORM_LDADD)
+ 
+ libtls_la_CPPFLAGS = $(AM_CPPFLAGS)
+ if OPENSSLDIR_DEFINED
+-libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"@OPENSSLDIR@/cert.pem\"
++libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"@OPENSSLDIR@/certs.pem\"
+ else
+-libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"$(sysconfdir)/ssl/cert.pem\"
++libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"$(sysconfdir)/ssl/certs.pem\"
+ endif
+ 
+ libtls_la_SOURCES = tls.c
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index cd46d748bb03..a163b69eee98 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
 # Template file for 'libtls'
 pkgname=libtls
 version=3.2.5
-revision=1
+revision=2
 wrksrc="libressl-${version}"
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -21,6 +21,7 @@ build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
 build_options_default="asm"
+patch_args=-Np1
 
 if [ "$build_option_asm" ]; then
 	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
@@ -49,11 +50,6 @@ pre_configure() {
 do_install() {
 	make -C tls install DESTDIR="$DESTDIR"
 	make -C apps/nc install DESTDIR="$DESTDIR"
-	# libtls expects certs linked to /etc/ssl/cert.pem
-	# instead of OpenSSL's /etc/ssl/certs.pem
-	# Create a symlink for now while awaiting discussion.
-	vmkdir etc/ssl
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams

From 7c3540da72df1431e486be1c19591eb93dbd71af Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 20:44:38 +0200
Subject: [PATCH 073/447] python3-boto3: update to 1.17.62.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index c376eedc533b..c80aa31bbed8 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.49
+version=1.17.62
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=08c4ee7dbcf5814555aeb2fed8496ab4165b8e3878acf2fcfd81f8d233f78ada
+checksum=f15caa30dba8e109409a05c5efa27b36935acccf09830af559f922039d1a8b98
 
 post_install() {
 	vlicense LICENSE

From cae478cd0a5659197855c0522994b414a253ec00 Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Tue, 20 Apr 2021 20:20:25 +0200
Subject: [PATCH 074/447] moby: update to 20.10.6.

---
 srcpkgs/moby/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 6d8ef4e83729..50e198d91574 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -1,8 +1,8 @@
 # Template file for 'moby'
 pkgname=moby
-version=20.10.5
+version=20.10.6
 revision=1
-_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+_libnetwork_commit=b3507428be5b458cb0e2b4086b13531fb0706e46
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
@@ -10,13 +10,13 @@ hostmakedepends="pkg-config"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd iptables xz"
 short_desc="Container engine for the Docker ecosystem"
-maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+maintainer="PWA COLLECTIVE <pwa@cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
 distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
  https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
- 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+checksum="fd7f5571b1f64f26b5ca520a3e1fefb33c190f3732b931051c23a76bdba5000e
+ 90a8dc84bc5d2d74dee0b2c3544f8786598ff85e9fc9f6a55a15b60b7cd78d63"
 system_groups="docker"
 
 _moby_builddir="moby-$version"

From fda6a3b388151c42a0ea74915f86f92f8b4a2fe8 Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Tue, 20 Apr 2021 20:20:28 +0200
Subject: [PATCH 075/447] docker-cli: update to 20.10.6.

---
 srcpkgs/docker-cli/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index c337e08b39fa..8299aba7846c 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'docker-cli'
 pkgname=docker-cli
-version=20.10.5
+version=20.10.6
 revision=2
 wrksrc="cli-${version}"
 build_style=go
@@ -12,11 +12,11 @@ go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
 hostmakedepends="pkg-config"
 depends="git"
 short_desc="Command-line interface for the Docker daemon"
-maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+maintainer="PWA COLLECTIVE <pwa@cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
-checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+checksum=eda53b96ab83a59502df2e5e00ab7ee867243259407ef454be55e695303c1113
 system_groups="docker"
 
 pre_build() {
@@ -32,5 +32,5 @@ post_install() {
 docker_package() {
 	build_style="meta"
 	short_desc="Docker container runtime"
-	depends="${sourcepkg}>=${version}_${revision} moby"
+	depends="${sourcepkg}>=${version}_${revision} moby tini"
 }

From abb2a11abd97362e80f04061deea2744279a5348 Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Tue, 20 Apr 2021 20:20:32 +0200
Subject: [PATCH 076/447] New package: tini-0.19.0

---
 srcpkgs/tini/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/tini/template

diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
new file mode 100644
index 000000000000..fb18b07ba3f2
--- /dev/null
+++ b/srcpkgs/tini/template
@@ -0,0 +1,17 @@
+# Template file for 'tini'
+pkgname=tini
+version=0.19.0
+revision=1
+build_style=cmake
+short_desc="Tiny but valid init for containers"
+maintainer="PWA COLLECTIVE <pwa@cya.cx>"
+license="MIT"
+homepage="https://github.com/krallin/tini"
+distfiles="https://github.com/krallin/tini/archive/refs/tags/v$version.tar.gz"
+checksum=0fd35a7030052acd9f58948d1d900fe1e432ee37103c5561554408bdac6bbf0d
+CFLAGS="-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"
+
+post_install() {
+	vlicense LICENSE
+	ln -s tini-static $DESTDIR/usr/bin/docker-init
+}

From 212dcd800f96abd4ed1d2dec91cd54c82a7854aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 20:55:11 +0200
Subject: [PATCH 077/447] dav: fix update-check.

---
 srcpkgs/dav/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/dav/update

diff --git a/srcpkgs/dav/update b/srcpkgs/dav/update
new file mode 100644
index 000000000000..68ec641047fb
--- /dev/null
+++ b/srcpkgs/dav/update
@@ -0,0 +1 @@
+pkgname='dav-text'

From 6260f073d17aead202934d02056b5e658f88aeb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:03:52 +0200
Subject: [PATCH 078/447] di: update to 4.50.

---
 srcpkgs/di/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 98a043a659e1..65f56f604143 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,14 +1,14 @@
 # Template file for 'di'
 pkgname=di
-version=4.48
+version=4.50
 revision=1
 build_style=gnu-makefile
 short_desc="A disk information utility"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Zlib"
-homepage="https://gentoo.com/di"
-distfiles="https://gentoo.com/di/${pkgname}-${version}.tar.gz"
-checksum=19d549feb59ccde7ff1cd2c48fea7b9ba99fa2285da81424603e23d8b5db3b33
+homepage="https://diskinfo-di.sourceforge.io/"
+distfiles="${SOURCEFORGE_SITE}/diskinfo-di/di-${version}.tar.gz"
+checksum=82f08b6c2549fd6ab2e9cb596135a70883ffd4136d176466ae0ec9ba67a3492a
 make_install_args="INSTALL_DIR=\${DESTDIR}/usr"
 
 post_install() {

From da77cc54025893cf530afe74c029a4dca00deeca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:06:56 +0200
Subject: [PATCH 079/447] hunspell-de_DE: fix update-check.

---
 srcpkgs/hunspell-de_DE/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hunspell-de_DE/update b/srcpkgs/hunspell-de_DE/update
index b2cf8b29bff3..0f916eb6f5f4 100644
--- a/srcpkgs/hunspell-de_DE/update
+++ b/srcpkgs/hunspell-de_DE/update
@@ -1,2 +1,2 @@
-pattern='<span>\K[-_.\d]+(?=</span></a>)'
+pattern='<span>\K[-_.\d]+(?=</span>)'
 version="${_version}"

From b73a5684017d6664293b617590c998cb58f5ca01 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:09:12 +0200
Subject: [PATCH 080/447] iana-etc: update to 20210429.

---
 srcpkgs/iana-etc/files/services | 12 +++++++-----
 srcpkgs/iana-etc/template       |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index eff20e860d08..3c877335d01a 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -238,7 +238,6 @@ emfis-cntl        141/udp
 bl-idm            142/tcp
 bl-idm            142/udp
 imap              143/tcp
-imap              143/udp
 uma               144/tcp
 uma               144/udp
 uaac              145/tcp
@@ -1375,7 +1374,6 @@ nas               991/udp
 telnets           992/tcp
 telnets           992/udp
 imaps             993/tcp
-imaps             993/udp
 pop3s             995/tcp
 pop3s             995/udp
 vsinet            996/tcp
@@ -2391,7 +2389,9 @@ pdap-np          1526/tcp
 pdap-np          1526/udp
 tlisrv           1527/tcp
 tlisrv           1527/udp
-ngr-t            1528/udp
+norp             1528/tcp
+norp             1528/udp
+norp             1528/sctp
 coauthor         1529/tcp
 coauthor         1529/udp
 rap-service      1530/tcp
@@ -8861,8 +8861,8 @@ spramsd          5770/tcp
 spramsd          5770/udp
 netagent         5771/tcp
 netagent         5771/udp
-dali-port        5777/tcp
-dali-port        5777/udp
+starfield-io     5777/tcp
+starfield-io     5777/udp
 vts-rpc          5780/tcp
 3par-evts        5781/tcp
 3par-evts        5781/udp
@@ -8930,6 +8930,7 @@ nuxsl            5991/udp
 consul-insight   5992/tcp
 consul-insight   5992/udp
 cim-rs           5993/tcp
+rms-agent        5994/tcp
 cvsup            5999/tcp
 cvsup            5999/udp
 x11              6000/tcp
@@ -9764,6 +9765,7 @@ http-alt         8008/udp
 nvme-disc        8009/tcp
 cfg-cloud        8015/tcp
 ads-s            8016/tcp
+cisco-cloudsec   8017/udp
 qbdb             8019/tcp
 qbdb             8019/udp
 intu-ec-svcdisc  8020/tcp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index 5f8eacb33041..c296edefc474 100644
--- a/srcpkgs/iana-etc/template
+++ b/srcpkgs/iana-etc/template
@@ -1,7 +1,7 @@
 # Template file for 'iana-etc'
 pkgname=iana-etc
 reverts="202001016_1"
-version=20210106
+version=20210429
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"

From 4945a7001e50fb82ae4ccc524ea9cafc9bfbedfc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:13:02 +0200
Subject: [PATCH 081/447] k9s: update to 0.24.8.

---
 srcpkgs/k9s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 6ceec1f3e0ad..7232ec025e1b 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.6
+version=0.24.8
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=72cce161786273f203421e93d8b22bfa7659fecdf2d0f018a5dc113302ba3958
+checksum=347048203464fd022c70f40b5f8b37c0374af083e514a39b49c5993f7886f2bf

From 506b9934cba96dbdac7d37d240164572f76f14d1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:30:28 +0200
Subject: [PATCH 082/447] puzzles: update to 20210427.8ff394d.

---
 srcpkgs/puzzles/template | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/puzzles/template b/srcpkgs/puzzles/template
index 9b75048b1a9c..cda5ec6b2850 100644
--- a/srcpkgs/puzzles/template
+++ b/srcpkgs/puzzles/template
@@ -1,28 +1,19 @@
 # Template file for 'puzzles'
 pkgname=puzzles
-version=20200609.9aa7b7c
+version=20210427.8ff394d
 revision=1
 wrksrc="${pkgname}-${version#*.}"
-hostmakedepends="pkg-config perl"
-makedepends="gtk+-devel"
+build_style=cmake
+configure_args="-DNAME_PREFIX=puzzles-"
+hostmakedepends="pkg-config"
+makedepends="gtk+3-devel"
 short_desc="Simon Tatham's Portable Puzzle Collection"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=9aa7b7cdfb2bcd200f45941a58d6ae698882a2d4;sf=tgz>${wrksrc}.tgz"
-checksum=855a548a7b2485ca80a1c83eeb7fdb35b01500faae986e7ba9b8da9a2f0c9060
+distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=8ff394d1cc42efc3509135bbdd6ce92498eafcf3;sf=tgz>${wrksrc}.tgz"
+checksum=54c507b3e6607344e9c4d6ab7beb29369ffeaacf3bbd258c6e76432d35f0ad60
 
-do_build() {
-	sed -i 's/-Werror -ansi -pedantic//' mkfiles.pl
-	./mkfiles.pl
-	echo "XLIBS += ${LDFLAGS}" >>Makefile.gtk
-	echo "ULIBS += ${LDFLAGS}" >>Makefile.gtk
-	make ${makejobs} -f Makefile.gtk prefix=/usr BINPREFIX=puzzles-
-}
-
-do_install() {
-	vmkdir usr/bin
-	make -f Makefile.gtk prefix=/usr gamesdir=/usr/bin \
-		DESTDIR="${DESTDIR}" BINPREFIX=puzzles- install
+post_install() {
 	vlicense LICENCE LICENSE
 }

From f3af1321180547e6a887b6a2f81990189416701f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:36:52 +0200
Subject: [PATCH 083/447] python3-pyinfra: update to 1.4.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index e14fcad29d7b..e505474c00a8 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.3.11
+version=1.4
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=415977585103aa42bfb1aeb9f627bd19d270d5deb4cb4a516b1d5cc445631388
+checksum=7e23bf20ace5f5c6f15d8c712c304b34ec1e93d42abcf28be11734f1baaf0391
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From f92ba4635f9a5216a3b5535f4be873ee632e3cf2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:40:59 +0200
Subject: [PATCH 084/447] qiv: fix update-check.

---
 srcpkgs/qiv/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qiv/update b/srcpkgs/qiv/update
index 96c8a5defc82..c5e5278278b2 100644
--- a/srcpkgs/qiv/update
+++ b/srcpkgs/qiv/update
@@ -1,2 +1,2 @@
-site=https://bitbucket.org/ciberandy/qiv/downloads/?tab=tags
-pattern='/get/v?\K[\d.]+(?=\.tar)'
+site=http://spiegl.de/qiv/download/
+pattern='qiv-\K[\d.]+(?=\.tgz">)'

From c03ec21c2297f2434a0061930d929a708172b8ba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:46:58 +0200
Subject: [PATCH 085/447] schilytools: update to 2021.04.21.

---
 srcpkgs/schilytools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/schilytools/template b/srcpkgs/schilytools/template
index 341007f35cb3..dc2c974e1cc9 100644
--- a/srcpkgs/schilytools/template
+++ b/srcpkgs/schilytools/template
@@ -1,6 +1,6 @@
 # Template file for 'schilytools'
 pkgname=schilytools
-version=2021.01.05
+version=2021.04.21
 revision=1
 wrksrc="schily-${version//./-}"
 build_style=meta
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CDDL-1.0"
 homepage="https://sourceforge.net/projects/schilytools/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/schily-${version//./-}.tar.bz2"
-checksum=20bfdaf57fa63b9613aa0d96f2ad0bfdf0c07722bc46f3146bac667a90e2dfe1
+checksum=4c2666b872269cf36318c957d1125aea1946a20ede4e989ce5ed864cdfcfddb1
 nocross=yes  # configure + re-builds with itself
 
 do_build() {

From ef08e5fb4e450bfe82e7cf1b5e47616faeddd8f9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:47:24 +0200
Subject: [PATCH 086/447] ugrep: update to 3.2.

---
 srcpkgs/ugrep/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 5c72c4d86d0b..4e252fe1a62d 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,16 +1,17 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.15
+version=3.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
-makedepends="bzip2-devel liblz4-devel liblzma-devel pcre2-devel zlib-devel"
+makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
+ zlib-devel"
 short_desc="Ultra fast grep with interactive query UI"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a34457751f1b99d12a98404d04bfe96c16fdf0960df7e9141b03e41ed0a62de8
+checksum=e5b4d7b2e4a87b34416200d068dc1984967f980418670fa6b08268edf00a4a9d
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From c2c0bf1aea66ce37ff6ae19dbd157711850f501d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:58:34 +0200
Subject: [PATCH 087/447] erlang: update to 23.3.2.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 549c0df7bd5b..1c7b6df1d093 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.3.1
+version=23.3.2
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=a5a067a3b17bbef8511f2c056957925b666670b6f2cdaf645e1bc28ce3dd3517
+checksum=02443dd42023d0eb73f73dc05f4d3ded7bc4ab59d348041a37a045ba1581b48b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 53c10c9af67c82db0fa8ea39ec22899f6dd2b4ec Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Mon, 3 May 2021 21:40:27 +0200
Subject: [PATCH 088/447] musikcube: update to 0.96.7

---
 .../patches/use-pkg-config-for-pipewire.patch  | 18 ------------------
 srcpkgs/musikcube/template                     |  4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch

diff --git a/srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch b/srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch
deleted file mode 100644
index e98bf1f7955b..000000000000
--- a/srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git src/plugins/pipewireout/CMakeLists.txt src/plugins/pipewireout/CMakeLists.txt
-index 7c24320d..233adab2 100644
---- src/plugins/pipewireout/CMakeLists.txt
-+++ src/plugins/pipewireout/CMakeLists.txt
-@@ -7,10 +7,8 @@ ensure_library_exists(pipewire-0.3)
- 
- message(STATUS "[pipewireout] plugin enabled")
- 
--include_directories("/usr/include/spa-0.2")
--include_directories("/usr/local/include/spa-0.2")
--include_directories("/usr/include/pipewire-0.3")
--include_directories("/usr/local/include/pipewire-0.3")
-+find_package(PkgConfig)
-+pkg_check_modules(PIPEWIRE REQUIRED IMPORTED_TARGET libpipewire-0.3)
- 
- add_library(pipewireout SHARED ${pipewireout_SOURCES})
--target_link_libraries(pipewireout ${musikcube_LINK_LIBS} pipewire-0.3)
-+target_link_libraries(pipewireout ${musikcube_LINK_LIBS} PkgConfig::PIPEWIRE)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 7a217ebb96e2..c786f86bef31 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,6 +1,6 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.96.6
+version=0.96.7
 revision=1
 build_style=cmake
 make_cmd=make
@@ -16,7 +16,7 @@ maintainer="eater <=@eater.me>"
 license="BSD-3-Clause"
 homepage="https://musikcube.com/"
 distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=3d3512ae03ff5a233de8d6787417b32731e50d813035fd49188b2fca66c6d21e
+checksum=81922ec6e86c06061dc009be3ec7c4bc8e8fd5ed3bb92231dabede8bbccaf723
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 7c56b705c12764c71f1bb3799f07351fe4e2fd14 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 May 2021 15:50:46 -0500
Subject: [PATCH 089/447] manuskript: update to 0.12.0.

---
 srcpkgs/manuskript/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/manuskript/template b/srcpkgs/manuskript/template
index 2f9f58d6d734..a390bebbb4d9 100644
--- a/srcpkgs/manuskript/template
+++ b/srcpkgs/manuskript/template
@@ -1,7 +1,7 @@
 # Template file for 'manuskript'
 pkgname=manuskript
-version=0.11.0
-revision=2
+version=0.12.0
+revision=1
 pycompile_dirs="usr/share/${pkgname}"
 hostmakedepends="python3-setuptools"
 depends="python3-enchant python3-lxml python3-Markdown python3-PyQt5 qt5-svg"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.theologeek.ch/manuskript"
 distfiles="https://github.com/olivierkes/manuskript/archive/${version}.tar.gz"
-checksum=bed0114c5d7787df07b420aa4909a7ae216e1581147058e03fda4c07deef8ef8
+checksum=72e5f8111573ad110f43ba385f7346243bd0823ad1f910e38929b24cb77289ea
 python_version=3
 
 do_install() {

From f8ea740a7b262a03f4bebba6509b7790fcaaf5c3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 May 2021 15:56:22 -0500
Subject: [PATCH 090/447] oidentd: update to 2.5.1.

---
 srcpkgs/oidentd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 54a87348bb85..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=c2d2d0b8a75290590c1df86996b92625246d6111904b83c88e2b4ec73993a83d
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd

From df5d5d8436698fcf1b9664add1ab0b4ab439e871 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 May 2021 16:23:37 -0500
Subject: [PATCH 091/447] bucklespring: updated to 1.5.0.

---
 srcpkgs/bucklespring-data     |  1 -
 srcpkgs/bucklespring/template | 17 +++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/bucklespring-data

diff --git a/srcpkgs/bucklespring-data b/srcpkgs/bucklespring-data
deleted file mode 120000
index 0674b0bb18f6..000000000000
--- a/srcpkgs/bucklespring-data
+++ /dev/null
@@ -1 +0,0 @@
-bucklespring
\ No newline at end of file
diff --git a/srcpkgs/bucklespring/template b/srcpkgs/bucklespring/template
index 2e4568bb7466..0764042d75c0 100644
--- a/srcpkgs/bucklespring/template
+++ b/srcpkgs/bucklespring/template
@@ -1,19 +1,19 @@
 # Template file for 'bucklespring'
 pkgname=bucklespring
-version=1.4.0
-revision=2
+version=1.5.0
+revision=1
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PATH_AUDIO=/usr/share/${pkgname}/wav"
 hostmakedepends="pkg-config"
 makedepends="alure-devel libinput-devel libXtst-devel"
-depends="bucklespring-data"
 short_desc="Emulate the sound of the IBM Model-M while typing"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/zevv/bucklespring"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b38b2c0ec905573a243cb9db543f8eeb92e4d040025ef338d8bcfcfd5ccd5348
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=0b9505abde912775dd78d8396d2282a6d89e3ad3342b3f150c207becb40d34ab
+replaces="bucklespring-data>=0"
 
 if [ $XBPS_CROSS_BASE ]; then
 	make_build_args+=" CROSS=$XBPS_CROSS_TRIPLET-"
@@ -24,10 +24,3 @@ do_install() {
 	vmkdir usr/share/${pkgname}
 	vcopy wav usr/share/${pkgname}
 }
-
-bucklespring-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share
-	}
-}

From 462704ee709f34082d5ccf3eb360107bf6c216c9 Mon Sep 17 00:00:00 2001
From: Kye Shi <shi.kye@gmail.com>
Date: Mon, 3 May 2021 15:13:56 -0700
Subject: [PATCH 092/447] just: update to 0.9.2.

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index e351ac32ad68..087f95b40364 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=0.9.0
+version=0.9.2
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -9,7 +9,7 @@ license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
 distfiles="https://github.com/casey/just/archive/v${version}.tar.gz"
-checksum=877fdd517722ec1a554b046e1a9fd112f3503d91211702895c5ba12b29dcbcc6
+checksum=0f064d0ea9f3d8bbcd84c5e6a85243738bdb6f49d059f589fd6928c64ea6fb64
 
 # Fix failing test
 pre_check() {

From f1f48959c0b79696dce355c86269f4a651f3102f Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 3 May 2021 15:01:24 +0200
Subject: [PATCH 093/447] dbeaver: update to 21.0.4.

---
 .../patches/colortheme-plugin-update-url.patch      | 13 -------------
 srcpkgs/dbeaver/template                            |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch

diff --git a/srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch b/srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch
deleted file mode 100644
index c8c9b887c815..000000000000
--- a/srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
-index 173322136b..6b9034eab5 100644
---- plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
-+++ plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
-@@ -16,7 +16,7 @@
-     <repositories>
-         <repository>
-             <id>eclipse-color-theme</id>
--            <url>https://eclipse-color-theme.github.com/update</url>
-+            <url>https://eclipse-color-theme.github.io/update/</url>
-             <layout>p2</layout>
-         </repository>
-     </repositories>
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 839984621cd2..ad84b846cdcd 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.0.3
+version=21.0.4
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=1573aee8642e6f65edc41b08376873765ddde72146c8b374d7e1e7e4cbbb0844
+checksum=c946fa92679edabd41d5c5f482d2572e837860f0c62450aed9bbcd836aa00cf4
 nopie=true
 
 do_build() {

From 6d0dfedcb72dde591eaca0d5051533a8a3a06d4f Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 4 May 2021 12:19:42 +1000
Subject: [PATCH 094/447] hfsprogs: fix distfile

---
 srcpkgs/hfsprogs/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 41bd475db09e..f1e0c690511d 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -2,6 +2,7 @@
 pkgname=hfsprogs
 _distver=540.1
 _patchver=3
+_md5sum=0435afc389b919027b69616ad1b05709
 version="${_distver}.linux${_patchver}"
 revision=8
 wrksrc="diskdev_cmds-${version}"
@@ -10,8 +11,8 @@ makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"
-homepage="http://www.opensource.apple.com/"
-distfiles="http://cavan.codon.org.uk/~mjg59/diskdev_cmds/diskdev_cmds-${version}.tar.gz"
+homepage="https://www.opensource.apple.com/"
+distfiles="https://src.fedoraproject.org/repo/pkgs/hfsplus-tools/diskdev_cmds-${version}.tar.gz/${_md5sum}/diskdev_cmds-${version}.tar.gz"
 checksum=b01b203a97f9a3bf36a027c13ddfc59292730552e62722d690d33bd5c24f5497
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 98ff62bae03c721aee74e35f7e2a48fc9cfd422e Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Wed, 28 Apr 2021 10:17:07 -0700
Subject: [PATCH 095/447] orientdb: update to 3.1.11

---
 srcpkgs/orientdb/template | 13 ++++++-------
 srcpkgs/orientdb/update   |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/orientdb/template b/srcpkgs/orientdb/template
index fea95ed35e7d..c7c49f59af5b 100644
--- a/srcpkgs/orientdb/template
+++ b/srcpkgs/orientdb/template
@@ -1,18 +1,17 @@
 # Template file for 'orientdb'
 pkgname=orientdb
-version=2.2.29
-revision=2
+version=3.1.11
+revision=1
 archs="i686 x86_64"
 conf_files="/etc/${pkgname}/*"
-wrksrc="${pkgname}-community-${version}"
 depends="virtual?java-runtime"
 short_desc="Distributed Graph Database"
 maintainer="bougyman <bougyman@rubyists.com>"
 license="Apache-2.0"
-patch_args="-p1"
-homepage="http://orientdb.com"
-distfiles="http://www.orientdb.com/download.php?email=unknown@unknown.com&file=orientdb-community-${version}.tar.gz&os=linux>orientdb-community-${version}.tar.gz"
-checksum=0e4f5d5150afcfb509dcafd6dced587d70f521dab4e27980e30c76c69be78ea9
+homepage="https://orientdb.org"
+distfiles="https://s3.us-east-2.amazonaws.com/orientdb3/releases/${version}/orientdb-${version}.tar.gz"
+checksum=73830279a5587de17ea4f5864598a0829bb03212d6cd36d185fe126a46086236
+patch_args="-Np1"
 system_accounts="orientdb"
 
 do_install() {
diff --git a/srcpkgs/orientdb/update b/srcpkgs/orientdb/update
index 058609c20e84..7f4963322546 100644
--- a/srcpkgs/orientdb/update
+++ b/srcpkgs/orientdb/update
@@ -1,2 +1,2 @@
-site="https://orientdb.com/releases/"
-pattern="OrientDB v \K[\d\.]+"
+site="https://orientdb.org/download/"
+pattern="OrientDB \K[\d\.]+"

From 81931ecef6bc6837314a0334cf865d3ff54404a8 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 2 May 2021 23:49:49 -0400
Subject: [PATCH 096/447] python3-SecretStorage: update to 3.3.1.

---
 srcpkgs/python3-SecretStorage/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-SecretStorage/template b/srcpkgs/python3-SecretStorage/template
index d1ddbfb7a8fe..a2ff3a2fc457 100644
--- a/srcpkgs/python3-SecretStorage/template
+++ b/srcpkgs/python3-SecretStorage/template
@@ -1,18 +1,23 @@
 # Template file for 'python3-SecretStorage'
 pkgname=python3-SecretStorage
-version=3.2.0
+version=3.3.1
 revision=1
 wrksrc="SecretStorage-${version}"
 build_style=python3-module
-pycompile_module="secretstorage"
 hostmakedepends="python3-setuptools"
 depends="python3-jeepney python3-cryptography"
+checkdepends="gnome-keyring dbus ${depends}"
 short_desc="Python3 bindings to FreeDesktop.org Secret Service API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/mitya57/secretstorage"
 distfiles="${PYPI_SITE}/S/SecretStorage/SecretStorage-${version}.tar.gz"
-checksum=46305c3847ee3f7252b284e0eee5590fa6341c891104a2fd2313f8798c615a82
+checksum=fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195
+make_check=ci-skip
+
+do_check() {
+	dbus-run-session -- python3 -m unittest discover -s tests
+}
 
 post_install() {
 	vlicense LICENSE

From a7a5778dd174cc31842767bb010e87702842a973 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 May 2021 11:24:30 +0200
Subject: [PATCH 097/447] hwloc: update to 2.4.1.

---
 srcpkgs/hwloc/template | 4 ++--
 srcpkgs/hwloc/update   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
index 62a08bdd0bb5..a8fba4973b0b 100644
--- a/srcpkgs/hwloc/template
+++ b/srcpkgs/hwloc/template
@@ -1,6 +1,6 @@
 # Template file for 'hwloc'
 pkgname=hwloc
-version=2.3.0
+version=2.4.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.open-mpi.org/projects/hwloc/"
 distfiles="https://www.open-mpi.org/software/hwloc/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2"
-checksum=b607f6097873f69ef6b4b01e66e0dcb45f9939e8979827284664bbf0d4018a64
+checksum=392421e69f26120c8ab95d151fe989f2b4b69dab3c7735741c4e0a6d7de5de63
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";;
diff --git a/srcpkgs/hwloc/update b/srcpkgs/hwloc/update
index cd5e03873cba..0d6931bc97a2 100644
--- a/srcpkgs/hwloc/update
+++ b/srcpkgs/hwloc/update
@@ -1,2 +1,2 @@
-pattern='hwloc v\K[\d.rc]+'
+pattern='hwloc \K\d[\d.rc]+'
 ignore='*rc*'

From 6cd0dba1c99d82bde5d9efe9db9e17c352a00888 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 May 2021 11:24:41 +0200
Subject: [PATCH 098/447] quickjs: fix update-check.

---
 srcpkgs/quickjs/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/quickjs/update

diff --git a/srcpkgs/quickjs/update b/srcpkgs/quickjs/update
new file mode 100644
index 000000000000..f1638f92252d
--- /dev/null
+++ b/srcpkgs/quickjs/update
@@ -0,0 +1 @@
+pattern='quickjs-\K[\d-]+(?=.tar.xz)'

From ae4bf0a1ee5aa1eafdfd6270bc96120021cb0471 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 May 2021 11:26:08 +0200
Subject: [PATCH 099/447] k9s: update to 0.24.9.

---
 srcpkgs/k9s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 7232ec025e1b..7e3db09bf076 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.8
+version=0.24.9
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=347048203464fd022c70f40b5f8b37c0374af083e514a39b49c5993f7886f2bf
+checksum=d4a97a244d2320e42015505e4d78dd1a459adf822371e5e910f6b33027b290ae

From e0237b37d71e4dc531b61a8a90abd36a3803c082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Tue, 4 May 2021 13:52:02 +0200
Subject: [PATCH 100/447] intellij-idea-ultimate-edition: update to 2021.1.1.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 6b1e2474cd69..20b2c7cbd226 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1
+version=2021.1.1
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.6693.111"
+wrksrc="idea-IU-211.7142.45"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=fdfd7fda5b4215b9eea925e341f4947eda5319f1b92e1d0083457741e0555318
+checksum=31ce6b0173bc8e046b263d7ab5601e3e1d1535a8e14f54487ce8a7f3a525f1a7
 repository=nonfree
 restricted=yes
 nopie=yes

From 222ab444366ba8a20fd37e9b4e04944dcb666b27 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 4 May 2021 11:09:35 +0200
Subject: [PATCH 101/447] gparted: update to 1.3.0, mv INSTALL.msg to
 README.voidlinux

---
 srcpkgs/gparted/{INSTALL.msg => files/README.voidlinux} | 0
 srcpkgs/gparted/template                                | 5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename srcpkgs/gparted/{INSTALL.msg => files/README.voidlinux} (100%)

diff --git a/srcpkgs/gparted/INSTALL.msg b/srcpkgs/gparted/files/README.voidlinux
similarity index 100%
rename from srcpkgs/gparted/INSTALL.msg
rename to srcpkgs/gparted/files/README.voidlinux
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 50d6dbe4dece..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.2.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=6c90715d254d7a7ec0208b29007b64160dd9fb7df4c4aa7f8ec2c9d23114c719
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
@@ -26,4 +26,5 @@ pre_configure() {
 post_install() {
 	vinstall ${FILESDIR}/org.void.pkexec.gparted.policy 644 /usr/share/polkit-1/actions
 	vbin ${FILESDIR}/gparted-pkexec
+	vdoc "${FILESDIR}/README.voidlinux"
 }

From 966579c9128a539a8e01dc64b17174ba8a8fedce Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 4 May 2021 08:35:05 +0200
Subject: [PATCH 102/447] perl-DateTime-Format-Strptime: update to 1.79

---
 srcpkgs/perl-DateTime-Format-Strptime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DateTime-Format-Strptime/template b/srcpkgs/perl-DateTime-Format-Strptime/template
index 0bdf353b38da..554202a35c0a 100644
--- a/srcpkgs/perl-DateTime-Format-Strptime/template
+++ b/srcpkgs/perl-DateTime-Format-Strptime/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-DateTime-Format-Strptime'
 pkgname=perl-DateTime-Format-Strptime
-version=1.78
+version=1.79
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-2.0"
 homepage="https://metacpan.org/release/DateTime-Format-Strptime"
 distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-$version.tar.gz"
-checksum=5143cb8032301b49abef8b989cbfa7592e78db29b7b8c3b874bb0b9489e0d90f
+checksum=701e46802c86ed4d88695c1a6dacbbe90b3390beeb794f387e7c792300037579

From 1274ffe5858445a02b6d71a8b21a7781b4763c1a Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 4 May 2021 16:03:41 +0300
Subject: [PATCH 103/447] font-iosevka: update to 6.1.3

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 768b5b7ebd9f..1155320af055 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=6.1.2
+version=6.1.3
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -12,8 +12,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 2415cfa67462a913c4e6e4d55f7fa3b64ed0c57694013704579dc18fb925b874
- 721ab82b60e0168d12731938ec97e0632f8608fd7c6f098ad991946ca1280cd5"
+ 4f2ae801cbcb24adb620d76484653cf5a5e8ebab7836031ab6e9e6a5c9b33529
+ 03540b47cbd710c66a34f8e15449a8a0f6cf4065d63b22d7f0a5d092b53a4352"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 6d4af84aa85f3e2782a32368fa592268176165fe Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 4 May 2021 16:00:39 +0300
Subject: [PATCH 104/447] font-sarasa-gothic: update to 0.31.2

---
 srcpkgs/font-sarasa-gothic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 26d2eaa693ab..5a891813bd19 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.31.1
+version=0.31.2
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=893dcad279711cc541a143f4ba2356ee1b8e3ff4ed203a2da00601879adda913
+checksum=927968ee2ec67c4073f55adc4775f1ee000419df98ea780236da1851a1c7c75c
 
 font_dirs="/usr/share/fonts/TTF"
 

From a58b6285726adae21ab622c328e4faed965f5e0d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 4 May 2021 16:54:27 +0200
Subject: [PATCH 105/447] zchunk: update to 1.1.11.

---
 srcpkgs/zchunk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index b56a3aba18bd..9c351c8210bd 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
-version=1.1.9
-revision=3
+version=1.1.11
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/zchunk/zchunk"
 distfiles="https://github.com/zchunk/zchunk/archive/${version}.tar.gz"
-checksum=9e9bac8bb92e86eba50dc7fcf1f79e7835534c3aa15274355ffd84a8bcc03f91
+checksum=febbbfb1de7720641e7e36cef6ae0ce8ed18684e3faf539f703a5497f830267f
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"

From d3d0f1ed65081ca277bf424c5cb2b872d0d4f99a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 4 May 2021 17:07:19 +0200
Subject: [PATCH 106/447] syncthing: update to 1.16.0.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index bc393826442b..caabaf3cb191 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.15.1
+version=1.16.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=ad7276cec428f1b680a660179a29708a68d4214d58c73043453b5a164e316c92
+checksum=1245efe448aa736c209aecfe8abb21677f25887b15c72fb0f352281ef74cb5e3
 
 pre_build() {
 	GOARCH= go generate \

From eead0f7a89725013f0ede0351e7b71ef79c8f577 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:26:56 +0200
Subject: [PATCH 107/447] dpkg: update to 1.20.9.

---
 srcpkgs/dpkg/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dpkg/template b/srcpkgs/dpkg/template
index 19c1079a9f2f..86b653fe7e45 100644
--- a/srcpkgs/dpkg/template
+++ b/srcpkgs/dpkg/template
@@ -1,20 +1,20 @@
 # Template file for 'dpkg'
 pkgname=dpkg
-version=1.20.5
-revision=2
+version=1.20.9
+revision=1
 build_style=gnu-configure
 configure_args="--disable-start-stop-daemon --with-libz --with-libbz2
  --with-liblzma"
 hostmakedepends="pkg-config perl tar"
 makedepends="zlib-devel bzip2-devel liblzma-devel ncurses-devel"
 depends="perl"
-checkdepends="gnupg perl-Test-Pod"
+checkdepends="gnupg perl-Test-Pod xz"
 short_desc="Debian Package Manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://packages.debian.org/dpkg"
 distfiles="${DEBIAN_SITE}/main/d/dpkg/dpkg_${version}.tar.xz"
-checksum=f2f23f3197957d89e54b87cf8fc42ab00e1b74f3a32090efe9acd08443f3e0dd
+checksum=5ce242830f213b5620f08e6c4183adb1ef4dc9da28d31988a27c87c71fe534ce
 
 dpkg-devel_package() {
 	short_desc+=" - development files"

From ff26765ef55e7456e986495ae2fb80dcc65c0cc7 Mon Sep 17 00:00:00 2001
From: Abhijit <abhijitsipahimalani@gmail.com>
Date: Tue, 4 May 2021 08:19:43 -0700
Subject: [PATCH 108/447] blanket: update to 0.4.1

fixed distfiles

removed trailing whitespace

switched the distfiles location back
---
 srcpkgs/blanket/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 91fed55cbc17..7bde1ef9e8fe 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -1,6 +1,6 @@
 # Template file for 'blanket'
 pkgname=blanket
-version=0.3.1
+version=0.4.1
 revision=2
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"
@@ -9,6 +9,6 @@ short_desc="Improve focus and productivity by listening to different sounds"
 maintainer="Reback00 <reback00@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rafaelmardojai/blanket"
-distfiles="https://github.com/rafaelmardojai/blanket/archive/${version}.tar.gz"
-checksum=79942ed919507c0078266d221c433ba9209f8ea5f11371d55d64bd3b469623bf
+distfiles="https://github.com/rafaelmardojai/blanket/archive/refs/tags/${version}.tar.gz"
+checksum=fbb5f34a704840c50bb5b29f6fae69a2f37677d88db717b79e6bf6fdd625d9eb
 python_version=3

From eb7791ed3475535fddc76f4667c3e1eee07398ea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 22 Apr 2021 16:35:21 +0200
Subject: [PATCH 109/447] base-files: disable unprivileged eBPF by default.

eBPF allowed a fair amount of local privilege escalation in
the past, disallow it for ordinary users by default.
---
 srcpkgs/base-files/files/bpf.conf    | 2 ++
 srcpkgs/base-files/files/sysctl.conf | 2 +-
 srcpkgs/base-files/template          | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/base-files/files/bpf.conf

diff --git a/srcpkgs/base-files/files/bpf.conf b/srcpkgs/base-files/files/bpf.conf
new file mode 100644
index 000000000000..faefda3b8d0e
--- /dev/null
+++ b/srcpkgs/base-files/files/bpf.conf
@@ -0,0 +1,2 @@
+# Block unprivileged use of eBPF
+kernel.unprivileged_bpf_disabled=1
diff --git a/srcpkgs/base-files/files/sysctl.conf b/srcpkgs/base-files/files/sysctl.conf
index 1e1a2768d677..c8e9eaec96be 100644
--- a/srcpkgs/base-files/files/sysctl.conf
+++ b/srcpkgs/base-files/files/sysctl.conf
@@ -2,7 +2,7 @@
 # User-alterable options are in 10-void-user.conf.
 
 # Append the PID to the core filename
-kernel.core_uses_pid = 1
+kernel.core_uses_pid=1
 
 # Enable hard and soft link protection
 fs.protected_hardlinks=1
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index ff629498408b..758cd54ad147 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.141
+version=0.142
 revision=11
 bootstrap=yes
 depends="xbps-triggers"
@@ -75,6 +75,7 @@ do_install() {
 	# sysctl(8) files
 	vinstall ${FILESDIR}/sysctl.conf 644 usr/lib/sysctl.d 10-void.conf
 	vinstall ${FILESDIR}/sysctl-user.conf 644 usr/lib/sysctl.d 10-void-user.conf
+	vinstall ${FILESDIR}/bpf.conf 644 usr/lib/sysctl.d 20-bpf.conf
 
 	# Install common licenses, from Debian.
 	vmkdir usr/share/licenses

From 17070e6b3c19b16702087f14ef7e87c912c1c991 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Tue, 4 May 2021 12:26:12 +0200
Subject: [PATCH 110/447] fuzzypkg: add missing xtools dependency

---
 srcpkgs/fuzzypkg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuzzypkg/template b/srcpkgs/fuzzypkg/template
index 4ef5fdb203b2..70c540da1de9 100644
--- a/srcpkgs/fuzzypkg/template
+++ b/srcpkgs/fuzzypkg/template
@@ -1,8 +1,8 @@
 # Template file for 'fuzzypkg'
 pkgname=fuzzypkg
 version=1.0.4
-revision=1
-depends="bash"
+revision=2
+depends="bash xtools"
 short_desc="XBPS fuzzy package manager"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From a56dc05df269fd6582454d3da5a5068c685f45e1 Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Mon, 3 May 2021 18:17:02 +0100
Subject: [PATCH 111/447] ansible-base: add python3-packaging as a runtime
 dependency

Running the current ansible package results in a warning:

"[WARNING]: packaging Python module unavailable; unable to validate collection Ansible version requirements"

A simple web search leads to the Ansible developers stating that
python3-packaging is a dependency for ansible-base[1], and this commit
adds it.

[1]: https://github.com/ansible/ansible/issues/72117
---
 srcpkgs/ansible-base/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible-base/template b/srcpkgs/ansible-base/template
index 195856106a84..1d959c2367c3 100644
--- a/srcpkgs/ansible-base/template
+++ b/srcpkgs/ansible-base/template
@@ -1,11 +1,11 @@
 # Template file for 'ansible-base'
 pkgname=ansible-base
 version=2.10.8
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml"
+ python3-yaml python3-packaging"
 short_desc="Simple deployment, configuration management and execution framework"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"

From 9d6b9b3e49c66fc4bcd1e21aed7021c207f66d97 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 May 2021 16:19:11 -0500
Subject: [PATCH 112/447] sqlmap: update to 1.5.5.

---
 srcpkgs/sqlmap/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a1cbfdedfaa5..41c7521e8bb2 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,15 +1,15 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.4
+version=1.5.5
 revision=1
-pycompile_dirs="usr/share/sqlmap"
+pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
 short_desc="Automatic SQL injection and database takeover tool"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=5b86671338102e6f48761b2edd6b7b9db8280cdb788ca531df612ea7654d6743
+checksum=66a234c3ee60604a8edd685a64110663a633757d3183db314edd76526fe1a0d8
 python_version=3
 
 do_install() {

From 74800a7286b1bfe8abc9a6673e2c7c34cd71fb13 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 May 2021 16:28:08 -0500
Subject: [PATCH 113/447] Amass: update to 3.12.3.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 2d8a44324103..9494f04abf32 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.12.2
+version=3.12.3
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=e4162b84a25ea6e21aa88c5afb556a4fe8e52c73deb411915faca845842bc769
+checksum=92045ab82afe9a3bf15741c49d8df8d37f3fcb1e5fad7fa1c6f770cfd334bd8d

From 60a90eb623b3450574637af93ee09b80e24ac822 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 May 2021 17:34:38 -0500
Subject: [PATCH 114/447] bpytop: update to 1.0.65.

---
 srcpkgs/bpytop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index f20fcbf99fb8..1598f3c49d59 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
 # Template file for 'bpytop'
 pkgname=bpytop
-version=1.0.64
+version=1.0.65
 revision=1
 build_style=gnu-makefile
 depends="python3-psutil"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aristocratos/bpytop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=233299db3f17863ab69b0f7b149b586c499f5697177ab71b2006770398b11196
+checksum=4c5b59fa24ba70398b19515651b2058eea5b6e940fb10a95dd2615bd6bfd9609
 
 pre_configure() {
 	vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py

From e397c48afe6f6ffa63da23359317af88ba841bfd Mon Sep 17 00:00:00 2001
From: Abhijit <abhijitsipahimalani@gmail.com>
Date: Tue, 4 May 2021 15:27:28 -0700
Subject: [PATCH 115/447] New Package: iwgtk 0.4

Closes: #30669
Closes: #30686 [via git-merge-pr]
---
 srcpkgs/iwgtk/patches/fix-makefile.patch | 29 ++++++++++++++++++++++++
 srcpkgs/iwgtk/template                   | 14 ++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/iwgtk/patches/fix-makefile.patch
 create mode 100644 srcpkgs/iwgtk/template

diff --git a/srcpkgs/iwgtk/patches/fix-makefile.patch b/srcpkgs/iwgtk/patches/fix-makefile.patch
new file mode 100644
index 000000000000..0ce589d04e96
--- /dev/null
+++ b/srcpkgs/iwgtk/patches/fix-makefile.patch
@@ -0,0 +1,29 @@
+https://patch-diff.githubusercontent.com/raw/J-Lentz/iwgtk/pull/14.patch
+
+--- Makefile.orig
++++ Makefile
+@@ -1,8 +1,8 @@
+-CC=gcc
+-CFLAGS=`pkg-config --cflags gtk+-3.0`
++CC?=gcc
++CCINCS=`pkg-config --cflags gtk+-3.0`
+ LDLIBS=`pkg-config --libs gtk+-3.0`
+ 
+-prefix=/usr/local
++prefix?=$(PREFIX)
+ exec_prefix=$(prefix)
+ bindir=$(exec_prefix)/bin
+ datarootdir=$(prefix)/share
+@@ -23,10 +23,10 @@
+ .PHONY : clean install uninstall
+ 
+ iwgtk : $(objects)
+-	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS)
++	$(CC) $(CCINCS) $(CFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ %.o : $(srcdir)/%.c $(headers)
+-	$(CC) -c $(CFLAGS) -o $@ $<
++	$(CC) -c $(CCINCS) $(CFLAGS) -o $@ $<
+ 
+ $(srcdir)/icons.c : icons.gresource.xml $(icons)
+ 	glib-compile-resources --target=$@ --sourcedir=icons --generate-source $<
diff --git a/srcpkgs/iwgtk/template b/srcpkgs/iwgtk/template
new file mode 100644
index 000000000000..a9b23b80f0ca
--- /dev/null
+++ b/srcpkgs/iwgtk/template
@@ -0,0 +1,14 @@
+# Template file for 'iwgtk'
+pkgname=iwgtk
+version=0.4
+revision=1
+build_style=gnu-makefile
+hostmakedepends="glib-devel pkg-config"
+makedepends="gtk+3-devel"
+depends="iwd"
+short_desc="GUI WiFi management utility to control iwd"
+maintainer="caughtquick <me@caughtquick.tech>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/J-Lentz/iwgtk/"
+distfiles="https://github.com/J-Lentz/iwgtk/archive/refs/tags/v${version}.tar.gz"
+checksum=71bb85546a55bf710052d4947f6be5f5a01033d04d2d14a85a7e734dd570657d

From 2690b0e5cc477ce6311e598c4515c38138bb0fdf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 May 2021 15:56:09 -0500
Subject: [PATCH 116/447] spotify-tui: update to 0.24.0.

---
 srcpkgs/spotify-tui/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 19593004ef06..686dc039843a 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
-version=0.23.0
-revision=2
+version=0.24.0
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="openssl-devel python3-devel libxcb-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/Rigellute/spotify-tui"
 distfiles="https://github.com/Rigellute/spotify-tui/archive/v${version}.tar.gz"
-checksum=836a686c78599431b7e4dcf4a2830d16b25d28bdc4f35d79f0d5e8c000788da7
+checksum=c3da9eec76fe5387555b63ff7e4de8e0e4f5eba948af6df112e02cf8031519ee
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.58

From 8173cfd5d7bd35992458c48dc1cf4e596c9d881b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 May 2021 16:17:38 -0500
Subject: [PATCH 117/447] spotify-qt: update to 3.6.

---
 srcpkgs/spotify-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index a2aa39226749..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.5
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b8c4827a6c3e012b897f0a87ef2cc6e04b2d97f14bc505d19ebd439464094b4e
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29

From c9688184e2d126df55c9bfb9ee7db5592a1627e6 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: Wed, 5 May 2021 07:04:45 +0700
Subject: [PATCH 118/447] mutt: update to 2.0.7.

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 91a9a7b0c8c0..f04981c480dd 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.0.6
+version=2.0.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.mutt.org"
 changelog="http://mutt.org/relnotes/${version%.*}"
 distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=81e31c45895fd624747f19106aa2697d2aa135049ff2e9e9db0a6ed876bcb598
+checksum=957688c6a521561992d4f2f27cf9feb239c7c6c0042c6061c0e474a7dd26cc91
 
 post_install() {
 	# provided by mime-types

From 46ea07a3f90cceba1a622ea524ad973864350c5a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 5 May 2021 01:57:02 +0200
Subject: [PATCH 119/447] tor: fix Failing because we have 4063 connections
 already. Please read doc/TUNING for guidance.

---
 srcpkgs/tor/files/tor/run | 1 +
 srcpkgs/tor/template      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tor/files/tor/run b/srcpkgs/tor/files/tor/run
index 66d61c6c1b59..d0d402d25f5a 100755
--- a/srcpkgs/tor/files/tor/run
+++ b/srcpkgs/tor/files/tor/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
+ulimit -n ${MAX_OPEN_FILES:-8192}
 exec tor ${OPTS:=--quiet} --runasdaemon 0 2>&1
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 564a36ec87ef..cef10708f390 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.5.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 820c46092040c0cfbab11e82a4c8a0d07bca5f06 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Tue, 4 May 2021 23:33:55 +0200
Subject: [PATCH 120/447] libhandy1: update to 1.2.2.

---
 srcpkgs/libhandy1/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index c8298f8f629c..b8bc2f205561 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.2.1
+version=1.2.2
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -15,8 +15,9 @@ short_desc="GTK+3 building blocks for modern adaptive applications"
 maintainer="Paper <paper@tilde.institute>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
+changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=411b4c6a4d5f9ed5e46594b4abb04c54af294e3242cf364942029f5e0b6f510b
+checksum=47ffd2865d02bd1ca579522deadd7e2f95362f1f202462fd5eeae2b81668b048
 
 build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"

From fab555cacc43e8ce4bdcb0a2e20e6af12fd1c85a Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 4 May 2021 08:20:50 +0200
Subject: [PATCH 121/447] gtkdatabox3: fix update check

---
 srcpkgs/gtkdatabox3/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/gtkdatabox3/update

diff --git a/srcpkgs/gtkdatabox3/update b/srcpkgs/gtkdatabox3/update
new file mode 100644
index 000000000000..541d9ae6394b
--- /dev/null
+++ b/srcpkgs/gtkdatabox3/update
@@ -0,0 +1 @@
+pkgname=gtkdatabox

From f5cd816a0337fbe9e5804929d91781331ef7f2df Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Mon, 3 May 2021 05:49:06 -0400
Subject: [PATCH 122/447] chezmoi: update to 2.0.11.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index eaad865e0f96..970fc1c9bc83 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.0.10
+version=2.0.11
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=2baff338f656b209502329327764d3f8dd5808f53303a13f3be6d48d076df9a3
+checksum=79f5165f7db7636e8ead30aedcaedd63ad4b710a7fb8c756718a5ba0e6091ec0
 
 post_install() {
 	vlicense LICENSE

From 9fb6b30fb02f88f3161f60fbcfa84f5b5854f8aa Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:25:42 +0200
Subject: [PATCH 123/447] apache: update to 2.4.47.

---
 srcpkgs/apache/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 54d12f3a57b5..e83e871bfed1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
-version=2.4.46
-revision=2
+version=2.4.47
+revision=1
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -36,7 +36,7 @@ license="Apache-2.0"
 homepage="http://httpd.apache.org/"
 changelog="http://www.apache.org/dist/httpd/CHANGES_2.4"
 distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2"
-checksum=740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea
+checksum=23d006dbc8e578116a1138fa457eea824048458e89c84087219f0372880c03ca
 
 system_accounts="_${pkgname}"
 _apache_homedir="/srv/www/$pkgname"

From 7a72765e6ba03342c45850a3702b32cbb3038114 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:28:57 +0200
Subject: [PATCH 124/447] haproxy: update to 2.3.10.

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 39e7eb4f78e1..5a4c6a12751d 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.3.8
+version=2.3.10
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=2aa2691238dbe6360318673603aecd1041df19d55447172f8cd988780788159c
+checksum=9946e0cfc83f29072b3431e37246221cf9d4a9d28a158c075714d345266f4f35
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From fd90233649fb8a7b8392dd91d7dfe5f57086e582 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:28:03 +0200
Subject: [PATCH 125/447] loksh: update to 6.9.

---
 srcpkgs/loksh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template
index 9089c868036a..327ac3a7583d 100644
--- a/srcpkgs/loksh/template
+++ b/srcpkgs/loksh/template
@@ -1,6 +1,6 @@
 # Template file for 'loksh'
 pkgname=loksh
-version=6.8.1
+version=6.9
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="custom:Public Domain"
 homepage="https://github.com/dimkr/loksh"
 distfiles="https://github.com/dimkr/loksh/releases/download/${version}/loksh-${version}.tar.xz"
-checksum=ceeda4913febdb7e5f42db6a465835178221417e9f24865b0017e89a1a6a610e
+checksum=1633048cd5f1270c5fa28ab49d9cb9f7e8305ab6880601b0c15b88ecb92450f9
 register_shell="/bin/loksh"
 
 alternatives="

From ea22cd9416bbd270479598f58f9dcceedef1a38c Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 2 May 2021 22:53:55 +1000
Subject: [PATCH 126/447] retroarch: update to 1.9.2

---
 srcpkgs/retroarch/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 8b2d3fb445f4..92d6cf76fb7f 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,13 +1,12 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.9.1
+version=1.9.2
 revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  --enable-udev --disable-builtinflac --disable-builtinglslang
  --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
- --disable-git_version
  $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
  $(vopt_enable miniupnpc) $(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
@@ -25,7 +24,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=153f7057cecd22441904f557302d50f969d199c4b6ff263bfe87d9cf4a9bab75
+checksum=782b1d15ac20b5b629e9e520bbfd8f0a4e00bf1bbeb10189f811770b68b610cf
 
 build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"

From 963d7d398f7ff10503a38d39cb5e50087cb48271 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 1 May 2021 13:28:28 -0700
Subject: [PATCH 127/447] kinfocenter: fix license

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index f3854c636e4e..825a1234b7ea 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,7 +1,7 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
 version=5.21.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ makedepends="kdoctools plasma-framework-devel kdesignerplugin-devel kcmutils-dev
 depends="hwids"
 short_desc="KDE Info Center"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=3e5c3fed0156f3464bb30ebb9e0822c4141d71802dfa8995961f84c548771394

From 3298a89d36e8558d022996153c005ea676748dc6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 1 May 2021 13:36:47 -0700
Subject: [PATCH 128/447] klystrack: fix license

---
 srcpkgs/klystrack/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/klystrack/template b/srcpkgs/klystrack/template
index 927645f0787c..fa15065adcad 100644
--- a/srcpkgs/klystrack/template
+++ b/srcpkgs/klystrack/template
@@ -1,14 +1,14 @@
 # Template file for 'klystrack'
 pkgname=klystrack
 version=1.7.3
-revision=1
+revision=2
 _klystronsha=f5114db4de299ece73852becbef56d7d461bf421
 create_wrksrc=yes
 hostmakedepends="SDL2-devel"
 makedepends="SDL2_image-devel SDL2_mixer-devel"
 short_desc="Chiptune music tracker"
 maintainer="allan <mail@may.mooo.com>"
-license="BSD"
+license="MIT"
 homepage="http://kometbomb.github.io/klystrack/"
 distfiles="https://github.com/kometbomb/klystrack/archive/${version}.tar.gz
  https://github.com/kometbomb/klystron/archive/${_klystronsha}.tar.gz"
@@ -45,5 +45,5 @@ do_install() {
 	vcopy key usr/lib/klystrack
 	vmkdir usr/share/examples/klystrack
 	vcopy examples usr/share/examples/klystrack
-	vlicense linux/copyright
+	vlicense doc/LICENSE
 }

From d062ef3a6b0d4a9777ecfd4463fa08b9e8200be1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 1 May 2021 13:45:54 -0700
Subject: [PATCH 129/447] kmenuedit: fix license

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 0115325e3485..8809898978b4 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,7 +1,7 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
 version=5.21.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools
@@ -10,7 +10,7 @@ makedepends="kdelibs4support-devel kdesignerplugin-devel kdoctools"
 depends="khotkeys"
 short_desc="KDE Menu editor"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=d022bb6486663fd1db8b627794be5eb557fa0daa45b27bb69d834fa84494b8c2

From 2ed50cb9c40e444450deccd9d210c236688e71c5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 3 May 2021 18:24:37 -0700
Subject: [PATCH 130/447] ksysguard: fix license

---
 srcpkgs/ksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template
index 3603a4f413c9..8ab3e37792bb 100644
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@@ -1,7 +1,7 @@
 # Template file for 'ksysguard'
 pkgname=ksysguard
 version=5.21.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ makedepends="knewstuff-devel libksysguard-devel kinit-devel libsensors-devel
 depends="hicolor-icon-theme lm_sensors"
 short_desc="KDE program to monitor various elements of your system"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, GFDL-1.2"
+license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/ksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=cd1482653c35c5e04e6940346836fcd0655c213fc191da30685cb10cd05ae582

From 3fd84585867a63f73bdf0214ae655e4f2346f8c4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 3 May 2021 18:34:47 -0700
Subject: [PATCH 131/447] ktoblzcheck: fix license, other lint, fix test

Test fix is a temporary stand-in until the next version.
---
 srcpkgs/ktoblzcheck/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ktoblzcheck/template b/srcpkgs/ktoblzcheck/template
index 8d04d9e51f46..45cdb65345e5 100644
--- a/srcpkgs/ktoblzcheck/template
+++ b/srcpkgs/ktoblzcheck/template
@@ -1,17 +1,21 @@
 # Template file for 'ktoblzcheck'
 pkgname=ktoblzcheck
 version=1.53
-revision=1
+revision=2
+build_style=cmake
+configure_args="-DENABLE_BANKDATA_DOWNLOAD=NO"
 hostmakedepends="pkg-config python"
 makedepends="python-devel"
-build_style=cmake
+short_desc="Tool for verification of account numbers and bank codes"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://ktoblzcheck.sourceforge.net"
-short_desc="Tool for verification of account numbers and bank codes"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=18b9118556fe83240f468f770641d2578f4ff613cdcf0a209fb73079ccb70c55
-configure_args="-DENABLE_BANKDATA_DOWNLOAD=NO"
+
+post_patch() {
+	vsed -i src/python/test_ktoblzcheck.py -e 's/Postbank Ndl der DB Privat- und Firmenkundenbank/Postbank Ndl der Deutsche Bank/'
+}
 
 ktoblzcheck-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a0eeeda5ceb4112f7587239e5cdb6d18d0293976 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:28:27 +0200
Subject: [PATCH 132/447] kexec-tools: update to 2.0.22.

Closes: #30652 [via git-merge-pr]
---
 srcpkgs/kexec-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template
index 761e5c60a9fe..06f6f4527138 100644
--- a/srcpkgs/kexec-tools/template
+++ b/srcpkgs/kexec-tools/template
@@ -1,17 +1,17 @@
 # Template file for 'kexec-tools'
 pkgname=kexec-tools
-version=2.0.21
+version=2.0.22
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="tar xz"
 makedepends="zlib-devel liblzma-devel"
 short_desc="Tools to support fast kexec reboots"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only"
 homepage="http://kernel.org/pub/linux/utils/kernel/kexec/"
 distfiles="${KERNEL_SITE}/utils/kernel/kexec/${pkgname}-${version}.tar.xz"
-checksum=e113142dee891638ad96e0f72cf9277b244477619470b30c41999d312e8e8702
+checksum=96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 CFLAGS="-fcommon"

From c7c6f90b2c03f9f024a0411ace400e704dab6f1f Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:26:13 +0200
Subject: [PATCH 133/447] ethtool: update to 5.12.

---
 srcpkgs/ethtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index 19c9799eaa64..e9d8c365320f 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
 # Template file for 'ethtool'
 pkgname=ethtool
-version=5.10
+version=5.12
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.kernel.org/pub/software/network/ethtool/"
 distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=817d5396a9307b4c637b435d4c558b8f5f964a1464a035ca3c0180f4cc93cfcf
+checksum=f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07

From 03c859f4e822e1d28b492b8c99ff16e60b7cccd6 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 5 May 2021 08:00:15 +0200
Subject: [PATCH 134/447] perl-CGI: update to 4.52

---
 srcpkgs/perl-CGI/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5ee8dbb32bf5..fdea0fc9a591 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
-version=4.51
-revision=2
+version=4.52
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/CGI"
 distfiles="${CPAN_SITE}/CGI/${pkgname/perl-/}-${version}.tar.gz"
-checksum=0bd215e7012f9f52e6a7d3fe695ee30ef959d796e8e53472fa0ed8c53fba600a
+checksum=c8e3aa8d590dfff1b8a7fb09a960416df7405eeb3656166df448cb9276bfb9af

From 998eedb8a5573537f51d50612f34c10dbfce2e59 Mon Sep 17 00:00:00 2001
From: Leonid Bobrov <curiousbeaver@disroot.org>
Date: Wed, 5 May 2021 10:06:07 +0300
Subject: [PATCH 135/447] vorbis-tools: add missing dep for OPUS support

Closes: #30692 [via git-merge-pr]
---
 srcpkgs/vorbis-tools/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vorbis-tools/template b/srcpkgs/vorbis-tools/template
index e1f2f6750054..4635d26dd180 100644
--- a/srcpkgs/vorbis-tools/template
+++ b/srcpkgs/vorbis-tools/template
@@ -1,10 +1,11 @@
 # Template file for 'vorbis-tools'
 pkgname=vorbis-tools
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel libvorbis-devel libao-devel libflac-devel libcurl-devel speex-devel"
+makedepends="libogg-devel libvorbis-devel libao-devel libflac-devel libcurl-devel
+ speex-devel opusfile-devel"
 short_desc="Tools for Vorbis-Codecs e.g. oggenc and oggdec"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-only"

From 8f4b810a3604ee3501c285ee36f87cb6ea2fe15a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 4 May 2021 22:39:13 -0700
Subject: [PATCH 136/447] nrg2iso: update to 0.4.1

---
 srcpkgs/nrg2iso/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nrg2iso/template b/srcpkgs/nrg2iso/template
index 3257be3dbef8..a4bcf40e557b 100644
--- a/srcpkgs/nrg2iso/template
+++ b/srcpkgs/nrg2iso/template
@@ -1,14 +1,14 @@
 # Template file for 'nrg2iso'
 pkgname=nrg2iso
-version=0.4
+version=0.4.1
 revision=1
 build_style=gnu-makefile
 short_desc="Simple tool to convert from Nero Burning Rom (NRG) to ISO"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"
 distfiles="http://gregory.kokanosky.free.fr/v4/linux/${pkgname}-${version}.tar.gz"
-checksum="25049d864680ec12bbe31b20597ce8c1ba3a4fe7a7f11e25742b83e2fda94aa3"
+checksum=3be36a416758fc1910473b49a8dadf2a2aa3d51f1976197336bc174bc1e306e5
 
 do_build() {
 	$CC $CFLAGS $LDFLAGS -o nrg2iso nrg2iso.c

From 4d7c55b1d83acb7153aba71fbeab50f52c89f1f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 17:06:36 +0200
Subject: [PATCH 137/447] DarkRadiant: update to 2.12.0.

---
 .../patches/do-no-install-test.patch          | 11 ++++++++
 srcpkgs/DarkRadiant/patches/musl.patch        | 28 +++++++++++++++++++
 srcpkgs/DarkRadiant/patches/test.patch        | 14 ----------
 srcpkgs/DarkRadiant/template                  |  7 +++--
 4 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/DarkRadiant/patches/do-no-install-test.patch
 create mode 100644 srcpkgs/DarkRadiant/patches/musl.patch
 delete mode 100644 srcpkgs/DarkRadiant/patches/test.patch

diff --git a/srcpkgs/DarkRadiant/patches/do-no-install-test.patch b/srcpkgs/DarkRadiant/patches/do-no-install-test.patch
new file mode 100644
index 000000000000..444acad58c8b
--- /dev/null
+++ b/srcpkgs/DarkRadiant/patches/do-no-install-test.patch
@@ -0,0 +1,11 @@
+--- test/CMakeLists.txt	2021-05-01 12:10:44.000000000 +0200
++++ -	2021-05-03 17:29:15.242919282 +0200
+@@ -47,6 +47,4 @@
+                       ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
+                       ${SIGC_LIBRARIES} ${GLEW_LIBRARIES} ${X11_LIBRARIES}
+                       PRIVATE Threads::Threads)
+-install(TARGETS drtest)
+-
+-gtest_discover_tests(drtest)
+\ No newline at end of file
++gtest_discover_tests(drtest)
diff --git a/srcpkgs/DarkRadiant/patches/musl.patch b/srcpkgs/DarkRadiant/patches/musl.patch
new file mode 100644
index 000000000000..fcc1a56318af
--- /dev/null
+++ b/srcpkgs/DarkRadiant/patches/musl.patch
@@ -0,0 +1,28 @@
+--- radiantcore/log/SegFaultHandler.cpp	2021-05-01 12:10:44.000000000 +0200
++++ -	2021-05-04 19:37:03.411760291 +0200
+@@ -2,7 +2,7 @@
+ 
+ #include "itextstream.h"
+ 
+-#ifdef POSIX
++#ifdef __GLIBC__
+ #include <execinfo.h>
+ #include <signal.h>
+ #endif
+@@ -12,14 +12,14 @@
+ 
+ void SegFaultHandler::Install()
+ {
+-#ifdef POSIX
++#ifdef __GLIBC__
+     signal(SIGSEGV, _handleSigSegv);
+ #endif
+ }
+ 
+ void SegFaultHandler::_handleSigSegv(int sig)
+ {
+-#ifdef POSIX
++#ifdef __GLIBC__
+     rError() << "SIGSEGV signal caught: " << sig << std::endl;
+     std::cerr << "SIGSEGV signal caught: " << sig << std::endl;
+ 
diff --git a/srcpkgs/DarkRadiant/patches/test.patch b/srcpkgs/DarkRadiant/patches/test.patch
deleted file mode 100644
index 43e20a5edd9a..000000000000
--- a/srcpkgs/DarkRadiant/patches/test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- test/CMakeLists.txt	2020-12-26 13:15:24.000000000 +0100
-+++ -	2020-12-27 00:12:53.749544936 +0100
-@@ -1,3 +1,4 @@
-+enable_testing()
- add_executable(drtest
-                Camera.cpp
-                ColourSchemes.cpp
-@@ -38,4 +38,5 @@
-                       ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
-                       ${SIGC_LIBRARIES} ${GLEW_LIBRARIES} ${X11_LIBRARIES}
-                       PRIVATE Threads::Threads)
--install(TARGETS drtest)
-+add_test(NAME drtest
-+	COMMAND drtest)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index feb3e095a032..1d47801303d3 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,19 +1,20 @@
 # Template file for 'DarkRadiant'
 pkgname=DarkRadiant
-version=2.10.0
+version=2.12.0
 revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config"
 makedepends="ftgl-devel glew-devel libjpeg-turbo-devel libsigc++-devel
- libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python3-devel freealut-devel"
+ libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python3-devel
+ eigen libglib-devel freealut-devel"
 checkdepends="gtest-devel"
 short_desc="Map editor for The Dark Mod and other idTech4/Doom3-based games"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/codereader/DarkRadiant/"
 distfiles="https://github.com/codereader/DarkRadiant/archive/${version}.tar.gz"
-checksum=b0a15d24a1f574616a1631dca64ee69545cd21ebecdc6bf8c8afd1b69ec53f5b
+checksum=8c5dc0f7d160dea7e9c735f9739e36462dd8c8719a3022156f9584250fc3b867
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/lib/wx/include/gtk3-unicode-3.0"
 

From 54ea239dae35d7b0a3a7cfca6bec321365c835a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:24:56 +0200
Subject: [PATCH 138/447] plasma-wayland-protocols: update to 1.3.0.

---
 srcpkgs/plasma-wayland-protocols/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/plasma-wayland-protocols/template b/srcpkgs/plasma-wayland-protocols/template
index 594de71c5d31..c9e4be9f4398 100644
--- a/srcpkgs/plasma-wayland-protocols/template
+++ b/srcpkgs/plasma-wayland-protocols/template
@@ -1,16 +1,15 @@
 # Template file for 'plasma-wayland-protocols'
 pkgname=plasma-wayland-protocols
-version=1.2.1
+version=1.3.0
 revision=1
-wrksrc="$pkgname-v$version"
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
 short_desc="Plasma Specific Protocols for Wayland"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/libraries/plasma-wayland-protocols"
-distfiles="${KDE_SITE}/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=287b90903f9a7f394c75e75cb187426862eaf64a92f1be7e2ef68e99fd8cbaaa
+distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=0daa2362f2e0d15f79e0e006e8d7f1908e88e37b5c5208b40c9cb0d4d6dca9b5
 
 post_install() {
 	vsed -e '/NOT CMAKE_SIZEOF_VOID_P STREQUAL/,+5d' \

From 08ab2b68095bf454353e5741da11214a466bb287 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:25:59 +0200
Subject: [PATCH 139/447] bluedevil: update to 5.21.5.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index ea9050223564..2e3067e5ec5b 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e115d1851f6ce251fc7447936cd929c6c222c91fd832ce7c39f15d10a68c4653
+checksum=26b03747e997fc2e7d734ea583a2a81174f0d982a965e0254c8ba690721f6289
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 86dabe35ab1a042fd47f53341b847fcd675ce642 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:01 +0200
Subject: [PATCH 140/447] breeze-gtk: update to 5.21.5.

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 5367cb1d2f00..82fbff9104d0 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=912c425f9b9c39af02458c63f93704b274f0324c4b4b23ea30461a027b46520d
+checksum=0fab052f237447df0de55701ab8fb2edce968c865fbba2f2c934d9dc53f0c719
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 05e372f228c4c41a956e8fe18d708d27617dbf18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:06 +0200
Subject: [PATCH 141/447] breeze: update to 5.21.5.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index e5e09f62f066..79bfe6cb11e2 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d52db46df07302ea3f139ae88dd3b3b15aaab7d632b9910b87c3dac5eee5d0d8
+checksum=9774c695da7d51c45116f85358e002663a1ccc5681b04c9afc7a57e8b075980c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 3bf245b20f6b77feb7ad4d9686b6d134decbf5d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:08 +0200
Subject: [PATCH 142/447] kactivitymanagerd: update to 5.21.5.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 1e79fe1bc41b..0d4015e39760 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2684b61713223f7d8f1e064689fef13e54f2ade6b767a6229294e25bfce54a71
+checksum=77b5394cae27d68c55eaa02e7b9be524b6d8fee9a088e505830347b8289ef0c8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUN_RESULT_VAR=0"

From 86508999e42d2cb8833a5b11b757dfa61dd93011 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:10 +0200
Subject: [PATCH 143/447] kde-cli-tools: update to 5.21.5.

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index c73632d962af..f030512a9723 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01426b8c6be7cec804a44b74c3d79354f6f5509cbc176360f4ab43f330586ec3
+checksum=369fe177a33fcd45ab4d81b5b535e4f321c00d2e9c7d1f4b2bd42f4c02da1e49
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From ef0d6ccf220b956adf56d86f2f9f2b8c3bd890de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:12 +0200
Subject: [PATCH 144/447] kde-gtk-config5: update to 5.21.5.

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 6266aa84519f..8a36107ecdb5 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.21.4
+version=5.21.5
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c8034212a9a10877e61917084003bece052e3b65aac0197014b1c1840b0df03c
+checksum=f39178aa9cbfdcd9e6c1663058f3ff74d658e87b29f9b765f67a5bdc7c46ec1d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 4bd8e4157d976be0dc0ca3cf94f9336db96ee02d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:14 +0200
Subject: [PATCH 145/447] kdecoration: update to 5.21.5.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index f7ee00e3acd1..77be5f9ab594 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0a5db022018b958934dd678bf47eceb4233808808b06be2cfd5adb3700ba7e00
+checksum=bc550b7bfde5b5762e76b33ac53f8268b6178ae389c953d729b864b22787d54c
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 420350ae5ddfd0283487f622443440ffcd7075b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:16 +0200
Subject: [PATCH 146/447] kdeplasma-addons5: update to 5.21.5.

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index ff7a41442c8c..9f02678c57b4 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.21.4
+version=5.21.5
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=2de617d0a750224d73a6a2d91d99508a6d725fab0f2be7b0b3c47dc3cdf056a2
+checksum=3c6dd7266c9bb2b89b7ec6831936afb12e32cb00eca19baaa0706cf251617d7d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 6da8e7bedad7545647bcb97db7940682bb556a5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:18 +0200
Subject: [PATCH 147/447] kgamma5: update to 5.21.5.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 89c6110d8c47..96f1a2833bb3 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=544387a3ab1fa630c979f8b447d3779f1f86e5d6ab7967935a8b44114f1bf6e7
+checksum=e64b41468ee5ac77b2b26b009a2e491c79ca6b7b031e2bafe19dda4eb46558e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From 8b9d9706d02a88a352fc0ee63b59f3dacbee26cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:20 +0200
Subject: [PATCH 148/447] khotkeys: update to 5.21.5.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 8bb7989c4206..0edca2226a9f 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a3f42777930145b2757eff95d468fd945c34db111d144d823e89521a3f5a6616
+checksum=2d58299f705f928f877718c1766a6dce201d728a24e88b9a24ca5e12a5f99c13
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 2318420886840198ce66af463a6bcb6136cd2178 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:22 +0200
Subject: [PATCH 149/447] kinfocenter: update to 5.21.5.

---
 srcpkgs/kinfocenter/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 825a1234b7ea..7bdcb3869872 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,7 +1,7 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.21.4
-revision=2
+version=5.21.5
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config qt5-host-tools qt5-qmake"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3e5c3fed0156f3464bb30ebb9e0822c4141d71802dfa8995961f84c548771394
+checksum=715a871f6d761515d804049672d58f78cfc04fd8c5db645c489a940979a6f49c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From fddd7f4e4c2a08c7f305d056c1f0dd5c112cf6ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:24 +0200
Subject: [PATCH 150/447] kmenuedit: update to 5.21.5.

---
 srcpkgs/kmenuedit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 8809898978b4..2232b49a98c7 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,7 +1,7 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.21.4
-revision=2
+version=5.21.5
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d022bb6486663fd1db8b627794be5eb557fa0daa45b27bb69d834fa84494b8c2
+checksum=e044970df84b889e51465270ee7108f898774309f52434ede12aca2701eaed7b

From 751240ca6a5643402b472a1f9f2c35324d0ee944 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:25 +0200
Subject: [PATCH 151/447] kscreen: update to 5.21.5.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 7697487c6d13..dc672f951cad 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9d1225d5e4d5e062275c88bb879b96bde0167783d1a3722e737baa67dad3ed9
+checksum=46698bd55ad08e0b833767f2c679832a276826abc37fd9c037614589101a84da
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From d8aab58f5ec95bfeaca4e6903d95bb79a919b404 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:27 +0200
Subject: [PATCH 152/447] kscreenlocker: update to 5.21.5.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 366f02bb7270..2678305894e1 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6492531abacf0078936247090d1c3038c44d5ae3a61593fe474b503847ba24fd
+checksum=1dad76b7c791e1077777bc9e1b309a6778c4e2124a1211105f2ca9dffa903637
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From e5338a46f1337466ae9552c32986c6b5a6e2e01a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:29 +0200
Subject: [PATCH 153/447] ksshaskpass: update to 5.21.5.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 6d61a29d9a14..a45663ac5328 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c1b0479dc4ae0a183c41e4e546801df5332387026b101b735a8024dd8109447e
+checksum=a2f963a9991cbe639a63664a820b4c55c1bd75be6a209a8b439911ec4911f119
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From e6e9417f0ef9e65f631e4079a8d2cfc4fc0b5ee7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:31 +0200
Subject: [PATCH 154/447] ksysguard: update to 5.21.5.

---
 srcpkgs/ksysguard/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template
index 8ab3e37792bb..c7904ebc1280 100644
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@@ -1,7 +1,7 @@
 # Template file for 'ksysguard'
 pkgname=ksysguard
-version=5.21.4
-revision=2
+version=5.21.5
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/ksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cd1482653c35c5e04e6940346836fcd0655c213fc191da30685cb10cd05ae582
+checksum=103b34b83fd2ea1af1cb01b67de70be2ad5362e22270d23cd437ac210bca1bb0

From 36d753408545292ea1cc89523bfdebbe4123963f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:33 +0200
Subject: [PATCH 155/447] kwallet-pam: update to 5.21.5.

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index f080436e2182..2304aba61421 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fce31384897e4913f03cffe6719c7f69618893676a2f44ca62bb21971f27c68
+checksum=bf3f30e990bf5c79b0fd2e24d82d01f99c226c5f2c64f57ed4a0bab754046e6b

From 2ced36c7cefcc8044010dc7b6a51eee266501e28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:35 +0200
Subject: [PATCH 156/447] kwayland-integration: update to 5.21.5.

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index ad92891b6f81..3b200826dd41 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=139cefb81cb852a699b15e77724cf4fb17adf9d8724b0d4955cdf9567fad6ee4
+checksum=bd1c713ea584c56f1d3551b08f7d5cd9fd9f66dff85e89de2436d71a3c2404f2

From 439ec4f65958e6eb3c0c62601f2d55c3f6b76efe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:36 +0200
Subject: [PATCH 157/447] kwayland-server: update to 5.21.5.

---
 srcpkgs/kwayland-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index b63423810c51..e9424943c85a 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ff32f4e6b92fc900db41780cb2f2645c472e6ec5d3999aa17fb0fba807df71d6
+checksum=2fcfc16e8bda1f85db8148715ec08a1b36a0738c3796cf886faadc983f8e21c9
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From b22283295303ac3b17ed942120efe96e6a582afb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:39 +0200
Subject: [PATCH 158/447] kwin: update to 5.21.5.

---
 srcpkgs/kwin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 4f0312a39da0..97a2b68a3d8a 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,7 +1,7 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.21.4
-revision=2
+version=5.21.5
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext breeze pkg-config"
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a9cbcf293c58bef10650399a7fe15c08b54fd009a0d9d859f75b54bc6c87232f
+checksum=a286edfaa13bf73565514ee3edb092cfbccac2307c48058a7302a4676c808331
 patch_args=-Np1
 
 build_options="pipewire"

From 9047cd82363418823ce6d6dfddafc04050f22af7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:41 +0200
Subject: [PATCH 159/447] kwrited: update to 5.21.5.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 6dc820129b8f..3bdca6c8f170 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8708c5f41dd32531a25bd9099cd15c39439769f7c17e4481b44f9f7572f03ac3
+checksum=e1e79046b9657defa5074e46f7bcb09e9000f6e4bc3504eda9363fc60891294e

From 32659328fbf7b59eaf5508c842e2b40d9ecb5511 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:43 +0200
Subject: [PATCH 160/447] libkscreen: update to 5.21.5.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c20d49199a89..33da65d40970 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ac09ad2e30920f4fbbb44d061cae5114d75ef0d1a765a4fbbf73b94f03a3152c
+checksum=13059ff71a395efbbb6231a4a796a174adb6a16433051e03db9bc83b7d1e7cba
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From ba343b720f8572e9e89fadbfa3e37e2182109a65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:45 +0200
Subject: [PATCH 161/447] libksysguard: update to 5.21.5.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index fe88776a8145..bff07eccb8d9 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ec094b59a7e111359b550731dafe4d9b92f17ae2c4d663275d97332e1bc5f16b
+checksum=5ff8c687a9d245d28ec4b92c019d2234cd931796c619ebb096de6e49cd18ebe8
 
 build_options="webengine"
 

From 5c95987b0e2ae59a1a44772834a79fa7723657a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:46 +0200
Subject: [PATCH 162/447] milou: update to 5.21.5.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 896fbeb475b2..e9e867188889 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6a72ab3cbadff8bb7999abc1fcdef30ec067cf0afb3ff18f0defe55bd8dfd578
+checksum=31c0db3b48aa4c081b748b999deb428e3c15e99fbf6b2128a900864975683b18
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 6b4cf329f185cee8b37d9611bb4dbf438739473d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:49 +0200
Subject: [PATCH 163/447] oxygen: update to 5.21.5.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 04dbfa6e6316..b7f053d45dd3 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f2039dd6ccd251c12651f3da77ed890b62360e115f1a6be678fe9f39fc6decb4
+checksum=ac0ad3b62438d08b7103e49871b6751e22bb2308c42072b830f4f8ee00d83649

From c3b191c6b9c9be3f272710a890212aadeefdba23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:51 +0200
Subject: [PATCH 164/447] plasma-browser-integration: update to 5.21.5.

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 00b22fc38d2e..fad83c4184d0 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=76f815739ffc133d82c578248302f26a1cd3262e8cf878824248b9e90b51d693
+checksum=4b85220204b89863386b30f5f758342f073e269d33af2c24721191664b1d649b
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 1f9136bcaae921ec5c064c8b0d325d1ed66e1720 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:55 +0200
Subject: [PATCH 165/447] plasma-desktop: update to 5.21.5.

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index c33eb1e56726..794e379f5a55 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9635c82ffa8fa9b22aa474e8aa2e8f9d912615137f039f5ee6080000c283bb7
+checksum=de507e305c8021d9226381e2beded1cf45d1b224e9a5201529924cd60eb31a27
 replaces="user-manager>=0"
 python_version=3
 

From 8ff473eaaba0d84f170220e61c3c9a99b1286620 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:57 +0200
Subject: [PATCH 166/447] plasma-disks: update to 5.21.5.

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 6139669b263d..2e2cb7f541be 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af186ba88170fe832f218a1438d142ed2ee6aff9ec967fe9003c6c84008451c2
+checksum=211d8273aea5146bc6ecb0511d0d4c3bea731c956b35a81dadc4b96a8daea0a0

From a21e2f91ad1075ddddc2b15958a401f10667bb5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:26:59 +0200
Subject: [PATCH 167/447] plasma-firewall: update to 5.21.5.

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index fbb12a61c14e..a1d39ecce265 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e79bb3ca1eb9b0beb999f1b6212af1eeb8c25fc7c04369a45487e909afaac9c6
+checksum=5399189129759cac235a4c6513a6a4838a798d2fc5e128a704a2429e7f4454f1

From 906767e1cb08ac9d95a741418a82a9c030796412 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:01 +0200
Subject: [PATCH 168/447] plasma-integration: update to 5.21.5.

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 83c8a510a492..d772d2122590 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1cc280a93fab2c9c461deb172ee22da34a5100c3cd31ad8ebf0a9c405899422e
+checksum=1e745570c9a4526a52a1fd7fc46b4cd5973c2b6047c4577b277bc5910d830c75

From 72cb3aa6a0886bac22a1e9f73d26f187b16eb3a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:03 +0200
Subject: [PATCH 169/447] plasma-nm: update to 5.21.5.

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index 5a62ab615e6d..38ef72b7201f 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3d01fdd78ee6d1b0bc9753e1386ffb03c318498feac856fae377a397d6ec1bf
+checksum=9098e660a391e821161ed9ad2361b568297df2b53742a8afe18d6104ac700ba3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 711fa1011af27102e5d132ea49e0d5e369b75974 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:04 +0200
Subject: [PATCH 170/447] plasma-pa: update to 5.21.5.

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 90b368c578ec..5805401d90e0 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e9575c6bb4d73e3b45f9bdd256ed0cdc0e36014a1676abe2ad8d6ab5f1838fe5
+checksum=f6ef1ea24bc8ef8717a09fc4396e8611c315da3175ffa69d873d485524ca9002
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 32858ddf0d5bc6762ca2d3f8308c5260e9ccc371 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:06 +0200
Subject: [PATCH 171/447] plasma-sdk: update to 5.21.5.

---
 srcpkgs/plasma-sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 650530213e76..08522c5a96fa 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40037c485cb4bbd9afbd237d96b65cdef41b8b3e35ab2f27a7f5c6d206a6c0b2
+checksum=01aac092b7c98e3fe5b74fab21cb94781960a8957d5b4a7811503cefa3445e95
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 150571fa96e60bba1ab5716890fcdc08da628710 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:08 +0200
Subject: [PATCH 172/447] plasma-systemmonitor: update to 5.21.5.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 8f751f5b5b4a..f1949259ff11 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=849407cf2b9333140cee9ca18ca34e1c4351a8597fea47a475eec68c8dc1b99a
+checksum=3c4d7facd472fd68eee6c7f7175539eeae42bf8a6d6c8e41925a0b0fd6988ecf

From bb0107629c82a9fe6d9161de38d9dada31adae12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:10 +0200
Subject: [PATCH 173/447] plasma-thunderbolt: update to 5.21.5.

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index c06c4bf5e882..4226c1984f7f 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0dc69a2e9c5fe692457771e503894f70ade69951b6cd838a7f71fa5025042983
+checksum=a1b85d9e997a7e202972212a79fc026da65509246952b096dd474ba520492c98
 
 do_check() {
 	: # Requires running dbus and bolt services

From c7bc22e022581d1ab1503dcc19b17478e542b770 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:12 +0200
Subject: [PATCH 174/447] plasma-vault: update to 5.21.5.

---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index 298bab530466..a8da733d1e07 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c577135b04d7b35227183100fcae08eaf6df5ef41c4ecf43e0706a329ef8a48d
+checksum=7519b5da20e59f571128b66fc22e5d2b2027752e01caa1c70574b12dcfd8979b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From b6a67107d995c45cb43b697d0cc00075c64da538 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:20 +0200
Subject: [PATCH 175/447] plasma-workspace-wallpapers: update to 5.21.5.

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 15857d3f4186..0b532576ca23 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c706e4293b3c0552503abc55eaa0d971203b23ad252804f0fb95b9b040fad8d7
+checksum=759acd1b6de1e272c751d9366002038fef6617d6717d82262ec459584502404a

From 69fd519a39da435af1ff2298f23681161e3ccbc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:23 +0200
Subject: [PATCH 176/447] plasma-workspace: update to 5.21.5.

---
 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 fe80db9ce3d3..e806438bb2fa 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ba0b184570b62be84be2f8108fccadd08de8f3abf8a0f615a6f06f829bd628d5
+checksum=9cb16ef4bca9ade0ca82d0cc539533ba9f9be47811ae13d154effc085618e90a
 
 build_options="pipewire"
 

From 5d1fdd4a0b92835acdaaa866dbe7bd49761fcb08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:25 +0200
Subject: [PATCH 177/447] polkit-kde-agent: update to 5.21.5.

---
 srcpkgs/polkit-kde-agent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 373cc02cc25a..93cb927a40eb 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.21.4
+version=5.21.5
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=b236f87213247a858acb9a7b82dba71f579c3febb3cee189b96584e588a6e251
+checksum=e68bad084d9144092c8aef68552434c9dba702caf953ea8fa7dcf7731ed689ad

From 94dd8cdc402cb75b1f804aa0e833743d53d254c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:27 +0200
Subject: [PATCH 178/447] powerdevil: update to 5.21.5.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 5495b2cfcd23..851ad05e07e4 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c6f1729dff9ce611c2094d930067fb4f364f6f3d4d78ea2ee07c5bb4db990445
+checksum=fdb0305b576345f17d21e2f3a3604e55b0413456cc8b58017e354d5c42d0dda3

From 8467843fa50f7f025c20b429b24502221dd5c638 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:29 +0200
Subject: [PATCH 179/447] sddm-kcm: update to 5.21.5.

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 5b11a4751a45..215d9ed772ba 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3396f33e7ae12661fc9722d96a37ee274588212bae886538423a9e4ee2052401
+checksum=5280c8e75167233808d44ce0091f66020a3f8f12590fd9272d3b3fda12ce2d6d

From d0e528ad4c181cfe3c1fda83538e193b091418c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:31 +0200
Subject: [PATCH 180/447] systemsettings: update to 5.21.5.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 7ad8cbdcf84a..04b62fea2561 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=034b0c384cdbf38d126daf4dced6f2d42995b76f9b9268b30eb6a1d59c20ed04
+checksum=95784e6f0dc89778ebbd0bc4536f690cd8454001c7665eb853c0c6eace987acd

From 9c2e97963f5edddc9e77721183a0ddd9625a99e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 4 May 2021 19:27:33 +0200
Subject: [PATCH 181/447] xdg-desktop-portal-kde: update to 5.21.5.

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index e6b92b916fdc..0c006dcdae93 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.21.4
+version=5.21.5
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=efbf69b0623db15d1a44725a88b3e6b5d0631bc0ebc88d0e695ff01df7da7406
+checksum=b0a7ea220d9b1913618a937b7364f7d88156998fd4d76df923520cb26ab38285

From 628d30f7dc76cca4715aba693af47ff7d1158575 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 5 May 2021 09:38:58 -0400
Subject: [PATCH 182/447] python3: update to 3.9.5.

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 96a4a9dfd7e2..40c6cc1ef8e5 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,7 +3,7 @@
 # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.9.4
+version=3.9.5
 revision=1
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
@@ -17,7 +17,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=4b0e6644a76f8df864ae24ac500a51bbf68bd098f6a173e27d3b61cdca9aa134
+checksum=0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From 66c0330492030413510ba710a76874879cb55c9f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 5 May 2021 09:53:04 -0400
Subject: [PATCH 183/447] python3-tkinter: update to 3.9.5.

---
 srcpkgs/python3-tkinter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index bb0f962c486d..943844507d58 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.9.4
+version=3.9.5
 revision=1
 wrksrc="Python-${version}"
 pycompile_dirs="
@@ -23,7 +23,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 homepage="https://www.python.org"
 license="Python-2.0"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=4b0e6644a76f8df864ae24ac500a51bbf68bd098f6a173e27d3b61cdca9aa134
+checksum=0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83
 
 pre_configure() {
 	# Ensure that internal copies of expat and libffi are not used.

From aff47381758179eefa0c7f31dec9ed8b17d9fb3d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 5 May 2021 09:54:10 -0400
Subject: [PATCH 184/447] python3-Pygments: update to 2.9.0.

---
 srcpkgs/python3-Pygments/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index 094a4f365a25..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.8.1
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=2656e1a6edcdabf4275f9a3640db59fd5de107d88e8663c5d4e9a0fa62f77f94
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {

From f01255ec14d99e25dd66d370cfec8169417642f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 5 May 2021 09:54:22 -0400
Subject: [PATCH 185/447] python3-websockets: update to 9.0.1.

---
 srcpkgs/python3-websockets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-websockets/template b/srcpkgs/python3-websockets/template
index 70a4239ab2e3..e0d69af6f6ea 100644
--- a/srcpkgs/python3-websockets/template
+++ b/srcpkgs/python3-websockets/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-websockets'
 pkgname=python3-websockets
-version=8.1
+version=9.0.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://websockets.readthedocs.io/en/stable/"
 distfiles="${PYPI_SITE}/w/websockets/websockets-${version}.tar.gz"
-checksum=5c65d2da8c6bce0fca2528f69f44b2f977e06954c8512a952222cea50dad430f
+checksum=2ab64e9fd18e57a66b63a8774e337d81d6366412bef65c7d71f87ad5c4faeed5
 
 post_install() {
 	vlicense LICENSE

From bf269c7d05b857415231f1fc04bc6b2b237c20ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 5 May 2021 10:50:57 -0400
Subject: [PATCH 186/447] qtutilities: update to 6.4.1.

---
 srcpkgs/qtutilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index e52be5259eaa..22385671114d 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.0
+version=6.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=c6c06a4e6648529e34e7f9bd12058d74b5e28ad755f99213dfd7d551b630ed70
+checksum=971100718b441eb76b3bb9a5352a75f15e366dc79ebfe4b8f385583b296d8c6b
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From 2e94fefa926633ec23d86a193c2e94405aa77d31 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 May 2021 13:23:05 +0200
Subject: [PATCH 187/447] syncthing: update to 1.16.1.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index caabaf3cb191..6ffaaf269c7e 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.16.0
+version=1.16.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=1245efe448aa736c209aecfe8abb21677f25887b15c72fb0f352281ef74cb5e3
+checksum=9994380a94b298e8266fdd40238bcff3ade2c21752b9cff98ec4218fe84731ad
 
 pre_build() {
 	GOARCH= go generate \

From f153d68323b6ebe3f6c5b32df97cbc1193d8defd Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Mon, 3 May 2021 18:59:13 +0200
Subject: [PATCH 188/447] libxkbcommon: update to 1.3.0.

---
 srcpkgs/libxkbcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 9e2fa45bb474..3cfefeb295d2 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'libxkbcommon'
 pkgname=libxkbcommon
-version=1.2.1
+version=1.3.0
 revision=1
 wrksrc="${pkgname}-${pkgname#lib}-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://xkbcommon.org/"
 distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
-checksum=50684541c11686203650f6ac8fe9b4b0343158fb7c54fbb0c86147f1ff5a5dbc
+checksum=e1b79838256549d72f42c824f720b4f14603374cfbe5587942e35a0cbb13ff9e
 
 post_install() {
 	vlicense LICENSE

From 5e264eccb20409279b157a532f17bfb5c925fa97 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Wed, 5 May 2021 18:29:35 +0200
Subject: [PATCH 189/447] fuzzel: update to 1.5.4.

---
 srcpkgs/fuzzel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 879bead182bc..1b6a04c8fd26 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.5.3
+version=1.5.4
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55ae113d278196241dc699fb6fc558ff20d7b6323048b53dbf343fd3b2be8a49
+checksum=8d805cdd80d3250f3d1a8cda3559176148538e3b2abd454ccf813b32ab271a21
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"

From 2540d444292df3649c095064e320d91307612368 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 1 May 2021 13:14:12 +0000
Subject: [PATCH 190/447] seaweedfs: update to 2.43.

---
 srcpkgs/seaweedfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 2935677d54f9..8ff1c831ee32 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,6 +1,6 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
-version=2.34
+version=2.43
 revision=1
 build_style=go
 go_import_path="github.com/chrislusf/seaweedfs"
@@ -11,4 +11,4 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/chrislusf/seaweedfs"
 distfiles="https://github.com/chrislusf/seaweedfs/archive/${version}.tar.gz"
-checksum=e268f9b0eb9b9be5be552b98a8482ff1f5630c1e996d46b9b36d3180eef62be7
+checksum=d261f2e801061ea1191f0fc96fc5b9aa87f3d4998e0d50f3cb93598d0ccd68f5

From 8c9737964c7511edf1548afb8f53de21a9b5b953 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Thu, 6 May 2021 00:45:04 +0700
Subject: [PATCH 191/447] vivaldi: update to 3.8.2259.40

---
 srcpkgs/vivaldi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 978bd5dd7e02..d13e4c17eb1c 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=3.8.2259.37
+version=3.8.2259.40
 revision=1
 _release=1
 archs="i686 x86_64"
@@ -18,10 +18,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=47047ff8e2dfec6f3c21ed7fbd84e0a3188b84e670169ee1da5e5053e550f1d2
+	checksum=c42f9a2ed9d723cb6a80bca1a0b66a31bbaa31c7052303d154ef8bc4626d6399
 else
 	_debarch=i386
-	checksum=2bc02df168cac09e0ae1d2084395e0236a9b6dd270cd4c4d4079e898a2c58b81
+	checksum=9e8f796ef7aeb0ffe4850e8d7917d505b1c9e50810a2a197afcc87b45c8a9004
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"

From f39d06319aecb8eb1c29023b302e5b2b741c34bd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 May 2021 21:45:12 +0200
Subject: [PATCH 192/447] harfbuzz: update to 2.8.1.

---
 srcpkgs/harfbuzz/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 62ea9a3ffda3..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,6 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.0
+version=2.8.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,17 +14,14 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=a1079fd021adaf5683351f34587a255975cc3bcadba31246ae40ebebb95ecd42
-
-post_install() {
-	vlicense COPYING LICENSE
-}
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 		vmove usr/lib/girepository-1.0
+		vlicense COPYING LICENSE
 	}
 }
 

From b5bdb49e1a70fbc40d84436c67b2354d4d2d74a5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 6 May 2021 01:11:43 +0200
Subject: [PATCH 193/447] openradtool: update to 0.12.9.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 5e3bf13f83bb..fea16317b71e 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.12.8
+version=0.12.9
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=bf877b1db23f84a897c9c2223aa9ad360a63089b01620f26a7bb9b680cac27d8
+checksum=239d62474b3f96ea066731e1c24dc7d576f5ca85438eed939c33cbee736d34e1
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From bf59ccc6b2708f4ce2e335fcfe2094d6f873de34 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 6 May 2021 14:51:59 +0200
Subject: [PATCH 194/447] ugrep: update to 3.2.1.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 4e252fe1a62d..98e76c3065c4 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.2
+version=3.2.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=e5b4d7b2e4a87b34416200d068dc1984967f980418670fa6b08268edf00a4a9d
+checksum=a377b399227296caeca3e1b8945fcfc12001e78ad735f9d3d63d8015082608ee
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From dbe255bd15eaaf29229b2515b77fc2f6e8815fb8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 6 May 2021 14:57:51 +0200
Subject: [PATCH 195/447] polyml: update to 5.8.2.

---
 srcpkgs/polyml/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/polyml/template b/srcpkgs/polyml/template
index e972da74190b..28170c9d2d32 100644
--- a/srcpkgs/polyml/template
+++ b/srcpkgs/polyml/template
@@ -1,9 +1,9 @@
 # Template file for 'polyml'
 pkgname=polyml
-version=5.8.1
+version=5.8.2
 revision=1
 build_style=gnu-configure
-configure_args="--with-system-libffi --enable-shared"
+configure_args="--enable-shared"
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl|x86_64-musl)
 		# musl doesn't allow writing to .rodata and .text during
@@ -14,14 +14,14 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	*) configure_args+=" --disable-native-codegeneration" ;;
 esac
-makedepends="gmp-devel libffi-devel"
+makedepends="gmp-devel"
 conflicts="mesa-demos>=0"  # /usr/bin/poly
 short_desc="The Poly/ML Standard ML (SML) implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1"
 homepage="http://www.polyml.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=fa0507b44470b4e07a061ef6a8896efe42710d8436e15721d743572ad2f7753b
+checksum=310b0ba748a50f38e99de7f65ba990bc4b4f4b0123ad76aba4c44d7cd1ed9277
 nocross=yes
 
 # broken on musl ppc and big endian ppc

From 370896c5a018391d23cb9b938631219c84ee5d5a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 5 May 2021 22:17:18 -0400
Subject: [PATCH 196/447] python3-zeroconf: update to 0.30.0.

---
 srcpkgs/python3-zeroconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index 614001d14339..0b06d05d142f 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-zeroconf'
 pkgname=python3-zeroconf
-version=0.29.0
+version=0.30.0
 revision=1
 wrksrc="python-zeroconf-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/jstasiak/python-zeroconf"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b8e7c55f36973362314b7d8cf716a76afea3c91abe9d2f435329dc67b973fe06
+checksum=bbb5e15625a96ac4dc4fba33519227ea8a6d1991000af51e976d01d2917a8d82
 
 do_check() {
 	# IPv6 doesn't work on github CI

From cc384be50e935b5ee783b63430fa8329c61c2b70 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Apr 2021 16:22:09 +0300
Subject: [PATCH 197/447] qutebrowser: update to 2.2.1

Closes: #30580 [via git-merge-pr]
---
 srcpkgs/qutebrowser/template | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 5ec394ace6fb..5988bf0d7db6 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.2.0
+version=2.2.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,8 +12,11 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=fa5d2015d64289ab70d4ce719134096503ee580702657972af652cdc6786dd2a
+checksum=247ca6c6734f74cb1599add350a092fa24427bd27b23403a88848fe4e5ed266f
 nostrip=yes
+# testing requires unpackaged plugins:
+# pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
+make_check=no
 
 build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine support"
@@ -35,12 +38,6 @@ pre_build() {
 	a2x -f manpage doc/qutebrowser.1.asciidoc
 }
 
-do_check() {
-	# testing requires unpackaged plugins:
-	# pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
-	:
-}
-
 post_install() {
 	vman doc/qutebrowser.1
 	vinstall misc/org.qutebrowser.qutebrowser.desktop 644 usr/share/applications

From e9b1cc8abd005b657c60afa5fcd2e5bd6c34264a Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 29 Apr 2021 13:26:39 +0200
Subject: [PATCH 198/447] iproute2: update to 5.12.0.

Closes: #30578 [via git-merge-pr]
---
 srcpkgs/iproute2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 66bdccf6024c..8f517150839a 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=5.11.0
+version=5.12.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
 distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c5e2ea108212b3445051b35953ec267f9f3469e1d5c67ac034ab559849505c54
+checksum=9d268db98a36ee2a0e3ff3b92b2efff66fc1138a51e409bdef6ab3cfe15f326f
 
 conf_files="
  /etc/iproute2/ematch_map

From 7e20cd88fa5ec7cc033ac02b138eb18a54a7b09b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 May 2021 09:27:58 -0400
Subject: [PATCH 199/447] python3-ipython: update to 7.23.1.

---
 srcpkgs/python3-ipython/patches/mpl_inline_fix.patch | 12 ------------
 srcpkgs/python3-ipython/template                     |  6 +++---
 2 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/python3-ipython/patches/mpl_inline_fix.patch

diff --git a/srcpkgs/python3-ipython/patches/mpl_inline_fix.patch b/srcpkgs/python3-ipython/patches/mpl_inline_fix.patch
deleted file mode 100644
index 4526ce4af0e7..000000000000
--- a/srcpkgs/python3-ipython/patches/mpl_inline_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git IPython/core/pylabtools.py IPython/core/pylabtools.py
-index c71b0cdb6..bb815956e 100644
---- IPython/core/pylabtools.py
-+++ IPython/core/pylabtools.py
-@@ -383,6 +383,6 @@ def configure_inline_support(shell, backend):
-         stacklevel=2,
-     )
- 
--    from matplotlib_inline.backend_inline import configure_inline_support_orig
-+    from matplotlib_inline.backend_inline import configure_inline_support as configure_inline_support_orig
- 
-     configure_inline_support_orig(shell, backend)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 671614a92a1d..08c5c2cc7d26 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.23.0
-revision=2
+version=7.23.1
+revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=69178f32bf9c6257430b6f592c3ae230c32861a1966d2facec454e09078e232d
+checksum=714810a5c74f512b69d5f3b944c86e592cee0a5fb9c728e582f074610f6cf038
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {

From 1db9794297951059d7869e0d3eb62ca4813d9425 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 May 2021 10:02:05 -0400
Subject: [PATCH 200/447] fuse3: update to 3.10.3.

Closes: #28648.
---
 srcpkgs/fuse3/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template
index 7a857d1d2565..ca4f3c6b1b69 100644
--- a/srcpkgs/fuse3/template
+++ b/srcpkgs/fuse3/template
@@ -1,6 +1,6 @@
 # Template file for 'fuse3'
 pkgname=fuse3
-version=3.10.1
+version=3.10.3
 revision=1
 wrksrc="fuse-${version}"
 build_style=meson
@@ -12,8 +12,10 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/libfuse/libfuse"
 distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.xz"
-checksum=d82d74d4c03e099f806e4bb31483955637c69226576bf0ca9bd142f1d50ae451
+checksum=eb8373f208b05a39702f9f437f6e49caf4b1ace26a9acb68110b49912078560f
 conf_files="/etc/fuse.conf"
+# Tests require root
+make_check=no
 
 post_install() {
 	chmod u+s ${DESTDIR}/usr/bin/fusermount3

From 80cf85fd184ae9db9fbfae7a46ffe78164effafc Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 5 May 2021 22:21:10 -0400
Subject: [PATCH 201/447] python3-trimesh: update to 3.9.15.

---
 srcpkgs/python3-trimesh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index 32ab0dbbf14d..94f53b44c8f2 100644
--- a/srcpkgs/python3-trimesh/template
+++ b/srcpkgs/python3-trimesh/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-trimesh'
 pkgname=python3-trimesh
-version=3.9.13
+version=3.9.15
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -17,7 +17,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://trimsh.org/"
 distfiles="https://github.com/mikedh/trimesh/archive/${version}.tar.gz"
-checksum=3f2419b0b03ac683e518bf4e8442f0804aeb4d708ae5e4aec25f2590e5725b71
+checksum=43173317e03254c948d8fcd15f52a37023fddeffb610cbcf2e57dad931e6838f
 
 post_install() {
 	vlicense LICENSE.md

From e652ee47463cdac049109df5217707da68afbb51 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 May 2021 10:30:57 -0400
Subject: [PATCH 202/447] python3-hypothesis: update to 6.12.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index b30cf143d996..473d29b50183 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.10.0
+version=6.12.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=26e01da7c57768e0c3a69bac6789a505a69fe1f4696953c587d827806108c931
+checksum=6c14b93e8844ae39adf420d00f9a915d1f5a5da4a11f2501b4c293aa4975b991
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From d5d6eac1d651e1224e5042a0a14eb756dbd01b96 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:31:25 +0200
Subject: [PATCH 203/447] FreeRADIUS: update to 3.0.21.

---
 srcpkgs/FreeRADIUS/patches/libressl.patch | 41 -----------------------
 srcpkgs/FreeRADIUS/template               |  8 ++---
 2 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/FreeRADIUS/patches/libressl.patch

diff --git a/srcpkgs/FreeRADIUS/patches/libressl.patch b/srcpkgs/FreeRADIUS/patches/libressl.patch
deleted file mode 100644
index 4a0033c8d4c6..000000000000
--- a/srcpkgs/FreeRADIUS/patches/libressl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c	2018-04-17 19:12:27.000000000 +0200
-+++ src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c	2019-04-27 16:56:01.628410415 +0200
-@@ -44,7 +44,7 @@
- {
- 	const EVP_CIPHER *c;
- 	const EVP_MD *h;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 	int md_size;
- 
- 	if (ssl->enc_read_ctx == NULL || ssl->enc_read_ctx->cipher == NULL ||
-diff --git src/main/tls.c src/main/tls.c
-index db73399..3a64534 100644
---- src/main/tls.c
-+++ src/main/tls.c
-@@ -1565,7 +1565,7 @@ done:
- 	return 0;
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- static SSL_SESSION *cbtls_get_session(SSL *ssl, unsigned char *data, int len, int *copy)
- #else
- static SSL_SESSION *cbtls_get_session(SSL *ssl, const unsigned char *data, int len, int *copy)
-@@ -3394,14 +3394,14 @@ post_ca:
- 		 */
- 		SSL_CTX_sess_set_cache_size(ctx, conf->session_cache_size);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- 		SSL_CTX_set_num_tickets(ctx, 1);
- #endif
- 
- 	} else {
- 		SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- 		/*
- 		 *	This controls the number of stateful or stateless tickets
- 		 *	generated with TLS 1.3.  In OpenSSL 1.1.1 it's also
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 16dd4660d1b6..666ee96ece22 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,17 +1,17 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
-version=3.0.20
-revision=5
+version=3.0.21
+revision=1
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://freeradius.org"
 distfiles="https://github.com/FreeRADIUS/freeradius-server/archive/release_${version//./_}.tar.gz"
-checksum=8177fe550af6685a040884dbe3df28431bdc5a8d3a48a9f4f88bdb49f2d0e90c
+checksum=b2014372948a92f86cfe2cf43c58ef47921c03af05666eb9d6416bdc6eeaedc2
 nocross=yes # Not supported by upstream
 system_accounts="_freeradius"
 make_dirs="/etc/raddb 0750 _freeradius _freeradius"

From 6b272bda4d59c8820e3c6e58b9c74fb547919653 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: Thu, 6 May 2021 22:12:58 +0700
Subject: [PATCH 204/447] libserialport: fix update-check

---
 srcpkgs/libserialport/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/libserialport/update

diff --git a/srcpkgs/libserialport/update b/srcpkgs/libserialport/update
new file mode 100644
index 000000000000..56313dc1d49b
--- /dev/null
+++ b/srcpkgs/libserialport/update
@@ -0,0 +1 @@
+site="https://sigrok.org/download/source/libserialport/"

From 4444f5b0e419bff71edcf086197003660744ad1d Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:27:32 +0200
Subject: [PATCH 205/447] fetchmail: update to 6.4.19.

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 274105153ef0..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.18
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=302dc9bcdc6927dedf375d2baaead2347557faa70d98b1da83f2409fa6fb259f
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"

From 644bdb2867bd99152f1788d6d9ce9d375afeda35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 206/447] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 9d1a1a7a1941..0fb985631ba1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"

From 0bd64a0c3c856c135f471393ffc276ee5e69f9c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 207/447] New package: qt6-base-6.1.0

---
 common/shlibs                              |  16 ++
 srcpkgs/qt6-base-devel                     |   1 +
 srcpkgs/qt6-base-doc                       |   1 +
 srcpkgs/qt6-base/patches/add-the-D.patch   |  15 ++
 srcpkgs/qt6-base/patches/musl-limits.patch |  20 +++
 srcpkgs/qt6-base/template                  | 188 +++++++++++++++++++++
 srcpkgs/qt6-base/update                    |   1 +
 srcpkgs/qt6-concurrent                     |   1 +
 srcpkgs/qt6-core                           |   1 +
 srcpkgs/qt6-dbus                           |   1 +
 srcpkgs/qt6-gui                            |   1 +
 srcpkgs/qt6-network                        |   1 +
 srcpkgs/qt6-opengl-widgets                 |   1 +
 srcpkgs/qt6-plugin-mysql                   |   1 +
 srcpkgs/qt6-plugin-odbc                    |   1 +
 srcpkgs/qt6-plugin-pgsql                   |   1 +
 srcpkgs/qt6-plugin-sqlite                  |   1 +
 srcpkgs/qt6-printsupport                   |   1 +
 srcpkgs/qt6-sql                            |   1 +
 srcpkgs/qt6-test                           |   1 +
 srcpkgs/qt6-widgets                        |   1 +
 srcpkgs/qt6-xml                            |   1 +
 22 files changed, 257 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-doc
 create mode 100644 srcpkgs/qt6-base/patches/add-the-D.patch
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 100644 srcpkgs/qt6-base/update
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index 1b284ac33ef2..3ba44093b45d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1982,6 +1982,22 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-doc b/srcpkgs/qt6-base-doc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-doc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/add-the-D.patch b/srcpkgs/qt6-base/patches/add-the-D.patch
new file mode 100644
index 000000000000..94d2fc030304
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/add-the-D.patch
@@ -0,0 +1,15 @@
+--- cmake/FindWrapAtomic.cmake	2021-04-30 11:31:33.000000000 +0200
++++ -	2021-05-06 15:56:49.553742705 +0200
+@@ -31,9 +31,9 @@
+ check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC)
+ if(NOT HAVE_STDATOMIC)
+-    set(_req_libraries "${CMAKE_REQUIRE_LIBRARIES}")
+-    set(CMAKE_REQUIRE_LIBRARIES "atomic")
++    set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}")
++    set(CMAKE_REQUIRED_LIBRARIES "atomic")
+     check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB)
+-    set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}")
++    set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}")
+ endif()
+ 
+ add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 000000000000..54f96779b31d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 000000000000..c720e7f51671
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,188 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.1.0
+revision=1
+wrksrc="qtbase-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_FEATURE_openssl_linked=ON
+ -DQT_FEATURE_system_sqlite=ON
+ -DBUILD_WITH_PCH=OFF"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-devel
+ xcb-util-image-devel xcb-util-keysyms-devel
+ xcb-util-renderutil-devel xcb-util-wm-devel
+ MesaLib-devel pcre2-devel icu-devel mtdev-devel harfbuzz-devel
+ libpng-devel tslib-devel libinput-devel gtk+3-devel
+ libmariadbclient-devel postgresql-libs-devel libatomic-devel
+ unixodbc-devel cups-devel libproxy-devel brotli-devel
+ sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
+short_desc="Cross-platform application and UI framework (QT6)"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://www.qt.io"
+distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
+checksum=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
+python_version=3
+
+if [ "$CROSS_BUILD" ]; then
+	# QtSetup fails native builds if this is set
+	configure_args+=" -DQT_HOST_PATH=/usr
+	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-doc_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-base/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 13e45486d357d96376082d639ae61066c383e5e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 208/447] New package: qt6-wayland-6.1.0

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 30 ++++++++++++++++++++++++++++++
 srcpkgs/qt6-wayland/update   |  1 +
 4 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template
 create mode 100644 srcpkgs/qt6-wayland/update

diff --git a/common/shlibs b/common/shlibs
index 3ba44093b45d..569d4d2237e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1998,6 +1998,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 000000000000..c4dec18ea9a0
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 000000000000..43194ae66ad8
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.1.0
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework - Wayland"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://www.qt.io"
+distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=d67e8ffe4014a66b5864acf358a392149555db2adac1b9802a6650a59a70ad97
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin/qtwaylandscanner
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-wayland/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From fad646a1cbd426d38423c507a46fdc792e004696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 209/447] New package: qt6-declarative-6.1.0

---
 common/shlibs                    | 11 ++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative-tools    |  1 +
 srcpkgs/qt6-declarative/template | 43 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-declarative/update   |  1 +
 5 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 120000 srcpkgs/qt6-declarative-tools
 create mode 100644 srcpkgs/qt6-declarative/template
 create mode 100644 srcpkgs/qt6-declarative/update

diff --git a/common/shlibs b/common/shlibs
index 569d4d2237e5..ba39775b36c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2000,6 +2000,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative-tools b/srcpkgs/qt6-declarative-tools
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-tools
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 000000000000..6da38cd33432
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.1.0
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args=" -DQT_HOST_PATH=/usr
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework - Declarative"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://www.qt.io"
+distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz"
+checksum=e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda
+
+qt6-declarative-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/qmltooling
+		for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
+			qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
+			qmltestrunner qmltime qmltyperegistrar; do
+			vmove usr/lib/qt6/bin/$bin
+		done
+	}
+}
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-declarative-tools>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-declarative/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 35d4d364cb2f2d6066dfa6933b6e8b636d7ece62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 210/447] New package: qt6-qt5compat-6.1.0

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-qt5compat/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template
 create mode 100644 srcpkgs/qt6-qt5compat/update

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 000000000000..f88da3a0fe5b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 000000000000..0fd536dc4075
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.1.0
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e403f07dbd18a798c20bbb8b9cdd51074afc89e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 211/447] New package: qt6-tools-6.1.0

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-tools/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template
 create mode 100644 srcpkgs/qt6-tools/update

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 000000000000..d2de59aba453
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 000000000000..8d2d8e3f2419
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.1.0
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel libatomic-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-tools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 6c55dc3cc970260f4f161999c41a55ce058fcaf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 212/447] New package: qt6-svg-6.1.0

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-svg/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template
 create mode 100644 srcpkgs/qt6-svg/update

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 000000000000..69c493dbd794
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 000000000000..936d831fcd4e
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.1.0
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-svg/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 41c5f194daa55cdc475611ed0be7dbb463e1123a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 213/447] New package: qt6-translations-6.1.0

---
 srcpkgs/qt6-translations/template | 15 +++++++++++++++
 srcpkgs/qt6-translations/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template
 create mode 100644 srcpkgs/qt6-translations/update

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 000000000000..16a3a190fe7e
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.1.0
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework - translations"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=2affef9a0da9b61e8fc64ebbd515136b59c7392b789cd059ad134b26755dd073
diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-translations/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 44470e724da8709bcc368238ec58547d97286531 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 214/447] New package: qt6-shadertools-6.1.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-shadertools/update   |  1 +
 4 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template
 create mode 100644 srcpkgs/qt6-shadertools/update

diff --git a/common/shlibs b/common/shlibs
index ba39775b36c9..6b6aa8a9cf6f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2011,6 +2011,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 000000000000..f1424d216cb3
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 000000000000..5c27d3fab884
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.1.0
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - shadertools"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From ff2bd4845e40582cebc61d686944ce7862db6cd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 215/447] New package: qt6-quick3d-6.1.0

---
 common/shlibs                |  8 ++++++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/qt6-quick3d/update   |  1 +
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template
 create mode 100644 srcpkgs/qt6-quick3d/update

diff --git a/common/shlibs b/common/shlibs
index 6b6aa8a9cf6f..ba192c561b5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,6 +2012,14 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 000000000000..91ff6f03e479
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 000000000000..0022dc25a374
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.1.0
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework - Quick3d"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From efccbf034bee324bfa2ced5673dfa6bac80d7fce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 216/447] New package: qt6-quickcontrols2-6.1.0

---
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-quickcontrols2/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template
 create mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 000000000000..280bc162057d
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 000000000000..51e8315b5aea
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.1.0
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quickcontrols2"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From ee0133ce7a44a95fa37f62acf7275f14b5459b46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 217/447] New package: qt6-quicktimeline-6.1.0

---
 srcpkgs/qt6-quicktimeline/template | 15 +++++++++++++++
 srcpkgs/qt6-quicktimeline/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template
 create mode 100644 srcpkgs/qt6-quicktimeline/update

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 000000000000..eb30cc7b6ddb
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.1.0
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quicktimeline"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e
diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 1b2821e5b659a7c5bd85b90524c88c7042e91e59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 10:54:23 +0200
Subject: [PATCH 218/447] New package: qt6-virtualkeyboard-6.1.0

---
 srcpkgs/qt6-virtualkeyboard-devel    |  1 +
 srcpkgs/qt6-virtualkeyboard/template | 29 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-virtualkeyboard-devel
 create mode 100644 srcpkgs/qt6-virtualkeyboard/template

diff --git a/srcpkgs/qt6-virtualkeyboard-devel b/srcpkgs/qt6-virtualkeyboard-devel
new file mode 120000
index 000000000000..5da71523b639
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard-devel
@@ -0,0 +1 @@
+qt6-virtualkeyboard
\ No newline at end of file
diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
new file mode 100644
index 000000000000..6488e9c5c80c
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-virtualkeyboard'
+pkgname=qt6-virtualkeyboard
+version=6.1.0
+revision=1
+wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl pkg-config qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-quickcontrols2-devel
+ qt6-svg-devel hunspell-devel"
+depends="qt6-quickcontrols2"
+short_desc="Cross-platform application and UI framework - virtualkeyboard"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtvirtualkeyboard-everywhere-src-${version}.tar.xz"
+checksum=595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01
+
+qt6-virtualkeyboard-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} $makedepends"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From e3fae42ed68876fe742bc0d24b189b9e485cfcf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:00:25 +0200
Subject: [PATCH 219/447] New package: qt6-networkauth-6.1.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-networkauth-devel    |  1 +
 srcpkgs/qt6-networkauth/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-networkauth-devel
 create mode 100644 srcpkgs/qt6-networkauth/template

diff --git a/common/shlibs b/common/shlibs
index ba192c561b5d..5b7622e48ccc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2020,6 +2020,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-networkauth-devel b/srcpkgs/qt6-networkauth-devel
new file mode 120000
index 000000000000..e9763b3bb1a8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth-devel
@@ -0,0 +1 @@
+qt6-networkauth
\ No newline at end of file
diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
new file mode 100644
index 000000000000..b70fcc828fb8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-networkauth'
+pkgname=qt6-networkauth
+version=6.1.0
+revision=1
+wrksrc="qtnetworkauth-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - networkauth"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtnetworkauth-everywhere-src-${version}.tar.xz"
+checksum=bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3
+
+qt6-networkauth-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 9e872018a5b0be383ed3f93c30c9894840670f8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:01:48 +0200
Subject: [PATCH 220/447] New package: qt6-scxml-6.1.0

---
 common/shlibs              |  4 ++++
 srcpkgs/qt6-scxml-devel    |  1 +
 srcpkgs/qt6-scxml/template | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-scxml-devel
 create mode 100644 srcpkgs/qt6-scxml/template

diff --git a/common/shlibs b/common/shlibs
index 5b7622e48ccc..f98b1e473be7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2021,6 +2021,10 @@ libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
+libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-scxml-devel b/srcpkgs/qt6-scxml-devel
new file mode 120000
index 000000000000..cd3032d5ed07
--- /dev/null
+++ b/srcpkgs/qt6-scxml-devel
@@ -0,0 +1 @@
+qt6-scxml
\ No newline at end of file
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
new file mode 100644
index 000000000000..b0e60b492782
--- /dev/null
+++ b/srcpkgs/qt6-scxml/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-scxml'
+pkgname=qt6-scxml
+version=6.1.0
+revision=1
+wrksrc="qtscxml-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - scxml"
+maintainer="John <me@johnnynator.dev>"
+license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtscxml-everywhere-src-${version}.tar.xz"
+checksum=c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea
+
+qt6-scxml-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 1cd1eec62e087877094d559d609bdad125734716 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:07:02 +0200
Subject: [PATCH 221/447] New package: qt6-imageformats-6.1.0

---
 srcpkgs/qt6-imageformats/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/qt6-imageformats/template

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
new file mode 100644
index 000000000000..80c457245cfd
--- /dev/null
+++ b/srcpkgs/qt6-imageformats/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-imageformats'
+pkgname=qt6-imageformats
+version=6.1.0
+revision=1
+wrksrc="qtimageformats-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - imageformats"
+maintainer="John <me@johnnynator.dev>"
+license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtimageformats-everywhere-src-${version}.tar.xz"
+checksum=34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a

From 29d82c6b9811fd4985bf6ef3f345024995c89d18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:08:18 +0200
Subject: [PATCH 222/447] New package: qt6-lottie-6.1.0

---
 common/shlibs               |  1 +
 srcpkgs/qt6-lottie-devel    |  1 +
 srcpkgs/qt6-lottie/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-lottie-devel
 create mode 100644 srcpkgs/qt6-lottie/template

diff --git a/common/shlibs b/common/shlibs
index f98b1e473be7..38ed206a6396 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2025,6 +2025,7 @@ libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-lottie-devel b/srcpkgs/qt6-lottie-devel
new file mode 120000
index 000000000000..ba915c5589b8
--- /dev/null
+++ b/srcpkgs/qt6-lottie-devel
@@ -0,0 +1 @@
+qt6-lottie
\ No newline at end of file
diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
new file mode 100644
index 000000000000..21ad418162bb
--- /dev/null
+++ b/srcpkgs/qt6-lottie/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-lottie'
+pkgname=qt6-lottie
+version=6.1.0
+revision=1
+wrksrc="qtlottie-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - lottie"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlottie-everywhere-src-${version}.tar.xz"
+checksum=3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8
+
+qt6-lottie-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From b28fed41e922c87a78e2d455bd94972b8b43365f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:48:19 +0200
Subject: [PATCH 223/447] New package: qt6-3d-6.1.0

---
 common/shlibs           | 12 ++++++++++++
 srcpkgs/qt6-3d-devel    |  1 +
 srcpkgs/qt6-3d/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 120000 srcpkgs/qt6-3d-devel
 create mode 100644 srcpkgs/qt6-3d/template

diff --git a/common/shlibs b/common/shlibs
index 38ed206a6396..111b048e3ff7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2026,6 +2026,18 @@ libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
+libQt63DQuickAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DCore.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickScene2D.so.6 qt6-3d-6.1.0rc2_1
+libQt63DLogic.so.6 qt6-3d-6.1.0rc2_1
+libQt63DRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-3d-devel b/srcpkgs/qt6-3d-devel
new file mode 120000
index 000000000000..4b7cae59503c
--- /dev/null
+++ b/srcpkgs/qt6-3d-devel
@@ -0,0 +1 @@
+qt6-3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
new file mode 100644
index 000000000000..101a56552999
--- /dev/null
+++ b/srcpkgs/qt6-3d/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-3d'
+pkgname=qt6-3d
+version=6.1.0
+revision=1
+wrksrc="qt3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
+ libatomic-devel"
+short_desc="Cross-platform application and UI framework - 3d"
+maintainer="John <me@johnnynator.dev>"
+license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz"
+checksum=af48f674883de91a5bcb11caefda0e130b9c8c65dce474c47550dc2fdd3a5660
+
+qt6-3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From b08763d5a1862b57dbac64ac4a4666d62a932712 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:57:02 +0200
Subject: [PATCH 224/447] New package: qt6-charts-6.1.0

---
 common/shlibs               |  1 +
 srcpkgs/qt6-charts-devel    |  1 +
 srcpkgs/qt6-charts/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-charts-devel
 create mode 100644 srcpkgs/qt6-charts/template

diff --git a/common/shlibs b/common/shlibs
index 111b048e3ff7..2ced94d7831f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2038,6 +2038,7 @@ libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
 libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
+libQt6Charts.so.6 qt6-charts-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-charts-devel b/srcpkgs/qt6-charts-devel
new file mode 120000
index 000000000000..894d48aa3126
--- /dev/null
+++ b/srcpkgs/qt6-charts-devel
@@ -0,0 +1 @@
+qt6-charts
\ No newline at end of file
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
new file mode 100644
index 000000000000..d8dee490199e
--- /dev/null
+++ b/srcpkgs/qt6-charts/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-charts'
+pkgname=qt6-charts
+version=6.1.0
+revision=1
+wrksrc="qtcharts-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - charts"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
+checksum=8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd
+
+qt6-charts-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From b80014e06475444ffd601f473cd5bec9f0c79214 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 20:52:55 +0200
Subject: [PATCH 225/447] strawberry: update to 0.9.3.

---
 .../strawberry/patches/less-log-spam.patch    |  10 +
 srcpkgs/strawberry/patches/pb_namespace.patch | 347 ------------------
 srcpkgs/strawberry/template                   |  29 +-
 3 files changed, 32 insertions(+), 354 deletions(-)
 create mode 100644 srcpkgs/strawberry/patches/less-log-spam.patch
 delete mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch

diff --git a/srcpkgs/strawberry/patches/less-log-spam.patch b/srcpkgs/strawberry/patches/less-log-spam.patch
new file mode 100644
index 000000000000..5cf85ad5fcdc
--- /dev/null
+++ b/srcpkgs/strawberry/patches/less-log-spam.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt	2021-04-14 16:59:00.905391095 +0200
++++ -	2021-04-29 21:22:05.347050684 +0200
+@@ -50,7 +50,6 @@
+   -Winit-self
+   -Wmissing-include-dirs
+   -Wmissing-declarations
+-  -Wstrict-overflow=2
+   -Wunused-parameter
+   -Wformat=2
+   -Wdisabled-optimization
diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch
deleted file mode 100644
index 5a9946116ac1..000000000000
--- a/srcpkgs/strawberry/patches/pb_namespace.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp
---- ext/libstrawberry-tagreader/tagreader.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -146,34 +146,34 @@
- 
- }
- 
--pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
- 
--  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
--  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
--  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
--  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
--  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
--  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
--  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
--  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
--  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
--  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
--  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
--  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
--  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
--  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
-+  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
-+  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
-+  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
-+  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
-+  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
-+  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
-+  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
-+  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
-+  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
-+  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
-+  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
-+  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
-+  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-+  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
- #ifdef HAVE_TAGLIB_DSFFILE
--  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
-+  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
- #endif
- #ifdef HAVE_TAGLIB_DSDIFFFILE
--  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
-+  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
- #endif
- 
--  return pb::tagreader::SongMetadata_FileType_UNKNOWN;
-+  return spb::tagreader::SongMetadata_FileType_UNKNOWN;
- 
- }
- 
--void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
- 
-   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-   const QFileInfo info(filename);
-@@ -435,7 +435,7 @@
- 
- }
- 
--void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
-   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
-@@ -459,7 +459,7 @@
- 
- }
- 
--void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
-   if (it != map.end()) {
-@@ -503,7 +503,7 @@
- 
- }
- 
--void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
- 
-   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
-   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
-@@ -521,7 +521,7 @@
- 
- }
- 
--bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
-+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
- 
-   if (filename.isEmpty()) return false;
- 
-@@ -608,7 +608,7 @@
-   return result;
- }
- 
--void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
- 
-   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
-   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
-diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h
---- ext/libstrawberry-tagreader/tagreader.h	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.h	2021-02-19 14:36:37.195218302 -0500
-@@ -51,10 +51,10 @@
-   ~TagReader();
- 
-   bool IsMediaFile(const QString &filename) const;
--  pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-+  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
- 
--  void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
--  bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
-+  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
- 
-   QByteArray LoadEmbeddedArt(const QString &filename) const;
-   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-@@ -62,11 +62,11 @@
-   static void Decode(const TagLib::String &tag, std::string *output);
-   static void Decode(const QString &tag, std::string *output);
- 
--  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
--  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-+  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-+  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
- 
--  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
--  void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
-+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-+  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
- 
-   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto
---- ext/libstrawberry-tagreader/tagreadermessages.proto	2020-09-11 17:34:59.552108115 -0400
-+++ ext/libstrawberry-tagreader/tagreadermessages.proto	2021-02-19 14:36:49.047230658 -0500
-@@ -1,6 +1,6 @@
- syntax = "proto2";
- 
--package pb.tagreader;
-+package spb.tagreader;
- 
- message SongMetadata {
- 
-diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp
---- ext/strawberry-tagreader/tagreaderworker.cpp	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -27,13 +27,13 @@
- #include "tagreaderworker.h"
- 
- TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
--  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
-+  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent)
- {
- }
- 
--void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
-+void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) {
- 
--  pb::tagreader::Message reply;
-+  spb::tagreader::Message reply;
- 
-   if (message.has_read_file_request()) {
-     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-@@ -55,7 +55,7 @@
- 
- 
- void TagReaderWorker::DeviceClosed() {
--  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
-+  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
- 
-   qApp->exit();
- }
-diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h
---- ext/strawberry-tagreader/tagreaderworker.h	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.h	2021-02-19 14:36:37.195218302 -0500
-@@ -28,12 +28,12 @@
- 
- class QIODevice;
- 
--class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
-+class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
- public:
-   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
- 
- protected:
--  void MessageArrived(const pb::tagreader::Message &message) override;
-+  void MessageArrived(const spb::tagreader::Message &message) override;
-   void DeviceClosed() override;
- 
- private:
-diff -ur src/core/song.cpp src/core/song.cpp
---- src/core/song.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.cpp	2021-02-19 14:36:37.196218302 -0500
-@@ -744,7 +744,7 @@
-   set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
- }
- 
--void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
-+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
- 
-   if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
- 
-@@ -791,7 +791,7 @@
- 
- }
- 
--void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
-+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
- 
-   const QByteArray url(d->url_.toEncoded());
-   const QByteArray art_automatic(d->art_automatic_.toEncoded());
-@@ -826,7 +826,7 @@
-   pb->set_filesize(d->filesize_);
-   pb->set_suspicious_tags(d->suspicious_tags_);
-   pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
--  pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
-+  pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
- 
- }
- 
-diff -ur src/core/song.h src/core/song.h
---- src/core/song.h	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.h	2021-02-19 14:37:05.177247472 -0500
-@@ -44,11 +44,11 @@
- struct SimpleMetaBundle;
- }  // namespace Engine
- 
--namespace pb {
-+namespace spb {
- namespace tagreader {
- class SongMetadata;
- }  // namespace tagreader
--}  // namespace pb
-+}  // namespace spb
- 
- #ifdef HAVE_LIBGPOD
- struct _Itdb_Track;
-@@ -155,7 +155,7 @@
-   // Constructors
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
--  void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
-+  void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
-   void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
-   void InitFromFilePartial(const QString &filename);  // Just store the filename: incomplete but fast
-   void InitArtManual();  // Check if there is already a art in the cache and store the filename in art_manual
-@@ -180,7 +180,7 @@
-   void BindToQuery(QSqlQuery *query) const;
-   void BindToFtsQuery(QSqlQuery *query) const;
-   void ToXesam(QVariantMap *map) const;
--  void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
-+  void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
- 
-   // Simple accessors
-   bool is_valid() const;
-diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
---- src/core/tagreaderclient.cpp	2020-10-19 13:09:38.951139121 -0400
-+++ src/core/tagreaderclient.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -71,8 +71,8 @@
- 
- TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -82,8 +82,8 @@
- 
- TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
-   metadata.ToProtobuf(req->mutable_metadata());
-@@ -96,8 +96,8 @@
- 
- TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -107,8 +107,8 @@
- 
- TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
---- src/core/tagreaderclient.h	2020-09-11 17:34:59.560108063 -0400
-+++ src/core/tagreaderclient.h	2021-02-19 14:36:37.196218302 -0500
-@@ -44,7 +44,7 @@
-  public:
-   explicit TagReaderClient(QObject *parent = nullptr);
- 
--  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
-+  typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
-   typedef HandlerType::ReplyType ReplyType;
- 
-   static const char *kWorkerExecutableName;
-@@ -78,7 +78,7 @@
-   static TagReaderClient *sInstance;
- 
-   WorkerPool<HandlerType> *worker_pool_;
--  QList<pb::tagreader::Message> message_queue_;
-+  QList<spb::tagreader::Message> message_queue_;
-   QThread *original_thread_;
- };
- 
-diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp
---- tests/src/tagreader_test.cpp	2020-09-11 17:34:59.596107832 -0400
-+++ tests/src/tagreader_test.cpp	2021-02-19 14:36:37.194218300 -0500
-@@ -44,7 +44,7 @@
-   static Song ReadSongFromFile(const QString& filename) {
-     TagReader tag_reader;
-     Song song;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
- 
-     // We need to init protobuf object from a Song object, to have default values initialized correctly.
-     song.ToProtobuf(&pb_song);
-@@ -55,7 +55,7 @@
- 
-   static void WriteSongToFile(const Song& song, const QString& filename) {
-     TagReader tag_reader;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
-     song.ToProtobuf(&pb_song);
-     tag_reader.SaveFile(filename, pb_song);
-   }
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 2621799c3421..ac2096d495ca 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,18 +1,33 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.4
+version=0.9.3
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
+hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
  chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
- libmtp-devel protobuf-devel pulseaudio-devel qt5-tools-devel qt5-plugin-mysql
- qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-x11extras-devel taglib-devel"
-depends="qt5-plugin-sqlite desktop-file-utils"
+ libmtp-devel protobuf-devel pulseaudio-devel taglib-devel"
+depends="desktop-file-utils"
 short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b
+checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e
+
+build_options="qt6"
+build_options_default=""
+
+if [ "$build_option_qt6" ]; then
+	configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
+	hostmakedepends+=" qt6-base-devel qt6-tools-devel"
+	makedepends+=" qt6-base-devel qt6-plugin-mysql
+	 qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+	depends+=" qt6-plugin-sqlite"
+else
+	hostmakedepends+=" qt5-host-tools qt5-devel"
+	makedepends+=" qt5-tools-devel qt5-plugin-mysql
+	 qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+	 qt5-plugin-tds qt5-x11extras-devel"
+	depends+=" qt5-plugin-sqlite"
+fi

From fa0edf37d354087b7994909f1cf2aee25dbab991 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:29:24 +0200
Subject: [PATCH 226/447] coreboot-utils: update to 4.13.

---
 srcpkgs/coreboot-utils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template
index 8368dec29699..4eec377ecea6 100644
--- a/srcpkgs/coreboot-utils/template
+++ b/srcpkgs/coreboot-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'coreboot-utils'
 pkgname=coreboot-utils
-version=4.12
-revision=2
+version=4.13
+revision=1
 archs="i686* x86_64*"
 wrksrc="coreboot-${version}"
 build_wrksrc="util"
@@ -12,7 +12,7 @@ maintainer="m3tav3rse <mtvrs@tuta.io>"
 license="GPL-2.0-only"
 homepage="https://coreboot.org"
 distfiles="https://coreboot.org/releases/coreboot-${version}.tar.xz"
-checksum=edcad000ee9b73183c396ea76155629b3d27c693e0f1ae83e3424c4d936e2be2
+checksum=4779da645a25ddebc78f1bd2bd0b740fb1e6479572648d4650042a2b9502856a
 
 do_build() {
 	for util in cbfstool cbmem ectool ifdtool inteltool intelmetool \

From c39080ad9f0227e932e178d3d5c24ed66795f40a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 7 May 2021 03:27:41 +1100
Subject: [PATCH 227/447] fasm: update to 1.73.27.

Also add update file.
---
 srcpkgs/fasm/template | 4 ++--
 srcpkgs/fasm/update   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/fasm/update

diff --git a/srcpkgs/fasm/template b/srcpkgs/fasm/template
index 6c175222ed04..020b96a5a3b8 100644
--- a/srcpkgs/fasm/template
+++ b/srcpkgs/fasm/template
@@ -1,6 +1,6 @@
 # Template file for 'fasm'
 pkgname=fasm
-version=1.73.24
+version=1.73.27
 revision=1
 archs="i686* x86_64*"
 wrksrc=fasm
@@ -9,7 +9,7 @@ maintainer="Dmitry Bogatov <KAction@disroot.org>"
 license="BSD-2-Clause"
 homepage="https://flatassembler.net"
 distfiles="https://flatassembler.net/fasm-${version}.tgz"
-checksum=f3c83975a36d9095e64bb3f60f2f0844355cb502391efce9d611c18a34ec5b90
+checksum=680148377fb6d3b6663852880faa03514d7326b5995742d33a87e244f48cf0b1
 nostrip=yes
 
 case ${XBPS_TARGET_MACHINE} in
diff --git a/srcpkgs/fasm/update b/srcpkgs/fasm/update
new file mode 100644
index 000000000000..7a0ebcb45533
--- /dev/null
+++ b/srcpkgs/fasm/update
@@ -0,0 +1,2 @@
+site="https://flatassembler.net/download.php"
+pattern="fasm-\K[\d\.]+.(?=.tgz)"

From da27e900b7118d83d97b6966c775067a9b716c72 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 7 May 2021 02:03:45 +1100
Subject: [PATCH 228/447] gtkwave: update to 3.3.109.

---
 srcpkgs/gtkwave/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkwave/template b/srcpkgs/gtkwave/template
index 277b13897c0f..d99b80e33dbf 100644
--- a/srcpkgs/gtkwave/template
+++ b/srcpkgs/gtkwave/template
@@ -1,6 +1,6 @@
 # Template file for 'gtkwave'
 pkgname=gtkwave
-version=3.3.108
+version=3.3.109
 revision=1
 build_style=gnu-configure
 configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib --with-tk=${XBPS_CROSS_BASE}/usr/lib"
@@ -11,7 +11,7 @@ maintainer="allan <mail@may.mooo.com>"
 license="GPL-2.0-or-later, MIT"
 homepage="http://gtkwave.sourceforge.net/"
 distfiles="http://gtkwave.sourceforge.net/gtkwave-${version}.tar.gz"
-checksum=ece447340442e7ad029713789552e8392b75dd3808c882ac5193d42fce55eb3b
+checksum=ca487e5e9b728086ba4de6581058d6c096a7771915163ef600f63d0e88c3c05d
 
 post_install() {
 	vlicense LICENSE.TXT

From bccd3639a8c9fe3911ce342b576b8b126c2384d6 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 6 May 2021 22:03:11 +0200
Subject: [PATCH 229/447] linux5.4: update to 5.4.116.

---
 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 b1e8f6aeafcc..a014891f7494 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.114
+version=5.4.116
 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=be98f087cb58f23bc5edb8ee80a4794a569d48049d75b1a8eaef9f80fede9557
+checksum=fa8bce778c23a2c5be36e5b5b5005bcfd4ac3df8a90999e9e64189634bbbc9aa
 python_version=3
 patch_args="-Np1"
 

From 1bcdc2e6dfb965d6dd2190a2fc7f72277afddb83 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 7 May 2021 00:49:20 +0200
Subject: [PATCH 230/447] knot-resolver: update to 5.3.2.

---
 srcpkgs/knot-resolver/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 04933629b990..b4a39a09a30c 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.1
+version=5.3.2
 revision=1
 build_style=meson
 configure_args="
@@ -11,13 +11,14 @@ configure_args="
  -Droot_hints=/var/lib/knot-resolver/root.hints"
 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"
+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=9d4d6b7bcdf114acc948e5ee68c83fcbb3944f48a13b9751dbbbc190cdd729c9
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From 6ab2de874977116f9f9ee079e0ec29eeeb0c89ad Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Wed, 5 May 2021 11:58:11 +0200
Subject: [PATCH 231/447] thunderbird: update to 78.10.1

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 0c28c456532c..e2e12fe3a7ac 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.10.0
+version=78.10.1
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=65d79a557027a3b52cc672ab9aea8da7131e6373f94657d03f6d6b9c7b36fb45
+checksum=ea1f573f4af5d6f6b94de8c3bedf27b359adfa1945b19aad005f5205106c1a55
 
 lib32disabled=yes
 

From 3a3cd3a2917532bd22284d2a3e66fc2d7273af47 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Wed, 5 May 2021 11:59:08 +0200
Subject: [PATCH 232/447] thunderbird-i18n: update to 78.10.1

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 936c962a1672..371d2cdf703c 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.10.0
+version=78.10.1
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="b22803c6717d1a832bd085660b7b892fe55b604f9eb486bfa5d97e6a84b9d116
- 8641331581f4140251ba09e0dd5f680c53e61ca6b363129579631289a4dccf50
- c4f9e576072471ed7f47d3c20da24e5b4629daebb2261edb336e30a92c3d5940
- 24b37b2e6515fe9213e8f6fdfe762d02db6ec4e39a82e82df0fe8c82e5148157
- 53874515986b698b356df97538a04b58528f31b5faa5f6f7d0e65d629fa10ab0
- d85088127e958276f71496fd9efb30dd7b79393a15e6f224df2d3a8d92414196
- 7d4dd6ce20c039d8f2d2a4a15d6d5ae4819631be9ef8b56844bd33befab99cfd
- 97159d84019af8aa99020acb009723f6bbef39aa8c1395c8c074370a99178a0f
- 6957f539b22df2598dc0be339f329870f3430f16652486090a210b33c9591c7e
- 3d9a64e42b186ec5a2d40ad6cef7174271b852878f1bba6426ebadd2d2c262f2
- 78c7df6b56b830b90cd77dc7bdeb1a3c75018166b748695eb0fa045b603477ce
- f55f5aa1a75b002198b85122a7dadf60fdc7c766b53de9969d6062341ec3a13c
- b143ffde6ca738614dd511381bba6153d037d25426ff9f0199b9ffb0e189a8f4
- c968c485b441bb2363c7f6f9beb2310976190fd3aedb939031f9bd14183ef911
- 2f1d94c06901d11346a5316ffffbb6f3198aff5711de5adc53b335fef6c46223
- 75fad100352d904bbeabe3c90759f2cbee1b197cb4d3ba2434879cd3fde0fcfc
- 2bbbf5583014c2c895619da5b96551ef5e2b79f85200c7db0f065e3e1aa5eb2c
- 1be39f436f87db7af1c487207a511c3b1033a82e7a9d956fc3cff0d618733445
- 483ce87e775982c955a2d3b4e5ef7c154bb2e41d21a1fe47c8f407cdceaea6ed
- b46821be66ccde4535cb581787354aa80bd0c516c019b297ef32fdcc86b67251
- 511d277d22b9d4c81e7f62d69389ae23a1b9c166f7d04e1e5b37ca379404a1d1
- c8d5c713fbcdc040e8e72bfe11472446f9d831775ebc673264fe0186108fef2a
- ecd0089f4b26be96ac1c6a34699d014bab71b8b28f2dfb2657981e917999f9ed
- 5befa2011017a0fc4e8ecf1c9a3edf43c6c8c086ac803d905304ac03b908c596
- 0bac411a13f004e92dcc46470bde318bdb687a4b8563145d6575825ccc268dcf
- 523fcd991a53436e77abc54fb0332246eaa515d25bf1011df5804ac1a169fe51
- b08a98ab295ee551fad1b3100387bc2dcbcee3ec086cba0538912ea4247db45a
- 1940ee0c7cbdb4b4e54821d97be26a00b0dba6ca8e694341bc95ec097bf72837
- de7bd652ba9fa4de28cbce19d2075228fc2b68f0a088149b1040e77016e83246
- 4309c1f47d25fd033202c39ba35dc16f393acfc4d83e5018257271db4dc55ac7
- eeb68e89171558bdf33931550c4176a13e7b68f24036eb48fe2cfdea1b1bdae6
- 9a9ee81b50561fa4fdae9e10370fc955e50295f4870474043dde45cb45e930c3
- 0f7d20d579a61c5b2e5e8d379b93190aff6e32b0bf1120fc9cc5a31d80578353
- 7040a0c09e1565b41cce2b17a59527f7dc708a05586430608b5f6310b7d06597
- bbf3f5d233219a67b0d10a9c249ded74fec8fd68be24e89cb8f1e2b0e94c03b3
- 51f0f1668dd4fed8d9343d77492b6ea88c218e975d31e8cb92d6cfede529b9fa
- fb98640ea0e1711410e6bfdcb95ba5f8314c5f821730c0f5c95edf6275440eae
- 4c41f47ea1546bca94a5a2a9840679a69a1341846f463b5935fec9fec7159ed3
- e307047b9909c6c3d013d234c6914399298fd668eed2112210eae3ae9b3ac34c
- b286e6c44507faa9545c064fe57536ed876cbcf2c38a578693f4de251fc3c054
- 32279bdbbe33c9a4b31da100c6f707886ccd2abec50a46ea820fb2582960d618
- 6ca81fe7b59e281ca61caf28cb2786f007be108afa1e8267f018ff12b7fe3c45
- 6a3e9e7e254efb6bfe7d3ca76f330ed21fd04b667272aca8bda1ee28499b3587
- f78d8984b15716ab42d29ca3d807f181cf613fe8c760fe39c219bce3bf1e50a4
- cab66584c10594314cdf5d48fc7af44eb361853917095d179ab58376f87ffa71
- f9755650f432d1c8223bf6b08596b70b34788c1f0e214e9a4b8a1bb160fdcd5a
- d4b525ac48b5cacb695844e71d128173ab1816af8da4f97bd0c940abd954bc11
- 0597ed6be1da91983d9ccbd98c7600a810faacaaa46ea73cb377feba4c94f88d
- 9f78c6dd107957101e227c496ab7b5c269f635635f23a84fc905de1bbeb32890
- af8402fb763fc4b9187c67ee555b67b4cec6dbbfe0d0be00e05513875af0451c
- c15da2439ca323568a33b599baceb1d30ec5b0e6f5a6784face9042f2a146914
- 8301d24d09270a4a45f7dc775dcfc10f701ab86957fa630a0abd5257a1f40471
- b6b6a2f77efb288a0b93d0ae1429b5139614d2f58e9e1434e60dc80768fd7bcc
- 9728ba07830c0654fd34df20059e712cf9944909e7b36ee676234ac66e7dbb99
- 77f570116788269af21d626b9d0eb40ab0e548bb6abcaf45a228d39c9dc7cd40"
+checksum="d692124388ab34eb01ae732cc1fe852bf3289110dedb8358d50dfb0faa7b9023
+ c29b7bd535f75b3086cbf3cb44872c7130d1604066144b62c1810e9111521bc5
+ 3386e2f33ef61446f7f0b25257ebd1dff0f051aedaf8f0b9dca538b01c324f07
+ b70e653b46f09087f146559728bf218fef892a91de6ee8c70e67c0f9efa5314d
+ 5aeb8de22f6f9591f099d81d97ea0603e531743a37539f9d7361fb16f72cb29f
+ 31dfb2e413dcc171bc6b19cd7a1b5917887d65b55be6437a05b75b6f1eeb60f9
+ 07caf82fe045e8f8aae6c8d441a702dc8cd647fa224f3d576affc7ce1e06117c
+ cb578a0f42ade1c312d96c499de2c49558b21f53c863474c97fafb9cf27a5f93
+ 5b1054d1e299332a25c28cced29a39a8071a3aa1c0b36673eb94ab3c86014ed0
+ c8eb375031c73535e2a5c0c93c779c711af81ecd12f5e36e18e8cf16e109fd24
+ 2535b151c4719f0b1fc45de60124d3cdb26d1b641fb32df153b64b42983f4ffc
+ 54f53b113d3b2c1dbb3d62464983fd0dda09098da30cdfebba227b5255f78bd4
+ f31de7703cf4fad04ccb8378bd092698acc5806efe62003a223db57e3cc3fbee
+ ffc2aa9e5081b74c3db2410a5fc3e823df1eb59ed8f7cc986ef591e27a0c90dd
+ 08a8d77b1ed238ccdd4593111f86d8db6a1566de9cc6b2edacfb9d25e10f5bfc
+ 8145a9cd418b6e0ddf74377a3f11aa3e261d91a443a042da5fff2957b1e486b0
+ 19958c4ff2b8c2ee293d0fcd02f67e7c4125431dd4c0de2fa6aa994fea5a8988
+ 3f80f66f7817940cef9ee1555a5c34581686fa629876a4eba7df9902ea22c3e2
+ 04cab8720473bdf007e815a8d86f41e720fa4650ec87d346c90c1f0b262399a0
+ 37326221fe42e21f2b02975e509ea62f19c228e6218176a9e82454a10fcb4dcf
+ 69c1eb520b0d4d182f94f151e0c0ad6cdb738521c993bfe723597d76323b9a2b
+ 88dd1c2e9f12654ca45ff4ed1d3d8f790490bf4472bcd50d39b9f369788be780
+ d72e77170975f05f7dc699791df5f52b823720b29f19f9e02cff962b92a2228a
+ c9125981c4ee0eeaf97bbb2000000bfdb5c437639a727981bf6ef63646a649fe
+ e14c828ebca0d7cedd1c184f690b9c59e390509673427150bf394dab43bbb745
+ ddcdad7735e4c2b71bb2fc7a29597483ba47d8c476fb21ac994ac90c76b557f4
+ effa3da616c5a941cf2a209f7577d0aefecc50435e8142bbc8f6cb26db421d53
+ 5f88682859d0442b2965b2dd59fd71f582cdcaa26aa06e523d114ecd0f6d482a
+ eeaf14930ad7903db1318d7eb18a91bea0b56a3810ee47888f406c98794facbb
+ 7d800567f85decd2dd04d1e15d91462516bc5ebff599f86fed4e99d15a086458
+ 790d6022330454c1770eda331bc3b63316bd8f7e0fdc26ca93ee11de77493fb8
+ 20ce52130fcee5bd61759c73b82c5f5bcb95cc8e3a986b505e103f5382270497
+ 1f824de93de8e06674b867a6da853443e24b7452c52f2ed2b87f07ddccfd190f
+ 92889930bc79405b5eea15fdc33cfc1371c34bb90f46da6b5f64d25c562c9244
+ 37000a4fec5a552b2761dd3c0b219f48804d1eff7e88d279873a978ac794b61c
+ 0b7282c3c21c498a4a440a2cb8a7638a53322372109ec7d603595011b9f8c8e4
+ e7278d6e5756ce66fa2e531ddc49bc962f8ca1f0996f715c0ad8cdcd2fa2060e
+ d5f423929b62c2a44761e3ff7037624f6358115eb44578163322d5262729e249
+ d05c8168ebdb71598bb4dd23093d9e0ad1978ea878017c24aa8b2b93dd678795
+ c28bcbc4b8656208ed14195f6f19fe0d2dabe7eaaf5c04313cbc4d3dd0c9f5e8
+ 3259c8208fb6763d687c115c108abc382cef12cbc0126a5faa63cb4e2899234d
+ b4158aa7141b57b97cedaceb4b6ad24313a399a4d0401ff061176c7d99245a1d
+ 31d206b605497979e5b037d59dc367156c75acb7e1bcec535af335a8ac5437c1
+ 78d1b28ef2d9e15c9c1257ed90a37134475d4b3b6ec2fd83a85f66b2b1232ff7
+ e98d8da568b85250b940a030b41def6766e9772cd0d1f6f9a5be529d887fa48d
+ e9930b57a59fbc43fd48eb704bed6e763f3f3b80d7a93499647dc8561c42eedb
+ ab669cb904d856eff63173abd3793dd479ea1c688fa4dd50d59779f5f61b480c
+ 7dad8be277cb97f0d1cb55f0ad72971081cd945fdc191ab9cfc12dcac2225974
+ 6d8179cbbf4ae88d8f47d4044546961a233992e259121d0e4678e1fee0869331
+ 1b16dc9df6909249f5c287a3379e052a878d582365e16afcbac705b46480309e
+ c357cd3e0dcf157dd02949449f4ab296705abb5d848dd33f3d3227e243b939e5
+ a1bb3e509b164311876ab206fee2348480f219828254125f02dd4096e87ee90c
+ 983deafa76012622940cf753c2415b73f6c9347f346f28792ce1ce175d2b0993
+ cf234a7eb25e4b3397ed366de21e0e1fbbd2d4417071ed3c752d51fe8b6565c3
+ d34eaf36f2fb4cafd6c0d752f68515e8d9c4dc429f204d7a8d72be5924b3fc4d"

From c8ece55a32d1433869c0fa3ea51ff115afa92872 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 7 May 2021 01:25:30 +0200
Subject: [PATCH 233/447] polyml: fix lint, clean up, simplify, add
 libffi-devel outside x86

---
 srcpkgs/polyml/template | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/polyml/template b/srcpkgs/polyml/template
index 28170c9d2d32..755274b19d7d 100644
--- a/srcpkgs/polyml/template
+++ b/srcpkgs/polyml/template
@@ -1,33 +1,30 @@
 # Template file for 'polyml'
 pkgname=polyml
 version=5.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-case "$XBPS_TARGET_MACHINE" in
-	i686-musl|x86_64-musl)
-		# musl doesn't allow writing to .rodata and .text during
-		# relocation, but polyexport.o contains DT_TEXTREL
-		# since libpolyml/elfexport.cpp only creates absolute
-		# relocations.  Drop PIE and do relocations at link time.
-		nopie=yes;;
-	i686*|x86_64*) ;;
-	*) configure_args+=" --disable-native-codegeneration" ;;
-esac
 makedepends="gmp-devel"
-conflicts="mesa-demos>=0"  # /usr/bin/poly
-short_desc="The Poly/ML Standard ML (SML) implementation"
+short_desc="Poly/ML Standard ML (SML) implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://www.polyml.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
 checksum=310b0ba748a50f38e99de7f65ba990bc4b4f4b0123ad76aba4c44d7cd1ed9277
+conflicts="mesa-demos>=0" # /usr/bin/poly
 nocross=yes
 
-# broken on musl ppc and big endian ppc
 case "$XBPS_TARGET_MACHINE" in
-	ppc64le) ;;
-	ppc*) broken="Segmentation Fault";;
+	i686*|x86_64*)
+		# musl doesn't allow writing to .rodata and .text during
+		# relocation, but polyexport.o contains DT_TEXTREL
+		# since libpolyml/elfexport.cpp only creates absolute
+		# relocations.  Drop PIE and do relocations at link time.
+		[ "$XBPS_TARGET_LIBC" = "musl" ] && nopie=yes
+		;;
+	*) makedepends+=" libffi-devel";;
 esac
 
-# Since this is a compiler, no -devel package.
+if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
+	broken="crashes"
+fi

From 5167c886852a58df0a70525c3aa9a2da820eb2d9 Mon Sep 17 00:00:00 2001
From: Abhijit <abhijitsipahimalani@gmail.com>
Date: Thu, 6 May 2021 13:25:35 -0700
Subject: [PATCH 234/447] thef: updated to 3.30

fixed lint error

added go binary to checkdepends
---
 srcpkgs/thefuck/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 33617cf872c0..98ae9dc23681 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,20 +1,19 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.29
+version=3.30
 revision=4
 build_style=python3-module
-pycompile_module="thefuck"
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
  python3-requests"
 checkdepends="python3-colorama python3-decorator python3-psutil python3-pyte
- python3-pytest-mock python3-requests"
+ python3-pytest-mock python3-requests go"
 short_desc="Magnificent app which corrects your previous console command"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=34a9ec020ff991a96a895dfbe2313b69464bbcc6975b1ad8158b32a2de5803a9
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 do_check() {
 	# on python3 mock is unittest.mock

From 35c2f3e407d6fafeb164580217c0449318ea3087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 6 May 2021 22:57:15 -0300
Subject: [PATCH 235/447] thefuck: fix checkdepends.

- go isn't available in all archs and would have broken builds with
  tests enabled, so disable tests in that case. someone with more
  interest in the package can disable specific tests if they want
- use $depends instead of repeating the dependency list
---
 srcpkgs/thefuck/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 98ae9dc23681..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -6,8 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
  python3-requests"
-checkdepends="python3-colorama python3-decorator python3-psutil python3-pyte
- python3-pytest-mock python3-requests go"
+checkdepends="python3-pytest-mock $depends"
 short_desc="Magnificent app which corrects your previous console command"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -15,6 +14,12 @@ homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
 checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
+case "$XBPS_TARGET_MACHINE" in
+	# archs where go is available - the test suite uses it
+	x86_64*|i686*|armv[67]*|aarch64*|ppc64le*) checkdepends+=" go" ;;
+	*) make_check=no ;;
+esac
+
 do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py

From 3e9e1c6eb35689d56793faf7ca5888a0c2e99058 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 7 May 2021 12:18:37 +0200
Subject: [PATCH 236/447] perl-LWP: update to 6.54.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index 3a35ee990c0e..12c57912c394 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.53
+version=6.54
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=9cbb7c688416a20c1aba9a32568504af1143ced58b572c502a1b2fb8a500f535
+checksum=76917708bd91fbb15eb5eece25ddd2ed1fa65a5b6b05a3ab2a7facce17dfc81d

From 8b635b8c9c29c8b02ff4f29d495bf6797f72eda2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 7 May 2021 12:20:07 +0200
Subject: [PATCH 237/447] kubecfg: update to 0.19.1.

---
 srcpkgs/kubecfg/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 56b00292d8b4..13193b95d169 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,6 +1,6 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
-version=0.18.0
+version=0.19.1
 revision=1
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
@@ -10,8 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/bitnami/kubecfg"
 distfiles="https://github.com/bitnami/kubecfg/archive/v${version}.tar.gz"
-checksum=710cedf1604ab8d7880cc4ea0e171bc8785067b23e8610665fd6b18de8a15793
-
-if [ "$XBPS_TARGET_WORDSIZE" != 64 ]; then
-	broken="vendor/github.com/google/go-jsonnet/builtins.go:865:82: constant -9223372036854775808 overflows int"
-fi
+checksum=da4228ee8ead91e47f04af09709e0de4ce1ac4c126915e12019f37b7947eb570

From 6a54ef8aaa07c2ca4c543146d01982ecafcef4b9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 7 May 2021 13:07:58 +0200
Subject: [PATCH 238/447] stress-ng: update to 0.12.08.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index c278479af58b..5710b7811811 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.07
+version=0.12.08
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=cf73e3a4c7d95afa46aa27fb9283a8a988f3971de4ce6ffe9f651ca341731ead
+checksum=39e98cbb682bd3f907b2c718c20747bc94804abc92fbc4dad3a50bf530108d09

From 25ca023fd6a7a2c8e8fb3fcab7b675b8b50248e9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 7 May 2021 13:28:02 +0200
Subject: [PATCH 239/447] linux5.10: update to 5.10.35.

---
 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 ddcc5f176e25..4ec10cb07818 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.34
+version=5.10.35
 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=6eeeb7e005bd1d4eb8b10382a35f8cd54ee6692c244ab1362590fa539f3d6582
+checksum=ac37a19d45b77a87e58e3aae8b127a6e7eb85ed7467fc8e58474b387bfd498fd
 python_version=3
 patch_args="-Np1"
 

From a49759cdfc3d0f8d7838e43baa0eb8e89c71a483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 7 May 2021 09:48:18 +0200
Subject: [PATCH 240/447] doctl: update to 1.60.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index beb0376be3db..8492609bc04b 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.59.0
+version=1.60.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=b37b693635af48da8b2b222486be3e315e9ba6eb8fdb0b0e976bff1e63f9c520
+checksum=3bc9cf89d530e3a665334403f4329a011da1eb216343d4ee95c4a66075eabba5

From ea5854d709b3ce9309b4c901f846ad3e26d27dd9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 7 May 2021 16:02:59 +0200
Subject: [PATCH 241/447] qt6-quick3d: broken on big endian (could be
 shadertools though)

---
 srcpkgs/qt6-quick3d/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0022dc25a374..3aa6d675b24c 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -15,6 +15,11 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
 checksum=ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
 
+if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
+	# possibly a qt6-shadertools bug, actually
+	broken="Shader baking failed: Cannot resolve expression type."
+fi
+
 qt6-quick3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
 	short_desc+=" - development files"

From e6f0b947738f1774c0948b1270667f3482964866 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Thu, 6 May 2021 18:16:17 +0200
Subject: [PATCH 242/447] git-toolbelt: update to 1.7.0.

---
 srcpkgs/git-toolbelt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-toolbelt/template b/srcpkgs/git-toolbelt/template
index 1998841827ce..9a43902be1bf 100644
--- a/srcpkgs/git-toolbelt/template
+++ b/srcpkgs/git-toolbelt/template
@@ -1,6 +1,6 @@
 # Template file for 'git-toolbelt'
 pkgname=git-toolbelt
-version=1.6.0
+version=1.7.0
 revision=1
 depends="git moreutils fzf"
 short_desc="Helper tools to make everyday life with Git much easier"
@@ -8,7 +8,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/nvie/git-toolbelt"
 distfiles="https://github.com/nvie/git-toolbelt/archive/v${version}.tar.gz"
-checksum=@8b0d689fcbda5148d0c8728b542fb691e7bbb91ba438f57db67e7f740819e526
+checksum=ea17c85a2494c98daf56c517c3dfcfb288a726ce867120ffb52befb22d42f2c5
 conflicts="git-extras"
 
 do_install() {

From 85722af26fe7ef5abe7e1e49e360645696c95124 Mon Sep 17 00:00:00 2001
From: Anubhav Kini <anubhavkini@gmail.com>
Date: Fri, 7 May 2021 13:01:55 +0530
Subject: [PATCH 243/447] batsignal: update to 1.2.0.

---
 srcpkgs/batsignal/patches/cflags.patch | 14 --------------
 srcpkgs/batsignal/template             |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/batsignal/patches/cflags.patch

diff --git a/srcpkgs/batsignal/patches/cflags.patch b/srcpkgs/batsignal/patches/cflags.patch
deleted file mode 100644
index 4bf91c2bb284..000000000000
--- a/srcpkgs/batsignal/patches/cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile	2020-07-31 18:42:11.268427773 +0100
-+++ Makefile	2020-07-31 19:30:33.904122987 +0100
-@@ -7,9 +7,9 @@
- PREFIX = /usr/local
- MANPREFIX = $(PREFIX)/share/man
- 
--CC = cc
-+CC ?= cc
- LD = ld
--CFLAGS = -std=c99 -pedantic -Wall -Wextra -Werror -Wno-unused-parameter -Os -s -D_GNU_SOURCE $(shell pkg-config --cflags libnotify)
-+CFLAGS += -std=c99 -D_GNU_SOURCE $(shell pkg-config --cflags libnotify)
- LDLIBS = $(shell pkg-config --libs libnotify)
- 
- SRC = main.c version.h
diff --git a/srcpkgs/batsignal/template b/srcpkgs/batsignal/template
index 72775d9640ae..5e55da9e7f8f 100644
--- a/srcpkgs/batsignal/template
+++ b/srcpkgs/batsignal/template
@@ -1,6 +1,6 @@
 # Template file for 'batsignal'
 pkgname=batsignal
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -11,7 +11,7 @@ maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="ISC"
 homepage="https://github.com/electrickite/batsignal"
 distfiles="https://github.com/electrickite/batsignal/archive/${version}.tar.gz"
-checksum=00cb30df33b5fee049963657f341e963a0f094dbf1620397bf1e56fa07191e7c
+checksum=79f72e7cfe660734ab14950b7592e8b46df3ebf15d41cb2cab45437dda3dfffb
 
 post_install() {
 	vlicense LICENSE

From 72eeea2974dd99d3bd13db59d1c266bded0029cf Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 7 May 2021 17:22:26 +0200
Subject: [PATCH 244/447] lagrange: update to 1.4.0.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index cb74a353bfe0..e56958cd7ef7 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.3.3
+version=1.4.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=c471c8bbf57aa242c5d23be727f846b87bca42b1eab977862deb9b5f9172eaa5
+checksum=5de404731e12eda994adffb39b3e6d80612a9de96b0f958c614161ac2e5f9ec3
 
 post_install() {
 	vlicense LICENSE.md

From 50458639f1bf50614a2971393dab871d9078898a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 7 May 2021 08:17:39 +0300
Subject: [PATCH 245/447] libass: update to 0.15.1.

---
 srcpkgs/libass/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libass/template b/srcpkgs/libass/template
index 398802902475..83cc908f26af 100644
--- a/srcpkgs/libass/template
+++ b/srcpkgs/libass/template
@@ -1,16 +1,16 @@
-# Template build file for 'libass.
+# Template file for 'libass'
 pkgname=libass
-version=0.15.0
+version=0.15.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool yasm pkg-config"
 makedepends="enca-devel fontconfig-devel fribidi-devel harfbuzz-devel"
-short_desc="A portable library for SSA/ASS subtitles rendering"
+short_desc="Portable library for SSA/ASS subtitles rendering"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/libass/libass/"
 license="MIT"
+homepage="https://github.com/libass/libass/"
 distfiles="https://github.com/libass/libass/archive/${version}.tar.gz"
-checksum=232b1339c633e6a93c153cac7a483e536944921605f35fcbaedc661c62fb49ec
+checksum=61538871aa7779620caa01fb52e9344a1840848e8a55b8aaa33d16dd88f97417
 
 pre_configure() {
 	autoreconf -fi

From 23505ee966f79ce985f107601cd92c1590279443 Mon Sep 17 00:00:00 2001
From: Anubhav Kini <anubhavkini@gmail.com>
Date: Fri, 7 May 2021 18:47:30 +0530
Subject: [PATCH 246/447] elogind: fix nobody ids

---
 srcpkgs/elogind/patches/id-nobody.patch | 13 +++++++++++++
 srcpkgs/elogind/template                |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/elogind/patches/id-nobody.patch

diff --git a/srcpkgs/elogind/patches/id-nobody.patch b/srcpkgs/elogind/patches/id-nobody.patch
new file mode 100644
index 000000000000..6ceecba74d4b
--- /dev/null
+++ b/srcpkgs/elogind/patches/id-nobody.patch
@@ -0,0 +1,13 @@
+--- src/basic/user-util.h
++++ src/basic/user-util.h
+@@ -70,8 +70,8 @@ int take_etc_passwd_lock(const char *root);
+ #define UID_INVALID ((uid_t) -1)
+ #define GID_INVALID ((gid_t) -1)
+ 
+-#define UID_NOBODY ((uid_t) 65534U)
+-#define GID_NOBODY ((gid_t) 65534U)
++#define UID_NOBODY ((uid_t) 99U)
++#define GID_NOBODY ((gid_t) 99U)
+ 
+ #define ETC_PASSWD_LOCK_PATH "/etc/.pwd.lock"
+ 
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 784b60e6462d..8e9fb0ef6c81 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -2,7 +2,7 @@
 pkgname=elogind
 reverts="246.10_1"
 version=246.9.2
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
  -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot

From cebdf958b1eff7bcc08d0cd76d42205fab36a415 Mon Sep 17 00:00:00 2001
From: Abhijit <abhijitsipahimalani@gmail.com>
Date: Thu, 6 May 2021 15:57:42 -0700
Subject: [PATCH 247/447] alure: remove outdated homepage comment.

Somewhat recent homepage snapshot (2020-09-27) can be found in
web.archive [1], but that URL isn't referenced anywhere in the
repository [2].

[1] https://web.archive.org/web/20200927044901/kcat.strangesoft.net/alure.html
[2] https://github.com/kcat/alure

Closes: #30712 [via git-merge-pr]
---
 srcpkgs/alure/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/alure/template b/srcpkgs/alure/template
index d8c3f41648b9..0acf8c80fd3d 100644
--- a/srcpkgs/alure/template
+++ b/srcpkgs/alure/template
@@ -10,7 +10,6 @@ makedepends="libopenal-devel libsndfile-devel libvorbis-devel libflac-devel
 short_desc="Utility library to help manage common tasks with OpenAL applications"
 maintainer="Simon Whelan <si.whelan@gmail.com>"
 license="MIT"
-# homepage="http://kcat.strangesoft.net/alure.html"
 homepage="https://github.com/kcat/alure"
 distfiles="${DEBIAN_SITE}/main/a/alure/alure_${version}.orig.tar.bz2"
 checksum=465e6adae68927be3a023903764662d64404e40c4c152d160e3a8838b1d70f71

From 2e753964952e9357324f7fc8afcce1cca67242b6 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Fri, 7 May 2021 08:02:32 +0530
Subject: [PATCH 248/447] traverso: remove package

distfiles are gone.
---
 srcpkgs/removed-packages/template             |  1 +
 .../patches/cmake-build-type-none.patch       | 28 -------------------
 .../patches/patch-src_core_Sheet.patch        | 11 --------
 srcpkgs/traverso/template                     | 25 -----------------
 4 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 srcpkgs/traverso/patches/cmake-build-type-none.patch
 delete mode 100644 srcpkgs/traverso/patches/patch-src_core_Sheet.patch
 delete mode 100644 srcpkgs/traverso/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1850b4b5bfb8..0f49b394e541 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -286,6 +286,7 @@ replaces="
  tagainijisho<=1.0.3_1
  tlsdate<=0.0.13_16
  taizen<=0.0.0.20180808_4
+ traverso<=0.49.6_2
  ttyload-git<=20141117_4
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
diff --git a/srcpkgs/traverso/patches/cmake-build-type-none.patch b/srcpkgs/traverso/patches/cmake-build-type-none.patch
deleted file mode 100644
index 75b3fd941eb8..000000000000
--- a/srcpkgs/traverso/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -65,13 +65,7 @@ SET(TRAVERSO_DEFINES -DSTATIC_BUILD)
- 
- #BUILD SETUP
- #None, Debug, Release, .. or custom ones
--IF(WANT_DEBUG)
--  SET(CMAKE_BUILD_TYPE DEBUG)
--  SET(WANT_TRAVERSO_DEBUG ON)
--ELSE(WANT_DEBUG)
--  SET(CMAKE_BUILD_TYPE RELEASE)
--  LIST(APPEND TRAVERSO_DEFINES -DQT_NO_DEBUG)
--ENDIF(WANT_DEBUG)
-+LIST(APPEND TRAVERSO_DEFINES -DQT_NO_DEBUG)
- 
- 
- IF(WANT_TRAVERSO_DEBUG)
-@@ -326,7 +320,7 @@ ${Qt5Xml_INCLUDE_DIRS}
- ${Qt5Xml_INCLUDES}
- )
- 
--set(CMAKE_CXX_FLAGS "-fPIC")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- 
- #Set up libraries to link with all found packages
- LINK_LIBRARIES (
diff --git a/srcpkgs/traverso/patches/patch-src_core_Sheet.patch b/srcpkgs/traverso/patches/patch-src_core_Sheet.patch
deleted file mode 100644
index 4676e9ebb059..000000000000
--- a/srcpkgs/traverso/patches/patch-src_core_Sheet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/Sheet.cpp.orig	2019-05-16 08:08:50 UTC
-+++ src/core/Sheet.cpp
-@@ -397,7 +397,7 @@ int Sheet::prepare_export(ExportSpecification* spec)
- 		m_rendering = true;
- 	}
- 
--	spec->startLocation = LONG_LONG_MAX;
-+	spec->startLocation = LLONG_MAX;
- 	spec->endLocation = TimeRef();
- 
- 	TimeRef endlocation, startlocation;
diff --git a/srcpkgs/traverso/template b/srcpkgs/traverso/template
deleted file mode 100644
index 4b93460f63d7..000000000000
--- a/srcpkgs/traverso/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'traverso'
-pkgname=traverso
-version=0.49.6
-revision=2
-build_style=cmake
-configure_args="-DWANT_MP3_ENCODE=ON -DDETECT_HOST_CPU_FEATURES=OFF"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="jack-devel wavpack-devel libvorbis-devel libflac-devel
- libmad-devel lame-devel fftw-devel qt5-devel lilv-devel libsndfile-devel
- libsamplerate-devel"
-depends="hicolor-icon-theme"
-short_desc="Digital Audio Workstation with an innovative user Interface"
-maintainer="Lorem <notloremipsum@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="http://traverso-daw.org/"
-distfiles="http://traverso-daw.org/traverso-${version}.tar.gz"
-checksum=f850b88cbb64529655514b7cfe01c56133e21929374b3e3b90813bc227eac789
-
-post_install() {
-	vdoc resources/help.text
-	vinstall resources/traverso.desktop 644 usr/share/applications
-	vinstall resources/x-traverso.xml 644 usr/share/mime/packages
-	vmkdir usr/share/icons/hicolor
-	cp -a resources/freedesktop/icons/* ${DESTDIR}/usr/share/icons/hicolor
-}

From c5dc4d45ddcb62fbe2daf06896fa5be4c25ce05b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 6 May 2021 21:32:08 -0700
Subject: [PATCH 249/447] srb2: update to 2.2.9

---
 srcpkgs/srb2/patches/libadd-execinfo.patch | 12 ++++++++++++
 srcpkgs/srb2/template                      | 15 ++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/srb2/patches/libadd-execinfo.patch

diff --git a/srcpkgs/srb2/patches/libadd-execinfo.patch b/srcpkgs/srb2/patches/libadd-execinfo.patch
new file mode 100644
index 000000000000..386010c38608
--- /dev/null
+++ b/srcpkgs/srb2/patches/libadd-execinfo.patch
@@ -0,0 +1,12 @@
+diff -Naur SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg SRB2-SRB2_release_2.2.9.orig/src/sdl/MakeNIX.cfg
+--- SRB2-SRB2_release_2.2.9.orig/src/sdl/MakeNIX.cfg	2021-05-07 00:06:51.901546000 -0700
++++ SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg	2021-05-06 19:38:24.000000000 -0700
+@@ -22,7 +22,7 @@
+ 	OPTS=-DUNIXCOMMON
+ 
+ 	#LDFLAGS = -L/usr/local/lib
++	LIBS+=-lm
+-	LIBS=-lm
+ ifdef LINUX
+ 	LIBS+=-lrt
+ ifdef NOTERMIOS
diff --git a/srcpkgs/srb2/template b/srcpkgs/srb2/template
index 5b136b6d4b97..08a2bff0886c 100644
--- a/srcpkgs/srb2/template
+++ b/srcpkgs/srb2/template
@@ -1,12 +1,12 @@
 # Template file for 'srb2'
 pkgname=srb2
-version=2.2.8
+version=2.2.9
 revision=1
 create_wrksrc=true
 build_wrksrc="SRB2-SRB2_release_${version}"
 build_style=gnu-makefile
 make_use_env=yes
-make_build_args=" -C src LINUX=1 USE_OPENMP=1 EXENAME=${pkgname}
+make_build_args=" -C src ECHO=1 LINUX=1 USE_OPENMP=1 EXENAME=${pkgname}
  DBGNAME=${pkgname}-debug NOOBJDUMP=1 NOUPX=1"
 hostmakedepends="pkg-config gettext"
 makedepends="SDL2-devel SDL2_mixer-devel libpng-devel libupnp-devel libcurl-devel libgme-devel libopenmpt-devel"
@@ -15,9 +15,9 @@ maintainer="oreo639 <oreo6391@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://srb2.org/"
 distfiles="https://github.com/STJr/SRB2/archive/SRB2_release_${version}.tar.gz
- https://github.com/STJr/SRB2/releases/download/SRB2_release_${version}/SRB2-v${version}-Full.zip"
-checksum="bbb2777a05a16019d8b4a3fcef9829e6e7cfd795710b3ffcce009120f0e2c43c
- 7a3805b1127bd42db6432a9fe3e25927269e334497d48bdc9c2751edc114d718"
+ https://github.com/STJr/SRB2/releases/download/SRB2_release_${version}/SRB2-v${version//./}-Full.zip"
+checksum="5f7eeb08e90323e28cdcb02ad25c904eef25ce75316720609b995a1e4ffd154a
+ 48cf787a70f44b31fa7a56db4053a404a7103a494f1e09fd2bbfd563672a3534"
 restricted=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -26,6 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_build_args+=" NONX86=1" ;;
 esac
 
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	export LIBS="-lexecinfo"
+fi
+
 if [ -n "$CROSS_BUILD" ]; then
 	make_build_args+=" OBJCOPY=${XBPS_CROSS_TRIPLET}-objcopy"
 fi

From 4b19f2fd81272a38f25d157df704ca8b5630f1d3 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 6 May 2021 09:21:37 +0200
Subject: [PATCH 250/447] vscode: update to 1.56.0

---
 srcpkgs/vscode/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 50304de55eee..8ee840e0d8a7 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,17 +1,17 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.55.2
-revision=2
-_electronver=10.4.3
+version=1.56.0
+revision=1
+_electronver=12.0.4
 hostmakedepends="pkg-config python nodejs yarn tar git"
-makedepends="libxkbfile-devel libsecret-devel electron10"
-depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron10"
+makedepends="libxkbfile-devel libsecret-devel electron12"
+depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron12"
 short_desc="Microsoft Code for Linux"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=43cb929a0fd3d569ff8a734df7a97a02c3d1107eda4c195d97835e6d08432cbc
+checksum=ccc1045d10b3b35a4f2fba5c536c902addac22f63c8e1c781ec636edf74358cc
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 6b51cae6099e55131b35146c0dfef9175f9b5aca Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 00:23:20 +0300
Subject: [PATCH 251/447] skalibs: update to 2.10.0.3.

---
 srcpkgs/skalibs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index 38363d38fd7b..891680dd1847 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,6 +1,6 @@
 # Template file for 'skalibs'
 pkgname=skalibs
-version=2.10.0.2
+version=2.10.0.3
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --enable-static --enable-shared
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/skalibs/"
 changelog="https://skarnet.org/software/skalibs/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=8bba3d7650bab83d4ea2ad21d6bfb5479a8652e362a478fcb783b3c7cf891e0f
+checksum=b780b0ae650dda0c3ec5f8975174998af2d24c2a2e2be669b1bab46e73b1464d
 
 post_install() {
 	vlicense COPYING LICENSE

From 38a91e528b9dd37fc2a1738fdb88b5c5607fbec4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 00:23:26 +0300
Subject: [PATCH 252/447] execline: update to 2.8.0.1.

---
 srcpkgs/execline/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index a2bf5437f0b4..856750ada28b 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,11 +1,12 @@
 # Template file for 'execline'
 pkgname=execline
-version=2.8.0.0
+version=2.8.0.1
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib"
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib
+ $(vopt_if static --enable-static-libc)"
 makedepends="skalibs-devel"
 short_desc="Non-interactive scripting language"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,17 +14,12 @@ license="ISC"
 homepage="https://skarnet.org/software/execline/"
 changelog="https://skarnet.org/software/execline/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=e7744b4a400eda68b83dcfb1bce65e454606279882d83d8230ddf8afda25766d
+checksum=a373f497d2335905d750e2f3be2ba47a028c11c4a7d5595dca9965c161e53aed
 
 CFLAGS="-fPIC"
 
 build_options="static"
 
-if [ "$build_option_static" ]; then
-	CFLAGS="-static"
-	LDFLAGS="-static"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		makedepends+=" nsss-devel"

From c85e6b810010a667d6726cab91f6f00e2ac3de8d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 00:23:30 +0300
Subject: [PATCH 253/447] s6: update to 2.10.0.3.

---
 srcpkgs/s6/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index 70e65e51a5c9..730c74a530a9 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,12 +1,13 @@
 # Template file for 's6'
 pkgname=s6
-version=2.10.0.2
+version=2.10.0.3
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib
- --exec-prefix=/usr"
+ --exec-prefix=/usr
+ $(vopt_if static --enable-static-libc)"
 makedepends="execline-devel skalibs-devel"
 short_desc="Small suite of programs for UNIX, designed to allow process supervision"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -14,7 +15,9 @@ license="ISC"
 homepage="http://skarnet.org/software/s6/"
 changelog="https://skarnet.org/software/s6/upgrade.html"
 distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=b23afce87080b848b89499e85ebd93c20269e6db23f6ef65e58386c9cecd6c21
+checksum=1d21373151704150df0e8ed199f097f6ee5d2befb9a68aca4f20f3862e5d8757
+
+build_options="static"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 54d61536afafbfc25b577d44d030ae017b92956c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 00:23:36 +0300
Subject: [PATCH 254/447] s6-rc: update to 0.5.2.2.

---
 srcpkgs/s6-rc/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template
index 31cce8d8e956..41565de3c458 100644
--- a/srcpkgs/s6-rc/template
+++ b/srcpkgs/s6-rc/template
@@ -1,11 +1,12 @@
 # Template file for 's6-rc'
 pkgname=s6-rc
-version=0.5.2.1
+version=0.5.2.2
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib"
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib
+ $(vopt_if static --enable-static-libc)"
 makedepends="execline-devel skalibs-devel s6-devel"
 depends="s6>=2.9.0.0_1 execline>=2.5.2.0_1"
 short_desc="Service manager of the s6 init system"
@@ -14,7 +15,9 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-rc/"
 changelog="https://skarnet.org/software/s6-rc/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=2842fa55e2bddb65573d78d2c475c4a2f2b26b9258a18b457f8a0342e2fafa0a
+checksum=2a8d1cd455c05c8502b34517cfe79841aa46d08ad969076b37a15d3910617f89
+
+build_options="static"
 
 post_install() {
 	vlicense COPYING

From d68cbb3a5ff6024508251dbaca557404563e2572 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 00:23:40 +0300
Subject: [PATCH 255/447] s6-dns: update to 2.3.5.1.

---
 srcpkgs/s6-dns/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index e3258cbd684c..ee56726d19e9 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -1,18 +1,21 @@
 # Template file for 's6-dns'
 pkgname=s6-dns
-version=2.3.5.0
+version=2.3.5.1
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib"
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib
+ $(vopt_if static --enable-static-libc)"
 makedepends="execline-devel skalibs-devel"
 short_desc="Suite of DNS client programs and libraries for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="ISC"
 homepage="https://skarnet.org/software/s6-dns"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=9f0b71c82cb51e9b7f998978d94c44e5e896fa60105f7233544db539572bb740
+checksum=0c1d50e5d7bc65cbf59b6f37fbd7f6f5645694224bb8c4dc1943d7921bc74f63
+
+build_options="static"
 
 post_install() {
 	vlicense COPYING

From b39417a4f540663469e7b296a3a3fac6a882cd3a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 00:23:47 +0300
Subject: [PATCH 256/447] s6-networking: update to 2.4.1.1.

---
 srcpkgs/s6-networking/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 963cbaa3e9d3..575d9b0f34df 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,12 +1,13 @@
 # Template file for 's6-networking'
 pkgname=s6-networking
-version=2.4.1.0
+version=2.4.1.1
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin
+ $(vopt_if static --enable-static-libc)"
 makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
@@ -15,9 +16,9 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-networking"
 changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
+checksum=a3fbca789dc5c82b3055fdbd2f55110902198f3136447617ce8f8b79fa8aa554
 
-build_options="bearssl libtls"
+build_options="bearssl libtls static"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
 desc_option_libtls="Use LibreSSL as SSL library"

From 5f7c617be9de9b4871ad70365cd163e4dcfc1cf1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 00:23:56 +0300
Subject: [PATCH 257/447] s6-portable-utils: update to 2.2.3.2.

---
 srcpkgs/s6-portable-utils/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index 24572e52d36f..39aa659bec74 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,11 +1,12 @@
 # Template file for 's6-portable-utils'
 pkgname=s6-portable-utils
-version=2.2.3.1
+version=2.2.3.2
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib"
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib
+ $(vopt_if static --enable-static-libc)"
 makedepends="skalibs-devel"
 short_desc="Tiny portable generic utilities (s6-cat, s6-chmod, etc.)"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,7 +14,9 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-portable-utils/"
 changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=43e68a9abec873b337baeee92075a1c2e22cdfffd595cb91475fdcb10b6441cf
+checksum=6627a2d3ea263539e83512a36f10a587fa0dd5e899bc3612187e9e3b9faf769c
+
+build_options="static"
 
 post_install() {
 	vlicense COPYING

From 143f625697ab994945a20c3f3f7623d24c37bce4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 00:24:02 +0300
Subject: [PATCH 258/447] s6-linux-utils: update to 2.5.1.5.

---
 srcpkgs/s6-linux-utils/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 32e443a6cb0e..52d3622be3b4 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -1,11 +1,12 @@
 # Template file for 's6-linux-utils'
 pkgname=s6-linux-utils
-version=2.5.1.4
+version=2.5.1.5
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --includedir=/usr/include
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin
+ $(vopt_if static --enable-static-libc)"
 makedepends="skalibs-devel"
 short_desc="Minimalistic Linux-specific system utilities (s6-chroot, s6-mount etc.)"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,7 +14,9 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-linux-utils"
 changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=d8ad8dcc8d805646b655971ddcaabcd50094d8347bd49d859ba2c51713fbfd09
+checksum=c300dbf36b533083f82c6827830c55ce34bfc6cd493c782f207d199669a345ba
+
+build_options="static"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From ea7f2787582382b552b3f247d37c715205866d9a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 00:24:11 +0300
Subject: [PATCH 259/447] mdevd: update to 0.1.4.0.

---
 srcpkgs/mdevd/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template
index ef6e7d21553b..b85ef940243b 100644
--- a/srcpkgs/mdevd/template
+++ b/srcpkgs/mdevd/template
@@ -1,11 +1,12 @@
 # Template file for 'mdevd'
 pkgname=mdevd
-version=0.1.3.0
+version=0.1.4.0
 revision=1
 build_style=configure
 configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
- --with-lib=${XBPS_CROSS_BASE}/usr/lib"
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib
+ $(vopt_if static --enable-static-libc)"
 makedepends="skalibs-devel"
 short_desc="Small mdev-compatible kernel hotplug daemon similar to udevd"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,7 +14,9 @@ license="ISC"
 homepage="https://skarnet.org/software/mdevd/"
 changelog="https://skarnet.org/software/mdevd/upgrade.html"
 distfiles="https://skarnet.org/software/mdevd/mdevd-${version}.tar.gz"
-checksum=be89ab072c4de822a06e26579dcca10e85ae5fd5be23ba903415b4de8fe0fb6a
+checksum=ffd3b223b4cf0e51253b4a8f09cb88d70bf22693228ab0818af174a3f099dcd2
+
+build_options="static"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 69308e1f62203d313e0b083f553a0deadac46786 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 00:24:15 +0300
Subject: [PATCH 260/447] nsss: update to 0.1.0.1.

---
 srcpkgs/nsss/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template
index bf23155fd7a5..3baf95812104 100644
--- a/srcpkgs/nsss/template
+++ b/srcpkgs/nsss/template
@@ -1,13 +1,14 @@
 # Template file for 'nsss'
 pkgname=nsss
-version=0.1.0.0
+version=0.1.0.1
 revision=1
 # Only available for musl
 archs="*-musl"
 build_style=configure
 configure_args="--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --enable-shared --libdir=/usr/lib
- --bindir=/usr/bin --dynlibdir=/usr/lib --includedir=/usr/include/nsss"
+ --bindir=/usr/bin --dynlibdir=/usr/lib --includedir=/usr/include/nsss
+ $(vopt_if static --enable-static-libc)"
 makedepends="skalibs-devel"
 short_desc="Minimal competing implementation of glibc's Name Switch Service"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -15,7 +16,9 @@ license="ISC"
 homepage="https://skarnet.org/software/nsss/"
 changelog="https://skarnet.org/software/nsss/upgrade.html"
 distfiles="https://skarnet.org/software/nsss/nsss-${version}.tar.gz"
-checksum=b88a389264a76893ef3ad9c086ea694f32b688ed22fb7480a2a172131c5f3d97
+checksum=20c7b015eb31d0a263ffbe3a672b2ed0be173190dce25b41b9adb95341c851d9
+
+build_options="static"
 
 do_check() {
 	: #checkdepends=s6, creates dependency cycle

From fc2e144203267e0bfa296a2d78d1ac9f3fa7c250 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 2 May 2021 23:04:00 +0300
Subject: [PATCH 261/447] s6-man-pages: update to 2.10.0.3.1.

---
 srcpkgs/s6-man-pages/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-man-pages/template b/srcpkgs/s6-man-pages/template
index f95e50d24b25..a435dda4f58b 100644
--- a/srcpkgs/s6-man-pages/template
+++ b/srcpkgs/s6-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 's6-man-pages'
 pkgname=s6-man-pages
-version=2.10.0.2.1
+version=2.10.0.3.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/s6-man-pages"
 distfiles="https://github.com/flexibeast/s6-man-pages/archive/v${version}.tar.gz"
-checksum=4b831ed89f6a53550626f28d09ea594042321ac6a81d42175b0c52de041ba3cf
+checksum=df23a0c68e276f4d6851997dc2535cec357e2e61f7dd5bd3bc991d3d60280029
 
 
 do_install() {

From 5fc1b5d13313b5da9916a7836bf1e4cb5f58468f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 2 May 2021 23:05:43 +0300
Subject: [PATCH 262/447] execline-man-pages: update to 2.8.0.1.1.

---
 srcpkgs/execline-man-pages/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template
index 5309ac930b02..d15dd021ab58 100644
--- a/srcpkgs/execline-man-pages/template
+++ b/srcpkgs/execline-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 'execline-man-pages'
 pkgname=execline-man-pages
-version=2.8.0.0.1
+version=2.8.0.1.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/execline-man-pages"
 distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz"
-checksum=c99e4bfce6aab2bdccb1ec08af063b6434a43bf4aa8bfa0efca98b4f11c8588e
+checksum=4e03d919660ffa1ec0713af0ebf6f7214d3f18a1633e1f97155da120824bcb92
 
 do_install() {
 	vmkdir usr/share/man/man1

From 4874d72cacbca78ece6f3f1f27d66a79e99c290c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 2 May 2021 23:07:47 +0300
Subject: [PATCH 263/447] s6-networking-man-pages: update to 2.4.1.1.1.

---
 srcpkgs/s6-networking-man-pages/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-networking-man-pages/template b/srcpkgs/s6-networking-man-pages/template
index 8e4f95b5efb4..4a0d92c55dd7 100644
--- a/srcpkgs/s6-networking-man-pages/template
+++ b/srcpkgs/s6-networking-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 's6-networking-man-pages'
 pkgname=s6-networking-man-pages
-version=2.4.1.0.1
+version=2.4.1.1.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/s6-networking-man-pages"
 distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/v${version}.tar.gz"
-checksum=e864679744eee8ba8f44297c76422c7a955f6bd973b3462c6ad2406c2d870c6d
+checksum=7606122ab71893fa216b48990d6c2e4eb124490acc237b84972ec6c1096c45f7
 
 do_install() {
 	vmkdir usr/share/man/man1

From ce505e78e75ce1abb83f906f7dda84d251cd7d2e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 8 May 2021 08:07:30 +0200
Subject: [PATCH 264/447] linux5.4: update to 5.4.117.

---
 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 a014891f7494..155eefa4b6b0 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.116
+version=5.4.117
 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=fa8bce778c23a2c5be36e5b5b5005bcfd4ac3df8a90999e9e64189634bbbc9aa
+checksum=4e989b5775830092e5c76b5cca65ebff862ad0c87d0b58c3a20d415c3d4ec770
 python_version=3
 patch_args="-Np1"
 

From fded804e4c2281b40f9dd28dcfe5ae13ff8011ef Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 8 May 2021 08:09:08 +0200
Subject: [PATCH 265/447] linux4.19: update to 4.19.190.

---
 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 9bb0d3d2f705..9c93e7b3ccc6 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.189
+version=4.19.190
 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=717b0e5df07ebbc0575d834e0c15c0e45060e771baa15b705e391ba38bc54389
+checksum=6f9c2aee8553129d2bdbab646bbf7e88c2a5c38c0b1450f2e728831681bfc85d
 python_version=2 #unverified
 patch_args="-Np1"
 

From 7a69d35d0e9d97b4e017fbc3c30cf89dddc8672f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 8 May 2021 08:11:18 +0200
Subject: [PATCH 266/447] perl-Gtk3-ImageView: update to 8.

---
 srcpkgs/perl-Gtk3-ImageView/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Gtk3-ImageView/template b/srcpkgs/perl-Gtk3-ImageView/template
index 6c9357bd0b09..db3318b9fb12 100644
--- a/srcpkgs/perl-Gtk3-ImageView/template
+++ b/srcpkgs/perl-Gtk3-ImageView/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Gtk3-ImageView'
 pkgname=perl-Gtk3-ImageView
-version=6
+version=8
 revision=1
 wrksrc="gtk3-imageview-${version}"
 build_style=perl-module
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://github.com/carygravel/gtk3-imageview"
 distfiles="https://github.com/carygravel/gtk3-imageview/archive/v${version}.tar.gz"
-checksum=e1c04181d318ff0794e843d277b89ceb2627ef347bca78bc518e0f04e56de1a5
+checksum=f41515b0933d631e9eacce7a43bfcdadebd51394a96723c7f21db048ec413810

From 482e93f6ea868ac8c310d5e0ba577d5611b6fb74 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 8 May 2021 11:15:17 +0200
Subject: [PATCH 267/447] wine: update to 6.8.

---
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 4 ++--
 srcpkgs/wine/template                        | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 9ddf5fd665e1..e97f91a8a420 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- wine-6.7/dlls/dnsapi/libresolv.c
-+++ wine-6.7/dlls/dnsapi/libresolv.c
+--- wine-6.8/dlls/dnsapi/libresolv.c
++++ wine-6.8/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index a88ba370500f..9a7171732704 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.7
+version=6.8
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="c30514b7761d4611514ae021cb1e354128d77eff54a283f1401ee702277bbea4
- e539bde0f7ffcb9f70c5474f0f397bdbbc3b48a1922d2abf0a32dc2d6f994694"
+checksum="5b422dde67d8412871152ce315875efb494507ad38a0f4d710f13938a769ebd8
+ a93460f673e32d9903325b4276491fc30529af7828486ca8ed6dca83b2fc566a"
 
 build_options="mingw staging"
 build_options_default="mingw"
@@ -116,7 +116,6 @@ libwine_package() {
 	short_desc+=" - Runtime library"
 	replaces="libwine-unstable>=0"
 	pkg_install() {
-		vmove "usr/lib/*.so.*"
 		vmove usr/lib/wine
 	}
 }

From 4fc633808bf814d5a3874304da6840e7c9cb242d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 8 May 2021 12:15:58 +0200
Subject: [PATCH 268/447] libvirt: update to 7.3.0.

---
 srcpkgs/libvirt/files/musl-fork-nofree.patch  |  29 ++--
 .../improve-generic-mass-close-of-fds.patch   | 131 ------------------
 srcpkgs/libvirt/template                      |   4 +-
 3 files changed, 16 insertions(+), 148 deletions(-)
 delete mode 100644 srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch

diff --git a/srcpkgs/libvirt/files/musl-fork-nofree.patch b/srcpkgs/libvirt/files/musl-fork-nofree.patch
index 4e6808403118..aa6597b88d38 100644
--- a/srcpkgs/libvirt/files/musl-fork-nofree.patch
+++ b/srcpkgs/libvirt/files/musl-fork-nofree.patch
@@ -33,9 +33,19 @@ diff -ur src/util/vircommand.c src/util/vircommand.c
  
      if (cmd->env)
          execve(binary, cmd->args, cmd->env);
-diff -ur src/util/virlog.c src/util/virlog.c
---- src/util/virlog.c
-+++ src/util/virlog.c
+diff -ur src/util/virlog.h src/util/virlog.h
+--- src/util/virlog.h
++++ src/util/virlog.h
+@@ -168,6 +168,7 @@
+ void virLogLock(void);
+ void virLogUnlock(void);
+ int virLogReset(void);
++int virLogResetWithoutFree(void);
+ int virLogParseDefaultPriority(const char *priority);
+ int virLogPriorityFromSyslog(int priority);
+ void virLogMessage(virLogSourcePtr source,
+--- src/util/virlog.c	2021-05-03 11:02:51.455354200 +0200
++++ src/util/virlog.c	2021-05-08 11:56:58.414314487 +0200
 @@ -108,8 +108,8 @@
   */
  static virLogPriority virLogDefaultPriority = VIR_LOG_DEFAULT;
@@ -44,7 +54,7 @@ diff -ur src/util/virlog.c src/util/virlog.c
 -static void virLogResetOutputs(void);
 +static void virLogResetFilters(bool freemem);
 +static void virLogResetOutputs(bool freemem);
- static void virLogOutputToFd(virLogSourcePtr src,
+ static void virLogOutputToFd(virLogSource *src,
                               virLogPriority priority,
                               const char *filename,
 @@ -284,8 +284,30 @@
@@ -124,14 +134,3 @@ diff -ur src/util/virlog.c src/util/virlog.c
      virLogFilters = filters;
      virLogNbFilters = nfilters;
      virLogUnlock();
-diff -ur src/util/virlog.h src/util/virlog.h
---- src/util/virlog.h
-+++ src/util/virlog.h
-@@ -168,6 +168,7 @@
- void virLogLock(void);
- void virLogUnlock(void);
- int virLogReset(void);
-+int virLogResetWithoutFree(void);
- int virLogParseDefaultPriority(const char *priority);
- int virLogPriorityFromSyslog(int priority);
- void virLogMessage(virLogSourcePtr source,
diff --git a/srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch b/srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch
deleted file mode 100644
index 6647588f3f1e..000000000000
--- a/srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-https://www.redhat.com/archives/libvir-list/2020-August/msg00598.html
-
-Add a portable generic implementation of virMassClose as fallback on
-non-FreeBSD and non-glibc.
-
-This implementation uses poll(2) to look for open files to keep
-performance reasonable while not using any mallocs.
-
-This solves a deadlock with musl libc.
-
-Signed-off-by: Natanael Copa <ncopa alpinelinux org>
----
- src/util/vircommand.c | 76 +++++++++++++++++++++++++++++++++----------
- 1 file changed, 58 insertions(+), 18 deletions(-)
-
-diff -ur src/util/vircommand.c src/util/vircommand.c
---- src/util/vircommand.c
-+++ src/util/vircommand.c
-@@ -443,7 +443,7 @@
-     return 0;
- }
- 
--# ifdef __linux__
-+# if defined(__linux__) && defined(__GLIBC__)
- /* On Linux, we can utilize procfs and read the table of opened
-  * FDs and selectively close only those FDs we don't want to pass
-  * onto child process (well, the one we will exec soon since this
-@@ -478,17 +478,7 @@
- 
-     return 0;
- }
--
--# else /* !__linux__ */
--
--static int
--virCommandMassCloseGetFDsGeneric(virCommandPtr cmd G_GNUC_UNUSED,
--                                 virBitmapPtr fds)
--{
--    virBitmapSetAll(fds);
--    return 0;
--}
--# endif /* !__linux__ */
-+# endif /* __linux__ && __GLIBC__ */
- 
- # ifdef __FreeBSD__
- 
-@@ -542,7 +532,7 @@
-     return 0;
- }
- 
--# else /* ! __FreeBSD__ */
-+# elif defined(__GLIBC__)  /* ! __FreeBSD__ */
- 
- static int
- virCommandMassClose(virCommandPtr cmd,
-@@ -569,13 +559,8 @@
- 
-     fds = virBitmapNew(openmax);
- 
--#  ifdef __linux__
-     if (virCommandMassCloseGetFDsLinux(cmd, fds) < 0)
-         return -1;
--#  else
--    if (virCommandMassCloseGetFDsGeneric(cmd, fds) < 0)
--        return -1;
--#  endif
- 
-     fd = virBitmapNextSetBit(fds, 2);
-     for (; fd >= 0; fd = virBitmapNextSetBit(fds, fd)) {
-@@ -593,6 +578,61 @@
-     return 0;
- }
- 
-+#else /* ! __FreeBSD__ && ! __GLIBC__ */
-+static int
-+virCommandMassClose(virCommandPtr cmd,
-+                    int childin,
-+                    int childout,
-+                    int childerr)
-+{
-+    static struct pollfd pfds[1024];
-+    int fd = 0;
-+    int i, total;
-+    int max_fd = sysconf(_SC_OPEN_MAX);
-+
-+    if (max_fd < 0) {
-+        virReportSystemError(errno, "%s", _("sysconf(_SC_OPEN_MAX) failed"));
-+        return -1;
-+    }
-+
-+    total = max_fd - fd;
-+    for (i = 0; i < (total < 1024 ? total : 1024); i++)
-+        pfds[i].events = 0;
-+
-+    while (fd < max_fd) {
-+        int nfds, r = 0;
-+
-+        total = max_fd - fd;
-+        nfds =  total < 1024 ? total : 1024;
-+
-+        for (i = 0; i < nfds; i++)
-+            pfds[i].fd = fd + i;
-+
-+        do {
-+            r = poll(pfds, nfds, 0);
-+        } while (r == -1 && errno == EINTR);
-+
-+        if (r < 0) {
-+            virReportSystemError(errno, "%s", _("poll() failed"));
-+            return -1;
-+        }
-+
-+        for (i = 0; i < nfds; i++)
-+            if (pfds[i].revents != POLLNVAL) {
-+                if (pfds[i].fd == childin || pfds[i].fd == childout || pfds[i].fd == childerr)
-+                    continue;
-+                if (!virCommandFDIsSet(cmd, pfds[i].fd)) {
-+                    VIR_MASS_CLOSE(pfds[i].fd);
-+                } else if (virSetInherit(pfds[i].fd, true) < 0) {
-+                    virReportSystemError(errno, _("failed to preserve fd %d"), pfds[i].fd);
-+                    return -1;
-+                }
-+            }
-+        fd += nfds;
-+    }
-+    return 0;
-+}
-+
- # endif /* ! __FreeBSD__ */
- 
- /*
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 1b7f3740c5b6..28824ed7f713 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.2.0
+version=7.3.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=01f459d0c7ba5009622a628dba1a026200e8f4a299fea783b936a71d7e0ed1d0
+checksum=27bdbb85c0301475ab1f2ecd185c629ea0bfd5512bef3f6f1817b6c55d1dc1be
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From 479120e1ca9be9a06d34935f9db32806a36b8e82 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 8 May 2021 12:19:14 +0200
Subject: [PATCH 269/447] libvirt-python3: update to 7.3.0.

---
 srcpkgs/libvirt-python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index f9dbeedc483a..316e02e83df8 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.2.0
+version=7.3.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=c0c3bac54c55622e17927b09cd9843869600d71842fb072c99491fe2608dcee7
+checksum=676c260ddb365120404e611a38c514045ef1af1a7fede15c1fc02d0f8241f696

From 0e9cdc13ed84522655b15539bf55c654a44a8972 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Wed, 12 May 2021 06:07:29 +0000
Subject: [PATCH 270/447] u-boot-menu: quote all the things

At least the CMDLINE expansion did break on the printf '%s' and we
got a newline for every parameter, which is wrong.
(I'm suprised nobody noticed this, and how I not noticed this myself)
---
 srcpkgs/u-boot-menu/files/kernel.d/extlinux | 20 ++++++++++----------
 srcpkgs/u-boot-menu/template                |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/u-boot-menu/files/kernel.d/extlinux b/srcpkgs/u-boot-menu/files/kernel.d/extlinux
index 5a4465698a46..cb4bae4e09bd 100644
--- a/srcpkgs/u-boot-menu/files/kernel.d/extlinux
+++ b/srcpkgs/u-boot-menu/files/kernel.d/extlinux
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 header() {
-	printf "TIMEOUT %s\n" ${TIMEOUT} > ${OUTFILE}
-	printf "DEFAULT entry0\n" >> ${OUTFILE}
-	printf "MENU TITLE Boot menu\n" >> ${OUTFILE}
+	printf "TIMEOUT %s\n" "${TIMEOUT}" > "${OUTFILE}"
+	printf "DEFAULT entry0\n" >> "${OUTFILE}"
+	printf "MENU TITLE Boot menu\n" >> "${OUTFILE}"
 }
 
 get_bootpath() {
@@ -18,19 +18,19 @@ add_kernel() {
 	fdt=$(get_bootpath "/boot/dtbs/dtbs-${ver}/${DTBPATH}")
 	cmdline="${CMDLINE}"
 
-	printf "LABEL entry%s\n" ${ENTRY} >> ${OUTFILE}
-	printf "\tMENU LABEL Void Linux Version %s\n" ${ver} >> ${OUTFILE}
-	printf "\tLINUX %s\n" ${kernel} >> ${OUTFILE}
+	printf "LABEL entry%s\n" "${ENTRY}" >> "${OUTFILE}"
+	printf "\tMENU LABEL Void Linux Version %s\n" "${ver}" >> "${OUTFILE}"
+	printf "\tLINUX %s\n" "${kernel}" >> "${OUTFILE}"
 	if [ -e "${BOOTPART}/${initrd}" ]; then
-		printf "\tINITRD %s\n" ${initrd} >> ${OUTFILE}
+		printf "\tINITRD %s\n" "${initrd}" >> "${OUTFILE}"
 	fi
 	if [ -n "${USE_DEVICETREEDIR}" ]; then
-		printf "\tDEVICETREEDIR %s\n" ${devicetreedir} >> ${OUTFILE}
+		printf "\tDEVICETREEDIR %s\n" "${devicetreedir}" >> "${OUTFILE}"
 	elif [ -n "${DTBPATH}" ] && [ -e "${BOOTPART}/${fdt}" ]; then
-		printf "\tFDT %s\n" ${fdt} >> ${OUTFILE}
+		printf "\tFDT %s\n" ${fdt} >> "${OUTFILE}"
 	fi
 	if [ -n "${cmdline}" ]; then
-		printf "\tAPPEND %s\n" ${cmdline} >> ${OUTFILE}
+		printf "\tAPPEND %s\n" "${cmdline}" >> "${OUTFILE}"
 	fi
 	ENTRY=$(expr ${ENTRY} + 1)
 }
diff --git a/srcpkgs/u-boot-menu/template b/srcpkgs/u-boot-menu/template
index 5c5fb87639c8..678c36d050a7 100644
--- a/srcpkgs/u-boot-menu/template
+++ b/srcpkgs/u-boot-menu/template
@@ -1,7 +1,7 @@
 # Template file for 'u-boot-menu'
 pkgname=u-boot-menu
 version=0.2
-revision=2
+revision=3
 conf_files="/etc/default/extlinux"
 short_desc="Create an u-boot menu with currently available kernels"
 maintainer="Remi Pommarel <repk@triplefau.lt>"

From 0d9e920b7804de164318f15dd0587613d3cc1320 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 May 2021 21:01:06 +0200
Subject: [PATCH 271/447] qt5: mention used commit

---
 srcpkgs/qt5/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 08c7badefa18..fd13cbdaa444 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,6 +1,8 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.3+20210429
+# commit d42afef0e48a102334ecfda6a492286fb9fc5996
+# base repo: https://invent.kde.org/qt/qt/qt5
 revision=1
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config

From da4372381a4a0ab870dc65cb1cad4d8c4f3b1e03 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 8 May 2021 21:50:01 +0200
Subject: [PATCH 272/447] python3-boto3: update to 1.17.69.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index c80aa31bbed8..cd58f1e3a587 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.62
+version=1.17.69
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=f15caa30dba8e109409a05c5efa27b36935acccf09830af559f922039d1a8b98
+checksum=ba27aaf2833ff82a4bde3b17cc81da5d0032d4e382e391639f19943727a8717f
 
 post_install() {
 	vlicense LICENSE

From 4a02207f5767ddcd289b0827a3cb4f62e6fe5060 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 22 Feb 2021 21:35:00 +0100
Subject: [PATCH 273/447] rpi-kernel: split into rpi, rpi2, rpi3

Until now, rpi-kernel served rpi0/rpi1 + rpi2 + rpi3 all at once.  The
variants were solely distiguished by the target architecture; it was
nice while it lasted, but now that rpi4 is on its way, we need to split
things up a little.

With the split,
* rpi-kernel serves rpi0 + rpi1, armv6l* only
* rpi2-kernel serves rpi2, armv7l* only
* rpi3-kernel serves rpi3, aarch64* only

To help migrate existing devices to the new kernel packages, rpi-kernel
will be an empty mega package for !armv6l* and depend on rpi2-kernel or
rpi3-kernel (depending on target architecture) for the foreseeable
future, thus resolving like this:
* rpi-kernel -> rpi2-kernel (armv7l*)
* rpi-kernel -> rpi3-kernel (aarch64*)

Relates to: #29139

Acked-by: Duncaen <duncaen@voidlinux.org>
---
 srcpkgs/rpi-kernel/template  |  78 ++++++------
 srcpkgs/rpi2-kernel-headers  |   1 +
 srcpkgs/rpi2-kernel/template | 233 ++++++++++++++++++++++++++++++++++
 srcpkgs/rpi3-kernel-headers  |   1 +
 srcpkgs/rpi3-kernel/template | 236 +++++++++++++++++++++++++++++++++++
 5 files changed, 512 insertions(+), 37 deletions(-)
 create mode 120000 srcpkgs/rpi2-kernel-headers
 create mode 100644 srcpkgs/rpi2-kernel/template
 create mode 120000 srcpkgs/rpi3-kernel-headers
 create mode 100644 srcpkgs/rpi3-kernel/template

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 1fe4e2477e1f..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -10,15 +10,18 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
 version=5.4.83
-revision=1
+revision=2
+archs="armv6l*"
 wrksrc="linux-${_githash}"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
+makedepends="ncurses-devel"
 maintainer="Piraty <piraty1@inbox.ru>"
 homepage="http://www.kernel.org"
 license="GPL-2.0-only"
-short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])"
+short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
 checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
-python_version=2
+python_version=3
 
 _kernver="${version}_${revision}"
 
@@ -27,10 +30,6 @@ nostrip=yes
 noverifyrdeps=yes
 noshlibprovides=yes
 
-# RPi, RPi2, RPi3
-archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
-makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.
 mutable_files="
@@ -62,15 +61,6 @@ do_configure() {
 
 	# Use upstream's default configuration, no need to maintain ours.
 	case "$XBPS_TARGET_MACHINE" in
-		# RPi3
-		aarch64*)
-			target=bcmrpi3_defconfig
-			;;
-		# RPi2 / RPi3
-		armv7l*)
-			target=bcm2709_defconfig
-			;;
-		# RPi1
 		armv6l*)
 			target=bcmrpi_defconfig
 			;;
@@ -81,7 +71,7 @@ do_configure() {
 	echo "CONFIG_PROC_EVENTS=y" >> "$defconfig"
 	echo "CONFIG_F2FS_FS_SECURITY=y" >> "$defconfig"
 	echo "CONFIG_CGROUP_PIDS=y" >> "$defconfig"
-	
+
 	# IR Remote Support
 	echo "CONFIG_RC_CORE=y" >> "$defconfig"
 	echo "CONFIG_LIRC=y" >> "$defconfig"
@@ -128,26 +118,9 @@ do_install() {
 	# Install device tree blobs
 	make ${makejobs} ARCH=${_arch} INSTALL_DTBS_PATH=${DESTDIR}/boot dtbs_install
 
-	# move dtb that ended up in /boot/broadcom
-	case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		mv ${DESTDIR}/boot/broadcom/bcm{2710,2837}-*.dtb ${DESTDIR}/boot
-		;;
-	esac
-
-	vmkdir boot
 	# Generate kernel.img and install it to destdir.
-	case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		cp arch/arm64/boot/Image ${DESTDIR}/boot/kernel8.img
-		;;
-	armv7l*)
-		cp arch/arm/boot/zImage ${DESTDIR}/boot/kernel7.img
-		;;
-	armv6l*)
-		cp arch/arm/boot/zImage ${DESTDIR}/boot/kernel.img
-		;;
-	esac
+	vmkdir boot
+	cp arch/arm/boot/zImage ${DESTDIR}/boot/kernel.img
 
 	hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
 
@@ -252,9 +225,40 @@ rpi-kernel-headers_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc="The Linux kernel headers for Raspberry Pi (${version%.*} series [git ${_gitshort}])"
+	short_desc="${short_desc/kernel/kernel headers}"
 	pkg_install() {
 		vmove usr/src
 		vmove usr/lib/modules/${_kernver}/build
 	}
 }
+
+
+# support legacy systems (before rpi-kernel was split to rpi{,2,3})
+# archs != armv6* are emtpy meta packages to pull the new rpi{$n}-kernel package
+archs+=" armv7l* aarch64*"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) : ;;
+	*)
+		build_style=meta
+		short_desc="Linux kernel for Raspberry Pi (transitional dummy package)"
+
+		pre_configure() { : ; }
+		do_configure() { : ; }
+		do_build() { : ; }
+		do_install() { : ; }
+
+		case "$XBPS_TARGET_MACHINE" in
+			armv7*) depends=rpi2-kernel ;;
+			aarch64*) depends=rpi3-kernel ;;
+		esac
+
+		rpi-kernel-headers_package() {
+			build_style=meta
+			short_desc="Linux kernel headers for Raspberry Pi (transitional dummy package)"
+			case "$XBPS_TARGET_MACHINE" in
+				armv7*) depends=rpi2-kernel-headers ;;
+				aarch64*) depends=rpi3-kernel-headers ;;
+			esac
+		}
+		;;
+esac
diff --git a/srcpkgs/rpi2-kernel-headers b/srcpkgs/rpi2-kernel-headers
new file mode 120000
index 000000000000..fbe6d91aeb7f
--- /dev/null
+++ b/srcpkgs/rpi2-kernel-headers
@@ -0,0 +1 @@
+rpi2-kernel
\ No newline at end of file
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
new file mode 100644
index 000000000000..cda240234550
--- /dev/null
+++ b/srcpkgs/rpi2-kernel/template
@@ -0,0 +1,233 @@
+# Template file for 'rpi2-kernel'
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_gitshort="${_githash:0:7}"
+
+pkgname=rpi2-kernel
+version=5.4.83
+revision=2
+archs="armv7l*"
+wrksrc="linux-${_githash}"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
+makedepends="ncurses-devel"
+maintainer="Piraty <piraty1@inbox.ru>"
+homepage="http://www.kernel.org"
+license="GPL-2.0-only"
+short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
+distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+python_version=3
+
+_kernver="${version}_${revision}"
+
+nodebug=yes
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+
+triggers="kernel-hooks"
+# These files could be modified when an external module is built.
+mutable_files="
+	/usr/lib/modules/${_kernver}/modules.dep
+	/usr/lib/modules/${_kernver}/modules.dep.bin
+	/usr/lib/modules/${_kernver}/modules.symbols
+	/usr/lib/modules/${_kernver}/modules.symbols.bin
+	/usr/lib/modules/${_kernver}/modules.alias
+	/usr/lib/modules/${_kernver}/modules.alias.bin
+	/usr/lib/modules/${_kernver}/modules.devname"
+
+_arch=
+case "$XBPS_TARGET_MACHINE" in
+	arm*) _arch=arm ;;
+	aarch64*) _arch=arm64 ;;
+esac
+_cross=
+if [ "$CROSS_BUILD" ]; then
+	_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
+
+pre_configure() {
+	# Remove .git directory, otherwise scripts/setkernelversion.sh
+	# modifies KERNELRELEASE and appends + to it.
+	rm -rf .git
+}
+do_configure() {
+	local target defconfig
+
+	# Use upstream's default configuration, no need to maintain ours.
+	case "$XBPS_TARGET_MACHINE" in
+		armv7l*)
+			target=bcm2709_defconfig
+			;;
+	esac
+
+	defconfig="arch/${_arch}/configs/${target}"
+	echo "CONFIG_CONNECTOR=y" >> "$defconfig"
+	echo "CONFIG_PROC_EVENTS=y" >> "$defconfig"
+	echo "CONFIG_F2FS_FS_SECURITY=y" >> "$defconfig"
+	echo "CONFIG_CGROUP_PIDS=y" >> "$defconfig"
+
+	# IR Remote Support
+	echo "CONFIG_RC_CORE=y" >> "$defconfig"
+	echo "CONFIG_LIRC=y" >> "$defconfig"
+	echo "CONFIG_RC_DECODERS=y" >> "$defconfig"
+	echo "CONFIG_RC_DEVICES=y" >> "$defconfig"
+	echo "CONFIG_IR_RC6_DECODER=m" >> "$defconfig"
+	echo "CONFIG_IR_MCEUSB=m" >> "$defconfig"
+
+	# HID Controllers
+	echo "CONFIG_HID_STEAM=y" >> "$defconfig"
+
+	# LXD 4.2+ support
+	echo "CONFIG_BRIDGE_VLAN_FILTERING=y" >> "$defconfig"
+
+	make ${makejobs} ${_cross} ARCH=${_arch} ${target}
+
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	vsed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local target
+
+	case "$XBPS_TARGET_MACHINE" in
+		arm*)
+			target="zImage modules dtbs"
+			;;
+		aarch64*)
+			target="Image modules dtbs"
+			;;
+	esac
+
+	make ${makejobs} ${_cross} ARCH=${_arch} prepare
+	make ${makejobs} ${_cross} ARCH=${_arch} ${target}
+}
+do_install() {
+	local hdrdest
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${_arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	# Install device tree blobs
+	make ${makejobs} ARCH=${_arch} INSTALL_DTBS_PATH=${DESTDIR}/boot dtbs_install
+
+	# Generate kernel.img and install it to destdir.
+	vmkdir boot
+	cp arch/arm/boot/zImage ${DESTDIR}/boot/kernel7.img
+
+	hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
+	done
+
+	cd ${wrksrc}
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${_arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds.
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+	if [ -d "arch/${_arch}/tools" ]; then
+		cp -a arch/${_arch}/tools ${hdrdest}/arch/${_arch}
+	fi
+
+	# copy arch includes for external modules
+	mkdir -p ${hdrdest}/arch/${_arch}
+	cp -a arch/${_arch}/include ${hdrdest}/arch/${_arch}
+
+	mkdir -p ${hdrdest}/arch/${_arch}/kernel
+	cp arch/${_arch}/Makefile ${hdrdest}/arch/${_arch}
+	cp arch/${_arch}/kernel/asm-offsets.s ${hdrdest}/arch/${_arch}/kernel
+	if [ "$_arch" = "arm64" ] ; then
+		cp -a arch/${_arch}/kernel/vdso ${hdrdest}/arch/${_arch}/kernel/
+	fi
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# Remove unneeded architectures
+	# (save the correct one + Kconfig and delete all others)
+	mkdir -p arch-backup
+	cp -r ${hdrdest}/arch/${_arch} ${hdrdest}/arch/Kconfig arch-backup/
+	rm -rf ${hdrdest}/arch
+	mv arch-backup ${hdrdest}/arch
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Compress all modules with xz to save a few MBs.
+	msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
+	find ${DESTDIR} -name '*.ko' | xargs -n1 -P0 gzip -9
+
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+
+rpi2-kernel-headers_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	short_desc="${short_desc/kernel/kernel headers}"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
diff --git a/srcpkgs/rpi3-kernel-headers b/srcpkgs/rpi3-kernel-headers
new file mode 120000
index 000000000000..29e9f333d668
--- /dev/null
+++ b/srcpkgs/rpi3-kernel-headers
@@ -0,0 +1 @@
+rpi3-kernel
\ No newline at end of file
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
new file mode 100644
index 000000000000..a3a16bc577fc
--- /dev/null
+++ b/srcpkgs/rpi3-kernel/template
@@ -0,0 +1,236 @@
+# Template file for 'rpi3-kernel'
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_gitshort="${_githash:0:7}"
+
+pkgname=rpi3-kernel
+version=5.4.83
+revision=2
+archs="aarch64*"
+wrksrc="linux-${_githash}"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
+makedepends="ncurses-devel"
+maintainer="Piraty <piraty1@inbox.ru>"
+homepage="http://www.kernel.org"
+license="GPL-2.0-only"
+short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
+distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+python_version=3
+
+_kernver="${version}_${revision}"
+
+nodebug=yes
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+
+triggers="kernel-hooks"
+# These files could be modified when an external module is built.
+mutable_files="
+	/usr/lib/modules/${_kernver}/modules.dep
+	/usr/lib/modules/${_kernver}/modules.dep.bin
+	/usr/lib/modules/${_kernver}/modules.symbols
+	/usr/lib/modules/${_kernver}/modules.symbols.bin
+	/usr/lib/modules/${_kernver}/modules.alias
+	/usr/lib/modules/${_kernver}/modules.alias.bin
+	/usr/lib/modules/${_kernver}/modules.devname"
+
+_arch=
+case "$XBPS_TARGET_MACHINE" in
+	arm*) _arch=arm ;;
+	aarch64*) _arch=arm64 ;;
+esac
+_cross=
+if [ "$CROSS_BUILD" ]; then
+	_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
+
+pre_configure() {
+	# Remove .git directory, otherwise scripts/setkernelversion.sh
+	# modifies KERNELRELEASE and appends + to it.
+	rm -rf .git
+}
+do_configure() {
+	local target defconfig
+
+	# Use upstream's default configuration, no need to maintain ours.
+	case "$XBPS_TARGET_MACHINE" in
+		aarch64*)
+			target=bcmrpi3_defconfig
+			;;
+	esac
+
+	defconfig="arch/${_arch}/configs/${target}"
+	echo "CONFIG_CONNECTOR=y" >> "$defconfig"
+	echo "CONFIG_PROC_EVENTS=y" >> "$defconfig"
+	echo "CONFIG_F2FS_FS_SECURITY=y" >> "$defconfig"
+	echo "CONFIG_CGROUP_PIDS=y" >> "$defconfig"
+
+	# IR Remote Support
+	echo "CONFIG_RC_CORE=y" >> "$defconfig"
+	echo "CONFIG_LIRC=y" >> "$defconfig"
+	echo "CONFIG_RC_DECODERS=y" >> "$defconfig"
+	echo "CONFIG_RC_DEVICES=y" >> "$defconfig"
+	echo "CONFIG_IR_RC6_DECODER=m" >> "$defconfig"
+	echo "CONFIG_IR_MCEUSB=m" >> "$defconfig"
+
+	# HID Controllers
+	echo "CONFIG_HID_STEAM=y" >> "$defconfig"
+
+	# LXD 4.2+ support
+	echo "CONFIG_BRIDGE_VLAN_FILTERING=y" >> "$defconfig"
+
+	make ${makejobs} ${_cross} ARCH=${_arch} ${target}
+
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	vsed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local target
+
+	case "$XBPS_TARGET_MACHINE" in
+		arm*)
+			target="zImage modules dtbs"
+			;;
+		aarch64*)
+			target="Image modules dtbs"
+			;;
+	esac
+
+	make ${makejobs} ${_cross} ARCH=${_arch} prepare
+	make ${makejobs} ${_cross} ARCH=${_arch} ${target}
+}
+do_install() {
+	local hdrdest
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${_arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	# Install device tree blobs
+	make ${makejobs} ARCH=${_arch} INSTALL_DTBS_PATH=${DESTDIR}/boot dtbs_install
+
+	# move dtb that ended up in /boot/broadcom
+	mv ${DESTDIR}/boot/broadcom/*dtb ${DESTDIR}/boot
+
+	# Generate kernel.img and install it to destdir.
+	vmkdir boot
+	cp arch/arm64/boot/Image ${DESTDIR}/boot/kernel8.img
+
+	hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
+	done
+
+	cd ${wrksrc}
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${_arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds.
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+	if [ -d "arch/${_arch}/tools" ]; then
+		cp -a arch/${_arch}/tools ${hdrdest}/arch/${_arch}
+	fi
+
+	# copy arch includes for external modules
+	mkdir -p ${hdrdest}/arch/${_arch}
+	cp -a arch/${_arch}/include ${hdrdest}/arch/${_arch}
+
+	mkdir -p ${hdrdest}/arch/${_arch}/kernel
+	cp arch/${_arch}/Makefile ${hdrdest}/arch/${_arch}
+	cp arch/${_arch}/kernel/asm-offsets.s ${hdrdest}/arch/${_arch}/kernel
+	if [ "$_arch" = "arm64" ] ; then
+		cp -a arch/${_arch}/kernel/vdso ${hdrdest}/arch/${_arch}/kernel/
+	fi
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# Remove unneeded architectures
+	# (save the correct one + Kconfig and delete all others)
+	mkdir -p arch-backup
+	cp -r ${hdrdest}/arch/${_arch} ${hdrdest}/arch/Kconfig arch-backup/
+	rm -rf ${hdrdest}/arch
+	mv arch-backup ${hdrdest}/arch
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Compress all modules with xz to save a few MBs.
+	msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
+	find ${DESTDIR} -name '*.ko' | xargs -n1 -P0 gzip -9
+
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+
+rpi3-kernel-headers_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	short_desc="${short_desc/kernel/kernel headers}"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}

From 7ae9df8d3321eae84a8d09fd52abdc7be5373c13 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 22 Feb 2021 21:35:09 +0100
Subject: [PATCH 274/447] rpi-base: split into rpi, rpi2, rpi3

Until now, rpi-base served rpi0/rpi1 + rpi2 + rpi3 all at once.  The
variants were solely distiguished by the target architecture; it was
nice while it lasted, but now that rpi4 is on its way, we need to split
things up a little.

With the split,
* rpi-base depends on rpi-kernel, armv6l* only,
* rpi2-base depends on rpi2-kernel, armv7l* only
* rpi3-base depends on rpi3-kernel, aarch64* only,

To help migrate existing devices to the new base packages, rpi-base
will be an empty mega package for !armv6l* and depend on rpi2-base or
rpi3-base for the foreseeable future, thus resolving like this:
* rpi-base -> rpi2-base (armv7l*)
* rpi-base -> rpi3-base (aarch64*)

For now it's sufficient to have one package provide all subpackages, to
ease maintainance. The template can easiliy be split (as we did with
rpi-kernel) should the need arise some day.

rpi3-base actually existed back in 2017 (it depended on mainline kernel
instead of rpi-kernel) and became obsolete in 2018;
who would have known back then we may have to deal with rpi>3 some day...

Relates to: #29139

Acked-by: Duncaen <duncaen@voidlinux.org>
---
 srcpkgs/rpi-base/template | 51 +++++++++++++++++++++++++++++++++++++--
 srcpkgs/rpi2-base         |  1 +
 srcpkgs/rpi3-base         |  1 +
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/rpi2-base
 create mode 120000 srcpkgs/rpi3-base

diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index 8fcf3581efd9..cbe8e79526f4 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,9 +1,10 @@
 # Template file for 'rpi-base'
 pkgname=rpi-base
-version=2.6
+version=3.0
 revision=1
 archs="armv6l* armv7l* aarch64*"
-depends="virtual?ntp-daemon rpi-firmware rpi-kernel"
+_base_depends="virtual?ntp-daemon rpi-firmware"
+depends="${_base_depends} rpi-kernel"
 short_desc="Void Linux Raspberry Pi base files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
@@ -12,3 +13,49 @@ homepage="https://www.voidlinux.org"
 do_install() {
 	vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d
 }
+
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)
+		subpackages=" "
+		;;
+	armv7*)
+		subpackages="rpi2-base"
+		;;
+	aarch64*)
+		subpackages="rpi3-base"
+		;;
+esac
+
+# support legacy systems (before rpi-kernel was split to rpi{,2,3})
+# archs != armv6* are emtpy meta packages to pull the new rpi${n}-base package
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) : ;;
+	*)
+		build_style=meta
+		short_desc+=" (transitional dummy package)"
+
+	 	do_install() { : ; }
+
+		case "$XBPS_TARGET_MACHINE" in
+			armv7*) depends="rpi2-base" ;;
+			aarch64*) depends="rpi3-base" ;;
+		esac
+		;;
+esac
+
+rpi2-base_package() {
+	depends="${_base_depends} rpi2-kernel"
+	short_desc="Void Linux Raspberry Pi 2 base files"
+	pkg_install() {
+		vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d
+	}
+}
+
+
+rpi3-base_package() {
+	depends="${_base_depends} rpi3-kernel"
+	short_desc="Void Linux Raspberry Pi 3 base files"
+	pkg_install() {
+		vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d
+	}
+}
diff --git a/srcpkgs/rpi2-base b/srcpkgs/rpi2-base
new file mode 120000
index 000000000000..c004915dfa8a
--- /dev/null
+++ b/srcpkgs/rpi2-base
@@ -0,0 +1 @@
+rpi-base
\ No newline at end of file
diff --git a/srcpkgs/rpi3-base b/srcpkgs/rpi3-base
new file mode 120000
index 000000000000..c004915dfa8a
--- /dev/null
+++ b/srcpkgs/rpi3-base
@@ -0,0 +1 @@
+rpi-base
\ No newline at end of file

From 70f33565086c8fd381e7a285c493823e0375e2d6 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 28 Feb 2021 19:52:49 +0100
Subject: [PATCH 275/447] New package: rpi4-kernel-5.4.83

Relates to: #29139
---
 srcpkgs/rpi4-kernel-headers  |   1 +
 srcpkgs/rpi4-kernel/template | 237 +++++++++++++++++++++++++++++++++++
 2 files changed, 238 insertions(+)
 create mode 120000 srcpkgs/rpi4-kernel-headers
 create mode 100644 srcpkgs/rpi4-kernel/template

diff --git a/srcpkgs/rpi4-kernel-headers b/srcpkgs/rpi4-kernel-headers
new file mode 120000
index 000000000000..9c2fad143506
--- /dev/null
+++ b/srcpkgs/rpi4-kernel-headers
@@ -0,0 +1 @@
+rpi4-kernel
\ No newline at end of file
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
new file mode 100644
index 000000000000..b69cd945758d
--- /dev/null
+++ b/srcpkgs/rpi4-kernel/template
@@ -0,0 +1,237 @@
+# Template file for 'rpi4-kernel'
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_gitshort="${_githash:0:7}"
+
+pkgname=rpi4-kernel
+version=5.4.83
+revision=1
+archs="aarch64*"
+wrksrc="linux-${_githash}"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
+makedepends="ncurses-devel"
+maintainer="Piraty <piraty1@inbox.ru>"
+homepage="http://www.kernel.org"
+license="GPL-2.0-only"
+short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
+distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+python_version=2
+conflicts=rpi3-kernel
+
+_kernver="${version}_${revision}"
+
+nodebug=yes
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+
+triggers="kernel-hooks"
+# These files could be modified when an external module is built.
+mutable_files="
+	/usr/lib/modules/${_kernver}/modules.dep
+	/usr/lib/modules/${_kernver}/modules.dep.bin
+	/usr/lib/modules/${_kernver}/modules.symbols
+	/usr/lib/modules/${_kernver}/modules.symbols.bin
+	/usr/lib/modules/${_kernver}/modules.alias
+	/usr/lib/modules/${_kernver}/modules.alias.bin
+	/usr/lib/modules/${_kernver}/modules.devname"
+
+_arch=
+case "$XBPS_TARGET_MACHINE" in
+	arm*) _arch=arm ;;
+	aarch64*) _arch=arm64 ;;
+esac
+_cross=
+if [ "$CROSS_BUILD" ]; then
+	_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
+
+pre_configure() {
+	# Remove .git directory, otherwise scripts/setkernelversion.sh
+	# modifies KERNELRELEASE and appends + to it.
+	rm -rf .git
+}
+do_configure() {
+	local target defconfig
+
+	# Use upstream's default configuration, no need to maintain ours.
+	case "$XBPS_TARGET_MACHINE" in
+		aarch64*)
+			target=bcm2711_defconfig
+			;;
+	esac
+
+	defconfig="arch/${_arch}/configs/${target}"
+	echo "CONFIG_CONNECTOR=y" >> "$defconfig"
+	echo "CONFIG_PROC_EVENTS=y" >> "$defconfig"
+	echo "CONFIG_F2FS_FS_SECURITY=y" >> "$defconfig"
+	echo "CONFIG_CGROUP_PIDS=y" >> "$defconfig"
+
+	# IR Remote Support
+	echo "CONFIG_RC_CORE=y" >> "$defconfig"
+	echo "CONFIG_LIRC=y" >> "$defconfig"
+	echo "CONFIG_RC_DECODERS=y" >> "$defconfig"
+	echo "CONFIG_RC_DEVICES=y" >> "$defconfig"
+	echo "CONFIG_IR_RC6_DECODER=m" >> "$defconfig"
+	echo "CONFIG_IR_MCEUSB=m" >> "$defconfig"
+
+	# HID Controllers
+	echo "CONFIG_HID_STEAM=y" >> "$defconfig"
+
+	# LXD 4.2+ support
+	echo "CONFIG_BRIDGE_VLAN_FILTERING=y" >> "$defconfig"
+
+	make ${makejobs} ${_cross} ARCH=${_arch} ${target}
+
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	vsed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local target
+
+	case "$XBPS_TARGET_MACHINE" in
+		arm*)
+			target="zImage modules dtbs"
+			;;
+		aarch64*)
+			target="Image modules dtbs"
+			;;
+	esac
+
+	make ${makejobs} ${_cross} ARCH=${_arch} prepare
+	make ${makejobs} ${_cross} ARCH=${_arch} ${target}
+}
+do_install() {
+	local hdrdest
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${_arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	# Install device tree blobs
+	make ${makejobs} ARCH=${_arch} INSTALL_DTBS_PATH=${DESTDIR}/boot dtbs_install
+
+	# move dtb that ended up in /boot/broadcom
+	mv ${DESTDIR}/boot/broadcom/*dtb ${DESTDIR}/boot
+
+	# Generate kernel.img and install it to destdir.
+	vmkdir boot
+	cp arch/arm64/boot/Image ${DESTDIR}/boot/kernel8.img
+
+	hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
+	done
+
+	cd ${wrksrc}
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${_arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds.
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+	if [ -d "arch/${_arch}/tools" ]; then
+		cp -a arch/${_arch}/tools ${hdrdest}/arch/${_arch}
+	fi
+
+	# copy arch includes for external modules
+	mkdir -p ${hdrdest}/arch/${_arch}
+	cp -a arch/${_arch}/include ${hdrdest}/arch/${_arch}
+
+	mkdir -p ${hdrdest}/arch/${_arch}/kernel
+	cp arch/${_arch}/Makefile ${hdrdest}/arch/${_arch}
+	cp arch/${_arch}/kernel/asm-offsets.s ${hdrdest}/arch/${_arch}/kernel
+	if [ "$_arch" = "arm64" ] ; then
+		cp -a arch/${_arch}/kernel/vdso ${hdrdest}/arch/${_arch}/kernel/
+	fi
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# Remove unneeded architectures
+	# (save the correct one + Kconfig and delete all others)
+	mkdir -p arch-backup
+	cp -r ${hdrdest}/arch/${_arch} ${hdrdest}/arch/Kconfig arch-backup/
+	rm -rf ${hdrdest}/arch
+	mv arch-backup ${hdrdest}/arch
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Compress all modules with xz to save a few MBs.
+	msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
+	find ${DESTDIR} -name '*.ko' | xargs -n1 -P0 gzip -9
+
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+
+rpi4-kernel-headers_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	short_desc="${short_desc/kernel/kernel headers}"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}

From bfa9075c40df6f88d5805aed5f7c1f2abbb78c6d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 28 Feb 2021 19:56:40 +0100
Subject: [PATCH 276/447] rpi-base: add rpi4

Closes: #29139
---
 srcpkgs/rpi-base/template    | 13 +++++++++++--
 srcpkgs/rpi4-base            |  1 +
 srcpkgs/rpi4-kernel/template |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/rpi4-base

diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index cbe8e79526f4..8940033c83ab 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-base'
 pkgname=rpi-base
 version=3.0
-revision=1
+revision=2
 archs="armv6l* armv7l* aarch64*"
 _base_depends="virtual?ntp-daemon rpi-firmware"
 depends="${_base_depends} rpi-kernel"
@@ -22,7 +22,7 @@ case "$XBPS_TARGET_MACHINE" in
 		subpackages="rpi2-base"
 		;;
 	aarch64*)
-		subpackages="rpi3-base"
+		subpackages="rpi3-base rpi4-base"
 		;;
 esac
 
@@ -59,3 +59,12 @@ rpi3-base_package() {
 		vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d
 	}
 }
+
+rpi4-base_package() {
+	depends="${_base_depends} rpi4-kernel"
+	short_desc="Void Linux Raspberry Pi 4 base files"
+	conflicts="rpi3-base"
+	pkg_install() {
+		vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d
+	}
+}
diff --git a/srcpkgs/rpi4-base b/srcpkgs/rpi4-base
new file mode 120000
index 000000000000..c004915dfa8a
--- /dev/null
+++ b/srcpkgs/rpi4-base
@@ -0,0 +1 @@
+rpi-base
\ No newline at end of file
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index b69cd945758d..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -21,7 +21,7 @@ license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
 checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
-python_version=2
+python_version=3
 conflicts=rpi3-kernel
 
 _kernver="${version}_${revision}"

From d4af36ff35cba9fbd7a9325540927d609c273808 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 9 May 2021 01:25:32 +0200
Subject: [PATCH 277/447] squashfs-tools-ng: update to 1.1.1.

---
 srcpkgs/squashfs-tools-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/squashfs-tools-ng/template b/srcpkgs/squashfs-tools-ng/template
index ba0c6fb21390..f67f436f86ac 100644
--- a/srcpkgs/squashfs-tools-ng/template
+++ b/srcpkgs/squashfs-tools-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'squashfs-tools-ng'
 pkgname=squashfs-tools-ng
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://infraroot.at/projects/squashfs-tools-ng/index.html"
 changelog="https://git.infraroot.at/squashfs-tools-ng.git/plain/CHANGELOG.md"
 distfiles="https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"
-checksum=110794124b268e92e28e6a95f0781d1338f48c338434ef746f5de68c64e19aeb
+checksum=b82fc0adf85ff3a9c80aafbd68d839c03140944fe604ce994f196ffefedd881d
 
 squashfs-tools-ng-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 57c96d4b6f027841e89ab16ef3c7af2769726e36 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 9 May 2021 01:25:45 +0200
Subject: [PATCH 278/447] openradtool: update to 0.12.10.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index fea16317b71e..ac9c8fbc8b3f 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.12.9
+version=0.12.10
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=239d62474b3f96ea066731e1c24dc7d576f5ca85438eed939c33cbee736d34e1
+checksum=7f0bbfb214f1e0fd9250b549bfae7fb04ab20ad3aebddd0b2693debb3dcf2b6a
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From 94340cab1524c4c2b434a4302e2f606904458c3a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 8 May 2021 04:35:12 +1100
Subject: [PATCH 279/447] iwd: update to 1.14.

---
 srcpkgs/iwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 32a44f3a0555..33e2e7874a7e 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.13
+version=1.14
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
 distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=b005f7ed0f0a96a2c6181c44560fc868533a18e7034bd4cb43ea0d40c21b4e7a
+checksum=21be6ad59ba666ba1e50e01889d647472b9b2f96f4941123db036fd33c257f0b
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From 712b4023388795c8c63eee024dad0db5cb7e1f42 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 8 May 2021 05:47:34 +1100
Subject: [PATCH 280/447] turbovnc: update to 2.2.6.

Also fix homepage.
---
 srcpkgs/turbovnc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index 12db4b8c9c57..8bb508ee94a2 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -1,7 +1,7 @@
 # Template file for 'turbovnc'
 pkgname=turbovnc
-version=2.2.4
-revision=2
+version=2.2.6
+revision=1
 build_style=cmake
 configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
@@ -12,9 +12,9 @@ depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://virtualgl.org"
+homepage="https://turbovnc.org"
 distfiles="${SOURCEFORGE_SITE}/turbovnc/${pkgname}-${version}.tar.gz"
-checksum=821da48c3422e71c5b2cae338058e720078ec74c55c466e5cf90d8e5cc91b2bf
+checksum=71ff553dbad24f8339e168fe90e09bc2b13c21e453f28276d0e5c9c408bd9de2
 
 conf_files="/etc/*.conf"
 archs="i686* x86_64* ppc64*"

From 6ad7e1bcd9abbaee963fc32342f1617b08cf1c6f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 8 May 2021 00:17:31 +0300
Subject: [PATCH 281/447] gallery-dl: update to 1.17.4

---
 srcpkgs/gallery-dl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 2249ecce51d0..4e461616bb69 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
-version=1.17.3
+version=1.17.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/mikf/gallery-dl"
 changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
 distfiles="https://github.com/mikf/gallery-dl/archive/v${version}.tar.gz"
-checksum=350ea07d5d36e0ba982a5bfb869f3226195be196e0012401f350857ceb025c42
+checksum=61f3396edc717274f32af5a54cde9a671d9787ff46c1adfad37254f1e140308d
 
 do_check() {
 	make test

From eaed71047c1c6fac7a908706397e6467c0a12e9e Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Sat, 8 May 2021 07:21:52 +0200
Subject: [PATCH 282/447] nim: update to 1.4.6.

---
 srcpkgs/nim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index c22afd64371b..34e5daf6dbce 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,7 +1,7 @@
 # Template file for 'nim'
 pkgname=nim
-version=1.4.2
-revision=2
+version=1.4.6
+revision=1
 _cversion=0.20.0
 _nimbleversion=0.12.0
 _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
@@ -18,7 +18,7 @@ distfiles="${_ghsite}/Nim/archive/v${version}.tar.gz
  ${_ghsite}/csources/archive/v${_cversion}.tar.gz>csources-${_cversion}.tar.gz
  ${_ghsite}/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz
  ${_ghsite}/fusion/archive/${_fusionversion}.tar.gz>fusion-${_fusionversion}.tar.gz"
-checksum="fc1e25aa2c667a34fe48160a79472fd5ced35af6478a535919d20b8821277a3a
+checksum="f041b63cbd7a5018a2a60f27aa3d2ea6f13890c1a2d8d79197a3b2fecb2614b1
  5e6fd15d90df1a8cb7614c4ffc70aa8c4198cd854d7742016202b96dd0228d3c
  0b88d91a450f31641f85379f2d76afb0a013cf783e62144a6534525b9cb1cbac
  76d10a2f0f25ba7fb3393bdb800c75e8084758d8ce69e63d07926cd36f555084"

From 59cba4b3a388e429b109e52b2e0e94be9c2e39fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 8 May 2021 10:38:12 +0200
Subject: [PATCH 283/447] croc: update to 9.1.2.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 820730bfcda3..fb97c032234a 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.1.1
+version=9.1.2
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ca151e59d7a655f2f4cdb06669f568254c2c73f499c2f828055e142702a6a415
+checksum=f5dc5aa37cf179f86982080a067218d0fccf8fead9b5b25bc3f1f9181e82ab26
 
 post_install() {
 	vlicense LICENSE

From ae0ab3cfe247b701e5fd143554dc350a3e9d3090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 7 May 2021 09:50:43 +0200
Subject: [PATCH 284/447] slmenu: remove package

repo is gone
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/slmenu/template           | 21 ---------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 srcpkgs/slmenu/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0f49b394e541..2232f209ad38 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -279,6 +279,7 @@ replaces="
  simple-obfs<=0.0.5_2
  sitecopy<=0.16.6_11
  skypetab-ng<=20150201_3
+ slmenu<=0.1_1
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
  sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/slmenu/template b/srcpkgs/slmenu/template
deleted file mode 100644
index 4469c5c94bc4..000000000000
--- a/srcpkgs/slmenu/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'slmenu'
-pkgname=slmenu
-version=0.1
-revision=1
-_git_commit=7e74fa5db73e
-wrksrc="rafaelgg-${pkgname}-${_git_commit}"
-build_style=gnu-makefile
-short_desc="Dmenu clone for the console"
-maintainer="Benjamín Albiñana <benalb@gmail.com>"
-license="MIT"
-homepage="https://bitbucket.org/rafaelgg/slmenu/"
-distfiles="https://bitbucket.org/rafaelgg/${pkgname}/get/${_git_commit}.tar.gz"
-checksum=55725f239178ccd304f9e2c10245247fafcc9e206954be8883bf1326cbdb2d86
-
-pre_build() {
-	sed -i 's|/local||' config.mk
-}
-
-post_install() {
-	vlicense LICENSE
-}

From d5482eeae5a519329f17a4548784821ff597a897 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 23:20:44 -0700
Subject: [PATCH 285/447] perl-Exception-Class: update to 1.45

---
 srcpkgs/perl-Exception-Class/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/perl-Exception-Class/template b/srcpkgs/perl-Exception-Class/template
index 0352d2a0637f..a8a82c574855 100644
--- a/srcpkgs/perl-Exception-Class/template
+++ b/srcpkgs/perl-Exception-Class/template
@@ -1,7 +1,7 @@
-# Template build file for 'perl-Exception-Class'.
+# Template file for 'perl-Exception-Class'
 pkgname=perl-Exception-Class
-version=1.44
-revision=2
+version=1.45
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
 hostmakedepends="perl-Class-Data-Inheritable perl-Devel-StackTrace"
@@ -9,7 +9,7 @@ makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
 short_desc='Allows you to declare real exception classes'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Exception-Class"
-license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Exception/Exception-Class-${version}.tar.gz"
-checksum=33f3fbf8b138d3b04ea4ec0ba83fb0df6ba898806bcf4ef393d4cafc1a23ee0d
+checksum=5482a77ef027ca1f9f39e1f48c558356e954936fc8fbbdee6c811c512701b249

From 5674e6916bff7d874144aaf7ef20022cc2e2e94d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 23:57:41 -0700
Subject: [PATCH 286/447] perl-MIME-Types: update to 2.20

---
 srcpkgs/perl-MIME-Types/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/perl-MIME-Types/template b/srcpkgs/perl-MIME-Types/template
index 2d708402146f..6ce8faf74079 100644
--- a/srcpkgs/perl-MIME-Types/template
+++ b/srcpkgs/perl-MIME-Types/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-MIME-Types'
 pkgname=perl-MIME-Types
-version=2.17
-revision=2
+version=2.20
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Perl extension for determining MIME types"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/MIME-Types"
-license="Artistic, GPL-1"
 distfiles="${CPAN_SITE}/MIME/${pkgname/perl-/}-${version}.tar.gz"
-checksum=e04ed7d42f1ff3150a303805f2689c28f80b92c511784d4641cb7f040d3e8ff6
+checksum=3e71099b92bfdbd8ef9f0643d7160201c4176053276bcf7e074cf5734ea9f8f1

From 22fe4f94fa3d7d9eb27845365bfeb5e4b329730c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 8 May 2021 16:33:29 +0200
Subject: [PATCH 287/447] yad: update to 10.1.

---
 srcpkgs/yad/patches/browser.c.patch | 11 -----------
 srcpkgs/yad/patches/tools.c.patch   | 11 -----------
 srcpkgs/yad/template                |  9 ++-------
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/yad/patches/browser.c.patch
 delete mode 100644 srcpkgs/yad/patches/tools.c.patch

diff --git a/srcpkgs/yad/patches/browser.c.patch b/srcpkgs/yad/patches/browser.c.patch
deleted file mode 100644
index fa7f33cdbb6f..000000000000
--- a/srcpkgs/yad/patches/browser.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/browser.c	2021-02-23 16:13:54.703468769 -0700
-+++ src/browser.c.new	2021-02-23 16:14:36.647362079 -0700
-@@ -18,7 +18,7 @@
-  */
- 
- #include <config.h>
--
-+#include <locale.h>
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>
diff --git a/srcpkgs/yad/patches/tools.c.patch b/srcpkgs/yad/patches/tools.c.patch
deleted file mode 100644
index a0b9e9676db9..000000000000
--- a/srcpkgs/yad/patches/tools.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tools.c	2021-03-15 15:19:06.650948813 +0100
-+++ src/tools.c.new	2021-03-15 15:14:18.580955373 +0100
-@@ -18,7 +18,7 @@
-  */
- 
- #include <config.h>
--
-+#include <locale.h>
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- 
diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index c6008b33dfb8..88f7e6f5165a 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,6 +1,6 @@
 # Template file for 'yad'
 pkgname=yad
-version=9.3
+version=10.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-icon-browser"
@@ -12,14 +12,9 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/v1cont/yad"
 changelog="https://raw.githubusercontent.com/v1cont/yad/master/NEWS"
 distfiles="https://github.com/v1cont/yad/releases/download/v${version}/yad-${version}.tar.xz"
-checksum=d5ca05d7658ac45490f1b49e15d24acd2c2011d88dab3f8dab0431ae9f493319
+checksum=742a5bd55de4b249eee6780bddeccb05c7ff4b158fd9743808f7d280219fd3ab
 
 pre_configure() {
 	autoreconf -ivf
 	intltoolize
 }
-
-post_install() {
-	# Avoid conflict with disputils
-	mv "${DESTDIR}"/usr/bin/{,yad-}pfd
-}

From c41c89be07271de068d0edbe82d5dbe458895698 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 17:08:33 -0700
Subject: [PATCH 288/447] python-contextlib2: update to 0.6.0.post1

---
 srcpkgs/python-contextlib2/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python-contextlib2/template b/srcpkgs/python-contextlib2/template
index 69848250008a..bef0e281f8f1 100644
--- a/srcpkgs/python-contextlib2/template
+++ b/srcpkgs/python-contextlib2/template
@@ -1,19 +1,18 @@
 # Template file for 'python-contextlib2'
 pkgname=python-contextlib2
-version=0.5.5
-revision=2
+version=0.6.0.post1
+revision=1
 wrksrc="contextlib2-${version}"
 build_style=python2-module
-pycompile_module="contextlib2.py"
 hostmakedepends="python-setuptools"
 depends="python"
 short_desc="Backports and enhancements for the contextlib module"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="PSF-2.0"
 homepage="https://contextlib2.readthedocs.io/"
-license="PSF"
 distfiles="${PYPI_SITE}/c/contextlib2/contextlib2-${version}.tar.gz"
-checksum=509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48
+checksum=01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e
 
 post_install() {
-       vlicense LICENSE.txt
+	vlicense LICENSE.txt
 }

From 97aeb54afc4bb154500c256e32fa9ca799c0b45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Sat, 8 May 2021 17:45:57 +0200
Subject: [PATCH 289/447] go: update to 1.16.4

---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 7ab8307d6974..e2223bc6edff 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.3
+version=1.16.4
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=b298d29de9236ca47a023e382313bcc2d2eed31dfa706b60a04103ce83a71a25
+checksum=ae4f6b6e2a1677d31817984655a762074b5356da50fb58722b99104870d43503
 nostrip=yes
 noverifyrdeps=yes
 

From 344477b7dfffbbcd3d7aeb8a2855a29112c126d0 Mon Sep 17 00:00:00 2001
From: Anubhav Kini <anubhavkini@gmail.com>
Date: Sun, 9 May 2021 09:01:24 +0530
Subject: [PATCH 290/447] polybar: update to 3.5.5.

---
 srcpkgs/polybar/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index d74bb8630638..6181cac3e1c5 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -1,6 +1,6 @@
 # Template file for 'polybar'
 pkgname=polybar
-version=3.5.4
+version=3.5.5
 revision=1
 build_style=cmake
 configure_args="
@@ -23,9 +23,9 @@ makedepends="cairo-devel xcb-util-image-devel xcb-util-wm-devel xcb-util-xrm-dev
 short_desc="Fast and easy-to-use status bar"
 maintainer="Michael Carlberg <c@rlberg.se>"
 license="MIT"
-homepage="https://github.com/jaagr/polybar"
-distfiles="https://github.com/jaagr/polybar/releases/download/${version}/polybar-${version}.tar.gz"
-checksum=133af4e8b29f426595ad3b773948eee27275230887844473853e7940c7959c2b
+homepage="https://github.com/polybar/polybar"
+distfiles="${homepage}/releases/download/${version}/polybar-${version}.tar.gz"
+checksum=7e625d3b6f7885587e70200fd81c2a5d3fb03f5649422de8e138747152ca0bb1
 
 build_options="alsa curl i3 mpd network pulseaudio"
 build_options_default="$build_options"

From 7371e9c9f2f094eb4345fed14b9c34e2e72aa935 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 4 May 2021 21:41:41 -0700
Subject: [PATCH 291/447] ndpi: update to 3.4

---
 common/shlibs         |  2 +-
 srcpkgs/ndpi/template | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2ced94d7831f..338fede96e6b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2563,7 +2563,7 @@ libykneomgr.so.0 libykneomgr-0.1.8_1
 libopenshot-audio.so.7 libopenshot-audio-0.2.0_1
 libopenshot.so.19 libopenshot-0.2.5_3
 libpqxx-6.3.so libpqxx-6.3.3_1
-libndpi.so.1 ndpi-1.6_1
+libndpi.so.3 ndpi-3.4_1
 liblog.so android-studio-3.0.1_1
 libm.so android-studio-3.0.1_1
 libdl.so android-studio-3.0.1_1
diff --git a/srcpkgs/ndpi/template b/srcpkgs/ndpi/template
index 4990b3353528..43be3ed5ab94 100644
--- a/srcpkgs/ndpi/template
+++ b/srcpkgs/ndpi/template
@@ -1,26 +1,24 @@
 # Template file for 'ndpi'
 pkgname=ndpi
-version=2.2
-revision=4
+version=3.4
+revision=1
 wrksrc=nDPI-${version}
 build_style=gnu-configure
 hostmakedepends="libtool automake pkg-config"
-makedepends="libpcap-devel json-c-devel"
+makedepends="libpcap-devel json-c-devel libgcrypt-devel"
 short_desc="Open Source Deep Packet Inspection Software Toolkit"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="LGPL-3"
+license="LGPL-3.0-or-later"
 homepage="http://www.ntop.org/products/ndpi/"
 distfiles="https://github.com/ntop/nDPI/archive/${version}.tar.gz"
-checksum=25607db12f466ba88a1454ef8b378e0e9eb59adffad6baa4b5610859a102a5dd
+checksum=dc9b291c7fde94edb45fb0f222e0d93c93f8d6d37f4efba20ebd9c655bfcedf9
 
-pre_configure() {
-	# Copied from autogen.sh
-	local NDPI_MAJOR=${version%.*}
-	local NDPI_MINOR=${version#*.}
-	local NDPI_PATCH=0
-	local NDPI_VERSION_SHORT=${version}.0
-	cat configure.seed | sed "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" | sed "s/@NDPI_MINOR@/$NDPI_MINOR/g" | sed "s/@NDPI_PATCH@/$NDPI_PATCH/g" | sed "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" > configure.ac
-	autoreconf -fi
+do_configure() {
+	./autogen.sh ${configure_args}
+}
+
+do_check() {
+	cd tests ; ./do.sh
 }
 
 post_install() {

From debd49c10f1763b5e781fbb1138a32863cada251 Mon Sep 17 00:00:00 2001
From: Anubhav Kini <anubhavkini@gmail.com>
Date: Wed, 5 May 2021 22:34:05 +0530
Subject: [PATCH 292/447] New package: basu-0.2.0

---
 common/shlibs                         |  1 +
 srcpkgs/basu-devel                    |  1 +
 srcpkgs/basu/patches/uid-nobody.patch | 11 +++++++++++
 srcpkgs/basu/template                 | 23 +++++++++++++++++++++++
 4 files changed, 36 insertions(+)
 create mode 120000 srcpkgs/basu-devel
 create mode 100644 srcpkgs/basu/patches/uid-nobody.patch
 create mode 100644 srcpkgs/basu/template

diff --git a/common/shlibs b/common/shlibs
index 338fede96e6b..2afcbb9a6dea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3986,3 +3986,4 @@ libgumbo.so.1 gumbo-parser-0.10.1_2
 libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
 libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
+libbasu.so.0 basu-0.2.0_1
diff --git a/srcpkgs/basu-devel b/srcpkgs/basu-devel
new file mode 120000
index 000000000000..a25387954cc6
--- /dev/null
+++ b/srcpkgs/basu-devel
@@ -0,0 +1 @@
+basu
\ No newline at end of file
diff --git a/srcpkgs/basu/patches/uid-nobody.patch b/srcpkgs/basu/patches/uid-nobody.patch
new file mode 100644
index 000000000000..27524c0f474d
--- /dev/null
+++ b/srcpkgs/basu/patches/uid-nobody.patch
@@ -0,0 +1,11 @@
+--- src/basic/user-util.h
++++ src/basic/user-util.h
+@@ -17,7 +17,7 @@ char* uid_to_name(uid_t uid);
+ 
+ #define UID_INVALID ((uid_t) -1)
+ 
+-#define UID_NOBODY ((uid_t) 65534U)
++#define UID_NOBODY ((uid_t) 99U)
+ 
+ bool synthesize_nobody(void);
+ 
diff --git a/srcpkgs/basu/template b/srcpkgs/basu/template
new file mode 100644
index 000000000000..1a3614b781c3
--- /dev/null
+++ b/srcpkgs/basu/template
@@ -0,0 +1,23 @@
+# Template file for 'basu'
+pkgname=basu
+version=0.2.0
+revision=1
+build_style=meson
+configure_args="-Dwerror=false"
+hostmakedepends="gperf"
+short_desc="SD-Bus library extracted from systemd"
+maintainer="Anubhav Kini <anubhavkini@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/emersion/basu"
+distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=e2fda9b69fc6c4530173fcf8db94c29aa5f3ed932d948cc6a31892623cde5e4b
+
+basu-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From e01ecd696672a8731a3daf43bad9c0807cedb536 Mon Sep 17 00:00:00 2001
From: Anubhav Kini <anubhavkini@gmail.com>
Date: Wed, 5 May 2021 22:34:33 +0530
Subject: [PATCH 293/447] mako: update to 1.5

---
 srcpkgs/mako/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mako/template b/srcpkgs/mako/template
index 18c18def196d..49a40cf8f9ea 100644
--- a/srcpkgs/mako/template
+++ b/srcpkgs/mako/template
@@ -1,24 +1,24 @@
 # Template file for 'mako'
 pkgname=mako
-version=1.4.1
+version=1.5
 revision=1
 build_style=meson
-configure_args="-Dzsh-completions=true -Dapparmor=true -Dwerror=false"
+configure_args="-Dzsh-completions=true -Dwerror=false"
 hostmakedepends="pkg-config scdoc wayland-devel wayland-protocols"
 makedepends="wayland-devel wayland-protocols pango-devel cairo-devel
- elogind-devel gdk-pixbuf-devel"
+ basu-devel gdk-pixbuf-devel"
 short_desc="Lightweight Wayland notification daemon"
 maintainer="Emerson Ferreira <me@skrps.me>"
 license="MIT"
 homepage="https://mako-project.org/"
 distfiles="https://github.com/emersion/${pkgname}/archive/v${version}.tar.gz"
-checksum=27ab63264a74389de2119393fe64fd578a4c1d04c8409990ef7cfbb6eb9309bb
+checksum=d79998aa4c68de82155080a58ad5783b40d81f50553a0a5d633553ece4f7439d
 
 conf_files="/etc/apparmor.d/local/fr.emersion.Mako"
 
 post_install() {
 	vlicense LICENSE
-
+	vinstall contrib/apparmor/fr.emersion.Mako 644 etc/apparmor.d
 	vmkdir etc/apparmor.d/local
 	touch ${DESTDIR}/etc/apparmor.d/local/fr.emersion.Mako
 }

From a5b1f438f2f27fbfc4faa88bd9ff8825c7ab5e84 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 May 2021 17:10:40 +0200
Subject: [PATCH 294/447] libimagequant: update to 2.15.0.

---
 srcpkgs/libimagequant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimagequant/template b/srcpkgs/libimagequant/template
index 629732b28bbe..225895bb8b67 100644
--- a/srcpkgs/libimagequant/template
+++ b/srcpkgs/libimagequant/template
@@ -1,6 +1,6 @@
 # Template file for 'libimagequant'
 pkgname=libimagequant
-version=2.14.1
+version=2.15.0
 revision=1
 build_style=configure
 configure_args="--with-openmp"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/lib/"
 distfiles="https://github.com/ImageOptim/libimagequant/archive/${version}.tar.gz"
-checksum=b5fa27da1f3cf3e8255dd02778bb6a51dc71ce9f99a4fc930ea69b83200a7c74
+checksum=11b15f4057feb9de724415f71a8e369942218e1691bb75838167bc986591fc36
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*) configure_args+=" --enable-sse";;

From d5e0b3b74ea82af6f22043e48896c9bd44cfc930 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 May 2021 17:11:04 +0200
Subject: [PATCH 295/447] pngquant: update to 2.15.0.

---
 srcpkgs/pngquant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template
index 9e74557dc2a8..bb57194e77ec 100644
--- a/srcpkgs/pngquant/template
+++ b/srcpkgs/pngquant/template
@@ -1,6 +1,6 @@
 # Template file for 'pngquant'
 pkgname=pngquant
-version=2.14.1
+version=2.15.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-openmp"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/"
 distfiles="https://github.com/pornel/${pkgname}/archive/${version}.tar.gz"
-checksum=5b2e29d61f548b18b0dd37156a49f87625123250577815add666e473fd1ca1af
+checksum=263f1dee605a3e300fd4df957476ca3c125de6b8d001c2c43e31fe469a710712
 make_check_target=test
 
 case "$XBPS_TARGET_MACHINE" in

From 07048b166df68a7926ef97f5ae4cdf73dde27fb4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 May 2021 17:14:04 +0200
Subject: [PATCH 296/447] netpbm: update to 10.94.03.

---
 srcpkgs/netpbm/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 72fc4b2d4611..bb8deb828688 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.94.02
+version=10.94.03
 revision=1
-_githash=877641742255c9eeb82438eb54fd772f65e61e84
-_githash_guide=2d01412ab83361b8ed8d8db8f364cb223bd1c152
+_githash=5f3f8a1273d87104c0884995e6e58eab392de08b
+_githash_guide=6616ab1ac1f91aaf5a7f4eb2e2f3b920e86ebaa0
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="7d5104abe1046da49fb0aedc4f2bdcc077b559c998992d0e491cec74c742f31d
- 794cf365b1c3b6b9b2f9536b8b173ccbcbc74a96cf6eaa4377aa4a684af4ad58"
+checksum="03ce04ab50afae5e97aad4bd6932587e2ab45bf0ee2c18983de152257b6b63d9
+ 85236a7ae2ae8d5d22a5017a2d336ada79a19ece644e44fec8d6dfcbda36d9c3"
 
 post_extract() {
 	cd $build_wrksrc

From aa19323d1224d6966166740e11c7dfc36fbb1515 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 May 2021 17:14:08 +0200
Subject: [PATCH 297/447] python3-userpath: update to 1.5.0.

---
 srcpkgs/python3-userpath/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template
index 117866eb9b8b..923ee33b79eb 100644
--- a/srcpkgs/python3-userpath/template
+++ b/srcpkgs/python3-userpath/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-userpath'
 pkgname=python3-userpath
-version=1.4.2
+version=1.5.0
 revision=1
 wrksrc="userpath-${version}"
 build_style=python3-module
 pycompile_module="userpath"
 hostmakedepends="python3-setuptools"
-depends="python3-distro python3-click"
+depends="python3-click"
 short_desc="Cross-platform tool for adding locations to the user PATH"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/ofek/userpath"
 distfiles="${PYPI_SITE}/u/userpath/userpath-${version}.tar.gz"
-checksum=dd4b5496e4ef2c1a3bbb103ffefa7738fa4ba15f23580918bb9f949dcd61a8a7
+checksum=61f84899b7280800a8b6cc1b959a0cf250f6757e6f6c7176d7455bb693a4423a
 
 post_install() {
 	vlicense LICENSE-MIT

From c356f91c6786ea7bdfb5a30d7c95af3579eded3c Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 May 2021 17:04:36 +0200
Subject: [PATCH 298/447] roxterm: update to 3.10.4.

Closes: #30767 [via git-merge-pr]
---
 srcpkgs/roxterm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/roxterm/template b/srcpkgs/roxterm/template
index d511563b1773..b34b8b5e70ba 100644
--- a/srcpkgs/roxterm/template
+++ b/srcpkgs/roxterm/template
@@ -1,6 +1,6 @@
 # Template file for 'roxterm'
 pkgname=roxterm
-version=3.10.1
+version=3.10.4
 revision=1
 build_style=cmake
 hostmakedepends="ImageMagick glib-devel itstool librsvg-utils libtool
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://github.com/realh/roxterm"
 changelog="https://raw.githubusercontent.com/realh/roxterm/master/debian/changelog"
 distfiles="https://github.com/realh/roxterm/archive/${version}.tar.gz"
-checksum=ac5bad93afbbfec54c67a638835ad3493cf08f18a04d51ae6c27eceaa63d7041
+checksum=f04e3d607a2003d1992759434cc8b21a3a8fe49dcd9407b9ccd8440445331524

From 722cb81b636d0ce6027ccccdc874ec61db028944 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 9 May 2021 14:33:22 -0400
Subject: [PATCH 299/447] python3-matplotlib: update to 3.4.2.

---
 srcpkgs/python3-matplotlib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 43c126fc4811..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.1
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e662bdde3f493b0f14f658095d91c36521d0f2d96c0a4b9fad55fca6d6300a87
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From b8a975234804fdf49e46f07a94d51d2ecc566596 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 May 2021 20:46:56 +0200
Subject: [PATCH 300/447] redo: fix homepage/distfiles.

---
 srcpkgs/redo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/redo/template b/srcpkgs/redo/template
index 12ff84c893a9..b8af94ccc102 100644
--- a/srcpkgs/redo/template
+++ b/srcpkgs/redo/template
@@ -1,14 +1,14 @@
 # Template file for 'redo'
 pkgname=redo
 version=1.5
-revision=2
+revision=3
 create_wrksrc=yes
 hostmakedepends="perl"
 short_desc="Incremental build system (version of de Boyne Pollard)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
-homepage="https://jdebp.eu/Softwares/redo/"
-distfiles="https://jdebp.eu/Repository/freebsd/redo-${version}.tar.gz"
+homepage="http://jdebp.info/Softwares/redo/"
+distfiles="http://jdebp.info/Repository/freebsd/redo-${version}.tar.gz"
 checksum=5ff21779993418cf16f5632c593e30d9a2780bfc38cef9de9ab9427154736d36
 
 do_configure() {

From 0f84a4ef9c42d0b5a3c9de06f2b4c0aa951c1063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 9 May 2021 17:11:51 +0200
Subject: [PATCH 301/447] homebank: update to 5.5.2.

---
 srcpkgs/homebank/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index c92efe7057be..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.1
+version=5.5.2
 revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=9bb39eaad3c4c68d2bcbe21e2f6c4a5274e3a3f385afb2b2ff73ae5fd998da08
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From 53f5161f7395e0fb443514214e55f333779e6aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 9 May 2021 17:02:27 +0200
Subject: [PATCH 302/447] qpdf: update to 10.3.2.

---
 srcpkgs/qpdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index f3b5524a1539..55f9eb480eee 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=10.3.1
+version=10.3.2
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://github.com/qpdf/qpdf"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/master/ChangeLog"
 distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
-checksum=311dd965ed33bdf68e77c1b5945b548f846bd394562358c632c05e98c4f9e342
+checksum=8f1f42d1c36f62cf5bb4d2511e80e4fc0125093adc7fc444bc96cb7e79e71402
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 0737a75a4ac69b47445bf70aa028ea560721c29c Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 May 2021 16:28:27 +0200
Subject: [PATCH 303/447] kubetail: update to 1.6.13.

---
 srcpkgs/kubetail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubetail/template b/srcpkgs/kubetail/template
index f5d64db70579..83c9e6a3c9bd 100644
--- a/srcpkgs/kubetail/template
+++ b/srcpkgs/kubetail/template
@@ -1,6 +1,6 @@
 # Template file for 'kubetail'
 pkgname=kubetail
-version=1.6.12
+version=1.6.13
 revision=1
 depends="bash"
 short_desc="Bash script to tail Kubernetes logs from multiple pods at the same time"
@@ -8,7 +8,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="Apache-2.0"
 homepage="https://github.com/johanhaleby/kubetail"
 distfiles="https://github.com/johanhaleby/kubetail/archive/${version}.tar.gz"
-checksum=b5f3229361d520cc2f2de4b24d309ac49582e126e271525c85dc4b0975d57e59
+checksum=a4aeea1cffede44d5e8b030b6ead3ffe25fd3c1e7c5b7c82905df65cceac1254
 
 do_install() {
 	vbin kubetail

From 7a4d40a4ec932a95add986c54fd1fe5f9a259520 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 May 2021 20:22:01 +0200
Subject: [PATCH 304/447] cozy: update to 0.9.5.

---
 srcpkgs/cozy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 646f6049a13e..d959c923a2c7 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,10 +1,10 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=0.8.1
+version=0.9.5
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
 makedepends="glib-devel python3-distro python3-peewee python3-mutagen
  python3-gobject-devel libhandy1-devel"
 depends="python3 python3-peewee gst-libav gst-plugins-good1 gst1-python3
@@ -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=16fdb225ee24a1e1acff62c3e3c3eb7bf8fd602350f4aa66508ee741ae13d030
+checksum=4a7fdd7fead6e74aaaa3eab1589f13a88a99a25e5c9c4f0ed6b1f0ee901630c3

From 8cf21eb0ed5418dc8a1eb6751cd22faa48efea15 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 17:25:33 -0700
Subject: [PATCH 305/447] python-enum34: update to 1.1.10

---
 srcpkgs/python-enum34/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python-enum34/template b/srcpkgs/python-enum34/template
index 99ca2ade67a1..55894323fbbe 100644
--- a/srcpkgs/python-enum34/template
+++ b/srcpkgs/python-enum34/template
@@ -1,22 +1,21 @@
 # Template file for 'python-enum34'
 pkgname=python-enum34
-version=1.1.6
-revision=2
+version=1.1.10
+revision=1
 wrksrc="enum34-${version}"
 build_style=python2-module
 hostmakedepends="python-setuptools"
 depends="python"
-pycompile_module="enum"
 short_desc="Backport of Python 3.4 enum module"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/stoneleaf/enum34"
-license="3-clause-BSD"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/enum34/"
 distfiles="${PYPI_SITE}/e/enum34/enum34-${version}.tar.gz"
-checksum=8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1
+checksum=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248
 
 pre_build() {
 	# remove doc
-	sed -i "/'enum' :/,+6d" setup.py
+	vsed -i "/'enum' :/,+6d" setup.py
 }
 post_install() {
 	vlicense enum/LICENSE

From 12251ffa73db70b9610ccfc3ce8c2bdcb27b087f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 May 2021 16:39:36 +0200
Subject: [PATCH 306/447] yq-go: update to 4.7.1.

---
 srcpkgs/yq-go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index f94fe745cd47..b212620e7343 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=4.6.3
+version=4.7.1
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=85d7e0cbc12ac690fd86e77bef7a7ce27e0969191a9b6d3bb491ec690659d681
+checksum=19a7c43aaac678065f436ddfdf8b0a75dd3883984f4b9548cabdf53eb09932f9
 
 do_check() {
 	go test -v

From 3d55e8f0de9b15e233ebade5eef1e7bb5e6e0a7e Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 May 2021 10:26:26 +0200
Subject: [PATCH 307/447] miniflux: update to 2.0.30.

---
 srcpkgs/miniflux/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index b6c677a2aa70..f35a15a42d6c 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,10 +1,11 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.29
+version=2.0.30
 revision=1
 wrksrc="v2-${version}"
 build_style=go
 go_import_path="miniflux.app"
+go_ldflags="-X miniflux.app/version.Version=${version}"
 hostmakedepends="git"
 short_desc="Minimalist and opinionated feed reader written in Go"
 maintainer="Frank Steinborn <steinex@nognu.de>"
@@ -12,7 +13,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/v2/master/ChangeLog"
 distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=dcce29b07738cd2ffe1da3cf1401d8c49ead421a81e2b2239323f3423c867200
+checksum=b5328c99e176439c44647cfec48fd6b5557b18060d0c93871bf8cbbac98e9594
 system_accounts="_miniflux"
 
 post_install() {

From 8cea62f71501011731aecebf70ff9162d5f6b36f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 8 May 2021 16:26:41 +0200
Subject: [PATCH 308/447] tor: double MAX_OPEN_FILES yet again.

---
 srcpkgs/tor/files/tor/run | 2 +-
 srcpkgs/tor/template      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tor/files/tor/run b/srcpkgs/tor/files/tor/run
index d0d402d25f5a..389850ff0342 100755
--- a/srcpkgs/tor/files/tor/run
+++ b/srcpkgs/tor/files/tor/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
-ulimit -n ${MAX_OPEN_FILES:-8192}
+ulimit -n ${MAX_OPEN_FILES:-16384}
 exec tor ${OPTS:=--quiet} --runasdaemon 0 2>&1
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index cef10708f390..ef6d68483a56 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.5.6
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From c901e8294460d9d077bdb38e3b4f58dbc9f1fa88 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 23:03:20 -0700
Subject: [PATCH 309/447] perl-Digest-HMAC: update to 1.04

Technically a no-op but it keeps the version checker happy while also
fixing various linting issues.
---
 srcpkgs/perl-Digest-HMAC/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/perl-Digest-HMAC/template b/srcpkgs/perl-Digest-HMAC/template
index 97dd9b696e81..72eb4e0679cd 100644
--- a/srcpkgs/perl-Digest-HMAC/template
+++ b/srcpkgs/perl-Digest-HMAC/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Digest-HMAC'
 pkgname=perl-Digest-HMAC
-version=1.03
-revision=4
+version=1.04
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Perl interface to HMAC message-digest algorithms"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Digest-HMAC"
-license="Artistic, GPL-1"
 distfiles="${CPAN_SITE}/Digest/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3bc72c6d3ff144d73aefb90e9a78d33612d58cf1cd1631ecfb8985ba96da4a59
+checksum=d6bc8156aa275c44d794b7c18f44cdac4a58140245c959e6b19b2c3838b08ed4

From c64015207f80386bc78a2e8e48787dce4f698b60 Mon Sep 17 00:00:00 2001
From: Anubhav Kini <anubhavkini@gmail.com>
Date: Sat, 8 May 2021 21:24:13 +0530
Subject: [PATCH 310/447] timeshift: update outdated homepage

---
 srcpkgs/timeshift/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 9a01c60cf05d..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -9,7 +9,7 @@ depends="rsync psmisc"
 short_desc="System restore tool"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://www.teejeetech.in/p/timeshift.html"
+homepage="https://teejeetech.com/timeshift/"
 distfiles="https://github.com/teejee2008/timeshift/archive/v${version}.tar.gz"
 checksum=c6dcca80b42f80a8c8d9d03e91eb17aa634be2f1031f667bba3f483410297abb
 

From fc0f5dae38688906fe1fa2ac17318cc0ad5c3d7b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 10:51:45 -0700
Subject: [PATCH 311/447] perl-User-Identity: update to 1.00

---
 srcpkgs/perl-User-Identity/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/perl-User-Identity/template b/srcpkgs/perl-User-Identity/template
index 1005686e7261..52b82d5c4de5 100644
--- a/srcpkgs/perl-User-Identity/template
+++ b/srcpkgs/perl-User-Identity/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-User-Identity'
 pkgname=perl-User-Identity
-version=0.99
-revision=2
+version=1.00
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Perl module for abstracting information about a physical person"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/User-Identity"
-license="Artistic, GPL-1"
 distfiles="${CPAN_SITE}/User/${pkgname/perl-/}-${version}.tar.gz"
-checksum=f53b388897c965e529352aac2053298ef3f8a0f8bfac3c942795597c5fe75830
+checksum=9219b4271cfeb726330e9564589ea3a7db4b6dd6f6f4423746048df1a08e9f4a

From 7c562f39acf0c8323955e303dd7e6d0441ad1f68 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 13:55:30 -0700
Subject: [PATCH 312/447] python-chardet: fix license, other lint

---
 srcpkgs/python-chardet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-chardet/template b/srcpkgs/python-chardet/template
index 276b8e949804..4af1148333f5 100644
--- a/srcpkgs/python-chardet/template
+++ b/srcpkgs/python-chardet/template
@@ -1,7 +1,7 @@
 # Template file for 'python-chardet'
 pkgname=python-chardet
 version=4.0.0
-revision=1
+revision=2
 wrksrc="chardet-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
@@ -9,8 +9,8 @@ depends="python-setuptools"
 checkdepends="python3-pytest python-pytest"
 short_desc="Universal encoding detector for Python 2 and 3 (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="LGPL-2.1-only"
 homepage="https://github.com/chardet/chardet"
-license="LGPL-2.1"
 distfiles="${PYPI_SITE}/c/chardet/chardet-${version}.tar.gz"
 checksum=0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa
 alternatives="chardet:chardetect:/usr/bin/chardetect2"

From 64422bf8f19af5c768afb8c1896f4a8130c8ed8e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 14:12:22 -0700
Subject: [PATCH 313/447] python-backports: fix license, update homepage

---
 srcpkgs/python-backports/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-backports/template b/srcpkgs/python-backports/template
index 8bd3bb28526d..77409ecd82f1 100644
--- a/srcpkgs/python-backports/template
+++ b/srcpkgs/python-backports/template
@@ -1,15 +1,14 @@
 # Template file for 'python-backports'
 pkgname=python-backports
 version=1.0
-revision=4
+revision=5
 wrksrc="backports-${version}"
 build_style=python2-module
-pycompile_module="backports"
 hostmakedepends="python"
 depends="python"
 short_desc="Namespace for backported Python features"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/brandon/backports"
-license="PSF"
+license="PSF-2.0"
+homepage="https://pypi.org/project/backports/"
 distfiles="https://dev.gentoo.org/~radhermit/dist/backports-${version}.tar.gz"
 checksum=ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740

From 00fd14ae45342b08618161beac16d6b64bbac7d8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 14:19:20 -0700
Subject: [PATCH 314/447] python-distutils-extra: fix license, other lint

---
 srcpkgs/python-distutils-extra/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-distutils-extra/template b/srcpkgs/python-distutils-extra/template
index 61648d80cedf..47d4c8cf11f7 100644
--- a/srcpkgs/python-distutils-extra/template
+++ b/srcpkgs/python-distutils-extra/template
@@ -1,21 +1,19 @@
 # Template file for 'python-distutils-extra'
 pkgname=python-distutils-extra
 version=2.39
-revision=6
+revision=7
 build_style=python-module
-pycompile_module="DistUtilsExtra"
 hostmakedepends="intltool python-setuptools python3-setuptools"
 depends="python"
 short_desc="Enhancements to the Python2 build system"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="https://launchpad.net/python-distutils-extra"
-license="GPL-2"
 distfiles="http://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae8063af
 
 python3-distutils-extra_package() {
 	depends="python3"
-	pycompile_module="DistUtilsExtra"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*

From 53a6419666b337ef5c891020348bd026a71c6a15 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 15:16:37 -0700
Subject: [PATCH 315/447] python-pgpdump: fix license, other lint

---
 srcpkgs/python-pgpdump/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-pgpdump/template b/srcpkgs/python-pgpdump/template
index 4c629009edb5..f43a49156374 100644
--- a/srcpkgs/python-pgpdump/template
+++ b/srcpkgs/python-pgpdump/template
@@ -1,21 +1,23 @@
 # Template file for 'python-pgpdump'
 pkgname=python-pgpdump
 version=1.5
-revision=8
+revision=9
 build_style=python-module
-pycompile_module="pgpdump"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Python2 library for parsing PGP packets"
 maintainer="Duncaen <mail@duncano.de>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://github.com/toofishes/python-pgpdump"
 distfiles="https://github.com/toofishes/python-pgpdump/archive/${version}.tar.gz"
 checksum=05383f66e467e855299d1ed51161c6038ac338d9d10bd33476b574dc3bef64ff
 
+post_install() {
+	vlicense COPYRIGHT
+}
+
 python3-pgpdump_package() {
 	depends="python3"
-	pycompile_module="pgpdump"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*

From 1c7873c65146407cb2fad1431d6ef3e93527f753 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 15:21:37 -0700
Subject: [PATCH 316/447] python-ply: fix license, other lint

---
 srcpkgs/python-ply/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
index 37282837f2fa..55a017a9b66c 100644
--- a/srcpkgs/python-ply/template
+++ b/srcpkgs/python-ply/template
@@ -1,16 +1,15 @@
 # Template file for 'python-ply'
 pkgname=python-ply
 version=3.11
-revision=4
+revision=5
 wrksrc="ply-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
-pycompile_module="ply"
 short_desc="Lex and Yacc for Python2"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
 homepage="http://www.dabeaz.com/ply/"
-license="3-clause-BSD"
 distfiles="${PYPI_SITE}/p/ply/ply-${version}.tar.gz"
 checksum=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
 
@@ -21,7 +20,6 @@ post_install() {
 
 python3-ply_package() {
 	depends="python3"
-	pycompile_module="ply"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*

From 2a3216766ecf422c37fd5f3d41832cf91dd39b1f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 8 May 2021 15:24:38 -0700
Subject: [PATCH 317/447] python-spambayes: fix license

---
 srcpkgs/python-spambayes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-spambayes/template b/srcpkgs/python-spambayes/template
index b05815bf02ae..04386eb3942f 100644
--- a/srcpkgs/python-spambayes/template
+++ b/srcpkgs/python-spambayes/template
@@ -1,14 +1,14 @@
 # Template file for 'python-spambayes'
 pkgname=python-spambayes
 version=1.1b3
-revision=2
+revision=3
 wrksrc=${pkgname#*-}-${version}
 build_style=python2-module
 hostmakedepends="python-setuptools"
 depends="python-lockfile python-pydns"
 short_desc="Spam classification system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="PSF"
+license="PSF-2.0"
 homepage="http://spambayes.sourceforge.net/"
 distfiles="${PYPI_SITE}/s/spambayes/spambayes-${version}.tar.gz"
 checksum=188d650fa930b27f74c96233429bd48f96d304a22d401b34cde32839c81bd904

From 80fef9e49822803d4c04ee3cccca98f9846a0f60 Mon Sep 17 00:00:00 2001
From: noarchwastaken <noarch@n0ar.ch>
Date: Sun, 9 May 2021 00:25:44 -0400
Subject: [PATCH 318/447] libusb: fix descriptor parsing

backported upstream commit
<https://github.com/libusb/libusb/commit/f6d2cb56>

which fixes a regression for multi-configuration devices, e.g. iPhone.
---
 .../patches/fix-descriptor-parsing.patch      | 35 +++++++++++++++++++
 srcpkgs/libusb/template                       |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libusb/patches/fix-descriptor-parsing.patch

diff --git a/srcpkgs/libusb/patches/fix-descriptor-parsing.patch b/srcpkgs/libusb/patches/fix-descriptor-parsing.patch
new file mode 100644
index 000000000000..41b78b7348b3
--- /dev/null
+++ b/srcpkgs/libusb/patches/fix-descriptor-parsing.patch
@@ -0,0 +1,35 @@
+--- libusb/os/linux_usbfs.c
++++ libusb/os/linux_usbfs.c
+@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx,
+ 	uint8_t *buffer, size_t len)
+ {
+ 	struct usbi_descriptor_header *header;
+-	int offset = 0;
++	int offset;
++
++	/* Start seeking past the config descriptor */
++	offset = LIBUSB_DT_CONFIG_SIZE;
++	buffer += LIBUSB_DT_CONFIG_SIZE;
++	len -= LIBUSB_DT_CONFIG_SIZE;
+ 
+ 	while (len > 0) {
+ 		if (len < 2) {
+@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
+ 		}
+ 
+ 		if (priv->sysfs_dir) {
+-			 /*
++			/*
+ 			 * In sysfs wTotalLength is ignored, instead the kernel returns a
+ 			 * config descriptor with verified bLength fields, with descriptors
+ 			 * with an invalid bLength removed.
+@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
+ 			int offset;
+ 
+ 			if (num_configs > 1 && idx < num_configs - 1) {
+-				offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE,
+-							     remaining - LIBUSB_DT_CONFIG_SIZE);
++				offset = seek_to_next_config(ctx, buffer, remaining);
+ 				if (offset < 0)
+ 					return offset;
+ 				sysfs_config_len = (uint16_t)offset;
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 1f2036d0ecad..8c5ff6054eed 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,7 +1,7 @@
 # Template file for 'libusb'
 pkgname=libusb
 version=1.0.24
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel"

From 64ce58fa615d22dac655583be3e78b7d4916a789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 9 May 2021 19:08:54 -0300
Subject: [PATCH 319/447] gufw: fix path to python module.

The gufw-pkexec script hardcodes the path to the python module; this
made it error out:

  python3: can't open file '/usr/share/gufw/gufw/gufw.py':
  [Errno 2] No such file or directory

The issue was missed when the package was updated.

Using python entry points should be suggested to upstream, since that's
the standard way of distributing python programs with setuptools.
---
 srcpkgs/gufw/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gufw/template b/srcpkgs/gufw/template
index 56e5d1de74e8..6495bd7b1488 100644
--- a/srcpkgs/gufw/template
+++ b/srcpkgs/gufw/template
@@ -1,7 +1,7 @@
 # Template file for 'gufw'
 pkgname=gufw
 version=21.04.0
-revision=1
+revision=2
 wrksrc="gufw-${version}"
 build_style=python3-module
 hostmakedepends="python3-distutils-extra intltool"
@@ -14,5 +14,7 @@ distfiles="https://github.com/costales/gufw/archive/refs/tags/$version.tar.gz"
 checksum=b57892ec9817ca1520b2fef31cc3ef404b243ef1230bdccfdc6d75ed4e461841
 
 pre_configure() {
-	vsed -i -e "s/python3.5/python$py3_ver/" bin/gufw-pkexec
+	vsed -i -e \
+		"s|/usr/share/gufw/gufw/gufw.py|/usr/lib/python${py3_ver}/site-packages/gufw/gufw.py|" \
+		bin/gufw-pkexec
 }

From 09433d715e727491e4aaea88546c960e339b0419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 9 May 2021 19:18:29 -0300
Subject: [PATCH 320/447] pipewire: use >= for version constraints.

Using ${pkgname}-${version}_${revision} can be ambiguous, since it can
be interpreted as the package's actual name. Using
${pkgname}>=${version}_${revision} is preferred.

Since we are here, make depends for pipewire itself also require
specific versions of the libspa-* packages.
---
 srcpkgs/pipewire/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 7ed96573fbb9..fb5c149e8a42 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.26
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
  -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
@@ -10,7 +10,8 @@ hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
 makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
-depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control"
+depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
+ libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"
 license="MIT"
@@ -47,7 +48,7 @@ libpipewire_package() {
 }
 
 pipewire-devel_package() {
-	depends="libpipewire-${version}_${revision}"
+	depends="libpipewire>=${version}_${revision}"
 	short_desc+=" - pipewire and libspa development files"
 	pkg_install() {
 		vmove usr/include/pipewire-0.3
@@ -136,7 +137,7 @@ gstreamer1-pipewire_package() {
 }
 
 alsa-pipewire_package() {
-	depends="libpipewire-${version}_${revision}"
+	depends="libpipewire>=${version}_${revision}"
 	short_desc+=" - ALSA client library"
 	pkg_install() {
 		vmove usr/lib/alsa-lib
@@ -145,7 +146,7 @@ alsa-pipewire_package() {
 }
 
 libjack-pipewire_package() {
-	depends="libpipewire-${version}_${revision}"
+	depends="libpipewire>=${version}_${revision}"
 	short_desc+=" - JACK client library"
 	pkg_install() {
 		vmove usr/lib/pipewire-0.3/jack

From d273e676cdbb7ffe1325f2773d9e4bc3d0081294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 9 May 2021 19:21:58 -0300
Subject: [PATCH 321/447] mbuffer: update to 20210328.

---
 .../0001-mbuffer-don-t-cancel-ReaderThr.patch | 33 -------------------
 srcpkgs/mbuffer/template                      |  6 ++--
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/mbuffer/patches/0001-mbuffer-don-t-cancel-ReaderThr.patch

diff --git a/srcpkgs/mbuffer/patches/0001-mbuffer-don-t-cancel-ReaderThr.patch b/srcpkgs/mbuffer/patches/0001-mbuffer-don-t-cancel-ReaderThr.patch
deleted file mode 100644
index 1dd160547225..000000000000
--- a/srcpkgs/mbuffer/patches/0001-mbuffer-don-t-cancel-ReaderThr.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Subject: [PATCH] mbuffer: don't cancel ReaderThr.
-
-joinSenders is called after ReaderThr has been joined, which makes the
-pthread_cancel call in cancelAll undefined behavior and a case of
-use-after-free. Since the thread will already have been joined in main
-by the time joinSenders is called, there is no need to cancel it, so
-that call can simply be removed.
-
-Furthermore, we don't have to account for situations where pthread_join
-can fail, because this program doesn't generate them. If there were
-other threads which tried to join readerThr at the same time, a
-successful pthread_join call should also set Status=0, so pthread_cancel
-isn't called. However, that isn't necessary.
----
- mbuffer.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/mbuffer.c b/mbuffer.c
-index 79c997f..6e65277 100644
---- a/mbuffer.c
-+++ b/mbuffer.c
-@@ -166,8 +166,6 @@ static void cancelAll(void)
- 			d->result = "canceled";
- 		d = d->next;
- 	} while (d);
--	if (Status)
--		(void) pthread_cancel(ReaderThr);
- }
- 
- 
--- 
-2.30.2
-
diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index fa30e2134c17..97e0daac30e8 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,7 +1,7 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
-version=20210209
-revision=2
+version=20210328
+revision=1
 build_style=gnu-configure
 makedepends="openssl-devel"
 checkdepends="tar"
@@ -10,6 +10,6 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.maier-komor.de/mbuffer.html"
 distfiles="https://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"
-checksum=e81f2788e2621f20f848181ef2cb19ac6d12328691437f301574b253fd899a0c
+checksum=51b5b8d8488991a55fe1dfce90130f9e47bc1ce286ba03b4f628c04b784fdc5d
 patch_args=-Np1
 conf_files="/etc/mbuffer.rc"

From 6d99d61b378a78661d9c0025c90a954018a39c73 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 10 May 2021 01:41:23 +0300
Subject: [PATCH 322/447] sublime-merge-bin: update to 2054.

---
 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 3eb3184ee6ef..f627603bf28c 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=2049
+version=2054
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=bbe44b5c128f8e86582312e167e7fbf57be223b58290ac02c4c0c606c108ffbd
+checksum=539e0b514197e91aee756009d86ee505470d48350b2bcc3defbea11a789aac48
 _license_checksum=0cf0c605c296198b1b176dcb56343e7eb4f297fdcc7ec64dc347bcabf48fc4e8
 nopie=yes
 repository=nonfree

From c4f44842ebba764c5092ee8de3d180b1beb95ff6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 10 May 2021 01:30:37 +0300
Subject: [PATCH 323/447] notcurses: update to 2.2.11.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index eaa93ff2c60f..e66e1e73ded2 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.2.8
+version=2.2.11
 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=dc744f6a11bf8ca81dc8a73f56c4d9021cf4d56ef89a9a658974dff7984df376
+checksum=b49674891d42e3cb95da9db6e2f436b0274b72becb6697d64e4b24c6f9c8326e
 patch_args=-Np1
 
 build_options="man"

From bc0af779e6a34e9b59796cc536945346c2a758d2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 10 May 2021 01:34:20 +0300
Subject: [PATCH 324/447] growlight: update to 1.2.33.

---
 srcpkgs/growlight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 4456db1f8185..863c318d4081 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,6 +1,6 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.32
+version=1.2.33
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://nick-black.com/dankwiki/index.php/Growlight"
 distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
-checksum=f15357602d04e10a34d5d3f0d83a66a328638ce40c7b20ffaeac68459318edf2
+checksum=ef26904412ff6134018c350fe9e1f943d37fb82a623d06327195f9bd2b939408
 patch_args=-Np1
 
 build_options="man zfs"

From 3393a15fa86e5dddce1a461a33e771f95084811f Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Mon, 10 May 2021 00:51:04 +0200
Subject: [PATCH 325/447] surf: update to 2.1

---
 srcpkgs/surf/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/surf/template b/srcpkgs/surf/template
index b4937c4894fe..402209854a57 100644
--- a/srcpkgs/surf/template
+++ b/srcpkgs/surf/template
@@ -1,24 +1,17 @@
 # Template file for 'surf'
 pkgname=surf
-version=2.0
-revision=2
+version=2.1
+revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-makedepends="webkit2gtk-devel"
-depends="xprop"
+makedepends="webkit2gtk-devel gcr-devel"
+depends="xprop dmenu"
 short_desc="Simple web browser based on WebKit/GTK+"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://surf.suckless.org"
 distfiles="http://dl.suckless.org/surf/$pkgname-$version.tar.gz"
-checksum=faee4c7a62c38fc9791eff1ad06787c3c9b2b79f338806827f5152a7bc54951d
-
-do_build() {
-	sed -i 's,/usr/include,,g;s,/usr/lib,,g' config.mk
-	sed -i "/CFLAGS/s|\${CPPFLAGS}|& $CFLAGS|g" config.mk
-	sed -i "/LDFLAGS/s|\-s|$LDFLAGS|g" config.mk
-	make CC=$CC ${makejobs}
-}
+checksum=72e582920ba25a646203e93c2d2331d87f03037a28894d6c7e99af00ee043257
 
 post_install() {
 	vlicense LICENSE

From 84d1e31fe754c86e03bf109e46096503a7fe03ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 9 May 2021 20:48:32 -0300
Subject: [PATCH 326/447] void-docs: update to 2021.05.09.

And switch void-docs-browse to fully portable C-only dependencies.
---
 srcpkgs/void-docs/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/void-docs/template b/srcpkgs/void-docs/template
index 95aa4657d606..3ffb0c2c5649 100644
--- a/srcpkgs/void-docs/template
+++ b/srcpkgs/void-docs/template
@@ -1,28 +1,25 @@
 # Template file for 'void-docs'
 pkgname=void-docs
-version=2020.12.23
+version=2021.05.09
 revision=1
-hostmakedepends="mdBook fd pandoc texlive perl perl-JSON librsvg-utils"
+hostmakedepends="mdBook lowdown texlive perl perl-JSON librsvg-utils"
 short_desc="Documentation for Void Linux"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="CC-BY-SA-4.0"
 homepage="https://github.com/void-linux/void-docs"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=bc6f25392b14b3de33378fbfe84a93e4838cba21603cc9d742fd842ab32c4db5
-
-export PREFIX=/usr
+checksum=96f6676bfbff213a9862c245227641da1723b4ca2d775582cb3a08a518ff4df9
 
 do_build() {
-	res/build.sh
+	PREFIX=/usr res/build.sh
 }
 
 do_install() {
-	export DESTDIR
-	res/install.sh
+	PREFIX=/usr DESTDIR=$DESTDIR res/install.sh
 }
 
 void-docs-browse_package() {
-	depends="${sourcepkg}>=${version}_${revision} skim mdcat"
+	depends="${sourcepkg}>=${version}_${revision} pick lowdown"
 	short_desc+=" - browsing utilities"
 	build_style=meta
 }

From 5efa0979486854a53e82776c7772c1b92fef34cc Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 10 May 2021 04:09:07 +0200
Subject: [PATCH 327/447] gnome-control-center: drop alsa-plugins-pulseaudio
 dependency

---
 srcpkgs/gnome-control-center/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index a20f50cf9361..06e002cce6fc 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
 version=40.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcheese=$(vopt_if cheese true false)"
@@ -16,9 +16,8 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
  libsoup-devel $(vopt_if cheese cheese-devel)"
-depends="alsa-plugins-pulseaudio desktop-file-utils upower colord cups-pk-helper
- gsettings-desktop-schemas hicolor-icon-theme iso-codes sound-theme-freedesktop
- cracklib"
+depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
+ gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
 short_desc="GNOME control center"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 8a96d8b571466a6884df0878ec04875872a33784 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 10 May 2021 04:12:32 +0200
Subject: [PATCH 328/447] gnome-session: drop alsa-plugins-pulseaudio
 dependency

---
 srcpkgs/gnome-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 61dc64010ba6..5b69454eb4ae 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
 version=40.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
 hostmakedepends="glib-devel intltool pkg-config xmlto"
 makedepends="elogind-devel gnome-desktop-devel gtk+3-devel json-glib-devel
  libglib-devel libICE-devel libSM-devel libXtst-devel startup-notification-devel
  upower-devel xtrans"
-depends="alsa-plugins-pulseaudio dconf desktop-file-utils bash
+depends="dconf desktop-file-utils bash
  gsettings-desktop-schemas hicolor-icon-theme polkit"
 short_desc="GNOME session management utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 38f8a3f7452b434c28580805d121b433d70e1670 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 10 May 2021 04:19:44 +0200
Subject: [PATCH 329/447] gnome-sound-recorder: depend on gst-plugins-good1,
 not pulseaudio

---
 srcpkgs/gnome-sound-recorder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 24431907839c..2887819e5a8b 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
 version=40.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="gjs-devel libglib-devel gtk+3-devel gst-plugins-bad1-devel
  libhandy1-devel"
 depends="desktop-file-utils gjs gsettings-desktop-schemas gst-plugins-bad1
- libhandy1 pulseaudio"
+ gst-plugins-good1 libhandy1"
 short_desc="GNOME sound recorder application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From d0fe63b408619e5b4e38607f25cd6edc8fc6572e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 10 May 2021 08:05:30 +0200
Subject: [PATCH 330/447] pinebookpro-kernel: update to 5.10.35.

---
 srcpkgs/pinebookpro-kernel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index dd338fd233a9..5908c8021ce4 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -1,6 +1,6 @@
 # Template file for 'pinebookpro-kernel'
 pkgname=pinebookpro-kernel
-version=5.10.23
+version=5.10.35
 revision=1
 archs="aarch64*"
 wrksrc="linux-${version}"
@@ -9,7 +9,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 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=f6e21c03ec6ff85b26d77c59fdab81e64707792a57593643307df192749edb6a
+checksum=ac37a19d45b77a87e58e3aae8b127a6e7eb85ed7467fc8e58474b387bfd498fd
 patch_args="-Np1"
 python_version=3
 

From 6e1426b6db605e426f52ab216381990a969c4451 Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Fri, 25 Dec 2020 22:35:08 +0100
Subject: [PATCH 331/447] New package: nx-libs-3.5.99.26

---
 common/shlibs                                 |  3 +
 .../patches/fix-musl-headers-x86.patch        | 11 ++++
 srcpkgs/nx-libs/patches/xf86bigfont.patch     | 10 +++
 srcpkgs/nx-libs/template                      | 62 +++++++++++++++++++
 4 files changed, 86 insertions(+)
 create mode 100644 srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch
 create mode 100644 srcpkgs/nx-libs/patches/xf86bigfont.patch
 create mode 100644 srcpkgs/nx-libs/template

diff --git a/common/shlibs b/common/shlibs
index 2afcbb9a6dea..0d4bdcffac05 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3987,3 +3987,6 @@ libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
 libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
 libbasu.so.0 basu-0.2.0_1
+libXcomp.so.3 nx-libs-3.5.99.24_1
+libXcompshad.so.3 nx-libs-3.5.99.24_1
+libNX_X11.so.6 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch b/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch
new file mode 100644
index 000000000000..3f51b8e4b1a1
--- /dev/null
+++ b/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch
@@ -0,0 +1,11 @@
+--- ./nx-X11/extras/Mesa/src/mesa/main/glheader.h.orig
++++ ./nx-X11/extras/Mesa/src/mesa/main/glheader.h
+@@ -62,7 +62,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#if defined(__linux__) && defined(__i386__)
++#if defined(__GLIBC__) && defined(__i386__)
+ #include <fpu_control.h>
+ #endif
+ #endif
diff --git a/srcpkgs/nx-libs/patches/xf86bigfont.patch b/srcpkgs/nx-libs/patches/xf86bigfont.patch
new file mode 100644
index 000000000000..b5f29e493372
--- /dev/null
+++ b/srcpkgs/nx-libs/patches/xf86bigfont.patch
@@ -0,0 +1,10 @@
+--- nx-X11/programs/Xserver/Xext/xf86bigfont.c	2021-02-04 14:34:56.000000000 +0100
++++ -	2021-05-10 08:55:11.108944904 +0200
+@@ -45,7 +45,6 @@
+ /* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
+    Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
+    PAGE_SIZE. It is defined in <asm/page.h>. */
+-#include <asm/page.h>
+ #include <limits.h>
+ #endif
+ #ifdef SVR4
diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template
new file mode 100644
index 000000000000..e0b01308bc97
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,62 @@
+# Template file for 'nx-libs'
+pkgname=nx-libs
+version=3.5.99.26
+revision=1
+build_style=gnu-configure
+make_build_args="CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES"
+make_install_args="PREFIX=/usr"
+hostmakedepends="autoconf automake libtool pkg-config which imake xkbcomp gccmakedep"
+makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel
+ libXext-devel libXdamage-devel libXrandr-devel libXtst-devel pixman-devel
+ libXfont2-devel libxml2-devel libXcomposite-devel libXinerama-devel
+ libtirpc-devel libXpm-devel font-util xkbcomp"
+short_desc="NX X11 protocol compression libraries"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/ArcticaProject/nx-libs"
+distfiles="https://github.com/ArcticaProject/nx-libs/archive/$version/$pkgname-$version.tar.gz"
+checksum=3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357
+python_version=3
+nocross="imake attempts to run target executables on host"
+
+post_patch() {
+	# Replace hard-coded /usr/local ProjectRoot
+	vsed -e '/ProjectRoot/s,/usr/local,/usr,' -i nx-X11/config/cf/site.def
+	# Manually run autoreconf in pre_configure, disable in Makefile
+	vsed -e 's/autoreconf/echo &-disabled/' -i Makefile
+}
+
+pre_configure() {
+	# Create configure scripts for all subprojects
+	local _subdir
+	for _subdir in nxcomp nx-X11/lib nxcompshad nxproxy nxdialog; do
+		( cd ${_subdir} && autoreconf -vfsi )
+	done
+}
+
+do_configure() {
+	# Configure all subprojects in advance of build
+	local _subdir
+	for _subdir in nxcomp nxcompshad nxproxy nxdialog; do
+		( cd ${_subdir} && ./configure ${configure_args} )
+	done
+
+	# nx-X11 configure has an extra argument
+	( cd nx-X11/lib && ./configure ${configure_args} --disable-poll )
+}
+
+post_install() {
+	# Remove conflicting GL headers
+	rm -rf ${DESTDIR}/usr/include/GL
+}
+
+nx-libs-devel_install() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 02a273c56441d0a654af602ad0d3fc78b395c52d Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Fri, 25 Dec 2020 22:35:54 +0100
Subject: [PATCH 332/447] New package: x2goclient-4.1.2.2

---
 srcpkgs/x2goclient/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/x2goclient/template

diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
new file mode 100644
index 000000000000..76dbc1e2f258
--- /dev/null
+++ b/srcpkgs/x2goclient/template
@@ -0,0 +1,20 @@
+# Template file for 'x2goclient'
+pkgname=x2goclient
+version=4.1.2.2
+revision=1
+build_style=gnu-makefile
+build_helper=qmake
+make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
+make_build_target="build_client build_man"
+make_install_args="$make_build_args"
+make_install_target="install_client install_man"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="qt5-svg-devel qt5-x11extras-devel libldap-devel
+ libssh-devel libXpm-devel cups-devel"
+depends="nx-libs"
+short_desc="Graphical Qt5 client for X2Go"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.x2go.org"
+distfiles="http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=c9953267c40fa67119ad96a73bacb1f266196da2059f0cdcd1b8d5199421d12a

From c1132692691a34af850b66b95b882e227ccaae4a Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Mon, 28 Dec 2020 23:15:17 +0100
Subject: [PATCH 333/447] New package: x2goserver-4.1.0.3

---
 srcpkgs/x2goserver/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/x2goserver/template

diff --git a/srcpkgs/x2goserver/template b/srcpkgs/x2goserver/template
new file mode 100644
index 000000000000..158130a96717
--- /dev/null
+++ b/srcpkgs/x2goserver/template
@@ -0,0 +1,28 @@
+# Template file for 'x2goserver'
+pkgname=x2goserver
+version=4.1.0.3
+revision=1
+build_style=gnu-makefile
+hostmakedepends="pkg-config perl"
+makedepends="libssh2-devel"
+depends="perl perl-Config-Simple perl-DBI perl-Capture-Tiny perl-DBD-SQLite bash iproute2 makepasswd openssh lsof xauth perl-File-BaseDir nx-libs perl-File-Which"
+short_desc="Open source graphical Remote Desktop based on NX technology"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.x2go.org"
+distfiles="http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0
+system_groups="x2gouser"
+system_accounts="x2gouser"
+x2gouser_homedir="/var/lib/x2go"
+x2gouser_shell="/bin/false"
+
+post_extract() {
+	# Replace hard-coded /usr/sbin
+	for _file in x2goserver-printing/Makefile x2goserver/Makefile x2goserver-xsession/Makefile libx2go-server-db-perl/Makefile x2goserver-common/Makefile; do
+		vsed -e 's,/sbin,/bin,g' -i "$_file"
+	done
+	for _file in bin/x2golistdesktops bin/x2goresume-session bin/x2gostartagent sbin/x2gocleansessions; do
+		vsed -e 's,/usr/sbin,/usr/bin,g' -i x2goserver/"$_file"
+	done
+}

From 83b830fd594d83ac2012d640a35d84b4d6a755a3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 10 May 2021 12:25:02 +0200
Subject: [PATCH 334/447] gnuchess: update to 6.2.8.

---
 srcpkgs/gnuchess/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnuchess/template b/srcpkgs/gnuchess/template
index 9a279566ad5b..55c123c51101 100644
--- a/srcpkgs/gnuchess/template
+++ b/srcpkgs/gnuchess/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuchess'
 pkgname=gnuchess
-version=6.2.7
-revision=2
+version=6.2.8
+revision=1
 build_style=gnu-configure
 makedepends="readline-devel"
 short_desc="GNU Chess"
@@ -9,6 +9,6 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/chess/chess.html"
 distfiles="${GNU_SITE}/chess/${pkgname}-${version}.tar.gz"
-checksum=e536675a61abe82e61b919f6b786755441d9fcd4c21e1c82fb9e5340dd229846
+checksum=d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847
 
 LDFLAGS="-Wl,-z,stack-size=2097152"

From b1b16eb395e7460e1e7f52ccc05860bfcd4a0226 Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Mon, 21 Dec 2020 16:08:39 +0100
Subject: [PATCH 335/447] New package: tiny-0.8.0

---
 srcpkgs/tiny/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/tiny/template

diff --git a/srcpkgs/tiny/template b/srcpkgs/tiny/template
new file mode 100644
index 000000000000..d46b594b09bd
--- /dev/null
+++ b/srcpkgs/tiny/template
@@ -0,0 +1,19 @@
+# Template file for 'tiny'
+pkgname=tiny
+version=0.8.0
+revision=1
+build_wrksrc="tiny"
+build_style=cargo
+configure_args="--no-default-features --features=desktop-notifications --features=tls-native"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel dbus-devel"
+short_desc="Tiny terminal IRC client"
+maintainer="eoli3n <jonathan.kirszling@runbox.com>"
+license="MIT"
+homepage="https://github.com/osa1/tiny"
+distfiles="https://github.com/osa1/tiny/archive/v${version}.tar.gz"
+checksum=acaf0b7c3515bdfd0c80b4a7274aec44d283025c6e40508e450525167f73e447
+
+post_install() {
+	vlicense ../LICENSE
+}

From 9f04d77ce60d2d7d313ead4dcfa79ec684cb7603 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sun, 9 May 2021 14:16:15 +1100
Subject: [PATCH 336/447] fontmanager: update to 0.8.6.

---
 srcpkgs/fontmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fontmanager/template b/srcpkgs/fontmanager/template
index 0e0b67dd0abe..4c08bfd3b1cd 100644
--- a/srcpkgs/fontmanager/template
+++ b/srcpkgs/fontmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'fontmanager'
 pkgname=fontmanager
-version=0.8.3
+version=0.8.6
 revision=1
 wrksrc="font-manager-${version}"
 build_helper=gir
@@ -12,5 +12,5 @@ short_desc="Simple font management for GTK+ desktop environments"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
 license="GPL-3.0-or-later"
 homepage="https://fontmanager.github.io/"
-distfiles="https://github.com/FontManager/master/archive/${version}.tar.gz"
-checksum=a530c2ccd68251bb17be0c99cd260750ef8e5905f231205b7b068f5a606e436e
+distfiles="https://github.com/FontManager/font-manager/archive/${version}.tar.gz"
+checksum=1c5b34b834fbf457c882b8d3180c8e6e5dc101e2444200cf80aa713485f7fc6f

From ee8b0f11312989cc5738eb4caa1983f7d870ce0b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 10 May 2021 15:16:02 +0200
Subject: [PATCH 337/447] ffmpeg: remove duplicate gnutls-devel

---
 srcpkgs/ffmpeg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 76c9423d02fe..e6667478fe13 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -14,7 +14,7 @@ checksum=46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
  libXext-devel libXvMC-devel libxcb-devel faad2-devel lame-devel libtheora-devel
- gnutls-devel libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
+ libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
  libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
  speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
  libbs2b-devel libvidstab-devel $(vopt_if pulseaudio pulseaudio-devel)

From 484682560d010ed63331e4654942697c0c8400c9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 10 May 2021 11:32:45 -0500
Subject: [PATCH 338/447] manuskript: ship .desktop

---
 srcpkgs/manuskript/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/manuskript/template b/srcpkgs/manuskript/template
index a390bebbb4d9..29fd1de41353 100644
--- a/srcpkgs/manuskript/template
+++ b/srcpkgs/manuskript/template
@@ -1,7 +1,7 @@
 # Template file for 'manuskript'
 pkgname=manuskript
 version=0.12.0
-revision=1
+revision=2
 pycompile_dirs="usr/share/${pkgname}"
 hostmakedepends="python3-setuptools"
 depends="python3-enchant python3-lxml python3-Markdown python3-PyQt5 qt5-svg"
@@ -21,4 +21,6 @@ do_install() {
 
 	vmkdir usr/bin
 	ln -sf /usr/share/manuskript/bin/manuskript ${DESTDIR}/usr/bin/manuskript
+
+	vinstall package/create_deb/manuskript.desktop 0644 usr/share/applications
 }

From 2f9d2759794174571b436b27a4f3ce49d0dc1b8d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 6 May 2021 07:58:38 -0500
Subject: [PATCH 339/447] gnustep-base: update to 1.28.0

---
 common/shlibs                 | 2 +-
 srcpkgs/gnustep-base/template | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0d4bdcffac05..4468f0ae3b6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3098,7 +3098,7 @@ libffms2.so.4 libffms2-2.23.1_1
 libddcutil.so.4 ddcutil-1.0.1_1
 liblsmash.so.2 liblsmash-2.9.1_1
 libgiac.so.0 libgiac-1.4.9r17_1
-libgnustep-base.so.1.27 gnustep-base-1.27.0_1
+libgnustep-base.so.1.28 gnustep-base-1.28.0_1
 libtermbox.so.1 termbox-1.1.0_1
 libmysofa.so.1 libmysofa-1.2_1
 libzinnia.so.0 libzinnia-0.06_1
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 1c7069d55eb9..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
-version=1.27.0
-revision=2
+version=1.28.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
@@ -11,7 +11,8 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://www.gnustep.org/"
 distfiles="http://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"
-checksum=8803fa1fdf23f90264a81ad2d9fbe97ba66d6e313e396a28fd7c10d2caceb283
+checksum=c7d7c6e64ac5f5d0a4d5c4369170fc24ed503209e91935eb0e2979d1601039ed
+make_check=extended
 
 nocross="objc doesn't get cross build at present within gcc"
 case "$XBPS_TARGET_MACHINE" in

From 3a8cbd96edd72aafa77cc02bfa2ae0b2aef08a20 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 6 May 2021 07:59:14 -0500
Subject: [PATCH 340/447] gnustep-gui: update to 0.29.0

---
 common/shlibs                | 2 +-
 srcpkgs/gnustep-gui/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4468f0ae3b6a..b12756eb9130 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3641,7 +3641,7 @@ libflite_usenglish.so.1 flite-2.1_1
 libflite_cmulex.so.1 flite-2.1_1
 libgtk-4.so.1 gtk4-4.0.0_1
 libmodule.so.5 libmodule-5.0.0_1
-libgnustep-gui.so.0.28 gnustep-gui-0.28.0_1
+libgnustep-gui.so.0.29 gnustep-gui-0.29.0_1
 libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index aac67d1556c5..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
-version=0.28.0
-revision=3
+version=0.29.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://www.gnustep.org/"
 distfiles="http://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz"
-checksum=1f6d2de60417e8a674280de84077f94f7394ae4edb3fae9e04129743d7449317
+checksum=7bf12b29b12a2886003d3b251e8076ad284f41780c7322531676fcd54e1d6df5
 replaces="gnustep-gui-data>=0"
 
 nocross="objc doesn't get cross build at present within gcc"

From 08accf896672f5bcdf2169d3494d041df5dc5700 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 6 May 2021 07:59:21 -0500
Subject: [PATCH 341/447] gnustep-back: update to 0.29.0.

---
 srcpkgs/gnustep-back/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnustep-back/template b/srcpkgs/gnustep-back/template
index 57a90be9beb1..cacd0eea8e3c 100644
--- a/srcpkgs/gnustep-back/template
+++ b/srcpkgs/gnustep-back/template
@@ -1,6 +1,6 @@
 # Template file for 'gnustep-back'
 pkgname=gnustep-back
-version=0.28.0
+version=0.29.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config"
@@ -11,6 +11,6 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnustep.org/"
 distfiles="http://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"
-checksum=59e647f77c60d7edb2f0fe194ec4dfed7addc504a97a8ac5ad27a8c7ff11cdfa
+checksum=18dd4e9200abef16570b331e8725d2ecf808fa86d125a927cc9776e8b88a9892
 
 nocross="objc doesn't get cross build at present within gcc"

From 71a506d78656537311ff7bba14eff8254f4debea Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 6 May 2021 07:53:49 -0500
Subject: [PATCH 342/447] PikoPixel.app: revbump for gnustep-base

---
 srcpkgs/PikoPixel.app/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PikoPixel.app/template b/srcpkgs/PikoPixel.app/template
index 755801587377..42fe3f2f61ed 100644
--- a/srcpkgs/PikoPixel.app/template
+++ b/srcpkgs/PikoPixel.app/template
@@ -1,7 +1,7 @@
 # Template file for 'PikoPixel.app'
 pkgname=PikoPixel.app
 version=1.0.b10
-revision=1
+revision=2
 wrksrc="PikoPixel.Sources.${version%.*}-${version##*.}"
 build_wrksrc=PikoPixel
 build_style=gnu-makefile

From ec38e28ab1906aba0ccb2fd2b528c9f60c4b4b39 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 6 May 2021 07:53:49 -0500
Subject: [PATCH 343/447] Terminal: revbump for gnustep-base

---
 srcpkgs/Terminal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Terminal/template b/srcpkgs/Terminal/template
index c52cbeb59d2a..9cd7970fcc2e 100644
--- a/srcpkgs/Terminal/template
+++ b/srcpkgs/Terminal/template
@@ -1,7 +1,7 @@
 # Template file for 'Terminal'
 pkgname=Terminal
 version=0.9.9
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="OBJCFLAGS=-fcommon messages=yes"

From 226fb1d90a43d092cad663b74026b317b2b91ee1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 6 May 2021 07:53:50 -0500
Subject: [PATCH 344/447] gorm: revbump for gnustep-base

---
 srcpkgs/gorm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gorm/template b/srcpkgs/gorm/template
index b6836a77b0aa..c994a7709f79 100644
--- a/srcpkgs/gorm/template
+++ b/srcpkgs/gorm/template
@@ -1,7 +1,7 @@
 # Template file for 'gorm'
 pkgname=gorm
 version=1.2.26
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="gnustep-make"

From 1d71bd094bd5d506de63bca9791d03c8f8f41245 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 6 May 2021 07:53:50 -0500
Subject: [PATCH 345/447] unar: revbump for gnustep-base

---
 srcpkgs/unar/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index cb2f79241aca..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=5
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
@@ -15,6 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://theunarchiver.com/command-line"
 distfiles="https://github.com/MacPaw/unar/archive/v${version}.tar.gz"
 checksum=6ab8f01f7db8bc88e6e8e08a1d79fb7ef8e9fb1d940c748d0a329a2d6d331016
+make_check=no # Doesn't have any tests.
 nocross="objc doesn't get cross build at present within gcc (as seen in gnustep)"
 
 post_extract() {

From b5b742cc5a73925109130a92598282a2cc410656 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 10 May 2021 19:51:29 +0300
Subject: [PATCH 346/447] element-desktop: update to 1.7.27

---
 srcpkgs/element-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 556b6504aadb..f26d36407259 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.7.26
+version=1.7.27
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="ae3c96f04dbdfc0f69d14399bfcb0a7f4b3dec2b5db62c09da02c427c57d79c2
- 3a81a2ed8126f4cb286de312f10c84b11f9663658e126ffb1ae2d92b8d3c3a60"
+checksum="7842dc08a2b5884ddbf97462dde35cf34171c920b681a6815904f4c9badf1860
+ b1267eba6db477a116139feaddd42d8d468a85c30a893c14b915d44b2c99b83b"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From b300d997edc66271cbee78eaeee3db449204e6bf Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voiceops.com>
Date: Mon, 10 May 2021 11:31:10 -0700
Subject: [PATCH 347/447] python3-docker: update to 4.4.4

---
 srcpkgs/python3-docker/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-docker/template b/srcpkgs/python3-docker/template
index 4d4094a2b6ee..ef6c581745b0 100644
--- a/srcpkgs/python3-docker/template
+++ b/srcpkgs/python3-docker/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-docker'
 pkgname=python3-docker
-version=4.3.1
-revision=3
+version=4.4.4
+revision=1
 wrksrc="docker-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Sergi Alvarez <pancake@nopcode.org>"
 license="Apache-2.0"
 homepage="https://github.com/docker/docker-py"
 distfiles="${PYPI_SITE}/d/docker/docker-${version}.tar.gz"
-checksum=bad94b8dd001a8a4af19ce4becc17f41b09f228173ffe6a4e0355389eef142f2
+checksum=d3393c878f575d3a9ca3b94471a3c89a6d960b35feb92f033c0de36cc9d934db

From b83476f956f72146ea50518536dd701ab8ce1adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 10 May 2021 21:46:39 +0200
Subject: [PATCH 348/447] diffoscope: update to 174.

---
 srcpkgs/diffoscope/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index e84df9738c97..50ff82aea432 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=172
+version=174
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -9,11 +9,11 @@ hostmakedepends="python3-setuptools"
 depends="python3-magic python3-libarchive-c python3-setuptools
  python3-argcomplete binwalk python3-defusedxml python3-distro
  python3-jsondiff python3-PyPDF2 python3-pyxattr python3-tlsh"
-checkdepends="${depends} python3-pytest"
+checkdepends="${depends} python3-pytest xxd"
 short_desc="In-depth comparison of files, archives, and directories"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=5ffe7f38555c6409bc7e7edc277ed77dd78641fe1306fc38d153dbbe445ddea4
+checksum=9ad686855df2e71f9436c8f1e653282bbe74017c578bbd68c5dc19e0de12ba3c

From abfbb7232a1e50355ea785e76f1651b5236e1158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 10 May 2021 21:46:40 +0200
Subject: [PATCH 349/447] python3-alembic: update to 1.6.2.

---
 srcpkgs/python3-alembic/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-alembic/template b/srcpkgs/python3-alembic/template
index a02b8919ee55..4f7e7e743f78 100644
--- a/srcpkgs/python3-alembic/template
+++ b/srcpkgs/python3-alembic/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-alembic'
 pkgname=python3-alembic
-version=1.5.8
+version=1.6.2
 revision=1
 wrksrc="alembic-${version}"
 build_style=python3-module
@@ -10,8 +10,9 @@ short_desc="Database migration tool for SQLAlchemy"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://github.com/sqlalchemy/alembic"
+changelog="https://raw.githubusercontent.com/sqlalchemy/alembic/master/docs/build/changelog.rst"
 distfiles="${PYPI_SITE}/a/alembic/alembic-${version}.tar.gz"
-checksum=e27fd67732c97a1c370c33169ef4578cf96436fa0e7dcfaeeef4a917d0737d56
+checksum=fb9a39a7c68e55490be962fb5f70463d384d340e6563d6e3911447778e3b4576
 
 do_check() {
 	: tests require deprecated pytest behavior that throws errors

From 2fd33ce0c1b744caad6e6fdcca960d470d8459db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 10 May 2021 21:46:40 +0200
Subject: [PATCH 350/447] python3-pytest: update to 6.2.4.

---
 srcpkgs/python3-pytest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template
index 64e730d99d15..56ac4b4493af 100644
--- a/srcpkgs/python3-pytest/template
+++ b/srcpkgs/python3-pytest/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytest'
 pkgname=python3-pytest
-version=6.2.3
+version=6.2.4
 revision=1
 wrksrc="pytest-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://docs.pytest.org/en/latest/"
 changelog="https://docs.pytest.org/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz"
-checksum=671238a46e4df0f3498d1c3270e5deb9b32d25134c99b7d75370a68cfbe9b634
+checksum=50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b
 alternatives="
  pytest:pytest:/usr/bin/pytest3
  pytest:py.test:/usr/bin/py.test3"

From f52aeb982ae8d10c0e3f073f143bdc2278455b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 10 May 2021 21:46:41 +0200
Subject: [PATCH 351/447] tox: update to 3.23.1.

---
 srcpkgs/tox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index b4d6380c5e67..00857475bc69 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.23.0
+version=3.23.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=05a4dbd5e4d3d8269b72b55600f0b0303e2eb47ad5c6fe76d3576f4c58d93661
+checksum=307a81ddb82bd463971a273f33e9533a24ed22185f27db8ce3386bff27d324e3
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script

From 3387aeb4d6d386bccfae1ef08f03fff341607f94 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 10 May 2021 20:51:51 +0200
Subject: [PATCH 352/447] libglvnd: work around crashing on musl systems and
 multithreaded gl

firstly, disable ppc64 tsb assembly since it appears to be broken
in multithread contexts; secondly, when not using asm, compile the
dispatch code with low optimization level as doing otherwise seems
to result in crashes in multithreaded contexts

we'll need to fix this properly at some point, for now do this

the assembly code is seemingly buggy and causes strange crashes
when used with threaded code, so fall back to pure C paths
---
 .../libglvnd/patches/musl-noasm-use-o0.patch  | 52 +++++++++++++++++++
 srcpkgs/libglvnd/template                     |  5 +-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libglvnd/patches/musl-noasm-use-o0.patch

diff --git a/srcpkgs/libglvnd/patches/musl-noasm-use-o0.patch b/srcpkgs/libglvnd/patches/musl-noasm-use-o0.patch
new file mode 100644
index 000000000000..0ecf492e1c56
--- /dev/null
+++ b/srcpkgs/libglvnd/patches/musl-noasm-use-o0.patch
@@ -0,0 +1,52 @@
+From d82adbb78a246d68d67a951cdfc81b757fac2453 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Mon, 10 May 2021 23:02:21 +0200
+Subject: [PATCH] lower optimization for dispatch code when using C + tsb
+
+there appears to be some bug in the code which causes crashes
+with threaded opengl setups; this manifests at least on ppc64(le)
+with musl (where one must set `-Dtls=enabled`). I haven't been
+able to track it down yet, but this workaround at least makes it
+stop happening.
+---
+ src/GLdispatch/vnd-glapi/meson.build | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git src/GLdispatch/vnd-glapi/meson.build src/GLdispatch/vnd-glapi/meson.build
+index 615cdff..94310b3 100644
+--- src/GLdispatch/vnd-glapi/meson.build
++++ src/GLdispatch/vnd-glapi/meson.build
+@@ -35,8 +35,12 @@ else
+ endif
+ 
+ _entry_files = []
++_extra_cflags = []
+ if gl_dispatch_type == 'pure_c'
+   _entry_files += 'entry_pure_c.c'
++  if not have_tls
++    _extra_cflags += '-O0'
++  endif
+ else
+   _entry_files += 'entry_common.c'
+   if gl_dispatch_type != 'armv7_tsd'
+@@ -73,7 +77,7 @@ libglapi = static_library(
+     glapi_mapi_tmp_h,
+     _entry_files,
+   ],
+-  c_args : ['-DMAPI_ABI_HEADER="@0@"'.format(glapi_mapi_tmp_h.full_path())],
++  c_args : ['-DMAPI_ABI_HEADER="@0@"'.format(glapi_mapi_tmp_h.full_path())] + _extra_cflags,
+   include_directories : inc_include,
+   dependencies : idep_utils_misc,
+   gnu_symbol_visibility : 'hidden',
+@@ -89,7 +93,7 @@ foreach g : ['gl', 'opengl', 'glesv1', 'glesv2']
+     c_args : [
+       '-DSTATIC_DISPATCH_ONLY',
+       '-DMAPI_ABI_HEADER="@0@"'.format(header.full_path()),
+-    ],
++    ] + _extra_cflags,
+     include_directories : [inc_include, inc_util],
+     gnu_symbol_visibility : 'hidden',
+   )
+-- 
+2.31.1
+
diff --git a/srcpkgs/libglvnd/template b/srcpkgs/libglvnd/template
index 77b80b0abcff..3d974e70b9a9 100644
--- a/srcpkgs/libglvnd/template
+++ b/srcpkgs/libglvnd/template
@@ -1,7 +1,7 @@
 # Template file for 'libglvnd'
 pkgname=libglvnd
 version=1.3.2
-revision=1
+revision=2
 wrksrc="libglvnd-v${version}"
 build_style=meson
 hostmakedepends="pkg-config"
@@ -21,7 +21,10 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args="-Dtls=disabled"
 fi
 
+# ppc64_tsd (used when ppc64_tls is not available)
+# is broken with threads, so disable it on musl
 case "$XBPS_TARGET_MACHINE" in
+	ppc*-musl) configure_args+=" -Dasm=disabled";;
 	ppc64*) ;;
 	arm*|mips*|ppc*) configure_args+=" -Dasm=disabled";;
 esac

From 272a831355132b7ff7a477a4727e313783af0fa9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 10 May 2021 20:09:33 +0200
Subject: [PATCH 353/447] webkit2gtk: update to 2.32.1

---
 .../webkit2gtk/patches/bwrap-libdir32.patch   | 22 -----
 .../webkit2gtk/patches/fix-eglmesaext_h.patch | 10 ---
 srcpkgs/webkit2gtk/patches/musl-fixes.patch   | 80 -------------------
 .../webkit2gtk/patches/musl-stack-fix.patch   | 74 -----------------
 .../webkit2gtk/patches/musl-wordsize.patch    | 59 --------------
 srcpkgs/webkit2gtk/template                   | 21 ++---
 6 files changed, 6 insertions(+), 260 deletions(-)
 delete mode 100644 srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/musl-fixes.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/musl-stack-fix.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/musl-wordsize.patch

diff --git a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
deleted file mode 100644
index 7b399660fab8..000000000000
--- a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=221709
-
-diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-index 69b4dc6a6a0b..dc660f399257 100644
---- Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-+++ Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-@@ -759,9 +759,15 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
-         "--ro-bind-try", "/usr/lib", "/usr/lib",
-         "--ro-bind-try", "/usr/local/lib", "/usr/local/lib",
-         "--ro-bind-try", LIBDIR, LIBDIR,
-+#if CPU(ADDRESS64)
-         "--ro-bind-try", "/lib64", "/lib64",
-         "--ro-bind-try", "/usr/lib64", "/usr/lib64",
-         "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
-+#else
-+        "--ro-bind-try", "/lib32", "/lib32",
-+        "--ro-bind-try", "/usr/lib32", "/usr/lib32",
-+        "--ro-bind-try", "/usr/local/lib32", "/usr/local/lib32",
-+#endif
- 
-         "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
-     };
diff --git a/srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch b/srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch
deleted file mode 100644
index 7ab9e26d2088..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2019-09-23 10:17:18.000000000 +0200
-+++ Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2019-12-16 11:30:00.971252320 +0100
-@@ -32,6 +32,7 @@
- #include "WebKitWaylandServerProtocol.h"
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <WebCore/GLContext.h>
- #include <WebCore/PlatformDisplayWayland.h>
- #include <WebCore/Region.h>
diff --git a/srcpkgs/webkit2gtk/patches/musl-fixes.patch b/srcpkgs/webkit2gtk/patches/musl-fixes.patch
deleted file mode 100644
index b87497c99b36..000000000000
--- a/srcpkgs/webkit2gtk/patches/musl-fixes.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Upstream: yes
-
---- Source/JavaScriptCore/runtime/MachineContext.h
-+++ Source/JavaScriptCore/runtime/MachineContext.h
-@@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
- 
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX)
- 
- #if CPU(X86)
-     return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
-@@ -347,7 +347,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
- 
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX)
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -498,7 +498,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
- 
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX)
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -656,7 +656,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
- 
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX)
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -773,7 +773,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
- 
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX)
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
---- Source/WebCore/xml/XPathGrammar.cpp
-+++ Source/WebCore/xml/XPathGrammar.cpp
-@@ -966,7 +966,7 @@ int yydebug;
- #if YYERROR_VERBOSE
- 
- # ifndef yystrlen
--#  if defined __GLIBC__ && defined _STRING_H
-+#  if defined __linux__ && defined _STRING_H
- #   define yystrlen strlen
- #  else
- /* Return the length of YYSTR.  */
-@@ -989,7 +989,7 @@ yystrlen (yystr)
- # endif
- 
- # ifndef yystpcpy
--#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+#  if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
- #   define yystpcpy stpcpy
- #  else
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
---- Source/WTF/wtf/PlatformHave.h
-+++ Source/WTF/wtf/PlatformHave.h
-@@ -206,7 +206,7 @@
- #define HAVE_HOSTED_CORE_ANIMATION 1
- #endif
- 
--#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
-+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
- #define HAVE_MACHINE_CONTEXT 1
- #endif
- 
diff --git a/srcpkgs/webkit2gtk/patches/musl-stack-fix.patch b/srcpkgs/webkit2gtk/patches/musl-stack-fix.patch
deleted file mode 100644
index 0ca82cb50d86..000000000000
--- a/srcpkgs/webkit2gtk/patches/musl-stack-fix.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=225099
-
-From ab7e2bfae280b151ac173d6fc9d8eaa3da2e92a8 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Tue, 27 Apr 2021 22:51:22 +0200
-Subject: [PATCH] fix stack size issues on musl
-
----
- Source/WTF/wtf/StackBounds.cpp | 26 +++++++++++++++++++++++++-
- Source/WTF/wtf/Threading.cpp   |  4 ++++
- 2 files changed, 29 insertions(+), 1 deletion(-)
-
-diff --git Source/WTF/wtf/StackBounds.cpp Source/WTF/wtf/StackBounds.cpp
-index e6f7095..58bdb18 100644
---- Source/WTF/wtf/StackBounds.cpp
-+++ Source/WTF/wtf/StackBounds.cpp
-@@ -36,6 +36,12 @@
- #include <pthread_np.h>
- #endif
- 
-+#if OS(LINUX)
-+#include <sys/resource.h>
-+#include <sys/syscall.h>
-+#include <unistd.h>
-+#endif
-+
- #endif
- 
- namespace WTF {
-@@ -107,7 +113,25 @@ StackBounds StackBounds::newThreadStackBounds(PlatformThreadHandle thread)
- 
- StackBounds StackBounds::currentThreadStackBoundsInternal()
- {
--    return newThreadStackBounds(pthread_self());
-+    auto ret = newThreadStackBounds(pthread_self());
-+#if OS(LINUX)
-+    // on glibc, pthread_attr_getstack will generally return the limit size (minus a guard page)
-+    // for the main thread; this is however not necessarily always true on every libc - for example
-+    // on musl, it will return the currently reserved size - since the stack bounds are expected to
-+    // be constant (and they are for every thread except main, which is allowed to grow), check
-+    // resource limits and use that as the boundary instead (and prevent stack overflows in JSC)
-+    if (getpid() == static_cast<pid_t>(syscall(SYS_gettid))) {
-+        void* origin = ret.origin();
-+        rlimit limit;
-+        getrlimit(RLIMIT_STACK, &limit);
-+        rlim_t size = limit.rlim_cur;
-+        // account for a guard page
-+        size -= static_cast<rlim_t>(sysconf(_SC_PAGESIZE));
-+        void* bound = static_cast<char*>(origin) - size;
-+        return StackBounds { origin, bound };
-+    }
-+#endif
-+    return ret;
- }
- 
- #elif OS(WINDOWS)
-diff --git Source/WTF/wtf/Threading.cpp Source/WTF/wtf/Threading.cpp
-index 99d09c0..362bf35 100644
---- Source/WTF/wtf/Threading.cpp
-+++ Source/WTF/wtf/Threading.cpp
-@@ -58,6 +58,10 @@ static Optional<size_t> stackSize(ThreadType threadType)
- 
- #if defined(DEFAULT_THREAD_STACK_SIZE_IN_KB) && DEFAULT_THREAD_STACK_SIZE_IN_KB > 0
-     return DEFAULT_THREAD_STACK_SIZE_IN_KB * 1024;
-+#elif OS(LINUX) && !defined(__BIONIC__) && !defined(__GLIBC__)
-+    // on libc's other than glibc and bionic (e.g. musl) we are either unsure how big
-+    // the default thread stack is, or we know it's too small - pick a robust default
-+    return 1 * MB;
- #else
-     // Use the platform's default stack size
-     return WTF::nullopt;
--- 
-2.30.1
-
diff --git a/srcpkgs/webkit2gtk/patches/musl-wordsize.patch b/srcpkgs/webkit2gtk/patches/musl-wordsize.patch
deleted file mode 100644
index 069abd753da6..000000000000
--- a/srcpkgs/webkit2gtk/patches/musl-wordsize.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Upstream: yes
-
-From 1b7144916774dbb4cc4705ba9a4377844e35f47d Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Tue, 27 Apr 2021 22:56:33 +0200
-Subject: [PATCH] remove __WORDSIZE usage
-
----
- Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp | 6 +++---
- Source/WebCore/rendering/RenderLayerBacking.h               | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp
-index cfe3698..e5bc870 100644
---- Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp
-+++ Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp
-@@ -39,7 +39,7 @@ namespace CryptoAlgorithmAES_GCMInternal {
- static const char* const ALG128 = "A128GCM";
- static const char* const ALG192 = "A192GCM";
- static const char* const ALG256 = "A256GCM";
--#if __WORDSIZE >= 64
-+#if CPU(ADDRESS64)
- static const uint64_t PlainTextMaxLength = 549755813632ULL; // 2^39 - 256
- #endif
- static const uint8_t DefaultTagLength = 128;
-@@ -77,7 +77,7 @@ void CryptoAlgorithmAES_GCM::encrypt(const CryptoAlgorithmParameters& parameters
- 
-     auto& aesParameters = downcast<CryptoAlgorithmAesGcmParams>(parameters);
- 
--#if __WORDSIZE >= 64
-+#if CPU(ADDRESS64)
-     if (plainText.size() > PlainTextMaxLength) {
-         exceptionCallback(OperationError);
-         return;
-@@ -120,7 +120,7 @@ void CryptoAlgorithmAES_GCM::decrypt(const CryptoAlgorithmParameters& parameters
-         return;
-     }
- 
--#if __WORDSIZE >= 64
-+#if CPU(ADDRESS64)
-     if (aesParameters.ivVector().size() > UINT64_MAX) {
-         exceptionCallback(OperationError);
-         return;
-diff --git Source/WebCore/rendering/RenderLayerBacking.h Source/WebCore/rendering/RenderLayerBacking.h
-index 9960724..193c5d1 100644
---- Source/WebCore/rendering/RenderLayerBacking.h
-+++ Source/WebCore/rendering/RenderLayerBacking.h
-@@ -43,7 +43,7 @@ class TiledBacking;
- class TransformationMatrix;
- 
- 
--#if __WORDSIZE == 64 && PLATFORM(COCOA)
-+#if CPU(ADDRESS64) && PLATFORM(COCOA)
- #define USE_OWNING_LAYER_BEAR_TRAP 1
- #define BEAR_TRAP_VALUE 0xEEEEEEEEEEEEEEEE
- #else
--- 
-2.30.1
-
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 270d2a4f5f31..a8d2b2426a40 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,16 +1,15 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.32.0
-revision=3
+version=2.32.1
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
 configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
- -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc
- -DRUBY_VERSION=2.7
+ -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc -DCMAKE_SKIP_RPATH=ON
  -DUSE_SYSTEMD=OFF -DUSE_WOFF2=ON
- -DENABLE_GTKDOC=OFF -DUSE_GSTREAMER_GL=OFF -DUSE_WPE_RENDERER=ON
+ -DENABLE_GTKDOC=OFF -DUSE_WPE_RENDERER=ON
  -DENABLE_MINIBROWSER=$(vopt_if minibrowser ON OFF)
  -DENABLE_JIT=$(vopt_if jit ON OFF)
  -DENABLE_C_LOOP=$(vopt_if jit OFF ON)
@@ -37,7 +36,8 @@ maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0
+checksum=136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917
+make_check=no
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser"
 build_options_default="gir wayland x11 bubblewrap minibrowser"
@@ -65,10 +65,6 @@ post_patch() {
 		Source/cmake/tools/scripts/version-stamp.pl
 }
 
-do_check() {
-	:
-}
-
 # detection + runtime
 if [ "$build_option_bubblewrap" ]; then
 	hostmakedepends+=" bubblewrap xdg-dbus-proxy"
@@ -76,11 +72,6 @@ if [ "$build_option_bubblewrap" ]; then
 	depends+=" bubblewrap xdg-dbus-proxy"
 fi
 
-# https://bugs.webkit.org/show_bug.cgi?id=197192
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) configure_args+=" -DWTF_CPU_ARM64_CORTEXA53=OFF";;
-esac
-
 # only a few platform support JIT
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*|x86_64*)

From 0ff83ed174d8980337071829eabbed668fe910c5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 10 May 2021 16:15:21 -0500
Subject: [PATCH 354/447] gorm: update to 1.2.28.

---
 srcpkgs/gorm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gorm/template b/srcpkgs/gorm/template
index c994a7709f79..6cb613fd317b 100644
--- a/srcpkgs/gorm/template
+++ b/srcpkgs/gorm/template
@@ -1,7 +1,7 @@
 # Template file for 'gorm'
 pkgname=gorm
-version=1.2.26
-revision=2
+version=1.2.28
+revision=1
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="gnustep-make"
@@ -11,4 +11,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnustep.org/experience/Gorm.html"
 distfiles="http://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"
-checksum=dc4a91901de73eb5fe8b6eb2bdc6d07f2193779725c1ec6018c95ff469466e18
+checksum=8a4f377f57637e415b2fdd93e0945e3652f9c25f53205aa0cad0198ed1537c37

From 1efcc4181b6945d29cce7adfc93f3bca8a832e2f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 10 May 2021 16:20:35 -0500
Subject: [PATCH 355/447] nfdump: update to 1.6.23.

---
 srcpkgs/nfdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nfdump/template b/srcpkgs/nfdump/template
index b2d73d25fed5..1bdf3de252f2 100644
--- a/srcpkgs/nfdump/template
+++ b/srcpkgs/nfdump/template
@@ -1,6 +1,6 @@
 # Template file for 'nfdump'
 pkgname=nfdump
-version=1.6.22
+version=1.6.23
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake flex libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/phaag/nfdump"
 distfiles="https://github.com/phaag/nfdump/archive/v${version}.tar.gz"
-checksum=437536acb02258f8e2cd1e63c801428c65e1c33100e349acbf718c5b04734bd0
+checksum=8c5a7959e66bb90fcbd8ad508933a14ebde4ccf7f4ae638d8f18c9473c63af33
 configure_args+="--enable-sflow --enable-readpcap --enable-nfcapd"
 
 pre_configure() {

From 3116735971096d0b963246cac08eae4e64a564fe Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Mon, 10 May 2021 18:45:23 +0200
Subject: [PATCH 356/447] spice: update to 0.15.0

---
 srcpkgs/spice/template | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 2d771932ea74..7f67e27c1ac9 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,7 +1,7 @@
 # Template file for 'spice'
 pkgname=spice
-version=0.14.3
-revision=4
+version=0.15.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
@@ -10,17 +10,26 @@ makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
  openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
+checkdepends="glib-networking"
 short_desc="Implements the SPICE protocol"
 maintainer="Anachron <gith@cron.world>"
 license="LGPL-2.1-or-later"
 homepage="http://www.spice-space.org"
-distfiles="http://www.spice-space.org/download/releases/spice-${version}.tar.bz2"
-checksum=551d4be4a07667cf0543f3c895beb6da8a93ef5a9829f2ae47817be5e616a114
+distfiles="https://www.spice-space.org/download/releases/spice-server/spice-${version}.tar.bz2"
+checksum=b320cf8f4bd2852750acb703c15b72856027e5a8554f8217dfbb3cc09deba0f5
 
 if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
 	broken="SPICE server only works on little endian architectures"
 fi
 
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# tests depend on odd behaviour of glibc
+	# in this case being that calling getnameinfo on an AF_LOCAL socket
+	# will return successfully, with either hostname or "localhost"
+	# musl errors out instead, thus failing the tests
+	make_check=no
+fi
+
 post_extract() {
 	sed -i 's/armv6hl/arm/g' configure	# "detects" cpu from triplet.
 }

From cd60f45e250e2ed183936248b9c3705a33ff4024 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 10 May 2021 16:24:51 -0500
Subject: [PATCH 357/447] libxlsxwriter: update to 1.0.4.

---
 srcpkgs/libxlsxwriter/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 9aba68731ef3..26fea5ff3787 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.3
+version=1.0.4
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=ff373664af1fc3821f934a05275d668f3f0e20663fddebeaa89fcb9a9d52b80d
+checksum=d1c8179ecebd3f216aa4bb4fab8618dea0ac74fe8bd7272e67abf51c12becebb
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
@@ -29,5 +29,6 @@ libxlsxwriter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "/usr/lib/*.so"
+		vmove usr/lib/pkgconfig
 	}
 }

From 9dd1cb0d3839f124a34b3f43098451dd05d9022a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 02:48:38 -0300
Subject: [PATCH 358/447] ucpp: fix description, xlint.

Was going to just fix a typo, ended up rephrasing and fixing xlints,
including wrong license field.
---
 srcpkgs/ucpp/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ucpp/template b/srcpkgs/ucpp/template
index 247c933ffac5..7511fbc16780 100644
--- a/srcpkgs/ucpp/template
+++ b/srcpkgs/ucpp/template
@@ -1,19 +1,19 @@
 # Template file for 'ucpp'
 pkgname=ucpp
 version=1.3.2
-revision=1
+revision=2
 wrksrc=${pkgname}
 build_style=gnu-makefile
-nopie=yes
-short_desc="Embeddable, quck, light C preprocessor compliant to C99"
+short_desc="Embeddable, quick and light C99 compliant C preprocessor"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://code.google.com/archive/p/ucpp/"
 distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ucpp/ucpp-${version}.tar.bz2"
 checksum=ab7ecc5ba2c2617fa14cd0a939c1e87ed789c59767fb39fc9b7d0ebf63a81635
+nopie=yes
 
 pre_build() {
-	sed -i Makefile \
+	vsed -i Makefile \
 		-e "s;^CC = .*;CC = ${CC};" \
 		-e "s;^FLAGS = .*;FLAGS = ${CFLAGS};" \
 		-e "s;^#LDFLAGS = -pg;LDFLAGS = ${LDFLAGS};"

From c338a56454904eb7eb2382fbb3ee44855f6ebbbb 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: Tue, 11 May 2021 18:43:45 +0700
Subject: [PATCH 359/447] Thunar: update to 4.16.8.

---
 srcpkgs/Thunar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index a3b6c1de8a80..e2bed9a18d4d 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,7 +1,7 @@
 # Template file for 'Thunar'
 pkgname=Thunar
 reverts="4.17.0_1"
-version=4.16.6
+version=4.16.8
 revision=1
 wrksrc=thunar-${version}
 build_style=gnu-configure
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
 changelog="https://raw.githubusercontent.com/xfce-mirror/thunar/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=cb531d3fe67196a43ca04979ef271ece7858bbc80c15b0ee4323c1252a1a02b7
+checksum=038ca228d220cd0ba1b7b76465d8a51f2433ad1f74648d1d291daa0a24cb3195
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

From 928644c123bb3822e87f2cfef11a42ec8dc4c31a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 11 May 2021 07:41:34 -0500
Subject: [PATCH 360/447] gnustep-make: update to 2.9.0.

---
 srcpkgs/gnustep-make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnustep-make/template b/srcpkgs/gnustep-make/template
index a98983e3c371..e77d199252d0 100644
--- a/srcpkgs/gnustep-make/template
+++ b/srcpkgs/gnustep-make/template
@@ -1,6 +1,6 @@
 # Template file for 'gnustep-make'
 pkgname=gnustep-make
-version=2.8.0
+version=2.9.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/GNUstep/GNUstep.conf"
@@ -10,7 +10,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnustep.org"
 distfiles="http://ftp.gnustep.org/pub/gnustep/core/${pkgname}-${version}.tar.gz"
-checksum=9fce2942dd945c103df37d668dd5fff650b23351b25a650428f6f59133f5ca5d
+checksum=a0b066c11257879c7c85311dea69c67f6dc741ef339db6514f85b64992c40d2a
 
 post_install() {
 	sed -i 's,/builddir/.xbps-gnustep-make/wrappers,/usr/bin,g' ${DESTDIR}/usr/share/GNUstep/Makefiles/config.make

From 513ee2ed6a9f94659e610a2c2c692ac67d3840fc Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 11 May 2021 07:50:53 -0500
Subject: [PATCH 361/447] python3-oletools: update to 0.56.2.

---
 srcpkgs/python3-oletools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template
index a8eede0d38cb..f253c60a4737 100644
--- a/srcpkgs/python3-oletools/template
+++ b/srcpkgs/python3-oletools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-oletools'
 pkgname=python3-oletools
-version=0.56.1
+version=0.56.2
 revision=1
 wrksrc="oletools-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/decalage2/oletools"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=827cc577e253d946d5616e0a18062ed6aa837368fc19912c06e7d4c7ed502f77
+checksum=d6f1c43d00d79bc17e8d2be3eb579170acbaf0d8cbf6b4524447d96c2b8be957
 
 post_install() {
 	vlicense oletools/LICENSE.txt

From 7f410c7e55ead77f70ef39cc1c23c19d22e3e3f3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 11 May 2021 15:49:26 +0200
Subject: [PATCH 362/447] linux5.10: update to 5.10.36.

---
 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 4ec10cb07818..b45826fd3523 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.35
+version=5.10.36
 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=ac37a19d45b77a87e58e3aae8b127a6e7eb85ed7467fc8e58474b387bfd498fd
+checksum=899ce7f728007321288e632f0c2f8db9c8c2d625cef0e5a331d4c213fce1b268
 python_version=3
 patch_args="-Np1"
 

From f06ce5f25654f3082cefa8930038269b79870e62 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 00:49:58 -0700
Subject: [PATCH 363/447] qt5-doc: fix license, http->https, other lint

---
 srcpkgs/qt5-doc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt5-doc/template b/srcpkgs/qt5-doc/template
index a5aadd333396..9676aa4dad00 100644
--- a/srcpkgs/qt5-doc/template
+++ b/srcpkgs/qt5-doc/template
@@ -1,15 +1,15 @@
 # Template file for 'qt5-doc'
 pkgname=qt5-doc
 version=5.15.2
-revision=1
+revision=2
 wrksrc="qt-everywhere-src-${version}"
 hostmakedepends="clang perl pkg-config qt5-devel qt5-plugin-sqlite qt5-tools which"
 makedepends="qt5-tools-devel"
 depends="qt5-plugin-sqlite qt5>=5.6.0"
-homepage="http://qt.io/"
-short_desc="A cross-platform application and UI framework (QT5) - Documentation"
+short_desc="Cross-platform application and UI framework (QT5) - Documentation"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3, LGPL-2.1"
+license="GFDL-1.3-only"
+homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
 checksum=3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240
 

From 9ae227bb2efe98a27fe66d7e110cc713d7a5fa1a Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Tue, 11 May 2021 08:52:03 +0200
Subject: [PATCH 364/447] python3-pikepdf: update to 2.12.0.

---
 srcpkgs/python3-pikepdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 2db7128c706c..c05d3605cb56 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.11.4
-revision=2
+version=2.12.0
+revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
 hostmakedepends="python3-pybind11 python3-setuptools_scm python3-toml python3-wheel"
@@ -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=7352ccda2eba78aab4d0e780de0ea4f7f84df0e6a5889ccc9b33d2aa6df3a54d
+checksum=fcbb6e37426564ccaf6bb301616700277d426225895b00a64283a95ff648f3b9
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From dbae54465915a4ad8a091bcb61bb26883079583b Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Tue, 11 May 2021 08:36:29 +0200
Subject: [PATCH 365/447] img2pdf: update to 0.4.1.

---
 srcpkgs/img2pdf/patches/disableicc.patch      |  11 -
 .../patches/endianess-endianness.patch        | 245 ------------------
 .../patches/fix_color_profile_path.patch      |  50 ++--
 srcpkgs/img2pdf/patches/imdepth.patch         |  22 --
 srcpkgs/img2pdf/template                      |   5 +-
 5 files changed, 20 insertions(+), 313 deletions(-)
 delete mode 100644 srcpkgs/img2pdf/patches/disableicc.patch
 delete mode 100644 srcpkgs/img2pdf/patches/endianess-endianness.patch
 delete mode 100644 srcpkgs/img2pdf/patches/imdepth.patch

diff --git a/srcpkgs/img2pdf/patches/disableicc.patch b/srcpkgs/img2pdf/patches/disableicc.patch
deleted file mode 100644
index 1c60cf9ad6bf..000000000000
--- a/srcpkgs/img2pdf/patches/disableicc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/img2pdf_test.py
-+++ b/src/img2pdf_test.py
-@@ -5320,7 +5320,7 @@ def test_png_palette8(tmp_path_factory,
- )
- def test_png_icc(tmp_path_factory, png_icc_img, png_icc_pdf):
-     tmpdir = tmp_path_factory.mktemp("png_icc")
--    compare_ghostscript(tmpdir, png_icc_img, png_icc_pdf, icc=True)
-+    # compare_ghostscript(tmpdir, png_icc_img, png_icc_pdf, icc=True)
-     # compare_poppler(tmpdir, png_icc_img, png_icc_pdf)
-     # compare_mupdf(tmpdir, png_icc_img, png_icc_pdf)
-     # compare_pdfimages_png(tmpdir, png_icc_img, png_icc_pdf)
diff --git a/srcpkgs/img2pdf/patches/endianess-endianness.patch b/srcpkgs/img2pdf/patches/endianess-endianness.patch
deleted file mode 100644
index f04a6b920969..000000000000
--- a/srcpkgs/img2pdf/patches/endianess-endianness.patch
+++ /dev/null
@@ -1,245 +0,0 @@
---- a/src/img2pdf_test.py
-+++ b/src/img2pdf_test.py
-@@ -863,7 +863,7 @@ def jpg_img(tmp_path_factory, tmp_normal
-     assert "resolution" not in identify[0]["image"]
-     assert identify[0]["image"].get("units") == "Undefined", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") == "Undefined", str(identify)
-+    assert identify[0]["image"].get("endianness") == "Undefined", str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-     assert identify[0]["image"].get("pageGeometry") == {
-@@ -2219,7 +2219,7 @@ def tiff_float_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2275,7 +2275,7 @@ def tiff_cmyk8_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "CMYK", str(identify)
-     assert identify[0]["image"].get("type") == "ColorSeparation", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2335,7 +2335,7 @@ def tiff_cmyk16_img(tmp_path_factory, tm
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "CMYK", str(identify)
-     assert identify[0]["image"].get("type") == "ColorSeparation", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 16, str(identify)
-@@ -2385,7 +2385,7 @@ def tiff_rgb8_img(tmp_path_factory, tmp_
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2436,7 +2436,7 @@ def tiff_rgb12_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 12, str(identify)
-@@ -2487,7 +2487,7 @@ def tiff_rgb14_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 14, str(identify)
-@@ -2538,7 +2538,7 @@ def tiff_rgb16_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 16, str(identify)
-@@ -2589,7 +2589,7 @@ def tiff_rgba8_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColorAlpha", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2640,7 +2640,7 @@ def tiff_rgba16_img(tmp_path_factory, tm
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColorAlpha", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 16, str(identify)
-@@ -2689,7 +2689,7 @@ def tiff_gray1_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 1, str(identify)
-@@ -2739,7 +2739,7 @@ def tiff_gray2_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Grayscale", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 2, str(identify)
-@@ -2789,7 +2789,7 @@ def tiff_gray4_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Grayscale", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 4, str(identify)
-@@ -2839,7 +2839,7 @@ def tiff_gray8_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Grayscale", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2889,7 +2889,7 @@ def tiff_gray16_img(tmp_path_factory, tm
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Grayscale", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 16, str(identify)
-@@ -2943,7 +2943,7 @@ def tiff_multipage_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2986,7 +2986,7 @@ def tiff_multipage_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -3036,7 +3036,7 @@ def tiff_palette1_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "Palette", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -3087,7 +3087,7 @@ def tiff_palette2_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "Palette", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -3138,7 +3138,7 @@ def tiff_palette4_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "Palette", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -3189,7 +3189,7 @@ def tiff_palette8_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "Palette", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -3253,7 +3253,7 @@ def tiff_ccitt_lsb_m2l_white_img(tmp_pat
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 1, str(identify)
-@@ -3334,7 +3334,7 @@ def tiff_ccitt_msb_m2l_white_img(tmp_pat
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in [
-+    assert identify[0]["image"].get("endianness") in [
-         "Undefined",
-         "MSB",
-     ]  # FIXME: should be MSB
-@@ -3416,7 +3416,7 @@ def tiff_ccitt_msb_l2m_white_img(tmp_pat
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in [
-+    assert identify[0]["image"].get("endianness") in [
-         "Undefined",
-         "MSB",
-     ]  # FIXME: should be MSB
-@@ -3503,7 +3503,7 @@ def tiff_ccitt_lsb_m2l_black_img(tmp_pat
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 1, str(identify)
-@@ -3593,7 +3593,7 @@ def tiff_ccitt_nometa1_img(tmp_path_fact
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 1, str(identify)
-@@ -3677,7 +3677,7 @@ def tiff_ccitt_nometa2_img(tmp_path_fact
-     }, str(identify)
-     assert identify[0]["image"].get("units") == "PixelsPerInch", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
diff --git a/srcpkgs/img2pdf/patches/fix_color_profile_path.patch b/srcpkgs/img2pdf/patches/fix_color_profile_path.patch
index 84e69f13fb02..3fae35d81610 100644
--- a/srcpkgs/img2pdf/patches/fix_color_profile_path.patch
+++ b/srcpkgs/img2pdf/patches/fix_color_profile_path.patch
@@ -1,49 +1,35 @@
---- a/src/img2pdf.py
-+++ b/src/img2pdf.py
-@@ -3308,10 +3308,10 @@ RGB.""",
+--- src/img2pdf.py
++++ src/img2pdf.py
+@@ -3439,10 +3439,10 @@ RGB.""",
      outargs.add_argument(
          "--pdfa",
          nargs="?",
 -        const="/usr/share/color/icc/sRGB.icc",
 +        const="/usr/share/color/icc/colord/sRGB.icc",
          default=None,
-         help="Output a PDF/A-1b complient document. By default, this will "
+         help="Output a PDF/A-1b compliant document. By default, this will "
 -        "embed /usr/share/color/icc/sRGB.icc as the color profile.",
 +        "embed /usr/share/color/icc/colord/sRGB.icc as the color profile.",
      )
  
      sizeargs = parser.add_argument_group(
---- a/src/img2pdf_test.py
-+++ b/src/img2pdf_test.py
-@@ -312,7 +312,7 @@ def compare_ghostscript(tmpdir, img, pdf, gsdevice="png16m", exact=True, icc=Fal
-                     "AE",
+--- src/img2pdf_test.py
++++ src/img2pdf_test.py
+@@ -304,7 +304,7 @@ def compare(im1, im2, exact, icc, cmyk):
+     else:
+         iccargs = []
+         if icc:
+-            iccargs = ["-profile", "/usr/share/color/icc/sRGB.icc"]
++            iccargs = ["-profile", "/usr/share/color/icc/colord/sRGB.icc"]
+         psnr = subprocess.run(
+             ["compare"]
+             + iccargs
+@@ -424,7 +424,7 @@ def compare_pdfimages_png(tmpdir, img, pdf, exact=True, icc=False):
+                     "PSNR",
                      "(",
                      "-profile",
 -                    "/usr/share/color/icc/ghostscript/srgb.icc",
-+                    "/usr/share/color/icc/colord/sRGS.icc",
++                    "/usr/share/color/icc/colord/sRGB.icc",
                      "-depth",
                      "8",
                      str(img),
-@@ -667,11 +667,11 @@ def tmp_icc_png(tmp_path_factory, alpha):
-         str(tmp_icc_png),
-         8,
-         2,
--        iccp="/usr/share/color/icc/sRGB.icc",
-+        iccp="/usr/share/color/icc/colord/sRGB.icc",
-     )
-     assert (
-         hashlib.md5(tmp_icc_png.read_bytes()).hexdigest()
--        == "d09865464626a87b4e7f398e1f914cca"
-+        == "b20cad5586ef280995bbf9afd30d2257"
-     )
-     yield tmp_icc_png
-     tmp_icc_png.unlink()
-@@ -4272,7 +4272,7 @@ def png_icc_pdf(tmp_path_factory, tmp_icc_png, request):
-         assert p.pages[0].Resources.XObject.Im0.ColorSpace[1].Alternate == "/DeviceRGB"
-         assert (
-             p.pages[0].Resources.XObject.Im0.ColorSpace[1].read_bytes()
--            == pathlib.Path("/usr/share/color/icc/sRGB.icc").read_bytes()
-+            == pathlib.Path("/usr/share/color/icc/colord/sRGB.icc").read_bytes()
-         )
-         assert p.pages[0].Resources.XObject.Im0.DecodeParms.BitsPerComponent == 8
-         assert p.pages[0].Resources.XObject.Im0.DecodeParms.Colors == 3
diff --git a/srcpkgs/img2pdf/patches/imdepth.patch b/srcpkgs/img2pdf/patches/imdepth.patch
deleted file mode 100644
index 489d34c8c582..000000000000
--- a/srcpkgs/img2pdf/patches/imdepth.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/img2pdf_test.py
-+++ b/src/img2pdf_test.py
-@@ -2439,7 +2439,8 @@ def tiff_rgb12_img(tmp_path_factory, tmp
-     assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
--    assert identify[0]["image"].get("depth") == 12, str(identify)
-+    assert identify[0]["image"].get("depth") == 16, str(identify)
-+    assert identify[0]["image"].get("baseDepth") == 12, str(identify)
-     assert identify[0]["image"].get("pageGeometry") == {
-         "width": 60,
-         "height": 60,
-@@ -2490,7 +2491,8 @@ def tiff_rgb14_img(tmp_path_factory, tmp
-     assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
--    assert identify[0]["image"].get("depth") == 14, str(identify)
-+    assert identify[0]["image"].get("depth") == 16, str(identify)
-+    assert identify[0]["image"].get("baseDepth") == 14, str(identify)
-     assert identify[0]["image"].get("pageGeometry") == {
-         "width": 60,
-         "height": 60,
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index cd2307f39f20..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'img2pdf'
 pkgname=img2pdf
-version=0.4.0
+version=0.4.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
@@ -11,5 +11,4 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
-checksum=eaee690ab8403dd1a9cb4db10afee41dd3e6c7ed63bdace02a0121f9feadb0c9
-patch_args="-Np1"
+checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552

From 51fd2b0f51c31f49a85b03dc9cf55b058d1779f0 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Tue, 11 May 2021 20:37:28 +0700
Subject: [PATCH 366/447] vivaldi: update to 3.8.2259.42

---
 srcpkgs/vivaldi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index d13e4c17eb1c..640809e2fd74 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=3.8.2259.40
+version=3.8.2259.42
 revision=1
 _release=1
 archs="i686 x86_64"
@@ -18,10 +18,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=c42f9a2ed9d723cb6a80bca1a0b66a31bbaa31c7052303d154ef8bc4626d6399
+	checksum=cd6648b4a6b45069e7bc4955cc0464abca6bd9c5c70f7a63f3a162e9e002f80c
 else
 	_debarch=i386
-	checksum=9e8f796ef7aeb0ffe4850e8d7917d505b1c9e50810a2a197afcc87b45c8a9004
+	checksum=68557d8723c3db7acea990524b4c3da895a2a1c150e547fc3bcb2c1590511675
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"

From 462024e1b8ba1e31132a1127a3ece76d068275d5 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 11 May 2021 12:37:55 +0200
Subject: [PATCH 367/447] wire-desktop: update to 3.25.2940.

---
 srcpkgs/wire-desktop/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index bfdda89383b7..e4ba10088bc8 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'wire-desktop'
 pkgname=wire-desktop
-version=3.24.2939
-revision=2
+version=3.25.2940
+revision=1
 wrksrc="${pkgname}-linux-${version}"
 hostmakedepends="nodejs yarn git"
 depends="electron10"
@@ -10,7 +10,7 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wire.com"
 distfiles="https://github.com/wireapp/wire-desktop/archive/linux/${version}.tar.gz"
-checksum=69e70d39286f29b2fb186da30ec828be0a30329c457e829111b863223ed64127
+checksum=d1702bb64692b3970c2b49be4621069e7ea40b367be0917632cec50e123e570c
 
 case "$XBPS_MACHINE" in
 	x86_64*|i686*) ;;
@@ -23,6 +23,7 @@ pre_build() {
 
 do_build() {
 	LINUX_TARGET=dir yarn build:linux
+	npx ts-node -P tsconfig.bin.json ./bin/build-tools/build-linux-desktop-file.ts > wire-desktop.desktop
 }
 
 do_install() {
@@ -38,4 +39,6 @@ EOF
 	vcopy resources/icons/256x256.png usr/share/icons/hicolor/256x256/apps/wire-desktop.png
 	vmkdir usr/share/icons/hicolor/32x32/apps
 	vcopy resources/icons/32x32.png usr/share/icons/hicolor/32x32/apps/wire-desktop.png
+	vmkdir usr/share/applications
+	vcopy wire-desktop.desktop usr/share/applications/wire-desktop.desktop
 }

From 7293a6219da0549318503ade85f01af1dd11d7ec Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Mon, 10 May 2021 10:38:48 -0700
Subject: [PATCH 368/447] runc: update to 1.0.0-rc94

---
 srcpkgs/runc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 55ae081fc641..d6be727f1f90 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,8 +1,8 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.0.0
-revision=15
-_subver="rc93"
+revision=16
+_subver="rc94"
 _ver="$version-$_subver"
 wrksrc="$pkgname-$_ver"
 build_style=go
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/opencontainers/runc"
 distfiles="https://github.com/opencontainers/runc/releases/download/v${_ver}/runc.tar.xz"
-checksum=70ee0fcf45b17f0da93dd4c4d174046a3584080dcc07c5468914d33d57c8202d
+checksum=87daf369dcac7f1895e72bc0ee22ba9e29d4678d6d0dd795f336e35c222a801a
 
 post_build() {
 	make man

From 8b444fd84a525266cb6cdb9a3e2f6cceb2f52083 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 11 May 2021 18:52:48 +0200
Subject: [PATCH 369/447] vlc: update to 3.0.14.

---
 srcpkgs/vlc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 0892f5bd78f3..e2076d5218bc 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.13
+version=3.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
@@ -17,7 +17,7 @@ license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://www.videolan.org/vlc/"
 changelog="https://www.videolan.org/developers/vlc-branch/NEWS"
 distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz"
-checksum=d5b43aa354dbe40f28099995e037bcf78896aa9b60862b17c5b7a19419be1ce5
+checksum=49b93e5b33deaa37060e6b24a98200cad70c407947f14eb2a8b6a0c64d8535a6
 
 lib32disabled=yes
 

From d6a42047b1338ef1dfd94d7b94e602dd25bd1733 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 09:05:40 -0400
Subject: [PATCH 370/447] python3-bokeh: update to 2.3.2.

---
 srcpkgs/python3-bokeh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template
index 92762b7e9f05..3dc06650d664 100644
--- a/srcpkgs/python3-bokeh/template
+++ b/srcpkgs/python3-bokeh/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-bokeh'
 pkgname=python3-bokeh
-version=2.3.1
+version=2.3.2
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="BSD-3-Clause"
 homepage="https://bokeh.org"
 changelog="https://raw.githubusercontent.com/bokeh/bokeh/main/CHANGELOG"
 distfiles="${PYPI_SITE}/b/bokeh/bokeh-${version}.tar.gz"
-checksum=2f2fb8bab8ca8fa039f48b1f0bed56d3a847c75694ece1d206ffab645ff5beec
+checksum=fcc0d0a3129ae457cdb0a4f503843a4d13d1f5d07af7748424ea8c7ddfc321f1
 
 do_check() {
 	echo "Tests have unpackaged dependencies and require fetching data; skipping"

From 263c43854e92d177960b77982fa8402b3cfdcd12 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 09:06:09 -0400
Subject: [PATCH 371/447] python3-breathe: update to 4.30.0.

---
 srcpkgs/python3-breathe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template
index d9685e4a0cda..8dde7a6d3620 100644
--- a/srcpkgs/python3-breathe/template
+++ b/srcpkgs/python3-breathe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-breathe'
 pkgname=python3-breathe
-version=4.29.2
+version=4.30.0
 revision=1
 wrksrc="breathe-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/michaeljones/breathe"
 changelog="https://raw.githubusercontent.com/michaeljones/breathe/master/README.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e71dfb5dd1176b91bb27d26b7c210d8bd0be5e1f31f10e22ab8d38412a74b52e
+checksum=540ca6d694aa2e194ba33265f58e0070465799f6feabb726d198cb039972a5a3
 
 post_install() {
 	vlicense LICENSE

From 6ead0ce6d000602c5940c0826570dd367a9086a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 09:07:41 -0400
Subject: [PATCH 372/447] python3-numpy: update to 1.20.3.

---
 srcpkgs/python3-numpy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index e6887934b974..0e7e4dc0d2a7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.20.2
+version=1.20.3
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=f2431c82e2d0ee1a7dba3abd26b9e80d8d3cfa620e8b37e7d95991ad6c785834
+checksum=6fd345c309cf0e51269dd061c80f6db8bcb68b217e6e3792d11e3473535d7304
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"

From 1a52c23f8dc5e65b915f41f348751b3d42577967 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 09:16:13 -0400
Subject: [PATCH 373/447] python3-acme: update to 1.15.0.

---
 srcpkgs/python3-acme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index ef4b0810aeb6..9bf53dca7ecd 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-acme'
 pkgname=python3-acme
-version=1.14.0
+version=1.15.0
 revision=1
 wrksrc="acme-${version}"
 build_style=python3-module
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/certbot"
 distfiles="${PYPI_SITE}/a/acme/acme-${version}.tar.gz"
-checksum=61daccfb0343628cbbca551a7fc4c82482113952c21db3fe0c585b7c98fa1c35
+checksum=070cc58910e2c36892adf830402a68e28287dc1c09103c7e0eaf1dfa460bee4d

From 4bb4564139832d56caedd452c999a43aa9ad5921 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 09:17:03 -0400
Subject: [PATCH 374/447] certbot: update to 1.15.0.

---
 srcpkgs/certbot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 5390a48b71bb..8dfeadd19267 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.14.0
+version=1.15.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,4 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot/certbot-${version}.tar.gz"
-checksum=959ea90c6bb8dca38eab9772722cb940972ef6afcd5f15deef08b3c3636841eb
+checksum=db7fe523f4cb3ccc69093c224e5e467ddbf94c42b16d32a10dfd35fcbeb69fe1

From c410ed727f46221fab36f82e04629b5c5654f295 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 09:18:01 -0400
Subject: [PATCH 375/447] certbot-apache: update to 1.15.0.

---
 srcpkgs/certbot-apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot-apache/template b/srcpkgs/certbot-apache/template
index b67f362c42e5..2b7cf2e577bd 100644
--- a/srcpkgs/certbot-apache/template
+++ b/srcpkgs/certbot-apache/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot-apache'
 pkgname=certbot-apache
-version=1.14.0
+version=1.15.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Kartik S. <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-apache/certbot-apache-${version}.tar.gz"
-checksum=887fe4a21af2de1e5c2c9428bacba6eb7c1219257bc70f1a1d8447c8a321adb0
+checksum=a705fa30dcc242914b68d905377f56d0f31a54aac95f3663fbc31b5e467aa9a1

From 38532f8a3bcac7afae07a932b70a508c9a5a9b3d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 09:18:39 -0400
Subject: [PATCH 376/447] certbot-nginx: update to 1.15.0.

---
 srcpkgs/certbot-nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot-nginx/template b/srcpkgs/certbot-nginx/template
index 95c3f7dc013b..dcb088b0ca33 100644
--- a/srcpkgs/certbot-nginx/template
+++ b/srcpkgs/certbot-nginx/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot-nginx'
 pkgname=certbot-nginx
-version=1.14.0
+version=1.15.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-nginx/certbot-nginx-${version}.tar.gz"
-checksum=cc2a8a0de56d9bb6b2efbda6c80c647dad8db2bb90675cac03ade94bd5fc8597
+checksum=ff711bac2dc2084db77d1d8b9abf415d8d14625fcd7e25c80b57ce6d78bcf1d2

From 07913fb463fb77a9da71f32c34d03dc600bf54f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 09:18:54 -0400
Subject: [PATCH 377/447] python3-ConfigArgParse: update to 1.4.1.

---
 srcpkgs/python3-ConfigArgParse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ConfigArgParse/template b/srcpkgs/python3-ConfigArgParse/template
index 2132e58fe20a..986ebe5e05d2 100644
--- a/srcpkgs/python3-ConfigArgParse/template
+++ b/srcpkgs/python3-ConfigArgParse/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ConfigArgParse'
 pkgname=python3-ConfigArgParse
-version=1.4
+version=1.4.1
 revision=1
 wrksrc="ConfigArgParse-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/bw2/ConfigArgParse"
 distfiles="${PYPI_SITE}/C/ConfigArgParse/ConfigArgParse-${version}.tar.gz"
-checksum=abef9ff44fb0091f0e3bb2ee7e5b26a02b5b62d45408a5272a9bd461f5b59b4b
+checksum=6df537158f28c5ef2e8a8146781833abbc6cb7fca81b1b55d18808ce3439235e
 
 post_install() {
 	vlicense LICENSE

From 10f8bf1c8451b439db2d17d293ca4fb2dcbf8e9f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:24:58 -0400
Subject: [PATCH 378/447] python3-setuptools: update to 56.2.0.

---
 srcpkgs/python3-setuptools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 9eef05df33e6..9202043d9499 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=56.0.0
+version=56.2.0
 revision=1
 wrksrc="setuptools-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/setuptools"
 changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=08a1c0f99455307c48690f00d5c2ac2c1ccfab04df00454fef854ec145b81302
+checksum=7bb5652625e94e73b9358b7ed8c6431b732e80cf31f4e0972294c64f0e5b849e
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;

From bb2b6deb7f42f4a527c33e26a47b47d6b3e2f7fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:25:31 -0400
Subject: [PATCH 379/447] python3-testpath: update to 0.4.4.

---
 srcpkgs/python3-testpath/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-testpath/template b/srcpkgs/python3-testpath/template
index 49413b26736d..55437453a717 100644
--- a/srcpkgs/python3-testpath/template
+++ b/srcpkgs/python3-testpath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-testpath'
 pkgname=python3-testpath
-version=0.4.2
-revision=4
+version=0.4.4
+revision=1
 wrksrc="testpath-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/testpath"
 distfiles="${PYPI_SITE}/t/testpath/testpath-${version}.tar.gz"
-checksum=b694b3d9288dbd81685c5d2e7140b81365d46c29f5db4bc659de5aa6b98780f8
+checksum=60e0a3261c149755f4399a1fff7d37523179a70fdc3abdf78de9fc2604aeec7e
 
 pre_build() {
 	rm -f testpath/cli-*.exe

From e27c5fc0c9f7a6b53e057b24c828f3400efbce41 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:25:43 -0400
Subject: [PATCH 380/447] python3-typing_extensions: update to 3.10.0.0.

---
 srcpkgs/python3-typing_extensions/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-typing_extensions/template b/srcpkgs/python3-typing_extensions/template
index 86dfe15bc521..48218a100428 100644
--- a/srcpkgs/python3-typing_extensions/template
+++ b/srcpkgs/python3-typing_extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-typing_extensions'
 pkgname=python3-typing_extensions
-version=3.7.4.3
+version=3.10.0.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="Python-2.0"
 homepage="https://github.com/python/typing"
 distfiles="${PYPI_SITE}/t/typing_extensions/typing_extensions-${version}.tar.gz"
-checksum=99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c
+checksum=50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342

From e7f236ef923dc064f86fd3137107d86c2d077139 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:28:37 -0400
Subject: [PATCH 381/447] python-six: update to 1.16.0.

---
 srcpkgs/python-six/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index 807d8fb46fdd..efaccb2e4a29 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -1,7 +1,7 @@
 # Template file for 'python-six'
 pkgname=python-six
-version=1.15.0
-revision=3
+version=1.16.0
+revision=1
 wrksrc="six-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/benjaminp/six"
 changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
 distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259
+checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
 
 post_install() {
 	vlicense LICENSE

From 1f223435b3e734b7e6f6110c54da39e0906e3849 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:36:11 -0400
Subject: [PATCH 382/447] python3-zope.component: update to 5.0.0.

---
 srcpkgs/python3-zope.component/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-zope.component/template b/srcpkgs/python3-zope.component/template
index aee1c9b51ccb..ffb1e1fbf65c 100644
--- a/srcpkgs/python3-zope.component/template
+++ b/srcpkgs/python3-zope.component/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.component'
 pkgname=python3-zope.component
-version=4.6.2
-revision=2
+version=5.0.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,9 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="ZPL-2.1"
 homepage="https://www.zope.org"
 distfiles="${PYPI_SITE}/z/zope.component/zope.component-${version}.tar.gz"
-checksum=91628918218b3e6f6323de2a7b845e09ddc5cae131c034896c051b084bba3c92
+checksum=df541a0501c79123f9ac30c6686a9e45c2690c5c3ae4f2b7f4c6fd1a3aaaf614
+# Tests can't find the package they test
+make_check=no
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From a01222c9919d5fe3f2626ca7c752737848cad031 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:45:31 -0400
Subject: [PATCH 383/447] python-zope.interface: update to 5.4.0.

---
 srcpkgs/python-zope.interface/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
index 96fff8828137..80db3610d040 100644
--- a/srcpkgs/python-zope.interface/template
+++ b/srcpkgs/python-zope.interface/template
@@ -1,6 +1,6 @@
 # Template file for 'python-zope.interface'
 pkgname=python-zope.interface
-version=5.2.0
+version=5.4.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
@@ -13,7 +13,9 @@ license="ZPL-2.1"
 homepage="https://github.com/zopefoundation/zope.interface"
 changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24
+checksum=5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e
+# Tests can't find the package they test
+make_check=no
 
 post_install() {
 	# zope.interface provides the zope namespace

From aed408e5810c5d2490ab742c94219eed5ce21f94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 12:02:40 -0400
Subject: [PATCH 384/447] python3-virtualenv: update to 20.4.6.

---
 srcpkgs/python3-virtualenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 65a094f1d0a1..18c3a95d9b1e 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.4.4
+version=20.4.6
 revision=1
 wrksrc="virtualenv-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://virtualenv.pypa.io/"
 changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=09c61377ef072f43568207dc8e46ddeac6bcdcaf288d49011bda0e7f4d38c4a2
+checksum=72cf267afc04bf9c86ec932329b7e94db6a0331ae9847576daaa7ca3c86b29a4
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
 do_check() {

From 62ffd8fe0ceb2cc6581bafb7776cc13b8116980f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 12:08:01 -0400
Subject: [PATCH 385/447] python3-bleach: update to 3.3.0.

---
 srcpkgs/python3-bleach/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template
index e1951883ea88..a9ddfd5e5bed 100644
--- a/srcpkgs/python3-bleach/template
+++ b/srcpkgs/python3-bleach/template
@@ -1,16 +1,16 @@
 # Template file for 'python3-bleach'
 pkgname=python3-bleach
-version=3.2.1
+version=3.3.0
 revision=1
 wrksrc="bleach-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-webencodings
- python3-packaging"
+depends="python3-six python3-webencodings python3-packaging"
+checkdepends="python3-pytest $depends"
 short_desc="Easy safelist-based HTML-sanitizing tool (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/mozilla/bleach"
 changelog="https://raw.githubusercontent.com/mozilla/bleach/master/CHANGES"
 distfiles="${PYPI_SITE}/b/bleach/bleach-${version}.tar.gz"
-checksum=52b5919b81842b1854196eaae5ca29679a2f2e378905c346d3ca8227c2c66080
+checksum=98b3170739e5e83dd9dc19633f074727ad848cbedb6026708c8ac2d3b697a433

From ac0bf8bd587a5b9e19f4a39d87b26bc7e63e0f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 14:41:02 -0300
Subject: [PATCH 386/447] qemu: restore mremap-efault patch.

This was deleted in b393370212519d8bbba57b50293380124a06bbbb, but was
still necessary. Without it, qemu in user mode has the wrong return
value for mremap, which leads to infinite looping in some
situations (afaik only with musl).  This could be observed with
qemu-user-static when crossbuilding webkit2gtk for armv*-musl, where
strace(1) showed infinite looping:

mremap(0x6525a000, 4096, 8192, 0^C)       = -1 ENOMEM (Out of memory)

The command being used was:

/usr/bin/qemu-arm-static -L /usr/arm-linux-musleabihf -E LD_LIBRARY_PATH=/usr/arm-linux-musleabihf/usr/lib:.libs: /builddir/webkitgtk-2.32.1/build/Source/WebKit/tmp-introspecth0go8pvu/WebKit2-4.0 --introspect-dump=/builddir/webkitgtk-2.32.1/build/Source/WebKit/tmp-introspecth0go8pvu/functions.txt,/builddir/webkitgtk-2.32.1/build/Source/WebKit/tmp-introspecth0go8pvu/dump.xml
---
 srcpkgs/qemu/patches/mmap-mremap-efault.patch | 42 +++++++++++++++++++
 srcpkgs/qemu/template                         |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qemu/patches/mmap-mremap-efault.patch

diff --git a/srcpkgs/qemu/patches/mmap-mremap-efault.patch b/srcpkgs/qemu/patches/mmap-mremap-efault.patch
new file mode 100644
index 000000000000..be58a46df664
--- /dev/null
+++ b/srcpkgs/qemu/patches/mmap-mremap-efault.patch
@@ -0,0 +1,42 @@
+Source: @pullmoll
+Upstream: no
+Reason: errno=EFAULT when the address passed to mremap(2) is not valid
+
+See Rich Felker's comment at https://www.openwall.com/lists/musl/2017/06/21/2 for
+why we need to return errno as described in man mremap(2) from qemu-user-static.
+Also speed up the loop when checking for increasing the mappings size to go
+in steps of TARGET_PAGE_SIZE and OR-in a check for the very last byte of the range.
+diff --git linux-user/mmap.c linux-user/mmap.c
+index 7e3b245..1e8d0f1 100644
+--- linux-user/mmap.c
++++ linux-user/mmap.c
+@@ -738,7 +738,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
+          !guest_range_valid_untagged(new_addr, new_size)) ||
+         ((flags & MREMAP_MAYMOVE) == 0 &&
+          !guest_range_valid_untagged(old_addr, new_size))) {
+-        errno = ENOMEM;
++        errno = EFAULT;
+         return -1;
+     }
+ 
+@@ -775,9 +775,10 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
+             abi_ulong addr;
+             for (addr = old_addr + old_size;
+                  addr < old_addr + new_size;
+-                 addr++) {
++                 addr += TARGET_PAGE_SIZE) {
+                 prot |= page_get_flags(addr);
+             }
++				prot |= page_get_flags(old_addr + new_size - 1);
+         }
+         if (prot == 0) {
+             host_addr = mremap(g2h_untagged(old_addr),
+@@ -796,7 +797,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
+                 }
+             }
+         } else {
+-            errno = ENOMEM;
++            errno = EFAULT;
+             host_addr = MAP_FAILED;
+         }
+     }
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 75f57bac755d..0fadb41f609c 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
 # This package should be updated together with qemu-user-static
 pkgname=qemu
 version=6.0.0
-revision=1
+revision=2
 build_style=configure
 hostmakedepends="gettext pkg-config perl python3 automake libtool flex
  python3-Sphinx texinfo ninja"

From dfbc35e0dbb556a3f474fe1b7bb707fb23357615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 14:45:48 -0300
Subject: [PATCH 387/447] qemu-user-static: restore mremap-efault patch.

Fixed in previous commit, just needs to be rebuilt for it.
---
 srcpkgs/qemu-user-static/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index c6870e38d263..3d8d2ae63ecf 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,7 +2,7 @@
 # This package should be updated together with qemu
 pkgname=qemu-user-static
 version=6.0.0
-revision=1
+revision=2
 wrksrc="qemu-${version}"
 build_style=configure
 hostmakedepends="pkg-config automake python3 ninja"

From 3820a85e4401a76b1af56270458d8b905de669d4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 11 May 2021 21:37:20 +0200
Subject: [PATCH 388/447] chibi-scheme: update to 0.10.

---
 srcpkgs/chibi-scheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chibi-scheme/template b/srcpkgs/chibi-scheme/template
index db5ad6e400a0..c4de4d0315a9 100644
--- a/srcpkgs/chibi-scheme/template
+++ b/srcpkgs/chibi-scheme/template
@@ -1,6 +1,6 @@
 # Template file for 'chibi-scheme'
 pkgname=chibi-scheme
-version=0.9.1
+version=0.10
 revision=1
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="http://synthcode.com/scheme/chibi/"
 distfiles="https://github.com/ashinn/chibi-scheme/archive/${version}.tar.gz"
-checksum=a9ee2afd7671418bc09a4d386448dbfd0662421ea1eb1c5ed3b68c071307854d
+checksum=ae1d2057138b7f438f01bfb1e072799105faeea1de0ab3cc10860adf373993b3
 alternatives="
  scheme:scheme:/usr/bin/chibi-scheme
  scheme:scheme.1:/usr/share/man/man1/chibi-scheme.1

From 8513e79af4e2b88cc820e20798a56346452ec718 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 11 May 2021 22:15:51 +0200
Subject: [PATCH 389/447] erlang: update to 23.3.4.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 1c7b6df1d093..3aef6ff91c5e 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.3.2
+version=23.3.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=02443dd42023d0eb73f73dc05f4d3ded7bc4ab59d348041a37a045ba1581b48b
+checksum=adc937319227774d53f941f25fa31990f5f89a530f6cb5511d5ea609f9f18ebe
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 63dd5414a9de9faa72d90142f660c35e7520e1f0 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 11 May 2021 23:16:47 +0200
Subject: [PATCH 390/447] vscode: update to 1.56.1

---
 srcpkgs/vscode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 8ee840e0d8a7..3a45b7fd5b32 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.56.0
+version=1.56.1
 revision=1
 _electronver=12.0.4
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=ccc1045d10b3b35a4f2fba5c536c902addac22f63c8e1c781ec636edf74358cc
+checksum=f4568de584b3a2a1f8092141d60dfd5c238f80ae51289592610185dc6f9f877b
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From d4f5fe2710dc01e3d77f197a58ca7f1ed9db693a Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 11 May 2021 20:46:32 +0200
Subject: [PATCH 391/447] google-chrome: update to 90.0.4430.212

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index a82ae4df6ad7..2461d0340fc4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=90.0.4430.93
+_chromeVersion=90.0.4430.212
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=86bedf3e385dcc819fa7863b28445c403090fb20b45a8b0f063199ed72662eee
+checksum=274b473c4b4a3bcd0839e777ed466550daceae4352570ca4f342e824506163f8
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From dea7ee6dc51690eecf7eb3d2f8fa8e2af8974a5c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 12:11:29 -0700
Subject: [PATCH 392/447] qxmpp: update to 1.4.0

---
 srcpkgs/qxmpp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qxmpp/template b/srcpkgs/qxmpp/template
index 5283f8ea32ee..345624bccf73 100644
--- a/srcpkgs/qxmpp/template
+++ b/srcpkgs/qxmpp/template
@@ -1,6 +1,6 @@
 # Template file for 'qxmpp'
 pkgname=qxmpp
-version=1.3.2
+version=1.4.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=false"
@@ -8,10 +8,10 @@ hostmakedepends="pkg-config"
 makedepends="qt5-devel opus-devel speex-devel libtheora-devel libvpx-devel"
 short_desc="Cross-platform C++ XMPP client and server library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/qxmpp-project/qxmpp/"
 distfiles="https://github.com/qxmpp-project/qxmpp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=016e23c40c604dd43b15e1888e31d48729d0f80775fb6f7faef1130a52fe0641
+checksum=2148162138eaf4b431a6ee94104f87877b85a589da803dff9433c698b4cf4f19
 
 build_options="opus speex theora vpx"
 build_options_default="opus speex theora vpx"

From bd4fb68ea576adcd0a7427e3c875d92d4a0c7480 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 11:42:25 -0700
Subject: [PATCH 393/447] qwt: update to 6.1.5

---
 srcpkgs/qwt/patches/qt5-5.15.0.patch | 58 ----------------------------
 srcpkgs/qwt/template                 | 12 +++---
 2 files changed, 6 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/qwt/patches/qt5-5.15.0.patch

diff --git a/srcpkgs/qwt/patches/qt5-5.15.0.patch b/srcpkgs/qwt/patches/qt5-5.15.0.patch
deleted file mode 100644
index 20ebd1d39f97..000000000000
--- a/srcpkgs/qwt/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: qt5-5.15.0 requires explicit include for QPainterPath
-
---- src/qwt_painter.h	2019-01-02 17:21:30.232435482 +0100
-+++ src/qwt_painter.h	2020-07-14 16:47:54.577577031 +0200
-@@ -17,6 +17,7 @@
- #include <qpen.h>
- #include <qline.h>
- #include <qpalette.h>
-+#include <qpainterpath.h>
- 
- class QPainter;
- class QBrush;
-@@ -31,7 +32,6 @@
- class QwtInterval;
- 
- class QTextDocument;
--class QPainterPath;
- 
- /*!
-   \brief A collection of QPainter workarounds
---- src/qwt_null_paintdevice.cpp	2019-01-02 17:21:31.296461212 +0100
-+++ src/qwt_null_paintdevice.cpp	2020-07-14 16:49:13.479579545 +0200
-@@ -9,6 +9,7 @@
- 
- #include "qwt_null_paintdevice.h"
- #include <qpaintengine.h>
-+#include <qpainterpath.h>
- #include <qpixmap.h>
- 
- class QwtNullPaintDevice::PrivateData
---- src/qwt_painter_command.h	2019-01-02 17:21:30.320437610 +0100
-+++ src/qwt_painter_command.h	2020-07-14 16:50:38.501582253 +0200
-@@ -12,12 +12,11 @@
- 
- #include "qwt_global.h"
- #include <qpaintengine.h>
-+#include <qpainterpath.h>
- #include <qpixmap.h>
- #include <qimage.h>
- #include <qpolygon.h>
- 
--class QPainterPath;
--
- /*!
-   QwtPainterCommand represents the attributes of a paint operation
-   how it is used between QPainter and QPaintDevice
---- src/qwt_plot_glcanvas.h	2019-01-02 17:21:30.204434804 +0100
-+++ src/qwt_plot_glcanvas.h	2020-07-14 16:52:54.074586572 +0200
-@@ -13,6 +13,7 @@
- #include "qwt_global.h"
- #include <qframe.h>
- #include <qgl.h>
-+#include <qpainterpath.h>
- 
- class QwtPlot;
- 
diff --git a/srcpkgs/qwt/template b/srcpkgs/qwt/template
index 0e96184000ee..f03bbd1af605 100644
--- a/srcpkgs/qwt/template
+++ b/srcpkgs/qwt/template
@@ -1,19 +1,19 @@
 # Template file for 'qwt'
 pkgname=qwt
-version=6.1.4
+version=6.1.5
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-svg-devel"
 short_desc="Qt Widgets for Technical Applications"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
-license="Qwt-License, LGPL-2.1"
-homepage="http://qwt.sourceforge.net/"
+license="LGPL-2.1-only, Qwt-exception-1.0"
+homepage="https://qwt.sourceforge.io/"
 distfiles="https://sourceforge.net/projects/${pkgname}/files/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9
+checksum=4076de63ec2b5e84379ddfebf27c7b29b8dc9074f3db7e2ca61d11a1d8adc041
 
-pre_configure() {
-	sed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \
+post_patch() {
+	vsed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \
 		-e '/^QWT_INSTALL_DOCS/ s|/doc|/share/doc/qwt|' \
 		-e '/^QWT_INSTALL_HEADERS/ s|include|&/qwt|' \
 		-e '/^QWT_INSTALL_PLUGINS/ s|plugins/designer|lib/qt5/&|' \

From d7bf8e06a08bc436316e5416c0eebab0398a53aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 22:47:53 -0300
Subject: [PATCH 394/447] shutils/pkgtarget: speed up build dir cleanup.

We need `chmod -R` to be able to cleanup after Go packages, but it's
unnecessary in most other cases. By only running it when the first `rm
-rf` fails, we optimize for the most common case and get a tiny speedup
for this build step.
---
 common/xbps-src/shutils/pkgtarget.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index 314dc5aeabe2..5944b791a4aa 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -79,7 +79,7 @@ remove_pkg_autodeps() {
 remove_pkg_wrksrc() {
     if [ -d "$wrksrc" ]; then
         msg_normal "$pkgver: cleaning build directory...\n"
-        chmod -R +wX "$wrksrc" # Needed to delete Go Modules
+        rm -rf "$wrksrc" || chmod -R +wX "$wrksrc" # Needed to delete Go Modules
         rm -rf "$wrksrc"
     fi
 }

From 781bce6a01eecc43445992a642873ba1dd329d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 21:34:25 -0300
Subject: [PATCH 395/447] xmlrpc-c: update to 1.51.07.

Add changelog.
---
 srcpkgs/xmlrpc-c/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index 911072087594..d60a1dd1cb92 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
-version=1.51.06
-revision=2
+version=1.51.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"
@@ -11,8 +11,9 @@ short_desc="XML-RPC for C and C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://xmlrpc-c.sourceforge.net/"
+changelog="http://xmlrpc-c.sourceforge.net/change_super_stable.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz"
-checksum=06dcd87d9c88374559369ffbe83b3139cf41418c1a2d03f20e08808085f89fd0
+checksum=84d20ae33f927582f821d61c0b9194aefbf1d7924590a13fa9da5ae1698aded9
 
 pre_configure() {
 	export AR RANLIB

From ce3ee2ba8ca078f88c29b296240a086a7b0cecc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 21:43:39 -0300
Subject: [PATCH 396/447] sudo: ignore rc releases.

---
 srcpkgs/sudo/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sudo/update b/srcpkgs/sudo/update
index 5731a163e9c7..70a5a34722cb 100644
--- a/srcpkgs/sudo/update
+++ b/srcpkgs/sudo/update
@@ -1 +1 @@
-ignore="*b[0-9]"
+ignore="*b[0-9] *rc*"

From 034635f4be7bf2cc84a7434cc30e6127c8f51ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 21:45:44 -0300
Subject: [PATCH 397/447] texinfo: ignore weird tarball.

texinfo37.tar-gz 2020-11-08 14:58  584K was being recognized as a
release. Next release should be 6.8.
---
 srcpkgs/texinfo/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/texinfo/update

diff --git a/srcpkgs/texinfo/update b/srcpkgs/texinfo/update
new file mode 100644
index 000000000000..201efa55e562
--- /dev/null
+++ b/srcpkgs/texinfo/update
@@ -0,0 +1 @@
+ignore="37"

From e86544d771d2e4f34b1f071215d2b4c82bcda134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 21:51:28 -0300
Subject: [PATCH 398/447] droidcam: update to 1.7.3.

---
 srcpkgs/droidcam/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 665811688867..bff563fdb636 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,19 +1,19 @@
 # Template file for 'droidcam'
 pkgname=droidcam
-version=1.7.2
+version=1.7.3
 revision=1
 build_style=gnu-makefile
 make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
 hostmakedepends="pkg-config"
 makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
 depends="v4l2loopback"
 short_desc="Tool for using your android device as a wireless/usb webcam"
 maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.dev47apps.com/"
 distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
-checksum=ea93a56f5e2291ea8546d047bb89c54f4b3ded3786d176a79148a62aaa0765e3
+checksum=e1b885f9790de17bb0b8dce8a81857733a8dba8333c1b3148206244a04a55381
 
 post_patch() {
 	vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -i droidcam.desktop

From b397f9c67eedfbd6ee13003005d7c31fda71493e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 21:51:30 -0300
Subject: [PATCH 399/447] aisleriot: update to 3.22.16.

---
 srcpkgs/aisleriot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 55a716a56217..83ecd9efa35e 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.15
+version=3.22.16
 revision=1
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
@@ -15,5 +15,5 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=d5ace3e8d4a158f1e68cd3f5b5f22764b990647bb66ce4d7c6e787094e8dfe95
+checksum=96891e5fb76a57b2ac68afa09a8bbc9a191d8fe1f494b34a40601d89d2fff50c
 replaces="aisleriot-data>=0"

From 0e193a7bac8c59bd48183b3ac8f280e3fcccf355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 21:53:44 -0300
Subject: [PATCH 400/447] poedit: update to 2.4.3.

---
 srcpkgs/poedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 4616503a9421..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,6 +1,6 @@
 # Template file for 'poedit'
 pkgname=poedit
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.poedit.net/"
 distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz"
-checksum=fed9932a9228b381aa363d8340eb5193d61ffc761f4f328d3cf3cce8f7fbcd4e
+checksum=6601f5ddeeb5aee0a6687af7867e9f88f6989e7050137a42131b6ac16c0efd84
 
 CPPFLAGS="-DUCHAR_TYPE=uint16_t -Wno-deprecated-copy"
 

From d29dc999d6bf04b764c1a98fb7a63063febfd24b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 22:02:13 -0300
Subject: [PATCH 401/447] swappy: update to 1.3.1.

---
 srcpkgs/swappy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swappy/template b/srcpkgs/swappy/template
index db6681a62305..9e5acefa1dfb 100644
--- a/srcpkgs/swappy/template
+++ b/srcpkgs/swappy/template
@@ -1,6 +1,6 @@
 # Template file for 'swappy'
 pkgname=swappy
-version=1.2.1
+version=1.3.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config scdoc glib-devel gettext"
@@ -11,7 +11,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/jtheoof/swappy"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b48ca60e4a2a9c274b1e52b35de800e342f79481aef3f90825d55250e210c040
+checksum=215c48b77eebfc2a4de41ce1a4058b5da1bace8455baba743b9142bb0e96afb1
 
 post_install() {
 	vlicense LICENSE

From 195dfaacdc2f707804c3ceaf1cb51b87802619cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 22:16:27 -0300
Subject: [PATCH 402/447] epiphany: update to 40.1.

And fix changelog.
---
 srcpkgs/epiphany/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index db7e343e5c9b..ffe20734ebd2 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=40.0
+version=40.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -16,6 +16,6 @@ short_desc="Intuitive GNOME web browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-3-38/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d5f81c0f66ad1bb0137686b337541116e71a1336579b8bc0aaeafdd9aaaba844
+checksum=696a426b1702774af8d0f056828f5d9ff9350507aba7f4c7e3e499f07a581ad0

From 5245b5a706cc18fab8df1efc278950d34ce8a47a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 22:17:22 -0300
Subject: [PATCH 403/447] sqlite: update to 3.35.5.

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 52a9f0d3e298..a0b395705db1 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.35.4
+version=3.35.5
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,7 +13,7 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2021/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=7771525dff0185bfe9638ccce23faa0e1451757ddbda5a6c853bb80b923a512d
+checksum=f52b72a5c319c3e516ed7a92e123139a6e87af08a2dc43d7757724f6132e6db0
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \

From bf999b41e62c70f751dadc908d61bc5c6db06b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 22:20:29 -0300
Subject: [PATCH 404/447] perl-Term-ReadLine-Gnu: update to 1.42.

---
 srcpkgs/perl-Term-ReadLine-Gnu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Term-ReadLine-Gnu/template b/srcpkgs/perl-Term-ReadLine-Gnu/template
index 920627efa287..8a8106da1d00 100644
--- a/srcpkgs/perl-Term-ReadLine-Gnu/template
+++ b/srcpkgs/perl-Term-ReadLine-Gnu/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Term-ReadLine-Gnu'
 pkgname=perl-Term-ReadLine-Gnu
-version=1.40
+version=1.42
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -11,7 +11,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Term-ReadLine-Gnu"
 distfiles="${CPAN_SITE}/Term/${pkgname/perl-/}-${version}.tar.gz"
-checksum=d3a6169aeb1f04f9f05853a4f1c3b26dd265f6f00b790024959cb8f395842774
+checksum=3c5f1281da2666777af0f34de0289564e6faa823aea54f3945c74c98e95a5e73
 
 post_extract() {
 	vsed -i '/if.*guess_malloc_names/s/.*/if(my $extra_defs=""){/' Makefile.PL

From 90e343d3a6e721a4e09685d79d9f3d0aa10e43aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 22:22:51 -0300
Subject: [PATCH 405/447] python3-sympy: update to 1.8.

---
 srcpkgs/python3-sympy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sympy/template b/srcpkgs/python3-sympy/template
index a1fadb7c98f1..0375c96501b6 100644
--- a/srcpkgs/python3-sympy/template
+++ b/srcpkgs/python3-sympy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-sympy'
 pkgname=python3-sympy
-version=1.7.1
+version=1.8
 revision=1
 wrksrc="sympy-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://sympy.org/"
 distfiles="${PYPI_SITE}/s/sympy/sympy-${version}.tar.gz"
-checksum=a3de9261e97535b83bb8607b0da2c7d03126650fafea2b2789657b229c246b2e
+checksum=1ca588a9f6ce6a323c5592f9635159c2093572826668a1022c75c75bdf0297cb
 
 post_install() {
 	vman doc/man/isympy.1

From 1098f6dca4aec2043f1fc9968e5dad7eba6f16c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 22:29:43 -0300
Subject: [PATCH 406/447] adwaita-icon-theme: update to 40.1.1.

---
 srcpkgs/adwaita-icon-theme/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 2ce6e203025c..d81dd66c5537 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=40.rc
+version=40.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,5 +9,5 @@ short_desc="Theme consisting of a set of icons for GTK+"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404
+distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
+checksum=0b6c436ed6ad9887a88ada1f72a0197b1eb73b020d8d344abab4c7fa7250f8f6

From afcf986473432c349892434404116d7032f340a8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 7 May 2021 16:52:25 -0700
Subject: [PATCH 407/447] oxygen-gtk+: fix license, other lint

---
 srcpkgs/oxygen-gtk+/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/oxygen-gtk+/template b/srcpkgs/oxygen-gtk+/template
index 3a7e133daf29..4d184eaad762 100644
--- a/srcpkgs/oxygen-gtk+/template
+++ b/srcpkgs/oxygen-gtk+/template
@@ -1,14 +1,14 @@
 # Template file for 'oxygen-gtk+'
 pkgname=oxygen-gtk+
 version=1.4.6
-revision=3
+revision=4
 wrksrc="${pkgname//\+/2}-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel"
-short_desc="A port of the default KDE widget theme (Oxygen) to GTK2"
+short_desc="Port of the default KDE widget theme (Oxygen) to GTK2"
 maintainer="TheNumb <me@thenumb.eu>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/playground/artwork/oxygen-gtk/"
-distfiles="http://download.kde.org/stable/${pkgname//\+/2}/${version}/src/${pkgname//\+/2}-${version}.tar.bz2"
+distfiles="${KDE_SITE}/${pkgname//\+/2}/${version}/src/${pkgname//\+/2}-${version}.tar.bz2"
 checksum=a289434347cc96054c75d1e4e4408b84adc2e8c7862f0be4e2da8fafbf26bf26

From f5006dde2dca05b3ace8155e6c33ceb89787f872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 12 May 2021 00:02:33 -0300
Subject: [PATCH 408/447] elfutils: update to 0.184.

---
 srcpkgs/elfutils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index ee2bb254040a..f1b7eb09d455 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.183
-revision=2
+version=0.184
+revision=1
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
 hostmakedepends="automake libtool pkg-config"
@@ -14,7 +14,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
-checksum=c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5
+checksum=87e7d1d7f0333815dd1f62135d047a4dc4082068f361452f357997c11360644b
 # subpackages require explicit ordering
 subpackages="debuginfod libdebuginfod libelf elfutils-devel"
 

From 8c144a196c6b58830925c1be116172a252461e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 22:55:23 -0300
Subject: [PATCH 409/447] poppler: update to 21.05.0.

---
 common/shlibs                            |  2 +-
 srcpkgs/{libpoppler102 => libpoppler110} |  0
 srcpkgs/poppler/patches/fix-cflags.patch | 14 +++++++-------
 srcpkgs/poppler/template                 | 13 ++++++-------
 4 files changed, 14 insertions(+), 15 deletions(-)
 rename srcpkgs/{libpoppler102 => libpoppler110} (100%)

diff --git a/common/shlibs b/common/shlibs
index b12756eb9130..421d9f677e80 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -340,7 +340,7 @@ libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.102 libpoppler102-20.09.0_1
+libpoppler.so.110 libpoppler110-21.05.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/libpoppler102 b/srcpkgs/libpoppler110
similarity index 100%
rename from srcpkgs/libpoppler102
rename to srcpkgs/libpoppler110
diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
index 9e62b11010ba..f1a408d03cce 100644
--- a/srcpkgs/poppler/patches/fix-cflags.patch
+++ b/srcpkgs/poppler/patches/fix-cflags.patch
@@ -1,13 +1,13 @@
-Index: cmake/modules/PopplerMacros.cmake
-===================================================================
---- cmake/modules/PopplerMacros.cmake.orig
-+++ cmake/modules/PopplerMacros.cmake
-@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index fe1182d..6013bd2 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
    set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
  
    set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
-+  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
++  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
    set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
    set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 1aebd7f7e177..72a961b24615 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
 pkgname=poppler
-version=20.09.0
-revision=3
+version=21.05.0
+revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -18,13 +18,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+patch_args=-Np1
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
-libpoppler102_package() {
+libpoppler110_package() {
 	depends="poppler-data"
 	short_desc+=" - poppler runtime library"
 	pkg_install() {
@@ -50,7 +51,7 @@ poppler-cpp_package() {
 }
 
 poppler-devel_package() {
-	depends="libglib-devel libpoppler102>=${version}_${revision}"
+	depends="libglib-devel libpoppler110>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove "usr/include/poppler/*.h"
@@ -59,7 +60,6 @@ poppler-devel_package() {
 		vmove usr/include/poppler/goo
 		vmove usr/lib/libpoppler.so
 		vmove usr/lib/pkgconfig/poppler.pc
-		vmove usr/lib/pkgconfig/poppler-splash.pc
 	}
 }
 
@@ -72,7 +72,6 @@ poppler-glib-devel_package() {
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove usr/lib/pkgconfig/poppler-cairo.pc
 		vmove usr/lib/pkgconfig/poppler-glib.pc
 	}
 }

From ca4972fd582e93d77e133497a30a564db856ec5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:31:30 -0300
Subject: [PATCH 410/447] poppler-qt5: update to 21.05.0.

---
 srcpkgs/poppler-qt5/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index c2ec35dbbad3..4fb165ecc22b 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,8 +4,8 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=20.09.0
-revision=2
+version=21.05.0
+revision=1
 wrksrc="poppler-${version}"
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -18,7 +18,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 distfiles="${homepage}/poppler-${version}.tar.xz"
-checksum=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+# fails to find a bunch of files
+make_check=no
+patch_args=-Np1
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DTHREADS_PTHREAD_ARG=2"

From db6160e2a567f419ef1432caee9a6d0d6f86a97f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:25 -0300
Subject: [PATCH 411/447] calligra: revbump for libpoppler110-21.05.0.

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 9782b528067b..6c34e0438ab8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=3
+revision=4
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From dff0b5f10acc65267469c93c4c57f2361bde9b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 412/447] inkscape: revbump for libpoppler110-21.05.0.

And import patch to build with glib >= 2.67.3.
---
 srcpkgs/inkscape/patches/glib-extern-C.patch | 65 ++++++++++++++++++++
 srcpkgs/inkscape/template                    |  3 +-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/inkscape/patches/glib-extern-C.patch

diff --git a/srcpkgs/inkscape/patches/glib-extern-C.patch b/srcpkgs/inkscape/patches/glib-extern-C.patch
new file mode 100644
index 000000000000..b959bcd76fdc
--- /dev/null
+++ b/srcpkgs/inkscape/patches/glib-extern-C.patch
@@ -0,0 +1,65 @@
+From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
+From: Harald van Dijk <harald@gigawatt.nl>
+Date: Wed, 17 Feb 2021 09:13:49 +0000
+Subject: [PATCH] Fix build with glib 2.67.3.
+
+As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
+blocks. It was indirectly included by both "types.h" and "color.h".
+"types.h" already does not need to be wrapped in an extern "C" block,
+"color.h" does but can be modified not to, so with that changed they can
+be moved out.
+---
+ src/3rdparty/autotrace/autotrace.h | 6 +++---
+ src/3rdparty/autotrace/color.h     | 7 +++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
+index 2ce6f272a9..e56be9a74c 100644
+--- a/src/3rdparty/autotrace/autotrace.h
++++ b/src/3rdparty/autotrace/autotrace.h
+@@ -23,6 +23,9 @@
+ 
+ #include <stdio.h>
+ 
++#include "types.h"
++#include "color.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif                          /* __cplusplus */
+@@ -35,9 +38,6 @@ extern "C" {
+  * Typedefs
+  * ===================================================================== */
+ 
+-#include "types.h"
+-#include "color.h"
+-
+ /* Third degree is the highest we deal with.  */
+   enum _at_polynomial_degree {
+     AT_LINEARTYPE = 1,
+diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
+index e50ab30ae0..88651db9f7 100644
+--- a/src/3rdparty/autotrace/color.h
++++ b/src/3rdparty/autotrace/color.h
+@@ -24,6 +24,10 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif                          /* __cplusplus */
++
+ typedef struct _at_color at_color;
+ struct _at_color {
+   guint8 r;
+@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
+ GType at_color_get_type(void);
+ #define AT_TYPE_COLOR (at_color_get_type ())
+ 
++#ifdef __cplusplus
++}
++#endif                          /* __cplusplus */
+ #endif /* not AT_COLOR_H */
+-- 
+GitLab
+
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 364f229dba30..6339519c22f9 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.0.2
-revision=2
+revision=3
 wrksrc="inkscape-${version}_2021-01-15_e86c870879"
 build_style=cmake
 # builds executables then runs checks
@@ -23,6 +23,7 @@ homepage="http://inkscape.org/"
 distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz"
 checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
 python_version=3
+patch_args=-Np1
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 444fdd65bb0e1752831a30c9ba7e5a0814383c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:27 -0300
Subject: [PATCH 413/447] ipe: revbump for libpoppler110-21.05.0.

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index f322cdbfaca1..1917a94ebf4e 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.24
-revision=1
+revision=2
 _tools_commit=v7.2.20.1
 hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
 makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel

From cada26e1199eea31abaa6e5d9b657988ad8536be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 414/447] scribus: update to 1.5.7.

Also remove outdated post_install (was a no-op).
---
 srcpkgs/scribus/patches/cmake-build-type-none.patch |  9 ++++-----
 srcpkgs/scribus/template                            | 10 +++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/scribus/patches/cmake-build-type-none.patch b/srcpkgs/scribus/patches/cmake-build-type-none.patch
index 670c83cc48f5..a27b4c757811 100644
--- a/srcpkgs/scribus/patches/cmake-build-type-none.patch
+++ b/srcpkgs/scribus/patches/cmake-build-type-none.patch
@@ -2,7 +2,7 @@ Index: CMakeLists.txt
 ===================================================================
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -35,11 +35,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+@@ -75,11 +75,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
  
  
  #RPATH setup - more below too
@@ -14,10 +14,10 @@ Index: CMakeLists.txt
  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
  set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
  set(CMAKE_SKIP_BUILD_RPATH TRUE)
-@@ -309,16 +304,6 @@ include (CMakeLists_Directories.cmake)
+@@ -330,15 +325,6 @@ include (CMakeLists_Directories.cmake)
+ 
  #Convert our simpler command line option to the CMake style
  #None, Debug, Release, .. or custom ones
- # set(WANT_DEBUG ON)
 -if(WANT_DEBUG)
 -	set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Set Debug Build Type" FORCE)
 -endif()
@@ -27,7 +27,6 @@ Index: CMakeLists.txt
 -if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
 -	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
 -endif()
--
  
  
- #Based on our build type, setup our build options
+ 
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 868ec55590fa..9c7b0bfaa8fa 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
-version=1.5.6.1
-revision=1
+version=1.5.7
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3"
@@ -14,9 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://scribus.net"
 distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
-checksum=d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab
+checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce
 python_version=3
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/include
-}

From 6c07546b0c63b5588ba65cc246d81f14cf0f7e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 23:26:28 -0300
Subject: [PATCH 415/447] texlive: revbump for libpoppler110-21.05.0.

---
 srcpkgs/texlive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 72481d85bcbf..b9a19c12a347 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=7
+revision=8
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure

From e98a679e3b53ef13ae84645dcfaacc404d522ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 11 May 2021 02:35:57 -0300
Subject: [PATCH 416/447] libreoffice: update to 7.1.3.2, adopt.

- remove comment about missing dependencies: they are either not used by
  the current configuration (krb5 with system postgresql or nasm with
  system libjpeg) or were made to be used in this update (poppler)
- use system fontforge to build opens___.ttf
- use system ucpp as preprocessor
- use system python3-lxml in the build process
- use system poppler and libxml2
- remove outdated libtommath from distfiles
- use vsed everywhere (and remove outdated stuff)
- be explicit about bundling fonts
- use make_build_target instead of make_build_args (more semantically correct)
- patch so build can run in CI
---
 .../patches/0011-liborcus-unittest.patch      | 13 ---
 .../libreoffice/patches/fix-vlc-backend.patch | 20 ++++
 srcpkgs/libreoffice/template                  | 95 ++++++++-----------
 3 files changed, 62 insertions(+), 66 deletions(-)
 delete mode 100644 srcpkgs/libreoffice/patches/0011-liborcus-unittest.patch
 create mode 100644 srcpkgs/libreoffice/patches/fix-vlc-backend.patch

diff --git a/srcpkgs/libreoffice/patches/0011-liborcus-unittest.patch b/srcpkgs/libreoffice/patches/0011-liborcus-unittest.patch
deleted file mode 100644
index d398fdc0a374..000000000000
--- a/srcpkgs/libreoffice/patches/0011-liborcus-unittest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- sc/qa/unit/subsequent_filters-test.cxx	2018-02-22 18:45:41.000000000 +0100
-+++ sc/qa/unit/subsequent_filters-test.cxx	2018-03-02 11:24:08.616015560 +0100
-@@ -2395,7 +2395,9 @@
-     CPPUNIT_ASSERT_MESSAGE("Style Name1 : Doesn't have Attribute background, but it should have.",
-         pStyleSheet->GetItemSet().HasItem(ATTR_BACKGROUND, &pItem));
-     const SvxBrushItem* pBackground = static_cast<const SvxBrushItem*>(pItem);
--    CPPUNIT_ASSERT_EQUAL(Color(254, 255, 204), pBackground->GetColor());
-+    /* This test fails with liborcus >= 0.13.3
-+     * CPPUNIT_ASSERT_EQUAL(Color(254, 255, 204), pBackground->GetColor());
-+     */
- 
-     CPPUNIT_ASSERT_MESSAGE("Style Name1 : Doesn't have Attribute border, but it should have.",
-         pStyleSheet->GetItemSet().HasItem(ATTR_BORDER, &pItem));
diff --git a/srcpkgs/libreoffice/patches/fix-vlc-backend.patch b/srcpkgs/libreoffice/patches/fix-vlc-backend.patch
new file mode 100644
index 000000000000..eabf413b86db
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/fix-vlc-backend.patch
@@ -0,0 +1,20 @@
+ vcl: fix build with vlc backend enabled
+ 
+ avmedia/source/vlc/vlcplayer.cxx tries to access the aWindow member
+ directly, which leads to a compilation failure, since it's private.
+
+diff --git include/vcl/sysdata.hxx include/vcl/sysdata.hxx
+index 63b7c810de3d..0cd0e037c823 100644
+--- include/vcl/sysdata.hxx
++++ include/vcl/sysdata.hxx
+@@ -73,9 +73,8 @@ struct VCL_DLLPUBLIC SystemEnvData
+     // however, the GTK3 vclplug wants to store pointers in here!
+     sal_IntPtr          aShellWindow;   // the window of the frame's shell
+     Platform            platform;       // the windowing system in use
+-private:
+-    sal_uIntPtr         aWindow;        // the window of the object
+ public:
++    sal_uIntPtr         aWindow;        // the window of the object
+ 
+     void SetWindowHandle(sal_uIntPtr nWindow)
+     {
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index d10c5e457a9d..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,17 +1,14 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=7.1.0.3
-revision=2
+version=7.1.3.2
+revision=1
 build_style=meta
-make_build_args="build-nocheck"
+make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
 
-#
-# XXX: mit-krb5-devel nasm hamcrest iwyu ogl-math poppler
-# Missing, required libraries are downloaded and built internally
-#
 hostmakedepends="automake flex git gperf hyphen icu libtool openldap which gettext xz
- perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip wget zip python3-setuptools"
+ perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip wget zip python3-setuptools
+ fontforge python3-lxml"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
  gtk+-devel gtk+3-devel hunspell-devel hyphen-devel libXt-devel libabw-devel
@@ -23,7 +20,7 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  libwps-devel lpsolve-devel mdds mythes-devel neon-devel nss-devel
  postgresql-libs-devel python3-devel qt5-devel redland-devel sane-devel
  telepathy-glib-devel unixodbc-devel vigra-devel vlc-devel libcppunit-devel
- qrcodegen-devel xmlsec1-devel"
+ qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel"
 depends="libreoffice-common>=${version}_${revision}"
 depends+=" libreoffice-base>=${version}_${revision}"
 depends+=" libreoffice-calc>=${version}_${revision}"
@@ -44,12 +41,12 @@ depends+=" libreoffice-i18n-it>=${version}_${revision}"
 depends+=" libreoffice-i18n-pl>=${version}_${revision}"
 depends+=" libreoffice-i18n-pt>=${version}_${revision}"
 short_desc="Productivity suite"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
 
 # Source, dictionary, help and translations
-_baseurl="https://download.documentfoundation.org/${pkgname}/src/${version%.*}"
+_baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
 _addurl="https://dev-www.libreoffice.org/src"
 _exturl="https://dev-www.libreoffice.org/extern"
 
@@ -62,8 +59,7 @@ distfiles="
  ${_baseurl}/${pkgname}-translations-${version}.tar.xz
  ${_addurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
  ${_addurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- ${_addurl}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
- ${_addurl}/language-subtag-registry-2017-08-15.tar.bz2
+ ${_addurl}/language-subtag-registry-2019-04-03.tar.bz2
  ${_addurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  ${_addurl}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ${_addurl}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
@@ -72,10 +68,9 @@ distfiles="
  ${_addurl}/libstaroffice-0.0.7.tar.xz
  ${_addurl}/libzmf-0.0.2.tar.xz
  ${_addurl}/pdfium-4306.tar.bz2
- ${_addurl}/poppler-21.01.0.tar.xz
  ${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
  ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
- ${_exturl}/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
+ ${_exturl}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
  ${_exturl}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
  ${_addurl}/commons-logging-1.2-src.tar.gz
  ${_addurl}/dtoa-20180411.tgz
@@ -90,11 +85,9 @@ distfiles="
  ${_addurl}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
  ${_addurl}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
  ${_addurl}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${_addurl}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
  ${_addurl}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
  ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
  ${_addurl}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
- ${_addurl}/ltm-1.0.zip
  ${_addurl}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  ${_addurl}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
  ${_addurl}/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
@@ -111,20 +104,17 @@ distfiles="
  ${_addurl}/libre-hebrew-1.0.tar.gz
  ${_addurl}/alef-1.001.tar.gz
  ${_addurl}/ttf-kacst_2.01+mry.tar.gz
- ${_exturl}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
- ${_addurl}/lxml-4.1.1.tgz
  ${_addurl}/Amiri-0.111.zip
  ${_addurl}/ReemKufi-0.7.zip
  ${_addurl}/Scheherazade-2.100.zip
 "
-checksum="9ed0833f349da3f7b27f54fa24da388dc6a84079935322b305a7a2171e48f3e6
- 2d260ec3b24d577719706f56f83a3aa8839ee9c95d4b30b40ec2d7fc6a323afc
- 698ae21765ae1e2df8bbc3b448fe88437055402708f6afe3ed6f746491887acf
- b17e0d7c61de80526d22c11c63596c4d56aaa2b1ad0f14d29e0abdd8b3efcc54
+checksum="35af7fd104b253704f770a205f835aee0e82ccc889ebf0949a89d9b3276229bf
+ 66dc5fd4253f6b956b8fdde0d741ef7d85f12647db235642eb74f3d0a44d404e
+ e0f14b4db1585506761ad2ceeb43850cb594f2ec8a20fc9ca7bcb95e77408935
+ 86138935d274d46d27e4ce92a72d759e7d4491d7b227be952e05735ba5c9b327
  1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
- 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
- d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab
+ a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d
  d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
  1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
  233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
@@ -133,10 +123,9 @@ checksum="9ed0833f349da3f7b27f54fa24da388dc6a84079935322b305a7a2171e48f3e6
  f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
  27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
  eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8
- 016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3
  d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
  f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
- d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
+ 984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
  eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
  49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
  0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
@@ -151,11 +140,9 @@ checksum="9ed0833f349da3f7b27f54fa24da388dc6a84079935322b305a7a2171e48f3e6
  3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8
  abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
  05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
- 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
  a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
  085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
  f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301
- 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
  c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
  4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
  7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a
@@ -172,8 +159,6 @@ checksum="9ed0833f349da3f7b27f54fa24da388dc6a84079935322b305a7a2171e48f3e6
  f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
  b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
  dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
- f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
- 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
  1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166
  f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f
  251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"
@@ -183,21 +168,18 @@ skip_extraction="
  ${pkgname}-translations-${version}.tar.xz
  798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
  a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
- language-subtag-registry-2017-08-15.tar.bz2
+ language-subtag-registry-2019-04-03.tar.bz2
  17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
  b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
- Firebird-3.0.0.32483-0.tar.bz2
  box2d-2.3.1.tar.gz
  libstaroffice-0.0.7.tar.xz
  libzmf-0.0.2.tar.xz
  pdfium-4306.tar.bz2
- poppler-21.01.0.tar.xz
  bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
  8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
- odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
+ odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
  185d60944ea767075d27247c3162b3bc-unowinreg.dll
  commons-logging-1.2-src.tar.gz
  dtoa-20180411.tgz
@@ -212,11 +194,9 @@ skip_extraction="
  97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
  8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
  f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
  7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
  39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
  skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
- ltm-1.0.zip
  368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
  33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
@@ -233,8 +213,6 @@ skip_extraction="
  libre-hebrew-1.0.tar.gz
  alef-1.001.tar.gz
  ttf-kacst_2.01+mry.tar.gz
- f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
- lxml-4.1.1.tgz
  Amiri-0.111.zip
  ReemKufi-0.7.zip
  Scheherazade-2.100.zip
@@ -245,7 +223,7 @@ build_options="java"
 desc_option_java="Enable Java support"
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	make_build_args="build"
+	make_build_target="build"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
@@ -427,10 +405,8 @@ post_fetch() {
 	done
 }
 
-do_configure() {
-	local opts
-
-	sed -i bin/distro-install-desktop-integration \
+post_patch() {
+	vsed -i bin/distro-install-desktop-integration \
 		-e "/gzip -f/d" \
 		-e "s|.1.gz|.1|g"
 	chmod +x bin/unpack-sources
@@ -441,17 +417,25 @@ do_configure() {
 
 	case "$XBPS_TARGET_MACHINE" in
 		i686*)	# Don't run broken tests
-			sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
-			sed -i "/CPPUNIT_TEST(testTdf111798);/d" sd/qa/unit/export-tests-ooxml2.cxx
+			vsed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
+			vsed -i "/CPPUNIT_TEST(testTdf111798);/d" sd/qa/unit/export-tests-ooxml2.cxx
 			;;
 	esac
 
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+		vsed -i "s/bootstrap: check-if-root compilerplugins/bootstrap: compilerplugins/" Makefile.in
+	fi
+}
+
+do_configure() {
+	local opts
+
 	# Separate autogen.sh and configure because we need
 	# to patch configure for musl support
 	NOCONFIGURE=1 ./autogen.sh
 
 	# Add linux-musl* as host OS to lines containing linux-gnu*
-	sed -i configure -e 's;linux-gnu\*;linux-gnu*|linux-musl*;g'
+	vsed -i configure -e 's;linux-gnu\*;linux-gnu*|linux-musl*;g'
 
 	# standard options
 	opts="--prefix=/usr"
@@ -486,6 +470,8 @@ do_configure() {
 		# opts+=" --enable-ext-languagetool"
 		;;
 	esac
+	# Includes many fonts we don't package individually
+	opts+=" --with-fonts=yes"
 
 	# skia sucks
 	if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
@@ -495,14 +481,13 @@ do_configure() {
 	if [ "$build_option_java" ]; then
 		opts+=" --with-java"
 		opts+=" --with-jdk-home=/usr/lib/jvm/openjdk11"
+		# also disables hamcrest
 		opts+=" --without-junit"
 	else
 		opts+=" --without-java"
 	fi
 	opts+=" --with-tls=nss"
-	# fails to build with system poppler
 	opts+=" --without-system-box2d"
-	opts+=" --without-system-poppler"
 	opts+=" --without-system-libzmf"
 	opts+=" --without-system-libstaroffice"
 	opts+=" --without-system-libtommath"
@@ -512,6 +497,10 @@ do_configure() {
 	# opts+=" --without-system-glm"
 	opts+=" --with-myspell-dicts"
 	opts+=" --with-system-icu-for-build=yes"
+	# use system utilities
+	opts+=" --enable-build-opensymbol"
+	opts+=" --with-system-ucpp=yes"
+	# finish configuring build
 	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"
 	opts+=" --with-external-thes-dir=${XBPS_CROSS_BASE}/usr/share/mythes"
@@ -519,12 +508,12 @@ do_configure() {
 
 	./configure ${opts} --with-lang="${_languages}"
 
-	# Disable slowchecks target
-	sed -i Makefile -e "/gb_Top_MODULE_CHECK_TARGETS /s/ slowchecks//"
+	# Disable slowcheck target
+	vsed -i Makefile -e "/gb_Top_MODULE_CHECK_TARGETS /s/ slowcheck//"
 }
 
 do_build() {
-	make ${makejobs} ${make_build_args}
+	make ${makejobs} ${make_build_target}
 	make ${makejobs} -C libreofficekit
 
 	# on some platforms (32-bit ppc at least), this single file has

From cfd61d65b779264489fe06e6e933c542851f694b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 20 Apr 2021 13:27:04 +0200
Subject: [PATCH 417/447] google-authenticator-libpam: update to 1.09.

---
 srcpkgs/google-authenticator-libpam/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/google-authenticator-libpam/template b/srcpkgs/google-authenticator-libpam/template
index 5a08ade0e4f1..b53c13db3d78 100644
--- a/srcpkgs/google-authenticator-libpam/template
+++ b/srcpkgs/google-authenticator-libpam/template
@@ -1,6 +1,6 @@
 # Template file for 'google-authenticator-libpam'
 pkgname=google-authenticator-libpam
-version=1.08
+version=1.09
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -10,14 +10,11 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/google-authenticator-libpam"
 distfiles="https://github.com/google/google-authenticator-libpam/archive/$version.tar.gz"
-checksum=6f6d7530261ba9e2ece84214f1445857d488b7851c28a58356b49f2d9fd36290
+checksum=ab1d7983413dc2f11de2efa903e5c326af8cb9ea37765dacb39949417f7cd037
 replaces="libpam-google-authenticator>=0"
+# Tries to change user to nobody and fails due to being in a user namespace
+make_check=no
 
 pre_configure() {
 	autoreconf -fi
 }
-
-do_check() {
-	# Tries to change user to nobody and fails due to being in a user namespace
-	:
-}

From e69e217dd931a9b9a4715040fc6c74fe3ae8e23e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 20 Apr 2021 12:48:21 +0200
Subject: [PATCH 418/447] tin: update to 2.4.5.

---
 srcpkgs/tin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tin/template b/srcpkgs/tin/template
index 5bbd16533f7b..2f54962d047f 100644
--- a/srcpkgs/tin/template
+++ b/srcpkgs/tin/template
@@ -1,6 +1,6 @@
 # Template file for 'tin'
 pkgname=tin
-version=2.4.4
+version=2.4.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-pcre=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ maintainer="allan <mail@may.mooo.com>"
 license="BSD-3-Clause"
 homepage="http://www.tin.org"
 distfiles="ftp://ftp.tin.org/pub/news/clients/tin/v${version%.*}/tin-${version}.tar.xz"
-checksum=9ff12cecf6005be4d150a26403cb736668bcedbc97fe7d6e6846559ea490ff02
+checksum=1a14e6a49a3627230f792eb48936d39d0abd7b04d958083a6296bb4210c6c512
 
 pre_configure() {
 	sed -i '/BUILD_CPPFLAGS.*=/s/$(PCRE_CPPFLAGS)//' src/Makefile.in

From aa6e70712dfe32b2ee2a13eff0daa7ab1497658c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 10 May 2021 22:32:30 -0700
Subject: [PATCH 419/447] qastools: update to 0.23.0

Other changes: new homepage, drop the patch file, change distfiles
source.

Closes: #30792 [via git-merge-pr]
---
 srcpkgs/qastools/patches/qt5-5.15.0.patch | 40 -----------------------
 srcpkgs/qastools/template                 | 13 ++++----
 2 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/qastools/patches/qt5-5.15.0.patch

diff --git a/srcpkgs/qastools/patches/qt5-5.15.0.patch b/srcpkgs/qastools/patches/qt5-5.15.0.patch
deleted file mode 100644
index 1d5a7f9be338..000000000000
--- a/srcpkgs/qastools/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/src/wdg/ds_slider_painter_bevelled.cpp	2014-04-15 11:33:05.000000000 +0200
-+++ shared/src/wdg/ds_slider_painter_bevelled.cpp	2020-07-25 13:01:49.887621334 +0200
-@@ -20,6 +20,7 @@
- 
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QRadialGradient>
- #include <QScopedPointer>
---- shared/src/wdg/sliders_pad_style.cpp	2014-01-27 16:26:27.000000000 +0100
-+++ shared/src/wdg/sliders_pad_style.cpp	2020-07-25 13:03:56.304627856 +0200
-@@ -10,6 +10,7 @@
- #include "sliders_pad_data.hpp"
- #include "sliders_pad_header_data.hpp"
- 
-+#include <QPainterPath>
- #include <QPicture>
- #define _USE_MATH_DEFINES
- #include <cmath>
---- shared/src/wdg/ds_switch_painter_circle.cpp	2014-01-27 16:26:24.000000000 +0100
-+++ shared/src/wdg/ds_switch_painter_circle.cpp	2020-07-25 13:05:40.351633224 +0200
-@@ -18,6 +18,7 @@
- 
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadialGradient>
- #include <QScopedPointer>
- 
---- shared/src/wdg/ds_switch_painter_close.cpp	2014-01-27 16:26:24.000000000 +0100
-+++ shared/src/wdg/ds_switch_painter_close.cpp	2020-07-25 13:07:04.304637555 +0200
-@@ -18,6 +18,7 @@
- 
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadialGradient>
- #include <QScopedPointer>
- 
diff --git a/srcpkgs/qastools/template b/srcpkgs/qastools/template
index cf8aad0305a0..d8922f593acf 100644
--- a/srcpkgs/qastools/template
+++ b/srcpkgs/qastools/template
@@ -1,15 +1,16 @@
 # Template file for 'qastools'
 pkgname=qastools
-version=0.21.0
+version=0.23.0
 revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}-v${version}"
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake tar"
 makedepends="alsa-lib-devel qt5-svg-devel qt5-tools-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Collection of desktop applications for the Linux sound system ALSA"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://xwmw.org/qastools/"
-license="GPL-3"
-distfiles="${SOURCEFORGE_SITE}/qastools/${version}/qastools_${version}.tar.xz"
-checksum=2380e0ed16d24771404a7e4783b5b14f7be344915a40b5cf16e417ea58699b26
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/sebholt/qastools"
+changelog="https://gitlab.com/sebholt/qastools/-/raw/master/CHANGELOG"
+distfiles="https://gitlab.com/sebholt/qastools/-/archive/v${version}/qastools-v${version}.tar.bz2"
+checksum=d18ee5e1045ec44a18d5f7b8613f3987f225b4ef96c63128bf5cc645b2e6dbbb

From 2d3b2120817d53d95f912db4b95c13ce63b4a84f Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Wed, 12 May 2021 09:39:53 +0200
Subject: [PATCH 420/447] ipp-usb: update to 0.9.18.

---
 srcpkgs/ipp-usb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 95d82fedf04f..3654afdd4efd 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,6 +1,6 @@
 # Template file for 'ipp-usb'
 pkgname=ipp-usb
-version=0.9.17
+version=0.9.18
 revision=1
 build_style=go
 go_import_path="github.com/OpenPrinting/ipp-usb"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="BSD-2-Clause"
 homepage="https://github.com/OpenPrinting/ipp-usb"
 distfiles="https://github.com/OpenPrinting/ipp-usb/archive/$version.tar.gz"
-checksum=4c1fbd89f7d971eed8447cd80d3e4723edd968043cb2fa4c490ac305720156c3
+checksum=e23e77436e9138f3d24cb122fd6fdb0e5f832138659d413f0be7527f6ebff27e
 
 post_install() {
 	vsv ipp-usb

From 0a44fee912339e53eea544d029fd4a84a9b9f945 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Wed, 12 May 2021 15:16:26 +1000
Subject: [PATCH 421/447] bluez-alsa: disable debug

Prints messages while playing media and can screw up terminal applications.
---
 srcpkgs/bluez-alsa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez-alsa/template b/srcpkgs/bluez-alsa/template
index 2d6ba4ff38a5..d01ec201aa12 100644
--- a/srcpkgs/bluez-alsa/template
+++ b/srcpkgs/bluez-alsa/template
@@ -1,9 +1,9 @@
 # Template file for 'bluez-alsa'
 pkgname=bluez-alsa
 version=3.0.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-aac --disable-hcitop --enable-debug
+configure_args="--enable-aac --disable-hcitop --disable-debug
  $(vopt_if man --enable-manpages)"
 hostmakedepends="pkg-config automake libtool $(vopt_if man pandoc)"
 makedepends="alsa-lib-devel fdk-aac-devel libbluetooth-devel libglib-devel

From ee62123ffea9100faa424b4feb6f885a374b511f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 12 May 2021 23:27:41 +1100
Subject: [PATCH 422/447] feh: update to 3.7.

---
 srcpkgs/feh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template
index 7b891fa8f9c1..66fbb69d9da2 100644
--- a/srcpkgs/feh/template
+++ b/srcpkgs/feh/template
@@ -1,6 +1,6 @@
 # Template file for 'feh'
 pkgname=feh
-version=3.6.3
+version=3.7
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -15,7 +15,7 @@ license="MIT-feh"
 homepage="https://feh.finalrewind.org"
 changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog"
 distfiles="${homepage}/feh-${version}.tar.bz2"
-checksum=437420f37f11614e008d066e2a3bdefcfc78144c8212998b2bacdd5d21ea23b4
+checksum=07cdb1076c3b7777064cf081f722346600aeefeb568cbca58575777969a6bb41
 
 pre_build() {
 	vsed -i 's|doc/feh/examples|examples/feh|' config.mk

From 3afd9ad1b8ac0242ae631ea7972c7e007d31f48d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 10 May 2021 12:10:47 -0500
Subject: [PATCH 423/447] ghostwriter: update to 2.0.0.

---
 srcpkgs/ghostwriter/patches/qt5-5.15.0.patch | 14 --------------
 srcpkgs/ghostwriter/template                 |  8 ++++----
 2 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/ghostwriter/patches/qt5-5.15.0.patch

diff --git a/srcpkgs/ghostwriter/patches/qt5-5.15.0.patch b/srcpkgs/ghostwriter/patches/qt5-5.15.0.patch
deleted file mode 100644
index e84ae5cf95d1..000000000000
--- a/srcpkgs/ghostwriter/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: qt5-5.15.0 requires explicit include for QPainterPath
-
---- src/MarkdownEditor.cpp	2020-02-23 01:49:46.000000000 +0100
-+++ src/MarkdownEditor.cpp	2020-07-14 02:29:29.200936217 +0200
-@@ -34,6 +34,7 @@
- #include <QUrl>
- #include <QPixmap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QFileInfo>
- #include <QDir>
- 
diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
index 4219a7f13aee..5d5e89eb6135 100644
--- a/srcpkgs/ghostwriter/template
+++ b/srcpkgs/ghostwriter/template
@@ -1,8 +1,8 @@
 # Template file for 'ghostwriter'
 pkgname=ghostwriter
-version=1.8.1
+version=2.0.0
 revision=1
-build_style=qmake
+build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="hunspell-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel
  qt5-webengine-devel qt5-location-devel qt5-webchannel-devel qt5-declarative-devel"
@@ -11,8 +11,8 @@ short_desc="Distraction-free Markdown editor"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://wereturtle.github.io/ghostwriter"
-distfiles="https://github.com/wereturtle/ghostwriter/archive/v${version}.tar.gz"
-checksum=2b73fed6a95ebcd45333fe4b12acb491eb4171fca8a11eea1af9bbdc73ed4b69
+distfiles="https://github.com/wereturtle/ghostwriter/archive/${version}.tar.gz"
+checksum=9ece6235fd3794c33f3b2cead83344ac01054ac4f42df42934e125137a2782bd
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5tel*) broken="qtwebengine not built for this platform";;

From 28a2a256f6a59cd38569b421b30bfb1a12b57fa8 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolo@gmail.com>
Date: Thu, 6 May 2021 20:51:22 +0200
Subject: [PATCH 424/447] firefox: update to 88.0.1

---
 srcpkgs/firefox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index bba9994c2a91..0a54a0d352c8 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=88.0
+version=88.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=6b50dbfb393f843e4401e23965a1d8f7fd44b5a7628d95138294094094eee297
+checksum=83df1eae0e28fe99661fd5d39d705cdab2e108b4a24ce12c2db6183c632804cc
 
 lib32disabled=yes
 

From 5089939dfc9ca0a4107a1eadcff6aef955f6220e Mon Sep 17 00:00:00 2001
From: Nicolo <nicolo@gmail.com>
Date: Thu, 6 May 2021 20:51:43 +0200
Subject: [PATCH 425/447] firefox-i18n: update to 88.0.1

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a73c83f152ec..582142758b24 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=88.0
+version=88.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="da88ccf14094a5de19526b4650b4f718db67f3d81f26c0ce1af25ede1a2a42e1
- ce0ae11d1629fd4f691f6033c948ffa89e50e26adb4390bd7645239067615548
- 9c8c18bb150a9c9969e4f0d3969c476ac353fb6d118162b3e1836a3679a42bef
- ed8f29b245f2b9f1cf3bb1e45eaccbd9acb875dd60c042b06f5d24d545abadfe
- e4f18d5762c3bc66ee973a956aeb88e636c16bb7f665c4d9a240b6419a3b12f1
- d5e24820837ea08f890fe2a9d47f95b704c6f43138d712d238c83e61bfa70f63
- 4eead79524a8f3569928e221d398adde6ea9cb556ac6e8ec5b0e35014e164829
- d09fc47244541f92f4ea8845edbcdb36334e03499dd7c53bc8424b46ab9c0763
- 7bf0fe548926a255266697f23a055f187fbc8d9dabaeb525b599ea606413e7e6
- 9ded5446658221a32cbbfcddcfd1b4a50ec0db9b79574a8910953e0c5b1ee5ec
- f2f9b7df0b814cd43a10b8141af9a967426f5b807605e708330173b3ec3ba88a
- 4ec43f292136acecad40db971feda1bf628b1a77dc42879c29e4b206dbca5c3f
- c3e461c83cd4f1e4ed1c73de3def0b346b41ba9f9a938ac1ceca20b34411d1e6
- 105b7b26c13640eb140b0b122fe4c03a10cdf53288a163d5f8e3b0dc5209c41e
- 686dce89d291b34d13aab3c036ac5dd03f9f4c015a4a81056a0a87c878efb20d
- 4144b4fafab32651ce7ead86996ce0e0b148d3ad9bd079d8f373fcf9be0d3633
- bc01bafdec35e8d03c9b225556cbe84f649c439f47e73588c07b364dd172ce0a
- ad9b46502ef92b0c1aff78fc13b2f097b46316fa145cc370d2e62158e529d304
- e6bc9507d6006620ed9a068a4f0237d0eba62cadd53b9960038ba83680a7d155
- d37421d461f698707a25118694c9a55a4e590802fd4ce919a4e3ddf5f2c17652
- a790bed70e3be94cf6bfe45f07e11a09c57b095af6372bdf01351eb6c0933c4b
- 551dcf4bc5ffba65c9bf92d28393778c2907332342bccdaf5fa0e9137b566451
- cc266c2e5f608bd59978218792def6bf361760d4c0c33fc626509dca7faeaa0b
- 2c7a7980e0026b2f11596ae723f75f06fbae1e6149a1b482eddfcc7e1ac711d3
- 788750358c49c996811a567740ddc72327f83315f7032cafb9953c139e1adec8
- 3e4dfce301488a300b05dad0b226f0b1fe3d9920d612babdaddac622758fdfdb
- d3d445ffe10f4924cb0fcdabf00066f9bcb55fe0ff04add79576f01ecd884dc3
- 9cd056a11a21ac3adbf9ceb3a91d99446b8efdc02549b4237743f8dc0d5cadc9
- edf8641d591d56bc0a087a3d35321ba7ac177cc46cfc2310398dd1337f13644a
- 9419aaa55db02a05dfeb00695cfcb4fddbd44784364c9e0273eb55b040bdf6fe
- de89528f19d0fe72e528d0b3b2671040a5f60c0a16427ed989e5c8995227e998
- 248b5c1968be6d470312faa4f018674f6956dffcf9e6abb05cc46d7668da7c7d
- 171d659668a17bb8998acba23b57818adb9be1c7b6ff028ad378ba812a9d5a8c
- 0c2782fa1b1b21cd12bc6848d9567c916f46f829a2ad91b7f5313234cc9f53f1
- fab7d9994dfb13673f1c377e161e4f60780d4193e7af2eec5debc0c69a486e17
- 3938d5510206e2416449e232a14c7b2dcb1455ac33bb8e746a4db6d6855827a9
- f111b803819713db455fba0027f36af9a09da3b591cea19f7e8d342b684aaf6a
- b2ede6f0c2e77cd9a20e2947615c001e772462d2716723e4c8566470134e3827
- 8b08ed35173326af40fbc920a7383bffbd2f35f59dfcff9de81bab358f0c7fe4
- 1f8dc9c566c0f7dc08ed232016c5b7109c8d8eeb65c03d6f17be76dcaf81a18d
- 8a88f5b1e45653743bc13a94dc2556f4bf8cdd923facee4ea643885e13ccb08c
- e1913629be2f7fad964d0b9407e43763521e0e8b6e90963401c55bcb2b7c356f
- be67cc96c25afe87784d1601ec59267fc2e521d1181f4334bf8aefc532ea5f3a
- 6a6542c847527f5f3894d83aeca2ef7b9b1f0332e1f60b00dc15a4664c009599
- 449c8ba115feacd21315b5042f056189e315a3bd736388a7f0f7fd92c5953c26
- ca409a4060572ba8239721196aaf6ff53307236a64854d776bed1862cebca18c
- f857da462c7e5de1bacfd48a6faa4239e7e5ada1e5e3137bbffb09925537f371
- 2fab91fdbdf81798323e82a7321dc04a7b5b53a4ffdaeb073ed9590d804c34bc
- 422083d6e3b40cf6b6a60f6207944534115d9f6ea7813b9caaaacb9238b9d7b8
- 1eda0dc20f95e2a4d3cfdcea7806473be0d44549ee91015b3037d3c5a2f785c6
- df038a3715ae11bc0ae368cf23f7cdff62637fca302bb41a9a54d391cb475bc5
- c3ed921ad0c521b3b259ba2ee1181d42830f69a1a9305d8eba7d4a7f3aa75522
- 55b005da1c92309b90945f04b04cac4ea6ec56cc34f69d75590674afd68e7cf7
- 2cb0b12c3009ac920a0a9b5234d412ac5c4960c68f94a2a5124db2d1a0313531
- c596b0c5ae8540afff007de494254727e94a54b837a2503a033f2014ddc59c73
- 1cd550c95f6f166d6bcc45307057eff3d730e07a7c6280c6cf72844602a55675
- fe41ba33a31e0c5294e99c7c0d3364abcdc5b44ca006f42e9f440e57710d36ab
- 588a4af16be74e94616b9ef689d1a4e066f3588e1bd1b3a637facce009ef6789
- ac399cc0d4d0779b18296cb00b846ec8799e558139127b398865ebb8ceecdd77
- 02cb1244be4d25cc0398a87c210c4741a97f66774c372bde24faad630eff448f
- cc2e550f9c71c435dd101790c6f4e1f0af8e185eaa81a1e1440a69b45cd80303
- b21aac4cbdb26e2743891b637319baf6fd7b5f2ab8b52893d2b26e2448cc0dab
- a6219d66630c0e9e991ae6a8afb0539b6b743e8cbd7c9ce5febff5f6b1bc2739
- 533f38e026ace1332ebd0484a4ee0a7832f11c796a5dfce9ee35a5af34ec7ee7
- 172d5969d5d9c4d0ced33153abb52c5fca52603d8fa5e2f2fbf0d2b7b68d8142
- 0d25977a21e9772d2657ca8754717e5f1abba416fdbd5866fa917209c2af560c
- 604a4df1799971e5b716e638ee776f30c5558ffddd72f10ba2796a2e2c323503
- 328334d1339b406a8d9b8a9efafbe2e7bb711354a56c3876065a96e64f9c98de
- a7f101d7a791b6deb6a2ae9afbf5286568069f73b33655db4323f5f94387f5d4
- 094d5ba532fbd2f2bd07afb739e99886a836cb4a93e57deb8a3e10e70feba449
- f6c97435a64e29c79388b0e40b8ba7a0d774df96e074979bf7cf7343f9a980df
- 2f6ca77bf7d4d3fb0a17141918cf3468380e8b477413fa5d1e71ff0aff30f810
- 230731339bd7b96889a06083d4b28b08d942dd73cfeed2a6d247a4e8dbbe6cf8
- f7901d656ad56c1f7e3e38fe6a988f68d8cc94d6890b7f2482b62fe983df0579
- be6403f22dae93e06f04dc303f44ff7ec1f951395c329e0842b6ef84c9487137
- 6cc11c2a68fe9755f065f02558c4f8077fd53c73c7e5f8846eae5365e2873eba
- 28c7a9fa809ec38812a2c840466c9403943c8ef47c9c886f4ecbc390a1668617
- 7fa2e4b43fc50f4fea5ed550679745262f27e8db75dfbe3102a4ba78b0250a8b
- fb09aa3f793eec95cd97e73fe1c03af81f5e06629ed3afdce77d89d82e3565d8
- 21e5008e10af7b0008de36c6f964a40737b004bf0f49154781d472dbca1b86fa
- 9eb985f4fd4f5a6a26b5abe0dead9222d02d76e57b0282a1bced57d2f194be40
- e5c2295733f5b95a3476cc177e825a06a0aa3149a331da054ab5d265cf63f036
- 746872105fa1bd9f68d683ba2d6d0bace16cb31a301dbf99b3b1087d85998629
- e66f933ebcf6c0da6c3334c7b91eee4a20a7a623fb16ca22dfcff7a9c88be9af
- ec3390fdb7f96cfd434c2c4ab344b597fbe3bafb799771800f09d509f486858b
- 3e9d5f326025153fdb5608be6673b4966b2cb5ffa0b7a54e08dee5f05b01e196
- 3a90521f63e68d86129f3b24814295a2d1e2dce8ff60674cbedea617d9aca969
- dccef3e20f35be84bee5892c77cb64dd2be2de453171ef998244cacd588b861b
- c100aded88de30b24e469a361042e4bef94de560681e3f28f9b8d6b0d2c6fd28
- 9e1d373a84bc53f9a6809391717e5c728553ab2609c7c72314d6f1c66094e9b4
- 7fed64f1e1667c8aeb07abc4a6ece100ec8c90e424634917abc87dd1edb500f1
- af9967c67b5f68dd4360ebd0ccd711637a385ab0e42444308d5256be91531664
- ea24d3550c9915da7adc26c1ccbb4996f074e08d299894af26990517644c063b
- 8d12b4b4b8129ed1192fdd7987744307c0fcf77133fc058301263525a206b134
- f19a74f2985c20e072337c455a6e62fcebdb85166b915ff1fe44f7ee957fd560
- 4eba6dc24c0dd4abab61b399dc4616f6787a3135a344a6b397c104e01f68abd0"
+checksum="80d01a3af48f86e2f99d48b81933c813a6add751cbc3c17617cd9ac59aaa45d1
+ b0462a102fa42c5e20dffa371b47ca79112f9c0860f7ae222c1d1f4711c4f1f4
+ ad1bf82b2a6598f080f168ae00b878c524a326dbb80f2502d16a85e20f9084ed
+ 8834060393326650c97dfff017fc3a5cd701aaa7e1ad10e364db1fc58b6058c9
+ 0331fe783f787492229c31322bec6227d493a396efe40c629f259037e260a8bd
+ 10f5b5791a17bfe2765a7af427622cebc462e52e6780c948aafdd4f511e53127
+ 86713d2fe5b3071195db13c8ce4f7d69e88b4ad5897ec862ee9cde6a06f40654
+ dab99398f4a93110b9caf90b9f401919777de8ed942063110bfc57b2935a4bb8
+ 65514a6ca8b2709a8a7fe530bc781075645fad548a91c760875016e59d6bedfd
+ eace7d76e3dd6d3a9cf61a2639342f8f9c6d16e5d9aa1e84a1897ea600662826
+ 4b5ce0682e3292e1893a362998222bd8bd755a78be5135bccaee234e0d27be20
+ 076dc03cda273eb92fb9b0efb18f1a7ec7ef1cc8e9a99629d3a1d258e1e08b3e
+ dc9b1a177df4d8a07bc3777b82273b7f52b927221a7c3ab30d81582343de8f23
+ 58ef43f7f6a40d76013b9179a6b60a1d7be79083060c50dc775d0f934779dabb
+ f97091e3b7284388171a2d344aab7f022087c255d649ab49ce19bc702a7e5c6a
+ f4acefa54dc91d2ce335b82969db6632913c3fc899ece59110a0051b20f79c4b
+ 8e07fbf79e539061fd3cfa8a7a19d5b7f1a8f30740e200451dac248b5d8ce36d
+ 7cfe8a32374e862cf7de4cb9fc28077b625bea7be39e17aff08605036de4c64e
+ 0a892932cbb536177457d081f56ca3c6e29b7f08bace67b858a2b3f392f64731
+ c0f0c3c079da499adb40815e6cda38a68c3d36c8e19d3d1eae705354d9b217a4
+ 218afbcd896be8ab58d772e993c946fa6ba2310a688b97d25625c16ce207d9e9
+ dd5089f902c502954580e8cf4e9bdc3a08f8b9e7c6835b65a6e27eb6c6061ec1
+ d1246f60808b37e8fa51c19d62d8996953306a1f7ed83f151f7ac25380e999ca
+ a19d5f4d6c5d1d0b0f66b0ba9a16f11c22df4ae4d738eb942381e9d471c5ffd3
+ c074e370c6d95bfe6b1d5cbe93c5a868207e4a1b7587618060708ae95f5dc187
+ 2e15a9d0066bc0d7bea7fb712a0195e3f15b488ed06d0dd8fb893527d4aa4107
+ 8a505ee4bce3fa9d26ded1c09b401987aff02997dd2abf4cd220a4c10069c126
+ 69d5a146ef8dd0581af03b034b495a695a9768c68fb9e3d68a2144db8b36be27
+ 4be5b1cc3682961212f10a5c72e69e22ad818aacd35df5cda62001315ba9a169
+ 157cf8160f537857dd6d617a096836e510b13aa58deba19867072409371547ca
+ 890e4af479db68015dbf1f4761ce44ee6a659c3b667fabaf0b51ddab3930542b
+ 7e182154ee64bf0926ac8549dd4d9c97a5e396262d4422fde5591b043e146195
+ 708bf3f9f35d1caf5cebb76052bfca05dbb0279ea60e9562d22255fda755e0e7
+ 7f1e28ac36aedaf889fe65123960dd076a6d2c800cf5c09f9d734e68a0c175bf
+ 9694b7099a0e4b543992d431045beb421aab2931ba806bb5efc997c77e11c6a7
+ 199599e9e9fe5feae34047d0ca761ccd2847c8475a38ab5685c4f1487cdf3c23
+ ec2f6edd10a39a8ac96e38bbf72f7dc2aae06d9e68b00316979b2a51e8fe8e3d
+ 94c964b8526f64d4dd7fccc972eca6e33a5b9db7daef3b6dfcc9cd4911cb94a5
+ 48ab4a86a1abdc9838102324b3bf5f4b406b68ad630bae215f0dd9b7b99cabe3
+ 142b8f92096bd812da58aedc86111d76cd7a10fafa03aaaa4052f480235e6661
+ 089a0533ccec66d0a451967521b7a3eff0db0b0f75589fe2b9045016702aee26
+ ef09d30d8d1e5714d04fc6dcb8b4348e46901f961d4ef65443bf124fd7cfb93d
+ 629c16da6d5467c83fbbeb4511484629cb20babb3e067454c571830631768e8c
+ 5bdfa6cb2d6032a112f076f098746bb08ed9d0b1a1bcfca515af39d17533170d
+ ccc164411ab79a0fca4f1968067d2c008acb3ee00f339f017e6c39aadef9334d
+ f99be63e67b9fcbd59a6e1fd8b8cbfddf9d9a4d1b412a701dd466f7eda9c00f2
+ aded4763b7a2cafa37d9a405ce40a4649f3967e36ace410c687cee975861f549
+ 8ca5fbec8187088a600398b652c4491df75b7159a0371ec16c72a21ac6816cc8
+ c8c5c7e3cbb8da143218c1bfed836cf3d62e8a7ffa96af886251abe760066baa
+ 5df0960a12955cd9acbd67eae0b1a111aa8d0c5c601bb14539c7aced81e59aae
+ 5582003eb846eacfa350955a706f84b7133e3b5294270c809ffebe9035bcf8dd
+ b1daa0ccc0056e23556413b1fa3f92727df8a75bfed928c6d6d7835170727e07
+ 818262c84ccc247ccd566980bd563f85b2f6f88d0cc38c9ffe5bd7d82127fb2e
+ 9578eeb909233fdce99d0426bd4d2d5972b46fe63af62d8957ff6170fb9618a2
+ a5b21393bfab188c6f3ba647a376a0ad63a3ca33175f7d3b0e88a204be457f70
+ 09916f7223ebe012deee3b503a690697db566c60a84366f117ed43b95ddb4873
+ 61181ec9e6f4c2af894c58fd9c432f3fc56945f6a2c7a5cdf0b7a6d3e2098f15
+ 645e40060948871010ca1b3f2b62dd9d72d50bdb3c0df52ab3300dbe11f0c267
+ 911803ed44b73bf232b3a95e4bc636249df68dc3c6c5685b22d8e9a900ae873c
+ c05dd396d67b4c47e34dfa6afc8b7fc06a880001589fea1f46b5b1b660d1c5c9
+ a4f1b51752fc377146d4b5489f45380557bbf956f5075daa2a0ca337d7fa462a
+ 33cfcf70fd3a20222648d89f8f1dfa101bd54dda1777bcd8adb77873c413af0b
+ 0ed711860a7da0893ae6e9c93f6a01137b9f607dd2e41bdc1d4f7602a790a6d7
+ 06a10157e2bc454947e8bc35f4d7add624528ee556114d9da7fb56ff7ca0628f
+ 3d099078e99a658c194fefe063abb63a2dc1ef70ad10685509a0ed1213383e85
+ dc6cdaaf8f1a06645312a5127a1f533fb0bd289f41de2c559bd9a83db3cafba5
+ 76c78c8d1246467f8680c9f8d2f108f0ca3a8eddf1cde2150b8ff5cefa4388aa
+ f791a1d8da8a1b4dec937660c9664679a04176a83fbbda63fda61d29d6752148
+ 7ddf2d351962efd9fd2d13e53378a877dca2be8b610053fd9b13dafd74fe0280
+ c977cf8fbb47aaeb573f0fed95e67a9614115440fc4ce89736e9f83fba9e0dea
+ 153e408653e06449bb4de584df31722ffefa30fca259074b879ef28bc6188ea5
+ 5b25bfedb0a2986777960fdbf6553ff5da77f95d52ff3e7a8273fb59703e4229
+ b802a1bf47a83dc773de1f2b31fb04141838fefddf98a1f7980bb64e2ff487a9
+ aea7155b62595eb92438c5d6a59231eb19264c249427b913971bbac3746fa01e
+ b852a49e72182b513db59f6355b651c1f42b67ae2f8cbb0c5aefd9d2b605dc45
+ 46e6caba0551b360a6e5cceb2f34e10265c7a2acd209b9f6423559cfa7162d2a
+ 343b5eded13a9faf73071ab1a14f2d166cf086cb3d3ebd8b964a370e5fcd47cc
+ 9ecf36f0398c8f58e46f96d943435e01ca64ff54860947968d6fb4047ee4f53a
+ a682cb0c8cc42a1ed0311a4c6695a11b5d8e9bfabaf819107527b642c05eab23
+ 798f0bb6281dd56d5e0bf21f98a8a09dad386755ff7c3b1facb7b3f871233753
+ bd3e8383475e93da36683afb1a3cd81056d8ea8a76d95e35f048add52e8b76fc
+ 6abf4ffbc9b945702a5acc95a3bc4f981401a38e1dfcc1bf49e3323008e48b4a
+ 327f10df38fcff9e796db163e49a2aeab7ebfa1969a0201d985086526a8da07a
+ d5d2630d3068eba3a9842fa7d94ff5ddf5ce247ec1cfe0671186ef56b50704f6
+ db6dd5560e5d868f4b79a227305a270059adf4980086440df031703c8b3d4536
+ a3ffd854799a85fd1ef5e882c9d8d38dc892509f42b656ea52ed0bd53e85a490
+ e82e73e7f8b16b182bc0aa64648e02177093b65aa175e4388fd46f6727ef1038
+ 35a8d5c2d2e576ec2f66faf137a1ee53daaa4ef8ff6bc0b13f5f77d0269c782a
+ 1401f6935ee94a4487e8d64cb58f2ce0074e91297b18083877ff6e85bc32b2f1
+ 76ab00d25a3131d90ba3a30927dab6e98d7c8ccd9c27b68e39228e62e3f53eb0
+ 0de92fd6614bafcf3a8a8f88367537f40ca3fd4963c73046d237ef857ae265bf
+ 3f47f20d655de331ee281d2f2e71f68a730e730be2eddcb6811ee2b3db9759e9
+ acc767c992a616c72306496611e1aa67cbd946dac8fba753c025788e8bf84947
+ 986526dec3da5a96f218d53b398e8e45358b66ab03f0e4a76adc0179fb39aace
+ ae2e0644fa1f620418e1cce9561b0816575721326aaf13e232f47afa323f0686
+ 6ee4c16de0a36febf3ca0f2d80ed3d3afab3d90d12cbbd8c7f531ff50f93025e"

From 1fa285732c8e8b64ac89bd2cd0c6e92e94c9c55c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 12 May 2021 17:04:32 +0200
Subject: [PATCH 426/447] airspy: update to 1.0.10.

---
 srcpkgs/airspy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/airspy/template b/srcpkgs/airspy/template
index a81e3470d205..c259679d8ddd 100644
--- a/srcpkgs/airspy/template
+++ b/srcpkgs/airspy/template
@@ -1,7 +1,7 @@
 # Template file for 'airspy'
 pkgname=airspy
-version=1.0.9
-revision=2
+version=1.0.10
+revision=1
 wrksrc=airspyone_host-${version}
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,10 +12,10 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://airspy.com/"
 distfiles="https://github.com/airspy/airspyone_host/archive/v${version}.tar.gz"
-checksum=967ef256596d4527b81f007f77b91caec3e9f5ab148a8fec436a703db85234cc
+checksum=fcca23911c9a9da71cebeffeba708c59d1d6401eec6eb2dd73cae35b8ea3c613
 
 pre_configure() {
-	sed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' airspy-tools/52-airspy.rules
+	vsed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' airspy-tools/52-airspy.rules
 }
 
 libairspy_package() {

From d23cce42d7ccbc2f8e15480c5a61d4b1f3633d4a Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Wed, 12 May 2021 17:54:15 +0300
Subject: [PATCH 427/447] topgrade: update to 6.9.0.

---
 srcpkgs/topgrade/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 799ea0366cbb..cbfaee0378eb 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=6.8.0
+version=6.9.0
 revision=1
 build_style=cargo
 short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else"
@@ -8,4 +8,4 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/r-darwish/topgrade"
 distfiles="https://github.com/r-darwish/topgrade/archive/v${version}.tar.gz"
-checksum=7ed24e5ca728482fc1c862a61e091cb5dfa5353f733c3458fbe1fda662e8fd41
+checksum=6de7a3a79716d0b7626b4c8c76590a4e3ed0bd3e06c9a5ca7191bdca7d0f582b

From 00687240667ff033dbe2f92607cb9e7535886f34 Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Thu, 13 May 2021 00:07:15 +0600
Subject: [PATCH 428/447] pnpm: update to 6.3.0

---
 srcpkgs/pnpm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 6de605f2e69f..24d7a6dc7f51 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,6 +1,6 @@
 # Template file for 'pnpm'
 pkgname=pnpm
-version=6.1.0
+version=6.3.0
 revision=1
 build_style=fetch
 hostmakedepends="nodejs jq"
@@ -10,7 +10,7 @@ maintainer="reback00 <reback00@protonmail.com>"
 license="MIT"
 homepage="https://pnpm.js.org/"
 distfiles="https://registry.npmjs.org/${pkgname}/-/${pkgname}-${version}.tgz"
-checksum=29edaaee2babbeb34309421b24cbe8f36b05066abba6ab14c97f7483ad5e3378
+checksum=eebd1dfe4466e5e84fb83332c5bf0e970002eedcb1cae8922257a477d67c5636
 python_version=3
 
 do_install() {

From 683154aa293f83b82404e27c897955d811c0366b Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 12 May 2021 19:42:47 +0200
Subject: [PATCH 429/447] razergenie: update to 0.9.0

---
 srcpkgs/razergenie/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/razergenie/template b/srcpkgs/razergenie/template
index 33626a19ccc8..53cb9757b60a 100644
--- a/srcpkgs/razergenie/template
+++ b/srcpkgs/razergenie/template
@@ -1,6 +1,6 @@
 # Template file for 'razergenie'
 pkgname=razergenie
-version=0.8.1
+version=0.9.0
 revision=1
 wrksrc="RazerGenie-${version}"
 build_style=meson
@@ -12,4 +12,4 @@ maintainer="Luca Weiss <luca@z3ntu.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/z3ntu/RazerGenie"
 distfiles="https://github.com/z3ntu/RazerGenie/releases/download/v${version}/RazerGenie-${version}.tar.xz"
-checksum=2da308d70a88accf2a98899f0addef641fcedcbf69f99fffc69bb111f953b70e
+checksum=e4a35ce56f7a8bc102afaca121668831dab876a6f487849bce46b0c6613aa85e

From d18f6d2a6e36c7ebd3e9212e34d57fbfed00ecba Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 12 May 2021 19:41:28 +0200
Subject: [PATCH 430/447] openrazer-meta: update to 3.0.1

---
 srcpkgs/openrazer-meta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template
index 0b74bb4ebb9e..8a3f15ff6f6a 100644
--- a/srcpkgs/openrazer-meta/template
+++ b/srcpkgs/openrazer-meta/template
@@ -1,6 +1,6 @@
 # Template file for 'openrazer-meta'
 pkgname=openrazer-meta
-version=2.9.0
+version=3.0.1
 revision=1
 wrksrc="openrazer-${version}"
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Luca Weiss <luca@z3ntu.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://openrazer.github.io"
 distfiles="https://github.com/openrazer/openrazer/releases/download/v${version}/openrazer-${version}.tar.xz"
-checksum=c2b52debfd16ae1f319720c1db294f1d8a274b4a5736ac8a3eb27a680180254b
+checksum=b27a7ab459e5290f9fe4d56f49922f97ed83fc92ba2bc0154aff8c4cdd1de73f
 
 do_build() {
 	:

From 3c11307f8c9bcd6178cba97138c2cceb59496a43 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 12 May 2021 10:36:47 +0200
Subject: [PATCH 431/447] hdparm: update to 9.62.

---
 srcpkgs/hdparm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hdparm/template b/srcpkgs/hdparm/template
index f742d1e42891..1f8a58fb6db2 100644
--- a/srcpkgs/hdparm/template
+++ b/srcpkgs/hdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'hdparm'
 pkgname=hdparm
-version=9.61
+version=9.62
 revision=1
 build_style=gnu-makefile
 make_install_args="exec_prefix=/usr sbindir=/usr/bin"
@@ -9,7 +9,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="0BSD" # Upstream is very unclear and names their stuff 'bsd-style'
 homepage="https://sourceforge.net/projects/hdparm/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=da1a1c3887f10b8397e8e02013caa61142e0e72cb0d73997421ca2f2f4df5343
+checksum=2c0f9d75cdbeda928a25a128cd3d0b7120445ec0910c0b29d4c1038ed1be777f
 
 post_install() {
 	vlicense LICENSE.TXT

From 4de1c388f4066fbbb6168938066b9121e0f1067c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 12 May 2021 20:54:27 +0200
Subject: [PATCH 432/447] linux5.4: update to 5.4.118.

---
 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 155eefa4b6b0..e73e72e35c7e 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.117
+version=5.4.118
 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=4e989b5775830092e5c76b5cca65ebff862ad0c87d0b58c3a20d415c3d4ec770
+checksum=d970509c274fd2f5a9257a63c56f7a8b3e50ec12015bd6864dc4b76b38dc821b
 python_version=3
 patch_args="-Np1"
 

From 86245762337d8908ff4b31286a1d3cb7ebdd8817 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 12 May 2021 20:59:00 +0200
Subject: [PATCH 433/447] libfilezilla: update to 0.28.0.

---
 common/shlibs                 | 2 +-
 srcpkgs/libfilezilla/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 421d9f677e80..0d53e2be7dfa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2582,7 +2582,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.12 libfilezilla-0.27.1_1
+libfilezilla.so.13 libfilezilla-0.28.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 612ca6852ac0..65267f53cb33 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.27.1
+version=0.28.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=400ef405c49fa486953b28b2bccdc445357a0650168a17a912936a5e6db9d840
+checksum=e7c021070e6101838728b19691d0c480924f4640e5b04adf41e35206e7041638
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From c0b30253f4516a48e9b4816b5534e9b99a572d5a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 12 May 2021 21:29:54 +0200
Subject: [PATCH 434/447] filezilla: update to 3.54.0.

---
 srcpkgs/filezilla/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 1ac4a2bd9525..5f57fe407281 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.53.1
+version=3.54.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=656874f2eaec54672c72f41ea5ea149c50197c50de5d6748bb41d722bfc3f779
+checksum=5a167b678391d8962f924dbdff8ea488dc13c21ee5c0e3276acd7a97bd65f48e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From fcdb2fb40e8854e7d3c9c92d7d2bd8a31ce12318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 12 May 2021 17:05:09 -0300
Subject: [PATCH 435/447] =?UTF-8?q?.mailmap:=20add=20=C3=89rico=20Rolim=20?=
 =?UTF-8?q?alias.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index b0305c467b92..0692788d3f38 100644
--- a/.mailmap
+++ b/.mailmap
@@ -55,3 +55,5 @@ teldra <teldra@rotce.de> xor <aur@rotce.de>
 Andrew J. Hesford <ajh@sideband.org> Andrew J. Hesford <ahesford@gleason.com>
 
 howtologinquickwiththirtyninecharacters <howtologinquickwiththirtyninecharacters@users.noreply.github.com> It looks like the profile name is limited to 256 characters, just like most error messages here it says 255 characters but we know better, do we? As usual, let's try to fill it with meaningless words about nothing at all. Maybe I can reach its limit. End <61999526+howtologinquickwiththirtyninecharacters@users.noreply.github.com>
+
+Érico Nogueira <erico.erc@gmail.com> Érico Rolim <erico.erc@gmail.com>

From 3d37c843c35c3baab269fcf3146aa2acdf8e2490 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 11 May 2021 16:25:03 -0500
Subject: [PATCH 436/447] nvidia: update to 460.80.

---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index dd974995916d..f003d51545df 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=460.73.01
+version=460.80
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=11b1c918de26799e9ee3dc5db13d8630922b6aa602b9af3fbbd11a9a8aab1e88
+checksum=ca6cb416d52ee5672b35b63df187e491698b27e5ceb4d7967c1483ffb91d09f8
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}

From 36f9fd20e4a1678ac1b79d4f92dfe9fabd5f96d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 13 May 2021 00:46:43 -0300
Subject: [PATCH 437/447] libepoxy: update to 1.5.7.

---
 srcpkgs/libepoxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libepoxy/template b/srcpkgs/libepoxy/template
index 3c2b44e721c8..ae914b24c3d5 100644
--- a/srcpkgs/libepoxy/template
+++ b/srcpkgs/libepoxy/template
@@ -1,6 +1,6 @@
 # Template file for 'libepoxy'
 pkgname=libepoxy
-version=1.5.5
+version=1.5.7
 revision=1
 build_style=meson
 hostmakedepends="pkg-config xorg-util-macros"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/anholt/libepoxy"
 changelog="https://github.com/anholt/libepoxy/releases"
 distfiles="https://github.com/anholt/libepoxy/archive/${version}.tar.gz"
-checksum=5d80a43a6524a1ebdd0c9c5d5105295546a0794681853c636a0c70f8f9c658ce
+checksum=b9e22ba707d0e723e9665c67a2b2974a86f4c4c27e3009dde24a988d1aadf643
 
 post_install() {
 	vlicense COPYING

From 3797d2deca5fa134c96ac40bd70a101b0601c68c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 13 May 2021 00:46:48 -0300
Subject: [PATCH 438/447] wpebackend-fdo: update to 1.8.4.

---
 srcpkgs/wpebackend-fdo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpebackend-fdo/template b/srcpkgs/wpebackend-fdo/template
index e0588805cbc9..d2fc65ffd6bd 100644
--- a/srcpkgs/wpebackend-fdo/template
+++ b/srcpkgs/wpebackend-fdo/template
@@ -1,6 +1,6 @@
 # Template file for 'wpebackend-fdo'
 pkgname=wpebackend-fdo
-version=1.8.3
+version=1.8.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -10,7 +10,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="BSD-2-Clause"
 homepage="https://wpewebkit.org"
 distfiles="https://wpewebkit.org/releases/${pkgname}-${version}.tar.xz"
-checksum=3d0b4282a1bd9e0664d7a20abe14e982f3285296ac62de56cae2a404b9d28b9e
+checksum=def59bed5e8cdabb65ffa76ee2eef349fba7b42a75dac80f3da5954b17f4074a
 
 post_install() {
 	vlicense COPYING

From 33dfbeb238f9c6df354ad1ad17bbd649c75250b7 Mon Sep 17 00:00:00 2001
From: Anubhav Kini <anubhavkini@gmail.com>
Date: Wed, 12 May 2021 14:55:22 +0530
Subject: [PATCH 439/447] opentyrian: update outdated homepage

---
 srcpkgs/opentyrian/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index a9ae953da179..2f70a3b2a0a2 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -11,7 +11,7 @@ makedepends="SDL_net-devel"
 short_desc="OSS port of the DOS shoot-em-up Tyrian"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
+homepage="https://github.com/opentyrian/opentyrian"
 distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
  http://camanis.net/tyrian/tyrian${_dataver}.zip"
 checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f

From 74540558a8576931a184af0e9c824aeda6b614a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 12 May 2021 17:42:38 -0300
Subject: [PATCH 440/447] libinput: update to 1.17.2.

---
 srcpkgs/libinput/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 9a7244523b00..630b7c6f69dc 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=e51c50f3ce253961bed452d9f93102cc26128406975ab88ff9ec9e6c3b875137
+checksum=b822263086b6588b9a9a153be97dea409f63927fb67b9a241748e76f222a5be1
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"

From bddd5e60e244e4d1d8d664b74d6792084eb7c2bb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:22:15 -0700
Subject: [PATCH 441/447] reaver: upgrade to 1.6.6

Also cleans up past template mistakes made in the 1.4 to 1.6.5
transition:
Remove commented out lines referencing the sqlite database
Remove commented-out do_install override
Remove u_char -> unsigned char sed (u_char still present in source but
    upstream fixed build breaks.

reaver-wps-fork-t6x commit 46ccf2e268f7 has the database removal,
d559537b7021 has the u_char fix, and 8977bdf66e43 fixes the destdir
breakage that required the do_install override.

Fixes: 09da89673e64 ("reaver: update to 1.6.5")
---
 srcpkgs/reaver/template | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/reaver/template b/srcpkgs/reaver/template
index 67f2f9a29854..2275ccd0881e 100644
--- a/srcpkgs/reaver/template
+++ b/srcpkgs/reaver/template
@@ -1,29 +1,13 @@
 # Template file for 'reaver'
 pkgname=reaver
-version=1.6.5
-revision=2
-build_style=gnu-configure
+version=1.6.6
+revision=1
 build_wrksrc="src"
-#conf_files="/etc/reaver/reaver.db"
+build_style=gnu-configure
 makedepends="libpcap-devel"
 short_desc="Brute force attack tool against Wifi Protected Setup (WPS)"
 maintainer="cipr3s <cipr3s@gmx.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/t6x/reaver-wps-fork-t6x"
 distfiles="https://github.com/t6x/reaver-wps-fork-t6x/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=342e9d265cf459bd2387205b73a63d1fc7582e268f0e9aec20613f3ec11b6a6b
-
-post_extract() {
-	case "$XBPS_TARGET_MACHINE" in
-	*-musl) find -type f -exec sed -i "{}" -e"s;u_char;unsigned char;g" \;
-		;;
-	esac
-}
-
-#do_install() {
-#	# The Makefile's install target is broken (ignores destdir)
-#	vmkdir etc/${pkgname}
-#	vinstall ${pkgname}.db 644 etc/${pkgname}
-#	vbin wash
-#	vbin reaver
-#}
+checksum=e329a0da0b6dd888916046535ff86a6aa144644561937954e560bb1810ab6702

From 09475c27e7eab6dfae1d4955b9ccc33a626fa0cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?=
 <louisdb@lespetitspedestres.org>
Date: Tue, 11 May 2021 15:48:52 +0300
Subject: [PATCH 442/447] New package: kpkpass 21.04.0

---
 srcpkgs/kpkpass-devel    |  1 +
 srcpkgs/kpkpass/template | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 120000 srcpkgs/kpkpass-devel
 create mode 100644 srcpkgs/kpkpass/template

diff --git a/srcpkgs/kpkpass-devel b/srcpkgs/kpkpass-devel
new file mode 120000
index 000000000000..35f208ff1de3
--- /dev/null
+++ b/srcpkgs/kpkpass-devel
@@ -0,0 +1 @@
+kpkpass
\ No newline at end of file
diff --git a/srcpkgs/kpkpass/template b/srcpkgs/kpkpass/template
new file mode 100644
index 000000000000..94086b03d41e
--- /dev/null
+++ b/srcpkgs/kpkpass/template
@@ -0,0 +1,23 @@
+# Template file for 'kpkpass'
+pkgname=kpkpass
+version=21.04.0
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools shared-mime-info"
+makedepends="karchive-devel qt5-devel"
+short_desc="Apple Wallet Pass reader"
+maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
+license="LGPL-2.1-or-later"
+homepage="https://kontact.kde.org"
+distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
+checksum=b117e2b04f66e101662ef85a56e2636d78b4092e897f14ff0c27ce61874c2e68
+
+kpkpass-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 6e5418536a553312d45191e02a337a8917f074c3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 13 May 2021 12:32:15 +0200
Subject: [PATCH 443/447] kmymoney: fix segfault with qt5-5.15.3+20210429

---
 ...0aed4652a0e9ff0bffcade33827a6283aaa1.patch | 174 ++++++++++++++++++
 srcpkgs/kmymoney/template                     |   3 +-
 2 files changed, 176 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kmymoney/patches/de390aed4652a0e9ff0bffcade33827a6283aaa1.patch

diff --git a/srcpkgs/kmymoney/patches/de390aed4652a0e9ff0bffcade33827a6283aaa1.patch b/srcpkgs/kmymoney/patches/de390aed4652a0e9ff0bffcade33827a6283aaa1.patch
new file mode 100644
index 000000000000..a84104b9fb62
--- /dev/null
+++ b/srcpkgs/kmymoney/patches/de390aed4652a0e9ff0bffcade33827a6283aaa1.patch
@@ -0,0 +1,174 @@
+From de390aed4652a0e9ff0bffcade33827a6283aaa1 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 8 Apr 2021 22:57:29 +0200
+Subject: [PATCH] Fix crash with newer Qt versions
+
+Newer Qt versions call filterAcceptsRow from QSortFilterProxyModel::setSourceModel so we need to call AccountsProxyModel::setSourceColumns before setSourceModel
+---
+ kmymoney/converter/mymoneystatementreader.cpp        | 2 +-
+ kmymoney/dialogs/kaccountselectdlg.cpp               | 2 +-
+ kmymoney/dialogs/knewaccountdlg.cpp                  | 2 +-
+ kmymoney/views/kgloballedgerview_p.h                 | 2 +-
+ kmymoney/views/kinvestmentview_p.h                   | 2 +-
+ kmymoney/views/kpayeesview_p.h                       | 2 +-
+ kmymoney/views/newspliteditor.cpp                    | 2 +-
+ kmymoney/views/newtransactioneditor.cpp              | 2 +-
+ kmymoney/views/simpleledgerview.cpp                  | 2 +-
+ kmymoney/widgets/kmymoneyaccounttreeview.cpp         | 2 +-
+ kmymoney/wizards/newaccountwizard/khierarchypage.cpp | 2 +-
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/kmymoney/converter/mymoneystatementreader.cpp b/kmymoney/converter/mymoneystatementreader.cpp
+index af9a6a345..2158f5ba7 100644
+--- a/kmymoney/converter/mymoneystatementreader.cpp
++++ b/kmymoney/converter/mymoneystatementreader.cpp
+@@ -1043,8 +1043,8 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
+                     filterProxyModel->addAccountGroup(QVector<Account::Type> {Account::Type::Asset, Account::Type::Liability, Account::Type::Equity, Account::Type::Income, Account::Type::Expense});
+ 
+                     auto const model = Models::instance()->accountsModel();
+-                    filterProxyModel->setSourceModel(model);
+                     filterProxyModel->setSourceColumns(model->getColumns());
++                    filterProxyModel->setSourceModel(model);
+                     filterProxyModel->sort((int)eAccountsModel::Column::Account);
+ 
+                     QPointer<KMyMoneyAccountCombo> accountCombo = new KMyMoneyAccountCombo(filterProxyModel);
+diff --git a/kmymoney/dialogs/kaccountselectdlg.cpp b/kmymoney/dialogs/kaccountselectdlg.cpp
+index 8495ab8c1..21b939873 100644
+--- a/kmymoney/dialogs/kaccountselectdlg.cpp
++++ b/kmymoney/dialogs/kaccountselectdlg.cpp
+@@ -123,8 +123,8 @@ KAccountSelectDlg::KAccountSelectDlg(const eDialogs::Category accountType, const
+     filterProxyModel->addAccountGroup(accountTypes);
+ 
+     auto model = Models::instance()->accountsModel();
+-    filterProxyModel->setSourceModel(model);
+     filterProxyModel->setSourceColumns(model->getColumns());
++    filterProxyModel->setSourceModel(model);
+     filterProxyModel->sort((int)eAccountsModel::Column::Account);
+ 
+     d->ui->m_accountSelector->setModel(filterProxyModel);
+diff --git a/kmymoney/dialogs/knewaccountdlg.cpp b/kmymoney/dialogs/knewaccountdlg.cpp
+index c8b37b41e..d6c8b8bf4 100644
+--- a/kmymoney/dialogs/knewaccountdlg.cpp
++++ b/kmymoney/dialogs/knewaccountdlg.cpp
+@@ -124,8 +124,8 @@ class KNewAccountDlgPrivate
+         m_filterProxyModel->addAccountGroup(filterAccountGroup);
+         m_filterProxyModel->setCurrentAccountId(m_account.id());
+         auto const model = Models::instance()->accountsModel();
+-        m_filterProxyModel->setSourceModel(model);
+         m_filterProxyModel->setSourceColumns(model->getColumns());
++        m_filterProxyModel->setSourceModel(model);
+         m_filterProxyModel->setDynamicSortFilter(true);
+ 
+         ui->m_parentAccounts->setModel(m_filterProxyModel);
+diff --git a/kmymoney/views/kgloballedgerview_p.h b/kmymoney/views/kgloballedgerview_p.h
+index 69ee133b9..50862ccdb 100644
+--- a/kmymoney/views/kgloballedgerview_p.h
++++ b/kmymoney/views/kgloballedgerview_p.h
+@@ -271,8 +271,8 @@ class KGlobalLedgerViewPrivate : public KMyMoneyViewBasePrivate
+         m_filterProxyModel = new AccountNamesFilterProxyModel(q);
+         m_filterProxyModel->addAccountGroup(QVector<eMyMoney::Account::Type> {eMyMoney::Account::Type::Asset, eMyMoney::Account::Type::Liability, eMyMoney::Account::Type::Equity});
+         auto const model = Models::instance()->accountsModel();
+-        m_filterProxyModel->setSourceModel(model);
+         m_filterProxyModel->setSourceColumns(model->getColumns());
++        m_filterProxyModel->setSourceModel(model);
+         m_filterProxyModel->sort((int)eAccountsModel::Column::Account);
+ 
+         // create the toolbar frame at the top of the view
+diff --git a/kmymoney/views/kinvestmentview_p.h b/kmymoney/views/kinvestmentview_p.h
+index 34db5d117..66bb87483 100644
+--- a/kmymoney/views/kinvestmentview_p.h
++++ b/kmymoney/views/kinvestmentview_p.h
+@@ -104,8 +104,8 @@ class KInvestmentViewPrivate : public KMyMoneyViewBasePrivate
+         m_accountsProxyModel->addAccountType(eMyMoney::Account::Type::Investment);
+         m_accountsProxyModel->setHideEquityAccounts(false);
+         auto const model = Models::instance()->accountsModel();
+-        m_accountsProxyModel->setSourceModel(model);
+         m_accountsProxyModel->setSourceColumns(model->getColumns());
++        m_accountsProxyModel->setSourceModel(model);
+         m_accountsProxyModel->sort((int)eAccountsModel::Column::Account);
+         ui->m_accountComboBox->setModel(m_accountsProxyModel);
+         ui->m_accountComboBox->expandAll();
+diff --git a/kmymoney/views/kpayeesview_p.h b/kmymoney/views/kpayeesview_p.h
+index fd9d6b706..771a1e060 100644
+--- a/kmymoney/views/kpayeesview_p.h
++++ b/kmymoney/views/kpayeesview_p.h
+@@ -146,8 +146,8 @@ class KPayeesViewPrivate : public KMyMoneyViewBasePrivate
+         m_filterProxyModel->addAccountGroup(QVector<eMyMoney::Account::Type> {eMyMoney::Account::Type::Asset, eMyMoney::Account::Type::Liability, eMyMoney::Account::Type::Income, eMyMoney::Account::Type::Expense, eMyMoney::Account::Type::Equity});
+ 
+         auto const model = Models::instance()->accountsModel();
+-        m_filterProxyModel->setSourceModel(model);
+         m_filterProxyModel->setSourceColumns(model->getColumns());
++        m_filterProxyModel->setSourceModel(model);
+         m_filterProxyModel->sort((int)eAccountsModel::Column::Account);
+         ui->comboDefaultCategory->setModel(m_filterProxyModel);
+ 
+diff --git a/kmymoney/views/newspliteditor.cpp b/kmymoney/views/newspliteditor.cpp
+index 0272507de..c71f7f784 100644
+--- a/kmymoney/views/newspliteditor.cpp
++++ b/kmymoney/views/newspliteditor.cpp
+@@ -200,8 +200,8 @@ NewSplitEditor::NewSplitEditor(QWidget* parent, const QString& counterAccountId)
+     d->accountsModel->addAccountGroup(QVector<eMyMoney::Account::Type> {eMyMoney::Account::Type::Asset, eMyMoney::Account::Type::Liability, eMyMoney::Account::Type::Income, eMyMoney::Account::Type::Expense, eMyMoney::Account::Type::Equity,});
+     d->accountsModel->setHideEquityAccounts(false);
+     auto const model = Models::instance()->accountsModel();
+-    d->accountsModel->setSourceModel(model);
+     d->accountsModel->setSourceColumns(model->getColumns());
++    d->accountsModel->setSourceModel(model);
+     d->accountsModel->sort((int)eAccountsModel::Column::Account);
+     d->ui->accountCombo->setModel(d->accountsModel);
+ 
+diff --git a/kmymoney/views/newtransactioneditor.cpp b/kmymoney/views/newtransactioneditor.cpp
+index 0163d233e..5fc5cf6e0 100644
+--- a/kmymoney/views/newtransactioneditor.cpp
++++ b/kmymoney/views/newtransactioneditor.cpp
+@@ -356,8 +356,8 @@ NewTransactionEditor::NewTransactionEditor(QWidget* parent, const QString& accou
+ 
+     d->accountsModel->addAccountGroup(QVector<eMyMoney::Account::Type> {eMyMoney::Account::Type::Asset, eMyMoney::Account::Type::Liability, eMyMoney::Account::Type::Income, eMyMoney::Account::Type::Expense, eMyMoney::Account::Type::Equity});
+     d->accountsModel->setHideEquityAccounts(false);
+-    d->accountsModel->setSourceModel(model);
+     d->accountsModel->setSourceColumns(model->getColumns());
++    d->accountsModel->setSourceModel(model);
+     d->accountsModel->sort((int)eAccountsModel::Column::Account);
+     d->ui->accountCombo->setModel(d->accountsModel);
+ 
+diff --git a/kmymoney/views/simpleledgerview.cpp b/kmymoney/views/simpleledgerview.cpp
+index 99a6d790c..64dc303bc 100644
+--- a/kmymoney/views/simpleledgerview.cpp
++++ b/kmymoney/views/simpleledgerview.cpp
+@@ -95,8 +95,8 @@ class SimpleLedgerViewPrivate : public KMyMoneyViewBasePrivate
+ 
+         accountsModel->setHideEquityAccounts(false);
+         auto const model = Models::instance()->accountsModel();
+-        accountsModel->setSourceModel(model);
+         accountsModel->setSourceColumns(model->getColumns());
++        accountsModel->setSourceModel(model);
+         accountsModel->sort((int)eAccountsModel::Column::Account);
+         ui->accountCombo->setModel(accountsModel);
+ 
+diff --git a/kmymoney/widgets/kmymoneyaccounttreeview.cpp b/kmymoney/widgets/kmymoneyaccounttreeview.cpp
+index 61271106d..1d0ee59ca 100644
+--- a/kmymoney/widgets/kmymoneyaccounttreeview.cpp
++++ b/kmymoney/widgets/kmymoneyaccounttreeview.cpp
+@@ -167,8 +167,8 @@ AccountsViewProxyModel *KMyMoneyAccountTreeView::init(View view)
+         institutionsModel->setColumnVisibility(column, true);
+     }
+ 
+-    d->m_model->setSourceModel(sourceModel);
+     d->m_model->setSourceColumns(sourceModel->getColumns());
++    d->m_model->setSourceModel(sourceModel);
+     d->m_model->setFilterCaseSensitivity(Qt::CaseInsensitive);
+     d->m_model->setSortLocaleAware(true);
+     setModel(d->m_model);
+diff --git a/kmymoney/wizards/newaccountwizard/khierarchypage.cpp b/kmymoney/wizards/newaccountwizard/khierarchypage.cpp
+index efd117205..456e781ce 100644
+--- a/kmymoney/wizards/newaccountwizard/khierarchypage.cpp
++++ b/kmymoney/wizards/newaccountwizard/khierarchypage.cpp
+@@ -53,8 +53,8 @@ HierarchyPage::HierarchyPage(Wizard* wizard) :
+     d->m_filterProxyModel->setHideEquityAccounts(!KMyMoneySettings::expertMode());
+     d->m_filterProxyModel->addAccountGroup(QVector<Account::Type> {Account::Type::Asset, Account::Type::Liability});
+     auto const model = Models::instance()->accountsModel();
+-    d->m_filterProxyModel->setSourceModel(model);
+     d->m_filterProxyModel->setSourceColumns(model->getColumns());
++    d->m_filterProxyModel->setSourceModel(model);
+     d->m_filterProxyModel->setDynamicSortFilter(true);
+ 
+     d->ui->m_parentAccounts->setModel(d->m_filterProxyModel);
diff --git a/srcpkgs/kmymoney/template b/srcpkgs/kmymoney/template
index 9ed8942e2886..3b7e889f93a8 100644
--- a/srcpkgs/kmymoney/template
+++ b/srcpkgs/kmymoney/template
@@ -1,7 +1,7 @@
 # Template file for 'kmymoney'
 pkgname=kmymoney
 version=5.1.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson
  -DBUILD_TESTING=OFF"
@@ -19,6 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://kmymoney.org"
 distfiles="${KDE_SITE}/kmymoney/${version}/src/${pkgname}-${version}.tar.xz"
 checksum=df7b9f78e8596f99d28295ca738708f0655ee057789dfd921c7b1bab96578298
+patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DENABLE_LIBICAL=0"

From 3f575325dcc3bdfc419824518bac6d4c38241859 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 12 May 2021 07:29:59 -0400
Subject: [PATCH 444/447] chromium: update to 90.0.4430.212.

- Built for x86_64, x86_64-musl.
- Tested on x86_64.
---
 srcpkgs/chromium/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 3276f5b667df..1110f36a13fd 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
-version=90.0.4430.85
+version=90.0.4430.212
 revision=1
 archs="i686* x86_64* aarch64* armv7l* ppc64le*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=01c5594d4b7eaa67e00b4fa16ae0c9d35ec5917467abd387ba1b5cc332d44922
+checksum=abe11d0cb1ff21278aad2eec1a1e279d59176b15331804d7df1807446786d59e
 nocross=yes
 
 lib32disabled=yes
@@ -191,7 +191,6 @@ do_configure() {
 
 	conf+=(
 		"rtc_use_pipewire=$(vopt_if pipewire true false)"
-		'rtc_pipewire_version="0.3"'
 	)
 
 	# Use explicit library dependencies instead of dlopen.

From 661657d9068025d3e65f3cd0d6661885a6d3f46a Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 12 May 2021 07:32:58 -0400
Subject: [PATCH 445/447] chromium-widevine: update to 90.0.4430.212.

---
 srcpkgs/chromium-widevine/INSTALL  | 2 +-
 srcpkgs/chromium-widevine/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium-widevine/INSTALL b/srcpkgs/chromium-widevine/INSTALL
index 3f5b65d3fc64..61d41e2a5c1a 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
 # INSTALL
 
-checksum=39de976ede3d759fd696e59bd7ac3447093ab67b65972a41caa557edbee12952
+checksum=274b473c4b4a3bcd0839e777ed466550daceae4352570ca4f342e824506163f8
 _baseUrl="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable"
 _filename="google-chrome-stable_${VERSION%_*}-1_amd64.deb"
 DISTFILE="${_baseUrl}/${_filename}"
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index c8b624d2819c..b17e7989f1a6 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
 _channel="stable"
 
 pkgname=chromium-widevine
-version=90.0.4430.85
+version=90.0.4430.212
 revision=1
 archs="x86_64"
 create_wrksrc=yes

From e124b8bf672f1a8000a6b77d54ecb6b085fd5cbf Mon Sep 17 00:00:00 2001
From: Nuntius <admin@nuntius.dev>
Date: Sun, 18 Apr 2021 13:24:07 +0200
Subject: [PATCH 446/447] New package: obsidian-0.11.13

---
 srcpkgs/obsidian/files/LICENSE                |   1 +
 .../icons/hicolor/128x128/apps/obsidian.png   | Bin 0 -> 6643 bytes
 .../icons/hicolor/16x16/apps/obsidian.png     | Bin 0 -> 737 bytes
 .../icons/hicolor/256x256/apps/obsidian.png   | Bin 0 -> 13026 bytes
 .../icons/hicolor/32x32/apps/obsidian.png     | Bin 0 -> 1553 bytes
 .../icons/hicolor/48x48/apps/obsidian.png     | Bin 0 -> 2390 bytes
 .../icons/hicolor/512x512/apps/obsidian.png   | Bin 0 -> 14664 bytes
 .../icons/hicolor/64x64/apps/obsidian.png     | Bin 0 -> 3241 bytes
 srcpkgs/obsidian/files/obsidian.desktop       |  10 +++++
 srcpkgs/obsidian/template                     |  36 ++++++++++++++++++
 srcpkgs/obsidian/update                       |   2 +
 11 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/obsidian/files/LICENSE
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png
 create mode 100644 srcpkgs/obsidian/files/obsidian.desktop
 create mode 100644 srcpkgs/obsidian/template
 create mode 100644 srcpkgs/obsidian/update

diff --git a/srcpkgs/obsidian/files/LICENSE b/srcpkgs/obsidian/files/LICENSE
new file mode 100644
index 000000000000..2300567c2323
--- /dev/null
+++ b/srcpkgs/obsidian/files/LICENSE
@@ -0,0 +1 @@
+The current version of this license can be found at: https://obsidian.md/eula 
diff --git a/srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/128x128/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f23a08dc5d95965149978e4cf1677f4e317d873
GIT binary patch
literal 6643
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/16x16/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde9f6b77036ae1beefb1e539b32b128562ff9d1
GIT binary patch
literal 737
zcmV<70v`Q|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00080Nkl<Zc${QX
zO-~$05UuJS7D#5o0tqBptso&Nuu=deh$Od2$sdT6OQIYSCBGnvqU2`#Xd&5_eDK9W
z{sq4H;F~4;<_}~cu#II{K(<*}zSfI(rf0gUtZwh}p`BCp=+&!N?^OWJ@0-sqLjU`D
z5b;k00L{!cm+ORlZ}?rY_~E0kX2z@Q<q8ac^07z#_<IPdMPRM<eVZ@0u(PYv0c;Qi
zV{shM5z(!wFUKwvijm~=k#_jFk@~(Pg64<w8~+Lu4FJF_0L(M<Z-EXtm+SbYT1kE_
z6#LyItpjyTFg-jAh=|q_42A!_6UWJIMEu(r(_JWhM5WR=te1DWcF?%2l=>6^SZk$D
zDG(7IMWOWf_Whj1=5uB?qoX4-H8r8#xWjtF8*BSL3-iy<Irzrfp6?A#$fqa@6)OBo
zL}YUEi;ls80W>BBcFqa_5lh`9H3zQ0N=|v;jFF|q$3Fo;$w`dDNF_-MmKc}>tYt@l
zBJj|;FAS#$Tx`HB-z%l0(THWWybgd0$a1S$xtc65|NrNrS96lUKM?V%m!q}X+N!`|
z{k5M&mW3=UOKdE0d2(jR|2s)Qu1*qjS48f(L`-U^QrQF%1Zzp$DrEVE&1mz3!LUt%
zud~b_$0cS)tu$13wxQ98ff>ZhCway!_U82kB?4^()YsRGM0^7PRzyIhsbNO~f@0t9
z|0D>s^F%3)$0pui`^Wo0#9C{eipUkGLMff@?QL_C7?*@tqNSD9r`}kXOxr0VBE1`S
zW0qytl)^e9cA3nm{ev9^ppYyrH`9{ya}(_Z)>?_)3n7WqY7ppeMdYkPd{C?Jsw^|B
zfOt<poOV7ku2nSG00fktp2&fg0N_k%<m+i`vmf?r)jwFc0pf2)T77Q<00960{UVcZ
T40Dqb00000NkvXXu0mjfExuZt

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/256x256/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..5662efa89974184dc76b3fbb00ec90c558d5d537
GIT binary patch
literal 13026
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
SRtNA8psQu5`SFfj%>Mw>2Z?V0

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/32x32/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..0306b0322ee61667012fe3e5abbe54fc28172552
GIT binary patch
literal 1553
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
DTv_9J

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/48x48/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..bea7b668e4e382d660af3815a683d925d52d0594
GIT binary patch
literal 2390
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
IM6N<$f;x+SXaE2J

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/512x512/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dc489bfb99f441d2c9b07a7732898663884cc12
GIT binary patch
literal 14664
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png b/srcpkgs/obsidian/files/icons/hicolor/64x64/apps/obsidian.png
new file mode 100644
index 0000000000000000000000000000000000000000..edf7310010543ab673fcb7edf3478d966426558c
GIT binary patch
literal 3241
zcmV;a3|8}rP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000bdNkl<Zc%0N*
zeT-aH+5eq$@9s=@+iqz~d3pQwhL5)UwxwlTD7?uF0p&v?Ac`ggqliYq5I_;535fwU
z_76}SDpmxF;`c}3FXRv7M`AD#)Dld~riyf_`_<jq-I@KEnS1Yf%sKa*J7@0PncbPW
zQ|pu6`8adu-t+vP-}80O9T#Vi+_3Li^_<Vo!gU<JY4d-xd+xtUTzU<o-#kya`WBY@
zHO~kDjN)2YU*8HoTbK*v8^-~D@l>A8&zI==!?U>MW6M*$Hc$0zO^Q_9Ql4ppP!I%x
z5Mm1$p8M+?V^;)$py89_jyy<$kf!`w7!b3#6serFxDVhQ$8jFaWHWbh#(Gz+T6sya
zSRPo}x4fi5N|gzxodGfB9j%m9ei?wz0yqNT0S4CVb~z=^+19Qu=dnztJJ83cDyI#A
z7~Q#Lbpmi3fIk6v48VU$CJ+&2vzZL%T(aUW0PocdN!1lP4nTsRO9g~h{%Qcf2k;{R
z{RR-m;1Y;smu0{h<3tLi?*cem1E%Jk1_&LC0rAML75BB07Xf$(zz6l`fpttM1T4#D
z<S5slOJ*Db@Buw<k;XhzXF$y2&`Ob3em#H#0AAI~lUB~DnF|B55&(+MA;15A0C(!w
z%6RRvAXNYo6o*!D1%NN;0Cz8dOrq5-VT>V@?FJEnvFLo#>fZ!#o(7?9S4a(jE4M$P
zo~Nf~SP%r<Qt%EP;JyZ6t)4hFQe248>^(hMqdZIs)L<Ug@40?%SyBOD@BcgsGgIz3
zq%CzlfS2`TFSHbQ>rGlJ@B69%#K6Es2s{_3#`55tsehu#6|T^XYC9{W#sJP4E0xMT
z)7^a*=llf#zXEWXW`by>IJENRvWMQ@9$a?$CD^oS1IlF|<6{M!9Gb%Xd>M|*CC(0!
zI_D!2r*=U|4S?c8(V3r{7x{eQ?jQ(mW{i1S@!9~FAmwry=bn2GF8{wv(6@3Wip5em
zL5E>s-owcgQy3ebK@bpgTppIqgzqtitUiSTw^<O{20+mtV4mj(M6_H8@o8DhFGX=_
zbs6O3;aj#`fIWM5!*yJEo~J(pNQB2p?Q)ZIIPumbrgQV0bLMl0?GS?YcW2yyai&;6
z)ZF~jVt^AiG2(U*)(3tdsk*50zVE|v91INX!q%-9s`nvwq4M&9%)jakIXo}G@X09*
z{UhfV7d+o}o%_6UaP6MUdXy_jH#zw5J4>E;TZNFZzV`DjBKnM+yXOb2ktK}3uUfSd
zyLRosiWMtRDwWlEsC?zi(Mt^iRJ`FR6pEOgE%7yLdui>u6;J1<aZ&H`?DYIxi3MWm
zJV>JwG?Dox09z#(zVADfFb6|<>F*mhtjG54+oZ`97*h9I#mW5XLHQTH(^-L!jTC~}
zLTN*8V)mftdmnb)F6kb@QYYWC3ux;@2RdoG2g5p^K?FkmGdqbhhCq%Bf&Tuj*tKgX
zq-Xn{S5cV4X9^#}*Qkt<8Pl;rzIR>5=I6>ZHd45>ToUY=LoWx#1#iiEw95d~(Om^#
zpNaZXNk0hSxK5<J^zTe2gPl9KW8J#7D3{71ZaUaCvUcJ)Md%C0nG2%V8E4|g_w96=
zVL(d&Sk^c5`n>&KD&%`Uve|B>q@?_sHLI2KJv}|4ze`^?2U`k8VAzW52Wl_|U{C}k
zt4L-l$)!j;S-><o7X!G~%K6G4q{XE&(!V!v-h{n-2awHX)q54_kWBMvOjy*1MSYVU
z^qA!~NAG`RvwHpD{_~csMAHngtPc&q0~*MvIgtoR0OZFzcJyP@rj3db0g38hXVJV8
z?NMv(dgI}PqmLPU_}(`SES&>D3)dDuAHc2g=0^Iw=lSUG@5jcC>t&S~^$L;Img4iZ
zG_SZ#<ty^Uc_N%(VY}4SIzdw|U|HXEX7ScG0zeit`I$UqQ50FtE^I6%%@`J^dBsJ-
zanj!%5)@2?*fht0R$_p${yG33O=@lB9At$z^v+4l&o4yzzs8T_sm&;uq_`ai5P>H2
z*m2+UNeCp?ADsX|Ugc8&`r_6%B9$%{i}>g8FdXiLJ^m7cnw{fokJU^O77Ice9P92@
zizm#kJvspZ)4{G6z}@x&Wn4lQa10NRV18i%jMrg742-z76I}!rgM>Qf=$9Vfran;5
z9R$Eo{SyGr)vi$Y9E@?rf|22oS{5{*J|)Eq9r0pgj{er*Lw6l*Is>!<fVsfCwDR>Y
zD48mq(s3|6GNSr>6AKyywTiWo6fdl}5Dv<wD^DWK0Muj#XaxWxPwDU0{k~ck69U}f
z$^}NpMim%xtU*vq04Kpkh!7o47-E7=DDR{O21yA3)A+my;7$FyF6u@hhjWaKjG$C5
zR~9<z1hopyQ8iWz1_?cWoP7CCIL)iynhTir_lZRT5TT`|<>%(+Fg`vG&fN+Nl7d<_
z&8w7#HD=We$Iz{wSu5+qt+;?mdp`s)Y4rqE!VInTGgmAaR?A&x#U~-C)datKV1(&X
zjUD~+q5oB%$>)v&@Y>s-gT;azfFD>ZLNy2os?@rY1+%lWn3y<a#e!-D>juQC@dzMC
zA2#^KkH1k>Rd);kOH3^IHUO{QCP%y~Q!E%A(Tx&IRJ_L8sLcc#8+n2}5uMN-R!e(@
z?EoOZJE+(HO@UMmfUuXiNVA}TTrQ{T0$IDp+uj-$gfxe!21EA%7@`2W2RKa(&~9MM
zfqLh%bGi|k1x81Q5r{xFa#hwA34KBh1JtoX<8VCiWCDm<;-;mY1rZYre+S?%NwFZV
zykS9pHjk;PDU}{cP)&rdNBycAA^hGkx0{7M!080QVu9JQJs59@m}T9#$OFg5M^tG{
zjY?yx6t_vOGyzBVKeJPPzW?c+t*FxW#)x6T&jE~BfP{sasEy5GN_3IW&tPU|8eGPL
z$ing3zZM*Q4o8DD_`pYwG`$93OUnSnQer{x0wZ1+sU@2jLCvz**r}0Z%U07o&H{Bx
z)dNuLJ%Eukw#LlGp9HXA7e-;bT5Fsr7UZW<DC8{`P(0mLz^Q-{tpZWtO+*)JQPKiH
zDt!XL3-MrBZ<os42r)h}YQ=#XYbTY<La&1yCr?P*w{`1WTL2`a#K-OPCZ$0mh6OV-
zQ<$48RIwl)2kLZ%$5?ll$^h-?kk;;SpwIP3eOHLNMW!J;Lly{}nivBRV?pAYp*0R1
zeeAi56+n-Ee|O6hZyNxM1?F6j+n+ZAAYws&N_C5j@u~s{@dhbeLvS=0gZJI`=awtL
z_@vVilM-bdcw5E=Rk2m>@=6r5gg%)Y4{L|S&M*Rl6y<dfpjVjMx?eCA0AeYzs51go
z3|wTN&ahxQpTk0NLERTwqj<CiK*kG(C}0!e3C<h_z)FdSb#34*ihyB(?;|%g9@|5x
zi2*{79rpv-1BjM;03)3MK(b(zG5nM<S+LNeTh$Q@W^yQ&iWOH#XoR#Y9P4t!RiJi%
zLy{T*v6RRd<KGHh086rxx`!a}Fg1ND3Wl})fC;K}^uSLB6#ozWc%ZF$cj9hw6%2C|
z(?^Ktw?ra&#V97KM_?Q?`5a2+l45~~tp<lZK$rpU`Os@^X8@!PfSnROuPk%?0ee|&
z(aA6l&o5(UW-?@fsHz1>XPLaNI+4a5<DL4wfWNi>0yaJ|{t|#e9lRI4aYyQ?SWuWm
z*(=AJC<EgV5Uv6>+?ZLSqz-^#f#>^9x#)Y2<2*q`E`Tn5h~LO^iUnQ?`Ft*9K}AQi
z6ZKZoj&!Tiu^&vhjuUL(v5oaCTXvW+wi>|A0Cro~B&&pu3=y`^9Qnc|`c|%1ueC61
zIX*Q>|Cfkb-o5)tbZ5HN>#!PBm)Zy5763N_uov-#wb06C01SkWb!#_ZRo^=KI$%&p
zybfTG29FN@Y;W81?D%hn78Z)kvid9fHuqfs{vW_M0Q^nQ!!<Ww5XfhY(R6+iLilFO
zM?QRIu^s7VrDFj6`p75M^Ri`GVvPCL^;{hX{-A#*w^I^EZ?&B;$8hGba(O`%W~a-X
zJDiA)=strlC9N)1I_3g#N%#>JPuNfB1#qSQVbpa*Vtsd478}=Zku11%rZD--l`B@O
zn={j(KTanAw$uRwwq*&_$H1>561ShdX8l<=U3blOho1Y6*mnM2l@|V^0kEY$7_x_8
zs+NA~)jKiq3gJDse---%u1`&QoC&`kfAN(&qSrU<dzLCJP-(+)xU0s#{^Z{~a{Ye=
b00960OfSclv?Uml00000NkvXXu0mjfMT7o2

literal 0
HcmV?d00001

diff --git a/srcpkgs/obsidian/files/obsidian.desktop b/srcpkgs/obsidian/files/obsidian.desktop
new file mode 100644
index 000000000000..faf569631b21
--- /dev/null
+++ b/srcpkgs/obsidian/files/obsidian.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Obsidian
+Exec=/opt/Obsidian/obsidian %U
+Terminal=false
+Type=Application
+Icon=obsidian
+StartupWMClass=obsidian
+Comment=Obsidian
+MimeType=x-scheme-handler/obsidian;
+Categories=Office;
diff --git a/srcpkgs/obsidian/template b/srcpkgs/obsidian/template
new file mode 100644
index 000000000000..054d5509d3fd
--- /dev/null
+++ b/srcpkgs/obsidian/template
@@ -0,0 +1,36 @@
+# Template file for 'obsidian'
+pkgname=obsidian
+version=0.11.13
+revision=1
+archs="x86_64"
+wrksrc="obsidian-${version}"
+short_desc="Chat and VOIP application"
+maintainer="Hugo Melder <contact@nuntius.dev>"
+license="custom:Proprietary"
+homepage="https://obsidian.md"
+distfiles="https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"
+checksum=d102f5acfdfba6674874633d7876bb3df5b5195aef9f67d7e1b40fa90f053a92
+repository=nonfree
+restricted=yes
+nopie=yes
+
+do_install() {
+	local package_location="usr/lib/$pkgname" item
+	vmkdir usr/share
+	vcopy $FILESDIR/icons /usr/share
+	vmkdir usr/share/applications
+	vcopy $FILESDIR/obsidian.desktop /usr/share/applications/
+	vmkdir ${package_location}
+	chmod +x obsidian
+	for item in locales resources obsidian libffmpeg.so snapshot_blob.bin \
+	icudtl.dat libEGL.so libGLESv2.so chrome_100_percent.pak chrome_200_percent.pak \
+	chrome-sandbox resources.pak swiftshader v8_context_snapshot.bin \
+	libvk_swiftshader.so libvulkan.so; do
+		vcopy "${item}" "${package_location}"
+	done
+	vmkdir usr/bin
+	ln -sfr $DESTDIR/${package_location}/obsidian $DESTDIR/usr/bin/obsidian
+}
+post_install() {
+	vlicense $FILESDIR/LICENSE
+}
diff --git a/srcpkgs/obsidian/update b/srcpkgs/obsidian/update
new file mode 100644
index 000000000000..ed82c41bd17c
--- /dev/null
+++ b/srcpkgs/obsidian/update
@@ -0,0 +1,2 @@
+site="https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json"
+pattern="\"latestVersion\":\s*\"\K[\d.]+(?=\")"

From b833f624d71c6e7b6472e021f9f36e7d761f130f Mon Sep 17 00:00:00 2001
From: Nuntius <admin@nuntius.dev>
Date: Thu, 13 May 2021 14:20:17 +0200
Subject: [PATCH 447/447] Update

---
 srcpkgs/dotnet-sdk/template | 46 +++++++++++++++++++++++++++
 srcpkgs/jellyfin/template   | 62 +++++++++++++++++++++++++++++++++++++
 srcpkgs/obsidian/template   |  2 +-
 3 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dotnet-sdk/template
 create mode 100644 srcpkgs/jellyfin/template

diff --git a/srcpkgs/dotnet-sdk/template b/srcpkgs/dotnet-sdk/template
new file mode 100644
index 000000000000..9855b0e49719
--- /dev/null
+++ b/srcpkgs/dotnet-sdk/template
@@ -0,0 +1,46 @@
+# Template file for 'dotnet-sdk'
+pkgname=dotnet-sdk
+version=2.2.203
+revision=1
+archs="x86_64 armv7 aarch64"
+wrksrc="${pkgname}-${version}"
+create_wrksrc=yes
+short_desc="Provides the .NET SDK components"
+maintainer="Anachron <gith@cron.world>"
+license="MIT"
+homepage="https://dotnet.microsoft.com"
+nopie=yes
+
+case "${XBPS_TARGET_MACHINE}" in
+    x86_64)
+    _arch="x64"
+    _path="647f8505-3bf0-48c5-ac0f-3839be6816d7/d0c2762ded5a1ded3c79b1e495e43b7c"
+    distfiles="https://download.visualstudio.microsoft.com/download/pr/${_path}/${pkgname}-${version}-linux-${_arch}.tar.gz"
+    checksum="d1e2368b1335a6a5f496b887950ad5da3d85783ec76f74a663214989817bb497"
+    ;;
+    armv7)
+    _arch="arm"
+    _path="e5573b57-df74-4b5b-8cd8-06973b66c3ac/b9ee29318ad2d87fa05adfaf74a8271c"
+    distfiles="https://download.visualstudio.microsoft.com/download/pr/${_path}/${pkgname}-${version}-linux-${_arch}.tar.gz"
+    checksum="76488566b7c81f12a517274562bf5bbb77e003cd9ca568f90d9bfb2865de3242"
+    ;;
+    aarch64)
+    _arch="arm64"
+    _path="50979c85-1634-4c40-a4d0-4d25c9dae08d/cfa1d7e5ef765cef1d2c9127c9e14599"
+    distfiles="https://download.visualstudio.microsoft.com/download/pr/${_path}/${pkgname}-${version}-linux-${_arch}.tar.gz"
+    checksum="6f49fa85aef7f69ec04bbb4f61e4029a472d5a01ea5a4154986df27e26521879"
+    ;;
+esac
+
+_target='opt/dotnet'
+
+do_install() {
+    vmkdir usr/bin
+    ln -sf "/${_target}/dotnet" "${DESTDIR}/usr/bin/dotnet"
+    vmkdir "${_target}"
+    vcopy dotnet "${_target}"
+    vcopy host "${_target}"
+    vcopy shared "${_target}"
+    vcopy sdk "${_target}"
+    vlicense "LICENSE.txt"
+}
diff --git a/srcpkgs/jellyfin/template b/srcpkgs/jellyfin/template
new file mode 100644
index 000000000000..d792edb78cb2
--- /dev/null
+++ b/srcpkgs/jellyfin/template
@@ -0,0 +1,62 @@
+# Template file for 'jellyfin'
+pkgname=jellyfin
+version=10.5.0
+revision=1
+wrksrc="${pkgname}-${version}"
+create_wrksrc=yes
+archs="i686 x86_64 aarmv7l aarch64"
+build_style=meta
+hostmakedepends="dotnet-sdk yarn"
+makedepends="icu-devel libssl47 git"
+depends="ffmpeg sqlite"
+short_desc="Free Software Media System "
+maintainer="Abel Tesfaye <abel-tesfaye@hotmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://jellyfin.readthedocs.io"
+distfiles="
+ https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz
+ https://github.com/${pkgname}/${pkgname}-web/archive/v${version}.tar.gz>${pkgname}-web-${version}.tar.gz"
+checksum="
+ f5631758c2a175ae04bedd6d8f8566b2222b14254261bdf29019ecdffde0dddd
+ e50b280e805469367bedfef41c32070907e191d4a856b92049e6f6fd558e1dea"
+nopie=yes
+
+system_accounts="jellyfin"
+jellyfin_homedir="/var/lib/jellyfin"
+
+do_build() {
+  cd jellyfin-web-${version}
+  yarn install
+
+  # https://docs.microsoft.com/de-de/dotnet/core/rid-catalog#linux-rids
+  case "${XBPS_TARGET_MACHINE}" in
+    i686) _build_arch="x86";;
+    x86_64) _build_arch="x64";;
+    armv7l) _build_arch="arm";;
+    aarch64) _build_arch="arm64";;
+  esac
+
+  cd ../jellyfin-${version}
+
+  export DOTNET_CLI_TELEMETRY_OPTOUT=1
+  export CLR_OPENSSL_VERSION_OVERRIDE=47
+  dotnet build -r "linux-${_build_arch}" --configuration Release Jellyfin.Server
+  dotnet publish -r "linux-${_build_arch}" --configuration Release Jellyfin.Server --output "$PWD"/publish
+  rm -rfv publish/runtimes/{alpine-*,osx*,tizen-*,win*,linux-musl-x64,linux-armel}
+
+  test "${XBPS_TARGET_MACHINE}" = 'i686' || rm -rfv publish/runtimes/linux-x86
+  test "${XBPS_TARGET_MACHINE}" = 'x86_64' || rm -rfv publish/runtimes/linux-x64
+  test "${XBPS_TARGET_MACHINE}" = 'armv7l' || rm -rfv publish/runtimes/linux-arm
+  test "${XBPS_TARGET_MACHINE}" = 'aarch64' || rm -rfv publish/runtimes/linux-arm64
+  
+  mkdir publish/jellyfin-web
+  cp -rv ../jellyfin-web-${version}/dist/. publish/jellyfin-web
+}
+
+do_install() {
+  vmkdir usr/lib/jellyfin
+  #vmkdir etc/default
+  #vcopy "${FILESDIR}/jellyfin.default" etc/default/jellyfin 
+  vcopy "${pkgname}-${version}/publish/." usr/lib/jellyfin
+  #vsv jellyfin
+}
diff --git a/srcpkgs/obsidian/template b/srcpkgs/obsidian/template
index 054d5509d3fd..6ee144015d9b 100644
--- a/srcpkgs/obsidian/template
+++ b/srcpkgs/obsidian/template
@@ -1,6 +1,6 @@
 # Template file for 'obsidian'
 pkgname=obsidian
-version=0.11.13
+version=0.12.1
 revision=1
 archs="x86_64"
 wrksrc="obsidian-${version}"

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Closed]: New package: obsidian-0.11.13
  2021-04-18 11:45 [PR PATCH] New package: obsidian-0.11.13 DerNuntius
                   ` (2 preceding siblings ...)
  2021-05-13 14:18 ` DerNuntius
@ 2021-05-13 14:19 ` DerNuntius
  3 siblings, 0 replies; 5+ messages in thread
From: DerNuntius @ 2021-05-13 14:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1443 bytes --]

There's a closed pull request on the void-packages repository

New package: obsidian-0.11.13
https://github.com/void-linux/void-packages/pull/30292

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-05-13 14:19 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-18 11:45 [PR PATCH] New package: obsidian-0.11.13 DerNuntius
2021-04-18 14:28 ` [PR PATCH] [Updated] " DerNuntius
2021-04-30 20:32 ` DerNuntius
2021-05-13 14:18 ` DerNuntius
2021-05-13 14:19 ` [PR PATCH] [Closed]: " DerNuntius

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).