Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: xfce4-hamster-plugin-1.8
@ 2021-01-07 12:01 aquaherd
  2021-01-07 17:24 ` [PR PATCH] [Updated] " aquaherd
                   ` (17 more replies)
  0 siblings, 18 replies; 19+ messages in thread
From: aquaherd @ 2021-01-07 12:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/aquaherd/void-packages master
https://github.com/void-linux/void-packages/pull/27737

New package: xfce4-hamster-plugin-1.8
I am the author of this xfce4 panel plugin and I want it in void, so I packaged it.

A patch file from https://github.com/void-linux/void-packages/pull/27737.patch is attached

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

From b7d05ec01c3fe481d1e822db7269e8575024238b Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 12:47:00 +0100
Subject: [PATCH] New package: xfce4-hamster-plugin-1.8

---
 srcpkgs/xfce4-hamster-plugin/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xfce4-hamster-plugin/template

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
new file mode 100644
index 00000000000..2e37c34b6af
--- /dev/null
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -0,0 +1,20 @@
+# Template file for 'xfce4-hamster-plugin'
+pkgname=xfce4-hamster-plugin
+version=1.8
+revision=1
+wrksrc="xfce4-hamster-plugin-$version"
+build_style=gnu-configure
+configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
+makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
+depends="hamster-applet"
+short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster/xfce4-hamster-plugin"
+distfiles="https://github.com/projecthamster/${pkgname}/archive/v${version}.tar.gz"
+checksum=0802f8a695755153a2f89f7b99767ca7753521dadc3f20a7cec2e09b1b2bb032
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}

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

* Re: [PR PATCH] [Updated] New package: xfce4-hamster-plugin-1.8
  2021-01-07 12:01 [PR PATCH] New package: xfce4-hamster-plugin-1.8 aquaherd
@ 2021-01-07 17:24 ` aquaherd
  2021-01-07 17:29 ` aquaherd
                   ` (16 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: aquaherd @ 2021-01-07 17:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/aquaherd/void-packages master
https://github.com/void-linux/void-packages/pull/27737

New package: xfce4-hamster-plugin-1.8
I am the author of this xfce4 panel plugin and I want it in void, so I packaged it.

A patch file from https://github.com/void-linux/void-packages/pull/27737.patch is attached

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

From b7d05ec01c3fe481d1e822db7269e8575024238b Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 12:47:00 +0100
Subject: [PATCH 1/2] New package: xfce4-hamster-plugin-1.8

---
 srcpkgs/xfce4-hamster-plugin/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xfce4-hamster-plugin/template

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
new file mode 100644
index 00000000000..2e37c34b6af
--- /dev/null
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -0,0 +1,20 @@
+# Template file for 'xfce4-hamster-plugin'
+pkgname=xfce4-hamster-plugin
+version=1.8
+revision=1
+wrksrc="xfce4-hamster-plugin-$version"
+build_style=gnu-configure
+configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
+makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
+depends="hamster-applet"
+short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster/xfce4-hamster-plugin"
+distfiles="https://github.com/projecthamster/${pkgname}/archive/v${version}.tar.gz"
+checksum=0802f8a695755153a2f89f7b99767ca7753521dadc3f20a7cec2e09b1b2bb032
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}

From b8d5ac00462f60d85232ec4c22e61f2b9fafb4d6 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:24:23 +0100
Subject: [PATCH 2/2] New package: hamster-time-tracker-3.0.2

---
 srcpkgs/hamster-time-tracker/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/hamster-time-tracker/template

diff --git a/srcpkgs/hamster-time-tracker/template b/srcpkgs/hamster-time-tracker/template
new file mode 100644
index 00000000000..988f19556cb
--- /dev/null
+++ b/srcpkgs/hamster-time-tracker/template
@@ -0,0 +1,16 @@
+# Template file for 'hamster-time-tracker'
+pkgname=hamster-time-tracker
+version=3.0.2
+revision=1
+wrksrc=hamster-${version}
+build_style=waf3
+hostmakedepends="pkg-config gettext intltool itstool glib-devel"
+makedepends="python3-gobject-devel python3-cairo"
+depends="python3-gobject"
+short_desc="Time tracking application for individuals"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster"
+distfiles="https://github.com/projecthamster/hamster/archive/v${version}.tar.gz"
+checksum=8bf28fe1f06cd950583ebfb24acf5254d3406ee29c3046f6a6fb648b98c929ef
+conflicts="hamster-applet"

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

* Re: [PR PATCH] [Updated] New package: xfce4-hamster-plugin-1.8
  2021-01-07 12:01 [PR PATCH] New package: xfce4-hamster-plugin-1.8 aquaherd
  2021-01-07 17:24 ` [PR PATCH] [Updated] " aquaherd
@ 2021-01-07 17:29 ` aquaherd
  2021-01-07 17:39 ` aquaherd
                   ` (15 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: aquaherd @ 2021-01-07 17:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/aquaherd/void-packages master
https://github.com/void-linux/void-packages/pull/27737

New package: xfce4-hamster-plugin-1.8
I am the author of this xfce4 panel plugin and I want it in void, so I packaged it.

A patch file from https://github.com/void-linux/void-packages/pull/27737.patch is attached

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

From b7d05ec01c3fe481d1e822db7269e8575024238b Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 12:47:00 +0100
Subject: [PATCH 1/2] New package: xfce4-hamster-plugin-1.8

---
 srcpkgs/xfce4-hamster-plugin/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xfce4-hamster-plugin/template

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
new file mode 100644
index 00000000000..2e37c34b6af
--- /dev/null
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -0,0 +1,20 @@
+# Template file for 'xfce4-hamster-plugin'
+pkgname=xfce4-hamster-plugin
+version=1.8
+revision=1
+wrksrc="xfce4-hamster-plugin-$version"
+build_style=gnu-configure
+configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
+makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
+depends="hamster-applet"
+short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster/xfce4-hamster-plugin"
+distfiles="https://github.com/projecthamster/${pkgname}/archive/v${version}.tar.gz"
+checksum=0802f8a695755153a2f89f7b99767ca7753521dadc3f20a7cec2e09b1b2bb032
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}

From 405aece98c451e104a1b8bb8a5fe08383de3bc30 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:24:23 +0100
Subject: [PATCH 2/2] New package: hamster-time-tracker-3.0.2 also adjust the
 xfce4-hamster-plugin from deprecated hamster-applet to hamster-time-tracker

---
 srcpkgs/hamster-time-tracker/template | 16 ++++++++++++++++
 srcpkgs/xfce4-hamster-plugin/template |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/hamster-time-tracker/template

diff --git a/srcpkgs/hamster-time-tracker/template b/srcpkgs/hamster-time-tracker/template
new file mode 100644
index 00000000000..988f19556cb
--- /dev/null
+++ b/srcpkgs/hamster-time-tracker/template
@@ -0,0 +1,16 @@
+# Template file for 'hamster-time-tracker'
+pkgname=hamster-time-tracker
+version=3.0.2
+revision=1
+wrksrc=hamster-${version}
+build_style=waf3
+hostmakedepends="pkg-config gettext intltool itstool glib-devel"
+makedepends="python3-gobject-devel python3-cairo"
+depends="python3-gobject"
+short_desc="Time tracking application for individuals"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster"
+distfiles="https://github.com/projecthamster/hamster/archive/v${version}.tar.gz"
+checksum=8bf28fe1f06cd950583ebfb24acf5254d3406ee29c3046f6a6fb648b98c929ef
+conflicts="hamster-applet"
diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 2e37c34b6af..0e499e24d81 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
-depends="hamster-applet"
+depends="hamster-time-tracker"
 short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
 maintainer="Hakan Erduman <hakan@erduman.de>"
 license="GPL-2.0-or-later"

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

* Re: [PR PATCH] [Updated] New package: xfce4-hamster-plugin-1.8
  2021-01-07 12:01 [PR PATCH] New package: xfce4-hamster-plugin-1.8 aquaherd
  2021-01-07 17:24 ` [PR PATCH] [Updated] " aquaherd
  2021-01-07 17:29 ` aquaherd
@ 2021-01-07 17:39 ` aquaherd
  2021-01-07 17:42 ` aquaherd
                   ` (14 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: aquaherd @ 2021-01-07 17:39 UTC (permalink / raw)
  To: ml

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

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

https://github.com/aquaherd/void-packages master
https://github.com/void-linux/void-packages/pull/27737

New package: xfce4-hamster-plugin-1.8
I am the author of this xfce4 panel plugin and I want it in void, so I packaged it.

A patch file from https://github.com/void-linux/void-packages/pull/27737.patch is attached

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

From b7d05ec01c3fe481d1e822db7269e8575024238b Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 12:47:00 +0100
Subject: [PATCH 1/3] New package: xfce4-hamster-plugin-1.8

---
 srcpkgs/xfce4-hamster-plugin/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xfce4-hamster-plugin/template

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
new file mode 100644
index 00000000000..2e37c34b6af
--- /dev/null
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -0,0 +1,20 @@
+# Template file for 'xfce4-hamster-plugin'
+pkgname=xfce4-hamster-plugin
+version=1.8
+revision=1
+wrksrc="xfce4-hamster-plugin-$version"
+build_style=gnu-configure
+configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
+makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
+depends="hamster-applet"
+short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster/xfce4-hamster-plugin"
+distfiles="https://github.com/projecthamster/${pkgname}/archive/v${version}.tar.gz"
+checksum=0802f8a695755153a2f89f7b99767ca7753521dadc3f20a7cec2e09b1b2bb032
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}

From 405aece98c451e104a1b8bb8a5fe08383de3bc30 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:24:23 +0100
Subject: [PATCH 2/3] New package: hamster-time-tracker-3.0.2 also adjust the
 xfce4-hamster-plugin from deprecated hamster-applet to hamster-time-tracker

---
 srcpkgs/hamster-time-tracker/template | 16 ++++++++++++++++
 srcpkgs/xfce4-hamster-plugin/template |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/hamster-time-tracker/template

diff --git a/srcpkgs/hamster-time-tracker/template b/srcpkgs/hamster-time-tracker/template
new file mode 100644
index 00000000000..988f19556cb
--- /dev/null
+++ b/srcpkgs/hamster-time-tracker/template
@@ -0,0 +1,16 @@
+# Template file for 'hamster-time-tracker'
+pkgname=hamster-time-tracker
+version=3.0.2
+revision=1
+wrksrc=hamster-${version}
+build_style=waf3
+hostmakedepends="pkg-config gettext intltool itstool glib-devel"
+makedepends="python3-gobject-devel python3-cairo"
+depends="python3-gobject"
+short_desc="Time tracking application for individuals"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster"
+distfiles="https://github.com/projecthamster/hamster/archive/v${version}.tar.gz"
+checksum=8bf28fe1f06cd950583ebfb24acf5254d3406ee29c3046f6a6fb648b98c929ef
+conflicts="hamster-applet"
diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 2e37c34b6af..0e499e24d81 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
-depends="hamster-applet"
+depends="hamster-time-tracker"
 short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
 maintainer="Hakan Erduman <hakan@erduman.de>"
 license="GPL-2.0-or-later"

From 824029da7fc89c60b9338fcd33816df15c19dda9 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:37:44 +0100
Subject: [PATCH 3/3] xfce4-hamster-plugin: update to 1.8. Also default to the
 newer icon.

---
 srcpkgs/xfce4-hamster-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 0e499e24d81..c9873909d8c 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -4,7 +4,7 @@ version=1.8
 revision=1
 wrksrc="xfce4-hamster-plugin-$version"
 build_style=gnu-configure
-configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+configure_args="--prefix=/usr --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
 depends="hamster-time-tracker"

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

* Re: New package: xfce4-hamster-plugin-1.8
  2021-01-07 12:01 [PR PATCH] New package: xfce4-hamster-plugin-1.8 aquaherd
                   ` (2 preceding siblings ...)
  2021-01-07 17:39 ` aquaherd
@ 2021-01-07 17:42 ` aquaherd
  2021-01-08 10:50 ` [PR PATCH] [Updated] " aquaherd
                   ` (13 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: aquaherd @ 2021-01-07 17:42 UTC (permalink / raw)
  To: ml

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

New comment by aquaherd on void-packages repository

https://github.com/void-linux/void-packages/pull/27737#issuecomment-756269630

Comment:
I was not aware that the gtk2/python2 hamster-applet was dropped from void last September - I still had it running.
So I had to package the gtk3/python3 hamster-time-tracker, too.

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

* Re: [PR PATCH] [Updated] New package: xfce4-hamster-plugin-1.8
  2021-01-07 12:01 [PR PATCH] New package: xfce4-hamster-plugin-1.8 aquaherd
                   ` (3 preceding siblings ...)
  2021-01-07 17:42 ` aquaherd
@ 2021-01-08 10:50 ` aquaherd
  2021-01-08 22:59 ` kawaiiamber
                   ` (12 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: aquaherd @ 2021-01-08 10:50 UTC (permalink / raw)
  To: ml

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

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

https://github.com/aquaherd/void-packages master
https://github.com/void-linux/void-packages/pull/27737

New package: xfce4-hamster-plugin-1.8
I am the author of this xfce4 panel plugin and I want it in void, so I packaged it.

A patch file from https://github.com/void-linux/void-packages/pull/27737.patch is attached

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

From c9946f2d6b4abcc3b055eb10a89aff90e6efe025 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 12:47:00 +0100
Subject: [PATCH 1/3] New package: xfce4-hamster-plugin-1.8

---
 srcpkgs/xfce4-hamster-plugin/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xfce4-hamster-plugin/template

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
new file mode 100644
index 00000000000..2e37c34b6af
--- /dev/null
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -0,0 +1,20 @@
+# Template file for 'xfce4-hamster-plugin'
+pkgname=xfce4-hamster-plugin
+version=1.8
+revision=1
+wrksrc="xfce4-hamster-plugin-$version"
+build_style=gnu-configure
+configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
+makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
+depends="hamster-applet"
+short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster/xfce4-hamster-plugin"
+distfiles="https://github.com/projecthamster/${pkgname}/archive/v${version}.tar.gz"
+checksum=0802f8a695755153a2f89f7b99767ca7753521dadc3f20a7cec2e09b1b2bb032
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}

From 3fa4e0050a3d9ccacb7a6df223b982e7eede19db Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:24:23 +0100
Subject: [PATCH 2/3] New package: hamster-time-tracker-3.0.2 also adjust the
 xfce4-hamster-plugin from deprecated hamster-applet to hamster-time-tracker

---
 srcpkgs/hamster-time-tracker/template | 16 ++++++++++++++++
 srcpkgs/xfce4-hamster-plugin/template |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/hamster-time-tracker/template

diff --git a/srcpkgs/hamster-time-tracker/template b/srcpkgs/hamster-time-tracker/template
new file mode 100644
index 00000000000..988f19556cb
--- /dev/null
+++ b/srcpkgs/hamster-time-tracker/template
@@ -0,0 +1,16 @@
+# Template file for 'hamster-time-tracker'
+pkgname=hamster-time-tracker
+version=3.0.2
+revision=1
+wrksrc=hamster-${version}
+build_style=waf3
+hostmakedepends="pkg-config gettext intltool itstool glib-devel"
+makedepends="python3-gobject-devel python3-cairo"
+depends="python3-gobject"
+short_desc="Time tracking application for individuals"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster"
+distfiles="https://github.com/projecthamster/hamster/archive/v${version}.tar.gz"
+checksum=8bf28fe1f06cd950583ebfb24acf5254d3406ee29c3046f6a6fb648b98c929ef
+conflicts="hamster-applet"
diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 2e37c34b6af..0e499e24d81 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
-depends="hamster-applet"
+depends="hamster-time-tracker"
 short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
 maintainer="Hakan Erduman <hakan@erduman.de>"
 license="GPL-2.0-or-later"

From 35236e50703cf60ec92d1c163eca869a412ce503 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:37:44 +0100
Subject: [PATCH 3/3] xfce4-hamster-plugin: update to 1.8. Also default to the
 newer icon.

---
 srcpkgs/xfce4-hamster-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 0e499e24d81..c9873909d8c 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -4,7 +4,7 @@ version=1.8
 revision=1
 wrksrc="xfce4-hamster-plugin-$version"
 build_style=gnu-configure
-configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+configure_args="--prefix=/usr --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
 depends="hamster-time-tracker"

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

* Re: New package: xfce4-hamster-plugin-1.8
  2021-01-07 12:01 [PR PATCH] New package: xfce4-hamster-plugin-1.8 aquaherd
                   ` (4 preceding siblings ...)
  2021-01-08 10:50 ` [PR PATCH] [Updated] " aquaherd
@ 2021-01-08 22:59 ` kawaiiamber
  2021-01-09 11:25 ` [PR PATCH] [Updated] " aquaherd
                   ` (11 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: kawaiiamber @ 2021-01-08 22:59 UTC (permalink / raw)
  To: ml

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27737#issuecomment-757039444

Comment:
On the `aarch64-musl` arch, the check it reporting
```
ERROR: [trans] failed to download `libglvnd-devel-1.3.2_1' signature from `http://alpha.us.repo.voidlinux.org/current/aarch64': Transient resolver failure
Transaction failed! see above for errors.
libglvnd-1.3.2_1: verifying RSA signature...
Error: Process completed with exit code 1.
```
From my experience, just repushing might fix it.

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

* Re: [PR PATCH] [Updated] New package: xfce4-hamster-plugin-1.8
  2021-01-07 12:01 [PR PATCH] New package: xfce4-hamster-plugin-1.8 aquaherd
                   ` (5 preceding siblings ...)
  2021-01-08 22:59 ` kawaiiamber
@ 2021-01-09 11:25 ` aquaherd
  2021-01-13 17:19 ` aquaherd
                   ` (10 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: aquaherd @ 2021-01-09 11:25 UTC (permalink / raw)
  To: ml

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

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

https://github.com/aquaherd/void-packages master
https://github.com/void-linux/void-packages/pull/27737

New package: xfce4-hamster-plugin-1.8
I am the author of this xfce4 panel plugin and I want it in void, so I packaged it.

A patch file from https://github.com/void-linux/void-packages/pull/27737.patch is attached

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

From 50f398cb1bd93d0d6ce567dab8071b2401bae671 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 12:47:00 +0100
Subject: [PATCH 1/3] New package: xfce4-hamster-plugin-1.8

---
 srcpkgs/xfce4-hamster-plugin/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xfce4-hamster-plugin/template

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
new file mode 100644
index 00000000000..2e37c34b6af
--- /dev/null
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -0,0 +1,20 @@
+# Template file for 'xfce4-hamster-plugin'
+pkgname=xfce4-hamster-plugin
+version=1.8
+revision=1
+wrksrc="xfce4-hamster-plugin-$version"
+build_style=gnu-configure
+configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
+makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
+depends="hamster-applet"
+short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster/xfce4-hamster-plugin"
+distfiles="https://github.com/projecthamster/${pkgname}/archive/v${version}.tar.gz"
+checksum=0802f8a695755153a2f89f7b99767ca7753521dadc3f20a7cec2e09b1b2bb032
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}

From 65f1a255f932855aa341eed021ddadaac3f8027e Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:24:23 +0100
Subject: [PATCH 2/3] New package: hamster-time-tracker-3.0.2 also adjust the
 xfce4-hamster-plugin from deprecated hamster-applet to hamster-time-tracker

---
 srcpkgs/hamster-time-tracker/template | 16 ++++++++++++++++
 srcpkgs/xfce4-hamster-plugin/template |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/hamster-time-tracker/template

diff --git a/srcpkgs/hamster-time-tracker/template b/srcpkgs/hamster-time-tracker/template
new file mode 100644
index 00000000000..988f19556cb
--- /dev/null
+++ b/srcpkgs/hamster-time-tracker/template
@@ -0,0 +1,16 @@
+# Template file for 'hamster-time-tracker'
+pkgname=hamster-time-tracker
+version=3.0.2
+revision=1
+wrksrc=hamster-${version}
+build_style=waf3
+hostmakedepends="pkg-config gettext intltool itstool glib-devel"
+makedepends="python3-gobject-devel python3-cairo"
+depends="python3-gobject"
+short_desc="Time tracking application for individuals"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster"
+distfiles="https://github.com/projecthamster/hamster/archive/v${version}.tar.gz"
+checksum=8bf28fe1f06cd950583ebfb24acf5254d3406ee29c3046f6a6fb648b98c929ef
+conflicts="hamster-applet"
diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 2e37c34b6af..0e499e24d81 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
-depends="hamster-applet"
+depends="hamster-time-tracker"
 short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
 maintainer="Hakan Erduman <hakan@erduman.de>"
 license="GPL-2.0-or-later"

From 090a84a36a90b470bb27e6fd57b5f4d7e7a02a1e Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:37:44 +0100
Subject: [PATCH 3/3] xfce4-hamster-plugin: update to 1.8. Also default to the
 newer icon.

---
 srcpkgs/xfce4-hamster-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 0e499e24d81..c9873909d8c 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -4,7 +4,7 @@ version=1.8
 revision=1
 wrksrc="xfce4-hamster-plugin-$version"
 build_style=gnu-configure
-configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+configure_args="--prefix=/usr --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
 depends="hamster-time-tracker"

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

* Re: New package: xfce4-hamster-plugin-1.8
  2021-01-07 12:01 [PR PATCH] New package: xfce4-hamster-plugin-1.8 aquaherd
                   ` (6 preceding siblings ...)
  2021-01-09 11:25 ` [PR PATCH] [Updated] " aquaherd
@ 2021-01-13 17:19 ` aquaherd
  2021-01-15 16:16 ` [PR PATCH] [Updated] " aquaherd
                   ` (9 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: aquaherd @ 2021-01-13 17:19 UTC (permalink / raw)
  To: ml

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

New comment by aquaherd on void-packages repository

https://github.com/void-linux/void-packages/pull/27737#issuecomment-759596024

Comment:
Now it fails due to locale folder being in /usr/lib. Will fix this upstream and rebase when done. 

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

* Re: [PR PATCH] [Updated] New package: xfce4-hamster-plugin-1.8
  2021-01-07 12:01 [PR PATCH] New package: xfce4-hamster-plugin-1.8 aquaherd
                   ` (7 preceding siblings ...)
  2021-01-13 17:19 ` aquaherd
@ 2021-01-15 16:16 ` aquaherd
  2021-01-15 16:59 ` aquaherd
                   ` (8 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: aquaherd @ 2021-01-15 16:16 UTC (permalink / raw)
  To: ml

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

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

https://github.com/aquaherd/void-packages master
https://github.com/void-linux/void-packages/pull/27737

New package: xfce4-hamster-plugin-1.8
I am the author of this xfce4 panel plugin and I want it in void, so I packaged it.

A patch file from https://github.com/void-linux/void-packages/pull/27737.patch is attached

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

From 50f398cb1bd93d0d6ce567dab8071b2401bae671 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 12:47:00 +0100
Subject: [PATCH 001/419] New package: xfce4-hamster-plugin-1.8

---
 srcpkgs/xfce4-hamster-plugin/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xfce4-hamster-plugin/template

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
new file mode 100644
index 00000000000..2e37c34b6af
--- /dev/null
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -0,0 +1,20 @@
+# Template file for 'xfce4-hamster-plugin'
+pkgname=xfce4-hamster-plugin
+version=1.8
+revision=1
+wrksrc="xfce4-hamster-plugin-$version"
+build_style=gnu-configure
+configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
+makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
+depends="hamster-applet"
+short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster/xfce4-hamster-plugin"
+distfiles="https://github.com/projecthamster/${pkgname}/archive/v${version}.tar.gz"
+checksum=0802f8a695755153a2f89f7b99767ca7753521dadc3f20a7cec2e09b1b2bb032
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}

From 65f1a255f932855aa341eed021ddadaac3f8027e Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:24:23 +0100
Subject: [PATCH 002/419] New package: hamster-time-tracker-3.0.2 also adjust
 the xfce4-hamster-plugin from deprecated hamster-applet to
 hamster-time-tracker

---
 srcpkgs/hamster-time-tracker/template | 16 ++++++++++++++++
 srcpkgs/xfce4-hamster-plugin/template |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/hamster-time-tracker/template

diff --git a/srcpkgs/hamster-time-tracker/template b/srcpkgs/hamster-time-tracker/template
new file mode 100644
index 00000000000..988f19556cb
--- /dev/null
+++ b/srcpkgs/hamster-time-tracker/template
@@ -0,0 +1,16 @@
+# Template file for 'hamster-time-tracker'
+pkgname=hamster-time-tracker
+version=3.0.2
+revision=1
+wrksrc=hamster-${version}
+build_style=waf3
+hostmakedepends="pkg-config gettext intltool itstool glib-devel"
+makedepends="python3-gobject-devel python3-cairo"
+depends="python3-gobject"
+short_desc="Time tracking application for individuals"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster"
+distfiles="https://github.com/projecthamster/hamster/archive/v${version}.tar.gz"
+checksum=8bf28fe1f06cd950583ebfb24acf5254d3406ee29c3046f6a6fb648b98c929ef
+conflicts="hamster-applet"
diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 2e37c34b6af..0e499e24d81 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
-depends="hamster-applet"
+depends="hamster-time-tracker"
 short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
 maintainer="Hakan Erduman <hakan@erduman.de>"
 license="GPL-2.0-or-later"

From 090a84a36a90b470bb27e6fd57b5f4d7e7a02a1e Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:37:44 +0100
Subject: [PATCH 003/419] xfce4-hamster-plugin: update to 1.8. Also default to
 the newer icon.

---
 srcpkgs/xfce4-hamster-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 0e499e24d81..c9873909d8c 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -4,7 +4,7 @@ version=1.8
 revision=1
 wrksrc="xfce4-hamster-plugin-$version"
 build_style=gnu-configure
-configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+configure_args="--prefix=/usr --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
 depends="hamster-time-tracker"

From 6015db0654a1c94f1468ffa451ef463ead81b7c8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:55:29 +0100
Subject: [PATCH 004/419] crawl: update to 0.26.0.

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

diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index 1cdaba5c356..e54831d1d85 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.25.1
+version=0.26.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=41ddf73543940a4d16a7f23c618e2f464dd6d3dd3affc999d2412d8af3f01126
+checksum=6306c835246057bf91b6690fde14c2c3433ebe1d526876f96c46fab6dc109d45
 nocross=yes
 
 post_extract() {
@@ -20,12 +20,9 @@ post_extract() {
 
 do_build() {
 	echo $version >util/release_ver
-	# crashes with relro?
-	make ${makejobs} CC="$CC" CXX="$CXX" \
-		EXTERNAL_FLAGS="$CFLAGS" V=1 build-rltiles
 	make ${makejobs} CC="$CC" CXX="$CXX" \
 		EXTERNAL_FLAGS="$CFLAGS" EXTERNAL_LDFLAGS="$LDFLAGS" \
-		${make_build_args} V=1 DESTDIR=${DESTDIR}
+		${make_build_args} V=1 NO_TRY_GOLD=1 DESTDIR=${DESTDIR}
 }
 
 do_install() {

From 4918ef52fe72710fc58ea00c023156518b72fc64 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:55:31 +0100
Subject: [PATCH 005/419] crawl-tiles: update to 0.26.0.

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

diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 48f96df65c4..af4ec047e10 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.25.1
+version=0.26.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=41ddf73543940a4d16a7f23c618e2f464dd6d3dd3affc999d2412d8af3f01126
+checksum=6306c835246057bf91b6690fde14c2c3433ebe1d526876f96c46fab6dc109d45
 nocross=yes
 
 post_extract() {
@@ -25,12 +25,9 @@ post_extract() {
 
 do_build() {
 	echo $version >util/release_ver
-	# crashes with relro?
-	make ${makejobs} CC="$CC" CXX="$CXX" \
-		${make_build_args} EXTERNAL_FLAGS="$CFLAGS" V=1 build-rltiles
 	make ${makejobs} CC="$CC" CXX="$CXX" \
 		EXTERNAL_FLAGS="$CFLAGS" EXTERNAL_LDFLAGS="$LDFLAGS" \
-		${make_build_args} V=1 DESTDIR=${DESTDIR}
+		${make_build_args} V=1 NO_TRY_GOLD=1 DESTDIR=${DESTDIR}
 }
 
 do_install() {

From d18b63ce89744021d7c3e28a4256b41f8be9e927 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:56:32 +0100
Subject: [PATCH 006/419] mcelog: update to 175.

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

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index e9434ac574e..0e0d77b4b7a 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
 # Template file for 'mcelog'
 pkgname=mcelog
-version=174
+version=175
 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=e326eda0c39926cfce89bad459ca631ecf5b778f1d7064c5fd677a7c5d238b65
+checksum=ed25a39bb20178e79e18cc5d3202b198868986ec3e964b6285f6a7bac8469fdf
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From 5587b24a7edd2e5c690fee4b6b4b8457fde5cae0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:57:02 +0100
Subject: [PATCH 007/419] python3-boto3: update to 1.16.51.

---
 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 acd9b54e1c2..eb982f6ff10 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.16.47
+version=1.16.51
 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=4cea6387bdde7c3d291ae1734a0530576abbd1e86e6cdf2a7f8d3aa44e9d9d11
+checksum=95160b45df095801b4551f76dbd46496a587effe1e10890ab355be564d67a334
 
 post_install() {
 	vlicense LICENSE

From a211cd2d79c291aecacd6e612b95b314aa576cb1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:58:05 +0100
Subject: [PATCH 008/419] rhash: update to 1.4.1.

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

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 1b434d2fe74..820963e9ede 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,6 +1,6 @@
 # Template file for 'rhash'
 pkgname=rhash
-version=1.4.0
+version=1.4.1
 revision=1
 wrksrc="RHash-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"
 homepage="https://github.com/rhash/RHash"
 distfiles="https://github.com/rhash/RHash/archive/v${version}.tar.gz"
-checksum=2ea39540f5c580da0e655f7b483c19e0d31506aed4202d88e8459fa7aeeb8861
+checksum=430c812733e69b78f07ce30a05db69563450e41e217ae618507a4ce2e144a297
 make_build_target="all lib-shared"
 make_install_target="install install-lib-shared"
 

From 8a027b98f792e13dd87d9b1d9a97d48f5ae4f4cb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 5 Jan 2021 04:38:41 +0100
Subject: [PATCH 009/419] ghc: initial patches for ppc64 elfv2

but ghc seems otherwise kinda broken on big endian, so we will
need more fixes...
---
 .../ghc/patches/no-atomic-64-on-32bit.patch   |  58 +++++
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch      | 199 ++++++++++++++++++
 2 files changed, 257 insertions(+)
 create mode 100644 srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
 create mode 100644 srcpkgs/ghc/patches/ppc64-be-elfv2.patch

diff --git a/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch b/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
new file mode 100644
index 00000000000..05ca275ea9d
--- /dev/null
+++ b/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
@@ -0,0 +1,58 @@
+From 5c5aa87d50dc4ea97e76e13f285a7b5dd71fcd88 Mon Sep 17 00:00:00 2001
+From: Ilias Tsitsimpis <iliastsi@debian.org>
+Date: Sun, 1 Mar 2020 16:25:13 +0200
+Subject: [PATCH] Do not define hs_atomic{read,write}64() on non-64bit
+
+Do not define hs_atomicread64() and hs_atomicwrite64() on machines where
+WORD_SIZE_IN_BITS is less than 64, just like we do with the rest of the atomic
+functions which work on 64-bit values.
+
+Without this, compilation fails on MIPSel and PowerPC with the following error:
+
+/usr/bin/ld: /<<PKGBUILDDIR>>/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3_p.a(atomic.p_o): in function `hs_atomicread64':
+atomic.c:(.text.hs_atomicread64+0x8): undefined reference to `__sync_add_and_fetch_8'
+/usr/bin/ld: /<<PKGBUILDDIR>>/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3_p.a(atomic.p_o): in function `hs_atomicwrite64':
+atomic.c:(.text.hs_atomicwrite64+0x38): undefined reference to `__sync_bool_compare_and_swap_8'
+
+Fixes #17886.
+---
+ libraries/ghc-prim/cbits/atomic.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libraries/ghc-prim/cbits/atomic.c b/libraries/ghc-prim/cbits/atomic.c
+index ac2e608ec2..01037d70ee 100644
+--- a/libraries/ghc-prim/cbits/atomic.c
++++ b/libraries/ghc-prim/cbits/atomic.c
+@@ -361,6 +361,7 @@ hs_atomicread32(StgWord x)
+ #endif
+ }
+ 
++#if WORD_SIZE_IN_BITS == 64
+ extern StgWord64 hs_atomicread64(StgWord x);
+ StgWord64
+ hs_atomicread64(StgWord x)
+@@ -371,6 +372,7 @@ hs_atomicread64(StgWord x)
+   return __sync_add_and_fetch((StgWord64 *) x, 0);
+ #endif
+ }
++#endif
+ 
+ // AtomicWriteByteArrayOp_Int
+ // Implies a full memory barrier (see compiler/prelude/primops.txt.pp)
+@@ -409,6 +411,7 @@ hs_atomicwrite32(StgWord x, StgWord val)
+ #endif
+ }
+ 
++#if WORD_SIZE_IN_BITS == 64
+ extern void hs_atomicwrite64(StgWord x, StgWord64 val);
+ void
+ hs_atomicwrite64(StgWord x, StgWord64 val)
+@@ -420,3 +423,5 @@ hs_atomicwrite64(StgWord x, StgWord64 val)
+ #endif
+ }
+ #endif
++
++#endif
+-- 
+GitLab
+
diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
new file mode 100644
index 00000000000..ac353ed417e
--- /dev/null
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -0,0 +1,199 @@
+From fd191973558cf4aeb0d5ca107357defd6f837c38 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Tue, 5 Jan 2021 04:10:25 +0100
+Subject: [PATCH] fix up runtime for ppc64 BE ELFv2 + ensure it's used
+
+---
+ aclocal.m4                        |  2 +-
+ configure                         |  2 +-
+ libraries/ghci/GHCi/InfoTable.hsc | 36 ++++++++++++-------------------
+ rts/Adjustor.c                    | 12 +++++------
+ rts/AdjustorAsm.S                 |  2 +-
+ rts/StgCRun.c                     |  4 ++--
+ rts/StgCRunAsm.S                  |  2 +-
+ 7 files changed, 26 insertions(+), 34 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 41cecf0..ba08bd2 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -190,7 +190,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
+             test -z "[$]2" || eval "[$]2=ArchPPC"
+             ;;
+         powerpc64)
+-            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V1}\""
++            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
+             ;;
+         powerpc64le)
+             test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
+diff --git a/configure b/configure
+index 183e661..8aae1bc 100755
+--- a/configure
++++ b/configure
+@@ -9868,7 +9868,7 @@ $as_echo "done" >&6; }
+             test -z "$2" || eval "$2=ArchPPC"
+             ;;
+         powerpc64)
+-            test -z "$2" || eval "$2=\"ArchPPC_64 {ppc_64ABI = ELF_V1}\""
++            test -z "$2" || eval "$2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
+             ;;
+         powerpc64le)
+             test -z "$2" || eval "$2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
+diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
+index ec3c18a..0359be7 100644
+--- a/libraries/ghci/GHCi/InfoTable.hsc
++++ b/libraries/ghci/GHCi/InfoTable.hsc
+@@ -228,30 +228,22 @@ mkJumpToAddr a = case platform of
+                 , fromIntegral w64
+                 , fromIntegral (w64 `shiftR` 32) ]
+     ArchPPC64 ->
+-        -- We use the compiler's register r12 to read the function
+-        -- descriptor and the linker's register r11 as a temporary
+-        -- register to hold the function entry point.
+-        -- In the medium code model the function descriptor
+-        -- is located in the first two gigabytes, i.e. the address
+-        -- of the function pointer is a non-negative 32 bit number.
+-        -- 0x0EADBEEF stands for the address of the function pointer:
+-        --    0:   3d 80 0e ad     lis     r12,0x0EAD
+-        --    4:   61 8c be ef     ori     r12,r12,0xBEEF
+-        --    8:   e9 6c 00 00     ld      r11,0(r12)
+-        --    c:   e8 4c 00 08     ld      r2,8(r12)
+-        --   10:   7d 69 03 a6     mtctr   r11
+-        --   14:   e9 6c 00 10     ld      r11,16(r12)
+-        --   18:   4e 80 04 20     bctr
+-       let  w32 = fromIntegral (funPtrToInt a)
++        -- The ABI requires r12 to point to the function's entry point.
++        -- We use the medium code model where code resides in the first
++        -- two gigabytes, so loading a non-negative32 bit address
++        -- with lis followed by ori is fine.
++        -- 0x0EADBEEF stands for the address:
++        -- 3D800EAD lis r12,0x0EAD
++        -- 618CBEEF ori r12,r12,0xBEEF
++        -- 7D8903A6 mtctr r12
++        -- 4E800420 bctr
++
++        let w32 = fromIntegral (funPtrToInt a)
+             hi16 x = (x `shiftR` 16) .&. 0xFFFF
+             lo16 x = x .&. 0xFFFF
+-       in Right [ 0x3D800000 .|. hi16 w32,
+-                  0x618C0000 .|. lo16 w32,
+-                  0xE96C0000,
+-                  0xE84C0008,
+-                  0x7D6903A6,
+-                  0xE96C0010,
+-                  0x4E800420]
++        in Right [ 0x3D800000 .|. hi16 w32,
++                   0x618C0000 .|. lo16 w32,
++                   0x7D8903A6, 0x4E800420 ]
+ 
+     ArchPPC64LE ->
+         -- The ABI requires r12 to point to the function's entry point.
+diff --git a/rts/Adjustor.c b/rts/Adjustor.c
+index d360cfe..ab7ede7 100644
+--- a/rts/Adjustor.c
++++ b/rts/Adjustor.c
+@@ -49,7 +49,7 @@ Haskell side.
+ 
+ #if defined(i386_HOST_ARCH)
+ extern void adjustorCode(void);
+-#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+ // from AdjustorAsm.s
+ // not declared as a function so that AIX-style
+ // fundescs can never get in the way.
+@@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
+ extern void obscure_ccall_ret_code(void);
+ #endif
+ 
+-#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+ #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
+ 
+ /* !!! !!! WARNING: !!! !!!
+@@ -318,7 +318,7 @@ typedef struct AdjustorStub {
+ } AdjustorStub;
+ #endif
+ 
+-#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+ static int totalArgumentSize(char *typeString)
+ {
+     int sz = 0;
+@@ -351,7 +351,7 @@ void*
+ createAdjustor(int cconv, StgStablePtr hptr,
+                StgFunPtr wptr,
+                char *typeString
+-#if !defined(powerpc_HOST_ARCH) && !defined(powerpc64_HOST_ARCH) && !defined(x86_64_HOST_ARCH)
++#if !defined(powerpc_HOST_ARCH) && (!defined(powerpc64_HOST_ARCH) || (_CALL_ELF == 2)) && !defined(x86_64_HOST_ARCH)
+                   STG_UNUSED
+ #endif
+               )
+@@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
+         }
+     }
+ 
+-#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+         
+ #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
+ #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
+@@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
+    return;
+  }
+  freeStablePtr(((StgStablePtr*)ptr)[1]);
+-#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+  if ( ((AdjustorStub*)ptr)->code != (StgFunPtr) &adjustorCode ) {
+    errorBelch("freeHaskellFunctionPtr: not for me, guv! %p\n", ptr);
+    return;
+diff --git a/rts/AdjustorAsm.S b/rts/AdjustorAsm.S
+index 2795b83..63cfe91 100644
+--- a/rts/AdjustorAsm.S
++++ b/rts/AdjustorAsm.S
+@@ -2,7 +2,7 @@
+ 
+ /* ******************************** PowerPC ******************************** */
+ 
+-#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+ #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
+     /* The following code applies, with some differences,
+        to all powerpc platforms except for powerpc32-linux,
+diff --git a/rts/StgCRun.c b/rts/StgCRun.c
+index 934926e..2ff8662 100644
+--- a/rts/StgCRun.c
++++ b/rts/StgCRun.c
+@@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
+    Everything is in assembler, so we don't have to deal with GCC...
+    -------------------------------------------------------------------------- */
+ 
+-#if defined(powerpc64_HOST_ARCH)
++#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
+ 
+ static void GNUC3_ATTRIBUTE(used)
+ StgRunIsImplementedInAssembler(void)
+@@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
+ 
+ #endif
+ 
+-#if defined(powerpc64le_HOST_ARCH)
++#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
+ /* -----------------------------------------------------------------------------
+    PowerPC 64 little endian architecture
+ 
+diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
+index 9274a44..3b4fc33 100644
+--- a/rts/StgCRunAsm.S
++++ b/rts/StgCRunAsm.S
+@@ -1,7 +1,7 @@
+ #include "ghcconfig.h"
+ #include "rts/Constants.h"
+ 
+-#if defined(powerpc64le_HOST_ARCH)
++#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
+ # ifdef linux_HOST_OS
+ # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
+ 	.file	"StgCRun.c"
+-- 
+2.30.0
+

From 3d6205540532b2f9ee87c8289f97d45bbfaf175b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Jan 2021 19:52:25 +0100
Subject: [PATCH 010/419] python3-pyqtgraph: update to 0.11.1.

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

diff --git a/srcpkgs/python3-pyqtgraph/template b/srcpkgs/python3-pyqtgraph/template
index 287a730c93a..89c3e582d1d 100644
--- a/srcpkgs/python3-pyqtgraph/template
+++ b/srcpkgs/python3-pyqtgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyqtgraph'
 pkgname=python3-pyqtgraph
-version=0.11.0
+version=0.11.1
 revision=1
 wrksrc="${pkgname#*-}-${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="http://www.pyqtgraph.org/"
 changelog="https://github.com/pyqtgraph/pyqtgraph/raw/master/CHANGELOG"
 distfiles="https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-${version}.tar.gz"
-checksum=082cdec1e559644e083cd8c5752fc06a18582fb2bebb83cdf6eb8ad33c735535
+checksum=9c103e965fb9398570f07c961030cc20fbb80d516a540011f868600a431c4a0d
 
 post_install() {
 	vlicense LICENSE.txt

From 40004c865e5201f1d447a45e8d81bf770d44832a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:29 +0100
Subject: [PATCH 011/419] subtle: broken

---
 srcpkgs/subtle/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index b2f8b67c3c9..28db062ae8a 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -10,6 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="http://subtle.subforge.org"
 conf_files="/etc/xdg/subtle/subtle.rb"
+broken="source location down"
 
 if [ "$CROSS_BUILD" ]; then
 	if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then

From 4aa3de803b7c4fba07dcf7c4b8921409988e3305 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 19:06:04 +0100
Subject: [PATCH 012/419] libucontext: update to 1.0

---
 common/shlibs                                 |  3 +-
 .../patches/arch-x86-i668_get_thunk_bx.patch  | 20 ----------
 srcpkgs/libucontext/template                  | 37 ++++++++++++-------
 3 files changed, 26 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch

diff --git a/common/shlibs b/common/shlibs
index de5cb65426e..17621bdb846 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2438,7 +2438,8 @@ libgemini.so.17 calligra-gemini-3.2.0_1
 libarpack.so.2 arpack-ng-3.3.0_2
 libfts.so.0 musl-fts-1.2_2
 libobstack.so.1 musl-obstack-1.2.1_1
-libucontext.so.0 libucontext-0.1.1_1
+libucontext.so.1 libucontext-1.0_1
+libucontext_posix.so.1 libucontext-1.0_1
 libgavl.so.1 gavl-1.40_1
 libmxml.so.1 mxml-2.9_1
 libKF5Pty.so.5 kpty-5.26.0_1
diff --git a/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch b/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch
deleted file mode 100644
index 702f06f5b28..00000000000
--- a/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- arch/x86/startcontext.S	2020-05-18 05:28:21.000000000 +0200
-+++ arch/x86/startcontext.S	2021-01-02 23:52:32.728187160 +0100
-@@ -18,7 +18,7 @@
- 	cmpl	$0, (%esp)
- 
- 	/* restore global offset table, exit@plt and __setcontext@plt need this */
--	call	__i686.get_pc_thunk.bx
-+	call	i686_get_pc_thunk_bx
- 	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
- 
- 	/* if we have no linked context, lets get out of here */
-@@ -35,7 +35,7 @@
- 	/* something is really hosed, call hlt to force termination */
- 	hlt
- 
--__i686.get_pc_thunk.bx:
-+i686_get_pc_thunk_bx:
- 	mov	(%esp), %ebx
- 	ret
- END(__start_context)
diff --git a/srcpkgs/libucontext/template b/srcpkgs/libucontext/template
index 738b1e317d0..aa3f130d1e4 100644
--- a/srcpkgs/libucontext/template
+++ b/srcpkgs/libucontext/template
@@ -1,8 +1,7 @@
 # Template file for 'libucontext'
 pkgname=libucontext
-reverts="0.13.1_1"
-version=0.11
-revision=2
+version=1.0
+revision=1
 archs="*-musl"
 wrksrc="${pkgname}-${pkgname}-${version}"
 short_desc="Compatibility layer providing ucontext functions"
@@ -10,27 +9,37 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="ISC"
 homepage="https://github.com/kaniini/libucontext"
 distfiles="https://github.com/kaniini/libucontext/archive/${pkgname}-${version}.tar.gz"
-checksum=ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb
+checksum=23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb
 
 case "${XBPS_TARGET_MACHINE}" in
-arm*)	export LIBUCONTEXT_ARCH="arm";;
-i686*)	export LIBUCONTEXT_ARCH="x86";;
-ppc64*) export LIBUCONTEXT_ARCH="ppc64";;
-ppc*)   export LIBUCONTEXT_ARCH="ppc";;
-mips*)  export LIBUCONTEXT_ARCH="mips";;
-*)	export LIBUCONTEXT_ARCH="${XBPS_TARGET_MACHINE%%-musl}";;
+	x86_64*)  _luctx_arch="x86_64"  ;;
+	i686*)    _luctx_arch="x86"     ;;
+	aarch64*) _luctx_arch="aarch64" ;;
+	arm*)     _luctx_arch="arm"     ;;
+	ppc64*)   _luctx_arch="ppc64"   ;;
+	ppc*)     _luctx_arch="ppc"     ;;
+	mips*64*) _luctx_arch="mips64"  ;;
+	mips*)    _luctx_arch="mips"    ;;
+	riscv64*) _luctx_arch="riscv64" ;;
+	s390x*)   _luctx_arch="s390x"   ;;
+	*) broken="libucontext not available for ${XBPS_TARGET_MACHINE}";;
 esac
 
+# we provide our own CFLAGS, which overwrite all of theirs
+export CFLAGS=" -DEXPORT_UNPREFIXED"
+
 do_build() {
-	make ARCH="${LIBUCONTEXT_ARCH}"
+	make ARCH="${_luctx_arch}" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 }
 
 do_check() {
-	make ARCH="${LIBUCONTEXT_ARCH}" check
+	make ARCH="${_luctx_arch}" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" check
 }
 
 do_install() {
-	make ARCH="${LIBUCONTEXT_ARCH}" DESTDIR="${DESTDIR}/usr" install
+	make ARCH="${_luctx_arch}" DESTDIR="${DESTDIR}" LIBDIR="/usr/lib" install
+	# missing from release?
+	ln -s libucontext_posix.so.1 ${DESTDIR}/usr/lib/libucontext_posix.so
 }
 
 post_install() {
@@ -41,6 +50,8 @@ libucontext-devel_package() {
 	depends="libucontext>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
 	}

From 6dbf0ea42e0091aa5cf30135a84d460e3864de1f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:17:21 +0100
Subject: [PATCH 013/419] gcompat: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gcompat/template b/srcpkgs/gcompat/template
index ca523bb2388..3988a933a5a 100644
--- a/srcpkgs/gcompat/template
+++ b/srcpkgs/gcompat/template
@@ -1,7 +1,7 @@
 # Template file for 'gcompat'
 pkgname=gcompat
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="musl-obstack-devel"
@@ -15,11 +15,7 @@ checksum=5bcf8bbe4b417bc66b22a7a3675273aa8834480144338172bbd8e81eaf41a7c4
 
 build_options="libucontext"
 desc_option_libucontext="Build with ucontext support via libucontext"
-
-case "$XBPS_TARGET_MACHINE" in
-	mips*) ;;
-	*) build_options_default+=" libucontext" ;;
-esac
+build_options_default=" libucontext"
 
 # https://sourceware.org/glibc/wiki/ABIList
 # https://wiki.linaro.org/RikuVoipio/LdSoTable

From 7b968129d2279a2ca5ececd8d6f8cee828c0772e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:20:38 +0100
Subject: [PATCH 014/419] libunwind: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template
index f520421b20d..67bd6303e01 100644
--- a/srcpkgs/libunwind/template
+++ b/srcpkgs/libunwind/template
@@ -1,7 +1,7 @@
 # Template file for 'libunwind'
 pkgname=libunwind
 version=1.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="libtool automake"
 makedepends="liblzma-devel"

From 663b75f09daff5a338b93d0bcf22ef4eaee6ad6d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:20:51 +0100
Subject: [PATCH 015/419] geary: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index 0bf2fe55363..a74b1ff16cd 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
 # Template file for 'geary'
 pkgname=geary
 version=3.38.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dcontractor=true"

From befcbab03b1dbd3dca661bf150c8b8e9ef5dd872 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:03 +0100
Subject: [PATCH 016/419] gperftools: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gperftools/template b/srcpkgs/gperftools/template
index 4d33ff78ed2..de7e9423d34 100644
--- a/srcpkgs/gperftools/template
+++ b/srcpkgs/gperftools/template
@@ -1,7 +1,7 @@
 # Template file for 'gperftools'
 pkgname=gperftools
 version=2.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="libunwind-devel"

From 021b51c0125f9fcade78433f1f193ad74c32f31e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:20 +0100
Subject: [PATCH 017/419] gstreamer1: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 16f7379fc93..7a5863b2765 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,7 +1,7 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
 version=1.16.2
-revision=1
+revision=2
 wrksrc="gstreamer-${version}"
 build_style=meson
 build_helper="gir"

From c43ec35af7f8eb74c7169880541fe0761d2b66d3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:41 +0100
Subject: [PATCH 018/419] plan9port: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/plan9port/template b/srcpkgs/plan9port/template
index 0e0faa85140..4b4c7efc1aa 100644
--- a/srcpkgs/plan9port/template
+++ b/srcpkgs/plan9port/template
@@ -1,7 +1,7 @@
 # Template file for 'plan9port'
 pkgname=plan9port
 version=20200927
-revision=1
+revision=2
 _githash=291f7411783bf6871b253f3b15ce691eea7a257e
 wrksrc="${pkgname}-${_githash}"
 hostmakedepends="perl which"

From 4bba0169dd8e84e1ee118e73ed1b41f3e1954e70 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:52 +0100
Subject: [PATCH 019/419] ruby: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 79241c6d48f..cd06d004172 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"

From bcbdb22d604ab9221b1b320fd3442ed05a9a4540 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:38:26 +0100
Subject: [PATCH 020/419] julia: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 32c8fc41b2a..56eb8f9511d 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,7 +1,7 @@
 # Template file for 'julia'
 pkgname=julia
 version=1.5.3
-revision=1
+revision=2
 archs="i686* x86_64* armv7l* aarch64*"
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share

From e85101b2f3b1c3d449bce89cfb5b10376497b4e7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:38:42 +0100
Subject: [PATCH 021/419] racket: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 98c5cc93756..85374e7c62f 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,7 +1,7 @@
 # Template file for 'racket'
 pkgname=racket
 version=7.7
-revision=2
+revision=3
 build_wrksrc=src
 build_style=gnu-configure
 configure_args="--enable-useprefix --disable-docs"

From 25f75fa3024ad571439c8ce37055f784c415157b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:59:12 +0100
Subject: [PATCH 022/419] gcc: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 02a7516002d..4ebca58e89e 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -8,7 +8,7 @@ _isl_version=0.21
 
 pkgname=gcc
 version=${_minorver}.0
-revision=8
+revision=9
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"

From d783895e66e4252401be8101513bbfc0bda51b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:15 +0100
Subject: [PATCH 023/419] filelight: update to 20.12.1.

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

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 8e7a6ab0b64..786f00ef213 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=445197abf17e03f0fcfb70b8be3d8e5b5eb5a7dfafc8fbc3177bd9f860781354
+checksum=91c82cc19aa3541885c1dbe8a849d99d79d7a025fba81de2b0401419f050f14c

From e038b5a3d2ff95b1139de5cfd03417b6d8f38f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:16 +0100
Subject: [PATCH 024/419] kaccounts-integration: update to 20.12.1.

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

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 8fd130fc16f..b01b00b4118 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=5bc0d40fd52a01bf6d80f7d2db54414dc5bcbf693d1c01e8546e1adaf9137f8d
+checksum=22d5879dff70075092748ae04575de7bd7df025eb9a9298bb39d7027601cbe07
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From fc9b285b7cbda4808cac085b97e1e6b093ceba35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:18 +0100
Subject: [PATCH 025/419] kaccounts-providers: update to 20.12.1.

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

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 4efb75cd6e2..4309601c6ee 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=77f4394b47e9787f6683dec5519d2118997baa32abcc1a09fbe4b2602d003bdd
+checksum=78a32db7363b44dae0670f50c68febea6698f57ef3d676a745eb542e87c96fb8
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 95189130f8bec0340402f835971706c956ef7a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:19 +0100
Subject: [PATCH 026/419] kcachegrind: update to 20.12.1.

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

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index d70535744de..dce27d6d0a0 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=e9543784589d7de2de8bfcd0e398f708f54543a208115ab492843cd996a06ac4
+checksum=b1477c26106d142111b050f542b6b91cc8756eafb0cb2c77cd44b5e56bf0066c
 python_version=2

From e8059530621ef91eb05e487f3c9cf48379c87494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:21 +0100
Subject: [PATCH 027/419] kcron: update to 20.12.1.

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

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 037b3bc7931..3081e78fdac 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=12a688f158d174b94f6ab67fb9e72b86ff5d8d34100f4093e26a837cf7894c87
+checksum=ac850bec99fd0da08b9a3ad7f48c133a4a20aa1b3f1302a799fc75d8155faa07

From 44242f819966a4c07b2f7b35b507b927b1feca8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:22 +0100
Subject: [PATCH 028/419] kdialog: update to 20.12.1.

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

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index ddbdc929235..a5f7b049123 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=2479ea4a4568314abbefff4d4edb84b2ac437f59805908044d001792efc46a1d
+checksum=c481729a5757d1668da648005b48b711eb4cb6fc7c6e7249343b45ac065bc68e

From 088f45d6ca0ac810f37f4a0e02d386b01d09598f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:23 +0100
Subject: [PATCH 029/419] keditbookmarks: update to 20.12.1.

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

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 2942b1c65f2..54f2e86f796 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=a17cc82f3698470eade7ed2e9437b2bd4c6b0ede211a5829d130d4e6efe21d90
+checksum=373563cb447a7894acc7aaf8aa7cb39d5ac1d85325a43ac2ad0d7f2ee8fd81a8
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 63e9125d30abfbffd3fb33725b2cafcdaa9ebd93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:25 +0100
Subject: [PATCH 030/419] kfind: update to 20.12.1.

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

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 4490bcfd304..e7adb6e46c0 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=006e6a842b85f4c3387b4333e2eba869d0ae13e0516b069325963630a74b768d
+checksum=b74934cba40298969f3cf7fb620fd8437c8e90f367abe559673e08411bc19d66

From a8610302a874ec6c6321c2013b1587666109231b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:27 +0100
Subject: [PATCH 031/419] kig: update to 20.12.1.

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

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 0d6a16ab798..432c0423549 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=16f09ee6fde0865ad2fb87528eae8d8ec4ab7e69a35ab43ec25fa91f0e200626
+checksum=3feabd92c5b4975c682e80f0b8038c4447b5f29ad0f2e4b194e70a8126cc445b

From 858a0cddc7d822490128d64fd0a36b07973a258c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:28 +0100
Subject: [PATCH 032/419] kio-gdrive: update to 20.12.1.

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

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 5e1498b78b8..390276a3216 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=332e60ae9df25cc40b31e7afabc0dc0cadc4129a9204832e5d93cdab4746e52e
+checksum=e07ef1431b2d9b7e12d9c09483c31f1f321351fc88177d1450d7b18c4640b02b

From eaf0143466d27e06efaaa6cf169936ae53f6cec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:29 +0100
Subject: [PATCH 033/419] kmag: update to 20.12.1.

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

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d44badeabdc..09b3f232050 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=0ade18c35210cd80827ba239a413343663f04efe9974efdf6fe2aa50a3549975
+checksum=12728dbb62fab21f63156859a08fd5694c668025c6b5ecdae7e48ab97cf09f54

From cf02bfa57d68481b0b81e4bb9a6a7d9580224cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:30 +0100
Subject: [PATCH 034/419] kmix: update to 20.12.1.

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

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index a9cf4ed0594..dd7e40d5417 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=161b743868a4fe3dad42c5a50a9568c61d8e44cf73f1f4f3e53e2de1c8936e72
+checksum=17c5bb01ddb61945439a116fc6615794a97b1e204f245e45b6255b5ec7f832e0

From 492d537c1fa5e0ca33f4cd436565bef1693ab303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:31 +0100
Subject: [PATCH 035/419] kolourpaint: update to 20.12.1.

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

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 9fbdcb3a380..6117d372f67 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d80940e27155304aa0842fa3c08d72f8e383eb45beff49dc1a66b12b030be4ca
+checksum=5ee17da9790d931953acedeebc434e11edb2f3e9a8593183913b47985c7e5ca8
 
 post_install() {
 	vlicense COPYING

From a218d24a005c02493fb3dfaef0e2b530ba4d255f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:32 +0100
Subject: [PATCH 036/419] kompare: update to 20.12.1.

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

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 26776ec9332..cbcf20b85ef 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6d838d59031dc91cbd0f690b881ec3b35e70e63a921c5454f709520f8646576a
+checksum=10b32f0556e8094ab6276c66d018310e47be0314c915ad9872f4f7737f43b18d

From 8d49db154e97022fd3ea569f5b0d4ca2f19f16b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:33 +0100
Subject: [PATCH 037/419] kpat: update to 20.12.1.

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

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index c4cb231d3d0..8b338960fc7 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,7 +13,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=c00f9afeb7b2d4e37e626a9379df08f30077d0c1965a674795b099dd11588d8f
+checksum=a9186b51156307060186b9546947f77f9cfe72c287cd863a01b17309f189a3cd
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 297285faa7e02f908a09a33f60ab2e235b611590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:35 +0100
Subject: [PATCH 038/419] kruler: update to 20.12.1.

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

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 7938b90e98c..7fc152eb110 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=4976fdef20abc10e05122f6d284f0b3cd187ce7bf56a3ae286ad693a5d6e259c
+checksum=78c02e727b0fa8d26fe35dfa1a1c479b01061ee7c78df748bccdae438c4e3fca

From 641d4e1b89c723ec8628e98c4c599df580523506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:36 +0100
Subject: [PATCH 039/419] ksystemlog: update to 20.12.1.

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

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 43cdc65b6f6..7750d20dabe 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=dd485238d4c2cd0ab2c603d5fc4ec60c6f4603ee5e3876cca577011cd0749508
+checksum=80f51e5dc1dcc6a7479ab4c2a10d39e04ef9ffe822f00e766f8c7182b5d16514
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 004de3a2f053d612963c8dc6e8355d0b8783f6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:37 +0100
Subject: [PATCH 040/419] kteatime: update to 20.12.1.

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

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index dabfd528e5c..93fcf6dda0a 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=fabef94581df93d805c69b62407599a4adf8fe504b60e3c2479db22223e0e9ee
+checksum=fd9b504cc37c4acf495a31c576048a53f735e8d93024e7230be6a3343c1f2c49

From ae25f8563c891b961d579ce8aad85c1575a04b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:38 +0100
Subject: [PATCH 041/419] kturtle: update to 20.12.1.

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

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index a5eb86542e1..bf3d351ed21 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=bf60bff1b207857faa9f970099e447d04962ce8c09018c10f5e6dd07f381e68d
+checksum=6b79f2f60517656501f6af0590f8464d37c698b88b7806c661fb4ac89626598a

From 107e6304ef8d8f0155a77984943c1d0536bb464a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:40 +0100
Subject: [PATCH 042/419] kwalletmanager: update to 20.12.1.

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

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 611212fa0e1..425f3d74adc 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=8253d2bdba00c8e016572296de60452fd0f82944e175d7914d7527131e74b8ee
+checksum=72ab9cd2a53b9cc7db144b712ef18d81b23de3ff6b05d92f961b9bff65174f5b

From b5ac63652e2e1285549c3b9e269dff7745150c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:41 +0100
Subject: [PATCH 043/419] libkcddb: update to 20.12.1.

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

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 3d24fb7c0d2..96e175a0fce 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=a922f201a9366f66ab3292f3f9e34d03fbd0183a6c23d8b5bd3730b69c567b25
+checksum=f3688d66a3026d5355a340e2d9a9e669d5b70afe187789ca7a0919713c257e1e
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From fa7021356b3f915a223ae84dd4de9fc5a00f90d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:42 +0100
Subject: [PATCH 044/419] libkomparediff2: update to 20.12.1.

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

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 54614d0261f..0cf9e8ac86a 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=8b92b729d2d1c7998b22ffd6a7ae95f46954785d4855ce6cfa7a1fb401cf66ec
+checksum=c3a79ea99dd4f4a72db628f46720049960e6b948f5e14b97a7857e04e1c67412
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 479a14ebd207da37c03f211a828a1b63da8dc6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:43 +0100
Subject: [PATCH 045/419] marble5: update to 20.12.1.

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

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index ef7feaa2e0b..1ab217abc56 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=20.12.0
+version=20.12.1
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=aa5a7891a7f8d0b6b9abdcbc99fc4dc783f6b93e898b3b9fcbe69b7348c1eb85
+checksum=65c936ceefdd368494778e55a921f9d111e6fabab718b948f3f59ede5f446970
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From d2f7e085fac634ac06d9de58632d8d9c8691a74f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:44 +0100
Subject: [PATCH 046/419] signon-kwallet-extension: update to 20.12.1.

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

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 33248ed6dca..b6d18130e12 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=7019c1b9b42930c2b0ab197674eeb435eccf6fef2aeda8b87a989479b1ee1e2e
+checksum=4b762208b8d48c0d56b4605f701ebadc1daa59b16054c238a132f38a6b518854

From ea3a7d7d7f08514720504935e8d2346696ff43fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:46 +0100
Subject: [PATCH 047/419] svgpart: update to 20.12.1.

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

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 8f67b404942..58a03476fb4 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=bc018419d05078f1ddf5b991c9c76448b1b1722dba914085553bde253b7895f5
+checksum=3eb7fe2ebb6cd32fc86fcb659189dd7e84ecda88019456ef7d8873a58bbbc026

From 5219de3f664ce5d03c1b37c1016a8219e2211fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:47 +0100
Subject: [PATCH 048/419] umbrello: update to 20.12.1.

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

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 7be67571b49..5744aaa0ce4 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=216bfa1bca11c28d41c3d2f8ba818b03090d138b00def56221d1901bff63b4b7
+checksum=74a787947b670024c8a39fc8fb764fba1e79dfcc2664390b903dd85fb8efdd1d
 python_version=2
 
 pre_configure() {

From bfdc67f29e906c73f47def0d7448eb851abe654a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:48 +0100
Subject: [PATCH 049/419] yakuake: update to 20.12.1.

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

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index fe96e4d1134..fd176e7eb3a 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=a1a1f914ffb4364ba57dd66daf9366aeb9da8fe0d14b4c41b5a7ad3befdcbb9c
+checksum=4a0d934335ec74e4a09b73792ad7a6587adb035742ef1adbe177f1d07ba2ea0a

From 9c820a9e247bfafaac9e1221eb8e7974250bb331 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 19 Dec 2020 16:49:32 -0600
Subject: [PATCH 050/419] nvidia340: remove

---
 common/shlibs                            |   3 -
 srcpkgs/nvidia340-dkms                   |   1 -
 srcpkgs/nvidia340-libs                   |   1 -
 srcpkgs/nvidia340-opencl                 |   1 -
 srcpkgs/nvidia340/INSTALL                |   7 -
 srcpkgs/nvidia340/INSTALL.msg            |  15 -
 srcpkgs/nvidia340/REMOVE                 |   7 -
 srcpkgs/nvidia340/files/kernel-5.8.patch |  92 ---
 srcpkgs/nvidia340/files/kernel-5.9.patch | 107 ----
 srcpkgs/nvidia340/files/kernel-5.x.patch | 781 -----------------------
 srcpkgs/nvidia340/files/nvidia-glx.conf  |   4 -
 srcpkgs/nvidia340/template               | 223 -------
 srcpkgs/nvidia340/update                 |   2 -
 srcpkgs/removed-packages/template        |   6 +-
 14 files changed, 5 insertions(+), 1245 deletions(-)
 delete mode 120000 srcpkgs/nvidia340-dkms
 delete mode 120000 srcpkgs/nvidia340-libs
 delete mode 120000 srcpkgs/nvidia340-opencl
 delete mode 100644 srcpkgs/nvidia340/INSTALL
 delete mode 100644 srcpkgs/nvidia340/INSTALL.msg
 delete mode 100644 srcpkgs/nvidia340/REMOVE
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.8.patch
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.9.patch
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.x.patch
 delete mode 100644 srcpkgs/nvidia340/files/nvidia-glx.conf
 delete mode 100644 srcpkgs/nvidia340/template
 delete mode 100644 srcpkgs/nvidia340/update

diff --git a/common/shlibs b/common/shlibs
index 17621bdb846..24c31d8621d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -131,16 +131,13 @@ libbrcmOpenVG.so rpi-userland-20180103_2
 libwayland-egl.so.1 wayland-1.15.0_4
 libnvidia-ml.so.1 nvidia-libs-346.47_1 ignore
 libnvidia-ml.so.1 nvidia304-libs-304.00_1 ignore
-libnvidia-ml.so.1 nvidia340-libs-340.46_1 ignore
 libnvidia-ml.so.1 nvidia390-libs-390.87_1 ignore
 libnvidia-tls.so.346.47 nvidia-libs-346.47_1 ignore
 libnvidia-glcore.so.346.47 nvidia-libs-346.47_1 ignore
 libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
-libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore
 libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore
 libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
-libnvidia-glsi.so.340.107 nvidia340-libs-340.107_7 ignore
 libnvidia-fatbinaryloader.so.390.138 nvidia390-libs-390.138_1 ignore
 libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore
 libglapi.so.0 libglapi-7.11_1
diff --git a/srcpkgs/nvidia340-dkms b/srcpkgs/nvidia340-dkms
deleted file mode 120000
index 383d067a70f..00000000000
--- a/srcpkgs/nvidia340-dkms
+++ /dev/null
@@ -1 +0,0 @@
-nvidia340
\ No newline at end of file
diff --git a/srcpkgs/nvidia340-libs b/srcpkgs/nvidia340-libs
deleted file mode 120000
index 383d067a70f..00000000000
--- a/srcpkgs/nvidia340-libs
+++ /dev/null
@@ -1 +0,0 @@
-nvidia340
\ No newline at end of file
diff --git a/srcpkgs/nvidia340-opencl b/srcpkgs/nvidia340-opencl
deleted file mode 120000
index 383d067a70f..00000000000
--- a/srcpkgs/nvidia340-opencl
+++ /dev/null
@@ -1 +0,0 @@
-nvidia340
\ No newline at end of file
diff --git a/srcpkgs/nvidia340/INSTALL b/srcpkgs/nvidia340/INSTALL
deleted file mode 100644
index 6b065bedb4a..00000000000
--- a/srcpkgs/nvidia340/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-# Regenerate initramfs.
-case ${ACTION} in
-post)
-	echo "Regenerating initramfs, please wait..."
-	dracut -f -q --regenerate-all
-	;;
-esac
diff --git a/srcpkgs/nvidia340/INSTALL.msg b/srcpkgs/nvidia340/INSTALL.msg
deleted file mode 100644
index 6301c36edbe..00000000000
--- a/srcpkgs/nvidia340/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-> Remove from your /etc/X11/xorg.conf blocks like this:
-
-Section "Files"
-...
-EndSection
-
-This is known to happen when the configuration is generated by nvidia-xconfig.
-Such a section interferes with the "Files" Section provided by the package.
-
--------------------------------------------------------------------------------
-
-> If you wish to go back to nouveau:
-
-# xbps-remove nvidia340 nvidia340-dkms
-# xbps-install libglvnd
diff --git a/srcpkgs/nvidia340/REMOVE b/srcpkgs/nvidia340/REMOVE
deleted file mode 100644
index e4d494ca015..00000000000
--- a/srcpkgs/nvidia340/REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-# Regenerate initramfs.
-case ${ACTION} in
-purge)
-	echo "Regenerating initramfs, please wait..."
-	dracut -f -q --regenerate-all
-	;;
-esac
diff --git a/srcpkgs/nvidia340/files/kernel-5.8.patch b/srcpkgs/nvidia340/files/kernel-5.8.patch
deleted file mode 100644
index 1d8b1a40e1e..00000000000
--- a/srcpkgs/nvidia340/files/kernel-5.8.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 2cc3342b4b3c96bcc4062513011d35c079b009a2 Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Thu, 22 Oct 2020 06:59:59 -0400
-Subject: [PATCH 2/3] kernel-5.8
-
-credit: https://launchpad.net/~kelebek333/+archive/ubuntu/nvidia-legacy/+packages
-extracted from: https://launchpadlibrarian.net/492468557/nvidia-graphics-drivers-340_340.108-1lmtrfocal3_340.108-2lmtrfocal.diff.gz
----
- kernel/nv-linux.h                | 8 ++++++++
- kernel/nvidia-modules-common.mk  | 1 +
- kernel/os-mlock.c                | 8 ++++++++
- kernel/uvm/nvidia_uvm_lite_api.c | 4 ++++
- 4 files changed, 21 insertions(+)
-
-diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
-index 83e6433..d055552 100644
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -669,11 +669,19 @@ extern nv_spinlock_t km_lock;
- #  define KM_FREE_RECORD(a,b,c)
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+#define NV_VMALLOC(ptr, size)                     \
-+    {                                             \
-+        (ptr) = __vmalloc(size, GFP_KERNEL);      \
-+        VM_ALLOC_RECORD(ptr, size, "vm_vmalloc"); \
-+    }
-+#else
- #define NV_VMALLOC(ptr, size)                               \
-     {                                                       \
-         (ptr) = __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);   \
-         VM_ALLOC_RECORD(ptr, size, "vm_vmalloc");           \
-     }
-+#endif
- 
- #define NV_VFREE(ptr, size)                         \
-     {                                               \
-diff --git a/kernel/nvidia-modules-common.mk b/kernel/nvidia-modules-common.mk
-index b94591b..0e4c228 100644
---- a/kernel/nvidia-modules-common.mk
-+++ b/kernel/nvidia-modules-common.mk
-@@ -222,6 +222,7 @@ build-sanity-checks:
- define BUILD_MODULE_RULE
-  $(1): build-sanity-checks $(3)
- 	@echo "NVIDIA: calling KBUILD..."; \
-+	touch .nv-kernel.o.cmd; \
- 	$$(MAKE) "CC=$$(CC)" NV_MODULE_SUFFIX=$$(strip $(2)) $$(KBUILD_PARAMS) modules; \
- 	echo "NVIDIA: left KBUILD."; \
- 	if ! [ -f $(1) ]; then \
-diff --git a/kernel/os-mlock.c b/kernel/os-mlock.c
-index 8a1fa2f..fc50543 100644
---- a/kernel/os-mlock.c
-+++ b/kernel/os-mlock.c
-@@ -44,11 +44,19 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
-         return rmStatus;
-     }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+    down_read(&mm->mmap_lock);
-+    ret = NV_GET_USER_PAGES((unsigned long)address,
-+                            page_count, write, force, user_pages, NULL);
-+    up_read(&mm->mmap_lock);
-+    pinned = ret;
-+#else
-     down_read(&mm->mmap_sem);
-     ret = NV_GET_USER_PAGES((unsigned long)address,
-                             page_count, write, force, user_pages, NULL);
-     up_read(&mm->mmap_sem);
-     pinned = ret;
-+#endif
- 
-     if (ret < 0)
-     {
-diff --git a/kernel/uvm/nvidia_uvm_lite_api.c b/kernel/uvm/nvidia_uvm_lite_api.c
-index 8448eb6..97a4818 100644
---- a/kernel/uvm/nvidia_uvm_lite_api.c
-+++ b/kernel/uvm/nvidia_uvm_lite_api.c
-@@ -30,6 +30,10 @@
- #include "uvm_gpu_ops_tests.h"
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+#define mmap_sem mmap_lock
-+#endif
-+
- //
- // nvidia_uvm_lite_api.c
- //
--- 
-2.29.0
-
diff --git a/srcpkgs/nvidia340/files/kernel-5.9.patch b/srcpkgs/nvidia340/files/kernel-5.9.patch
deleted file mode 100644
index d8584314f24..00000000000
--- a/srcpkgs/nvidia340/files/kernel-5.9.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From fea401df7500bfbead5a42b1e74560dbddf2f5a3 Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Thu, 22 Oct 2020 07:00:35 -0400
-Subject: [PATCH 3/3] kernel-5.9
-
-credit: https://github.com/warpme/minimyth2/blob/master/script/nvidia/nvidia-340.108/files/nvidia-340.108-fix-5.9-kernel-compile.patch
----
- kernel/nv-drm.c               | 8 ++++++++
- kernel/nv-linux.h             | 9 +++++++--
- kernel/nv.c                   | 4 ++++
- kernel/uvm/nvidia_uvm_linux.h | 2 ++
- 4 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
-index 85db07e..f0c1299 100644
---- a/kernel/nv-drm.c
-+++ b/kernel/nv-drm.c
-@@ -415,7 +415,11 @@ static struct drm_driver nv_drm_driver = {
-     .set_busid = drm_pci_set_busid,
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+    .gem_free_object_unlocked = nv_gem_free,
-+#else
-     .gem_free_object = nv_gem_free,
-+#endif
- 
-     .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
-     .gem_prime_export = drm_gem_prime_export,
-@@ -511,8 +515,12 @@ RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(
- 
- #if defined(NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT)
-     drm_gem_object_put_unlocked(&nv_obj->base);
-+#else
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+    drm_gem_object_put_locked(&nv_obj->base);
- #else
-     drm_gem_object_unreference_unlocked(&nv_obj->base);
-+#endif
- #endif
- 
-     status = RM_OK;
-diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
-index d055552..524a8fe 100644
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -136,8 +136,10 @@
- 
- #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
- #include <linux/syscalls.h>         /* sys_ioctl()                      */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
- #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
- #endif
-+#endif
- 
- #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
-   !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
-@@ -2249,10 +2251,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
-                                             pages, vmas, NULL);
- 
-         #else
--
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+               return get_user_pages_remote(mm, start, nr_pages, flags,
-+                                            pages, vmas, NULL);
-+#else
-                return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
-                                             pages, vmas);
--
-+#endif
-         #endif
- 
-         }
-diff --git a/kernel/nv.c b/kernel/nv.c
-index a218f83..be4e0f8 100644
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -2785,7 +2785,11 @@ nvidia_probe
- 
- #if defined(CONFIG_VGA_ARB)
- #if defined(VGA_DEFAULT_DEVICE)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+    vga_get(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK, 0);
-+#else
-     vga_tryget(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK);
-+#endif
- #endif
-     vga_set_legacy_decoding(dev, VGA_RSRC_NONE);
- #endif
-diff --git a/kernel/uvm/nvidia_uvm_linux.h b/kernel/uvm/nvidia_uvm_linux.h
-index 1625209..efc181f 100644
---- a/kernel/uvm/nvidia_uvm_linux.h
-+++ b/kernel/uvm/nvidia_uvm_linux.h
-@@ -158,8 +158,10 @@
- 
- #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
- #include <linux/syscalls.h>         /* sys_ioctl()                      */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
- #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
- #endif
-+#endif
- 
- #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
-   !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
--- 
-2.29.0
-
diff --git a/srcpkgs/nvidia340/files/kernel-5.x.patch b/srcpkgs/nvidia340/files/kernel-5.x.patch
deleted file mode 100644
index d7f763bbe39..00000000000
--- a/srcpkgs/nvidia340/files/kernel-5.x.patch
+++ /dev/null
@@ -1,781 +0,0 @@
-From 2154cc447a2377cfd60a7b7c5b619e689ebf71b1 Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Thu, 22 Oct 2020 06:58:53 -0400
-Subject: [PATCH 1/3] kernel-5.7
-
-Contains a bunch of stuff required for things up to 5.7.
-credit: https://gitlab.manjaro.org/packages?utf8=%E2%9C%93&filter=nvidia-340xx
----
- kernel/Makefile              |   5 +
- kernel/conftest.sh           |  81 +++++++++++++
- kernel/dkms.conf             |   8 +-
- kernel/nv-drm.c              | 229 ++++++++++++++++++++++++++++++++++-
- kernel/nv-linux.h            |  49 ++++++++
- kernel/nv-procfs.c           |  20 +++
- kernel/nv-time.h             |   9 +-
- kernel/nv.c                  |   2 +-
- kernel/os-interface.c        |   8 +-
- kernel/uvm/Makefile          |   1 +
- kernel/uvm/conftest.sh       |   4 +
- kernel/uvm/nvidia_uvm_lite.c |  29 ++++-
- 12 files changed, 431 insertions(+), 14 deletions(-)
-
-diff --git a/kernel/Makefile b/kernel/Makefile
-index 125a690..2597080 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -108,12 +108,14 @@ COMPILE_TESTS = \
- 	acquire_console_sem \
- 	console_lock \
- 	kmem_cache_create \
-+	kmem_cache_create_usercopy \
- 	outer_flush_all \
- 	on_each_cpu \
- 	smp_call_function \
- 	nvmap_support \
- 	acpi_evaluate_integer \
- 	ioremap_cache \
-+	ioremap_nocache \
- 	ioremap_wc \
- 	proc_dir_entry \
- 	INIT_WORK \
-@@ -122,6 +124,7 @@ COMPILE_TESTS = \
- 	pci_domain_nr \
- 	pci_dma_mapping_error \
- 	file_operations \
-+	proc_ops \
- 	sg_alloc_table \
- 	sg_init_table \
- 	pci_get_domain_bus_and_slot \
-@@ -147,6 +150,8 @@ COMPILE_TESTS = \
- 	vm_fault_present \
- 	vm_fault_has_address \
- 	drm_driver_unload_has_int_return_type \
-+	drm_get_pci_dev \
-+	drm_pci_init \
- 	drm_legacy_pci_init \
- 	timer_setup \
- 	do_gettimeofday \
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index b7a85f0..a5225e5 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -176,6 +176,7 @@ test_headers() {
-     FILES="$FILES linux/ktime.h"
-     FILES="$FILES linux/file.h"
- 
-+    FILES_ARCH="$FILES_ARCH asm/pgtable.h"
-     FILES_ARCH="$FILES_ARCH asm/set_memory.h"
- 
-     translate_and_find_header_files $HEADERS      $FILES
-@@ -440,6 +441,9 @@ compile_test() {
-             # Determine if the set_memory_array_uc() function is present.
-             #
-             CODE="
-+            #if defined(NV_ASM_PGTABLE_H_PRESENT)
-+            #include <asm/pgtable.h>
-+            #endif
-             #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
-             #include <asm/set_memory.h>
-             #else
-@@ -914,6 +918,21 @@ compile_test() {
-             fi
-         ;;
- 
-+        kmem_cache_create_usercopy)
-+            #
-+            # Determine if the kmem_cache_create_usercopy function exists.
-+            #
-+            # This function was added by:
-+            #   2017-06-10  8eb8284b412906181357c2b0110d879d5af95e52
-+            CODE="
-+            #include <linux/slab.h>
-+            void kmem_cache_create_usercopy(void) {
-+                kmem_cache_create_usercopy();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_KMEM_CACHE_CREATE_USERCOPY_PRESENT" "" "functions"
-+        ;;
-+
-         smp_call_function)
-             #
-             # Determine if the smp_call_function() function is
-@@ -1188,6 +1207,22 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_IOREMAP_CACHE_PRESENT" "" "functions"
-         ;;
- 
-+        ioremap_nocache)
-+            #
-+            # Determine if the ioremap_nocache() function is present.
-+            #
-+            # Removed by commit 4bdc0d676a64 ("remove ioremap_nocache and
-+            # devm_ioremap_nocache") in v5.6 (2020-01-06)
-+            #
-+            CODE="
-+            #include <asm/io.h>
-+            void conftest_ioremap_nocache(void) {
-+                ioremap_nocache();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_IOREMAP_NOCACHE_PRESENT" "" "functions"
-+        ;;
-+
-         ioremap_wc)
-             #
-             # Determine if the ioremap_wc() function is present.
-@@ -1371,6 +1406,16 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_FILE_OPERATIONS_HAS_COMPAT_IOCTL" "" "types"
-         ;;
- 
-+        proc_ops)
-+            CODE="
-+            #include <linux/proc_fs.h>
-+            int conftest_proc_ops(void) {
-+                return offsetof(struct proc_ops, proc_open);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_HAVE_PROC_OPS" "" "types"
-+        ;;
-+
-         sg_init_table)
-             #
-             # Determine if the sg_init_table() function is present.
-@@ -2044,6 +2089,42 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_DRM_DRIVER_UNLOAD_HAS_INT_RETURN_TYPE" "" "types"
-         ;;
- 
-+        drm_get_pci_dev)
-+            #
-+            # Determine if drm_get_pci_dev() is present.
-+            #
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            #if defined(NV_DRM_DRM_PCI_H_PRESENT)
-+            #include <drm/drm_pci.h>
-+            #endif
-+
-+            void conftest_drm_legacy_pci_init(void) {
-+                drm_get_pci_dev();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_GET_PCI_DEV_PRESENT" "" "functions"
-+        ;;
-+
-+        drm_pci_init)
-+            #
-+            # Determine if drm_pci_init() is present.
-+            #
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            void conftest_drm_legacy_pci_init(void) {
-+                drm_pci_init();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_PCI_INIT_PRESENT" "" "functions"
-+        ;;
-+
-         drm_legacy_pci_init)
-             #
-             # Determine if drm_legacy_pci_init() is present. drm_pci_init() was
-diff --git a/kernel/dkms.conf b/kernel/dkms.conf
-index 79a02ae..3140f03 100644
---- a/kernel/dkms.conf
-+++ b/kernel/dkms.conf
-@@ -1,7 +1,13 @@
-+if [ -x /usr/bin/nproc ]; then
-+  num_cpu_cores=$(nproc)
-+else
-+  num_cpu_cores=1
-+fi
-+
- PACKAGE_NAME="nvidia"
- PACKAGE_VERSION="340.108"
- BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
- DEST_MODULE_LOCATION[0]="/kernel/drivers/video"
--MAKE[0]="make module KERNEL_UNAME=${kernelver}"
-+MAKE[0]="make -j$num_cpu_cores module KERNEL_UNAME=${kernelver}"
- CLEAN="make clean"
- AUTOINSTALL="yes"
-diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
-index 0d1cdbf..85db07e 100644
---- a/kernel/nv-drm.c
-+++ b/kernel/nv-drm.c
-@@ -50,9 +50,236 @@
- #if defined(NV_DRM_LEGACY_PCI_INIT_PRESENT)
- #define nv_drm_pci_init drm_legacy_pci_init
- #define nv_drm_pci_exit drm_legacy_pci_exit
--#else
-+#elif defined(NV_DRM_PCI_INIT_PRESENT)
- #define nv_drm_pci_init drm_pci_init
- #define nv_drm_pci_exit drm_pci_exit
-+#else
-+#if defined(NV_DRM_GET_PCI_DEV_PRESENT)
-+#define nv_drm_get_pci_dev drm_get_pci_dev
-+#else
-+#include <drm/drm_agpsupport.h>
-+
-+struct nv_drm_agp_head {
-+    struct agp_kern_info agp_info;
-+    struct list_head memory;
-+    unsigned long mode;
-+    struct agp_bridge_data *bridge;
-+    int enabled;
-+    int acquired;
-+    unsigned long base;
-+    int agp_mtrr;
-+    int cant_use_aperture;
-+    unsigned long page_mask;
-+};
-+
-+struct nv_drm_agp_mem {
-+    unsigned long handle;
-+    struct agp_memory *memory;
-+    unsigned long bound;
-+    int pages;
-+    struct list_head head;
-+};
-+
-+/*
-+ * Code from drm_agp_init/nv_drm_{free,unbind}_agp
-+ * Extracted from commit: 5b8b9d0c6d0e0f1993c6c56deaf9646942c49d94, file: drivers/gpu/drm/drm_agpsupport.c
-+ */
-+struct drm_agp_head *nv_drm_agp_init(struct drm_device *dev)
-+{
-+    struct nv_drm_agp_head *head = NULL;
-+
-+    head = kzalloc(sizeof(*head), GFP_KERNEL);
-+    if (!head)
-+        return NULL;
-+    head->bridge = agp_find_bridge(dev->pdev);
-+    if (!head->bridge) {
-+        head->bridge = agp_backend_acquire(dev->pdev);
-+        if (!head->bridge) {
-+            kfree(head);
-+            return NULL;
-+        }
-+        agp_copy_info(head->bridge, &head->agp_info);
-+        agp_backend_release(head->bridge);
-+    } else {
-+        agp_copy_info(head->bridge, &head->agp_info);
-+    }
-+    if (head->agp_info.chipset == NOT_SUPPORTED) {
-+        kfree(head);
-+        return NULL;
-+    }
-+    INIT_LIST_HEAD(&head->memory);
-+    head->cant_use_aperture = head->agp_info.cant_use_aperture;
-+    head->page_mask = head->agp_info.page_mask;
-+    head->base = head->agp_info.aper_base;
-+    return (struct drm_agp_head *)head;
-+}
-+
-+void nv_drm_free_agp(struct agp_memory *handle, int pages)
-+{
-+    agp_free_memory(handle);
-+}
-+
-+int nv_drm_unbind_agp(struct agp_memory *handle)
-+{
-+    return agp_unbind_memory(handle);
-+}
-+
-+/*
-+ * Code from drm_pci_agp_{clear,destroy,init}/drm_get_pci_dev
-+ * Extracted from commit: 5b8b9d0c6d0e0f1993c6c56deaf9646942c49d94, file: drivers/gpu/drm/drm_pci.c
-+ */
-+static void nv_drm_pci_agp_init(struct drm_device *dev)
-+{
-+    if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
-+        if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
-+            dev->agp = nv_drm_agp_init(dev);
-+        if (dev->agp) {
-+            dev->agp->agp_mtrr = arch_phys_wc_add(
-+                dev->agp->agp_info.aper_base,
-+                dev->agp->agp_info.aper_size *
-+                1024 * 1024);
-+        }
-+    }
-+}
-+
-+void nv_drm_legacy_agp_clear(struct drm_device *dev)
-+{
-+    struct nv_drm_agp_mem *entry, *tempe;
-+
-+    if (!dev->agp)
-+        return;
-+    if (!drm_core_check_feature(dev, DRIVER_LEGACY))
-+        return;
-+
-+    list_for_each_entry_safe(entry, tempe, &dev->agp->memory, head) {
-+        if (entry->bound)
-+            nv_drm_unbind_agp(entry->memory);
-+        nv_drm_free_agp(entry->memory, entry->pages);
-+        kfree(entry);
-+    }
-+    INIT_LIST_HEAD(&dev->agp->memory);
-+
-+    if (dev->agp->acquired)
-+        drm_agp_release(dev);
-+
-+    dev->agp->acquired = 0;
-+    dev->agp->enabled = 0;
-+}
-+
-+void nv_drm_pci_agp_destroy(struct drm_device *dev)
-+{
-+    if (dev->agp) {
-+        arch_phys_wc_del(dev->agp->agp_mtrr);
-+        nv_drm_legacy_agp_clear(dev);
-+        kfree(dev->agp);
-+        dev->agp = NULL;
-+    }
-+}
-+
-+static int nv_drm_get_pci_dev(struct pci_dev *pdev,
-+               const struct pci_device_id *ent,
-+               struct drm_driver *driver)
-+{
-+    struct drm_device *dev;
-+    int ret;
-+
-+    DRM_DEBUG("\n");
-+
-+    dev = drm_dev_alloc(driver, &pdev->dev);
-+    if (IS_ERR(dev))
-+        return PTR_ERR(dev);
-+
-+    ret = pci_enable_device(pdev);
-+    if (ret)
-+        goto err_free;
-+
-+    dev->pdev = pdev;
-+#ifdef __alpha__
-+    dev->hose = pdev->sysdata;
-+#endif
-+
-+    if (drm_core_check_feature(dev, DRIVER_MODESET))
-+        pci_set_drvdata(pdev, dev);
-+
-+    nv_drm_pci_agp_init(dev);
-+
-+    ret = drm_dev_register(dev, ent->driver_data);
-+    if (ret)
-+        goto err_agp;
-+
-+    /* No locking needed since shadow-attach is single-threaded since it may
-+     * only be called from the per-driver module init hook. */
-+    if (drm_core_check_feature(dev, DRIVER_LEGACY))
-+        list_add_tail(&dev->legacy_dev_list, &driver->legacy_dev_list);
-+
-+    return 0;
-+
-+err_agp:
-+    nv_drm_pci_agp_destroy(dev);
-+    pci_disable_device(pdev);
-+err_free:
-+    drm_dev_put(dev);
-+    return ret;
-+}
-+#endif
-+
-+/*
-+ * Code from drm_legacy_pci_{init,exit}
-+ * Extracted from tag: v5.6.3, file: drivers/gpu/drm/drm_pci.c
-+ */
-+int nv_drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
-+{
-+    struct pci_dev *pdev = NULL;
-+    const struct pci_device_id *pid;
-+    int i;
-+
-+    DRM_DEBUG("\n");
-+
-+    if (WARN_ON(!(driver->driver_features & DRIVER_LEGACY)))
-+        return -EINVAL;
-+
-+    /* If not using KMS, fall back to stealth mode manual scanning. */
-+    INIT_LIST_HEAD(&driver->legacy_dev_list);
-+    for (i = 0; pdriver->id_table[i].vendor != 0; i++) {
-+        pid = &pdriver->id_table[i];
-+
-+        /* Loop around setting up a DRM device for each PCI device
-+         * matching our ID and device class.  If we had the internal
-+         * function that pci_get_subsys and pci_get_class used, we'd
-+         * be able to just pass pid in instead of doing a two-stage
-+         * thing.
-+         */
-+        pdev = NULL;
-+        while ((pdev =
-+            pci_get_subsys(pid->vendor, pid->device, pid->subvendor,
-+                       pid->subdevice, pdev)) != NULL) {
-+            if ((pdev->class & pid->class_mask) != pid->class)
-+                continue;
-+
-+            /* stealth mode requires a manual probe */
-+            pci_dev_get(pdev);
-+            nv_drm_get_pci_dev(pdev, pid, driver);
-+        }
-+    }
-+    return 0;
-+}
-+
-+void nv_drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver)
-+{
-+    struct drm_device *dev, *tmp;
-+    DRM_DEBUG("\n");
-+
-+    if (!(driver->driver_features & DRIVER_LEGACY)) {
-+        WARN_ON(1);
-+    } else {
-+        list_for_each_entry_safe(dev, tmp, &driver->legacy_dev_list,
-+                     legacy_dev_list) {
-+            list_del(&dev->legacy_dev_list);
-+            drm_put_dev(dev);
-+        }
-+    }
-+    DRM_INFO("Module unloaded\n");
-+}
- #endif
- 
- extern nv_linux_state_t *nv_linux_devices;
-diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
-index a1d2c68..83e6433 100644
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -688,11 +688,16 @@ extern nv_spinlock_t km_lock;
-         VM_ALLOC_RECORD(ptr, size, "vm_ioremap"); \
-     }
- 
-+#if defined(NV_IOREMAP_NOCACHE_PRESENT)
- #define NV_IOREMAP_NOCACHE(ptr, physaddr, size) \
-     { \
-         (ptr) = ioremap_nocache(physaddr, size); \
-         VM_ALLOC_RECORD(ptr, size, "vm_ioremap_nocache"); \
-     }
-+#else
-+#define NV_IOREMAP_NOCACHE(ptr, physaddr, size) \
-+    NV_IOREMAP(ptr, physaddr, size)
-+#endif
- 
- #if defined(NV_IOREMAP_CACHE_PRESENT)
- #define NV_IOREMAP_CACHE(ptr, physaddr, size)            \
-@@ -774,6 +779,17 @@ extern nv_spinlock_t km_lock;
- #error "NV_KMEM_CACHE_CREATE() undefined (kmem_cache_create() unavailable)!"
- #endif
- 
-+#if defined(NV_KMEM_CACHE_CREATE_USERCOPY_PRESENT)
-+#define NV_KMEM_CACHE_CREATE_USERCOPY(kmem_cache, name, type)       \
-+    {                                                               \
-+        kmem_cache = kmem_cache_create_usercopy(name, sizeof(type), \
-+                        0, 0, 0, sizeof(type), NULL);               \
-+    }
-+#else
-+#define NV_KMEM_CACHE_CREATE_USERCOPY(kmem_cache, name, type)       \
-+        NV_KMEM_CACHE_CREATE(kmem_cache, name, type)
-+#endif
-+
- #define NV_KMEM_CACHE_ALLOC(ptr, kmem_cache, type)              \
-     {                                                           \
-         (ptr) = kmem_cache_alloc(kmem_cache, GFP_KERNEL);       \
-@@ -1971,6 +1987,19 @@ extern NvU32 nv_assign_gpu_count;
-     })
- #endif
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+#define NV_CREATE_PROC_FILE(filename,parent,__name,__data)               \
-+   ({                                                                    \
-+        struct proc_dir_entry *__entry;                                  \
-+        int mode = (S_IFREG | S_IRUGO);                                  \
-+        const struct proc_ops *fops = &nv_procfs_##__name##_fops;        \
-+        if (fops->proc_write != 0)                                       \
-+            mode |= S_IWUSR;                                             \
-+        __entry = NV_CREATE_PROC_ENTRY(filename, mode, parent, fops,     \
-+            __data);                                                     \
-+        __entry;                                                         \
-+    })
-+#else
- #define NV_CREATE_PROC_FILE(filename,parent,__name,__data)               \
-    ({                                                                    \
-         struct proc_dir_entry *__entry;                                  \
-@@ -1982,6 +2011,7 @@ extern NvU32 nv_assign_gpu_count;
-             __data);                                                     \
-         __entry;                                                         \
-     })
-+#endif
- 
- /*
-  * proc_mkdir_mode exists in Linux 2.6.9, but isn't exported until Linux 3.0.
-@@ -2023,6 +2053,24 @@ extern NvU32 nv_assign_gpu_count;
-     remove_proc_entry(entry->name, entry->parent);
- #endif
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+#define NV_DEFINE_PROCFS_SINGLE_FILE(__name)                                  \
-+    static int nv_procfs_open_##__name(                                       \
-+        struct inode *inode,                                                  \
-+        struct file *filep                                                    \
-+    )                                                                         \
-+    {                                                                         \
-+        return single_open(filep, nv_procfs_read_##__name,                    \
-+            NV_PDE_DATA(inode));                                              \
-+    }                                                                         \
-+                                                                              \
-+    static const struct proc_ops nv_procfs_##__name##_fops = {                \
-+        .proc_open       = nv_procfs_open_##__name,                           \
-+        .proc_read       = seq_read,                                          \
-+        .proc_lseek      = seq_lseek,                                         \
-+        .proc_release    = single_release,                                    \
-+    };
-+#else
- #define NV_DEFINE_PROCFS_SINGLE_FILE(__name)                                  \
-     static int nv_procfs_open_##__name(                                       \
-         struct inode *inode,                                                  \
-@@ -2040,6 +2088,7 @@ extern NvU32 nv_assign_gpu_count;
-         .llseek     = seq_lseek,                                              \
-         .release    = single_release,                                         \
-     };
-+#endif
- 
- #endif  /* CONFIG_PROC_FS */
- 
-diff --git a/kernel/nv-procfs.c b/kernel/nv-procfs.c
-index ebca3e8..9365c3c 100644
---- a/kernel/nv-procfs.c
-+++ b/kernel/nv-procfs.c
-@@ -409,6 +409,15 @@ done:
-     return ((status < 0) ? status : (int)count);
- }
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+static struct proc_ops nv_procfs_registry_fops = {
-+    .proc_open    = nv_procfs_open_registry,
-+    .proc_read    = seq_read,
-+    .proc_write   = nv_procfs_write_file,
-+    .proc_lseek   = seq_lseek,
-+    .proc_release = nv_procfs_close_registry,
-+};
-+#else
- static struct file_operations nv_procfs_registry_fops = {
-     .owner   = THIS_MODULE,
-     .open    = nv_procfs_open_registry,
-@@ -417,6 +426,7 @@ static struct file_operations nv_procfs_registry_fops = {
-     .llseek  = seq_lseek,
-     .release = nv_procfs_close_registry,
- };
-+#endif
- 
- static int
- nv_procfs_read_unbind_lock(
-@@ -538,6 +548,15 @@ done:
-     return rc;
- }
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+static struct proc_ops nv_procfs_unbind_lock_fops = {
-+    .proc_open    = nv_procfs_open_unbind_lock,
-+    .proc_read    = seq_read,
-+    .proc_write   = nv_procfs_write_file,
-+    .proc_lseek   = seq_lseek,
-+    .proc_release = nv_procfs_close_unbind_lock,
-+};
-+#else
- static struct file_operations nv_procfs_unbind_lock_fops = {
-     .owner   = THIS_MODULE,
-     .open    = nv_procfs_open_unbind_lock,
-@@ -546,6 +565,7 @@ static struct file_operations nv_procfs_unbind_lock_fops = {
-     .llseek  = seq_lseek,
-     .release = nv_procfs_close_unbind_lock,
- };
-+#endif
- 
- static int
- nv_procfs_read_text_file(
-diff --git a/kernel/nv-time.h b/kernel/nv-time.h
-index a34ceb2..780f8bc 100644
---- a/kernel/nv-time.h
-+++ b/kernel/nv-time.h
-@@ -28,7 +28,12 @@
- #include <linux/ktime.h>
- #endif
- 
--static inline void nv_gettimeofday(struct timeval *tv)
-+struct nv_timeval {
-+    __kernel_long_t      tv_sec;
-+    __kernel_suseconds_t tv_usec;
-+};
-+
-+static inline void nv_gettimeofday(struct nv_timeval *tv)
- {
- #ifdef NV_DO_GETTIMEOFDAY_PRESENT
-     do_gettimeofday(tv);
-@@ -37,7 +42,7 @@ static inline void nv_gettimeofday(struct timeval *tv)
- 
-     ktime_get_real_ts64(&now);
- 
--    *tv = (struct timeval) {
-+    *tv = (struct nv_timeval) {
-         .tv_sec = now.tv_sec,
-         .tv_usec = now.tv_nsec/1000,
-     };
-diff --git a/kernel/nv.c b/kernel/nv.c
-index a167be9..a218f83 100644
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -752,7 +752,7 @@ int __init nvidia_init_module(void)
-     NV_SPIN_LOCK_INIT(&km_lock);
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
-+    NV_KMEM_CACHE_CREATE_USERCOPY(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
-     if (nv_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-diff --git a/kernel/os-interface.c b/kernel/os-interface.c
-index 7190b26..0c0dc05 100644
---- a/kernel/os-interface.c
-+++ b/kernel/os-interface.c
-@@ -439,7 +439,7 @@ RM_STATUS NV_API_CALL os_get_current_time(
-     NvU32 *useconds
- )
- {
--    struct timeval tm;
-+    struct nv_timeval tm;
- 
-     nv_gettimeofday(&tm);
- 
-@@ -474,7 +474,7 @@ RM_STATUS NV_API_CALL os_delay_us(NvU32 MicroSeconds)
-     unsigned long usec;
- 
- #ifdef NV_CHECK_DELAY_ACCURACY
--    struct timeval tm1, tm2;
-+    struct nv_timeval tm1, tm2;
- 
-     nv_gettimeofday(&tm1);
- #endif
-@@ -514,9 +514,9 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
-     unsigned long MicroSeconds;
-     unsigned long jiffies;
-     unsigned long mdelay_safe_msec;
--    struct timeval tm_end, tm_aux;
-+    struct nv_timeval tm_end, tm_aux;
- #ifdef NV_CHECK_DELAY_ACCURACY
--    struct timeval tm_start;
-+    struct nv_timeval tm_start;
- #endif
- 
-     nv_gettimeofday(&tm_aux);
-diff --git a/kernel/uvm/Makefile b/kernel/uvm/Makefile
-index 0cad8ff..043a08d 100644
---- a/kernel/uvm/Makefile
-+++ b/kernel/uvm/Makefile
-@@ -207,6 +207,7 @@ ccflags-y += $(EXTRA_CFLAGS)
- 
- RM_MODULE_SYMVERS:= $(RM_OUT_DIR)/Module.symvers
- UVM_MODULE_SYMVERS:= $(obj)/Module.symvers
-+KBUILD_EXTRA_SYMBOLS:= $(UVM_MODULE_SYMVERS)
- 
- module $(MODULE_NAME).ko: $(UVM_MODULE_SYMVERS) debug_diagnostics_printing
- 
-diff --git a/kernel/uvm/conftest.sh b/kernel/uvm/conftest.sh
-index b7a85f0..33e2a63 100755
---- a/kernel/uvm/conftest.sh
-+++ b/kernel/uvm/conftest.sh
-@@ -176,6 +176,7 @@ test_headers() {
-     FILES="$FILES linux/ktime.h"
-     FILES="$FILES linux/file.h"
- 
-+    FILES_ARCH="$FILES_ARCH asm/pgtable.h"
-     FILES_ARCH="$FILES_ARCH asm/set_memory.h"
- 
-     translate_and_find_header_files $HEADERS      $FILES
-@@ -440,6 +441,9 @@ compile_test() {
-             # Determine if the set_memory_array_uc() function is present.
-             #
-             CODE="
-+            #if defined(NV_ASM_PGTABLE_H_PRESENT)
-+            #include <asm/pgtable.h>
-+            #endif
-             #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
-             #include <asm/set_memory.h>
-             #else
-diff --git a/kernel/uvm/nvidia_uvm_lite.c b/kernel/uvm/nvidia_uvm_lite.c
-index 6943e7c..9a7e3b6 100644
---- a/kernel/uvm/nvidia_uvm_lite.c
-+++ b/kernel/uvm/nvidia_uvm_lite.c
-@@ -131,8 +131,8 @@ static
- RM_STATUS _preexisting_error_on_channel(UvmGpuMigrationTracking *pMigTracker,
-                                          UvmCommitRecord *pRecord);
- 
--static void _set_timeout_in_usec(struct timeval *src,
--                                 struct timeval *result,
-+static void _set_timeout_in_usec(struct nv_timeval *src,
-+                                 struct nv_timeval *result,
-                                  unsigned long timeoutInUsec)
- {
-     if (!src || !result)
-@@ -820,7 +820,13 @@ done:
- }
- 
- #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+vm_fault_t _fault(struct vm_fault *vmf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+int _fault(struct vm_fault *vmf)
-+#else
- int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+#endif
- {
- #if defined(NV_VM_FAULT_HAS_ADDRESS)
-     unsigned long vaddr = vmf->address;
-@@ -828,8 +834,15 @@ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-     unsigned long vaddr = (unsigned long)vmf->virtual_address;
- #endif
-     struct page *page = NULL;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+    vm_fault_t retval;
-+#else
-     int retval;
- 
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+   struct vm_area_struct *vma = vmf->vma;
-+#endif
-     retval = _fault_common(vma, vaddr, &page, vmf->flags);
- 
-     vmf->page = page;
-@@ -868,7 +881,13 @@ static struct vm_operations_struct uvmlite_vma_ops =
- // it's dealing with anonymous mapping (see handle_pte_fault).
- //
- #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+vm_fault_t _sigbus_fault(struct vm_fault *vmf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+int _sigbus_fault(struct vm_fault *vmf)
-+#else
- int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+#endif
- {
-     vmf->page = NULL;
-     return VM_FAULT_SIGBUS;
-@@ -1992,9 +2011,9 @@ void umvlite_destroy_per_process_gpu_resources(UvmGpuUuid *gpuUuidStruct)
- static RM_STATUS _check_ecc_errors(UvmGpuMigrationTracking *pMigTracker,
-                                     NvBool *pIsEccErrorSet)
- {
--    struct timeval eccErrorStartTime = {0};
--    struct timeval eccErrorCurrentTime = {0};
--    struct timeval eccTimeout = {0};
-+    struct nv_timeval eccErrorStartTime = {0};
-+    struct nv_timeval eccErrorCurrentTime = {0};
-+    struct nv_timeval eccTimeout = {0};
-     NvBool bEccErrorTimeout = NV_FALSE;
-     NvBool bEccIncomingError = NV_FALSE;
-     unsigned rmInterruptSet = 0;
--- 
-2.29.0
-
diff --git a/srcpkgs/nvidia340/files/nvidia-glx.conf b/srcpkgs/nvidia340/files/nvidia-glx.conf
deleted file mode 100644
index 7c76883abb3..00000000000
--- a/srcpkgs/nvidia340/files/nvidia-glx.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-Section "Files"
-    ModulePath "/usr/lib/nvidia/xorg"
-    ModulePath "/usr/lib/xorg/modules"
-EndSection
diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template
deleted file mode 100644
index 166f35756bc..00000000000
--- a/srcpkgs/nvidia340/template
+++ /dev/null
@@ -1,223 +0,0 @@
-# Template file for 'nvidia340'
-
-_desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)"
-
-pkgname=nvidia340
-version=340.108
-revision=4
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:NVIDIA proprietary"
-homepage="http://www.nvidia.com"
-
-archs="i686 x86_64"
-nopie=yes
-repository=nonfree
-create_wrksrc=yes
-short_desc="${_desc} - Libraries and Utilities"
-hostmakedepends="tar"
-depends="${pkgname}-dkms-${version}_${revision} pkg-config"
-conflicts="catalyst>=0 xserver-abi-video>24_1"
-
-provides="nvidia-${version}_${revision}"
-replaces="nvidia>=0 nvidia-stable>=0"
-subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs"
-
-if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	_pkg="NVIDIA-Linux-x86-${version}"
-	distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
-	checksum=2032aad612d9f3af1aecf979cfdfe423d79aa76929ef8bf8d3a403076f507cca
-else
-	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
-	distfiles="http://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=995d44fef587ff5284497a47a95d71adbee0c13020d615e940ac928f180f5b77
-fi
-
-do_extract() {
-	install -m755 ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_pkg}.run ${wrksrc}
-	cd ${wrksrc}
-	./${_pkg}.run --extract-only
-	rm -f ${_pkg}.run
-}
-
-do_patch() {
-	cd ${_pkg}
-	patch -p1 < ${FILESDIR}/kernel-5.x.patch
-	patch -p1 < ${FILESDIR}/kernel-5.8.patch
-	patch -p1 < ${FILESDIR}/kernel-5.9.patch
-}
-
-do_install() {
-	cd ${_pkg}
-
-	# X driver
-	vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers
-
-	# GLX extension module for X
-	vinstall libglx.so.${version} 755 usr/lib/nvidia/xorg
-	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/nvidia/xorg/libglx.so.1
-	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/nvidia/xorg/libglx.so
-	# Override default ModulePath to load nvidia's glx instead of xorg's
-	vinstall ${FILESDIR}/nvidia-glx.conf 644 /usr/share/X11/xorg.conf.d 10-nvidia-glx.conf
-
-	# OpenGL libraries (GL, EGL and GLES)
-	vinstall libGL.so.${version} 755 usr/lib
-	ln -sf libGL.so.${version} ${DESTDIR}/usr/lib/libGL.so.1
-	vinstall libEGL.so.${version} 755 usr/lib
-	ln -sf libEGL.so.${version} ${DESTDIR}/usr/lib/libEGL.so.1
-	vinstall libGLESv1_CM.so.${version} 755 usr/lib
-	ln -sf libGLESv1_CM.so.${version} ${DESTDIR}/usr/lib/libGLESv1_CM.so.1
-	vinstall libGLESv2.so.${version} 755 usr/lib
-	ln -sf libGLESv2.so.${version} ${DESTDIR}/usr/lib/libGLESv2.so.2
-	# Some programs link to these libglvnd links
-	ln -sf libGL.so.1 ${DESTDIR}/usr/lib/libOpenGL.so.0
-	ln -sf libGL.so.1 ${DESTDIR}/usr/lib/libGLX.so.0
-
-	# OpenGL core library
-	vinstall libnvidia-glcore.so.${version} 755 usr/lib
-	ln -sf libnvidia-glcore.so.${version} ${DESTDIR}/usr/lib/libnvidia-glcore.so
-
-	# VDPAU
-	vinstall libvdpau_nvidia.so.${version} 755 usr/lib/vdpau
-	ln -sf libvdpau_nvidia.so.${version} ${DESTDIR}/usr/lib/vdpau/libvdpau_nvidia.so
-	ln -sf libvdpau_nvidia.so.${version} ${DESTDIR}/usr/lib/vdpau/libvdpau_nvidia.so.1
-
-	# misc libraries
-	vinstall tls/libnvidia-tls.so.${version} 755 usr/lib
-	ln -sf libnvidia-tls.so.${version} ${DESTDIR}/usr/lib/libnvidia-tls.so
-
-	vinstall libnvidia-cfg.so.${version} 755 usr/lib
-	ln -sf libnvidia-cfg.so.${version} ${DESTDIR}/usr/lib/libnvidia-cfg.so
-	ln -sf libnvidia-cfg.so.${version} ${DESTDIR}/usr/lib/libnvidia-cfg.so.1
-
-	vinstall libnvidia-ml.so.${version} 755 usr/lib
-	ln -sf libnvidia-ml.so.${version} ${DESTDIR}/usr/lib/libnvidia-ml.so
-	ln -sf libnvidia-ml.so.${version} ${DESTDIR}/usr/lib/libnvidia-ml.so.1
-
-	vinstall libnvidia-encode.so.${version} 755 usr/lib
-	ln -sf libnvidia-encode.so.${version} ${DESTDIR}/usr/lib/libnvidia-encode.so
-	ln -sf libnvidia-encode.so.${version} ${DESTDIR}/usr/lib/libnvidia-encode.so.1
-
-	vinstall libnvidia-ifr.so.${version} 755 usr/lib
-	ln -sf libnvidia-ifr.so.${version} ${DESTDIR}/usr/lib/libnvidia-ifr.so
-	ln -sf libnvidia-ifr.so.${version} ${DESTDIR}/usr/lib/libnvidia-ifr.so.1
-
-	vinstall libnvidia-fbc.so.${version} 755 usr/lib
-	ln -sf libnvidia-fbc.so.${version} ${DESTDIR}/usr/lib/libnvidia-fbc.so
-	ln -sf libnvidia-fbc.so.${version} ${DESTDIR}/usr/lib/libnvidia-fbc.so.1
-
-	vinstall libnvidia-glsi.so.${version} 755 usr/lib
-
-	# CUDA
-	vbin nvidia-cuda-mps-control
-	vbin nvidia-cuda-mps-server
-	vman nvidia-cuda-mps-control.1.gz
-
-	vinstall libcuda.so.${version} 755 usr/lib
-	ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so
-	ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so.1
-
-	vinstall libnvcuvid.so.${version} 755 usr/lib
-	ln -sf libnvcuvid.so.${version} ${DESTDIR}/usr/lib/libnvcuvid.so
-	ln -sf libnvcuvid.so.${version} ${DESTDIR}/usr/lib/libnvcuvid.so.1
-
-	# nvidia-xconfig
-	vbin nvidia-xconfig
-	vman nvidia-xconfig.1.gz
-
-	# nvidia-settings
-	vbin nvidia-settings
-	vman nvidia-settings.1.gz
-	vinstall nvidia-settings.desktop 644 usr/share/applications
-	vinstall nvidia-settings.png 644 usr/share/pixmaps
-	sed -e 's:__UTILS_PATH__:/usr/bin:' \
-		-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
-		-i ${DESTDIR}/usr/share/applications/nvidia-settings.desktop
-
-	# nvidia-bug-report
-	vbin nvidia-bug-report.sh nvidia-bug-report
-	vbin nvidia-debugdump
-
-	# nvidia-smi
-	vbin nvidia-smi
-	vman nvidia-smi.1.gz
-
-	# License and documentation.
-	vlicense LICENSE
-	vdoc README.txt README
-	vdoc NVIDIA_Changelog
-
-	# opencl pkg
-	vinstall nvidia.icd 644 etc/OpenCL/vendors
-
-	vinstall libnvidia-compiler.so.${version} 755 usr/lib
-	ln -sf libnvidia-compiler.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-compiler.so
-	ln -sf libnvidia-compiler.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-compiler.so.1
-
-	vinstall libnvidia-opencl.so.${version} 755 usr/lib
-	ln -sf libnvidia-opencl.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-opencl.so
-	ln -sf libnvidia-opencl.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-opencl.so.1
-
-	# dkms pkg
-	vmkdir usr/src/nvidia-${version}
-	# add nvidia-uvm dkms submodule too.
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		cat kernel/uvm/dkms.conf.fragment >> kernel/dkms.conf
-	fi
-	vcopy "kernel/*" usr/src/nvidia-${version}
-
-	# systemd modules-load.d(5) file.
-	vmkdir usr/lib/modules-load.d
-	echo "nvidia" > ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf
-	chmod 644 ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		echo "nvidia-uvm" > ${DESTDIR}/usr/lib/modules-load.d/nvidia-uvm.conf
-		chmod 644 ${DESTDIR}/usr/lib/modules-load.d/nvidia-uvm.conf
-	fi
-
-	# Blacklist nouveau.
-	vmkdir usr/lib/modprobe.d
-	echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
-	chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
-
-	# Omit drm dracut module too.
-	vmkdir usr/lib/dracut/dracut.conf.d
-	echo "omit_dracutmodules+=\" drm \"" > ${DESTDIR}/usr/lib/dracut/dracut.conf.d/99-nvidia.conf
-}
-
-nvidia340-dkms_package() {
-	short_desc="${_desc} - DKMS kernel module"
-	dkms_modules="nvidia ${version}"
-	depends="dkms"
-	provides="nvidia-dkms-${version}_${revision}"
-	replaces="nvidia-dkms>=0 nvidia-stable-dkms>=0"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules-load.d
-		vmove usr/lib/modprobe.d
-		vmove usr/lib/dracut
-	}
-}
-nvidia340-opencl_package() {
-	short_desc="${_desc} - OpenCL implementation"
-	provides="nvidia-opencl-${version}_${revision}"
-	replaces="nvidia-opencl>=0 nvidia-stable-opencl>=0"
-	depends="libOpenCL"
-	pkg_install() {
-		vmove "usr/lib/libnvidia-compiler*"
-		vmove "usr/lib/libnvidia-opencl*"
-		vmove etc/OpenCL
-	}
-}
-nvidia340-libs_package() {
-	short_desc="${_desc} - libraries"
-	provides="libGL-7.11_1 libEGL-7.11_1 libGLES-7.11_1 libglvnd-1.3.0_1"
-	shlib_provides="libGLX.so.0 libOpenGL.so.0"
-	replaces="libGL>=0 libEGL>=0 libGLES>=0 libglvnd>=0"
-	pkg_install() {
-		vmove usr/lib
-	}
-}
diff --git a/srcpkgs/nvidia340/update b/srcpkgs/nvidia340/update
deleted file mode 100644
index 43bad67f7e8..00000000000
--- a/srcpkgs/nvidia340/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="http://www.nvidia.com/object/unix.html"
-pattern='340.+>\K[\d.]+(?=</A>)'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e07c160eafe..c3b79f436a5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=6
+revision=7
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -78,6 +78,10 @@ replaces="
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
  yt-play<=20140117_2
+ nvidia340<=340.108_4
+ nvidia340-dkms<=340.108_4
+ nvidia340-opencl<=340.108_4
+ nvidia340-libs<=340.108_4
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 8eb09b4216b263db4a947ec318449955dae239f0 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 22:13:36 +0100
Subject: [PATCH 051/419] sway: new maintainer.

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

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 84effd28b25..98ade688f1e 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -9,7 +9,7 @@ makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel"
 depends="swaybg xorg-server-xwayland"
 short_desc="Tiling Wayland compositor compatible with i3"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"

From c5fe2888efdc59804bf5774f95c20a885b077fa8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 10 Jan 2021 15:43:54 +0100
Subject: [PATCH 052/419] binutils: backport patch

this should fix chromium link on i686
---
 ...e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch | 60 +++++++++++++++++++
 srcpkgs/binutils/template                     |  2 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch

diff --git a/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch b/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch
new file mode 100644
index 00000000000..a55432d83cf
--- /dev/null
+++ b/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch
@@ -0,0 +1,60 @@
+From 1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Mon, 16 Nov 2020 06:37:53 -0800
+Subject: [PATCH] elf: Set rel_from_abs to 1 for __ehdr_start
+
+bfdlink.h has
+
+  /* Symbol will be converted from absolute to section-relative.  Set for
+     symbols defined by a script from "dot" (also SEGMENT_START or ORIGIN)
+     outside of an output section statement.  */
+  unsigned int rel_from_abs : 1;
+
+linker.c has
+
+.{* Return TRUE if the symbol described by a linker hash entry H
+.   is going to be absolute.  Linker-script defined symbols can be
+.   converted from absolute to section-relative ones late in the
+.   link.  Use this macro to correctly determine whether the symbol
+.   will actually end up absolute in output.  *}
+.#define bfd_is_abs_symbol(H) \
+.  (((H)->type == bfd_link_hash_defined \
+.    || (H)->type == bfd_link_hash_defweak) \
+.   && bfd_is_abs_section ((H)->u.def.section) \
+.   && !(H)->rel_from_abs)
+.
+
+Set rel_from_abs to 1 for __ehdr_start which will be converted from
+absolute to section-relative in assign_file_positions_for_load_sections.
+
+	PR ld/26869
+	* ldelf.c (ldelf_before_allocation): Set rel_from_abs to 1 for
+	__ehdr_start.
+	* testsuite/ld-i386/i386.exp: Run pr26869.
+	* testsuite/ld-i386/pr26869.d: New file.
+	* testsuite/ld-i386/pr26869.s: Likewise.
+
+(cherry picked from commit cbd5b99cce073273f668b154d4514e8e7e7ccc51)
+---
+ ld/ChangeLog                   |  9 +++++++++
+ ld/ldelf.c                     |  2 ++
+ ld/testsuite/ld-i386/i386.exp  |  1 +
+ ld/testsuite/ld-i386/pr26869.d | 14 ++++++++++++++
+ ld/testsuite/ld-i386/pr26869.s |  3 +++
+ 5 files changed, 29 insertions(+)
+ create mode 100644 ld/testsuite/ld-i386/pr26869.d
+ create mode 100644 ld/testsuite/ld-i386/pr26869.s
+
+diff --git a/ld/ldelf.c b/ld/ldelf.c
+index bada3ade2d7..831d032fe56 100644
+--- a/ld/ldelf.c
++++ b/ld/ldelf.c
+@@ -1589,6 +1589,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
+ 		      (char *) &ehdr_start->u + sizeof ehdr_start->u.def.next,
+ 		      sizeof ehdr_start_save_u);
+ 	      ehdr_start->type = bfd_link_hash_defined;
++	      /* It will be converted to section-relative later.  */
++	      ehdr_start->rel_from_abs = 1;
+ 	      ehdr_start->u.def.section = bfd_abs_section_ptr;
+ 	      ehdr_start->u.def.value = 0;
+ 	    }
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 0e6463ad431..b87e20315fb 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.35.1
-revision=1
+revision=2
 bootstrap=yes
 short_desc="GNU binary utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From d294c7b728cd1a4884cb7d2f0b635830099fd945 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 10 Jan 2021 15:44:38 +0100
Subject: [PATCH 053/419] chromium: broken on i686 until binutils is rebuilt

---
 srcpkgs/chromium/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 5e4d8129e5d..10b2c6c2d18 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -45,6 +45,10 @@ esac
 
 build_options_default="clang js_optimize vaapi pulseaudio pipewire"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) broken="until binutils update is done";;
+esac
+
 post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		for f in "${FILESDIR}"/musl-patches/*.patch; do

From 5f0b8fdb7104c7612cd87b4ed6dcc520159d68a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 10 Jan 2021 15:45:35 +0100
Subject: [PATCH 054/419] orion: update to 1.6.7

Add remaining patches from the archived repository.
---
 ...280a83521ac29a1438e05e8f7a331842bcb4.patch | 400 ++++++++++++++++++
 ...0bbd4a856ea45c770f882be9e63a663a9acd.patch |  32 ++
 ...b86f241df9e17238833c091992c80bb1d298.patch |  14 +
 srcpkgs/orion/patches/cpp.patch               |  11 -
 srcpkgs/orion/patches/mpv-setlocale.patch     |  14 -
 srcpkgs/orion/template                        |   4 +-
 6 files changed, 448 insertions(+), 27 deletions(-)
 create mode 100644 srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch
 create mode 100644 srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch
 create mode 100644 srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch
 delete mode 100644 srcpkgs/orion/patches/cpp.patch
 delete mode 100644 srcpkgs/orion/patches/mpv-setlocale.patch

diff --git a/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch b/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch
new file mode 100644
index 00000000000..67f7f15a163
--- /dev/null
+++ b/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch
@@ -0,0 +1,400 @@
+--- src/player/mpvobject.h
++++ src/player/mpvobject.h
+@@ -21,7 +21,7 @@ typedef mpv_opengl_cb_context mpv_context;
+ typedef mpv_render_context mpv_context;
+ #endif
+ 
+-#include <mpv/qthelper.hpp>
++#include "qthelper.hpp"
+ 
+ class MpvRenderer;
+
+--- /dev/null
++++ src/player/qthelper.hpp
+@@ -0,0 +1,386 @@
++/* Copyright (C) 2017 the mpv developers
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifndef MPV_CLIENT_API_QTHELPER_H_
++#define MPV_CLIENT_API_QTHELPER_H_
++
++#include <mpv/client.h>
++
++#if !MPV_ENABLE_DEPRECATED
++#error "This helper is deprecated. Copy it into your project instead."
++#else
++
++/**
++ * Note: these helpers are provided for convenience for C++/Qt applications.
++ * This is based on the public API in client.h, and it does not encode any
++ * knowledge that is not known or guaranteed outside of the C client API. You
++ * can even copy and modify this code as you like, or implement similar things
++ * for other languages.
++ */
++
++#include <cstring>
++
++#include <QVariant>
++#include <QString>
++#include <QList>
++#include <QHash>
++#include <QSharedPointer>
++#include <QMetaType>
++
++namespace mpv {
++namespace qt {
++
++// Wrapper around mpv_handle. Does refcounting under the hood.
++class Handle
++{
++    struct container {
++        container(mpv_handle *h) : mpv(h) {}
++        ~container() { mpv_terminate_destroy(mpv); }
++        mpv_handle *mpv;
++    };
++    QSharedPointer<container> sptr;
++public:
++    // Construct a new Handle from a raw mpv_handle with refcount 1. If the
++    // last Handle goes out of scope, the mpv_handle will be destroyed with
++    // mpv_terminate_destroy().
++    // Never destroy the mpv_handle manually when using this wrapper. You
++    // will create dangling pointers. Just let the wrapper take care of
++    // destroying the mpv_handle.
++    // Never create multiple wrappers from the same raw mpv_handle; copy the
++    // wrapper instead (that's what it's for).
++    static Handle FromRawHandle(mpv_handle *handle) {
++        Handle h;
++        h.sptr = QSharedPointer<container>(new container(handle));
++        return h;
++    }
++
++    // Return the raw handle; for use with the libmpv C API.
++    operator mpv_handle*() const { return sptr ? (*sptr).mpv : 0; }
++};
++
++static inline QVariant node_to_variant(const mpv_node *node)
++{
++    switch (node->format) {
++    case MPV_FORMAT_STRING:
++        return QVariant(QString::fromUtf8(node->u.string));
++    case MPV_FORMAT_FLAG:
++        return QVariant(static_cast<bool>(node->u.flag));
++    case MPV_FORMAT_INT64:
++        return QVariant(static_cast<qlonglong>(node->u.int64));
++    case MPV_FORMAT_DOUBLE:
++        return QVariant(node->u.double_);
++    case MPV_FORMAT_NODE_ARRAY: {
++        mpv_node_list *list = node->u.list;
++        QVariantList qlist;
++        for (int n = 0; n < list->num; n++)
++            qlist.append(node_to_variant(&list->values[n]));
++        return QVariant(qlist);
++    }
++    case MPV_FORMAT_NODE_MAP: {
++        mpv_node_list *list = node->u.list;
++        QVariantMap qmap;
++        for (int n = 0; n < list->num; n++) {
++            qmap.insert(QString::fromUtf8(list->keys[n]),
++                        node_to_variant(&list->values[n]));
++        }
++        return QVariant(qmap);
++    }
++    default: // MPV_FORMAT_NONE, unknown values (e.g. future extensions)
++        return QVariant();
++    }
++}
++
++struct node_builder {
++    node_builder(const QVariant& v) {
++        set(&node_, v);
++    }
++    ~node_builder() {
++        free_node(&node_);
++    }
++    mpv_node *node() { return &node_; }
++private:
++    Q_DISABLE_COPY(node_builder)
++    mpv_node node_;
++    mpv_node_list *create_list(mpv_node *dst, bool is_map, int num) {
++        dst->format = is_map ? MPV_FORMAT_NODE_MAP : MPV_FORMAT_NODE_ARRAY;
++        mpv_node_list *list = new mpv_node_list();
++        dst->u.list = list;
++        if (!list)
++            goto err;
++        list->values = new mpv_node[num]();
++        if (!list->values)
++            goto err;
++        if (is_map) {
++            list->keys = new char*[num]();
++            if (!list->keys)
++                goto err;
++        }
++        return list;
++    err:
++        free_node(dst);
++        return NULL;
++    }
++    char *dup_qstring(const QString &s) {
++        QByteArray b = s.toUtf8();
++        char *r = new char[b.size() + 1];
++        if (r)
++            std::memcpy(r, b.data(), b.size() + 1);
++        return r;
++    }
++    bool test_type(const QVariant &v, QMetaType::Type t) {
++        // The Qt docs say: "Although this function is declared as returning
++        // "QVariant::Type(obsolete), the return value should be interpreted
++        // as QMetaType::Type."
++        // So a cast really seems to be needed to avoid warnings (urgh).
++        return static_cast<int>(v.type()) == static_cast<int>(t);
++    }
++    void set(mpv_node *dst, const QVariant &src) {
++        if (test_type(src, QMetaType::QString)) {
++            dst->format = MPV_FORMAT_STRING;
++            dst->u.string = dup_qstring(src.toString());
++            if (!dst->u.string)
++                goto fail;
++        } else if (test_type(src, QMetaType::Bool)) {
++            dst->format = MPV_FORMAT_FLAG;
++            dst->u.flag = src.toBool() ? 1 : 0;
++        } else if (test_type(src, QMetaType::Int) ||
++                   test_type(src, QMetaType::LongLong) ||
++                   test_type(src, QMetaType::UInt) ||
++                   test_type(src, QMetaType::ULongLong))
++        {
++            dst->format = MPV_FORMAT_INT64;
++            dst->u.int64 = src.toLongLong();
++        } else if (test_type(src, QMetaType::Double)) {
++            dst->format = MPV_FORMAT_DOUBLE;
++            dst->u.double_ = src.toDouble();
++        } else if (src.canConvert<QVariantList>()) {
++            QVariantList qlist = src.toList();
++            mpv_node_list *list = create_list(dst, false, qlist.size());
++            if (!list)
++                goto fail;
++            list->num = qlist.size();
++            for (int n = 0; n < qlist.size(); n++)
++                set(&list->values[n], qlist[n]);
++        } else if (src.canConvert<QVariantMap>()) {
++            QVariantMap qmap = src.toMap();
++            mpv_node_list *list = create_list(dst, true, qmap.size());
++            if (!list)
++                goto fail;
++            list->num = qmap.size();
++            for (int n = 0; n < qmap.size(); n++) {
++                list->keys[n] = dup_qstring(qmap.keys()[n]);
++                if (!list->keys[n]) {
++                    free_node(dst);
++                    goto fail;
++                }
++                set(&list->values[n], qmap.values()[n]);
++            }
++        } else {
++            goto fail;
++        }
++        return;
++    fail:
++        dst->format = MPV_FORMAT_NONE;
++    }
++    void free_node(mpv_node *dst) {
++        switch (dst->format) {
++        case MPV_FORMAT_STRING:
++            delete[] dst->u.string;
++            break;
++        case MPV_FORMAT_NODE_ARRAY:
++        case MPV_FORMAT_NODE_MAP: {
++            mpv_node_list *list = dst->u.list;
++            if (list) {
++                for (int n = 0; n < list->num; n++) {
++                    if (list->keys)
++                        delete[] list->keys[n];
++                    if (list->values)
++                        free_node(&list->values[n]);
++                }
++                delete[] list->keys;
++                delete[] list->values;
++            }
++            delete list;
++            break;
++        }
++        default: ;
++        }
++        dst->format = MPV_FORMAT_NONE;
++    }
++};
++
++/**
++ * RAII wrapper that calls mpv_free_node_contents() on the pointer.
++ */
++struct node_autofree {
++    mpv_node *ptr;
++    node_autofree(mpv_node *a_ptr) : ptr(a_ptr) {}
++    ~node_autofree() { mpv_free_node_contents(ptr); }
++};
++
++#if MPV_ENABLE_DEPRECATED
++
++/**
++ * Return the given property as mpv_node converted to QVariant, or QVariant()
++ * on error.
++ *
++ * @deprecated use get_property() instead
++ *
++ * @param name the property name
++ */
++static inline QVariant get_property_variant(mpv_handle *ctx, const QString &name)
++{
++    mpv_node node;
++    if (mpv_get_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, &node) < 0)
++        return QVariant();
++    node_autofree f(&node);
++    return node_to_variant(&node);
++}
++
++/**
++ * Set the given property as mpv_node converted from the QVariant argument.
++
++ * @deprecated use set_property() instead
++ */
++static inline int set_property_variant(mpv_handle *ctx, const QString &name,
++                                       const QVariant &v)
++{
++    node_builder node(v);
++    return mpv_set_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
++}
++
++/**
++ * Set the given option as mpv_node converted from the QVariant argument.
++ *
++ * @deprecated use set_property() instead
++ */
++static inline int set_option_variant(mpv_handle *ctx, const QString &name,
++                                     const QVariant &v)
++{
++    node_builder node(v);
++    return mpv_set_option(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
++}
++
++/**
++ * mpv_command_node() equivalent. Returns QVariant() on error (and
++ * unfortunately, the same on success).
++ *
++ * @deprecated use command() instead
++ */
++static inline QVariant command_variant(mpv_handle *ctx, const QVariant &args)
++{
++    node_builder node(args);
++    mpv_node res;
++    if (mpv_command_node(ctx, node.node(), &res) < 0)
++        return QVariant();
++    node_autofree f(&res);
++    return node_to_variant(&res);
++}
++
++#endif
++
++/**
++ * This is used to return error codes wrapped in QVariant for functions which
++ * return QVariant.
++ *
++ * You can use get_error() or is_error() to extract the error status from a
++ * QVariant value.
++ */
++struct ErrorReturn
++{
++    /**
++     * enum mpv_error value (or a value outside of it if ABI was extended)
++     */
++    int error;
++
++    ErrorReturn() : error(0) {}
++    explicit ErrorReturn(int err) : error(err) {}
++};
++
++/**
++ * Return the mpv error code packed into a QVariant, or 0 (success) if it's not
++ * an error value.
++ *
++ * @return error code (<0) or success (>=0)
++ */
++static inline int get_error(const QVariant &v)
++{
++    if (!v.canConvert<ErrorReturn>())
++        return 0;
++    return v.value<ErrorReturn>().error;
++}
++
++/**
++ * Return whether the QVariant carries a mpv error code.
++ */
++static inline bool is_error(const QVariant &v)
++{
++    return get_error(v) < 0;
++}
++
++/**
++ * Return the given property as mpv_node converted to QVariant, or QVariant()
++ * on error.
++ *
++ * @param name the property name
++ * @return the property value, or an ErrorReturn with the error code
++ */
++static inline QVariant get_property(mpv_handle *ctx, const QString &name)
++{
++    mpv_node node;
++    int err = mpv_get_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, &node);
++    if (err < 0)
++        return QVariant::fromValue(ErrorReturn(err));
++    node_autofree f(&node);
++    return node_to_variant(&node);
++}
++
++/**
++ * Set the given property as mpv_node converted from the QVariant argument.
++ *
++ * @return mpv error code (<0 on error, >= 0 on success)
++ */
++static inline int set_property(mpv_handle *ctx, const QString &name,
++                                       const QVariant &v)
++{
++    node_builder node(v);
++    return mpv_set_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
++}
++
++/**
++ * mpv_command_node() equivalent.
++ *
++ * @param args command arguments, with args[0] being the command name as string
++ * @return the property value, or an ErrorReturn with the error code
++ */
++static inline QVariant command(mpv_handle *ctx, const QVariant &args)
++{
++    node_builder node(args);
++    mpv_node res;
++    int err = mpv_command_node(ctx, node.node(), &res);
++    if (err < 0)
++        return QVariant::fromValue(ErrorReturn(err));
++    node_autofree f(&res);
++    return node_to_variant(&res);
++}
++
++}
++}
++
++Q_DECLARE_METATYPE(mpv::qt::ErrorReturn)
++
++#endif /* else #if MPV_ENABLE_DEPRECATED */
++
++#endif
diff --git a/srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch b/srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch
new file mode 100644
index 00000000000..dfa699baedd
--- /dev/null
+++ b/srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch
@@ -0,0 +1,32 @@
+--- src/qml/PlayerView.qml
++++ src/qml/PlayerView.qml
+@@ -128,13 +128,27 @@
+ 
+ 
+     function loadAndPlay(){
+-        if (!streamMap) return
++        if (!streamMap) {
++            console.log("streamMap not available yet");
++            return;
++        }
+ 
+         var description = setWatchingTitle();
+ 
+         var start = !isVod ? -1 : seekBar.value
+ 
+-        var url = streamMap[Settings.quality]
++        var quality = Settings.quality;
++        if (!streamMap.hasOwnProperty(quality)) {
++            console.log("no stream for quality", quality);
++            quality = "source";
++            console.log("using", quality);
++        }
++        var url = streamMap[quality]
++
++        if (url == null) {
++            console.error("did not have a playback url");
++            return;
++        }
+ 
+         console.debug("Loading: ", url)
+ 
diff --git a/srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch b/srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch
new file mode 100644
index 00000000000..327ee7036df
--- /dev/null
+++ b/srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch
@@ -0,0 +1,14 @@
+--- src/qml/irc/ChatView.qml
++++ src/qml/irc/ChatView.qml
+@@ -280,6 +280,10 @@ Page {
+             }
+ 
+             function lookupEmote(word) {
++                if (_textEmotesMap == null) {
++                    console.log("FIXME: emotes haven't initialized");
++                    return;
++                }
+                 var emoteId = _textEmotesMap[word];
+                 if (emoteId != null) {
+                     return emoteId;
+ 
diff --git a/srcpkgs/orion/patches/cpp.patch b/srcpkgs/orion/patches/cpp.patch
deleted file mode 100644
index 2059c5ed52f..00000000000
--- a/srcpkgs/orion/patches/cpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- orion.pro	2018-10-15 16:18:14.000000000 +0200
-+++ -	2019-01-07 16:44:55.286087420 +0100
-@@ -8,7 +8,7 @@
- 
- QMAKE_CXXFLAGS += -Wall -O2
- 
--CONFIG += c++11
-+CONFIG += c++14
- #CONFIG += console
- 
- TARGET = orion
diff --git a/srcpkgs/orion/patches/mpv-setlocale.patch b/srcpkgs/orion/patches/mpv-setlocale.patch
deleted file mode 100644
index 9c55d9bb4c1..00000000000
--- a/srcpkgs/orion/patches/mpv-setlocale.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/player/mpvobject.cpp	2018-10-15 16:18:14.000000000 +0200
-+++ -	2019-01-07 16:58:32.132459477 +0100
-@@ -103,8 +103,10 @@
- };
- 
- MpvObject::MpvObject(QQuickItem * parent)
--    : QQuickFramebufferObject(parent), mpv{mpv_create()}, mpv_gl(nullptr)
-+    : QQuickFramebufferObject(parent), mpv_gl(nullptr)
- {
-+    std::setlocale(LC_NUMERIC, "C");
-+    mpv = mpv_create();
-     if (!mpv)
-         throw std::runtime_error("could not create mpv context");
- 
diff --git a/srcpkgs/orion/template b/srcpkgs/orion/template
index 2b0eedb0617..0348a824fc6 100644
--- a/srcpkgs/orion/template
+++ b/srcpkgs/orion/template
@@ -1,6 +1,6 @@
 # Template file for 'orion'
 pkgname=orion
-version=1.6.6
+version=1.6.7
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alamminsalo/orion"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3c8750555e9302e49904c43f35f2c2870a0224a231304c63301b9112471575e1
+checksum=19d9c170d0bcf21d47947704d8c8e927cff5140f94cb840b51d2b8574b0149fb
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-host-tools qt5-declarative-devel qt5-svg-devel qt5-quickcontrols2-devel"

From 21a4edd26ed902b366cec73bc4b7c2d0544a2c8f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 10 Jan 2021 17:17:01 +0100
Subject: [PATCH 055/419] Revert "chromium: broken on i686 until binutils is
 rebuilt"

This reverts commit d294c7b728cd1a4884cb7d2f0b635830099fd945.
---
 srcpkgs/chromium/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 10b2c6c2d18..5e4d8129e5d 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -45,10 +45,6 @@ esac
 
 build_options_default="clang js_optimize vaapi pulseaudio pipewire"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) broken="until binutils update is done";;
-esac
-
 post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		for f in "${FILESDIR}"/musl-patches/*.patch; do

From 157f54267e70df605f6643d975c5855c2e652943 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 11:53:35 -0500
Subject: [PATCH 056/419] polybar: update to 3.5.4.

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

diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index db7aa42eaaa..d74bb863063 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -1,7 +1,7 @@
 # Template file for 'polybar'
 pkgname=polybar
-version=3.5.3
-revision=2
+version=3.5.4
+revision=1
 build_style=cmake
 configure_args="
  -DENABLE_ALSA=$(vopt_if alsa ON OFF)
@@ -25,7 +25,7 @@ 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=d23fbb9a7b7f1cdd334fe0ba3adc0f9602cfc94aa0827c058584059416792680
+checksum=133af4e8b29f426595ad3b773948eee27275230887844473853e7940c7959c2b
 
 build_options="alsa curl i3 mpd network pulseaudio"
 build_options_default="$build_options"

From edaa53d24be302f6b09bae7fad1b9bbe7a024664 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 12:39:57 -0500
Subject: [PATCH 057/419] python3-exifread: update to 2.3.2.

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

diff --git a/srcpkgs/python3-exifread/template b/srcpkgs/python3-exifread/template
index 3e90335a4b2..f90e837d1c0 100644
--- a/srcpkgs/python3-exifread/template
+++ b/srcpkgs/python3-exifread/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-exifread'
 pkgname=python3-exifread
-version=2.3.1
-revision=3
+version=2.3.2
+revision=1
 wrksrc="exif-py-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
@@ -11,14 +11,9 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="BSD-3-Clause"
 homepage="https://github.com/ianare/exif-py"
 distfiles="https://github.com/ianare/exif-py/archive/${version}.tar.gz"
-checksum=b6b012d72df9af6e8a4fb439914f3a293f0a63c2087c21e94f5b6e1221de45f4
+checksum=b595f8644a456d00df98b2f83b5fe17682bba0e7e9f7c8b39fb7130a80b73b0a
 conflicts="python-exifread>=0"
 
-pre_build() {
-	# Upstream didn't update version in this file
-	sed -i "s/2.1.2/${version}/" exifread/__init__.py
-}
-
 post_install() {
 	vlicense LICENSE.txt
 }

From 931f36a55efd8bedb14606b093c834140e1f2706 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 12:51:13 -0500
Subject: [PATCH 058/419] python3-cachetools: update to 4.2.0.

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

diff --git a/srcpkgs/python3-cachetools/template b/srcpkgs/python3-cachetools/template
index b9af9fafddf..97f3f9c505b 100644
--- a/srcpkgs/python3-cachetools/template
+++ b/srcpkgs/python3-cachetools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cachetools'
 pkgname=python3-cachetools
-version=4.1.1
-revision=2
+version=4.2.0
+revision=1
 wrksrc="cachetools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="https://github.com/tkem/cachetools/"
 distfiles="${PYPI_SITE}/c/cachetools/cachetools-${version}.tar.gz"
-checksum=bbaa39c3dede00175df2dc2b03d0cf18dd2d32a7de7beb68072d13043c9edb20
+checksum=3796e1de094f0eaca982441c92ce96c68c89cced4cd97721ab297ea4b16db90e
 
 post_install() {
 	vlicense LICENSE

From 9bfad6a8c72f149cc06f3ecd651c0d31e56a6967 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 13:03:40 -0500
Subject: [PATCH 059/419] python3-Telethon: update to 1.19.0.

Add checkdepends.
---
 srcpkgs/python3-Telethon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Telethon/template b/srcpkgs/python3-Telethon/template
index 53ba9bc6847..51f404d4806 100644
--- a/srcpkgs/python3-Telethon/template
+++ b/srcpkgs/python3-Telethon/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-Telethon'
 pkgname=python3-Telethon
-version=1.18.2
+version=1.19.0
 revision=1
 wrksrc="Telethon-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pyaes python3-rsa"
+checkdepends="$depends python3-pytest python3-pytest-asyncio"
 short_desc="Pure Python3 Telegram client library"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="https://github.com/LonamiWebs/Telethon"
 distfiles="https://github.com/LonamiWebs/Telethon/archive/v${version}.tar.gz"
-checksum=0d1cc66e1fc6b8efd42d3a1dfb02d2b1bd0439905aae75a254a172679bfa5cc6
+checksum=6faccf5ba8ec9da472032188e68e421a26d5f42f4ee5c4cff0b3ecf222b158ca
 
 post_install() {
 	vlicense LICENSE

From 7f95d3d846cd73d5f0a8aa324bc45ff96787b935 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 7 Jan 2021 22:21:31 +0200
Subject: [PATCH 060/419] mtpaint: update to 3.50.01.

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

diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index 98787e3e22f..39f4f899f33 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,8 +1,8 @@
 # Template file for 'mtpaint'
 pkgname=mtpaint
-version=3.50
+version=3.50.01
 revision=1
-_commit=b0b023ba7ae231415d556ea88b2239fecf693faf
+_commit=a4675ff5cd9fcd57d291444cb9f332b48f11243f
 wrksrc="mtPaint-${_commit}"
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="http://mtpaint.sourceforge.net/"
 changelog="https://raw.githubusercontent.com/wjaguar/mtPaint/master/NEWS"
 distfiles="https://github.com/wjaguar/mtPaint/archive/${_commit}.tar.gz"
-checksum=b002718b3a5b907edfe6f6d9a1eaaa3287d98bc921da7137e32a4c06c29ae075
+checksum=852e0e8456610596952f168281836ed640275ac0dcd773321ae9a9285077e899
 
 post_install() {
 	vdoc doc/vcode.t2t

From 4e42582b5653c0d0b3d88abd0a158aa3098ab133 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 10 Jan 2021 01:03:10 +0200
Subject: [PATCH 061/419] hugo: update to 0.80.0.

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

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index b8127316dc7..9b4818c6467 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.79.0
+version=0.80.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=83e9b7e4bd3b321d140d1f35c75eafa6a70d3b814f2cac8e2f78b11feb23f1b2
+checksum=4ddcd6ebea21e5fd4067db4a481ab7810e34496d5991a3520169c8f5ee1d38bb
 
 build_options="pygments extended"
 desc_option_pygments="Alternative syntax highlighter"

From 4279187af3e351df7050d02e63e10323d79a8509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 10 Jan 2021 21:31:55 +0100
Subject: [PATCH 062/419] trinify: fix build

---
 srcpkgs/trinity/patches/stdint_h.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/trinity/patches/stdint_h.patch

diff --git a/srcpkgs/trinity/patches/stdint_h.patch b/srcpkgs/trinity/patches/stdint_h.patch
new file mode 100644
index 00000000000..e3903954ae1
--- /dev/null
+++ b/srcpkgs/trinity/patches/stdint_h.patch
@@ -0,0 +1,18 @@
+--- syscalls/x86/modify_ldt.c
++++ syscalls/x86/modify_ldt.c
+@@ -5,8 +5,15 @@
+  * asmlinkage int sys_modify_ldt(int func, void __user *ptr, unsigned long bytecount)
+  */
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <sys/types.h>
+ #define __ASSEMBLY__ 1
++typedef int16_t  __s16;
++typedef uint16_t __u16;
++typedef int32_t  __s32;
++typedef uint32_t __u32;
++typedef int64_t  __s64;
++typedef uint64_t __u64;
+ #include <asm/ldt.h>
+ #include "sanitise.h"
+ #include "shm.h"

From 6a91dea6fc5af2aa126b631505a707f571544074 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 10 Jan 2021 19:47:33 +0100
Subject: [PATCH 063/419] wget: update to 1.21.1

Change the libidn-devel makedep to libidn2-devel. This enables IRI
functionality in wget. libidn wasn't being used at all.

Also make the zlib build-time dependency explicit.

Fixes: #27813
Closes: #27811 [via git-merge-pr]
---
 srcpkgs/wget/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 348efcec677..49fb40112f1 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,12 +1,12 @@
 # Template file for 'wget'
 pkgname=wget
-version=1.21
+version=1.21.1
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
-makedepends="libidn-devel libuuid-devel pcre2-devel
+makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
  $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 #changelog="https://git.savannah.gnu.org/cgit/wget.git/plain/NEWS"
 homepage="http://www.gnu.org/software/wget/wget.html"
 distfiles="${GNU_SITE}/wget/wget-${version}.tar.gz"
-checksum=b3bc1a9bd0c19836c9709c318d41c19c11215a07514f49f89b40b9d50ab49325
+checksum=59ba0bdade9ad135eda581ae4e59a7a9f25e3a4bde6a5419632b31906120e26e
 
 build_options="gnutls ssl"
 build_options_default="ssl"

From b58767487cfd3b5e9e7e2897ea31e50ba9654b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 10 Jan 2021 22:28:58 +0100
Subject: [PATCH 064/419] zita-alsa-pcmi: fix build

---
 srcpkgs/zita-alsa-pcmi/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/zita-alsa-pcmi/template b/srcpkgs/zita-alsa-pcmi/template
index 6fb16de7a84..2090b4dec82 100644
--- a/srcpkgs/zita-alsa-pcmi/template
+++ b/srcpkgs/zita-alsa-pcmi/template
@@ -13,6 +13,8 @@ homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
 checksum=1a1d9f7e373032bd5702382e4c923407911f4f791c449c0c0f027a725edba789
 
+CXXFLAGS="-fPIC -DPIC"
+
 pre_build() {
 	sed -i '/march=native/d' Makefile
 }

From fb3833a18fe115e20377d585735d7839b7bcf5f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 10 Jan 2021 22:29:53 +0100
Subject: [PATCH 065/419] zita-resampler: fix build

---
 srcpkgs/zita-resampler/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index e54959dfdcb..56bd795af99 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -13,6 +13,8 @@ homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.
 distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
 checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
 
+CXXFLAGS="-fPIC -DPIC"
+
 pre_build() {
 	sed -i '/march=native/d' Makefile
 }

From 7b376bd7603138ed4ac55acf9e91383ba53c14b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 10 Jan 2021 22:34:27 +0100
Subject: [PATCH 066/419] timg: fix build

---
 srcpkgs/timg/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template
index 3d1ccb81b20..9221bc491df 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -14,6 +14,8 @@ homepage="https://github.com/hzeller/timg"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=436e2c3b5f43e906786ca150d11e521281d558329a7bc00198fe30d6907ee8c4
 
+CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/GraphicsMagick"
+
 do_install() {
 	vbin timg
 }

From cdb80f035b79a23f1cf518e7b5c418ce8a3a3b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 00:03:15 +0100
Subject: [PATCH 067/419] golangci-lint: update to 1.35.0

Setting LDFLAGS="-fuse-ld=bfd" does no longer work. However all
targets except ppc64le* support using the internal linker instead.

I found no way to make the ppc64le* build work and left it
trying to use the old method.
---
 srcpkgs/golangci-lint/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 06dba517cda..199642ac150 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,20 +1,27 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
-version=1.32.2
+version=1.35.0
 revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
-_date="$(date --utc --iso-8601=seconds)"
-go_ldflags="-X main.version=${version} -X main.date=${_date} -X main.commit=v${version}"
+go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
 short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=ff0e52ec28b5cf1dbc632db301c89dcf4352dd7376d0cc82e36571c609a0b339
+checksum=71739de1aa88defc6f08c7e5118705069fee51f4fcf303cb9b7a39215ef0c56d
 
-# Cross builds fail with -fuse-ld=gold
-LDFLAGS="-fuse-ld=bfd"
+# XXX: LDFLAGS="-fuse-ld=bfd" does no longer work when cross compiling
+# 'go build runtime/cgo: invalid flag in go:cgo_ldflag: -fuse-ld=bfd'
+case "$XBPS_TARGET_MACHINE" in
+	ppc*)	# @q66 : ppc64le does not (yet?) support the internal linker
+		LDFLAGS="-fuse-ld=bfd"
+		;;
+	*)	# other targets can use go's internal linker
+		go_ldflags=" -linkmode internal"
+		;;
+esac
 
 post_install() {
 	vdoc README.md

From 8184fc462b1994458d228dd8fc05c0c61c957ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 02:15:13 +0100
Subject: [PATCH 068/419] kristall: fix build

With build_style=gnu-makefile trying to build 'kristall' errored with:
error "You must build your code with position independent code if Qt was built with -reduce-relocations. "
      "Compile your code with -fPIC (and not with -fPIE)."
Switch to build_style=qmake to make sure all CXXFLAGS are set as required.

Unfortunately the data installation is no separate target in Makefile thus do it in post_install().

The kristall-mime-info.xml file is missing in the tarball yet installed in the Makefile.
Download it from https://github.com/MasterQ32/kristall/blob/master/kristall-mime-info.xml
---
 srcpkgs/kristall/template | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index 182781c2ac3..b5d6dbfb12c 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -2,17 +2,33 @@
 pkgname=kristall
 version=0.3
 revision=1
-build_style=gnu-makefile
-build_helper=qmake
+build_wrksrc=src
+build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel"
 short_desc="Small-Internet Browser"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://kristall.random-projects.net"
-distfiles="https://github.com/MasterQ32/kristall/archive/V${version}.tar.gz"
-checksum=24733402e0e3924459222c87aa2137139ff8ae10410a2a88d56455c5ec172368
+distfiles="https://github.com/MasterQ32/kristall/archive/V${version}.tar.gz
+ https://raw.githubusercontent.com/MasterQ32/kristall/master/kristall-mime-info.xml"
+checksum="24733402e0e3924459222c87aa2137139ff8ae10410a2a88d56455c5ec172368
+ 287f63fb3f1dfa0577fe2efb6f421a3299a928dfe139cb2a05c571aa171c2c9b"
+skip_extraction="kristall-mime-info.xml"
+
+pre_configure() {
+	vsed -i kristall.pro -e 's;/opt/$${TARGET}/;/usr/;'
+	cp -pv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/kristall-mime-info.xml ${wrksrc}
+}
+
+post_install() {
+	local share=usr/share icons=usr/share/icons
+	vinstall icons/kristall.svg 644 ${icons}/hicolor/scalable/apps net.random-projects.kristall.svg
+	vinstall icons/kristall-16.png 644 ${icons}/hicolor/16x16/apps net.random-projects.kristall.png
+	vinstall icons/kristall-32.png 644 ${icons}/hicolor/32x32/apps net.random-projects.kristall.png
+	vinstall icons/kristall-64.png 644 ${icons}/hicolor/64x64/apps net.random-projects.kristall.png
+	vinstall icons/kristall-128.png 644 ${icons}/hicolor/128x128/apps net.random-projects.kristall.png
+	vinstall ${wrksrc}/Kristall.desktop 644 ${share}/applications
+	vinstall ${wrksrc}/kristall-mime-info.xml 644 ${share}/mime/packages kristall.xml
 
-pre_install() {
-	export INSTALL="install -D"
 }

From 3b48183232665cf2f97b89348d6c981245e094fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 10 Jan 2021 21:18:53 -0500
Subject: [PATCH 069/419] rpi-userland: update to 20210110.

Make rpaths relative to allow proper function inside, e.g., a
multilib root; also, drop unneded dynamic linker configs (which are a
bad idea on musl anyway).
---
 srcpkgs/rpi-userland/INSTALL  |  7 -------
 srcpkgs/rpi-userland/template | 19 ++++---------------
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/rpi-userland/INSTALL

diff --git a/srcpkgs/rpi-userland/INSTALL b/srcpkgs/rpi-userland/INSTALL
deleted file mode 100644
index b544f54c430..00000000000
--- a/srcpkgs/rpi-userland/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-case "$ACTION" in
-post)
-	if [ -x sbin/ldconfig ]; then
-		sbin/ldconfig -X || :
-	fi
-	;;
-esac
diff --git a/srcpkgs/rpi-userland/template b/srcpkgs/rpi-userland/template
index e40f534acb1..b222667e334 100644
--- a/srcpkgs/rpi-userland/template
+++ b/srcpkgs/rpi-userland/template
@@ -1,20 +1,20 @@
 # Template file for 'rpi-userland'
-_githash="06bc6daa02137ca72b7a2104afad81e82a44de17"
+_githash="093b30bbc2fd083d68cc3ee07e6e555c6e592d11"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-userland
-version=20191218
+version=20210110
 revision=1
 wrksrc="userland-${_githash}"
 build_style=cmake
 hostmakedepends="pkg-config"
-configure_args="-DCMAKE_INSTALL_RPATH=/opt/vc/lib"
+configure_args="-DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib"
 short_desc="Raspberry Pi GPU userland libraries and utilities (git ${_gitshort})"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/raspberrypi/userland"
 distfiles="https://github.com/raspberrypi/userland/archive/${_githash}.tar.gz"
-checksum=cf4dff40a2f4ec38bc7e42a80b989df1bf88e12d714f7e681f83c4e5a588f5c9
+checksum=b23fc0849d282a8ba27b821cb8f63fa2ebc2ae8aa3cba0664ce3809ea814507b
 
 LDFLAGS="-Wl,--no-as-needed"
 archs="armv6l* armv7l* aarch64*"
@@ -55,17 +55,6 @@ post_install() {
 	vlicense LICENCE
 	rm -rf ${DESTDIR}/etc
 	rm -rf ${DESTDIR}/opt/vc/share
-
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			vmkdir etc
-			echo /lib:/usr/local/lib:/usr/lib:/opt/vc/lib > ${DESTDIR}/etc/ld-musl-armhf.path
-			;;
-		*)
-			vmkdir etc/ld.so.conf.d
-			echo /opt/vc/lib > ${DESTDIR}/etc/ld.so.conf.d/rpi-userland.conf
-			;;
-	esac
 }
 
 rpi-userland-devel_package() {

From cb257fed2e7361196774a89ed1f8e34c4523bb10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 10 Jan 2021 23:43:07 -0300
Subject: [PATCH 070/419] linux-firmware: use included Makefile.

Manually copying the files is error prone, leading to a lot of missing
symlinks (defined in the WHENCE file) as well as unnecessary content,
such as source code and some helper scripts. This commit fixes that.

Fixes #27682
---
 srcpkgs/linux-firmware/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index a2cc5c30c9d..bb1fbf54ecc 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version=20201218
-revision=1
+revision=2
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,12 +16,14 @@ subpackages="linux-firmware-amd linux-firmware-broadcom
  linux-firmware-intel linux-firmware-nvidia linux-firmware-network"
 
 do_install() {
-	vmkdir usr/lib/firmware
-	vmkdir usr/share/licenses/${pkgname}
-	vcopy "*" usr/lib/firmware
-	rm -f ${DESTDIR}/usr/lib/firmware/{README*,configure,GPL*}
-	mv ${DESTDIR}/usr/lib/firmware/{LICEN*,WHENCE} \
-		${DESTDIR}/usr/share/licenses/${pkgname}
+	make install FIRMWAREDIR=/usr/lib/firmware DESTDIR=$DESTDIR
+
+	for _l in LICEN* WHENCE
+	do
+		vlicense "$_l"
+	done
+
+	# XXX: should some firmwares, like carl9170, be pruned?
 }
 
 linux-firmware-amd_package() {

From 05ba901ea6ce6039ad442ee5e9e2960f08bae4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 05:00:45 +0100
Subject: [PATCH 071/419] zita-convolver: fix build

---
 srcpkgs/zita-convolver/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/zita-convolver/template b/srcpkgs/zita-convolver/template
index 06664118266..14cd977773a 100644
--- a/srcpkgs/zita-convolver/template
+++ b/srcpkgs/zita-convolver/template
@@ -14,6 +14,8 @@ homepage="http://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
 checksum=9aa11484fb30b4e6ef00c8a3281eebcfad9221e3937b1beb5fe21b748d89325f
 
+CXXFLAGS="-fPIC -DPIC"
+
 pre_build() {
 	sed -i '/march=native/d' Makefile
 }

From 75713d16240023291fa6534e7a8b904dc4c4857e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 8 Jan 2021 21:14:14 +0100
Subject: [PATCH 072/419] pcb: remove old pcb-data dependency

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

diff --git a/srcpkgs/pcb/template b/srcpkgs/pcb/template
index c9546e05b02..56b6d6e3a94 100644
--- a/srcpkgs/pcb/template
+++ b/srcpkgs/pcb/template
@@ -8,7 +8,7 @@ configure_args="--disable-update-desktop-database --disable-update-mime-database
 hostmakedepends="flex geda gerbv intltool netpbm pkg-config
  desktop-file-utils tar texinfo tk"
 makedepends="gd-devel gtkglext-devel tk-devel"
-depends="pcb-data geda gerbv"
+depends="geda gerbv"
 checkdepends="ImageMagick ghostscript"
 short_desc="Interactive printed circuit board editor"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From a5817be36bfc9af45160d4ce103fd41b45b748ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:35 +0100
Subject: [PATCH 073/419] attica: update to 5.78.0

[ci skip]
---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 3917a4e49b0..c88d6236bf7 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.77.0
+version=5.78.0
 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/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=035869dd6ee0f0c66972be31c06030f2bb676bb9b85824bf1c8c1540e6313ebd
+checksum=15f194688ffaa78b5cc093c61c08f7002f7eff042ce202466c67077f13d49676
 
 attica-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From acb2148ce23bf7c016f4c2734a450108eb40ace4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:37 +0100
Subject: [PATCH 074/419] baloo5: update to 5.78.0

[ci skip]
---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 3548e4a6141..da59a8fa293 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=00cca6a11b48d6e5cf915d56959ed9087fa9264a8bdc771fc5e5aa5a105bc9db
+checksum=f152c9644c812cdaf0dbfb5fb224e64e2fa0dedf615dc1f2fa572abc1e051add
 
 baloo5-devel_package() {
 	short_desc+=" - development"

From c06c63c7abaf78c9dc2b19f19458c884298b9446 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:40 +0100
Subject: [PATCH 075/419] bluez-qt5: update to 5.78.0

[ci skip]
---
 srcpkgs/bluez-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 35d50e18fa7..1b31c471808 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=fb1d33265cb0beca0192b56b0592065ccdf5651b9d3c76b119f46cd523ec70e3
+checksum=e97b36b02afb97193036ffa615430d4047d76e5a4be4596862be7e44b7d303bd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 42ff6f7b87247a7b13fdb752bb49df5cec99de28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:43 +0100
Subject: [PATCH 076/419] breeze-icons: update to 5.78.0

[ci skip]
---
 srcpkgs/breeze-icons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 615659b34c8..f1dd6f79311 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96ad021edd6999e632991bff286f13601b898dc623388e52e82b68b5ac0a0f82
+checksum=425f6d0163dac092939dede0b1023de5b175738cb59bb2ec002c821973a449b9
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"

From 54a7e44321807ef791b5824e58fe07dbfcf24cc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:46 +0100
Subject: [PATCH 077/419] extra-cmake-modules: update to 5.78.0

[ci skip]
---
 srcpkgs/extra-cmake-modules/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 8882a5933bd..b729f394455 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=OFF -DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=42f071f628b192122894026de20097cb0b3de411cb41c6935b48eb86ce992a65
+checksum=eede1f0c21f24eca56bd71a805fa76500a8c683bf21982cb33f4bba682d012f9
 python_version=3
 
 post_install() {

From e431d9f4429284e51cac13c9e0f67f7909084d22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:49 +0100
Subject: [PATCH 078/419] frameworkintegration: update to 5.78.0

[ci skip]
---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index ce9bd962dab..34241fd19cd 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0637592b489ee1187ffa7af2fa8aff4dac184189abb797ee90fecdb5ff5e0ec5
+checksum=908b5977cf711d6b78b5eab30bc9093bb2804a45cd15986d57124d869d407167
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 6e2855277d7d0ef6ebda0fb5c6ba46e38a68701c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:52 +0100
Subject: [PATCH 079/419] kactivities5-stats: update to 5.78.0

[ci skip]
---
 srcpkgs/kactivities5-stats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 7820ec6ec29..bc47894a29f 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=42c98f90d70efbb4422eea35ccc2a41e5ebc585b5b51e3f5c7d6ae82af8d6925
+checksum=fa303808bdf9dbb268177ae876b1d85d3eebf0ccb7aebaee74b2a067b9e6d629
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From b71408105ba15f78a62fbe826eb71d2227befbb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:54 +0100
Subject: [PATCH 080/419] kactivities5: update to 5.78.0

[ci skip]
---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 88dca61fc1c..5388b8bf55f 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=971179beb7b214edb9954cfe38b35a62331a7dad5cacd61b41401778c095dca2
+checksum=114eba7e76f3341c20fc7ac3936a8385d3d9d7b985aa1491689d4c6a38cb6787
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From 0cfadc87042ba689791ce06daa240c85834a092c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:57 +0100
Subject: [PATCH 081/419] kapidox: update to 5.78.0

[ci skip]
---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 5c79ad01667..1bde2d0f977 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca75b2c66a90b9f1a8cbec40db9099cedbaf70db1b5f46947b79acc14375642e
+checksum=774f1b8fafb161c7602ab45774cf6024360d9cc840d99adc436feb6cc75011b5
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 9dba3618e41ef778e55018d4f9df9797e906e2aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:59 +0100
Subject: [PATCH 082/419] karchive: update to 5.78.0

[ci skip]
---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 2cd010dd141..48ad79665b0 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2239af811b9205d9f4486791f4b25ff5ea299b3873021a646e1c8b9d44c2be36
+checksum=82e7a24280132b1654dc36caba52676b988a9feeaa6dbb9d398b170608f012d3
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 68aebce3a028f8fc6c15e03faddc66b5fc907765 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:02 +0100
Subject: [PATCH 083/419] kauth: update to 5.78.0

[ci skip]
---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 88b124841dd..e7295401182 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5a54ec41b1be0a72d710c43b8e00a7e3ac5e982c73da8ae48edf16cbc7c8c1e
+checksum=efb3b050492f466c4c531217c39aed67524976884a00f395eaeca147caf61db0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"

From 7473d43da16a7dc2aeb407c60e58badc3a276d83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:04 +0100
Subject: [PATCH 084/419] kbookmarks: update to 5.78.0

[ci skip]
---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index fc01daf09bc..d90e2f423b9 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20d1afd298227f4d45685a17816d7a41ef97e97a99ef816a7939226f92327923
+checksum=8301b0857e253bd12ffdbcde2866f91c4dcfe438bccd51b8bbbc61efa703ef2c
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 122a7eb653be2791c2fe5f18e9ad00474236cbbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:08 +0100
Subject: [PATCH 085/419] kcalendarcore: update to 5.78.0

[ci skip]
---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index c804ea900c9..06d55c421ae 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6d529aab66431daa84d506619a31287b1c628b1bdff919db4e010214675730c7
+checksum=3090887fe9ea28c062530aed6f0148ad34ab610c2efea7dc6e75258715d727ed
 replaces="kcalcore>=0"
 
 do_check() {

From a29a5f94f0db41874e7bc4d7fe0923bc5fe8b13b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:10 +0100
Subject: [PATCH 086/419] kcmutils: update to 5.78.0

[ci skip]
---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 4916407b275..4041f487496 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85bc905e156a56042572403dfcf53a653bdee3c87c9c367042048f4761f1e684
+checksum=68165fa953286ba5034b1766d09b02542c9d3eaa13dc4d64e8ced84cc70cc2d3
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 812b920d6476aecf0695f3bf488a881e78e37c65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:13 +0100
Subject: [PATCH 087/419] kcodecs: update to 5.78.0

[ci skip]
---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index bd9d80238ea..464b57b0857 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1b34aac21f6ab21e91e0e11f620949574678146f4407c853516c0f456e81fc4
+checksum=36b461cef0bb95c34298615a8a6d1f2da37676c9605ebae76d6cbdb393e8fc7a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 93d173f6e41df622df60ca0d489b665c6abcf38a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:15 +0100
Subject: [PATCH 088/419] kcompletion: update to 5.78.0

[ci skip]
---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 92c4d6c5da0..f3b0bdd0fa0 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2ed7c90a575de468fd025688e7aa566b30003f4e43b1d7ed0c5dacafa0abf3d4
+checksum=a73972651b5230c8df2d5d7b463d48004b8fd6672bda164e834eec5345113fa9
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From 10763a9de0e6b2a04cc347a9ca23a958d295bf5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:18 +0100
Subject: [PATCH 089/419] kconfig: update to 5.78.0

[ci skip]
---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index e4d1bf76a20..1739c93da94 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=30e81a7d00cc862e9d07d0e6d0fa55b561641850b7aaffcf51d4b390f1eff981
+checksum=b27a1e97d520e98178f955b8ab29e794df7733beab1898ef06ab5f14afcfffbb
 
 kconfig-devel_package() {
 	short_desc+=" - development"

From 7c57eae97d90a241ca9cd20a39b20c4ceb9bba88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:21 +0100
Subject: [PATCH 090/419] kconfigwidgets: update to 5.78.0

[ci skip]
---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index d21d5816a1d..6b53696034a 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f4a6897ef58992d38e820e8b0112069aec2ef0e7b943eb14265482c4fb22cd1
+checksum=87d4cd10145d5bf0e07f1913682553e368db0ee4a900d18368517ad9fda2ec39
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From a61e0e68ada71ae5466a04e55312a4666bb02e9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:24 +0100
Subject: [PATCH 091/419] kcontacts: update to 5.78.0

[ci skip]
---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 470d3b64a89..e12465ca831 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=15200917e7c07fed424de0616ba6e6a31355286e0d3022409f1bb448cd62aaeb
+checksum=9c3d12aa4675f7677e8c87725b23ae65bb258fd230f9ed9eac38b5d8100555f6
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 27ab5dcb026f1012ff5d7d823dcf69de29324bbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:26 +0100
Subject: [PATCH 092/419] kcoreaddons: update to 5.78.0

[ci skip]
---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index bcfa13266c5..eca6b669012 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=238e4cc422a62a2c3cb12915dbb52ad1a04be2ed13f59bfe3d1959266f08471d
+checksum=635ff94d5d15e0f7603901dbeeecc20ef633fd4f558d20462e7aacb1a88c3b07
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From daa2c3ff9dbd1fbfe284c7b837e7b4c8df972fd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:29 +0100
Subject: [PATCH 093/419] kcrash: update to 5.78.0

[ci skip]
---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 82e6f445b3b..9cd655b3018 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bda5567aca769590fbdd96d82d64ef6200350e3c88029d26c7a3603ce880a84e
+checksum=724a224efce588b9295b3ea01ea879d3eeefe77c843d833858718ec8bbfc3d67
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 6091d14d3382592c32d28fe49ec1f93efccd52ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:31 +0100
Subject: [PATCH 094/419] kdav: update to 5.78.0

[ci skip]
---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 8dae675f8b3..b0e82be82b8 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8ec9230d4d6ce15ed4f146e4b22846185c0d3046ada8cf98bbdae9b913dd0da3
+checksum=1200ac36df6cbf1f6a307166b50f3091762b8e5beb5e9a5925c4f89ccb2f10c7
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 056fbf0d9a3d4c52a2a351d7dc5d35bc6c57380d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:33 +0100
Subject: [PATCH 095/419] kdbusaddons: update to 5.78.0

[ci skip]
---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 414d26d0955..258bb9f2154 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9c11ebd460ecc198d65b1c3e00dfd4121b6b2ac63dadb14189fee1f605d78bc
+checksum=4f91d0b5762243e5e044c087d4faaa584ad5f779fdede138a0048fd4af24d399
 
 kdbusaddons-devel_package() {
 	short_desc+=" - development"

From 52f5cd8ea25917a3b7ceab8ad16f522189daf5f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:36 +0100
Subject: [PATCH 096/419] kdeclarative: update to 5.78.0

[ci skip]
---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 17a0e9caf4f..631a02c98f8 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2eaf59a4f73e7578c7b381078ca5ae920a3e8763433932277650707432104cb2
+checksum=4759319fd1569d64f53d299f67c8564e75f687376f2774dadc7c53e45d2f4797
 
 kdeclarative-devel_package() {
 	short_desc+=" - development"

From 2cc1a13def374dd0396b84ee75dcca12b80f3a2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:38 +0100
Subject: [PATCH 097/419] kded: update to 5.78.0

[ci skip]
---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index e2eea637abb..d83cc3640a4 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=921308b8690ceffcb56abf9503da6c32a824ef0540d15ff619c23ff250fb295e
+checksum=35156cac1df945e7420351b8a361567f20f21af78fef053fa51d8a0ebac2bd52
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 7560749d19beb97d26cf71587122af477bf84730 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:43 +0100
Subject: [PATCH 098/419] kdelibs4support: update to 5.78.0

[ci skip]
---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index 48035755848..7fec2a834f6 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d62ebe8aaa63218b293bc77b68aa9e6394ca314d525f8b170692a9465a436f7c
+checksum=98f914a9f2ad778c3f5dad4f340cb930a13fda968c899aef3812403d20fb94c5
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From f31dcd411a9f3d2886a8342b700aa825a18adaf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:46 +0100
Subject: [PATCH 099/419] kdesignerplugin: update to 5.78.0

[ci skip]
---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 5f2182d1275..b87caec9973 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=463fd7997e9177ca5f9b7a6533f8331960e51c6c8b7e88636e12267cd174b823
+checksum=9ff333f7d0432219b654bc4bb31cc3b152961dbc91454bdea7d522d6d11b0fb2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From c26b3f1fb133c21b398a588ecac67e57bea831b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:48 +0100
Subject: [PATCH 100/419] kdesu: update to 5.78.0

[ci skip]
---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index e00959cc794..f5f0770b6fd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bca5d64ab4d3f446c8c42f091b1982a83e80d4b810e0c00b1ae135a9751c632f
+checksum=d5f942ebfa602acf61a46f45474ec2f5403a15111906641f3108de0e8db44b1c
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From d10237c85172ca837e04a8ad6006d1bc006a3478 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:51 +0100
Subject: [PATCH 101/419] kdewebkit: update to 5.78.0

[ci skip]
---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index c91044d6028..ab31b7cbdef 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=91d8cf476f09620424a8e6d4940c2ceaad5d1fbab7cd36b0b14a2451c52067ff
+checksum=61e17a2616cf93469852ea10c5bb6e2a6bc50c944dcfeb65834f9ca109a39655
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From bae73e736c43598b5e44df660d69e5c3749ecd61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:53 +0100
Subject: [PATCH 102/419] kdnssd: update to 5.78.0

[ci skip]
---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index c90b88101fd..9396fff3262 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a94cce0d9e5557f83bc76ba6055a77867786c87c6ce723c8a66b6f3a3ecfd56
+checksum=4e03bd3dfcd468ef2d75182488b779006b59a5cb6c7f44fb093116d04b5c52e7
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From ecf21f5790d5735475102c0c7775e8f152de66a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:56 +0100
Subject: [PATCH 103/419] kdoctools: update to 5.78.0

[ci skip]
---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index a194bf36891..7f5d909ec9d 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a78c44534f85824ed8168670d2880d3735083129635109dfe54fc21f16fb6d44
+checksum=7a08eef3d7c0e4eac7d46ddc0d25942e008907bcac10ed27bca02a1169e2cf62
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools-devel"

From b4a403c3c8980f7330f1d970311c367e66679920 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:59 +0100
Subject: [PATCH 104/419] kemoticons: update to 5.78.0

[ci skip]
---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index cf7ba9f624b..d21b438efc5 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.77.0
+version=5.78.0
 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, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0c87364ca0b7b0d409d4083ef8d086f0e67d5bc30ee8f5c8df722bc12e68a8b4
+checksum=753c5c315a93174f3ce24bd8318bc7c1c0db813fba1e19ea6563be58ac805491
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 6e642b5bb037e608b14effecddce8ec200b9bc55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:02 +0100
Subject: [PATCH 105/419] kfilemetadata5: update to 5.78.0

[ci skip]
---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 6160954e3d7..8eebfe4957f 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=b011984183b45ac1f62cfae0bd59e3d91793e26b30998148dcfa9db110267491
+checksum=9dd965188f38dfc5cdcefb3b73d41885b069acb95076b96140b64e72dc213c84
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 4b737daa1295acbb90e0dfdcce55e0e135559e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:04 +0100
Subject: [PATCH 106/419] kglobalaccel: update to 5.78.0

[ci skip]
---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index da2c99e0f24..2f27b0c819e 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b47d95a5a28f64f10b2c9c0b0befde64cdb609bb3d88276ecedf7b3ddfc1457
+checksum=3f196edde20388b2c1b1aa0139de7701e86d1faa85578827e89f96f56293b822
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From 24cd65215c408e9feacb44f17331a34eb2b61abe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:07 +0100
Subject: [PATCH 107/419] kguiaddons: update to 5.78.0

[ci skip]
---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 2768a10de72..527d26ae5ad 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df674a64142d494345daed77cb64ab5b27960ebeda94ae30287bf311acaef63c
+checksum=ad09ed2db12a8740c5bc2d0b1e45b4a4f5c05835b995d2aa5492c11561bc77d0
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 58ce4aff35bb46178c5ac921abbc83b0b69b5e5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:09 +0100
Subject: [PATCH 108/419] kholidays: update to 5.78.0

[ci skip]
---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 17d791b3d00..631edaba26d 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=076862b69b38d9f8bde71f2f3b083da113a38ea419143c20f5186a1065b70552
+checksum=2768b85bad18603eacb93d211ebba51db800e532a2c0ec9f70cdaf5c0d50f590
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 283684d3c7aa47cd39d81948989a369ad4f0d0c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:13 +0100
Subject: [PATCH 109/419] khtml: update to 5.78.0

[ci skip]
---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 76efabb2920..044bb1f3abc 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=36d648c3e50fbc43ee0fcd565e67e531e8029d6f0346c09cb0cb3d693825576e
+checksum=16b63351a779bb877263c86fcc3600f8385dbfb7218593560fe022ba1830515d
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 2160866d5494fd48a9262d85cc1a37b8acdb076c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:15 +0100
Subject: [PATCH 110/419] ki18n: update to 5.78.0

[ci skip]
---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index b064e47974b..d1acafc03f4 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2e1b74dedc1a3af88f04c470922d1fafb892d5846ea91ad139d421070cff357
+checksum=13352d2ce158c09edde129712adc12ca50c81bbcafe2df924192b5faf2dc4e55
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 0bb82323d46bf939310c79eea620d834c81012ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:18 +0100
Subject: [PATCH 111/419] kiconthemes: update to 5.78.0

[ci skip]
---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 82f1ad405e8..8b3823410f1 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=735834671bd32f26da075d25f4209faac04fcc6af2f4090f99d055a3a277dc79
+checksum=fb887e4d93cdd240545c8c16431cafafe3ec3c696589540d79a0e28b92084d6b
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 43e501c3e4059dc44e63b3a2974ae4d860a51670 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:20 +0100
Subject: [PATCH 112/419] kidletime: update to 5.78.0

[ci skip]
---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 302f4393ec2..a98fb33d610 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=84e482e6c3af7fbb534547a87f49084cae1b9a4b6a7f3f26478f2c517d1b937e
+checksum=aa96864a2ea370a08ef3b6c720d2716b03d18213973b21e617e3d635ae79862b
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 95846ccefb1a888cc6bc47b3c5edf3bd0d7b71cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:23 +0100
Subject: [PATCH 113/419] kimageformats: update to 5.78.0

[ci skip]
---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 5160050984d..899a5a65753 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04bb3d02a8d967869c102da04d0c8c9e651c8e54625eb5b126156fefcb1901b0
+checksum=ecd4cf4ec006998b73724776cb2cb11f636057bd5f29ae134451fec612e1623f

From a8b8e313cc99792523402af6152100525b773a84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:26 +0100
Subject: [PATCH 114/419] kinit: update to 5.78.0

[ci skip]
---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index ed82c697492..4e8af1ec942 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58cbed51f7566b379726f46b18174f0dd9397bec77adc9face7263475110d56c
+checksum=7b93fd213ca6b0787a18033f97255acf159d65bdf8e5f90a706a036c6aa5509b
 
 kinit-devel_package() {
 	short_desc+=" - development"

From 459e4311e8ab799d447e08f20bef693b79bd2c6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:30 +0100
Subject: [PATCH 115/419] kio: update to 5.78.0

[ci skip]
---
 srcpkgs/kio/patches/fix-crash.patch | 29 -----------------------------
 srcpkgs/kio/template                |  6 +++---
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/kio/patches/fix-crash.patch

diff --git a/srcpkgs/kio/patches/fix-crash.patch b/srcpkgs/kio/patches/fix-crash.patch
deleted file mode 100644
index 163a0428c19..00000000000
--- a/srcpkgs/kio/patches/fix-crash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9dc9e26b9196111eeacb5609b36957f74f5a14c4 Mon Sep 17 00:00:00 2001
-From: Ismael Asensio <isma.af@gmail.com>
-Date: Tue, 22 Dec 2020 22:23:17 +0100
-Subject: [PATCH] RenameDialog: Add missing nullptr initialization
-
-It fixes a crash when pressing `Apply to All` in those cases where
-the action was not present, as the code checks for nullptr
-
-BUG: 430374
-FIXED-IN: 5.78
----
- src/widgets/renamedialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp
-index ac1d91d2..c3e04753 100644
---- src/widgets/renamedialog.cpp
-+++ src/widgets/renamedialog.cpp
-@@ -161,6 +161,7 @@ public:
-         bCancel = nullptr;
-         bRename = bSkip = nullptr;
-         bOverwrite = nullptr;
-+        bOverwriteWhenOlder = nullptr;
-         bResume = bSuggestNewName = nullptr;
-         bApplyAll = nullptr;
-         m_pLineEdit = nullptr;
--- 
-GitLab
-
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 6cde3c9b403..7fd6937356c 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,7 +1,7 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.77.0
-revision=2
+version=5.78.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=237c85c9dbcfcd366290512005b0e8498c10f3b300524633bbc9319a8327a14f
+checksum=e211dba2c1ed73b67188d3ddbaf40043409912ab731aed4eba5bea32a587d620
 
 CXXFLAGS+=" -fpermissive"
 

From da51453e5c74686da879bafdd412c6a2fefcc2c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:33 +0100
Subject: [PATCH 116/419] kirigami2: update to 5.78.0

[ci skip]
---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 64246d4e2ef..cba20a77545 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=aa4941f63e903ffdb029621739595c67acf02f16a2bca3657693c1fd5e503d96
+checksum=5e4e2be2a03d4ff4aae99c9451c2fc81015f9e5c22cc679e188346e83be3c718
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 77653267f19f6a67a7bda418387844c6c0faa276 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:35 +0100
Subject: [PATCH 117/419] kitemmodels: update to 5.78.0

[ci skip]
---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index a4e9cb5429e..f79918ab8c1 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=decc3f607a0b2e9e6d585188eb6664a2cf06646db50d4d60dce83d96a0456534
+checksum=4a361cf0fd7bc48261fddcc5b916367cb22b5a2cfdbb91a6eff5d0da4e7cc8fa
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From c0b4edf722a2dfe2a83e82f10631f21149f7b52a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:39 +0100
Subject: [PATCH 118/419] kitemviews: update to 5.78.0

[ci skip]
---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index d601771d923..10b66b1ede4 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1013c09c47b87c51b21e6cfe5a6ed112ba43ab9b18b8d41fe7ffe2214faf1b23
+checksum=05f8895880afd15b2c08570df26cfc6cec847808e1aab0968ffeaf47618eda83
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From 24210ca4ad326d4b734eb69fc569c69258f66fb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:42 +0100
Subject: [PATCH 119/419] kjobwidgets: update to 5.78.0

[ci skip]
---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index e1cc8ad78ae..b6d0ab12ae3 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=113fbf6c9e87e8eef727c3578a02845f99256e8ceca2d24640118ceafc7fed2e
+checksum=9bc3ba73f7a55896dc772adac8042e3cd62d795e5f066593eb08644e023fbe31
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From dec65290f7e124aae5e075491c74b88ffb1f9147 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:45 +0100
Subject: [PATCH 120/419] kjs: update to 5.78.0

[ci skip]
---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index f77d9d56cbb..6959d0410a7 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=e8a776f1dae92bfe3c0cf0b60f1556b78ad20eb12f9ef149f1a484e7d29aafca
+checksum=9070e1d8b28ea111f1946de57fd80c74dd03e92e31fa3106c4fbb5d38de4566a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 886fc4a9d4f9607d91c176694f75ddb37bdff49d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:47 +0100
Subject: [PATCH 121/419] kjsembed: update to 5.78.0

[ci skip]
---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 28d0b0c3dc4..349f76ac965 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=fc7efebc3d7b40066e215ca61cc8e15e0d1e389706277c5f6b972b96020cf229
+checksum=296faa38f8996e8b99a7e83fb67d4b0dda5a4284a77aaec9d41ccc62f1ea1065
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From b01c985b75c6760fda4291d57a185fecafdafa3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:49 +0100
Subject: [PATCH 122/419] kmediaplayer: update to 5.78.0

[ci skip]
---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index f93ac09dca9..50856c9bd72 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=cd2c6a33aac3a8fd65e597d7287147f5e1a60cbb8318764a3776ca29b3314bbc
+checksum=9afa27eafc8c7d144134d6ddc6e3cbc6310d6324f81d2ca6bd4142f69898c07b
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From cc64733fbc2926d641547b3688dc40d19a85f08f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:52 +0100
Subject: [PATCH 123/419] knewstuff: update to 5.78.0

[ci skip]
---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 7d3773c631f..9715df32071 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d031fe85c8870d1fd99d7a0252f06169d078be803bd6a70338403b624c7b70bc
+checksum=d5b0abd5d4ff67e1f4fb921b710d1251569bfc2e19788d9ce7843b498f9a61b9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 164267167b6e493e49384cd3aeb81b15cf905350 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:55 +0100
Subject: [PATCH 124/419] knotifications: update to 5.78.0

[ci skip]
---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index b188dd47d30..491a5986b0d 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f288fe163a9297011af9f2d147e6516f07c1ed68ff0546cc0cf65e858bb40265
+checksum=397fc21bbbaf235fd092f3bde731d2c0f1736ed4595e4a4cfa4b1e4328ee2339
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 6cb81d0e4ceb3c7714fa5d4a331d57bc947f4951 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:57 +0100
Subject: [PATCH 125/419] knotifyconfig: update to 5.78.0

[ci skip]
---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 917f1d80e53..477043de044 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=29ba27263e4b33990685cced7bb2d8288cd3370adda1e1df7335e1cd9d1d5d99
+checksum=df01a3c61502d60d16adcdc1c7b75de4b05e0850243c86dbd8fd1012a339fa5b
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 60475136c4e74754a90dd829a122aba77693dafe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:59 +0100
Subject: [PATCH 126/419] kpackage: update to 5.78.0

[ci skip]
---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index daef0c6488f..4d5966710bb 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.77.0
+version=5.78.0
 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/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e91f8dd81f4d2f5730ec444eb8acbe7e1891fa31df2fe01886ae0012d9ec2bd3
+checksum=ec906a1037b91d747a858b77e40e24c279c1af72199cc15dec422a1707741b34
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 3462d62649eaa3f3d23d6507bb9da1a1fead01e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:02 +0100
Subject: [PATCH 127/419] kparts: update to 5.78.0

[ci skip]
---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index ed12b5f6b1c..b5656880144 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3afdf8472d0e1aa991f4395d08bcc6836512c1da0fef9634087bca695df4e77d
+checksum=77d33ade190828254d1e0c8855b873282168eaf6a4f8ff42c902c2f8a1dee1da
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 3ee8a5d3d46002427a7901d4a3b81db33d0579df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:04 +0100
Subject: [PATCH 128/419] kpeople: update to 5.78.0

[ci skip]
---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 8137cdfb218..8b15279901a 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.77.0
+version=5.78.0
 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/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c7f40eea87062d585fe70504e5e83d81df3fd71f63ea8bf3b04dd35419348f26
+checksum=b180d9623f9ed0c83deb49a299bad6f7b88b50a2f83ea745d0c970e830088c31
 
 kpeople-devel_package() {
 	short_desc+=" - development"

From a06501eb14a74a0499ad586540f368760b6b66cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:06 +0100
Subject: [PATCH 129/419] kplotting: update to 5.78.0

[ci skip]
---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index e8091bf60cf..54f2138ca46 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.77.0
+version=5.78.0
 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/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=32226573989c105d84a324174d31a1ed4c7cbf57a75341873cd8fe5692d7a2e8
+checksum=6cb34efc35645ee26801587f65d7f4ba452dd219c1fcb6dcb31a30725f1e8d03
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 0e2f6d5d01f9330360a272ee16737d27c92811dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:08 +0100
Subject: [PATCH 130/419] kpty: update to 5.78.0

[ci skip]
---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index d0bdae8c28c..ded45618041 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=904bf61cda153f092fc5e2d089a00d73152c2dca6f7a0035f3978d9a7322f1e1
+checksum=c3d1d6d431de7608f9e764ab40c4e1f0c1765d0f6f44c092c4d62e942e9511da
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 841ce0a6e25cd35549f0adf23fc0426020f09b1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:11 +0100
Subject: [PATCH 131/419] kquickcharts: update to 5.78.0

[ci skip]
---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 4ebb6f6f19e..4f75e6a4984 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=267b7d53a49f9e15d2d3e144f1d352ccc5eacb00286539294e0e8537206fd59b
+checksum=1762b927e8fbaa24cb20425dfcdf875190000f357d1f3637dd580bc2c75d05ff
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From c3279fdc0562f2ff616af22fc78bb12e4733d6f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:13 +0100
Subject: [PATCH 132/419] kross: update to 5.78.0

[ci skip]
---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ecdacd7cb57..6f6029cc66d 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.77.0
+version=5.78.0
 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/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7e48494f1383f91b2bf448692db2f3bafc123275daaf4a5b37d7dfd141380d31
+checksum=6121ce648605b8de960889a6c48a5fda967b3f52e38c626c5ac6f5f2e766d41f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 44075a4f6f1a89e1fc28202f06683864b7beb385 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:15 +0100
Subject: [PATCH 133/419] krunner: update to 5.78.0

[ci skip]
---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 3d982193e18..98e8a4ab4a3 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5381bf1d4eb68eb448d2e5b92e4e86edb2727acdea44c31ffc499862417ed5b4
+checksum=755e627292550d56ae77e356eb7bd5991652c196d8499af6fb6da7989e301e02
 
 krunner-devel_package() {
 	short_desc+=" - development"

From 679fc14773f21499980e142751863ae4cc783f21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:18 +0100
Subject: [PATCH 134/419] kservice: update to 5.78.0

[ci skip]
---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 0168042614b..e5804330c91 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=942f50329be3a6dc727fe7c01dc8e61aede65c4050798388e6bedb60c21ab8aa
+checksum=2ce68ad220b2bc6975f84d8f231afe1a1b5cf6922a75e0ce9541c61e3c5535a0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 173149738e564c82e5ce6ef51b762cfec79fed10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:21 +0100
Subject: [PATCH 135/419] ksolid: update to 5.78.0

[ci skip]
---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index b750b882a54..c3f9a84aa17 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=67d066bcaadffa98960346639e8adacf7a3253fdc10d085d32b9c43fba59d921
+checksum=129710956e0f9940b00a0b6b9dca86709f3b753ab88debbf93d7ebaeb44bfde1
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 6a7c539206cae905bdb7ba6793e13dedcdee77e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:24 +0100
Subject: [PATCH 136/419] ktexteditor: update to 5.78.0

[ci skip]
---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 5e55e649491..b0b9b2450aa 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccc5ea0c2bcbef3babbef727fc604361b1f7ddcf68829353846f315576e84033
+checksum=5664c5eb12fc1282f751be6874ac2b99fb59056ddd6562b7e05e8e6e874524e4
 
 ktexteditor-devel_package() {
 	short_desc+=" - development"

From 7bbb3174c06bd6861d862dcc9fcbde4731beb32e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:26 +0100
Subject: [PATCH 137/419] ktextwidgets: update to 5.78.0

[ci skip]
---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index df8a4b0c687..18999dc8ae5 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8371accab994192f1505b3bb4805badd751fabd4e8a8ca66cadbc039a253f0f2
+checksum=e8133b3f5ba809c48a92895ecb4b4a1c4beb11ddb589fe6691b6545ce9eef8be
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 452f2c116bf798815c4ccf0223d4e66cab6e18b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:29 +0100
Subject: [PATCH 138/419] kunitconversion: update to 5.78.0

[ci skip]
---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index ea6f6363d1c..a712cec56d3 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0c2e206a3ee7c13944cf4d293f71a27944df8bd9d7acf14ca7ff946e225ed2d5
+checksum=8c790c9870362032556e3c7d6b37c01bfb571eef32d33a4ac3c96260d8a5439d
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 3765ed59ee7ae3ff50364822547d1f70375248f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:31 +0100
Subject: [PATCH 139/419] kwallet: update to 5.78.0

[ci skip]
---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index b49aee67df1..771ed6aab40 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e33272fedd9d8b1c008e35e2bae3963355e4f8b5ddfab8d6d06c63ddbddad8a0
+checksum=9730997f28ca4e55b015a5d76adcb1200d3e26ec21af9f1a598ce3e4532b16a9
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From ea20b498b2117cbd783220b6b43ceca9bdab8d38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:34 +0100
Subject: [PATCH 140/419] kwayland: update to 5.78.0

[ci skip]
---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 3103df4fb84..df3e56a49d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a88f2e98c74ed5c3d4c9c54b6321d79deaa72c339bfad96ad74e5442029d7b0a
+checksum=ab6ba414a69b2399ae7b83844d9ea735cd763afc2e5c2a74292b5ae914db4a14
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 4a92f01eb222d9425b98c8edc76698bce4070c21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:37 +0100
Subject: [PATCH 141/419] kwidgetsaddons: update to 5.78.0

[ci skip]
---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index c427f1bc382..22f678d7fa7 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c72094fdad6740280513ff27477003839f20555071817337d3bf5c95761d7ae4
+checksum=e4abb00c3228459768e99451350d94255a386ccd9cd15005ffe47f31694c5e2c
 
 kwidgetsaddons-devel_package() {
 	short_desc+=" - development"

From 94195ee6c2b44cb0662422737d419ca9919f01dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:40 +0100
Subject: [PATCH 142/419] kwindowsystem: update to 5.78.0

[ci skip]
---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index a3ef2f63950..df9aa90a19f 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.77.0
+version=5.78.0
 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/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=064d31310a8568fb1900c19b955176e245d96f0b42061c15c20bc2e2a7ab4f82
+checksum=6cb9caeceddaaa35754bb41051e1104f60bc205cf89b434fbdd88415edf57200
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 9cb8b38c09f925958ce1950605c8263efce44b4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:42 +0100
Subject: [PATCH 143/419] kxmlgui: update to 5.78.0

[ci skip]
---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 26e607b73e4..b0a290687ee 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae6df2146464ea403d33e8b0e4b69579428bf76c1e13f5fffb8634a65da930f1
+checksum=f80cb68986675a70a36ae711296973c9f88142779c4b402aa156a1bd577fdd17
 
 kxmlgui-devel_package() {
 	short_desc+=" - development"

From 2c4201e29059bfd9121c827aa941877ddaa37ae4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:44 +0100
Subject: [PATCH 144/419] kxmlrpcclient: update to 5.78.0

[ci skip]
---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index f887a372b76..51ba6abfa3e 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=c90d1add0252915f1c94c4f22360f73b779a8c5c30e04a8155f103317e841f89
+checksum=5d7c24fb3593f1eb43aefd74793738305025677ccbfcd38ecbd071a987602115
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 9791c479f2487b01eba76e18c8b647973cdb1687 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:47 +0100
Subject: [PATCH 145/419] modemmanager-qt5: update to 5.78.0

[ci skip]
---
 srcpkgs/modemmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b5f3b913755..4335491c4b3 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=259d860b5f914802e26cd0354afc3da32fa0a631735b463a4445e70777b40ca7
+checksum=d9db3adb4f6e4103bbf2d584a6286c3995169090c072a6e8adeeb7b395bcc327
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 828755e2540c3038cadc348d42e716342efb54c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:49 +0100
Subject: [PATCH 146/419] networkmanager-qt5: update to 5.78.0

[ci skip]
---
 srcpkgs/networkmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 89d83004a6f..064ebbd8074 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=9f8e4937565e4bc9e29aa316aef5e1a4efcc53860c313f12eb24dab54194d3dd
+checksum=caf3d4ee4056af726467282bbbbb610e121f4288976adf3c174ba338e967de71
 
 networkmanager-qt5-devel_package() {
 	short_desc+=" - development"

From 64295f12add00ba5f55c517821aede46b01fa0fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:50:46 +0100
Subject: [PATCH 147/419] oxygen-icons5: update to 5.78.0

[ci skip]
---
 srcpkgs/oxygen-icons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 3d3f1b7585d..bbe99bcc584 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.77.0
+version=5.78.0
 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, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3caf812346adc7c5b91769fc77a6b4e91ccf764c755b84146a88f2fc46be538e
+checksum=29cf52784263001acb4942d77107963aa354d5e98538563e60ae679dcafbe3f6
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From e12bfe118dbb9cbe52f0d46279af9361ec8ee562 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:50:50 +0100
Subject: [PATCH 148/419] plasma-framework: update to 5.78.0

[ci skip]
---
 srcpkgs/plasma-framework/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index ff647632786..d9dc41f0822 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.77.0
+version=5.78.0
 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/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=11678e5274d10a4ca3730a2441c8b555eb527d2a66606bd35fa1f15f667ae985
+checksum=46aee1e872728af5ec5c28c604494bbcdf01c32c19f9fe2593b749bbeb698481
 
 plasma-framework-devel_package() {
 	short_desc+=" - development"

From b9d481050270e44b9b460fb820bf565c6fd300d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:50:53 +0100
Subject: [PATCH 149/419] prison: update to 5.78.0

[ci skip]
---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 60685ce30a5..4e5efa0557c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=d2dd8566de361ff469ba0f03eb3a21ac9ffae13781f866d34e5ce7e44ef19c65
+checksum=d351df1579331eadea6fe1f47fde8c7e11765746831947e993879edc996cfa79
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 9c948c43f38376d2c4bedf99039f33c9049b5801 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:50:55 +0100
Subject: [PATCH 150/419] purpose: update to 5.78.0

[ci skip]
---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index e27bc687f60..1a787bcc6b2 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bc48dbaa200336dafb5519ff63adf01c6bd22737a8c8423103e9c2d305f0f674
+checksum=498017bdbd1f46773963d2b97bfb8b7d9e480fa6d958a83ce629c7d327e1628f
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From df78a78a3f596ae70c33103e245708fe48b7bbdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:50:57 +0100
Subject: [PATCH 151/419] qqc2-desktop-style: update to 5.78.0

[ci skip]
---
 srcpkgs/qqc2-desktop-style/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 032edd80d8f..be00cfc41bb 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb9736691e19ec72138035f46cb7e1d760b07ee9f8946c421c3b611c3ffe028d
+checksum=33ea60eba2112036b6e3e136161746afe84d44227da7b6d3011b83beb3eb3329
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ec5db266534082ebd52676fb18ac46d58df0c341 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:00 +0100
Subject: [PATCH 152/419] sonnet: update to 5.78.0

[ci skip]
---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 416fe615102..17a7d8077bc 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d092461a6a86811ab749459cc2079903616d4f839e73762b60019b5454db9068
+checksum=c2e70e96c66efa359b47c66937403089b11f6f9bf5406cb24f023809e70280cb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"

From d879517118bbe9d8cead57c1032c7dcecc646843 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:03 +0100
Subject: [PATCH 153/419] syndication: update to 5.78.0

[ci skip]
---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 42b2e6a394c..71c56e6dc8e 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=e3eaacfe43e07b8d25a188cfbe31c59ad57b2f942871b33d924f800abe91d6f8
+checksum=a12db60298fb8914d59ef286618a3c1fc351d6544f747024f665cddc5320c26b
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 58574f5c06eba2e04b9f29524ea03b256a089ab7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:06 +0100
Subject: [PATCH 154/419] syntax-highlighting: update to 5.78.0

[ci skip]
---
 srcpkgs/syntax-highlighting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index cfce24fa998..b33ca6bdf47 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36898baf86dce80ff125a6b2ae33afee497a61e06711aaa7ef7e0bec390bb6a4
+checksum=8b5eb71ce548bb2267235db42d026d8655285396cfc2766e0277c8688d7bd6d4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools syntax-highlighting qt5-devel qt5-tools-devel"

From 7b4edbfe1bc871817b3b863b3104a4924c0a367a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:09 +0100
Subject: [PATCH 155/419] threadweaver: update to 5.78.0

[ci skip]
---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ec5b1bc565e..c30b0eee929 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.77.0
+version=5.78.0
 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/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f898107074943f103fd9d4ee2b82cddcb705382424bd47fcca21b11c167d8f2
+checksum=d972e78e5ce89004d52c08e689b539877f20c036a1ef0383d2be02bc6e7598d2
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 30378a0045ae8362d33a4fc944fe10ecbc59c84d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:40 +0100
Subject: [PATCH 156/419] kde5-baseapps: update to 20.12.1

[ci skip]
---
 srcpkgs/kde5-baseapps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 3169b6279bb..5019a791eba 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=meta
 depends="

From 35c1dfd096f7f649776bfa68e6e41be52741ddde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:47 +0100
Subject: [PATCH 157/419] dolphin: update to 20.12.1

[ci skip]
---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index de01f5fa23d..ed971ca3c97 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=20.12.0
+version=20.12.1
 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, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=02b384e85b00aaaf1b4efd7ee7ca9d2f98991b850aa3645b7161219e9087ccd3
+checksum=b71652f40f28d92e790a0cdffbd0124c09a7a2264a7a798297b9238171454f58
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From d5b74c9e03137338814b6460e80f2b015174826d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:49 +0100
Subject: [PATCH 158/419] dolphin-plugins: update to 20.12.1

[ci skip]
---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 6dfab5a8961..ef6802940c3 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=1f1124f89540e19f6d17723fc6d779428736acc2cfcb82c38b547141eca5942f
+checksum=926dc9f69b1a22553f8808b14634ab3760170bddaa4de44e03a763c3074bc74e

From c09a367b768d64a6a0d8eeaa7a43d91b778b2c72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:56 +0100
Subject: [PATCH 159/419] khelpcenter: update to 20.12.1

[ci skip]
---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 9124dfebc1a..4d4fa5aa9f9 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=20.12.0
+version=20.12.1
 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://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8544416929518a3744b933c88a13f4f878fd6fab915866069557862f663c855a
+checksum=66e137a74bf79bc9af4320c7803c0e03d834f79b0e567295ece8bc81a3466ab1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From 1028f47a9679fcd343c176229e40c0eea9e0b2f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:52:03 +0100
Subject: [PATCH 160/419] kate5: update to 20.12.1

[ci skip]
---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 94d8ef2f0a3..7cc920beb9e 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=20.12.0
+version=20.12.1
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=69017d7369bbcac7a3e350fc0e02cbcfbf5ce09e89149e765a1cd647f3cb3c0f
+checksum=739bbb0378b73245465b59ae961e325d3224e251ae8b97d30c2daceec622a28e
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 2759e07dce1e004fb5dd00e4329fb3de94a24713 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:52:06 +0100
Subject: [PATCH 161/419] konsole: update to 20.12.1

[ci skip]
---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index ea51cda9b05..900cff279dd 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=20.12.0
+version=20.12.1
 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.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=6d3ba8a4e5baeda3f8b380f122313de1421836892994f1ddf0e6872696598d59
+checksum=b690be392462cab5abac74d1e1010c3f991c3d00968b51ed5525040640d769ec
 replaces="konsole5>=0"
 
 if [ "$CROSS_BUILD" ]; then

From b08e49f4117f64f6fb183d412a81c600f2701ffe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:52:08 +0100
Subject: [PATCH 162/419] baloo-widgets5: update to 20.12.1

[ci skip]
---
 srcpkgs/baloo-widgets5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index adb1b1a650c..1cffc9d16fc 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=20.12.0
+version=20.12.1
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9af708f4749effb02a87ef37decb3bd3cfe1365521290a49093f86da93dd1aa2
+checksum=23fb018485b778ef1e9eaa2a8f35e0becb64a3e928bf130033fd374d1b03be84
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From eb9b440d95d72728c1c4d8003b4d6e3228dbd183 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:03:47 +0100
Subject: [PATCH 163/419] okular: update to 20.12.1.

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

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index fa37d542457..070c5989374 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=972c5395dad9c47b0251237b476d569bcd21855710a1bf8ec50fa7e6f0472bce
+checksum=2ca17ad0b2a1a0f9f70c7ca4bc1f44a9ed758b0ca6a8e5c9935a467f883df53e
 
 do_check() {
 	cd build

From 83019831837304890f02bff0496415fdabb3d517 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:03:50 +0100
Subject: [PATCH 164/419] libkexiv25: update to 20.12.1.

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

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9b06da83c2a..5753ae0a6a6 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=20.12.0
+version=20.12.1
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=534a28648861f1d10e46a5b95c4c7dc27eb2028bf1e0cddd9814237d9c8d114c
+checksum=60b3c6d16ea02b335ce5b377e153e39268726d9b80187674547dccfe06f5d4ef
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From 2bfec23ea593fea2a959b64487bf08f6b35c2dcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:04:08 +0100
Subject: [PATCH 165/419] spectacle: update to 20.12.1.

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

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index ba338ea34b3..a06767e0da5 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=20.12.0
+version=20.12.1
 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, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0efa48c9646c8df804d2dd474fbce7f131f3918d9acd10e43cf983f699768e1a
+checksum=3414bcb536ea63876342dab7a33a4b005897985b10da8e01628c297723a85a12

From 87d74eb1bb3e35d82a08e62d5808b4360963e7c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:04:10 +0100
Subject: [PATCH 166/419] libkipi5: update to 20.12.1.

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

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 42013dbd162..0641ea914f2 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=20.12.0
+version=20.12.1
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=efb8b33f495a7481e2d1b69954980761f7f267dbc1d287cd1f77fe970d04b42e
+checksum=4f638ef8474527289f8dc1624625aa3bf3f339c3865f4a605a38c2976c70c4d2
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 91e8d0704d92dc90c8995bc94229fa29fa9acc88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:04:46 +0100
Subject: [PATCH 167/419] ark: update to 20.12.1.

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

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index c6372b0f590..653c81d49b7 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b7bc762eca2f2cd9dc13ca583291133cec3c4f08ab72779a59b54c5d6e4e45b7
+checksum=357366960c4b1621ccc943465800938da3a8711985ca3fe1109151c8b952eaa3
 
 do_check() {
 	:

From 83718d5bdbe180cf45d9ba89d9150c9b5d2a2c0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:10 +0100
Subject: [PATCH 168/419] elisa: update to 20.12.1.

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

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 142afc60cb5..0281b57dbd6 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=0e1bed3836da289361b9a9616caadf24479e184e6b8918747567b46535058508
+checksum=3e360105dd08296bee61d2d92adfc7311b46bdb813be5842f4f2fbd64fecafd2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 88b78e041833a7811d653f96ef0281c7a409fda0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:17 +0100
Subject: [PATCH 169/419] akonadi-calendar: update to 20.12.1

[ci skip]
---
 srcpkgs/akonadi-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 7c9bed43341..0255eab7818 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=6171a6b6e7e20f4de5744fb514dd3ae804871c9fe93b92cf01cc978353992821
+checksum=85db4f06e8af322eb65ad1dd37a8a2eec6277b99d0012f3323f2fa3f8023fe7f
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 31e06f54b55bd97d60819d46c487f497424131b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:20 +0100
Subject: [PATCH 170/419] akonadi-contacts: update to 20.12.1

[ci skip]
---
 srcpkgs/akonadi-contacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 758c8a92a97..c207df976d4 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=1e4d21c2897596db2f5d3b21a830c9ea9f247142bc4338013010db471f4c31bd
+checksum=34ab825e7a6e155363fc5d0b2505661dff612a836de9ea8ba5c61f602dd2ac3f
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From c7dd1d1c8d2c8bc49d3c59fa476103e7db0b9257 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:27 +0100
Subject: [PATCH 171/419] akonadi-import-wizard: update to 20.12.1

[ci skip]
---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index 1f81c99eb9f..0cfa412f286 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dc9e87635312c641606dd42c24cc790c2d7de0b340474554ce907de8fcb1af7d
+checksum=ff9fff17f16cbdcc1fd76cc3612dab0d2642068bc7af9d3b839eae2ff67eb0f1
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 094826f58f43e931ae622be9fbf8a3c2fdea219e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:30 +0100
Subject: [PATCH 172/419] akonadi-mime: update to 20.12.1

[ci skip]
---
 srcpkgs/akonadi-mime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 11a0e5dd29c..358d62080e2 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=bf6d0a4dd15c26bdffb4b20d6de3ca35fa5e09440c0e02f6206941d45154885b
+checksum=e58f1c794cfc0891ec920366572f588d2392352a751e6297a29a7e710a6259f7
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From 12b25a972e3be878f49b305e3b3d8118029e34f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:33 +0100
Subject: [PATCH 173/419] akonadi-notes: update to 20.12.1

[ci skip]
---
 srcpkgs/akonadi-notes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index 738cf8c3000..cc0ced117ee 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d6237903b79d31e0a685d955c77fc216ce3ac0fcefeaec3e9326ad80d008eccd
+checksum=959f6964407e03801faf1b6f563b97ed57feed85e0c6c53a73b1fa092a1fa295
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 76f6db5b97e521af87e80ab15f2328471b868804 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:36 +0100
Subject: [PATCH 174/419] akonadi-search: update to 20.12.1

[ci skip]
---
 srcpkgs/akonadi-search/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 6c27e33cb92..2b1edd1077a 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=1e5c3d22c412e25e4a93a0ab02bd94bd652965752d9001aa87ca10596766061c
+checksum=08115ac4fd33a423d6b9f68d6cdde360808b84961029bb0074e408e4ecb8b818
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From fbb04adf26e1f0e97081ef727e44f7603d141072 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:39 +0100
Subject: [PATCH 175/419] calendarsupport: update to 20.12.1

[ci skip]
---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 0b97d0ecf7b..993e4c02476 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=2a8fa770904c81d1f9452f2782507263c2ee8a07a5affc3ef847ea89335ed31b
+checksum=37738b20a369350d90cec17d186927e5dd9f092e88952886b9787fd3b7908ca9
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 3a1df7efcac97466499e0d96489244446e73a916 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:43 +0100
Subject: [PATCH 176/419] grantleetheme: update to 20.12.1

[ci skip]
---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 207affc4fb7..cf4c46d5e82 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=0cfa0cb1f169e60c77a5a62551a1e9f7f31a2f4caea13f129420cfa314cd141c
+checksum=9ded145cfa1f5fa11f1bdcc7c31e7e449e3018383962c04328762c9ac0bf07f1
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 5079d29f3f36e1439229e00e26cd0b615e1cd81b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:49 +0100
Subject: [PATCH 177/419] kalarmcal: update to 20.12.1

[ci skip]
---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index a8df8c91e96..42e8a587132 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7a6c76edfafbfc10b3f392ce05eca4921904df321c395dbc9a5b036439c924d6
+checksum=45f3aca13d0c124bd3c057503a67d6a0a189cd80e6f4a3f331170857055e8e80
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 2d89ce39acdd6fa53d8e85e6a01b0f6eccb3f537 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:52 +0100
Subject: [PATCH 178/419] kdepim-apps-libs: update to 20.12.1

[ci skip]
---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index b13a6f6b216..c65ce324cd7 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=c89cc5278e2701ac25445b0cb637468b26a3d54da1f81d67b9b49920017f70bf
+checksum=baebb2b8d3f1bf7d46b284ee255caf8668da48eb28251efb5d380ca7914dfc2c
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 0423d8195282166ed809d891bcf39c8f941b597b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:03 +0100
Subject: [PATCH 179/419] kdepim-runtime: update to 20.12.1

[ci skip]
---
 srcpkgs/kdepim-runtime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index e5b753c6543..9abba2b0acf 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6dd4cd1328aeb2699a51abf41056b7bb009104803a3f2cf70fc4966b21344b01
+checksum=f82aa8448d01e0e5a3af69581a9188411072541159574640fd8c8b0adbeae7da
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From d5a0b32a2b8d06cee59853d54028a6b544f53aed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:07 +0100
Subject: [PATCH 180/419] kimap: update to 20.12.1

[ci skip]
---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index 691c06ed2a8..dad2145ca22 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=d2f355e11f61bc25dc448b2943824940e34f918803b5af0e0079d7a914575354
+checksum=9bd0b19ec6f8bacb6cf6d2e47949eaa470dde4a7359fd8da1d3cebb1ea55d4f4
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From c9a523324614db1eab0b3a12cfcd8dd2fd2739f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:11 +0100
Subject: [PATCH 181/419] kldap: update to 20.12.1

[ci skip]
---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 5b9f10604d6..ee9f1808428 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=938c6dfd79fcfb02aac1b08467bceab99994f861197fef82694dfa6eb3b44b02
+checksum=63923db7e4a8985a3f2c6020e232ef62f20e89ccbf210966402db820d384840b
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From ee6a35c3b0f2fbaad2152a850807107107829331 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:21 +0100
Subject: [PATCH 182/419] kmail: update to 20.12.1

[ci skip]
---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index cb15ac7be2c..5e98eb1b862 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=89ded51ac8d33c62a15ba592b2beca13d05670541cc1515567ad30e4a6d7a5f2
+checksum=fc35e6d433f47d7764fed5caf58535fc1dda3c8e1b82d2991b0fd724fa291489

From 54053f313c4ca9e9387281192c5bcf6ba2171677 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:25 +0100
Subject: [PATCH 183/419] kmail-account-wizard: update to 20.12.1

[ci skip]
---
 srcpkgs/kmail-account-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 3289a300219..21993aaa5e4 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=b14cbd75209c9e294e781ab6051f3519df1ae8559a78da409c8697a0bdee8aa3
+checksum=365e917e68b8427c3dbda3f3f7c99d6ab53b632dd78333754ecc7b7aecbe84be

From a19049cb8b9d913fe6ea5f469b137140fbaca58e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:28 +0100
Subject: [PATCH 184/419] kmailtransport: update to 20.12.1

[ci skip]
---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index ffa38942394..b8b8eb4fe08 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=3ead5834ecb409f04114b30656ac8849f118929dd88cd5b120338e1c50b0bc1c
+checksum=95dea10d1b4b0f2c3abc2bce14ea9400745214ec8500bb0d3e34f63b61752422
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 40dbca9c4df5130fa17c1b5c50f9cfd63cc5ec02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:32 +0100
Subject: [PATCH 185/419] kmbox: update to 20.12.1

[ci skip]
---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index 30a396d4431..c7c26677853 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=c7f32faa9b9a6424c2fa063c9b0b84c3a250a7fcd37a056e3f3997428fd28ed3
+checksum=0d6fc76613d5cc84ecc0764cef68458ffa99aba6c230981aabf342abf01327f0
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 76868e7d4b1e18c998c29823670e754d09767330 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:35 +0100
Subject: [PATCH 186/419] kmime: update to 20.12.1

[ci skip]
---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 2da58c4c545..49c50776d0d 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=03375fd4963ad87c675b091c82e4d4ecfd5b17ed513964f7567a38e6b33caf64
+checksum=4299c59e65a4c74e5104d2349d3ce6eabc782be9a5008d1b882b2da210ac2543
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 2ab4af9b0bb31e05cf907d15bc7814b53f61a9bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:38 +0100
Subject: [PATCH 187/419] kontactinterface: update to 20.12.1

[ci skip]
---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 799c35beb7b..d5dfd7bebdf 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=cf947c8cde12af33c25bd1fcca9a7f25828b75b25c38ea5250a1b4a9d5d188bb
+checksum=923c18164e5973494cb30a0dc407714a3895895c241a43b44f5ae4b8797db469
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 3cded8846db4edaf5232dc31a1b8c3686e67e3c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:42 +0100
Subject: [PATCH 188/419] ksmtp: update to 20.12.1

[ci skip]
---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index e31e78d0831..a78f93de115 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=39682dc5464fd269c75eb67a363ae438ed1e3e0af0d1cb6a742dd6fe17e437f7
+checksum=affb69fb3efcd8a1eb761906bd01cfd250eac412f95668ac20674207d96350f9
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 3d4679dcdf675b2c46896ffced602d4bcc06c9e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:45 +0100
Subject: [PATCH 189/419] ktnef: update to 20.12.1

[ci skip]
---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 4dcb4181c5b..e2eb34247fe 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=755307e99f7ced99695a19d3beceb074c0479db2670b8feed3c25b5b1f274f97
+checksum=cd9155107c2358d0c03ffdd22d9eeba6931ab9cbb9481e05ed97be0397aa04df
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e932c5d9a21545aaebe4d49cda7ad1cf454c3ea4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:48 +0100
Subject: [PATCH 190/419] libgravatar: update to 20.12.1

[ci skip]
---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 976bd4b2d14..e492061dac3 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=8800c4a5270725abcaa1bc2c1739e5f5e8a56e403419581946dee7994a1df375
+checksum=327d019bd0d1cb4c4517a3b6608b979ffd81e112216cf682f14e7307ee717e89
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4af3f6ef1354e249b21db35c5b2f83561b84513a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:51 +0100
Subject: [PATCH 191/419] libkdepim: update to 20.12.1

[ci skip]
---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 7f304000921..1986e56926e 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=587265834c1c05877e6a48fe1687e1907378cad10b3a13cc691ec5227b467a10
+checksum=8e6811dbed7ac89428345346275a19cca2eb378483f6a9e31f74e140b5eee24e
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 68abf93c64f209b97133d9db327c3ef83d91b093 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:54 +0100
Subject: [PATCH 192/419] libkgapi: update to 20.12.1

[ci skip]
---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 9f391c918f7..7abbc520739 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da3f183df9ae5efde8244a0558203a27d0905e94b6af8721e570ad9820c31009
+checksum=0df9a24e68d50f67e171ff5c6404891956c7fe675351bda8f8ab2a84ffa2a833
 
 do_check() {
 	:

From 8281f9f898394547918c762e6da3f9a7b82e415c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:58 +0100
Subject: [PATCH 193/419] libkleo: update to 20.12.1

[ci skip]
---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ef8a9fc5b76..1ec0abf1140 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=9da666931763520582047cf472dac436b6efac076f0245befc0f884658c6f91e
+checksum=8a64e16316ab0365e2db1ef60ae4c4efdd81392f658069bdbe143209de350837
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c0966108e6569b63dcc168f05f710453ec563b01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:02 +0100
Subject: [PATCH 194/419] libksieve: update to 20.12.1

[ci skip]
---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index ffecc38c187..d6804955122 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=45698fe9b04b1c400094aef80920acbbf9a811e64db5a3ea3d821cc7c1578da7
+checksum=bfdd5e2602ebfb568978be45fe75fa77d4738bcca1dca96ff1cda1419b66ef1f
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 7b53d050314a4c2ed8e9f38aff99deadccd143aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:06 +0100
Subject: [PATCH 195/419] mailcommon: update to 20.12.1

[ci skip]
---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 8fc185dcf79..9c9aab610e2 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=d5601ae3b93f37216c726b8b0173b7af2023a29e9116c3c3fcf574cd944b76ce
+checksum=680c0592555a80211dcda96edb4ffde94f392bc6e7437c8490545a1206352da4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 43ebf8d9942c99b283e8c2a7701228288adb48b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:09 +0100
Subject: [PATCH 196/419] mailimporter: update to 20.12.1

[ci skip]
---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index dcb07a80fc3..164072202d5 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=7b7b184ce4d9e59686f9d87c6e86869bae3dfec6e44d9af3370febc3bc206b73
+checksum=ac4b84cc505da734cdb8ed8cfc208029c44c08d57e5bdefb27ec46caef640d4b
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 40043f6ead622f9a0bb2eaaf733e670fac521053 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:32 +0100
Subject: [PATCH 197/419] messagelib: update to 20.12.1

[ci skip]
---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index ec1b714fabe..2780ded22c4 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=b0a126d2544b3cdfb025caca6374dad2708e9112fe4118f8a94684a9c15fc3f1
+checksum=c77b7f87fceea1c0eda3ce540e6ffc4ed7155c8984cbbed189deeb09903e507a
 
 #TODO: fix build without qca-qt5
 

From 7fbff4688d9f66a876860a9d8d305a5b65ab9e8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:35 +0100
Subject: [PATCH 198/419] pimcommon: update to 20.12.1

[ci skip]
---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 65c9c10b07f..27634640049 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=54c6e51730bc10c67bade70a67f2500aa4fe4d2db32572bff3fecc4f7ab85c5c
+checksum=a7644e6a49b5fc29ff729ff688b841031b6d5d0f90e61e06eddb62ad77ddaaf0
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c45325ac9354e730701b80792b270f0a2fb5220a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:38 +0100
Subject: [PATCH 199/419] kpimtextedit: update to 20.12.1

[ci skip]
---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index bfc8742a8fe..809a0470476 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=64fb748137768b0450c202dfccaf085eb5711b5394283b73c39bc4a2c0a269e6
+checksum=64a532c9cefbc9127c51c92c4820b4f1d9240c1e588652c3ee1620ae3536a296
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From d18fa29151aa2c0cf5281611c9d74cc4e69fc3b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:47 +0100
Subject: [PATCH 200/419] kidentitymanagement: update to 20.12.1

[ci skip]
---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index c34b5d7bc67..9b863b07af7 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=1063a222119a7ac5197f3adb7367eb7a5ce562da7303b899c6f964d59f103d91
+checksum=c9d3a6aa4bef1b3864e7c5dd8def3f323c086321d9cedd142c131fcf574714b9
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From 5dbbae0cdbd2b0c337491dd2ec838a44e897152b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:52 +0100
Subject: [PATCH 201/419] akonadi5: update to 20.12.1

[ci skip]
---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 0cbcdc88a19..a0c971b0301 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=20.12.0
+version=20.12.1
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=37318b79992264e996d8afa14fa332e984a60e3a31de36f6da03ca395c2e6813
+checksum=b3f48ffe85fd5010138a7af3ec857b64f474dbaa9a2e54ec2ed811c48a19e384
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel qt5-devel kconfig kcoreaddons"

From 4230cfc813af0151f149e96b8e9f2706aee4e61d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:55 +0100
Subject: [PATCH 202/419] pim-data-exporter: update to 20.12.1

[ci skip]
---
 srcpkgs/pim-data-exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index 5e538b756cd..3274ea3bc5e 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b4af9554e1f425798340f9d6e8fb70e31305faaf4f071e8a7195b993bbeb5f48
+checksum=4c06f5c36614fd1ff25f86883c41a89fcd2ce59a90048c7ab1a0ff49e980344d

From 610c6eab73fc3d7fb10af94114e794aed16082d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:08:35 +0100
Subject: [PATCH 203/419] knights: update to 20.12.1.

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

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 75e92953fbb..69dc6efcad3 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=0b3787ca018f221eb6182953ea4f2c2c573e4231e4dfae2582405574bdde576a
+checksum=4b2e0204584c1594ad5cba4ea6ea6003373300909854b44ec7232fa8e9e21e25

From ddffd1a1af8a37153196056f5a323c91158e7a34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:08:38 +0100
Subject: [PATCH 204/419] kqtquickcharts: update to 20.12.1.

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

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index fcb939111ff..d2a07097708 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6034c27b6f75c7fba7c4bf468661022d8f7f38cf2728af82095b2de41eab2cb1
+checksum=ec524f2ea26b2773e111bfcb719ee977ff08506fde6059f52a6f4c6089dc4500
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ec84c8a3c1eb0c8fa189104678e8f6ecc22c24b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:09:44 +0100
Subject: [PATCH 205/419] yadm: update to 3.0.2.

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

diff --git a/srcpkgs/yadm/template b/srcpkgs/yadm/template
index 6e6a77ed547..d33617c085e 100644
--- a/srcpkgs/yadm/template
+++ b/srcpkgs/yadm/template
@@ -1,6 +1,6 @@
 # Template file for 'yadm'
 pkgname=yadm
-version=3.0.0
+version=3.0.2
 revision=1
 depends="bash git gnupg"
 short_desc="Yet Another Dotfiles Manager"
@@ -8,7 +8,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://yadm.io/"
 distfiles="https://github.com/TheLocehiliosan/${pkgname}/archive/${version}.tar.gz"
-checksum=af968c815817e9de85b60dc9c9a7e6159ed34e4f91ea78cadbcd6c73a0301c06
+checksum=724a8b61b09b70f5952cf14fd1786617bf88243a276b2d93dd7306feab13983c
 
 do_install() {
 	vbin ${pkgname}

From 587d443f2200ec5a16921cdf121a63ea74663d18 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 7 Jan 2021 16:37:53 +0100
Subject: [PATCH 206/419] google-chrome: update to 87.0.4280.141

---
 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 092162dbf4e..c42eaa649c9 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=87.0.4280.88
+_chromeVersion=87.0.4280.141
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=4bc68502dc5e22d5c264b3fb5d0a1ecfdadc3ba21d945646d8d37de4b8a96e58
+checksum=b7edb7cd5c166bf3c0a1d245baa5924e242c3b81b97090468bec778f41f40373
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 5a52b06011b93478fd6c04fffd2c0c9fbdb3c654 Mon Sep 17 00:00:00 2001
From: SolitudeSF <solitudesf@protonmail.com>
Date: Mon, 11 Jan 2021 10:20:26 +0200
Subject: [PATCH 207/419] vkQuake: update to 1.05.2

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

diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 2ed54d584e4..58fecc6649d 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
 # Template file for 'vkQuake'
 pkgname=vkQuake
-version=1.05.1
+version=1.05.2
 revision=1
 build_wrksrc="Quake"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Novum/vkQuake"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=4ced5d2756a04f2873fc3f1616b1b08c70baf6286496d08d0ce107985b56829a
+checksum=c2b01171fe241f394dae2044bd0990dfe5d487faee9956e016e277e759914e4c
 
 do_install() {
 	vbin vkquake

From 9f98fbf288fcf46729b723781d7d9faf4cf95e7e Mon Sep 17 00:00:00 2001
From: John Rowley <hey@johnrowley.me>
Date: Fri, 8 Jan 2021 16:54:36 +0100
Subject: [PATCH 208/419] openresolv: update to 3.12.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also fix homepage.

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
Closes: #27764 [via git-merge-pr]
---
 srcpkgs/openresolv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index 15e7863cb6e..809771e6673 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -1,6 +1,6 @@
 # Template file for 'openresolv'
 pkgname=openresolv
-version=3.10.0
+version=3.12.0
 revision=2
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin"
@@ -8,9 +8,9 @@ hostmakedepends="runit"
 short_desc="Management framework for resolv.conf"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"
-homepage="http://roy.marples.name/projects/openresolv/home"
-distfiles="http://roy.aydogan.net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=4078bc52dee022f4a1c7594045e724af9da5ef16d670e0c08444d1830033ba06
+homepage="https://roy.marples.name/projects/openresolv"
+distfiles="https://roy.marples.name/downloads/openresolv/${pkgname}-${version}.tar.xz"
+checksum=42b30508e857a228535c631eaac936862d86eca68c14b5c0bf387ba176b91b97
 conf_files="/etc/resolvconf.conf"
 
 post_install() {

From 0f1ed2b3923314f416ed7cd073f342f1f42abbfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 11 Jan 2021 10:28:17 -0300
Subject: [PATCH 209/419] openresolv: reset revision.

Forgot to do so in 9f98fbf288fcf46729b723781d7d9faf4cf95e7e. Builders
were busy so the updated package hasn't been built yet.
---
 srcpkgs/openresolv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index 809771e6673..3ed997c5fc5 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -1,7 +1,7 @@
 # Template file for 'openresolv'
 pkgname=openresolv
 version=3.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin"
 hostmakedepends="runit"

From 7570990f7d9c099bc0f01df1d97352dc4899712e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Jan 2021 15:22:58 +0100
Subject: [PATCH 210/419] jdupes: update to 1.19.1.

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

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 0cba17ea701..c17c9215484 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.19.0
+version=1.19.1
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
-checksum=98676d3455c89882c3f7f4934602f9e7aca2b054caf3f0deaf286552ce9b276b
+checksum=bb7c53cd463ab5e21da85948c4662a3b7ac9b038ae993cc14ccf793d2472e2e9
 
 post_install() {
 	vlicense LICENSE

From bd7f3839440d407b7b7f88b4aef4484bae5a325e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Jan 2021 15:25:57 -0500
Subject: [PATCH 211/419] retroarch: add support for Neon SIMD on armv7l

---
 srcpkgs/retroarch/template | 41 ++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index ac9283bbb63..c3ab2846259 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.0
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -80,17 +80,32 @@ if [ "$build_option_x11" ]; then
 	fi
 fi
 
-do_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
-	fi
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		configure_args+=" --enable-sse --enable-threads"
+		;;
+	ppc*)
+		configure_args+=" --enable-threads"
+		;;
+	aarch64*)
+		configure_args+=" --enable-threads"
+		;;
+	armv7*)
+		build_options+=" neon"
+		build_options_default+=" neon"
+		desc_option_neon="Enable support for ARM Neon SIMD extension"
+
+		configure_args+=" --enable-threads $(vopt_enable neon)"
 
-	case "$XBPS_TARGET_MACHINE" in
-		i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
-		ppc*) configure_args+=" --enable-threads";;
-		aarch64*) configure_args+=" --disable-neon --enable-threads";;
-		armv7*) configure_args+=" --disable-neon --enable-threads";;
-		arm*) configure_args+=" --disable-neon";;
+		if [ "$build_option_neon" ]; then
+			CFLAGS+=" -mfpu=neon"
+		fi
+		;;
+	arm*)
+		configure_args+=" --disable-neon"
+		;;
 	esac
-	./configure ${configure_args}
-}
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
+fi

From 4459c805d896aef1beaa068541002fb63453ecac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:20:13 +0100
Subject: [PATCH 212/419] python3-pylast: update to 4.1.0

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

diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index 21f5cc6c6e7..2f37811d5ab 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -1,10 +1,9 @@
 # Template file for 'python3-pylast'
 pkgname=python3-pylast
-version=4.0.0
+version=4.1.0
 revision=1
 wrksrc="pylast-${version}"
 build_style=python3-module
-pycompile_module="pylast"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Python3 interface to last.fm and libre.fm"
@@ -12,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="Apache-2.0"
 homepage="https://github.com/pylast/pylast"
 distfiles="${PYPI_SITE}/p/pylast/pylast-${version}.tar.gz"
-checksum=8ec555d6c4c1b474e9b3c96c3786abd38303a1a5716d928b0f3cfdcb4499b093
+checksum=ad084aec1bf7e307bc42d7cc1a003851f5bee1ad24fb697a9fdc300bbfe63932

From dbce600c276fe88b2639f75b0745c1f2418ff5b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:21:08 +0100
Subject: [PATCH 213/419] lollypop: update to 1.4.9

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

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 11c5105ecda..6cb8881ddd5 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.7
+version=1.4.9
 revision=1
 build_style=meson
 hostmakedepends="cmake git glib-devel gobject-introspection intltool itstool pkg-config"
@@ -13,4 +13,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
-checksum=748ffae06ceea356ae7fb4948e470f1c9fb4c2d8bdf395327ef9c247617d6b3d
+checksum=9423a6e474480b0a27153cdcf7f994c7f7ce4dbeb5a05809b1f40e3e9776f4ba

From a001f793f5ef2fa301b9ffaa236a158d7b3d2a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:27:41 +0100
Subject: [PATCH 214/419] parole: update to 4.16.0

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

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 4df335ffc4d..c902128411c 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
 # Template file for 'parole'
 pkgname=parole
-version=4.15.0
-revision=2
+version=4.16.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -13,4 +13,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/parole/start"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=014431dc565dab4bf4760ec7c2ea7e787523f112aabc99888027213ebecc1f10
+checksum=0d305ad8ccd3974d6b632f74325b1b8a39304c905c6b405b70f52c4cfd55a7e7

From e9adc0b9a802b6e626bcab4dd030b3773a5ab21c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:49:06 +0100
Subject: [PATCH 215/419] libtorrent-rasterbar: update to 1.2.12

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

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index e7e0daed934..831e507c127 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,7 +1,7 @@
 # Template file for 'libtorrent-rasterbar'
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
-version=1.2.11
+version=1.2.12
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
@@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
 distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=cb6a9cc3c9a9e485174394baa82744cef8415d23a357f5721dcc9ee7622c4efb
+checksum=c3744ac9fa41f6e6ebf79538a2ea678df76a2cbbaf3ac6ae2c05455314e5cce8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dbuild_tests=ON"

From 3522db182caf15549e8fb6804417aea913044aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:51:39 +0100
Subject: [PATCH 216/419] tali: update to 3.38.3

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

diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index d3b18e563a3..8de48032c97 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -1,6 +1,6 @@
 # Template file for 'tali'
 pkgname=tali
-version=3.38.2
+version=3.38.3
 revision=1
 build_style=meson
 hostmakedepends="cmake pkg-config gettext glib-devel appstream-glib
@@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tali"
 distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz"
-checksum=4fb9f7ee8cc0eb89010408c42cb0b1f83e839ac8e9b644ec3ddf564508431691
+checksum=0215428b50c4a0827fb0de2e4e6ba6e56678f9ba76d8d25b7eeca85215f25a39

From f4c048f89ed2ecba89ef61025d2fa75691bea2cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:55:57 +0100
Subject: [PATCH 217/419] qxmpp: update to 1.3.2

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

diff --git a/srcpkgs/qxmpp/template b/srcpkgs/qxmpp/template
index 5af354f19e9..d640ab5a3f5 100644
--- a/srcpkgs/qxmpp/template
+++ b/srcpkgs/qxmpp/template
@@ -1,6 +1,6 @@
 # Template file for 'qxmpp'
 pkgname=qxmpp
-version=1.3.1
+version=1.3.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=false"
@@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1"
 homepage="https://github.com/qxmpp-project/qxmpp/"
 distfiles="https://github.com/qxmpp-project/qxmpp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=812e718a2dd762ec501a9012a1281b9b6c6d46ec38adbc6eec242309144e1c55
+checksum=016e23c40c604dd43b15e1888e31d48729d0f80775fb6f7faef1130a52fe0641
 
 build_options="opus speex theora vpx"
 build_options_default="opus speex theora vpx"

From 872aea7001b61a6b092e1e52719fc7578cb427b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 16:51:58 +0100
Subject: [PATCH 218/419] mouseemu: fix build w/ musl-1.2.1 (time64)

---
 srcpkgs/mouseemu/patches/014-time64.patch | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 srcpkgs/mouseemu/patches/014-time64.patch

diff --git a/srcpkgs/mouseemu/patches/014-time64.patch b/srcpkgs/mouseemu/patches/014-time64.patch
new file mode 100644
index 00000000000..580264708f0
--- /dev/null
+++ b/srcpkgs/mouseemu/patches/014-time64.patch
@@ -0,0 +1,39 @@
+--- a/mouseemu.c	2021-01-11 16:44:11.242213686 +0100
++++ b/mouseemu.c	2021-01-11 16:45:42.351171654 +0100
+@@ -80,6 +80,7 @@
+ static void send_event(int fd, int type, int code, int value)
+ {
+ 	struct input_event event;
++	struct timeval tv;
+ 
+ 	if (fd < 0)
+ 		return;
+@@ -87,7 +88,9 @@
+ 	event.type = type;
+ 	event.code = code;
+ 	event.value = value;
+-	gettimeofday(&event.time, NULL);
++	gettimeofday(&tv, NULL);
++	event.input_event_sec = tv.tv_sec;
++	event.input_event_usec = tv.tv_usec;
+ 	if (write(fd, &event, sizeof(event)) < sizeof(event))
+ 		perror("send_event");
+ 		
+@@ -197,7 +200,7 @@
+ 		return;
+ 
+ 	if (!event_parse(inp.code, inp.value) && !is_modifier(inp)) {
+-		last_key = (inp.time.tv_sec*1000000 + inp.time.tv_usec);
++		last_key = (inp.input_event_sec*1000000 + inp.input_event_usec);
+ 	}
+ 	/* I think its best not to pass scroll, or experiment with not passing the release if
+ 	 * we actually used it for scrolling (but some apps may get stuck?)
+@@ -228,7 +231,7 @@
+ 		report_scroll (inp.value);
+ 		//printf("inp.value %d\n", inp.value);
+ 	} else {
+-		if ((inp.time.tv_sec*1000000+inp.time.tv_usec)-last_key > typing_block_delay*1000 
++		if ((inp.input_event_sec*1000000+inp.input_event_usec)-last_key > typing_block_delay*1000 
+ 		|| inp.type == EV_REL)
+ 			passthrough(ui_mouse_fd, inp);
+ 	}

From e3e1c8e22331b487d0a7c35397949d364f2f1a1b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Jan 2021 15:51:13 +0100
Subject: [PATCH 219/419] byacc: update to 20210109.

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

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 0970282ac97..327151602dd 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20200910
+version=20210109
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=0a5906073aeaf23ddc20aaac0ea61cb5ccc18572870b113375dec4ffe85ecf30
+checksum=9e7d7768587141e7784492615dfefc70a8e00410043b63901efedc1b50c19b97
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From f2f5aecf0ae692f7d6931ef92fa7a12ff5272cfd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Jan 2021 15:53:49 +0100
Subject: [PATCH 220/419] ocaml-zarith: update to 1.11.

---
 srcpkgs/ocaml-zarith/template | 6 +++---
 srcpkgs/ocaml-zarith/update   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ocaml-zarith/update

diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index 65f9d4c0b9e..190d274fe58 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-zarith'
 pkgname=ocaml-zarith
-version=1.9.1
-revision=3
+version=1.11
+revision=1
 wrksrc="Zarith-release-${version}"
 build_style=configure
 make_check_target="tests"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.0-only,OCaml-LGPL-linking-exception"
 homepage="https://github.com/ocaml/zarith"
 distfiles="https://github.com/ocaml/zarith/archive/release-${version}.tar.gz"
-checksum=49be0214f34ae05e7a83b53351f134ba73eddaf87d1abb6f61b19943c211ca5d
+checksum=f996af120a10fd06a8272ae99b7affd57cef49c57a3a596e2f589147dd183684
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ocaml-zarith/update b/srcpkgs/ocaml-zarith/update
new file mode 100644
index 00000000000..d3094846993
--- /dev/null
+++ b/srcpkgs/ocaml-zarith/update
@@ -0,0 +1 @@
+pkgname=release

From fb0f69db1c93a87d3dcdd705a698c2fda0818cb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Jan 2021 16:13:53 +0100
Subject: [PATCH 221/419] coq: update to 8.13.0.

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

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index d71c89bae92..cf49b27d018 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,14 +1,14 @@
 # Template file for 'coq'
 pkgname=coq
-version=8.12.2
+version=8.13.0
 revision=1
-hostmakedepends="ocaml ocaml-findlib ocaml-num camlp5"
+hostmakedepends="camlp5 ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only"
 homepage="https://coq.inria.fr"
 distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz"
-checksum=2c57416e3ec737b212610512eae7e40259fb17a4e487b49981556f28838e8b17
+checksum=06445dbd6cb3c8a2e4e957dbd12e094d609a62fcb0c8c3cad0cd1fdedda25c9b
 nopie=yes
 nocross=yes
 

From 6b7532d50a5bd384536af74fa4500f7a0ba008fc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Jan 2021 16:20:36 +0100
Subject: [PATCH 222/419] mathcomp: rebuild for coq-8.13.0.

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

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 84fab1b3e74..0e284e748b6 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.12.0
-revision=1
+revision=2
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From 7404b56504bbcad5ac413bdd5d5c3ade4a956c10 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Jan 2021 16:21:55 +0100
Subject: [PATCH 223/419] linux5.10: update to 5.10.6.

---
 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 036afe14b15..f987b44e16a 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.5
+version=5.10.6
 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=3991a9e16a187d78d5f414d89236ae5d7f404a69e60c4c42a9d262ee19612ef4
+checksum=7767d02c1cb5eb2a8d3c2b15a3f93e85b98baa6e9d93a3b9e3ec0e959d0a690b
 python_version=3
 patch_args="-Np1"
 

From 02afaac073dbe607f593b5d6f75b57d49707fa1e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Jan 2021 15:24:20 +0100
Subject: [PATCH 224/419] ugrep: update to 3.1.2.

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

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index af41ad214b8..7931ca3c836 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.1
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
@@ -10,4 +10,4 @@ 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=9afe1b9edc83478404fbcb47b1489c13ceb1101ae372d34b623c3521e5df0a44
+checksum=81de520a6db437455e8ae9ee4abbdc9dc875328a359b8620ef296bb8d8364310

From 8a15ba8f35650a9e27e0d9afb18feca47d39f5ba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Jan 2021 15:25:31 +0100
Subject: [PATCH 225/419] perltidy: update to 20210111.

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

diff --git a/srcpkgs/perltidy/template b/srcpkgs/perltidy/template
index 6e7e903d0e1..0b7008fab4a 100644
--- a/srcpkgs/perltidy/template
+++ b/srcpkgs/perltidy/template
@@ -1,6 +1,6 @@
 # Template file for 'perltidy'
 pkgname=perltidy
-version=20201207
+version=20210111
 revision=1
 wrksrc="Perl-Tidy-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://metacpan.org/release/Perl-Tidy"
 distfiles="${CPAN_SITE}/Perl/Perl-Tidy-${version}.tar.gz"
-checksum=2e4504e493a623674fff9d5e5c0865467f198cf20444d5503dd9ddcd95003d11
+checksum=207666ceaf5d4eaf7a608c8f4a77f212cae811bb88ce159c33e2d8a0b5da189f

From df9278b868a19d61d7db9bbc362b677ee567408e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Jan 2021 18:53:37 +0100
Subject: [PATCH 226/419] ocaml-zarith: needs gmp-devel for linking.

---
 srcpkgs/ocaml-zarith/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index 190d274fe58..642476093c2 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,12 +1,13 @@
 # Template file for 'ocaml-zarith'
 pkgname=ocaml-zarith
 version=1.11
-revision=1
+revision=2
 wrksrc="Zarith-release-${version}"
 build_style=configure
 make_check_target="tests"
 hostmakedepends="perl"
 makedepends="gmp-devel ocaml ocaml-findlib"
+depends="gmp-devel"
 short_desc="OCaml operations over arbitrary-precision integers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.0-only,OCaml-LGPL-linking-exception"

From 144aefc6de4ee62e1e1bf3ee2da644da7d33b474 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 10 Jan 2021 10:10:46 -0600
Subject: [PATCH 227/419] nvidia390: update to 390.141.

---
 common/shlibs                                 |   2 +-
 srcpkgs/nvidia390/files/linux-5.8.x.patch     |  29 --
 .../nvidia390/files/linux-5.9.x-x86_64.patch  |  58 ---
 srcpkgs/nvidia390/files/linux-5.9.x.patch     | 427 ------------------
 srcpkgs/nvidia390/template                    |  13 +-
 5 files changed, 5 insertions(+), 524 deletions(-)
 delete mode 100644 srcpkgs/nvidia390/files/linux-5.8.x.patch
 delete mode 100644 srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch
 delete mode 100644 srcpkgs/nvidia390/files/linux-5.9.x.patch

diff --git a/common/shlibs b/common/shlibs
index 24c31d8621d..af01a679c70 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -138,7 +138,7 @@ libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore
 libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
-libnvidia-fatbinaryloader.so.390.138 nvidia390-libs-390.138_1 ignore
+libnvidia-fatbinaryloader.so.390.141 nvidia390-libs-390.141_1 ignore
 libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore
 libglapi.so.0 libglapi-7.11_1
 libgbm.so.1 libgbm-9.0_1
diff --git a/srcpkgs/nvidia390/files/linux-5.8.x.patch b/srcpkgs/nvidia390/files/linux-5.8.x.patch
deleted file mode 100644
index 792cdb3afef..00000000000
--- a/srcpkgs/nvidia390/files/linux-5.8.x.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- NVIDIA-Linux-x86_64-390.138-no-compat32/kernel/common/inc/nv-linux.h	2020-05-14 14:29:21.000000000 +0200
-+++ NVIDIA-Linux-x86_64-390.138-no-compat32/kernel/common/inc/nv-linux.h	2020-09-10 21:56:45.927763032 +0200
-@@ -531,7 +531,11 @@
- 
- static inline void *nv_vmalloc(unsigned long size)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-     void *ptr = __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);
-+#else
-+    void *ptr = __vmalloc(size, GFP_KERNEL);
-+#endif
-     if (ptr)
-         NV_MEMDBG_ADD(ptr, size);
-     return ptr;
---- NVIDIA-Linux-x86_64-390.138-no-compat32/kernel/common/inc/nv-mm.h	2020-05-14 14:29:21.000000000 +0200
-+++ NVIDIA-Linux-x86_64-390.138-no-compat32/kernel/common/inc/nv-mm.h	2020-09-10 22:25:40.666693863 +0200
-@@ -29,6 +29,12 @@
- typedef int vm_fault_t;
- #endif
-
-+#include <linux/version.h> 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+/* kernel 5.8.0-rc1 renamed mmap_sem to mmap_lock */
-+#define mmap_sem mmap_lock
-+#endif
-+
- /* get_user_pages
-  *
-  * The 8-argument version of get_user_pages was deprecated by commit 
diff --git a/srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch b/srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch
deleted file mode 100644
index bc55a467f9a..00000000000
--- a/srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Source: Mageia, http://sophie.zarb.org/rpms/eaff282f82f9fc9911151ebd234f25cc/files/7
-diff --git a/kernel/nvidia-uvm/nvidia-uvm.Kbuild b/kernel/nvidia-uvm/nvidia-uvm.Kbuild
-index 650c922..0c83fae 100644
---- a/kernel/nvidia-uvm/nvidia-uvm.Kbuild
-+++ b/kernel/nvidia-uvm/nvidia-uvm.Kbuild
-@@ -108,10 +108,11 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += bitmap_clear
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += usleep_range
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += radix_tree_empty
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += radix_tree_replace_slot
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += do_gettimeofday
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += ktime_get_raw_ts64
-+NV_CONFTEST_FUNCTION_COMPILE_TESTS += smp_read_barrier_depends
- 
- NV_CONFTEST_TYPE_COMPILE_TESTS += proc_dir_entry
- NV_CONFTEST_TYPE_COMPILE_TESTS += irq_handler_t
- NV_CONFTEST_TYPE_COMPILE_TESTS += outer_flush_all
- NV_CONFTEST_TYPE_COMPILE_TESTS += vm_operations_struct
-diff --git a/kernel/nvidia-uvm/uvm8_tools.c b/kernel/nvidia-uvm/uvm8_tools.c
-index 86dbb77..be865bc 100644
---- a/kernel/nvidia-uvm/uvm8_tools.c
-+++ b/kernel/nvidia-uvm/uvm8_tools.c
-@@ -188,11 +188,15 @@ static NV_STATUS tools_update_status(uvm_va_space_t *va_space);
- 
- static uvm_tools_event_tracker_t *tools_event_tracker(struct file *filp)
- {
-     long event_tracker = atomic_long_read((atomic_long_t *)&filp->private_data);
- 
-+#if defined(NV_SMP_READ_BARRIER_DEPENDS_PRESENT)
-     smp_read_barrier_depends();
-+#else
-+    smp_rmb();
-+#endif
-     return (uvm_tools_event_tracker_t *)event_tracker;
- }
- 
- static bool tracker_is_queue(uvm_tools_event_tracker_t *event_tracker)
- {
-diff --git a/kernel/nvidia-uvm/uvm8_va_range.h b/kernel/nvidia-uvm/uvm8_va_range.h
-index 8cae357..a74ad24 100644
---- a/kernel/nvidia-uvm/uvm8_va_range.h
-+++ b/kernel/nvidia-uvm/uvm8_va_range.h
-@@ -715,11 +715,15 @@ static uvm_va_block_t *uvm_va_range_block(uvm_va_range_t *va_range, size_t index
-     // Later accesses in this thread will read state out of block, potentially
-     // as soon as the block pointer is updated by another thread. We have to
-     // make sure that any initialization of this block by the creating thread is
-     // visible to later accesses in this thread, which requires a data
-     // dependency barrier.
-+#if defined(NV_SMP_READ_BARRIER_DEPENDS_PRESENT)
-     smp_read_barrier_depends();
-+#else
-+    smp_mb();
-+#endif
-     return block;
- }
- 
- // Same as uvm_va_range_block except that the block is created if not already
- // present in the array. If NV_OK is returned, the block has been allocated
-
diff --git a/srcpkgs/nvidia390/files/linux-5.9.x.patch b/srcpkgs/nvidia390/files/linux-5.9.x.patch
deleted file mode 100644
index 763ee4e5c08..00000000000
--- a/srcpkgs/nvidia390/files/linux-5.9.x.patch
+++ /dev/null
@@ -1,427 +0,0 @@
-Source: Mageia, http://sophie.zarb.org/rpms/eaff282f82f9fc9911151ebd234f25cc/files/8
-diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
-index 37c6841..23efe9e 100644
---- a/kernel/common/inc/nv-linux.h
-+++ b/kernel/common/inc/nv-linux.h
-@@ -159,12 +159,14 @@ static inline uid_t __kuid_val(kuid_t uid)
- }
- #endif
- 
- #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
- #include <linux/syscalls.h>         /* sys_ioctl()                      */
-+#if defined(NV_LINUX_IOCTL32_H_PRESENT)
- #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
- #endif
-+#endif
- 
- #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
-   !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
- #error "struct file_operations compile test likely failed!"
- #endif
-diff --git a/kernel/common/inc/nv-mm.h b/kernel/common/inc/nv-mm.h
-index 8df26f1..e791bb2 100644
---- a/kernel/common/inc/nv-mm.h
-+++ b/kernel/common/inc/nv-mm.h
-@@ -146,10 +146,15 @@ typedef int vm_fault_t;
-         #if defined(NV_GET_USER_PAGES_REMOTE_HAS_LOCKED_ARG)
- 
-                return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
-                                             pages, vmas, NULL);
- 
-+        #elif defined(NV_GET_USER_PAGES_REMOTE_REMOVED_TSK_ARG)
-+
-+               return get_user_pages_remote(mm, start, nr_pages, flags,
-+                                            pages, vmas, NULL);
-+
-         #else
- 
-                return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
-                                             pages, vmas);
- 
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index cdb249c..54da233 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -132,10 +132,11 @@ test_headers() {
-     FILES="$FILES linux/sched/task_stack.h"
-     FILES="$FILES xen/ioemu.h"
-     FILES="$FILES linux/fence.h"
-     FILES="$FILES linux/ktime.h"
-     FILES="$FILES linux/dma-resv.h"
-+    FILES="$FILES linux/ioctl32.h"
- 
-     # Arch specific headers which need testing
-     FILES_ARCH="asm/book3s/64/hash-64k.h"
-     FILES_ARCH="$FILES_ARCH asm/set_memory.h"
-     FILES_ARCH="$FILES_ARCH asm/powernv.h"
-@@ -2449,10 +2450,69 @@ compile_test() {
-             }"
- 
-             compile_check_conftest "$CODE" "NV_DRM_DRIVER_HAS_LEGACY_DEV_LIST" "" "types"
-         ;;
- 
-+        drm_driver_has_gem_free_object)
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            #if defined(NV_DRM_DRM_DRV_H_PRESENT)
-+            #include <drm/drm_drv.h>
-+            #endif
-+
-+            int conftest_drm_driver_has_gem_free_object(void) {
-+                return offsetof(struct drm_driver, gem_free_object);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_DRIVER_HAS_GEM_FREE_OBJECT" "" "types"
-+        ;;
-+
-+        drm_display_mode_has_vrefresh)
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            #if defined(NV_DRM_DRM_DRV_H_PRESENT)
-+            #include <drm/drm_drv.h>
-+            #endif
-+
-+            int conftest_drm_display_mode_has_vrefresh(void) {
-+                return offsetof(struct drm_display_mode, vrefresh);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_DISPLAY_MODE_HAS_VREFRESH" "" "types"
-+        ;;
-+
-+        drm_master_set_returns_int)
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            #if defined(NV_DRM_DRM_DRV_H_PRESENT)
-+            #include <drm/drm_drv.h>
-+            #endif
-+
-+            static int nv_master_set(struct drm_device *x, struct drm_file *y, bool z)
-+            {
-+                return 1;
-+            }
-+
-+            int conftest_drm_master_set_returns_int(void) {
-+                struct drm_driver nv_drm_driver;
-+                nv_drm_driver.master_set = nv_master_set;
-+
-+                return nv_drm_driver.master_set(NULL, NULL, false);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_MASTER_SET_RETURNS_INT" "" "generic"
-+        ;;
-+
-         jiffies_to_timespec)
-             #
-             # Determine if jiffies_to_timespec() is present
-             #
-             # removed by commit 751addac78b6
-@@ -3138,10 +3198,33 @@ compile_test() {
-             else
-                 echo "#undef NV_GET_USER_PAGES_REMOTE_HAS_LOCKED_ARG" | append_conftest "functions"
-             fi
-             echo "#undef NV_GET_USER_PAGES_REMOTE_HAS_WRITE_AND_FORCE_ARGS" | append_conftest "functions"
- 
-+            # conftest #4: check if get_user_pages_remote() has removed tsk argument
-+
-+            echo "$CONFTEST_PREAMBLE
-+            #include <linux/mm.h>
-+            long get_user_pages_remote(struct mm_struct *mm,
-+                                       unsigned long start,
-+                                       unsigned long nr_pages,
-+                                       unsigned int gup_flags,
-+                                       struct page **pages,
-+                                       struct vm_area_struct **vmas,
-+                                       int *locked) {
-+                return 0;
-+            }" > conftest$$.c
-+
-+            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+            rm -f conftest$$.c
-+
-+            if [ -f conftest$$.o ]; then
-+                echo "#define NV_GET_USER_PAGES_REMOTE_REMOVED_TSK_ARG" | append_conftest "functions"
-+                rm -f conftest$$.o
-+            else
-+                echo "#undef NV_GET_USER_PAGES_REMOTE_REMOVED_TSK_ARG" | append_conftest "functions"
-+            fi
-         ;;
- 
-         usleep_range)
-             #
-             # Determine if the function usleep_range() is present.
-@@ -3227,10 +3310,25 @@ compile_test() {
-                 echo "#undef NV_DRM_GEM_OBJECT_LOOKUP_PRESENT" | append_conftest "functions"
-                 echo "#undef NV_DRM_GEM_OBJECT_LOOKUP_ARGUMENT_COUNT" | append_conftest "functions"
-             fi
-         ;;
- 
-+        drm_gem_object_put_unlocked)
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+            #if defined(NV_DRM_DRM_GEM_H_PRESENT)
-+            #include <drm/drm_gem.h>
-+            #endif
-+            int conftest_drm_gem_object_put_unlocked(void) {
-+                drm_gem_object_put_unlocked();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT" "" "functions"
-+        ;;
-+
-         drm_master_drop_has_from_release_arg)
-             #
-             # Determine if drm_driver::master_drop() has 'from_release' argument.
-             #
-             # Last argument 'bool from_release' has been removed by:
-@@ -4129,10 +4227,30 @@ compile_test() {
-             }"
- 
-             compile_check_conftest "$CODE" "NV_PCI_DEV_HAS_SKIP_BUS_PM" "" "types"
-         ;;
- 
-+        smp_read_barrier_depends)
-+            CODE="
-+            #include <asm/barrier.h>
-+            void conftest_smp_read_barrier_depends(void) {
-+                smp_read_barrier_depends(0);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_SMP_READ_BARRIER_DEPENDS_PRESENT" "" "functions"
-+        ;;
-+
-+        vga_tryget)
-+            CODE="
-+            #include <linux/vgaarb.h>
-+            void conftest_vga_tryget(void) {
-+                vga_tryget();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_VGA_TRYGET_PRESENT" "" "functions"
-+        ;;
-+
-     esac
- }
- 
- case "$6" in
-     cc_sanity_check)
-diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
-index 17e377d..95e035b 100644
---- a/kernel/nvidia-drm/nvidia-drm-drv.c
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
-@@ -464,20 +464,29 @@ static void nv_drm_unload(struct drm_device *dev)
- }
- #endif
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
-+#if defined(NV_DRM_MASTER_SET_RETURNS_INT)
- static int nv_drm_master_set(struct drm_device *dev,
-                              struct drm_file *file_priv, bool from_open)
-+#else
-+static void nv_drm_master_set(struct drm_device *dev,
-+                              struct drm_file *file_priv, bool from_open)
-+#endif
- {
-     struct nv_drm_device *nv_dev = to_nv_device(dev);
- 
-+#if defined(NV_DRM_MASTER_SET_RETURNS_INT)
-     if (!nvKms->grabOwnership(nv_dev->pDevice)) {
-         return -EINVAL;
-     }
- 
-     return 0;
-+#else
-+    nvKms->grabOwnership(nv_dev->pDevice);
-+#endif
- }
- 
- #if defined(NV_DRM_MASTER_DROP_HAS_FROM_RELEASE_ARG)
- static
- void nv_drm_master_drop(struct drm_device *dev,
-@@ -675,11 +684,15 @@ static struct drm_driver nv_drm_driver = {
- #if defined(NV_DRM_DRIVER_PRIME_FLAG_PRESENT)
-                                DRIVER_PRIME |
- #endif
-                                DRIVER_GEM  | DRIVER_RENDER,
- 
-+#if defined(NV_DRM_DRIVER_HAS_GEM_FREE_OBJECT)
-     .gem_free_object        = nv_drm_gem_free,
-+#else
-+    .gem_free_object_unlocked = nv_drm_gem_free,
-+#endif
- 
-     .ioctls                 = nv_drm_ioctls,
-     .num_ioctls             = ARRAY_SIZE(nv_drm_ioctls),
- 
-     .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
-diff --git a/kernel/nvidia-drm/nvidia-drm-gem.c b/kernel/nvidia-drm/nvidia-drm-gem.c
-index 37100ed..eb7b959 100644
---- a/kernel/nvidia-drm/nvidia-drm-gem.c
-+++ b/kernel/nvidia-drm/nvidia-drm-gem.c
-@@ -41,11 +41,13 @@
- void nv_drm_gem_free(struct drm_gem_object *gem)
- {
-     struct drm_device *dev = gem->dev;
-     struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem);
- 
-+#if !defined(NV_DRM_DRIVER_HAS_GEM_FREE_OBJECT)
-     WARN_ON(!mutex_is_locked(&dev->struct_mutex));
-+#endif
- 
-     /* Cleanup core gem object */
- 
-     drm_gem_object_release(&nv_gem->base);
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h
-index 5691a7a..7fc6f69 100644
---- a/kernel/nvidia-drm/nvidia-drm-gem.h
-+++ b/kernel/nvidia-drm/nvidia-drm-gem.h
-@@ -85,11 +85,15 @@ static inline struct nv_drm_gem_object *to_nv_gem_object(
- 
- static inline void
- nv_drm_gem_object_unreference_unlocked(struct nv_drm_gem_object *nv_gem)
- {
- #if defined(NV_DRM_GEM_OBJECT_GET_PRESENT)
-+#if defined(NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT)
-     drm_gem_object_put_unlocked(&nv_gem->base);
-+#else
-+    drm_gem_object_put(&nv_gem->base);
-+#endif
- #else
-     drm_gem_object_unreference_unlocked(&nv_gem->base);
- #endif
- }
- 
-@@ -136,11 +140,10 @@ void nv_drm_gem_object_init(struct nv_drm_device *nv_dev,
-     nv_dma_resv_init(&nv_gem->resv);
- 
- #if defined(NV_DRM_GEM_OBJECT_HAS_RESV)
-     nv_gem->base.resv = &nv_gem->resv;
- #endif
--
- #endif
- 
-     drm_gem_private_object_init(dev, &nv_gem->base, size);
- }
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-utils.c b/kernel/nvidia-drm/nvidia-drm-utils.c
-index 8cb2d5e..6460d4d 100644
---- a/kernel/nvidia-drm/nvidia-drm-utils.c
-+++ b/kernel/nvidia-drm/nvidia-drm-utils.c
-@@ -101,11 +101,13 @@ int nvkms_connector_type_to_drm_connector_type(NvKmsConnectorType type,
- 
- void
- nvkms_display_mode_to_drm_mode(const struct NvKmsKapiDisplayMode *displayMode,
-                                struct drm_display_mode *mode)
- {
-+#if defined(NV_DRM_DISPLAY_MODE_HAS_VREFRESH)
-     mode->vrefresh    = (displayMode->timings.refreshRate + 500) / 1000; /* In Hz */
-+#endif
- 
-     mode->clock       = (displayMode->timings.pixelClockHz + 500) / 1000; /* In Hz */
- 
-     mode->hdisplay    = displayMode->timings.hVisible;
-     mode->hsync_start = displayMode->timings.hSyncStart;
-@@ -187,11 +189,13 @@ bool drm_format_to_nvkms_format(u32 format,
- }
- 
- void drm_mode_to_nvkms_display_mode(const struct drm_display_mode *src,
-                                     struct NvKmsKapiDisplayMode *dst)
- {
-+#if defined(NV_DRM_DISPLAY_MODE_HAS_VREFRESH)
-     dst->timings.refreshRate  = src->vrefresh * 1000;
-+#endif
- 
-     dst->timings.pixelClockHz = src->clock * 1000; /* In Hz */
- 
-     dst->timings.hVisible   = src->hdisplay;
-     dst->timings.hSyncStart = src->hsync_start;
-diff --git a/kernel/nvidia-drm/nvidia-drm.Kbuild b/kernel/nvidia-drm/nvidia-drm.Kbuild
-index 4cfbbbc..d9dbab8 100644
---- a/kernel/nvidia-drm/nvidia-drm.Kbuild
-+++ b/kernel/nvidia-drm/nvidia-drm.Kbuild
-@@ -47,18 +47,20 @@ $(call ASSIGN_PER_OBJ_CFLAGS, $(NVIDIA_DRM_OBJECTS), $(NVIDIA_DRM_CFLAGS))
- 
- NV_OBJECTS_DEPEND_ON_CONFTEST += $(NVIDIA_DRM_OBJECTS)
- 
- NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_available
- NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_atomic_available
-+NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_master_set_returns_int
- NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_gpl_refcount_inc
- NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_gpl_refcount_dec_and_test
- 
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_dev_unref
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_reinit_primary_mode_group
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += get_user_pages_remote
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += get_user_pages
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_lookup
-+NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_put_unlocked
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_atomic_state_ref_counting
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_driver_has_gem_prime_res_obj
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_atomic_helper_connector_dpms
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_connector_funcs_have_mode_in_name
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += vmf_insert_pfn
-@@ -70,10 +72,12 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_connector_for_each_possible_encoder
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_present
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_has_bus_type
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_has_get_irq
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_has_get_name
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_legacy_dev_list
-+NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_gem_free_object
-+NV_CONFTEST_TYPE_COMPILE_TESTS += drm_display_mode_has_vrefresh
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_set_busid
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_crtc_state_has_connectors_changed
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_init_function_args
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_connector_list_update_has_merge_type_bits_arg
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_helper_mode_fill_fb_struct
-diff --git a/kernel/nvidia-modeset/nvidia-modeset-linux.c b/kernel/nvidia-modeset/nvidia-modeset-linux.c
-index f7f1def..8fb2161 100644
---- a/kernel/nvidia-modeset/nvidia-modeset-linux.c
-+++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c
-@@ -49,12 +49,14 @@
- #endif
- 
- 
- #if NV_NEEDS_COMPAT_IOCTL_REGISTRATION
- #include <linux/syscalls.h> /* sys_ioctl() */
-+#if defined(NV_LINUX_IOCTL32_H_PRESENT)
- #include <linux/ioctl32.h> /* register_ioctl32_conversion() */
- #endif
-+#endif
- 
- #define NVKMS_MAJOR_DEVICE_NUMBER 195
- #define NVKMS_MINOR_DEVICE_NUMBER 254
- 
- #define NVKMS_LOG_PREFIX "nvidia-modeset: "
-diff --git a/kernel/nvidia/nv.c b/kernel/nvidia/nv.c
-index 15983f6..a7be80a 100644
---- a/kernel/nvidia/nv.c
-+++ b/kernel/nvidia/nv.c
-@@ -3870,11 +3870,15 @@ nvidia_probe
- 
-     pci_set_master(dev);
- 
- #if defined(CONFIG_VGA_ARB) && !defined(NVCPU_PPC64LE)
- #if defined(VGA_DEFAULT_DEVICE)
-+#if defined(NV_VGA_TRYGET_PRESENT)
-     vga_tryget(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK);
-+#else
-+    vga_get(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK, 0);
-+#endif
- #endif
-     vga_set_legacy_decoding(dev, VGA_RSRC_NONE);
- #endif
- 
-     if (rm_get_cpu_type(sp, &nv_cpu_type) != NV_OK)
-
diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 21ea5c04747..40301343166 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
-version=390.138
-revision=3
+version=390.141
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -22,11 +22,11 @@ conflicts="xserver-abi-video>24_1"
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
-	checksum=7bf67323a393e857a09f979f155baa1ed13183653add0c344edf4d409f977878
+	checksum=8dfbc8ce77d2f49780105dd7e3058bbf8e663e9b17495507b7544ece34ffaf43
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=a34a19b618be0eb06c4699247489833a8f22c59423f246248614e0a59b1508da
+	checksum=d7d763aa52574b554dd3d8cbb93a6a63572a9c2bfd3bc3873ec5338c067f70ba
 fi
 
 subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs"
@@ -42,11 +42,6 @@ pre_install() {
 	cd ${_pkg}
 	cp nvidia_icd.json.template nvidia_icd.json
 	sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json
-	patch -Np1 < ${FILESDIR}/linux-5.8.x.patch
-	patch -Np1 < ${FILESDIR}/linux-5.9.x.patch
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		patch -Np1 < ${FILESDIR}/linux-5.9.x-x86_64.patch
-	fi
 }
 
 do_install() {

From 9440f687dce54457f8a25ca4ef7a9d0932d93dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 21:38:17 +0100
Subject: [PATCH 228/419] sile: fix cross

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

diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 3d47b117466..8e9f28786b9 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -16,7 +16,7 @@ distfiles="https://github.com/simoncozens/sile/releases/download/v${version}/sil
 checksum=60cdcc4509971973feab352dfc1a86217cc1fdb12d56823f04d863afef92003a
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" lua51 lua51-lpeg luaexpat lua51-zlib luafilesystem
+	hostmakedepends+=" lua51 lua51-devel lua51-lpeg luaexpat lua51-zlib luafilesystem
 	 luasocket lua51-luasec"
 fi
 

From 1984f03caef2801700ec0f178ecc9aae85358269 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 11 Jan 2021 09:59:58 +0100
Subject: [PATCH 229/419] slack-desktop: update to 4.12.1

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

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index a0c55ec0c28..d480ce6b5ca 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.12.0
+version=4.12.1
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=d5249ae7a88e0ed0f10b7536bdf549280158503b766f9c0bd45ff569ae337f93
+checksum=a9e71340a7d37cf9fbfa9206ad000038c0bb74fd3df445506cc740d6f0eb3ce6
 restricted=yes
 repository="nonfree"
 nopie=yes

From 9ff22d856a0a920397f83bc9603c836fabf16f8b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Jan 2021 12:48:48 +0100
Subject: [PATCH 230/419] feh: update to 3.6.2.

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

diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template
index 87fbc3b7071..7ed1d95af54 100644
--- a/srcpkgs/feh/template
+++ b/srcpkgs/feh/template
@@ -1,6 +1,6 @@
 # Template file for 'feh'
 pkgname=feh
-version=3.6.1
+version=3.6.2
 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=9b1edec52cbae97b17530cb5db10666abfb9983f51a5d820c89added6f7b1ea8
+checksum=1649fb79d1a1242938cd64a468fd2666c8b1174421b1050244f39e01d3c7c634
 
 pre_build() {
 	vsed -i 's|doc/feh/examples|examples/feh|' config.mk

From 66fe738af39fc6a6290e0104d3a929240a3274f9 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 11 Jan 2021 11:23:49 +0100
Subject: [PATCH 231/419] pokoy: update to 0.2.5

---
 srcpkgs/pokoy/patches/build.patch | 11 +++++------
 srcpkgs/pokoy/template            |  8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/pokoy/patches/build.patch b/srcpkgs/pokoy/patches/build.patch
index 94aeac57382..436217e37a3 100644
--- a/srcpkgs/pokoy/patches/build.patch
+++ b/srcpkgs/pokoy/patches/build.patch
@@ -1,13 +1,12 @@
-diff --git Makefile Makefile
-index 3e99b03..71b5fa1 100644
---- Makefile
+--- Makefile.orig
 +++ Makefile
-@@ -1,8 +1,7 @@
- VERSION		= 0.2
+@@ -1,8 +1,8 @@
+ VERSION		= 0.2.5
  CC          ?= gcc
  STRIP		?= strip
--CFLAGS      = -std=gnu11 -O2
+-CFLAGS      = -std=c99 -D_DEFAULT_SOURCE -O2
 -LDFLAGS 	= -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-screensaver
++CFLAGS      += -std=c99 -D_DEFAULT_SOURCE
 +LDFLAGS 	+= -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-screensaver
  
  SRCR 		= pokoy.c
diff --git a/srcpkgs/pokoy/template b/srcpkgs/pokoy/template
index d6cd835e818..490067f7d9f 100644
--- a/srcpkgs/pokoy/template
+++ b/srcpkgs/pokoy/template
@@ -1,13 +1,13 @@
 # Template file for 'pokoy'
 pkgname=pokoy
-version=0.2.2
+version=0.2.5
 revision=1
 build_style=gnu-makefile
-makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel"
 make_use_env=yes
+makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel"
 short_desc="Daemon that helps prevent RSI and other computer related stress"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/ttygde/pokoy"
 distfiles="https://github.com/ttygde/pokoy/archive/v${version}.tar.gz"
-checksum=9903146eeb0cb5c6c6f6484052a30946810a59d8fd392b8f49b48aaced82dc1e
+checksum=ae3ee5935e503d1f48f7fc8e4df2071e9d4586a52dfe778ef643deb28ca6a22f

From d063daa9e7b9727c9751ed3464dae86c41886c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 22:20:40 +0100
Subject: [PATCH 232/419] libunwind: fix mips*musl build w/ musl-1.2.1

---
 srcpkgs/libunwind/patches/mips-musl.patch     |  3 +-
 .../patches/mips-read_write_s32.patch         | 52 +++++++++++++++++++
 srcpkgs/libunwind/template                    |  1 +
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libunwind/patches/mips-read_write_s32.patch

diff --git a/srcpkgs/libunwind/patches/mips-musl.patch b/srcpkgs/libunwind/patches/mips-musl.patch
index b2bd99e78e8..6dac3d0789b 100644
--- a/srcpkgs/libunwind/patches/mips-musl.patch
+++ b/srcpkgs/libunwind/patches/mips-musl.patch
@@ -1,11 +1,10 @@
 --- src/mips/getcontext.S.orig
 +++ src/mips/getcontext.S
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,6 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
  
  #include "offsets.h"
 -#include <endian.h>
-+#include <bits/endian.h>
  
  	.text
  
diff --git a/srcpkgs/libunwind/patches/mips-read_write_s32.patch b/srcpkgs/libunwind/patches/mips-read_write_s32.patch
new file mode 100644
index 00000000000..d61d4b2cb52
--- /dev/null
+++ b/srcpkgs/libunwind/patches/mips-read_write_s32.patch
@@ -0,0 +1,52 @@
+--- include/tdep-mips/libunwind_i.h	2020-11-10 17:14:01.000000000 +0100
++++ include/tdep-mips/libunwind_i.h	2021-01-11 22:12:16.993539625 +0100
+@@ -148,9 +148,10 @@
+ static inline int
+ read_s32 (struct dwarf_cursor *c, unw_word_t addr, unw_word_t *val)
+ {
+-  int offset = addr & 4;
+   int ret;
+   unw_word_t memval;
++#if _MIPS_SIM == _ABI64
++  int offset = addr & 4;
+ 
+   ret = (*c->as->acc.access_mem) (c->as, addr - offset, &memval, 0, c->as_arg);
+   if (ret < 0)
+@@ -160,6 +161,13 @@
+     *val = (int32_t) memval;
+   else
+     *val = (int32_t) (memval >> 32);
++#else
++  ret = (*c->as->acc.access_mem) (c->as, addr, &memval, 0, c->as_arg);
++  if (ret < 0)
++    return ret;
++
++  *val = (int32_t) memval;
++#endif
+ 
+   return 0;
+ }
+@@ -167,9 +175,10 @@
+ static inline int
+ write_s32 (struct dwarf_cursor *c, unw_word_t addr, const unw_word_t *val)
+ {
+-  int offset = addr & 4;
+-  int ret;
+   unw_word_t memval;
++#if _MIPS_SIM == _ABI64
++  int offset = addr & 4;
++  int ret;
+ 
+   ret = (*c->as->acc.access_mem) (c->as, addr - offset, &memval, 0, c->as_arg);
+   if (ret < 0)
+@@ -181,6 +190,10 @@
+     memval = (memval & 0xffffffffLL) | (uint32_t) (*val << 32);
+ 
+   return (*c->as->acc.access_mem) (c->as, addr - offset, &memval, 1, c->as_arg);
++#else
++  memval =  (uint32_t) *val;
++  return (*c->as->acc.access_mem) (c->as, addr, &memval, 1, c->as_arg);
++#endif
+ }
+ 
+ /* FIXME: Implement these for the MIPS FPU.  */
diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template
index 67bd6303e01..3ef73d90d5b 100644
--- a/srcpkgs/libunwind/template
+++ b/srcpkgs/libunwind/template
@@ -19,6 +19,7 @@ case "$XBPS_TARGET_MACHINE" in
 	i686-musl) LDFLAGS=" -lssp_nonshared" ;;
 	ppc64*-musl) makedepends+=" libucontext-devel"; LDFLAGS=" -lucontext" ;;
 	ppc*-musl) makedepends+=" libucontext-devel"; LDFLAGS=" -lucontext -lssp_nonshared" ;;
+	mips*-musl) CLAGS="-D_MIPS_SIM=_ABI32" ;;
 	*) ;;
 esac
 

From a321faf51307a10a112532eaa4367bc5f231ae44 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 11 Jan 2021 23:32:31 +0100
Subject: [PATCH 233/419] xsettingsd: update to 1.0.2.

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

diff --git a/srcpkgs/xsettingsd/template b/srcpkgs/xsettingsd/template
index 9dd6a2e528e..e2754ef0099 100644
--- a/srcpkgs/xsettingsd/template
+++ b/srcpkgs/xsettingsd/template
@@ -1,8 +1,8 @@
 # Template file for 'xsettingsd'
 pkgname=xsettingsd
-version=1.0.0
-revision=2
-build_style=scons
+version=1.0.2
+revision=1
+build_style=cmake
 hostmakedepends="pkg-config libX11-devel"
 makedepends="libX11-devel"
 short_desc="Daemon that implements the XSETTINGS specification"
@@ -10,12 +10,9 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/derat/xsettingsd"
 distfiles="https://github.com/derat/xsettingsd/archive/v${version}.tar.gz"
-checksum=fe0b895b999af94004dc2eabe6dd113c475e3464d548cfe4e545fc02978ba977
+checksum=69b5d1987608d1b5f2a0085f2f88cc55936a99b92279118e655d665ebb5e50d3
 
-do_install() {
-	vbin xsettingsd
-	vbin dump_xsettings
-	vman xsettingsd.1
-	vman dump_xsettings.1
+post_install() {
 	vlicense COPYING
+	rm -rf "${DESTDIR}/usr/lib/systemd"
 }

From bfb20bfe2029e8cca2de2f721edbf5e2f1383e84 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, 10 Jan 2021 18:24:50 +0700
Subject: [PATCH 234/419] xnoise: remove package

- Unmaintained for more than 6 years
- Crash on start up on musl
- reported hanging on glibc
---
 common/shlibs                     |  1 -
 srcpkgs/libxnoise                 |  1 -
 srcpkgs/removed-packages/template |  5 ++++-
 srcpkgs/xnoise-devel              |  1 -
 srcpkgs/xnoise/template           | 35 -------------------------------
 5 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 120000 srcpkgs/libxnoise
 delete mode 120000 srcpkgs/xnoise-devel
 delete mode 100644 srcpkgs/xnoise/template

diff --git a/common/shlibs b/common/shlibs
index af01a679c70..3a329c443a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -913,7 +913,6 @@ libfm.so.4 libfm-1.2.3_3
 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2
 libfm-extra.so.4 libfm-extra-1.2.3_3
 libunique-1.0.so.0 libunique1-1.1.6_1
-libxnoise.so.0 libxnoise-0.1.29_1
 libdiscid.so.0 libdiscid-0.2.2_1
 librhythmbox-core.so.10 librhythmbox-3.4.1_1
 libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
diff --git a/srcpkgs/libxnoise b/srcpkgs/libxnoise
deleted file mode 120000
index 5cfcc50a50a..00000000000
--- a/srcpkgs/libxnoise
+++ /dev/null
@@ -1 +0,0 @@
-xnoise
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c3b79f436a5..e5b9cac33fa 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=7
+revision=8
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -77,6 +77,9 @@ replaces="
  vte-python<=0.28.2_16
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ libxnoise<=0.2.21_4
+ xnoise<=0.2.21_4
+ xnoise-devel<=0.2.21_4
  yt-play<=20140117_2
  nvidia340<=340.108_4
  nvidia340-dkms<=340.108_4
diff --git a/srcpkgs/xnoise-devel b/srcpkgs/xnoise-devel
deleted file mode 120000
index 5cfcc50a50a..00000000000
--- a/srcpkgs/xnoise-devel
+++ /dev/null
@@ -1 +0,0 @@
-xnoise
\ No newline at end of file
diff --git a/srcpkgs/xnoise/template b/srcpkgs/xnoise/template
deleted file mode 100644
index 61cc909b6ad..00000000000
--- a/srcpkgs/xnoise/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'xnoise'
-pkgname=xnoise
-version=0.2.21
-revision=4
-lib32disabled=yes
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel libtaginfo-devel sqlite-devel
- libnotify-devel libsoup-devel gst-plugins-base1-devel gst-plugins-good1
- desktop-file-utils hicolor-icon-theme"
-depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1"
-short_desc="Media player for GTK+ with a slick GUI"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.xnoise-media-player.com/"
-distfiles="https://bitbucket.org/shuerhaaken/xnoise/downloads/xnoise-${version}.tar.gz"
-checksum=6c501091ac5a59aa0596978aa8d4750cc12d6bc9a823fd57542d9ab8e3366681
-
-libxnoise_package() {
-	short_desc+=" - shared library"
-	pkg_install() {
-		vmove "usr/lib/libxnoise.so.*"
-	}
-}
-
-xnoise-devel_package() {
-	depends="libxnoise>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vmove usr/share/vala
-	}
-}

From 26388b5dad9ae0c3068956c9b53f3d35917d51b4 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, 9 Jan 2021 16:47:40 +0700
Subject: [PATCH 235/419] albatross-themes: not depends on gtk+

---
 srcpkgs/albatross-themes/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/albatross-themes/template b/srcpkgs/albatross-themes/template
index ce8a344c343..92d165f209f 100644
--- a/srcpkgs/albatross-themes/template
+++ b/srcpkgs/albatross-themes/template
@@ -1,18 +1,17 @@
 # Template file for 'albatross-themes'
 pkgname=albatross-themes
 version=1.7.4
-revision=3
-build_style=fetch
-depends="gtk+"
+revision=4
+wrksrc=Albatross-$version
 short_desc="Elegant black GTK2/3/Metacity/Xfwm theme"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
+license="GPL-2.0-or-later, CC-BY-SA-3.0"
 homepage="https://github.com/shimmerproject/Albatross"
 distfiles="https://github.com/shimmerproject/Albatross/archive/v${version}.tar.gz"
 checksum=ff40e28e164cb99f01b131ae3e79a07782e29a720535460e901ce305fa322ae1
 
 do_install() {
-	bsdtar xzf v${version}.tar.gz
 	vmkdir usr/share/themes
-	vcopy Albatross-${version} usr/share/themes/Albatross
+	rm -f .gitignore LICENSE* README
+	vcopy . usr/share/themes/Albatross
 }

From a9ce51efe53dbd3355db4d282f9c1d0125fe88ad 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, 9 Jan 2021 16:49:58 +0700
Subject: [PATCH 236/419] blackbird-themes: not depends on gtk+

---
 srcpkgs/blackbird-themes/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/blackbird-themes/template b/srcpkgs/blackbird-themes/template
index 68ced568cbc..5c7cdd7082e 100644
--- a/srcpkgs/blackbird-themes/template
+++ b/srcpkgs/blackbird-themes/template
@@ -1,9 +1,8 @@
 # Template file for 'blackbird-themes'
 pkgname=blackbird-themes
 version=0.4
-revision=4
-build_style=fetch
-depends="gtk+"
+revision=5
+wrksrc=Blackbird-$version
 short_desc="Elegant dark GTK2/3/Metacity/Xfwm theme"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-2.0-or-later"
@@ -12,7 +11,7 @@ distfiles="https://github.com/shimmerproject/Blackbird/archive/v${version}.tar.g
 checksum=ca31362254df2d336b2b090deb925f19a1dba72632ed9c7f82cf406be89ec1e6
 
 do_install() {
-	bsdtar xzf v${version}.tar.gz
 	vmkdir usr/share/themes
-	vcopy Blackbird-${version} usr/share/themes/Blackbird
+	rm README .gitignore
+	vcopy . usr/share/themes/Blackbird
 }

From 69fd8029f5bc609e6528c67044064de5e0d54b00 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, 9 Jan 2021 17:00:55 +0700
Subject: [PATCH 237/419] bluebird-themes: build gtk+3 themes

---
 srcpkgs/bluebird-themes/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/bluebird-themes/template b/srcpkgs/bluebird-themes/template
index ad67f8bc960..a9f4e852df1 100644
--- a/srcpkgs/bluebird-themes/template
+++ b/srcpkgs/bluebird-themes/template
@@ -1,9 +1,10 @@
 # Template file for 'bluebird-themes'
 pkgname=bluebird-themes
 version=1.3
-revision=2
-build_style=fetch
-depends="gtk+"
+revision=3
+wrksrc=Bluebird-$version
+build_style=gnu-configure
+hostmakedepends="sassc which glib-devel automake gdk-pixbuf tar librsvg-utils"
 short_desc="Elegant blue GTK2/3/Metacity/Xfwm theme"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-2.0-or-later"
@@ -11,8 +12,6 @@ homepage="https://github.com/shimmerproject/Bluebird"
 distfiles="https://github.com/shimmerproject/Bluebird/archive/v${version}.tar.gz"
 checksum=b8da767c0ed66e2c0e8c2f78a8c827d8757634179b114a1352590f4e6d0b32c8
 
-do_install() {
-	bsdtar xzf v${version}.tar.gz
-	vmkdir usr/share/themes
-	vcopy Bluebird-${version} usr/share/themes/Bluebird
+pre_configure() {
+	autoreconf -fi
 }

From ea9de2f12eeb87a4aa87c462b152cd917d869185 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, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 238/419] genius: load l10n from /usr/share

---
 srcpkgs/genius/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From 3aef03d6e429fe995e9030edcf9f2dcf26185ad3 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, 9 Jan 2021 18:56:47 +0700
Subject: [PATCH 239/419] lxappearance: load l10n from /usr/share

---
 srcpkgs/lxappearance/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33b739278c4..33d768aeb94 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"
@@ -16,3 +16,7 @@ checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38
 
 build_options="gtk3 dbus"
 build_options_default="dbus gtk3"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From e5600c652697134b01702bebb5771663d104a4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:45:00 +0700
Subject: [PATCH 240/419] desmume: remove l10n dir

---
 srcpkgs/desmume/template | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index 71ab6d9feca..3afaa5027f7 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,15 +1,16 @@
 # Template file for 'desmume'
 pkgname=desmume
 version=0.9.11
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx"
 hostmakedepends="pkg-config intltool dos2unix"
-makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel agg-devel zziplib-devel glu-devel"
+makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel
+ gtk+-devel agg-devel zziplib-devel glu-devel"
 depends="desktop-file-utils"
 short_desc="Nintendo DS emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.desmume.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
@@ -19,3 +20,13 @@ post_extract() {
 	# convert the target file to LF-only.
 	dos2unix $wrksrc/src/MMU_timing.h
 }
+
+post_install() {
+	# locales is only used for glade, but it's never built
+	# The configure script set GETTEXT_PACKAGE to empty string
+	# this it's never usable.
+	# /usr/lib/locale/nb/LC_MESSAGES/.mo
+	# /usr/share/locale/nb/LC_MESSAGES/.mo
+	rm -rf $DESTDIR/usr/lib/locale
+	rm -rf $DESTDIR/usr/share/locale
+}

From 3c03d6d02afd93261e142c7d9cd66c5748ce8b6a Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Fri, 8 Jan 2021 13:36:54 -0500
Subject: [PATCH 241/419] vivaldi: update to 3.5.2115.87.

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 8b0cb4113a1..4380b1de8bf 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=3.5.2115.81
+version=3.5.2115.87
 revision=1
 _release=1
 archs="i686 x86_64"
@@ -18,10 +18,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=38a18fe2624994cbc9782d7805ec058774e54e99e0ade6ad5e85da45055c9e5c
+	checksum=c02ea30b222a695b2fae5c7e2c62b51876ef3171cccde18e59a2b569a4161c54
 else
 	_debarch=i386
-	checksum=5c53dc84f1192d90349d5959848b106f542423268b6a5fa4d77119ba4a997e12
+	checksum=9c8ac7bd04efbef76b27f82fc6c754a1743ac5b5ba012810e77e2d16ff1a463a
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"

From 7da16f9532871a65c746a4686363f97401d92570 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Dec 2020 15:21:39 +0100
Subject: [PATCH 242/419] tuxc: remove package

---
 srcpkgs/removed-packages/template |  3 ++-
 srcpkgs/tuxc/template             | 16 ----------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/tuxc/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e5b9cac33fa..1391ec55958 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=8
+revision=9
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -70,6 +70,7 @@ replaces="
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
  ttyload-git<=20141117_4
+ tuxc<=1.1_3
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
  vte<=0.28.2_16
diff --git a/srcpkgs/tuxc/template b/srcpkgs/tuxc/template
deleted file mode 100644
index 861291aef0b..00000000000
--- a/srcpkgs/tuxc/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'tuxc'
-pkgname=tuxc
-version=1.1
-revision=3
-build_style="gnu-makefile"
-hostmakedepends="pkg-config"
-makedepends="lua53-devel"
-short_desc="Modular universal package manager wrapper"
-maintainer="Logen Kain <logen@sudotask.com>"
-license="ISC"
-homepage="https://github.com/logenkain/tuxc/"
-distfiles="https://github.com/logenkain/${pkgname}/archive/v${version}.tar.gz"
-checksum=164c905c4278422c8d75c7be9dfe3b92d0f820bccdae296b9e0db762f5ef614f
-post_install() {
-	vlicense LICENSE
-}

From 2879b28df90028d354bc8ac0c6661e6c8bec999c 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, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 243/419] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 84d1f791828214ffd6c5551c5c602df9cca3f8dd 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, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 244/419] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 5ad5566618d0fbc921dc6d94ec4e564f72645161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 245/419] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 669f5d1a9f879ee619ef41d3c2f54007dfabc388 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, 12 Jan 2021 07:40:41 +0700
Subject: [PATCH 246/419] openresolv: use cached distfiles for a while

---
 srcpkgs/openresolv/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index 3ed997c5fc5..7676f2c2fc4 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -10,6 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/openresolv"
 distfiles="https://roy.marples.name/downloads/openresolv/${pkgname}-${version}.tar.xz"
+distfiles="https://sources.voidlinux.org/openresolv-$version/openresolv-$version.tar.xz"
 checksum=42b30508e857a228535c631eaac936862d86eca68c14b5c0bf387ba176b91b97
 conf_files="/etc/resolvconf.conf"
 

From fc8058fab790de406d47592ae7aeaab1713816bc 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, 12 Jan 2021 07:41:54 +0700
Subject: [PATCH 247/419] Revert "openresolv: use cached distfiles for a while"

This reverts commit 669f5d1a9f879ee619ef41d3c2f54007dfabc388.
---
 srcpkgs/openresolv/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index 7676f2c2fc4..3ed997c5fc5 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -10,7 +10,6 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/openresolv"
 distfiles="https://roy.marples.name/downloads/openresolv/${pkgname}-${version}.tar.xz"
-distfiles="https://sources.voidlinux.org/openresolv-$version/openresolv-$version.tar.xz"
 checksum=42b30508e857a228535c631eaac936862d86eca68c14b5c0bf387ba176b91b97
 conf_files="/etc/resolvconf.conf"
 

From 83d3afb8e8b74fbae11741a237273258ff8c32ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 248/419] gconf-editor: fix l10n dir

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

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 4c01f331dd9af63b03a32b8c4a9e4d5cf87baa58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 249/419] gdmap: fix l10n dir

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

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From fe3234e4d464233a2349928879284b8ac4a169b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 250/419] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e7d7d4d3d58601be722575bb3de5fc52a9c272bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 251/419] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From 1ff38fadf9335848ec4bb183f159916b305fe5bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 252/419] gnome-mime-data: fix l10n dir

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

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From cc5dddec3d07a15416f0afca4ceda27a1f8d660f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 253/419] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From 8fa050915663194e9059bbf2b7a0cd12b0130ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 254/419] gnome-nettool: fix l10n dir

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

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 7f1593d4ec272936525380c0fdfe1ed22c427861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 255/419] gnome-system-log: fix l10n dir

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

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3920b00a7886592e34846822f111246a956317a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 256/419] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..21dd938564e 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,11 +22,16 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove usr/lib/libspreadsheet.so
 	}
 }

From 854365314d511a0bf06d1416415f8110a1eb93e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 257/419] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 7ead6c5aef509782d4464c1e342b9e4eae3a0be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 258/419] gtkpod: fix l10n dir

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

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 5093be09ba004ff6efc5a421898bf84fa6037d4f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 00:55:31 +0200
Subject: [PATCH 259/419] butt: update to 0.1.27.

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

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index 6e67147ec84..d78e567f0aa 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,6 +1,6 @@
 # Template file for 'butt'
 pkgname=butt
-version=0.1.25
+version=0.1.27
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://danielnoethen.de"
 changelog="https://danielnoethen.de/butt/Changelog.html"
 distfiles="${SOURCEFORGE_SITE}/butt/butt-${version}.tar.gz"
-checksum=7c9f44227584e30040315a5c86419bf3e654bd3523634d34b18c9017206334cb
+checksum=e19a9b457414d2ca68947b49f4c3180ca8b3210b1c4f3925d71eacf1d47bab87

From e04e5c10da12b5c75aaff684d9f65826d5c97425 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 00:40:10 +0200
Subject: [PATCH 260/419] mdcat: update to 0.22.2.

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

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index ce16fbe5a00..9a91d162d53 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,6 +1,6 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.22.1
+version=0.22.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
@@ -11,4 +11,4 @@ maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"
 homepage="https://github.com/lunaryorn/mdcat"
 distfiles="https://github.com/lunaryorn/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=b14846542fb8b60ac0235b399136372df7569aa59ed63f3faf88ff7a485abe5f
+checksum=92102c448c1742aa69604817d7d209c69ce1db5261cb6d8f0bb98cdc6c4f02f9

From b5ac22e16eb29143586ed28639936a49337f466e Mon Sep 17 00:00:00 2001
From: Logen Kain <logen@sudotask.com>
Date: Mon, 11 Jan 2021 16:21:39 -0500
Subject: [PATCH 261/419] ssr: update to 0.4.3

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

diff --git a/srcpkgs/ssr/template b/srcpkgs/ssr/template
index 5a67fafc7de..a6439c742b2 100644
--- a/srcpkgs/ssr/template
+++ b/srcpkgs/ssr/template
@@ -1,19 +1,19 @@
 # Template file for 'ssr'
 pkgname=ssr
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_QT5=ON"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel ffmpeg-devel glu-devel jack-devel pulseaudio-devel
- qt5-tools-devel qt5-x11extras-devel libXinerama-devel"
+ qt5-tools-devel qt5-x11extras-devel libXinerama-devel v4l-utils-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple Screen Recorder for programs and games"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.maartenbaert.be/simplescreenrecorder/"
 distfiles="https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"
-checksum=a6da4979c7c3f402ea93e43f1c55e289cdcc69653a1a128e32e8bd59481b2511
+checksum=03b5f6cd613b504f8b2351c2728a6fd070aa0cc98e709bcafdcf93b672bd2b71
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 0a79cee867a70cf1e168b7281d6d16b24d5f6038 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 01:38:29 +0200
Subject: [PATCH 262/419] man-pages: update to 5.10.

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

diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index 54ff41cb096..a61249ca051 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,13 +1,13 @@
 # Template file for 'man-pages'
 pkgname=man-pages
-version=5.09
+version=5.10
 revision=1
 short_desc="Linux Documentation Project (LDP) manual pages"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://man7.org/linux/man-pages/index.html"
 distfiles="${KERNEL_SITE}/docs/man-pages/${pkgname}-${version}.tar.xz"
-checksum=df1a3476bf63336f5e0335c4c2a992359b301999e9dfe44fb2cac7466aec0bf2
+checksum=75102535ba119f2f223f674d84e1dcdaebf0a5ffd639b3c2e6cb0a0e34768762
 
 do_install() {
 	make all prefix=${DESTDIR}/usr

From a9f9a0108a0a8698f8b52ef244d46fa028578c17 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 12 Jan 2021 00:13:49 +0300
Subject: [PATCH 263/419] gallery-dl: update to 1.16.3

---
 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 72fee5ca564..83bc94c2ecd 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.16.0
+version=1.16.3
 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="${homepage}/archive/v${version}.tar.gz"
-checksum=260fa553e055efa8c080779d001d53db0366398450a0f362f707e753ef54f078
+checksum=ca1b8069a614fdc1f71ba9b33c157c1a0557efa8a77793236e2de4b20d27c053
 
 do_check() {
 	make test

From 154d8721627cc41d91084a987ac56e77265f2c92 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 00:21:16 +0200
Subject: [PATCH 264/419] FeatherPad: update to 0.17.1.

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

diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index c1e097d2ae6..3ebfc5d376f 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -1,6 +1,6 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=0.16.0
+version=0.17.1
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
-checksum=781f092611cd330bd365df68b3b8793cfef8ae13b59f10494e4d0813832a0a2f
+checksum=021fd515979483df93d8652dabab6cdd4d383ee4bbbe8a091a597a8e497fe61f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-x11extras-devel qt5-svg-devel"

From 77108688b748eae958f71590a746cb8b8d05783f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 01:04:53 +0200
Subject: [PATCH 265/419] kvantum: update to 0.18.0.

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

diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index ff414eef927..34edc24474b 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.17.0
+version=0.18.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -13,7 +13,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=2d8eda6d44943a5e12baacae7228856c41e120235a374958c7cb50c39148cbfe
+checksum=79752525b5636009385864373618e5e747a9fa7047af46d7815e27934c9a3dfd
 nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/21436/steps/shell_3/logs/stdio"
 
 if [ "$CROSS_BUILD" ]; then

From 3dc10db829fd8998f7c973cbcdf4e6a68959f804 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 01:11:21 +0200
Subject: [PATCH 266/419] zim: update to 0.73.4.

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

diff --git a/srcpkgs/zim/template b/srcpkgs/zim/template
index 94f33ed850b..5fcc9a5a594 100644
--- a/srcpkgs/zim/template
+++ b/srcpkgs/zim/template
@@ -1,6 +1,6 @@
 # Template file for 'zim'
 pkgname=zim
-version=0.73.3
+version=0.73.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-gobject python3-xdg gtk+3"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://zim-wiki.org/"
 distfiles="http://zim-wiki.org/downloads/${pkgname}-${version}.tar.gz"
-checksum=a1f03d31682278b5432156b629ea3f2494e6f999d5947b7805114a4661e59300
+checksum=1f729d3390a04221a086526e9a894526c4d02b154af59ad535123066155213da

From 7b3d491e4b28979363e7180adb2bfe4117e83d17 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 01:29:50 +0200
Subject: [PATCH 267/419] phoronix-test-suite: update to 10.2.0.

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

diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 1273816a25f..eae4ccbe817 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,7 +1,7 @@
 # Template file for 'phoronix-test-suite'
 pkgname=phoronix-test-suite
-version=9.6.1
-revision=2
+version=10.2.0
+revision=1
 wrksrc="$pkgname"
 depends="php"
 short_desc="Comprehensive testing and benchmarking platform for Linux"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.phoronix-test-suite.com/"
 changelog="https://raw.githubusercontent.com/phoronix-test-suite/phoronix-test-suite/master/ChangeLog"
 distfiles="https://phoronix-test-suite.com/releases/${pkgname}-${version}.tar.gz"
-checksum=8afae3056aae06a9a5a8aa80e3706eeeb22e3b9ba7d6e7784506ff1b1788cce2
+checksum=7a828781b4b2384930ce48b9c16b9994e0266658f138c5dcced03f83c4edbad4
 
 do_install() {
 	vsed -e "s/^\texport PTS_DIR=.*/\texport PTS_DIR=\/usr\/share\/webapps\/${pkgname}/g" -i phoronix-test-suite

From 781ca021ff14b3f05073cb7d8c1d47b44d53f5bf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 11 Jan 2021 23:59:51 +0200
Subject: [PATCH 268/419] bacon: update to 4.3, orphan.

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

diff --git a/srcpkgs/bacon/template b/srcpkgs/bacon/template
index bc4dd296265..89405034d6c 100644
--- a/srcpkgs/bacon/template
+++ b/srcpkgs/bacon/template
@@ -1,18 +1,18 @@
 # Template file for 'bacon'
 pkgname=bacon
-version=4.2
+version=4.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-bash --enable-gui-fltk"
-hostmakedepends="pkg-config m4 which"
+hostmakedepends="pkg-config m4 which flex"
 makedepends="fltk-devel"
 short_desc="BASIC to C converter"
-maintainer="Juan RP <xtraeme@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.basic-converter.org"
 changelog="https://www.basic-converter.org/stable/CHANGES"
 distfiles="http://www.basic-converter.org/stable/bacon-${version}.tar.gz"
-checksum=03906139e9bc815d47635fdb92ded3f88376e38bb900fe3388aeb78a660defe2
+checksum=657eabca5870fb7db1e34100392af1c0f841d4a4ba7910b44c50302ca288b4f0
 disable_parallel_build=yes
 nocross=yes
 

From a3ad5f698a4b242dbb15ebc1337be5190caba544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 11 Jan 2021 11:00:37 -0300
Subject: [PATCH 269/419] lshw: clean up musl patches.

musl-path_max was no longer necessary, and musl-confname_h was kind of
helping them do the wrong thing. They should just be using the value of
LONG_BIT instead of trying to pass it to sysconf, so the usage was wrong
on glibc and musl. _SC_LONG_BIT is a glibc extension and shouldn't be at
all needed.

Since this does change behavior (sysconf(LONG_BIT) could return
arbitrary values), revbump the package.
---
 srcpkgs/lshw/files/confname.h              | 676 ---------------------
 srcpkgs/lshw/patches/musl-confname_h.patch |  15 -
 srcpkgs/lshw/patches/musl-long_bits.patch  |  20 +
 srcpkgs/lshw/patches/musl-path_max.patch   |  12 -
 srcpkgs/lshw/template                      |   7 +-
 5 files changed, 21 insertions(+), 709 deletions(-)
 delete mode 100644 srcpkgs/lshw/files/confname.h
 delete mode 100644 srcpkgs/lshw/patches/musl-confname_h.patch
 create mode 100644 srcpkgs/lshw/patches/musl-long_bits.patch
 delete mode 100644 srcpkgs/lshw/patches/musl-path_max.patch

diff --git a/srcpkgs/lshw/files/confname.h b/srcpkgs/lshw/files/confname.h
deleted file mode 100644
index 1972849cec3..00000000000
--- a/srcpkgs/lshw/files/confname.h
+++ /dev/null
@@ -1,676 +0,0 @@
-/* `sysconf', `pathconf', and `confstr' NAME values.  Generic version.
-   Copyright (C) 1993-2015 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined(_CONFNAME_H)
-#define _CONFNAME_H
-
-/* Values for the NAME argument to `pathconf' and `fpathconf'.  */
-enum
-  {
-    _PC_LINK_MAX,
-#define	_PC_LINK_MAX			_PC_LINK_MAX
-    _PC_MAX_CANON,
-#define	_PC_MAX_CANON			_PC_MAX_CANON
-    _PC_MAX_INPUT,
-#define	_PC_MAX_INPUT			_PC_MAX_INPUT
-    _PC_NAME_MAX,
-#define	_PC_NAME_MAX			_PC_NAME_MAX
-    _PC_PATH_MAX,
-#define	_PC_PATH_MAX			_PC_PATH_MAX
-    _PC_PIPE_BUF,
-#define	_PC_PIPE_BUF			_PC_PIPE_BUF
-    _PC_CHOWN_RESTRICTED,
-#define	_PC_CHOWN_RESTRICTED		_PC_CHOWN_RESTRICTED
-    _PC_NO_TRUNC,
-#define	_PC_NO_TRUNC			_PC_NO_TRUNC
-    _PC_VDISABLE,
-#define _PC_VDISABLE			_PC_VDISABLE
-    _PC_SYNC_IO,
-#define	_PC_SYNC_IO			_PC_SYNC_IO
-    _PC_ASYNC_IO,
-#define	_PC_ASYNC_IO			_PC_ASYNC_IO
-    _PC_PRIO_IO,
-#define	_PC_PRIO_IO			_PC_PRIO_IO
-    _PC_SOCK_MAXBUF,
-#define	_PC_SOCK_MAXBUF			_PC_SOCK_MAXBUF
-    _PC_FILESIZEBITS,
-#define _PC_FILESIZEBITS		_PC_FILESIZEBITS
-    _PC_REC_INCR_XFER_SIZE,
-#define _PC_REC_INCR_XFER_SIZE		_PC_REC_INCR_XFER_SIZE
-    _PC_REC_MAX_XFER_SIZE,
-#define _PC_REC_MAX_XFER_SIZE		_PC_REC_MAX_XFER_SIZE
-    _PC_REC_MIN_XFER_SIZE,
-#define _PC_REC_MIN_XFER_SIZE		_PC_REC_MIN_XFER_SIZE
-    _PC_REC_XFER_ALIGN,
-#define _PC_REC_XFER_ALIGN		_PC_REC_XFER_ALIGN
-    _PC_ALLOC_SIZE_MIN,
-#define _PC_ALLOC_SIZE_MIN		_PC_ALLOC_SIZE_MIN
-    _PC_SYMLINK_MAX,
-#define _PC_SYMLINK_MAX			_PC_SYMLINK_MAX
-    _PC_2_SYMLINKS
-#define _PC_2_SYMLINKS			_PC_2_SYMLINKS
-  };
-
-/* Values for the argument to `sysconf'.  */
-enum
-  {
-    _SC_ARG_MAX,
-#define	_SC_ARG_MAX			_SC_ARG_MAX
-    _SC_CHILD_MAX,
-#define	_SC_CHILD_MAX			_SC_CHILD_MAX
-    _SC_CLK_TCK,
-#define	_SC_CLK_TCK			_SC_CLK_TCK
-    _SC_NGROUPS_MAX,
-#define	_SC_NGROUPS_MAX			_SC_NGROUPS_MAX
-    _SC_OPEN_MAX,
-#define	_SC_OPEN_MAX			_SC_OPEN_MAX
-    _SC_STREAM_MAX,
-#define	_SC_STREAM_MAX			_SC_STREAM_MAX
-    _SC_TZNAME_MAX,
-#define	_SC_TZNAME_MAX			_SC_TZNAME_MAX
-    _SC_JOB_CONTROL,
-#define	_SC_JOB_CONTROL			_SC_JOB_CONTROL
-    _SC_SAVED_IDS,
-#define	_SC_SAVED_IDS			_SC_SAVED_IDS
-    _SC_REALTIME_SIGNALS,
-#define	_SC_REALTIME_SIGNALS		_SC_REALTIME_SIGNALS
-    _SC_PRIORITY_SCHEDULING,
-#define	_SC_PRIORITY_SCHEDULING		_SC_PRIORITY_SCHEDULING
-    _SC_TIMERS,
-#define	_SC_TIMERS			_SC_TIMERS
-    _SC_ASYNCHRONOUS_IO,
-#define	_SC_ASYNCHRONOUS_IO		_SC_ASYNCHRONOUS_IO
-    _SC_PRIORITIZED_IO,
-#define	_SC_PRIORITIZED_IO		_SC_PRIORITIZED_IO
-    _SC_SYNCHRONIZED_IO,
-#define	_SC_SYNCHRONIZED_IO		_SC_SYNCHRONIZED_IO
-    _SC_FSYNC,
-#define	_SC_FSYNC			_SC_FSYNC
-    _SC_MAPPED_FILES,
-#define	_SC_MAPPED_FILES		_SC_MAPPED_FILES
-    _SC_MEMLOCK,
-#define	_SC_MEMLOCK			_SC_MEMLOCK
-    _SC_MEMLOCK_RANGE,
-#define	_SC_MEMLOCK_RANGE		_SC_MEMLOCK_RANGE
-    _SC_MEMORY_PROTECTION,
-#define	_SC_MEMORY_PROTECTION		_SC_MEMORY_PROTECTION
-    _SC_MESSAGE_PASSING,
-#define	_SC_MESSAGE_PASSING		_SC_MESSAGE_PASSING
-    _SC_SEMAPHORES,
-#define	_SC_SEMAPHORES			_SC_SEMAPHORES
-    _SC_SHARED_MEMORY_OBJECTS,
-#define	_SC_SHARED_MEMORY_OBJECTS	_SC_SHARED_MEMORY_OBJECTS
-    _SC_AIO_LISTIO_MAX,
-#define	_SC_AIO_LISTIO_MAX		_SC_AIO_LISTIO_MAX
-    _SC_AIO_MAX,
-#define	_SC_AIO_MAX			_SC_AIO_MAX
-    _SC_AIO_PRIO_DELTA_MAX,
-#define	_SC_AIO_PRIO_DELTA_MAX		_SC_AIO_PRIO_DELTA_MAX
-    _SC_DELAYTIMER_MAX,
-#define	_SC_DELAYTIMER_MAX		_SC_DELAYTIMER_MAX
-    _SC_MQ_OPEN_MAX,
-#define	_SC_MQ_OPEN_MAX			_SC_MQ_OPEN_MAX
-    _SC_MQ_PRIO_MAX,
-#define	_SC_MQ_PRIO_MAX			_SC_MQ_PRIO_MAX
-    _SC_VERSION,
-#define	_SC_VERSION			_SC_VERSION
-    _SC_PAGESIZE,
-#define	_SC_PAGESIZE			_SC_PAGESIZE
-#define	_SC_PAGE_SIZE			_SC_PAGESIZE
-    _SC_RTSIG_MAX,
-#define	_SC_RTSIG_MAX			_SC_RTSIG_MAX
-    _SC_SEM_NSEMS_MAX,
-#define	_SC_SEM_NSEMS_MAX		_SC_SEM_NSEMS_MAX
-    _SC_SEM_VALUE_MAX,
-#define	_SC_SEM_VALUE_MAX		_SC_SEM_VALUE_MAX
-    _SC_SIGQUEUE_MAX,
-#define	_SC_SIGQUEUE_MAX		_SC_SIGQUEUE_MAX
-    _SC_TIMER_MAX,
-#define	_SC_TIMER_MAX			_SC_TIMER_MAX
-
-    /* Values for the argument to `sysconf'
-       corresponding to _POSIX2_* symbols.  */
-    _SC_BC_BASE_MAX,
-#define	_SC_BC_BASE_MAX			_SC_BC_BASE_MAX
-    _SC_BC_DIM_MAX,
-#define	_SC_BC_DIM_MAX			_SC_BC_DIM_MAX
-    _SC_BC_SCALE_MAX,
-#define	_SC_BC_SCALE_MAX		_SC_BC_SCALE_MAX
-    _SC_BC_STRING_MAX,
-#define	_SC_BC_STRING_MAX		_SC_BC_STRING_MAX
-    _SC_COLL_WEIGHTS_MAX,
-#define	_SC_COLL_WEIGHTS_MAX		_SC_COLL_WEIGHTS_MAX
-    _SC_EQUIV_CLASS_MAX,
-#define	_SC_EQUIV_CLASS_MAX		_SC_EQUIV_CLASS_MAX
-    _SC_EXPR_NEST_MAX,
-#define	_SC_EXPR_NEST_MAX		_SC_EXPR_NEST_MAX
-    _SC_LINE_MAX,
-#define	_SC_LINE_MAX			_SC_LINE_MAX
-    _SC_RE_DUP_MAX,
-#define	_SC_RE_DUP_MAX			_SC_RE_DUP_MAX
-    _SC_CHARCLASS_NAME_MAX,
-#define	_SC_CHARCLASS_NAME_MAX		_SC_CHARCLASS_NAME_MAX
-
-    _SC_2_VERSION,
-#define	_SC_2_VERSION			_SC_2_VERSION
-    _SC_2_C_BIND,
-#define	_SC_2_C_BIND			_SC_2_C_BIND
-    _SC_2_C_DEV,
-#define	_SC_2_C_DEV			_SC_2_C_DEV
-    _SC_2_FORT_DEV,
-#define	_SC_2_FORT_DEV			_SC_2_FORT_DEV
-    _SC_2_FORT_RUN,
-#define	_SC_2_FORT_RUN			_SC_2_FORT_RUN
-    _SC_2_SW_DEV,
-#define	_SC_2_SW_DEV			_SC_2_SW_DEV
-    _SC_2_LOCALEDEF,
-#define	_SC_2_LOCALEDEF			_SC_2_LOCALEDEF
-
-    _SC_PII,
-#define	_SC_PII				_SC_PII
-    _SC_PII_XTI,
-#define	_SC_PII_XTI			_SC_PII_XTI
-    _SC_PII_SOCKET,
-#define	_SC_PII_SOCKET			_SC_PII_SOCKET
-    _SC_PII_INTERNET,
-#define	_SC_PII_INTERNET		_SC_PII_INTERNET
-    _SC_PII_OSI,
-#define	_SC_PII_OSI			_SC_PII_OSI
-    _SC_POLL,
-#define	_SC_POLL			_SC_POLL
-    _SC_SELECT,
-#define	_SC_SELECT			_SC_SELECT
-    _SC_UIO_MAXIOV,
-#define	_SC_UIO_MAXIOV			_SC_UIO_MAXIOV
-    _SC_IOV_MAX = _SC_UIO_MAXIOV,
-#define _SC_IOV_MAX			_SC_IOV_MAX
-    _SC_PII_INTERNET_STREAM,
-#define	_SC_PII_INTERNET_STREAM		_SC_PII_INTERNET_STREAM
-    _SC_PII_INTERNET_DGRAM,
-#define	_SC_PII_INTERNET_DGRAM		_SC_PII_INTERNET_DGRAM
-    _SC_PII_OSI_COTS,
-#define	_SC_PII_OSI_COTS		_SC_PII_OSI_COTS
-    _SC_PII_OSI_CLTS,
-#define	_SC_PII_OSI_CLTS		_SC_PII_OSI_CLTS
-    _SC_PII_OSI_M,
-#define	_SC_PII_OSI_M			_SC_PII_OSI_M
-    _SC_T_IOV_MAX,
-#define	_SC_T_IOV_MAX			_SC_T_IOV_MAX
-
-    /* Values according to POSIX 1003.1c (POSIX threads).  */
-    _SC_THREADS,
-#define	_SC_THREADS			_SC_THREADS
-    _SC_THREAD_SAFE_FUNCTIONS,
-#define _SC_THREAD_SAFE_FUNCTIONS	_SC_THREAD_SAFE_FUNCTIONS
-    _SC_GETGR_R_SIZE_MAX,
-#define	_SC_GETGR_R_SIZE_MAX		_SC_GETGR_R_SIZE_MAX
-    _SC_GETPW_R_SIZE_MAX,
-#define	_SC_GETPW_R_SIZE_MAX		_SC_GETPW_R_SIZE_MAX
-    _SC_LOGIN_NAME_MAX,
-#define	_SC_LOGIN_NAME_MAX		_SC_LOGIN_NAME_MAX
-    _SC_TTY_NAME_MAX,
-#define	_SC_TTY_NAME_MAX		_SC_TTY_NAME_MAX
-    _SC_THREAD_DESTRUCTOR_ITERATIONS,
-#define	_SC_THREAD_DESTRUCTOR_ITERATIONS _SC_THREAD_DESTRUCTOR_ITERATIONS
-    _SC_THREAD_KEYS_MAX,
-#define	_SC_THREAD_KEYS_MAX		_SC_THREAD_KEYS_MAX
-    _SC_THREAD_STACK_MIN,
-#define	_SC_THREAD_STACK_MIN		_SC_THREAD_STACK_MIN
-    _SC_THREAD_THREADS_MAX,
-#define	_SC_THREAD_THREADS_MAX		_SC_THREAD_THREADS_MAX
-    _SC_THREAD_ATTR_STACKADDR,
-#define	_SC_THREAD_ATTR_STACKADDR	_SC_THREAD_ATTR_STACKADDR
-    _SC_THREAD_ATTR_STACKSIZE,
-#define	_SC_THREAD_ATTR_STACKSIZE	_SC_THREAD_ATTR_STACKSIZE
-    _SC_THREAD_PRIORITY_SCHEDULING,
-#define	_SC_THREAD_PRIORITY_SCHEDULING	_SC_THREAD_PRIORITY_SCHEDULING
-    _SC_THREAD_PRIO_INHERIT,
-#define	_SC_THREAD_PRIO_INHERIT		_SC_THREAD_PRIO_INHERIT
-    _SC_THREAD_PRIO_PROTECT,
-#define	_SC_THREAD_PRIO_PROTECT		_SC_THREAD_PRIO_PROTECT
-    _SC_THREAD_PROCESS_SHARED,
-#define	_SC_THREAD_PROCESS_SHARED	_SC_THREAD_PROCESS_SHARED
-
-    _SC_NPROCESSORS_CONF,
-#define _SC_NPROCESSORS_CONF		_SC_NPROCESSORS_CONF
-    _SC_NPROCESSORS_ONLN,
-#define _SC_NPROCESSORS_ONLN		_SC_NPROCESSORS_ONLN
-    _SC_PHYS_PAGES,
-#define _SC_PHYS_PAGES			_SC_PHYS_PAGES
-    _SC_AVPHYS_PAGES,
-#define _SC_AVPHYS_PAGES		_SC_AVPHYS_PAGES
-    _SC_ATEXIT_MAX,
-#define _SC_ATEXIT_MAX			_SC_ATEXIT_MAX
-    _SC_PASS_MAX,
-#define _SC_PASS_MAX			_SC_PASS_MAX
-
-    _SC_XOPEN_VERSION,
-#define _SC_XOPEN_VERSION		_SC_XOPEN_VERSION
-    _SC_XOPEN_XCU_VERSION,
-#define _SC_XOPEN_XCU_VERSION		_SC_XOPEN_XCU_VERSION
-    _SC_XOPEN_UNIX,
-#define _SC_XOPEN_UNIX			_SC_XOPEN_UNIX
-    _SC_XOPEN_CRYPT,
-#define _SC_XOPEN_CRYPT			_SC_XOPEN_CRYPT
-    _SC_XOPEN_ENH_I18N,
-#define _SC_XOPEN_ENH_I18N		_SC_XOPEN_ENH_I18N
-    _SC_XOPEN_SHM,
-#define _SC_XOPEN_SHM			_SC_XOPEN_SHM
-
-    _SC_2_CHAR_TERM,
-#define _SC_2_CHAR_TERM			_SC_2_CHAR_TERM
-    _SC_2_C_VERSION,
-#define _SC_2_C_VERSION			_SC_2_C_VERSION
-    _SC_2_UPE,
-#define _SC_2_UPE			_SC_2_UPE
-
-    _SC_XOPEN_XPG2,
-#define _SC_XOPEN_XPG2			_SC_XOPEN_XPG2
-    _SC_XOPEN_XPG3,
-#define _SC_XOPEN_XPG3			_SC_XOPEN_XPG3
-    _SC_XOPEN_XPG4,
-#define _SC_XOPEN_XPG4			_SC_XOPEN_XPG4
-
-    _SC_CHAR_BIT,
-#define	_SC_CHAR_BIT			_SC_CHAR_BIT
-    _SC_CHAR_MAX,
-#define	_SC_CHAR_MAX			_SC_CHAR_MAX
-    _SC_CHAR_MIN,
-#define	_SC_CHAR_MIN			_SC_CHAR_MIN
-    _SC_INT_MAX,
-#define	_SC_INT_MAX			_SC_INT_MAX
-    _SC_INT_MIN,
-#define	_SC_INT_MIN			_SC_INT_MIN
-    _SC_LONG_BIT,
-#define	_SC_LONG_BIT			_SC_LONG_BIT
-    _SC_WORD_BIT,
-#define	_SC_WORD_BIT			_SC_WORD_BIT
-    _SC_MB_LEN_MAX,
-#define	_SC_MB_LEN_MAX			_SC_MB_LEN_MAX
-    _SC_NZERO,
-#define	_SC_NZERO			_SC_NZERO
-    _SC_SSIZE_MAX,
-#define	_SC_SSIZE_MAX			_SC_SSIZE_MAX
-    _SC_SCHAR_MAX,
-#define	_SC_SCHAR_MAX			_SC_SCHAR_MAX
-    _SC_SCHAR_MIN,
-#define	_SC_SCHAR_MIN			_SC_SCHAR_MIN
-    _SC_SHRT_MAX,
-#define	_SC_SHRT_MAX			_SC_SHRT_MAX
-    _SC_SHRT_MIN,
-#define	_SC_SHRT_MIN			_SC_SHRT_MIN
-    _SC_UCHAR_MAX,
-#define	_SC_UCHAR_MAX			_SC_UCHAR_MAX
-    _SC_UINT_MAX,
-#define	_SC_UINT_MAX			_SC_UINT_MAX
-    _SC_ULONG_MAX,
-#define	_SC_ULONG_MAX			_SC_ULONG_MAX
-    _SC_USHRT_MAX,
-#define	_SC_USHRT_MAX			_SC_USHRT_MAX
-
-    _SC_NL_ARGMAX,
-#define	_SC_NL_ARGMAX			_SC_NL_ARGMAX
-    _SC_NL_LANGMAX,
-#define	_SC_NL_LANGMAX			_SC_NL_LANGMAX
-    _SC_NL_MSGMAX,
-#define	_SC_NL_MSGMAX			_SC_NL_MSGMAX
-    _SC_NL_NMAX,
-#define	_SC_NL_NMAX			_SC_NL_NMAX
-    _SC_NL_SETMAX,
-#define	_SC_NL_SETMAX			_SC_NL_SETMAX
-    _SC_NL_TEXTMAX,
-#define	_SC_NL_TEXTMAX			_SC_NL_TEXTMAX
-
-    _SC_XBS5_ILP32_OFF32,
-#define _SC_XBS5_ILP32_OFF32		_SC_XBS5_ILP32_OFF32
-    _SC_XBS5_ILP32_OFFBIG,
-#define _SC_XBS5_ILP32_OFFBIG		_SC_XBS5_ILP32_OFFBIG
-    _SC_XBS5_LP64_OFF64,
-#define _SC_XBS5_LP64_OFF64		_SC_XBS5_LP64_OFF64
-    _SC_XBS5_LPBIG_OFFBIG,
-#define _SC_XBS5_LPBIG_OFFBIG		_SC_XBS5_LPBIG_OFFBIG
-
-    _SC_XOPEN_LEGACY,
-#define _SC_XOPEN_LEGACY		_SC_XOPEN_LEGACY
-    _SC_XOPEN_REALTIME,
-#define _SC_XOPEN_REALTIME		_SC_XOPEN_REALTIME
-    _SC_XOPEN_REALTIME_THREADS,
-#define _SC_XOPEN_REALTIME_THREADS	_SC_XOPEN_REALTIME_THREADS
-
-    _SC_ADVISORY_INFO,
-#define _SC_ADVISORY_INFO		_SC_ADVISORY_INFO
-    _SC_BARRIERS,
-#define _SC_BARRIERS			_SC_BARRIERS
-    _SC_BASE,
-#define _SC_BASE			_SC_BASE
-    _SC_C_LANG_SUPPORT,
-#define _SC_C_LANG_SUPPORT		_SC_C_LANG_SUPPORT
-    _SC_C_LANG_SUPPORT_R,
-#define _SC_C_LANG_SUPPORT_R		_SC_C_LANG_SUPPORT_R
-    _SC_CLOCK_SELECTION,
-#define _SC_CLOCK_SELECTION		_SC_CLOCK_SELECTION
-    _SC_CPUTIME,
-#define _SC_CPUTIME			_SC_CPUTIME
-    _SC_THREAD_CPUTIME,
-#define _SC_THREAD_CPUTIME		_SC_THREAD_CPUTIME
-    _SC_DEVICE_IO,
-#define _SC_DEVICE_IO			_SC_DEVICE_IO
-    _SC_DEVICE_SPECIFIC,
-#define _SC_DEVICE_SPECIFIC		_SC_DEVICE_SPECIFIC
-    _SC_DEVICE_SPECIFIC_R,
-#define _SC_DEVICE_SPECIFIC_R		_SC_DEVICE_SPECIFIC_R
-    _SC_FD_MGMT,
-#define _SC_FD_MGMT			_SC_FD_MGMT
-    _SC_FIFO,
-#define _SC_FIFO			_SC_FIFO
-    _SC_PIPE,
-#define _SC_PIPE			_SC_PIPE
-    _SC_FILE_ATTRIBUTES,
-#define _SC_FILE_ATTRIBUTES		_SC_FILE_ATTRIBUTES
-    _SC_FILE_LOCKING,
-#define _SC_FILE_LOCKING		_SC_FILE_LOCKING
-    _SC_FILE_SYSTEM,
-#define _SC_FILE_SYSTEM			_SC_FILE_SYSTEM
-    _SC_MONOTONIC_CLOCK,
-#define _SC_MONOTONIC_CLOCK		_SC_MONOTONIC_CLOCK
-    _SC_MULTI_PROCESS,
-#define _SC_MULTI_PROCESS		_SC_MULTI_PROCESS
-    _SC_SINGLE_PROCESS,
-#define _SC_SINGLE_PROCESS		_SC_SINGLE_PROCESS
-    _SC_NETWORKING,
-#define _SC_NETWORKING			_SC_NETWORKING
-    _SC_READER_WRITER_LOCKS,
-#define _SC_READER_WRITER_LOCKS		_SC_READER_WRITER_LOCKS
-    _SC_SPIN_LOCKS,
-#define _SC_SPIN_LOCKS			_SC_SPIN_LOCKS
-    _SC_REGEXP,
-#define _SC_REGEXP			_SC_REGEXP
-    _SC_REGEX_VERSION,
-#define _SC_REGEX_VERSION		_SC_REGEX_VERSION
-    _SC_SHELL,
-#define _SC_SHELL			_SC_SHELL
-    _SC_SIGNALS,
-#define _SC_SIGNALS			_SC_SIGNALS
-    _SC_SPAWN,
-#define _SC_SPAWN			_SC_SPAWN
-    _SC_SPORADIC_SERVER,
-#define _SC_SPORADIC_SERVER		_SC_SPORADIC_SERVER
-    _SC_THREAD_SPORADIC_SERVER,
-#define _SC_THREAD_SPORADIC_SERVER	_SC_THREAD_SPORADIC_SERVER
-    _SC_SYSTEM_DATABASE,
-#define _SC_SYSTEM_DATABASE		_SC_SYSTEM_DATABASE
-    _SC_SYSTEM_DATABASE_R,
-#define _SC_SYSTEM_DATABASE_R		_SC_SYSTEM_DATABASE_R
-    _SC_TIMEOUTS,
-#define _SC_TIMEOUTS			_SC_TIMEOUTS
-    _SC_TYPED_MEMORY_OBJECTS,
-#define _SC_TYPED_MEMORY_OBJECTS	_SC_TYPED_MEMORY_OBJECTS
-    _SC_USER_GROUPS,
-#define _SC_USER_GROUPS			_SC_USER_GROUPS
-    _SC_USER_GROUPS_R,
-#define _SC_USER_GROUPS_R		_SC_USER_GROUPS_R
-    _SC_2_PBS,
-#define _SC_2_PBS			_SC_2_PBS
-    _SC_2_PBS_ACCOUNTING,
-#define _SC_2_PBS_ACCOUNTING		_SC_2_PBS_ACCOUNTING
-    _SC_2_PBS_LOCATE,
-#define _SC_2_PBS_LOCATE		_SC_2_PBS_LOCATE
-    _SC_2_PBS_MESSAGE,
-#define _SC_2_PBS_MESSAGE		_SC_2_PBS_MESSAGE
-    _SC_2_PBS_TRACK,
-#define _SC_2_PBS_TRACK			_SC_2_PBS_TRACK
-    _SC_SYMLOOP_MAX,
-#define _SC_SYMLOOP_MAX			_SC_SYMLOOP_MAX
-    _SC_STREAMS,
-#define _SC_STREAMS			_SC_STREAMS
-    _SC_2_PBS_CHECKPOINT,
-#define _SC_2_PBS_CHECKPOINT		_SC_2_PBS_CHECKPOINT
-
-    _SC_V6_ILP32_OFF32,
-#define _SC_V6_ILP32_OFF32		_SC_V6_ILP32_OFF32
-    _SC_V6_ILP32_OFFBIG,
-#define _SC_V6_ILP32_OFFBIG		_SC_V6_ILP32_OFFBIG
-    _SC_V6_LP64_OFF64,
-#define _SC_V6_LP64_OFF64		_SC_V6_LP64_OFF64
-    _SC_V6_LPBIG_OFFBIG,
-#define _SC_V6_LPBIG_OFFBIG		_SC_V6_LPBIG_OFFBIG
-
-    _SC_HOST_NAME_MAX,
-#define _SC_HOST_NAME_MAX		_SC_HOST_NAME_MAX
-    _SC_TRACE,
-#define _SC_TRACE			_SC_TRACE
-    _SC_TRACE_EVENT_FILTER,
-#define _SC_TRACE_EVENT_FILTER		_SC_TRACE_EVENT_FILTER
-    _SC_TRACE_INHERIT,
-#define _SC_TRACE_INHERIT		_SC_TRACE_INHERIT
-    _SC_TRACE_LOG,
-#define _SC_TRACE_LOG			_SC_TRACE_LOG
-
-    _SC_LEVEL1_ICACHE_SIZE,
-#define _SC_LEVEL1_ICACHE_SIZE		_SC_LEVEL1_ICACHE_SIZE
-    _SC_LEVEL1_ICACHE_ASSOC,
-#define _SC_LEVEL1_ICACHE_ASSOC		_SC_LEVEL1_ICACHE_ASSOC
-    _SC_LEVEL1_ICACHE_LINESIZE,
-#define _SC_LEVEL1_ICACHE_LINESIZE	_SC_LEVEL1_ICACHE_LINESIZE
-    _SC_LEVEL1_DCACHE_SIZE,
-#define _SC_LEVEL1_DCACHE_SIZE		_SC_LEVEL1_DCACHE_SIZE
-    _SC_LEVEL1_DCACHE_ASSOC,
-#define _SC_LEVEL1_DCACHE_ASSOC		_SC_LEVEL1_DCACHE_ASSOC
-    _SC_LEVEL1_DCACHE_LINESIZE,
-#define _SC_LEVEL1_DCACHE_LINESIZE	_SC_LEVEL1_DCACHE_LINESIZE
-    _SC_LEVEL2_CACHE_SIZE,
-#define _SC_LEVEL2_CACHE_SIZE		_SC_LEVEL2_CACHE_SIZE
-    _SC_LEVEL2_CACHE_ASSOC,
-#define _SC_LEVEL2_CACHE_ASSOC		_SC_LEVEL2_CACHE_ASSOC
-    _SC_LEVEL2_CACHE_LINESIZE,
-#define _SC_LEVEL2_CACHE_LINESIZE	_SC_LEVEL2_CACHE_LINESIZE
-    _SC_LEVEL3_CACHE_SIZE,
-#define _SC_LEVEL3_CACHE_SIZE		_SC_LEVEL3_CACHE_SIZE
-    _SC_LEVEL3_CACHE_ASSOC,
-#define _SC_LEVEL3_CACHE_ASSOC		_SC_LEVEL3_CACHE_ASSOC
-    _SC_LEVEL3_CACHE_LINESIZE,
-#define _SC_LEVEL3_CACHE_LINESIZE	_SC_LEVEL3_CACHE_LINESIZE
-    _SC_LEVEL4_CACHE_SIZE,
-#define _SC_LEVEL4_CACHE_SIZE		_SC_LEVEL4_CACHE_SIZE
-    _SC_LEVEL4_CACHE_ASSOC,
-#define _SC_LEVEL4_CACHE_ASSOC		_SC_LEVEL4_CACHE_ASSOC
-    _SC_LEVEL4_CACHE_LINESIZE,
-#define _SC_LEVEL4_CACHE_LINESIZE	_SC_LEVEL4_CACHE_LINESIZE
-    /* Leave room here, maybe we need a few more cache levels some day.  */
-
-    _SC_IPV6 = _SC_LEVEL1_ICACHE_SIZE + 50,
-#define _SC_IPV6			_SC_IPV6
-    _SC_RAW_SOCKETS,
-#define _SC_RAW_SOCKETS			_SC_RAW_SOCKETS
-
-    _SC_V7_ILP32_OFF32,
-#define _SC_V7_ILP32_OFF32		_SC_V7_ILP32_OFF32
-    _SC_V7_ILP32_OFFBIG,
-#define _SC_V7_ILP32_OFFBIG		_SC_V7_ILP32_OFFBIG
-    _SC_V7_LP64_OFF64,
-#define _SC_V7_LP64_OFF64		_SC_V7_LP64_OFF64
-    _SC_V7_LPBIG_OFFBIG,
-#define _SC_V7_LPBIG_OFFBIG		_SC_V7_LPBIG_OFFBIG
-
-    _SC_SS_REPL_MAX,
-#define _SC_SS_REPL_MAX			_SC_SS_REPL_MAX
-
-    _SC_TRACE_EVENT_NAME_MAX,
-#define _SC_TRACE_EVENT_NAME_MAX	_SC_TRACE_EVENT_NAME_MAX
-    _SC_TRACE_NAME_MAX,
-#define _SC_TRACE_NAME_MAX		_SC_TRACE_NAME_MAX
-    _SC_TRACE_SYS_MAX,
-#define _SC_TRACE_SYS_MAX		_SC_TRACE_SYS_MAX
-    _SC_TRACE_USER_EVENT_MAX,
-#define _SC_TRACE_USER_EVENT_MAX	_SC_TRACE_USER_EVENT_MAX
-
-    _SC_XOPEN_STREAMS,
-#define _SC_XOPEN_STREAMS		_SC_XOPEN_STREAMS
-
-    _SC_THREAD_ROBUST_PRIO_INHERIT,
-#define _SC_THREAD_ROBUST_PRIO_INHERIT	_SC_THREAD_ROBUST_PRIO_INHERIT
-    _SC_THREAD_ROBUST_PRIO_PROTECT
-#define _SC_THREAD_ROBUST_PRIO_PROTECT	_SC_THREAD_ROBUST_PRIO_PROTECT
-  };
-
-/* Values for the NAME argument to `confstr'.  */
-enum
-  {
-    _CS_PATH,			/* The default search path.  */
-#define _CS_PATH		_CS_PATH
-
-    _CS_V6_WIDTH_RESTRICTED_ENVS,
-#define _CS_V6_WIDTH_RESTRICTED_ENVS	_CS_V6_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS	_CS_V6_WIDTH_RESTRICTED_ENVS
-
-    _CS_GNU_LIBC_VERSION,
-#define _CS_GNU_LIBC_VERSION	_CS_GNU_LIBC_VERSION
-    _CS_GNU_LIBPTHREAD_VERSION,
-#define _CS_GNU_LIBPTHREAD_VERSION	_CS_GNU_LIBPTHREAD_VERSION
-
-    _CS_V5_WIDTH_RESTRICTED_ENVS,
-#define _CS_V5_WIDTH_RESTRICTED_ENVS	_CS_V5_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V5_WIDTH_RESTRICTED_ENVS	_CS_V5_WIDTH_RESTRICTED_ENVS
-
-    _CS_V7_WIDTH_RESTRICTED_ENVS,
-#define _CS_V7_WIDTH_RESTRICTED_ENVS	_CS_V7_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS	_CS_V7_WIDTH_RESTRICTED_ENVS
-
-    _CS_LFS_CFLAGS = 1000,
-#define _CS_LFS_CFLAGS	_CS_LFS_CFLAGS
-    _CS_LFS_LDFLAGS,
-#define _CS_LFS_LDFLAGS	_CS_LFS_LDFLAGS
-    _CS_LFS_LIBS,
-#define _CS_LFS_LIBS		_CS_LFS_LIBS
-    _CS_LFS_LINTFLAGS,
-#define _CS_LFS_LINTFLAGS	_CS_LFS_LINTFLAGS
-    _CS_LFS64_CFLAGS,
-#define _CS_LFS64_CFLAGS	_CS_LFS64_CFLAGS
-    _CS_LFS64_LDFLAGS,
-#define _CS_LFS64_LDFLAGS	_CS_LFS64_LDFLAGS
-    _CS_LFS64_LIBS,
-#define _CS_LFS64_LIBS	_CS_LFS64_LIBS
-    _CS_LFS64_LINTFLAGS,
-#define _CS_LFS64_LINTFLAGS	_CS_LFS64_LINTFLAGS
-
-    _CS_XBS5_ILP32_OFF32_CFLAGS = 1100,
-#define _CS_XBS5_ILP32_OFF32_CFLAGS _CS_XBS5_ILP32_OFF32_CFLAGS
-    _CS_XBS5_ILP32_OFF32_LDFLAGS,
-#define _CS_XBS5_ILP32_OFF32_LDFLAGS _CS_XBS5_ILP32_OFF32_LDFLAGS
-    _CS_XBS5_ILP32_OFF32_LIBS,
-#define _CS_XBS5_ILP32_OFF32_LIBS _CS_XBS5_ILP32_OFF32_LIBS
-    _CS_XBS5_ILP32_OFF32_LINTFLAGS,
-#define _CS_XBS5_ILP32_OFF32_LINTFLAGS _CS_XBS5_ILP32_OFF32_LINTFLAGS
-    _CS_XBS5_ILP32_OFFBIG_CFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_CFLAGS _CS_XBS5_ILP32_OFFBIG_CFLAGS
-    _CS_XBS5_ILP32_OFFBIG_LDFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_LDFLAGS _CS_XBS5_ILP32_OFFBIG_LDFLAGS
-    _CS_XBS5_ILP32_OFFBIG_LIBS,
-#define _CS_XBS5_ILP32_OFFBIG_LIBS _CS_XBS5_ILP32_OFFBIG_LIBS
-    _CS_XBS5_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_LINTFLAGS _CS_XBS5_ILP32_OFFBIG_LINTFLAGS
-    _CS_XBS5_LP64_OFF64_CFLAGS,
-#define _CS_XBS5_LP64_OFF64_CFLAGS _CS_XBS5_LP64_OFF64_CFLAGS
-    _CS_XBS5_LP64_OFF64_LDFLAGS,
-#define _CS_XBS5_LP64_OFF64_LDFLAGS _CS_XBS5_LP64_OFF64_LDFLAGS
-    _CS_XBS5_LP64_OFF64_LIBS,
-#define _CS_XBS5_LP64_OFF64_LIBS _CS_XBS5_LP64_OFF64_LIBS
-    _CS_XBS5_LP64_OFF64_LINTFLAGS,
-#define _CS_XBS5_LP64_OFF64_LINTFLAGS _CS_XBS5_LP64_OFF64_LINTFLAGS
-    _CS_XBS5_LPBIG_OFFBIG_CFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_CFLAGS _CS_XBS5_LPBIG_OFFBIG_CFLAGS
-    _CS_XBS5_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_LDFLAGS _CS_XBS5_LPBIG_OFFBIG_LDFLAGS
-    _CS_XBS5_LPBIG_OFFBIG_LIBS,
-#define _CS_XBS5_LPBIG_OFFBIG_LIBS _CS_XBS5_LPBIG_OFFBIG_LIBS
-    _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS
-
-    _CS_POSIX_V6_ILP32_OFF32_CFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS _CS_POSIX_V6_ILP32_OFF32_CFLAGS
-    _CS_POSIX_V6_ILP32_OFF32_LDFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS _CS_POSIX_V6_ILP32_OFF32_LDFLAGS
-    _CS_POSIX_V6_ILP32_OFF32_LIBS,
-#define _CS_POSIX_V6_ILP32_OFF32_LIBS _CS_POSIX_V6_ILP32_OFF32_LIBS
-    _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS
-    _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS
-    _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS
-    _CS_POSIX_V6_ILP32_OFFBIG_LIBS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS _CS_POSIX_V6_ILP32_OFFBIG_LIBS
-    _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS
-    _CS_POSIX_V6_LP64_OFF64_CFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_CFLAGS _CS_POSIX_V6_LP64_OFF64_CFLAGS
-    _CS_POSIX_V6_LP64_OFF64_LDFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS _CS_POSIX_V6_LP64_OFF64_LDFLAGS
-    _CS_POSIX_V6_LP64_OFF64_LIBS,
-#define _CS_POSIX_V6_LP64_OFF64_LIBS _CS_POSIX_V6_LP64_OFF64_LIBS
-    _CS_POSIX_V6_LP64_OFF64_LINTFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_LINTFLAGS _CS_POSIX_V6_LP64_OFF64_LINTFLAGS
-    _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS
-    _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS
-    _CS_POSIX_V6_LPBIG_OFFBIG_LIBS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS _CS_POSIX_V6_LPBIG_OFFBIG_LIBS
-    _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS
-
-    _CS_POSIX_V7_ILP32_OFF32_CFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_CFLAGS _CS_POSIX_V7_ILP32_OFF32_CFLAGS
-    _CS_POSIX_V7_ILP32_OFF32_LDFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_LDFLAGS _CS_POSIX_V7_ILP32_OFF32_LDFLAGS
-    _CS_POSIX_V7_ILP32_OFF32_LIBS,
-#define _CS_POSIX_V7_ILP32_OFF32_LIBS _CS_POSIX_V7_ILP32_OFF32_LIBS
-    _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS
-    _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS
-    _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS
-    _CS_POSIX_V7_ILP32_OFFBIG_LIBS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LIBS _CS_POSIX_V7_ILP32_OFFBIG_LIBS
-    _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS
-    _CS_POSIX_V7_LP64_OFF64_CFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_CFLAGS _CS_POSIX_V7_LP64_OFF64_CFLAGS
-    _CS_POSIX_V7_LP64_OFF64_LDFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_LDFLAGS _CS_POSIX_V7_LP64_OFF64_LDFLAGS
-    _CS_POSIX_V7_LP64_OFF64_LIBS,
-#define _CS_POSIX_V7_LP64_OFF64_LIBS _CS_POSIX_V7_LP64_OFF64_LIBS
-    _CS_POSIX_V7_LP64_OFF64_LINTFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_LINTFLAGS _CS_POSIX_V7_LP64_OFF64_LINTFLAGS
-    _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS
-    _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS
-    _CS_POSIX_V7_LPBIG_OFFBIG_LIBS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS _CS_POSIX_V7_LPBIG_OFFBIG_LIBS
-    _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS
-
-    _CS_V6_ENV,
-#define _CS_V6_ENV			_CS_V6_ENV
-    _CS_V7_ENV
-#define _CS_V7_ENV			_CS_V7_ENV
-  };
-
-#endif /* defined(_CONFNAME_H) */
diff --git a/srcpkgs/lshw/patches/musl-confname_h.patch b/srcpkgs/lshw/patches/musl-confname_h.patch
deleted file mode 100644
index 3d4b1f00267..00000000000
--- a/srcpkgs/lshw/patches/musl-confname_h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-The musl libc does not define the _sysconf(2) constant _SC_LONG_BIT,
-thus include a local copy of GNU libc's /usr/include/bits/confname.h
-
---- src/core/abi.cc	2015-10-14 10:09:57.131324977 +0200
-+++ src/core/abi.cc	2015-10-14 10:15:29.040299081 +0200
-@@ -8,6 +8,9 @@
- #include "config.h"
- #include "abi.h"
- #include "osutils.h"
-+#if !defined(__GLIBC__)
-+#include "confname.h"
-+#endif
- #include <unistd.h>
- #include <stdlib.h>
- #include <dirent.h>
diff --git a/srcpkgs/lshw/patches/musl-long_bits.patch b/srcpkgs/lshw/patches/musl-long_bits.patch
new file mode 100644
index 00000000000..e67df9ddc6c
--- /dev/null
+++ b/srcpkgs/lshw/patches/musl-long_bits.patch
@@ -0,0 +1,20 @@
+sysconf(LONG_BIT) isn't correct usage of sysconf(3).
+
+musl doesn't define _SC_LONG_BIT, so just use LONG_BIT directly. There's really
+no reason to use sysconf(3) here, word size isn't a runtime property.
+
+diff --git src/core/abi.cc src/core/abi.cc
+index adff7b5..76c664c 100644
+--- src/core/abi.cc
++++ src/core/abi.cc
+@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
+ bool scan_abi(hwNode & system)
+ {
+   // are we compiled as 32- or 64-bit process ?
+-  long sc = sysconf(LONG_BIT);
+-  if(sc==-1) sc = sysconf(_SC_LONG_BIT);
+-  if(sc!=-1) system.setWidth(sc);
++  system.setWidth(LONG_BIT);
+ 
+   pushd(PROC_SYS);
+ 
diff --git a/srcpkgs/lshw/patches/musl-path_max.patch b/srcpkgs/lshw/patches/musl-path_max.patch
deleted file mode 100644
index e10dd0c6df0..00000000000
--- a/srcpkgs/lshw/patches/musl-path_max.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Need to include limits.h for the definition of PATH_MAX.
-
---- src/core/cpufreq.cc	2015-10-14 10:07:06.646338278 +0200
-+++ src/core/cpufreq.cc	2015-10-14 10:08:09.092333406 +0200
-@@ -10,6 +10,7 @@
- #include "version.h"
- #include "hw.h"
- #include "osutils.h"
-+#include <limits.h>
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/srcpkgs/lshw/template b/srcpkgs/lshw/template
index c6d0130a766..6ba1bb44a95 100644
--- a/srcpkgs/lshw/template
+++ b/srcpkgs/lshw/template
@@ -1,7 +1,7 @@
 # Template file for 'lshw'
 pkgname=lshw
 version=B.02.19.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="VERSION=${version}"
 make_build_target="all gui"
@@ -18,11 +18,6 @@ distfiles="https://ezix.org/software/files/lshw-${version}.tar.gz"
 checksum=9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80
 
 post_patch() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			cp -p ${FILESDIR}/confname.h ${wrksrc}/src/core
-			;;
-	esac
 	vsed -i src/Makefile src/gui/Makefile \
 		-e 's,CXXFLAGS=,CXXFLAGS += ,g'
 }

From ab114df12838afc38be8bbb97012207c5ba4deee Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Mon, 11 Jan 2021 16:15:59 +0100
Subject: [PATCH 270/419] qjackctl: Add build option for jack-session support

This option is necessary to make it possible to use qjackctl with
PipeWire, which doesn't support the jack session protocol.

Since this doesn't change the resulting package, it isn't revbumped.

Closes: #27828 [via git-merge-pr]
---
 srcpkgs/qjackctl/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index 83743edd237..f47da62e887 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -4,6 +4,7 @@ version=0.9.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
+configure_args="$(vopt_enable jack_session jack-session)"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel qt5-devel jack-devel qt5-x11extras-devel"
 depends="desktop-file-utils hicolor-icon-theme jack"
@@ -14,6 +15,10 @@ homepage="http://qjackctl.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=5196c5c01b7948c1a8ca37cd3198a7f0fe095a99a34a67086abd3466855b4abd
 
+build_options="jack_session"
+build_options_default="jack_session"
+desc_option_jack_session="Enable support for the deprecated Jack Session API"
+
 if [ "${CROSS_BUILD}" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel qt5-x11extras-devel"
 	configure_args+=" ac_cv_path_ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake"

From b60d9f3716a502c19715dfd5344d6d6a52aa8c13 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 11 Jan 2021 10:26:54 +1100
Subject: [PATCH 271/419] upmpdcli: update to 1.5.8

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

diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index 99eb988d948..2107b090313 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,6 +1,6 @@
 # Template file for 'upmpdcli'
 pkgname=upmpdcli
-version=1.5.7
+version=1.5.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config tar"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.lesbonscomptes.com/upmpdcli"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz"
-checksum=37ccd3bf24641eab979fa6bb143554384e24f954bcbd98488ce7334235dab0e3
+checksum=802a2ab795841fbb9bfff5fd7951881022f5414ed893a1db704801b999e658a8
 python_version=3
 
 system_accounts="_upmpdcli"

From 6799eaca54c98da2068870353384f37080d7a358 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 10 Jan 2021 19:55:23 +0100
Subject: [PATCH 272/419] lzip: update to 1.22

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

diff --git a/srcpkgs/lzip/template b/srcpkgs/lzip/template
index bc130ffc4d2..288a8163fae 100644
--- a/srcpkgs/lzip/template
+++ b/srcpkgs/lzip/template
@@ -1,14 +1,14 @@
 # Template file for 'lzip'
 pkgname=lzip
-version=1.21
+version=1.22
 revision=1
 build_style=gnu-configure
 short_desc="Lossless data compressor based on the LZMA algorithm"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.nongnu.org/lzip/lzip.html"
 distfiles="${NONGNU_SITE}/lzip/lzip-${version}.tar.gz"
-checksum=e48b5039d3164d670791f9c5dbaa832bf2df080cb1fbb4f33aa7b3300b670d8b
+checksum=c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948
 
 do_configure() {
 	./configure --prefix=/usr CXX="$CXX" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS"

From f870ab17d26536aa7ffaa18d201da6576fee66ce Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Sun, 10 Jan 2021 16:49:08 +0100
Subject: [PATCH 273/419] task: update to 2.5.3.

Use GitHub distfile location and vcompletion helper.

Closes: #27809 [via git-merge-pr]
---
 srcpkgs/task/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/task/template b/srcpkgs/task/template
index cc7944eae2e..024553ea2ca 100644
--- a/srcpkgs/task/template
+++ b/srcpkgs/task/template
@@ -1,19 +1,19 @@
 # Template file for 'task'
 pkgname=task
-version=2.5.1
-revision=6
+version=2.5.3
+revision=1
 build_style=cmake
 makedepends="libuuid-devel gnutls-devel"
 short_desc="Task Warrior command-line todo list manager"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
 homepage="https://taskwarrior.org"
-distfiles="https://taskwarrior.org/download/${pkgname}-${version}.tar.gz"
-checksum=d87bcee58106eb8a79b850e9abc153d98b79e00d50eade0d63917154984f2a15
+distfiles="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/task-${version}.tar.gz"
+checksum=7243d75e0911d9e2c9119ad94a61a87f041e4053e197f7280c42410aa1ee963b
 
 post_install() {
-	vinstall scripts/zsh/_task 644 usr/share/zsh/site-functions
-	vinstall scripts/bash/task.sh 644 usr/share/bash-completion/completions ${pkgname}
-	vinstall scripts/fish/task.fish 644 usr/share/fish/vendor_completions.d
+	vcompletion scripts/zsh/_task zsh
+	vcompletion scripts/bash/task.sh bash
+	vcompletion scripts/fish/task.fish fish
 	vlicense LICENSE
 }

From 886d7266b8e023193a1e1d0a0f9b16c566b6caf7 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Sat, 9 Jan 2021 22:12:06 +0100
Subject: [PATCH 274/419] pueue: update to 0.10.2

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

diff --git a/srcpkgs/pueue/template b/srcpkgs/pueue/template
index a02bf8af489..adb0e9ea182 100644
--- a/srcpkgs/pueue/template
+++ b/srcpkgs/pueue/template
@@ -1,6 +1,6 @@
 # Template file for 'pueue'
 pkgname=pueue
-version=0.9.0
+version=0.10.2
 revision=1
 build_style=cargo
 short_desc="Command-line tool for managing long-running tasks"
@@ -8,7 +8,7 @@ maintainer="crater2150 <void@qwertyuiop.de>"
 license="MIT"
 homepage="https://github.com/Nukesor/pueue"
 distfiles="https://github.com/Nukesor/pueue/archive/v${version}.tar.gz"
-checksum=15fc17ffc931ba077bf7951f403009bd8391eec9e735b0c7297a5dfba997ebed
+checksum=dbd333079df9249609f6a01d7c96175ec9d74f9d621688b95ec755134b7fa1f5
 
 post_install() {
 	vlicense LICENSE

From 8e405a8ee59d3c9d359c87aa7f34e0029e5e4782 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Jan 2021 22:25:28 +0200
Subject: [PATCH 275/419] zziplib: update to 0.13.72.

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

diff --git a/srcpkgs/zziplib/template b/srcpkgs/zziplib/template
index 74c093cff52..ab5af234af6 100644
--- a/srcpkgs/zziplib/template
+++ b/srcpkgs/zziplib/template
@@ -1,6 +1,6 @@
 # Template file for 'zziplib'
 pkgname=zziplib
-version=0.13.71
+version=0.13.72
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config python3 tar zip"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later, MPL-1.1"
 homepage="https://github.com/gdraheim/zziplib"
 changelog="https://raw.githubusercontent.com/gdraheim/zziplib/master/ChangeLog"
 distfiles="https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz"
-checksum=2ee1e0fbbb78ec7cc46bde5b62857bc51f8d665dd265577cf93584344b8b9de2
+checksum=93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DZZIPTEST=OFF"

From 62676235a428e7b6d35f4f17446d540173b46cc8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Jan 2021 22:13:05 +0200
Subject: [PATCH 276/419] zile: update to 2.4.15.

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

diff --git a/srcpkgs/zile/template b/srcpkgs/zile/template
index a2326621e1c..e710cb6d622 100644
--- a/srcpkgs/zile/template
+++ b/srcpkgs/zile/template
@@ -1,16 +1,16 @@
 # Template file for 'zile'
 pkgname=zile
-version=2.4.14
-revision=3
+version=2.4.15
+revision=1
 build_style=gnu-configure
 hostmakedepends="help2man pkg-config"
 makedepends="acl-devel gc-devel libatomic_ops-devel ncurses-devel"
-short_desc="A small, fast, and powerful Emacs clone"
+short_desc="Small, fast, and powerful Emacs clone"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/zile"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74
+checksum=39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e
 
 post_configure() {
 	if [ "$CROSS_BUILD" ]; then

From 1bafc648115f2967a8d2bb0741f85b42f858e043 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 10 Jan 2021 01:29:54 +0200
Subject: [PATCH 277/419] vitetris: update to 0.59.1.

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

diff --git a/srcpkgs/vitetris/template b/srcpkgs/vitetris/template
index 64e8df0d186..833a3cb491e 100644
--- a/srcpkgs/vitetris/template
+++ b/srcpkgs/vitetris/template
@@ -1,6 +1,6 @@
 # Template file for 'vitetris'
 pkgname=vitetris
-version=0.58.0
+version=0.59.1
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --with-ncurses --without-x"
@@ -11,7 +11,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="BSD-2-Clause"
 homepage="http://www.victornils.net/tetris/"
 distfiles="https://github.com/vicgeralds/vitetris/archive/v${version}.tar.gz"
-checksum=e7e7cb74bb814b9fec80fe4ede3c3f04134d8217d630e092a097238248d604f9
+checksum=699443df03c8d4bf2051838c1015da72039bbbdd0ab0eede891c59c840bdf58d
 
 post_install() {
 	sed -i 's/Exec=tetris/Exec=vitetris/' $DESTDIR/usr/share/applications/vitetris.desktop

From d199a725664471836760d8578e3550251b2dcea2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Jan 2021 22:03:17 +0200
Subject: [PATCH 278/419] moe: update to 1.11.

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

diff --git a/srcpkgs/moe/template b/srcpkgs/moe/template
index 58cbae94309..0b41e267582 100644
--- a/srcpkgs/moe/template
+++ b/srcpkgs/moe/template
@@ -1,6 +1,6 @@
 # Template file for 'moe'
 pkgname=moe
-version=1.10
+version=1.11
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnu.org/software/moe/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.lz"
-checksum=8cfd44ab5623ed4185ee53962b879fd9bdd18eab47bf5dd9bdb8271f1bf7d53b
+checksum=0efbcbcf5a4a8d966541c6cb099ba0ab6416780366dbce82d9ff995a85a5e2f9
 
 pre_configure() {
 	# remove hardcoded values

From 45a5a4e753acb594f543ff1ffe556ab09b01000b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 10:46:27 -0500
Subject: [PATCH 279/419] djmount: remove package

Upstream has not been updated since 2006-08-27.
---
 srcpkgs/djmount/INSTALL.msg                   |   1 +
 srcpkgs/djmount/patches/000_djmount.1.diff    | 105 ------------------
 .../djmount/patches/001-libupnp-1.6.6.diff    |  31 ------
 .../patches/003-support-fstab-mounting.diff   |  96 ----------------
 .../patches/djmount-0.71-includes.patch       |  10 --
 srcpkgs/djmount/patches/musl.patch            |  11 --
 srcpkgs/djmount/template                      |  16 +--
 7 files changed, 4 insertions(+), 266 deletions(-)
 create mode 100644 srcpkgs/djmount/INSTALL.msg
 delete mode 100644 srcpkgs/djmount/patches/000_djmount.1.diff
 delete mode 100644 srcpkgs/djmount/patches/001-libupnp-1.6.6.diff
 delete mode 100644 srcpkgs/djmount/patches/003-support-fstab-mounting.diff
 delete mode 100644 srcpkgs/djmount/patches/djmount-0.71-includes.patch
 delete mode 100644 srcpkgs/djmount/patches/musl.patch

diff --git a/srcpkgs/djmount/INSTALL.msg b/srcpkgs/djmount/INSTALL.msg
new file mode 100644
index 00000000000..32dd66613a6
--- /dev/null
+++ b/srcpkgs/djmount/INSTALL.msg
@@ -0,0 +1 @@
+djmount is no longer provided by Void Linux
diff --git a/srcpkgs/djmount/patches/000_djmount.1.diff b/srcpkgs/djmount/patches/000_djmount.1.diff
deleted file mode 100644
index a20589a339d..00000000000
--- a/srcpkgs/djmount/patches/000_djmount.1.diff
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Description: Adds djmount.1 manpage which isn't included in original sources.
-# Forwarded: http://sourceforge.net/tracker/index.php?func=detail&aid=2834139&group_id=142039&atid=751320
-# Author: Dario Minnucci <midget@debian.org>
-# Last-Update: 2010-01-24
-#
---- djmount.1	1970-01-01 01:00:00.000000000 +0100
-+++ djmount.1	2009-08-31 19:38:36.289425318 +0200
-@@ -0,0 +1,96 @@
-+.\"                                      Hey, EMACS: -*- nroff -*-
-+.\" First parameter, NAME, should be all caps
-+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-+.\" other parameters are allowed: see man(7), man(1)
-+.TH DJMOUNT 1 "August 31, 2009"
-+.\" Please adjust this date whenever revising the manpage.
-+.\"
-+.\" Some roff macros, for reference:
-+.\" .nh        disable hyphenation
-+.\" .hy        enable hyphenation
-+.\" .ad l      left justify
-+.\" .ad b      justify to both left and right margins
-+.\" .nf        disable filling
-+.\" .fi        enable filling
-+.\" .br        insert line break
-+.\" .sp <n>    insert n+1 empty lines
-+.\" for manpage-specific macros, see man(7)
-+.SH NAME
-+djmount \- file system client for mounting network media servers
-+.SH SYNOPSIS
-+.B djmount
-+.RI [ options ] " mountpoint"
-+.br
-+.SH DESCRIPTION
-+This manual page describes briefly the
-+.B djmount
-+command.
-+.PP
-+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-+.\" respectively.
-+This package provides a client for Universal Plug'n'Play (UPnP) Audio-Visual MediaServers.  It discovers all compatible UPnP AV devices on the network automatically and mounts their media content as a file system using FUSE.
-+
-+.SH OPTIONS
-+This program follows the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+A summary of options is included below.
-+For a complete description, see the Info files.
-+
-+.TP
-+.B \-d[levels]
-+enable debug output (implies \-f)
-+
-+.TP
-+.B \-f
-+foreground operation (default: daemonized)
-+
-+.TP
-+.B \-h, \-\-help
-+print this help, then exit
-+
-+.TP
-+.B \-\-version
-+print version number, then exit
-+
-+.TP
-+.B \-o [options]
-+mount options (see below)
-+
-+
-+.TP
-+Mount options (one or more comma separated options):
-+
-+ iocharset=<charset>    filenames encoding (default: from environment)
-+ playlists              use playlists for AV files, instead of plain files
-+ search_history=<size>  number of remembered searches (default: 100)
-+                        (set to 0 to disable search)
-+
-+.TP
-+See FUSE documentation for the following mount options:
-+
-+ default_permissions    enable permission checking by kernel
-+ allow_other            allow access to other users
-+ allow_root             allow access to root
-+ kernel_cache           cache files in kernel
-+ nonempty               allow mounts over non-empty file/dir
-+ fsname=NAME            set filesystem name in mtab
-+
-+
-+.TP
-+Debug levels are one or more comma separated words:
-+
-+ upnperr, upnpall: increasing level of UPnP traces
-+ error, warn, info, debug: increasing level of djmount traces
-+ fuse: activates FUSE traces
-+ leak, leakfull: enable talloc leak reports at exit
-+ '\-d' alone defaults to 'upnpall, debug, fuse, leak' which is all traces.
-+
-+
-+.SH SEE ALSO
-+.BR fusermount (1)
-+.SH AUTHOR
-+djmount was written by Rémi Turboult <r3mi@users.sourceforge.net>.
-+.PP
-+This manual page was written by Dario Minnucci <midget@debian.org>,
-+for the Debian project (and may be used by others).
diff --git a/srcpkgs/djmount/patches/001-libupnp-1.6.6.diff b/srcpkgs/djmount/patches/001-libupnp-1.6.6.diff
deleted file mode 100644
index aebc9dd22c5..00000000000
--- a/srcpkgs/djmount/patches/001-libupnp-1.6.6.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Description: Update libupnp API for 1.6.x.
-#   Between libupnp2 and libupnp3 (pupnp 1.4.x and 1.6.x) the function
-#   SetLogFileNames was renamed to UpnpSetLogFileNames.
-# Author: nick@leverton.org
-# Bug-Debian: 581879 
-#
---- djmount/fuse_main.c	2010-05-16 21:40:56.000000000 +0100
-+++ djmount/fuse_main.c	2010-05-16 21:43:55.000000000 +0100
-@@ -616,7 +616,7 @@
- 	}  
- 	Log_Colorize (true);
- #if UPNP_HAVE_DEBUG
--	SetLogFileNames ("/dev/null", "/dev/null");
-+	UpnpSetLogFileNames ("/dev/null", "/dev/null");
- #endif
- 	
- 	/*
-@@ -710,10 +710,10 @@
- 					Log_SetMaxLevel (LOG_ERROR);
- #if UPNP_HAVE_DEBUG
- 				} else if (strcmp (s, "upnperr") == 0) {
--					SetLogFileNames ("/dev/stdout", 
-+					UpnpSetLogFileNames ("/dev/stdout",
- 							 "/dev/null");
- 				} else if (strcmp (s, "upnpall") == 0) {
--					SetLogFileNames ("/dev/stdout", 
-+					UpnpSetLogFileNames ("/dev/stdout",
- 							 "/dev/stdout");
- #endif
- 				} else {
diff --git a/srcpkgs/djmount/patches/003-support-fstab-mounting.diff b/srcpkgs/djmount/patches/003-support-fstab-mounting.diff
deleted file mode 100644
index 05a1e6f8539..00000000000
--- a/srcpkgs/djmount/patches/003-support-fstab-mounting.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-Description: Support /etc/fstab mounting
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3514280&group_id=142039&atid=751317
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660098
-Author: Kevin Vargo <vargok@yahoo.com>
-Last-Update: 2012-04-02
---- djmount/fuse_main.c	2006-08-27 16:12:20.000000000 -0400
-+++ djmount/fuse_main.c	2011-12-23 15:39:29.000000000 -0500
-@@ -529,6 +529,7 @@
-      "    --version              print version number, then exit\n"
-      "    -o [options]           mount options (see below)\n"
-      "    -d[levels]             enable debug output (implies -f)\n"
-+     "    -s                     sloppy -- ignore unknown options\n"
-      "    -f                     foreground operation (default: daemonized)\n"
-      "\n"
-      "Mount options (one or more comma separated options) :\n"
-@@ -538,6 +539,7 @@
-      "    playlists              use playlists for AV files, instead of plain files\n"
-      "    search_history=<size>  number of remembered searches (default: %d)\n"
-      "                           (set to 0 to disable search)\n"
-+     "    sloppy                 ignore unknown options (e.g., for /etc/fstab)\n"
-      "\n", DEFAULT_SEARCH_HISTORY_SIZE);
-   fprintf 
-     (stream,
-@@ -635,6 +637,9 @@
- 	Log_Printf (LOG_DEBUG, "  Fuse option = %s", fuse_argv[fuse_argc]); \
- 	fuse_argc++
- 
-+	//Ignore unknown options "sloppy" -- mount -s
-+	bool options_sloppy = false;
-+
- 	int opt = 1;
- 	char* o;
- 	while ((o = argv[opt++])) {
-@@ -646,6 +651,9 @@
- 			
- 		} else if (strcmp(o, "-f") == 0) {
- 			background = false;
-+			
-+		} else if (strcmp(o, "-s") == 0) {
-+			options_sloppy = true;
- 
- 		} else if (*o != '-') { 
- 			// mount point
-@@ -657,6 +665,10 @@
- 			char* options_copy = strdup (options);
- 			char* tokptr = 0;
- 			char* s;
-+
-+			char** unknown_options = talloc_size(tmp_ctx, sizeof(char) * strlen(options_copy));
-+			int unknown_ptr = -1;
-+
- 			for (s = strtok_r (options_copy, ",", &tokptr); 
- 			     s != NULL; 
- 			     s = strtok_r (NULL, ",", &tokptr)) {
-@@ -669,16 +681,39 @@
- 				} else if (strncmp(s, "search_history=", 15)
- 					   == 0) {
- 					search_history_size = atoi (s+15);
-+				//check for '-s|-o sloppy' -- ignore unknown options
-+				} else if (strncmp(s, "sloppy", 15) == 0 ||
-+						(strlen(s) == 1 && strncmp(s, "s", 1) == 0)) {
-+					options_sloppy = true;
- 				} else if (strncmp(s, "fsname=", 7) == 0 ||
- 					   strstr (FUSE_ALLOWED_OPTIONS, s)) {
- 					FUSE_ARG ("-o");
- 					FUSE_ARG (talloc_strdup (tmp_ctx, s));
- 				} else {
-+					//Record unknown options for analysis, after we're sure
-+					//we don't see '-o sloppy'
-+					unknown_options[++unknown_ptr] = strdup(s);
-+				}
-+			}
-+
-+			//Now, we should know if we have invalid option(s), or can
-+			//ignore:
-+			if (unknown_ptr >= 0) {
-+				//If debug...
-+				int i = 0;
-+				for (i = 0; i <= unknown_ptr; i++) {
-+					Log_Printf (LOG_WARNING, "Found unknown option = %s%s",
-+						unknown_options[i], (options_sloppy ? "; ignoring" : ""));
-+				}
-+				//If 'sloppy' is not enabled...
-+				if (! options_sloppy) {
- 					bad_usage (argv[0], 
--						   "unknown mount option '%s'",
--						   s); // ---------->
-+						   "unknown mount option '%s' (and [-s|-o sloppy] not provided)",
-+						   unknown_options[0]); // ---------->
- 				}
- 			}
-+			talloc_free(unknown_options);
-+
- 			free (options_copy);
- 			Log_Printf (LOG_INFO, "  Mount options = %s", options);
- 			
diff --git a/srcpkgs/djmount/patches/djmount-0.71-includes.patch b/srcpkgs/djmount/patches/djmount-0.71-includes.patch
deleted file mode 100644
index 36cf3be000c..00000000000
--- a/srcpkgs/djmount/patches/djmount-0.71-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- djmount/upnp_util.c.jx	2006-08-27 16:12:20.000000000 -0400
-+++ djmount/upnp_util.c	2011-05-31 12:30:42.980161484 -0400
-@@ -28,6 +28,7 @@
- #	include <config.h>
- #endif
- 
-+#include "upnp.h"
- #include "upnp_util.h"
- #include "log.h"
- #include "xml_util.h"
diff --git a/srcpkgs/djmount/patches/musl.patch b/srcpkgs/djmount/patches/musl.patch
deleted file mode 100644
index 14084beebea..00000000000
--- a/srcpkgs/djmount/patches/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- djmount/cache.h.orig	2016-04-25 08:49:55.265766330 +0200
-+++ djmount/cache.h	2016-04-25 08:50:06.728886696 +0200
-@@ -25,7 +25,7 @@
- 
- #include <stdlib.h>
- #include <stdbool.h>
--
-+#include <sys/time.h>
- 
- /******************************************************************************
-  * @var Cache
diff --git a/srcpkgs/djmount/template b/srcpkgs/djmount/template
index b0ef3b59c33..bd3ff5733a9 100644
--- a/srcpkgs/djmount/template
+++ b/srcpkgs/djmount/template
@@ -1,19 +1,9 @@
 # Template file for 'djmount'
 pkgname=djmount
 version=0.71
-revision=7
-build_style=gnu-configure
-configure_args="--with-external-libupnp --with-external-talloc"
-hostmakedepends="pkg-config"
-makedepends="fuse-devel talloc-devel libupnp-devel readline-devel"
-short_desc="Mount MediaServers content as a Linux file system"
+revision=8
+build_style=meta
+short_desc="Mount MediaServers content as a Linux file system (removed package)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://djmount.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=aa5bb482af4cbd42695a7e396043d47b53d075ac2f6aa18a8f8e11383c030e4f
-
-do_install() {
-	vbin djmount/djmount
-	vman djmount.1
-}

From 58600277687596c9be4f9109c8b92915b784322f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 11:47:03 -0500
Subject: [PATCH 280/419] retroshare: build against miniupnpc

---
 srcpkgs/retroshare/template | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 4931444905a..8b92dd990f1 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,12 +1,14 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=3
+revision=4
 wrksrc="RetroShare-${version}"
 build_style=qmake
-hostmakedepends="pkg-config qt5-qmake"
+configure_args="RS_UPNP_LIB=miniupnpc"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools
+ qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel"
 makedepends="ffmpeg-devel libgnome-keyring-devel libmicrohttpd-devel
- libopencv-devel libssh-devel libupnp-devel libXScrnSaver-devel libxslt-devel
+ libopencv-devel libssh-devel miniupnpc-devel libXScrnSaver-devel libxslt-devel
  pulseaudio-devel qt5-multimedia-devel qt5-tools-devel qt5-x11extras-devel
  speex-devel sqlcipher-devel sqlite-devel rapidjson"
 short_desc="Decentralized, private and secure commmunication and sharing platform"
@@ -16,5 +18,13 @@ homepage="https://retroshare.cc"
 distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz"
 checksum=901a1d1f282e04118fbe0e24190355b4a8f355a806cc5448738b1d691b46f5d5
 
-nocross="https://travis-ci.org/voidlinux/void-packages/jobs/375096223#L1160
- https://travis-ci.org/voidlinux/void-packages/jobs/375096224#L1668"
+post_patch() {
+	# upnputil.c includes a C++ header, so make sure qmake recognizes it as C++
+	mv libretroshare/src/upnp/upnputil.{c,cc}
+	vsed -i libretroshare/src/libretroshare.pro \
+		-e 's,\bupnp/upnputil.c\b,upnp/upnputil.cc,'
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 3a544ba7093ad37bee53bf8acda868703f27d34e Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Mon, 11 Jan 2021 16:35:15 +0100
Subject: [PATCH 281/419] libupnp: update to 1.14.0.

Closes #27829.
---
 common/shlibs            |  4 ++--
 srcpkgs/libupnp/template | 13 ++++++++-----
 srcpkgs/libupnp/update   |  1 -
 3 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 srcpkgs/libupnp/update

diff --git a/common/shlibs b/common/shlibs
index 3a329c443a6..1c04cc78885 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1452,8 +1452,8 @@ libedit.so.0 libedit-20130712.3.1_1
 libnet.so.9 libnet-1.2_1
 libgpaste.so.13 libgpaste-3.38.2_1
 libthreadutil.so.6 libupnp-1.6.18_1
-libixml.so.2 libupnp-1.6.18_1
-libupnp.so.6 libupnp-1.6.18_1
+libupnp.so.17 libupnp-1.14.0_1
+libixml.so.11 libupnp-1.14.0_1
 libupnpp.so.9 libupnpp-0.18.0_1
 libgeocode-glib.so.0 geocode-glib-3.10.0_1
 libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template
index fc06f05c442..9adb5f00da6 100644
--- a/srcpkgs/libupnp/template
+++ b/srcpkgs/libupnp/template
@@ -1,18 +1,20 @@
 # Template file for 'libupnp'
 pkgname=libupnp
-version=1.6.25
+version=1.14.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool"
-short_desc="A Portable Open Source UPnP Development Kit"
+hostmakedepends="automake libtool pkg-config"
+short_desc="Portable Open Source UPnP Development Kit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://pupnp.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/pupnp/$pkgname-$version.tar.bz2"
-checksum=c5a300b86775435c076d58a79cc0d5a977d76027d2a7d721590729b7f369fa43
+checksum=ecb23d4291968c8a7bdd4eb16fc2250dbacc16b354345a13342d67f571d35ceb
+
+CFLAGS="-D_FILE_OFFSET_BITS=64"
 
 post_install() {
-	vlicense LICENSE
+	vlicense COPYING
 }
 
 pre_configure() {
@@ -21,6 +23,7 @@ pre_configure() {
 
 libupnp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
+	conflicts="libupnp1.8-devel>=0"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/libupnp/update b/srcpkgs/libupnp/update
deleted file mode 100644
index f9e26f0c7e3..00000000000
--- a/srcpkgs/libupnp/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="1.8*"

From 435e10bde73ac624070e55400b93b4fd1d8cde24 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Mon, 11 Jan 2021 16:37:12 +0100
Subject: [PATCH 282/419] gerbera: update to 1.6.4

Closes: #27795 [via git-merge-pr]
---
 srcpkgs/gerbera/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index cdec13159fd..0c2cae408e1 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,17 +1,19 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.3.1
-revision=2
+version=1.6.4
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
- libexif-devel libupnp1.8-devel libuuid-devel sqlite-devel taglib-devel"
+ libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9
+checksum=cbe7ea78977db8c02fcca1759ed149f199a590afaf4a6d21ffcca8623d1a0cc5
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From 5b53b105e53ac8e2599c242ab411010be8b4ed2b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:12:23 -0500
Subject: [PATCH 283/419] mpd: rebuild against new libupnp

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

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 8ce4f1799a7..42e12041856 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
 version=0.22.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
@@ -21,7 +21,7 @@ hostmakedepends="pkg-config python3-Sphinx"
 makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel
  libcurl-devel libid3tag-devel libmad-devel libmikmod-devel libmms-devel
  libmodplug-devel libmpdclient-devel libnfs-devel libsamplerate-devel
- libsoup-devel libupnp1.8-devel mpg123-devel opus-devel yajl-devel
+ libsoup-devel libupnp-devel mpg123-devel opus-devel yajl-devel
  zziplib-devel libsoxr-devel audiofile-devel twolame-devel
  $(vopt_if io_uring 'liburing-devel')
  $(vopt_if cdio 'libcdio-paranoia-devel') $(vopt_if shoutcast 'libshout-devel')

From 970ba56ffbd95704b62da0cf96f6952d9a900aaf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:12:23 -0500
Subject: [PATCH 284/419] vlc: rebuild against new libupnp

---
 srcpkgs/vlc/template | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 9d9a8765429..7cb0b4a3c1d 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.11.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -30,7 +30,7 @@ makedepends="
  libcdio-devel libdca-devel libdvbpsi-devel libdvdnav-devel libmad-devel
  libmatroska-devel libmodplug-devel libmpcdec-devel libmpeg2-devel
  libmtp-devel libplacebo-devel libproxy-devel libsamplerate-devel
- libSM-devel libsysfs-devel libtheora-devel libupnp1.8-devel
+ libSM-devel libsysfs-devel libtheora-devel libupnp-devel
  libXinerama-devel libXpm-devel libXvMC-devel opus-devel pulseaudio-devel
  sndio-devel speex-devel taglib-devel wayland-protocols x264-devel
  xcb-util-devel xcb-util-keysyms-devel live555-devel libdvdread-devel
@@ -44,7 +44,7 @@ makedepends="
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
 
 # Package build options
-build_options="lua notify opengl qt smb svg v4l2 vaapi vdpau x265 sndio chromecast"
+build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
 build_options_default="lua smb v4l2 x265 sndio chromecast"
 
 CFLAGS="-fcommon"
@@ -60,15 +60,9 @@ case "$XBPS_TARGET_MACHINE" in
 		configure_args+=" --disable-altivec"
 		build_options_default+=" opengl"
 		;;
-	armv[67]l*)
+	armv[67]*)
 		# XXX only for rpi
-		configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil"
-		makedepends+=" rpi-userland-devel"
-		CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
-		CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos"
-		CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vmcs_host/linux"
-		CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads"
-		LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm"
+		build_options_default+=" rpi"
 		;;
 esac
 
@@ -76,6 +70,18 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" qt"
 fi
 
+if [ "$build_option_rpi" ]; then
+	configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil"
+	makedepends+=" rpi-userland-devel"
+
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vmcs_host/linux"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads"
+
+	LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-rpath=/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm"
+fi
+
 pre_configure() {
 	NOCONFIGURE=1 ./bootstrap
 

From 268425a292b6971bb54aaabe360af710e74f7675 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:14:16 -0500
Subject: [PATCH 285/419] libupnp1.8: remove package

---
 common/shlibs               |  2 --
 srcpkgs/libupnp1.8-devel    |  1 -
 srcpkgs/libupnp1.8/template | 36 ------------------------------------
 srcpkgs/libupnp1.8/update   |  1 -
 4 files changed, 40 deletions(-)
 delete mode 120000 srcpkgs/libupnp1.8-devel
 delete mode 100644 srcpkgs/libupnp1.8/template
 delete mode 100644 srcpkgs/libupnp1.8/update

diff --git a/common/shlibs b/common/shlibs
index 1c04cc78885..8f8117a371e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3142,8 +3142,6 @@ libgutenprint.so.9 gutenprint-5.3.3_1
 libunbound.so.8 libunbound-1.10.0_2
 libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
-libixml.so.10 libupnp1.8-1.8.2_1
-libupnp.so.13 libupnp1.8-1.8.4_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libmozjs-52.so mozjs52-52.3.0_1
diff --git a/srcpkgs/libupnp1.8-devel b/srcpkgs/libupnp1.8-devel
deleted file mode 120000
index e90a1eae9ec..00000000000
--- a/srcpkgs/libupnp1.8-devel
+++ /dev/null
@@ -1 +0,0 @@
-libupnp1.8
\ No newline at end of file
diff --git a/srcpkgs/libupnp1.8/template b/srcpkgs/libupnp1.8/template
deleted file mode 100644
index 7ae8ba2f1d4..00000000000
--- a/srcpkgs/libupnp1.8/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'libupnp1.8'
-pkgname=libupnp1.8
-version=1.8.7
-revision=1
-wrksrc="pupnp-release-${version}"
-build_style=gnu-configure
-configure_args="--enable-ipv6 --enable-reuseaddr"
-hostmakedepends="automake libtool pkg-config"
-short_desc="Portable Open Source UPnP Development Kit"
-maintainer="Alexander Gehrke <void@qwertyuiop.de>"
-license="BSD-3-Clause"
-homepage="http://pupnp.sourceforge.net/"
-distfiles="https://github.com/mrjimenez/pupnp/archive/release-${version}.tar.gz"
-checksum=236a788a0fe1274f51497c0433398ab2fd8ecf3ed8a6e738b15896f63e89c81d
-
-# libupnp uses large file support, so users must do that, too
-CFLAGS="-D_FILE_OFFSET_BITS=64"
-
-pre_configure() {
-	autoreconf -fi
-}
-
-post_install() {
-	vlicense COPYING
-}
-
-libupnp1.8-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.a"
-	}
-}
diff --git a/srcpkgs/libupnp1.8/update b/srcpkgs/libupnp1.8/update
deleted file mode 100644
index 35ccc57c5ec..00000000000
--- a/srcpkgs/libupnp1.8/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="release-\K[\d\.]*(?=\.tar.gz)"

From a7e0818d145c9bc336df96be78e9b2cb69f479f5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:15:58 -0500
Subject: [PATCH 286/419] hyperion: unify rpi build options, fix linker paths

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

diff --git a/srcpkgs/hyperion/template b/srcpkgs/hyperion/template
index 3f7952a187d..eac663a6bb3 100644
--- a/srcpkgs/hyperion/template
+++ b/srcpkgs/hyperion/template
@@ -6,9 +6,10 @@ build_style=cmake
 configure_args="-DUSE_SYSTEM_PROTO_LIBS=ON -DENABLE_QT5=ON
  -DPROTOBUF_PROTOC_EXECUTABLE=/usr/bin/protoc -DENABLE_AMLOGIC=ON
  -DENABLE_X11=ON -DENABLE_SPIDEV=ON -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
- $(vopt_if dispmanx -DENABLE_DISPMANX=ON -DENABLE_FB=ON)"
+ $(vopt_if rpi -DENABLE_DISPMANX=ON -DENABLE_FB=ON)"
 hostmakedepends="protobuf qt5-host-tools qt5-qmake"
-makedepends="libusb-devel protobuf-devel python3-devel qt5-devel $(vopt_if dispmanx rpi-userland-devel)"
+makedepends="libusb-devel protobuf-devel python3-devel qt5-devel
+ $(vopt_if rpi rpi-userland-devel)"
 short_desc="Ambient Lighting Software"
 maintainer="Christian Buschau <christian.buschau@mailbox.org>"
 license="MIT"
@@ -17,8 +18,11 @@ distfiles="https://github.com/hyperion-project/hyperion/archive/${version}.tar.g
 checksum=aa2e226f1fe035166379eefef00bf389b36da514739fa24a3608b2ef44fc7b18
 conf_files="/etc/hyperion/hyperion.config.json"
 
-build_options="dispmanx"
-desc_option_dispmanx="Enable the RPI dispmanx grabber (disables FB grabber)"
+build_options="rpi"
+
+if [ "$build_option_rpi" ]; then
+	LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-rpath=/opt/vc/lib"
+fi
 
 post_install() {
 	vinstall config/hyperion.config.json.example 0644 etc/hyperion hyperion.config.json

From 48d20507792567cf768e3f141c4059b298c33313 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:16:45 -0500
Subject: [PATCH 287/419] libcec: unify rpi build options, fix linker paths

---
 srcpkgs/libcec/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template
index a21293587d5..bf232fb89eb 100644
--- a/srcpkgs/libcec/template
+++ b/srcpkgs/libcec/template
@@ -21,6 +21,7 @@ if [ "$build_option_rpi" ]; then
 	configure_args+=" -DRPI_INCLUDE_DIR=${XBPS_CROSS_BASE}/opt/vc/include"
 	configure_args+=" -DRPI_LIB_DIR=${XBPS_CROSS_BASE}/opt/vc/lib"
 	makedepends+=" rpi-userland-devel"
+	LDFLAGS="-Wl,-rpath=/opt/vc/lib"
 fi
 
 post_install() {

From efb9151ef1cba84a0746d616ed3598bcbab8224e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:18:08 -0500
Subject: [PATCH 288/419] gst-omx: unify rpi build options, fix linker paths

---
 srcpkgs/gst-omx/template | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index a4d2fad7609..2a77a4a8e27 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,9 +1,10 @@
 # Template file for 'gst-omx'
 pkgname=gst-omx
 version=1.16.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-examples"
+configure_args="--disable-examples
+ $(vopt_if rpi --with-omx-target=rpi --with-omx-target=generic)"
 hostmakedepends="pkg-config python glib-devel"
 makedepends="gst-plugins-base1-devel"
 short_desc="GStreamer OpenMAX IL wrapper plugin (1.x)"
@@ -13,15 +14,15 @@ homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439
 
+build_options="rpi"
+
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|aarch64*|ppc*)
-		# XXX bellagio target
-		configure_args+=" --with-omx-target=generic"
-		;;
-	armv[67]*)
-		configure_args+=" --with-omx-target=rpi"
-		makedepends+=" rpi-firmware rpi-userland-devel"
-		export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/opt/vc/lib/pkgconfig"
-		CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include/IL"
-		;;
+	armv[67]*) build_options_default="rpi" ;;
 esac
+
+if [ "$build_option_rpi" ]; then
+	makedepends+=" rpi-firmware rpi-userland-devel"
+	export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/opt/vc/lib/pkgconfig"
+	CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include/IL"
+	LDFLAGS="-Wl,-rpath=/opt/vc/lib"
+fi

From 7d77b719936ad58e6e62389b32c4be1a7d0c4bde Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:18:08 -0500
Subject: [PATCH 289/419] kodi-rpi: unify rpi build options, fix linker paths

---
 srcpkgs/kodi-rpi/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index 166659bea29..3d1cc29102d 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=3
+revision=4
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -51,6 +51,7 @@ configure_args="
  -DENABLE_VDPAU=OFF
  -DWITH_FFMPEG=/usr
  -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
 "
 case "$XBPS_TARGET_MACHINE" in
 	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"

From bfa51a6c7c0a6b989bafd04f69f0c7773398868e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:18:08 -0500
Subject: [PATCH 290/419] smpeg2: unify rpi build options, fix linker paths

---
 srcpkgs/smpeg2/template | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/smpeg2/template b/srcpkgs/smpeg2/template
index 763d0137ca7..5bc6ccf5f7c 100644
--- a/srcpkgs/smpeg2/template
+++ b/srcpkgs/smpeg2/template
@@ -1,7 +1,7 @@
 # Template file for 'smpeg2'
 pkgname=smpeg2
 version=2.0.0
-revision=3
+revision=4
 build_style=gnu-configure
 makedepends="SDL2-devel"
 short_desc="SDL2 MPEG Player Library"
@@ -12,24 +12,18 @@ distfiles="https://www.libsdl.org/projects/smpeg/release/smpeg2-${version}.tar.g
 checksum=979a65b211744a44fa641a9b6e4d64e64a12ff703ae776bafe3c4c4cd85494b3
 
 # Package build options
-build_options="gles"
+build_options="rpi"
 
 case "$XBPS_TARGET_MACHINE" in
-	arm*)
-		# Enable OpenGL/ES on rpi platforms
-		build_options_default="gles"
-		;;
+	# Enable OpenGL/ES on rpi platforms
+	armv[67]*) build_options_default="rpi" ;;
 esac
 
 
-if [ "$build_option_gles" ]; then
-	case "$XBPS_TARGET_MACHINE" in
-	armv[67]*)
-		# RaspberryPi, use Videocore IV
-		makedepends+=" rpi-userland-devel"
-		LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
-		;;
-	esac
+if [ "$build_option_rpi" ]; then
+	# Use Videocore IV on Raspberry Pi
+	makedepends+=" rpi-userland-devel"
+	LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-rpath=/opt/vc/lib -lbcm_host"
 fi
 
 smpeg2-devel_package() {

From 40a21736811bb92b1f21b31175cf85e04c238c35 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 19:49:14 -0500
Subject: [PATCH 291/419] retroarch: make neon a global build option, default
 on armv7l only

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

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c3ab2846259..063ebf36e8c 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -26,11 +26,12 @@ homepage="https://www.retroarch.com/"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc noen opengl pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
+desc_option_neon="Enable support for ARM Neon SIMD extension"
 
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
@@ -91,9 +92,7 @@ case "$XBPS_TARGET_MACHINE" in
 		configure_args+=" --enable-threads"
 		;;
 	armv7*)
-		build_options+=" neon"
 		build_options_default+=" neon"
-		desc_option_neon="Enable support for ARM Neon SIMD extension"
 
 		configure_args+=" --enable-threads $(vopt_enable neon)"
 

From f45446412863ab548f564047557c0b86d27261a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 12 Jan 2021 01:42:17 -0300
Subject: [PATCH 292/419] lowdown: update to 0.7.9.

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

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index beb65d50661..ccc87496f24 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.7.7
+version=0.7.9
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=f71bbf0bd27007e1359587926af5b37c64d5fb6f45d41be64ad952402ab07934
+checksum=a7c0cbb7d878005a8c8951b0dc960612bdf715a81881a6dc18b2ce62319a7340
 
 post_install() {
 	vlicense LICENSE.md

From aa55f25ad4f4c38fae05f51d192b6c1dd09791aa Mon Sep 17 00:00:00 2001
From: Logen Kain <logen@sudotask.com>
Date: Mon, 11 Jan 2021 15:53:04 -0500
Subject: [PATCH 293/419] radeontop: update to 1.3

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

diff --git a/srcpkgs/radeontop/template b/srcpkgs/radeontop/template
index 7c5d91ab645..4f36a8d6b03 100644
--- a/srcpkgs/radeontop/template
+++ b/srcpkgs/radeontop/template
@@ -1,6 +1,6 @@
 # Template file for 'radeontop'
 pkgname=radeontop
-version=1.2
+version=1.3
 revision=1
 archs="i686* x86_64*"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/clbr/radeontop"
 distfiles="https://github.com/clbr/radeontop/archive/v${version}.tar.gz"
-checksum=dced8f8e64e6bfac1f4054b5cdd986e984b80766547ba272870bc25291c68349
+checksum=0e6abacafa3c795ee783be18b736f6dfc7ff93c6e3c3237cc7c1684863e08100
 
 do_build() {
 	make CC="$CC" amdgpu=1

From ad6e7d4904fa58429a87f2f5771f37b990f598ae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 00:15:31 -0500
Subject: [PATCH 294/419] removed-packages: add djmount

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1391ec55958..bf072b83c9b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=9
+revision=10
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -18,6 +18,7 @@ replaces="
  california<=0.4.0_4
  ctpp2<=2.8.3_7
  ctpp2-devel<=2.8.3_7
+ djmount<=0.71_8
  dleyna-core<=0.6.0_2
  dleyna-renderer<=0.6.0_2
  dleyna-server<=0.6.0_2

From 6006e664f1506d73ce5e3239bd0719bf8367f3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 12 Jan 2021 08:20:24 +0100
Subject: [PATCH 295/419] geda: update to 1.10.2

---
 common/shlibs         | 2 ++
 srcpkgs/geda/template | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f8117a371e..5e6a8d0c6ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2249,6 +2249,8 @@ libffmpegthumbnailer.so.4 ffmpegthumbnailer-2.0.10_1
 libopenraw.so.7 libopenraw-0.1.0_1
 libopenrawgnome.so.7 libopenraw-0.1.0_1
 libgeda.so.47 geda-1.10.1_1
+libgedacairo.so.1 geda-1.10.2_1
+libxornstorage.so.0 geda-1.10.2_1
 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
 libgsound.so.0 gsound-1.0.1_1
 libgegl-0.3.so.0 gegl3-0.3.0_1
diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index 2e920b2d89b..d3ee7d151d6 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -1,6 +1,6 @@
 # Template file for 'geda'
 pkgname=geda
-version=1.10.1
+version=1.10.2
 revision=1
 wrksrc="${pkgname}-gaf-${version}"
 build_style=gnu-configure
@@ -15,12 +15,11 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://www.geda-project.org/"
 distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz"
-checksum=76d282ddeebfb63da8d9b347951e67ce9282b9547df81bde4b46a3851eb13359
-CFLAGS="-Wno-deprecated-declarations -fcommon"
+checksum=e862ab241528538fa3bee2739261f568011102b60c5e39a2f0358663c042c8a4
 python_version=2
 replaces="geda-data>=0"
 
-CFLAGS="-Wno-unused-function"
+CFLAGS="-Wno-deprecated-declarations -fcommon -Wno-unused-function"
 
 pre_configure() {
 	mkdir -p gnu

From 6d82e14bbc4a757e944ff6f450081eeafbbad0d7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 08:45:06 +0100
Subject: [PATCH 296/419] golangci-lint: remove weird linkmode thing

i don't see why this is necessary, the cc command being called
does not imply anything other than bfd being used in the first
place anyway

and explicit -fuse-ld=bfd fails just the same on ppc64le
---
 srcpkgs/golangci-lint/template | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 199642ac150..726a0315e05 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -12,17 +12,6 @@ homepage="https://github.com/golangci/golangci-lint"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
 checksum=71739de1aa88defc6f08c7e5118705069fee51f4fcf303cb9b7a39215ef0c56d
 
-# XXX: LDFLAGS="-fuse-ld=bfd" does no longer work when cross compiling
-# 'go build runtime/cgo: invalid flag in go:cgo_ldflag: -fuse-ld=bfd'
-case "$XBPS_TARGET_MACHINE" in
-	ppc*)	# @q66 : ppc64le does not (yet?) support the internal linker
-		LDFLAGS="-fuse-ld=bfd"
-		;;
-	*)	# other targets can use go's internal linker
-		go_ldflags=" -linkmode internal"
-		;;
-esac
-
 post_install() {
 	vdoc README.md
 }

From 19f0d82c0bff9e5bd40d4aa191c474054e213f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 12 Jan 2021 09:11:23 +0100
Subject: [PATCH 297/419] aisleriot: update to 3.22.14

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

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a26d8c2f0cf 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,7 +1,7 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.13
-revision=2
+version=3.22.14
+revision=1
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
@@ -15,5 +15,5 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 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=25677dc789d84a4cd7736eef50992c95a1ecb0e6d8903eb0e2633502dd256a10
+checksum=23249cff1cad498a6c465a597d927ee4386bd0d9ecf0b189de84d6fc384f1160
 replaces="aisleriot-data>=0"

From 7e3c566f86ec70e2e9a5bc1d825a543d90025817 Mon Sep 17 00:00:00 2001
From: rc-05 <rc23@email.it>
Date: Thu, 7 Jan 2021 02:55:20 +0000
Subject: [PATCH 298/419] juCi++: update to 1.6.2.

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

diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 1b37c9c3dd9..c7a4e8655f3 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,8 +1,8 @@
 # Template file for 'juCi++'
 pkgname=juCi++
-version=1.6.1
+version=1.6.2
 revision=1
-_libclangmm_commit="c807211edcd3894f0920fcc1c01476d898f93f8f"
+_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
 _tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
 wrksrc="jucipp-v${version}"
 build_style=cmake
@@ -16,8 +16,8 @@ homepage="https://gitlab.com/cppit/jucipp"
 distfiles="https://gitlab.com/cppit/jucipp/-/archive/v${version}/jucipp-v${version}.tar.gz
 https://gitlab.com/cppit/libclangmm/-/archive/${_libclangmm_commit}/libclangmm-${_libclangmm_commit}.tar.gz
 https://gitlab.com/eidheim/tiny-process-library/-/archive/${_tiny_commit}/tiny-process-library-${_tiny_commit}.tar.gz"
-checksum="9cbae04ace6b4f4a606b1dcd500c30a7232f83b21fea0201c1c37085974bd2c9
- 380a2e2cb31a3310c3ac31bb6778c844fe3947a216b19acbe69d415f3da4448a
+checksum="b2dc1d3ad6182c43dc23193e2c2ccb2c1e5eb66da361e66342f12aaeecdacad9
+ 33f17a21b8949f93ab9cdc1ab13d239867767fe2988f040ad96f6a173f46883b
  0bb5bd57f1b909a08d883a5a06a15bb55cfa34b2056bc63fe26ea2d5ff13fa38"
 nocross=yes #clang cannot be installed as makedepends when cross compiling
 

From fb6d4af5047c7855ba74e946485620d693f2c424 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 09:51:07 +0100
Subject: [PATCH 299/419] go: update to 1.15.6

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

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 977c87da8d0..f4867859b8d 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.15.5
+version=1.15.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://golang.org/"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1
+checksum=890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817
 nostrip=yes
 noverifyrdeps=yes
 

From 0a955b97a68e391615a0460ff77e10a77505d095 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 09:55:43 +0100
Subject: [PATCH 300/419] golangci-lint: update to 1.35.2

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

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 726a0315e05..de9cc114e16 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
-version=1.35.0
+version=1.35.2
 revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -10,7 +10,10 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=71739de1aa88defc6f08c7e5118705069fee51f4fcf303cb9b7a39215ef0c56d
+checksum=31f245cb78a4f79d666a9357d5ea1f6ce30e15ea37d5c10c3ffb6765a158dc9d
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
 
 post_install() {
 	vdoc README.md

From 21448751aa04704fa42b41cc4cc0059fd29482cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 301/419] gtkspell: fix l10n dir

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

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From c81656d30e0eeaf8176825f21ad109ade9c10bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 302/419] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e6930b656f942e9117b5428d78873f07aef40a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 303/419] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2992f6cd941195aaf995713b086ab411845a1a01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 304/419] leafpad: fix l10n dir

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

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From f8a734756b043d2383e93de5ba38e97d17e22a15 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, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 305/419] libgnome-keyring: fix l10n dir

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

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 55ce113071ce83c9a79f594a7c25c3cc166fb2df 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, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 306/419] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From e5e7cc5c86bd24e1d4e0b2b22bbdd8060491f134 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, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 307/419] lxinput: fix l10n dir

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

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 7867a7fb11769a5be036dcf1372e08c25280f595 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, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 308/419] lxlauncher: fix l10n dir

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

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 7ff4bc866bdea7d20dbe4b294f51e153bc307d85 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, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 309/419] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 032ee6c120243323196afbbf73dc5890cc3064d0 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, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 310/419] pidgin-libnotify: fix l10n dir

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

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From fb068208fafcf2cf1da982b09483c232cf154b61 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, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 311/419] pidgin-otr: fix l10n dir

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

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 87e92c56ce6bd30bcb2704e1598c8c933e92ca2a 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, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 312/419] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 46238a3578f4408f32d54c0c92eb61c9c17d22c0 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, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 313/419] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..36f11cead86 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,16 +1,22 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://xournal.sourceforge.net/"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From 401d1f9e1324ab117c07d0123412301fd2b870bd 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, 9 Jan 2021 19:16:55 +0700
Subject: [PATCH 314/419] spacefm: fix l10n dir

---
 srcpkgs/spacefm/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index d0b2d831418..f89a4cd5ad5 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -1,13 +1,12 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=1.0.6
-revision=1
-build_options="gtk3"
+revision=2
 build_style=gnu-configure
-conf_files="/etc/spacefm/spacefm.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 configure_args="$(vopt_with gtk3)"
+hostmakedepends="pkg-config intltool"
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
+ startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,5 +14,12 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/spacefm/"
 distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"
 checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9
+conf_files="/etc/spacefm/spacefm.conf"
 
+build_options="gtk3"
+build_options_default="gtk3"
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 7ea4c00c687371362740d87513261dc7c803d640 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, 9 Jan 2021 19:17:08 +0700
Subject: [PATCH 315/419] udevil: fix l10n dir

---
 srcpkgs/udevil/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 699017010d2..b560bdf7589 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -1,7 +1,7 @@
 # Template file for 'udevil'
 pkgname=udevil
 version=0.4.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-systemd"
 conf_files="/etc/udevil/udevil.conf"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/udevil/"
 distfiles="https://github.com/IgnorantGuru/udevil/archive/${version}.tar.gz"
 checksum=ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 5a40f361e1e2e1ab9718b94121e045e20491333a 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, 9 Jan 2021 19:27:05 +0700
Subject: [PATCH 316/419] ufraw: fix l10n dir

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

diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template
index c238ef73f56..476435c6aba 100644
--- a/srcpkgs/ufraw/template
+++ b/srcpkgs/ufraw/template
@@ -1,11 +1,11 @@
 # Template file for 'ufraw'
 pkgname=ufraw
 version=0.22
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp
  $(vopt_enable extras)"
-hostmakedepends="pkg-config dcraw"
+hostmakedepends="pkg-config dcraw gettext"
 makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel
  jasper-devel"
 depends="desktop-file-utils"
@@ -24,6 +24,9 @@ post_patch() {
 		-i dcraw_api.cc \
 		-i ufraw_ufraw.c \
 		-i ufraw_developer.c
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
 }
 
 ufraw-gimp_package() {

From 3aa352b1b66627ab1ed464387203dfc73a4246d4 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, 9 Jan 2021 23:06:35 +0700
Subject: [PATCH 317/419] uget: fix l10n dir

---
 srcpkgs/uget/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index 050eb3a9790..e82aa99ea34 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
@@ -13,3 +13,9 @@ distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz"
 checksum=5cf7f311ef59bd02b71e0ce750dd37a0299ef15f9f6c6e7e60ffd175409abfc2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From c813fc4494ece81eb4bd22e948044495465ffef0 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, 9 Jan 2021 23:19:48 +0700
Subject: [PATCH 318/419] viking: fix l10n dir

---
 srcpkgs/viking/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index e0807418eca..6f7a469c204 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,7 +1,7 @@
 # Template file for 'viking'
 pkgname=viking
 version=1.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-realtime-gps-tracking --disable-bluemarble
  --disable-bing --disable-terraserver --disable-spotmaps
@@ -20,3 +20,9 @@ checksum=855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8
 patch_args="-Np1"
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From a5ca06db5d1876be2edb1383a3b70d8e29b131b1 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, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 319/419] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..063e6d0380a 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From cf69efab34deaa1b03fdbdcffd86d9d237b09a39 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, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 320/419] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..66651a7af8a 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --with-gtk2
  --enable-compile-warnings=no"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 09fe43a2b08ec187851adc4b043b3472abbe57c9 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 12 Jan 2021 09:22:58 -0600
Subject: [PATCH 321/419] zfsbootmenu: update to 1.8.1.

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

diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template
index 9f07a82f0de..4b36fd6865e 100644
--- a/srcpkgs/zfsbootmenu/template
+++ b/srcpkgs/zfsbootmenu/template
@@ -1,6 +1,6 @@
 # Template file for 'zfsbootmenu'
 pkgname=zfsbootmenu
-version=1.8.0
+version=1.8.1
 revision=1
 build_style=gnu-makefile
 conf_files="/etc/zfsbootmenu/config.yaml"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/zbm-dev/zfsbootmenu"
 changelog="https://raw.githubusercontent.com/zbm-dev/zfsbootmenu/master/CHANGELOG.md"
 distfiles="https://github.com/zbm-dev/zfsbootmenu/archive/v${version}.tar.gz"
-checksum=c9394bdf9f7a543ac73cee2584794354d0df99ab7291687f53cc044c489004c7
+checksum=b86e34448ccb43e4c4f2e6cad51886bb97252475318b79e27c963dc42f64e787
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|armv[67]*|aarch64*|ppc64le*)

From 31065b22e21c137c779202c377895d7391060146 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, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 322/419] libgnomecanvas: fix l10n dir

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

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..94f26d446f6 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,7 +1,7 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -10,9 +10,15 @@ short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 4428cf0f9cefee4f55d1afdb0cde6815d2987ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 323/419] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..83dc7323082 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,7 +5,7 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
 configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
@@ -20,6 +20,7 @@ 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=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +30,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From e6024eef7f45335a93d4f35f322de89140246c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 324/419] libcryptui: fix l10n dir

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

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..a0bfef4a32c 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,11 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +22,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From fc6b97945de3802d1c83169395b8008721bed455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 325/419] gnome-screensaver: fix l10n dir

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

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..1a23f6dcfb0 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b2dad79a29894be7b3b967b3cb549bfc749e7adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 326/419] gtk2-engines: fix l10n dir

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

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..6b26226c19f 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
 configure_args="--enable-animation"
@@ -9,7 +9,11 @@ hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b0b386a0d5d4e022d71f6e54a92f05a56dcb8242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 327/419] gtksourceview2: fix l10n dir

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

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..6857cc50b11 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,7 +1,7 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From f0196f98a1fc87b9e326492de4fe082aa41159e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 328/419] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..f846f0e6125 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b645a33514fb2228c69be008417ff0175ad654b2 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, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 329/419] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..8a826f4e0fe 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,19 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 7c18879ba5aea13df2a22f59bba548a734e0b449 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, 24 Dec 2020 21:16:06 +0700
Subject: [PATCH 330/419] tomb: not provide gtk-2 tray

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

diff --git a/srcpkgs/tomb/template b/srcpkgs/tomb/template
index 274fff1c109..1173ce3df86 100644
--- a/srcpkgs/tomb/template
+++ b/srcpkgs/tomb/template
@@ -1,11 +1,10 @@
 # Template file for 'tomb'
 pkgname=tomb
 version=2.8.1
-revision=1
+revision=2
 wrksrc=Tomb-${version}
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-makedepends="libnotify-devel gtk+-devel"
 depends="sudo gnupg cryptsetup pinentry zsh"
 short_desc="Minimalistic commandline tool to manage encrypted volumes"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -14,8 +13,8 @@ homepage="https://www.dyne.org/software/tomb/"
 distfiles="https://files.dyne.org/tomb/releases/Tomb-${version}.tar.gz"
 checksum=74865ea3364706323a3ebe12886d5816dd86c90a100bc3b49fae6e60cbb7be16
 
-pre_build() {
-	sed -i extras/gtk-tray/Makefile \
+post_patch() {
+	vsed -i extras/gtk-tray/Makefile \
 		-e's;$(CC) ;$(CC) $(CFLAGS) $(LDFLAGS) ;'
 }
 
@@ -30,9 +29,4 @@ do_install() {
 	vdoc doc/TODO.org
 	vdoc doc/bertini_thesis.pdf
 	vdoc doc/tomb_manpage.pdf
-
-	# tomb-gtk-tray
-	cd extras/gtk-tray
-	make
-	vbin tomb-gtk-tray
 }

From 9e76603f552699f1d3b88aecad97d58e83703c5d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 12 Jan 2021 16:12:14 +0100
Subject: [PATCH 331/419] zoom: update to 5.4.57862.0110

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

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 6bf998ec56f..9784cc1ff02 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.4.57450.1220
+version=5.4.57862.0110
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -12,7 +12,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"
-checksum=e8762567f7fa957aa072fab2b090b84c1b8838c99d35354935d30c2fdc08253d
+checksum=640c1785b6779d3e8f1a4482d6f9d7db2fd750e65fa5e774af73ae79d23ada06
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 0c0110f10e14859ec9f86cd60fc6437b105b5c54 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:08:36 -0500
Subject: [PATCH 332/419] python3-Pygments: update to 2.7.4.

---
 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 b09860ca925..84603bdf79a 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.7.3
+version=2.7.4
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://pygments.org"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=ccf3acacf3782cbed4a989426012f1c535c9a90d3a7fc3f16d231b9372d2b716
+checksum=df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {

From 59a322df638fae9e465c1da01876d42b5da9be1a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:16:13 -0500
Subject: [PATCH 333/419] python3-hypercorn: update to 0.11.2.

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

diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template
index e33dff0de19..9635ad9fe53 100644
--- a/srcpkgs/python3-hypercorn/template
+++ b/srcpkgs/python3-hypercorn/template
@@ -1,19 +1,28 @@
 # Template file for 'python3-hypercorn'
 pkgname=python3-hypercorn
-version=0.11.1
+version=0.11.2
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-h11 python3-hyper-h2 python3-priority
  python3-toml python3-typing_extensions python3-wsproto"
+checkdepends="python3-pytest-asyncio $depends"
 short_desc="Python ASGI server based on hyper and inspired by gunicorn"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://gitlab.com/pgjones/hypercorn"
 changelog="https://gitlab.com/pgjones/hypercorn/-/blob/master/CHANGELOG.rst"
 distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz"
-checksum=ce54464ee775d99a5f4c4408f3b52bf31c43057f40543aff386b790ecdc764da
+checksum=5030666663b3a048f971db9f728a76d4e0075a06e2a1fbed67b5c47cb11e7a5f
+
+do_check() {
+	vsed -i setup.cfg -e '/addopts/d'
+	# Ignored tests depend on packages not offered by Void
+	PYTHONPATH=src python3 -m pytest \
+		--ignore-glob="tests/trio/*" \
+		--ignore=tests/middleware/test_wsgi.py
+}
 
 post_install() {
 	vlicense LICENSE

From b25213f8699c0c3b2f1cca8a8c7247cf977a19af Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:18:23 -0500
Subject: [PATCH 334/419] python3-pytools: update to 2021.1.

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

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5fcf3cb1a0f..bdeab1325db 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2020.4.4
+version=2021.1
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-decorator python3-appdirs python3-six python3-numpy"
-checkdepends="python3-mpi4py python3-numpy python3-six python3-appdirs python3-decorator"
+checkdepends="python3-pytest python3-mpi4py $depends"
 short_desc="Python utilities from Andreas Kloeckner"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=3645ed839cf4d79cb4bf030f37ddaeecd7fe5e2d6698438cc36c24a1d5168809
+checksum=073ae22a0ae946e2db97164f2eb24a599cd3a51430384aa40859dffd73056c40
 
 post_install() {
 	vlicense LICENSE

From df1d3e11f2afd651a096cd6c1c545ca945dfbea3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:20:50 -0500
Subject: [PATCH 335/419] python3-tifffile: update to 2021.1.11.

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

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 84536d54c5e..caf54206905 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2020.12.8
+version=2021.1.11
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=aa823c1185ff42bdcae549883244802122f404a51bb6fb893a223df5330c6d81
+checksum=fba3d3718634dd705d8a025421b1a241efad6166533b1be304a3b1a59a68e941
 
 post_install() {
 	vlicense LICENSE

From ce5715f27ce0926cdf2e127f203820534c9c2899 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:24:40 -0500
Subject: [PATCH 336/419] python3-setuptools: update to 51.1.2.

---
 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 c3688cd4b0c..58346bb37e8 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=51.1.1
+version=51.1.2
 revision=1
 wrksrc="setuptools-${version}"
 build_style=python3-module
@@ -14,7 +14,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=0b43d1e0e0ac1467185581c2ceaf86b5c1a1bc408f8f6407687b0856302d1850
+checksum=4fa149145ba5dcd4aaa89912ec92393a31170eaf17fe0268b1429538bad1f85a
 alternatives="setuptools:easy_install:/usr/bin/easy_install3"
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"

From 396b50e07a6fdfcfec2ef6310f456c7e196e66d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:28:29 -0500
Subject: [PATCH 337/419] python3-virtualenv: update to 20.3.0.

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

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index fc0010d96d1..c26f27bde83 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,19 +1,19 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.2.2
+version=20.3.0
 revision=1
 wrksrc="virtualenv-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-setuptools python3-appdirs python3-distlib python3-filelock python3-six"
-checkdepends="python3-pytest-mock python3-flaky python3-devel $depends"
+checkdepends="python3-pytest-mock python3-flaky python3-devel python3-pip $depends"
 short_desc="Virtual Python environment builder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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=b7a8ec323ee02fb2312f098b6b4c9de99559b462775bc8fe3627a73706603c1b
+checksum=7992b8de87e544a4ab55afc2240bf8388c4e3b5765d03784dad384bfdf9097ee
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
 do_check() {

From 65d948daec5bc07829a2ab6772b6b9234368d9f7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 10:59:21 -0500
Subject: [PATCH 338/419] tox: update to 3.21.0.

---
 srcpkgs/tox/template | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2d39e47d019..39f3dd4cd00 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,19 +1,31 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.20.1
-revision=2
+version=3.21.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-filelock python3-packaging
  python3-pluggy python3-pytest python3-toml python3-virtualenv"
-checkdepends="${depends} python3-flaky python3-pathlib2"
+checkdepends="${depends} python3-pytest-mock
+ python3-flaky python3-pathlib2 python3-freezegun"
 short_desc="Generic virtualenv management and test command line tool"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 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=4321052bfe28f9d85082341ca8e233e3ea901fdd14dab8a5d3fbd810269fbaf6
+checksum=8cccede64802e78aa6c69f81051b25f0706639d1cbbb34d9366ce00c70ee054f
+
+do_check() {
+	# Skipped tests fail to find module or rely on missing entrypoint script
+	PYTHONPATH=src python3 -m pytest \
+		-k "not test_parallel \
+			and not test_tox_console_script \
+			and not test_tox_quickstart_script \
+			and not test_provision_cli_args_ignore \
+			and not test_provision_interrupt_child \
+			and not test_provision_non_canonical_dep"
+}
 
 post_install() {
 	vlicense LICENSE

From 7986cd69d3135b4922345f000b646c3b46541d12 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 11:00:57 -0500
Subject: [PATCH 339/419] certbot: update to 1.11.0.

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

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 4732173b143..7ab61e71740 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.10.1
+version=1.11.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ 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=0d9ee3fc09e0d03b2d1b1f1c4916e61ecfc6904b4216ddef4e6a5ca1424d9cb7
+checksum=6b0ce04e55379aff0a47f873fa05c084538ad0f4a9b79f33108dbb0a7a668b43
 
 do_check() {
 	python3 -m pytest

From f36b7de809b14504815ebc8db3834b035443d24a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 11:03:13 -0500
Subject: [PATCH 340/419] python3-acme: update to 1.11.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 3517f27eced..8424db282cf 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.10.1
+version=1.11.0
 revision=1
 wrksrc="acme-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ 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=fcbb559aedc96b404edf593e78517dcd7291984d5a37036c3fc77f3c5c122fd8
+checksum=092eb09a074a935da4c10f66cb8634ffb2cc2d2cc1035d2998d608996efab924
 
 do_check() {
 	python3 -m pytest

From feb7bbe5bc282337295a9e4905963e12fa9e7063 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 11:04:07 -0500
Subject: [PATCH 341/419] certbot-apache: update to 1.11.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 2e31c4c0674..9ee797aa5f8 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.10.1
+version=1.11.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ 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=97ed637b4c7b03820db6c69aa90145dc989933351d46a3d62baf6b71674f0a10
+checksum=3ed001427ec0b49324f2b9af7170fa6e6e88948fa51c3678b07bf17f8138863d
 
 do_check() {
 	python3 -m pytest

From 67add182ee03e4ffe289f718d6734d30802ab43e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 11:04:40 -0500
Subject: [PATCH 342/419] certbot-nginx: update to 1.11.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 796fb1c2853..23f7dd5435c 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.10.1
+version=1.11.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ 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=c0bbeccf85f46b728fd95e6bb8c2649d32d3383d7f47ea4b9c312d12bf04d2f0
+checksum=9afe611f99a78b8898941b8ad7bdcf7f3c2b6e0fce27125268f7c713e64b34ee
 
 do_check() {
 	python3 -m pytest

From ad01b547fba8d3f3a413c3c463899522ef5d811d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Jan 2021 17:25:31 +0100
Subject: [PATCH 343/419] nncp: update to 5.5.1.

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

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 76dc4d0597f..db039facdae 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=5.5.0
+version=5.5.1
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=ef0cbee1520be97da210794c172bf444e6f75db284f5bd0566919193326aed77
+checksum=e7deed7ad3ba696cf64359c0dc0a93ad109950c56660d0285fd7bb57120c9cf7
 
 do_build() {
 	make

From 06153f018464ca7ecc864594bf223393029b6f5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jan 2021 15:31:40 -0500
Subject: [PATCH 344/419] zfs: update to 2.0.1.

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

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 1e9de9140a5..1af53405226 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=3403bf8e993f3c9d772f768142117df47bdbbb8e9bbf85a29c0e166f577f9311
+checksum=71510a6381d9910d75fa52d7bbf0863aa80ff88f337c8a023e267f4ba8486978
 
 patch_args="-Np1"
 

From d512ccd4157d7b5f86678e4038f3b6b8b2191dcc Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 18:07:37 +0100
Subject: [PATCH 345/419] pueue: now broken on non-x86/arm because of ring

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

diff --git a/srcpkgs/pueue/template b/srcpkgs/pueue/template
index adb0e9ea182..9323800e377 100644
--- a/srcpkgs/pueue/template
+++ b/srcpkgs/pueue/template
@@ -10,6 +10,11 @@ homepage="https://github.com/Nukesor/pueue"
 distfiles="https://github.com/Nukesor/pueue/archive/v${version}.tar.gz"
 checksum=dbd333079df9249609f6a01d7c96175ec9d74f9d621688b95ec755134b7fa1f5
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From 90ecdf24e9928fee348302b39ec1946dbd226679 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 12 Jan 2021 10:37:52 +0100
Subject: [PATCH 346/419] slack-desktop: update to 4.12.2

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

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index d480ce6b5ca..7a2199f9589 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.12.1
+version=4.12.2
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=a9e71340a7d37cf9fbfa9206ad000038c0bb74fd3df445506cc740d6f0eb3ce6
+checksum=1b9b90234efc37b01b84426ce9aff5ec7a22e4349dc2f60b3354ffb6dac4c38b
 restricted=yes
 repository="nonfree"
 nopie=yes

From f30e7a7eee5afa8020d81d16833e35f71c23d6c1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 12 Jan 2021 11:40:43 +0100
Subject: [PATCH 347/419] hoogle: update to 5.0.18.1

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

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 40dc26778d1..4305ac4ae6e 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,6 +1,6 @@
 # Template file for 'hoogle'
 pkgname=hoogle
-version=5.0.18
+version=5.0.18.1
 revision=1
 build_style=haskell-stack
 stackage="lts-16.13"
@@ -10,7 +10,7 @@ maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
 homepage="http://hoogle.haskell.org/"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=fa624618ccbf5772af5628b791094fa43301f1c25137e06ed65c203e0de8b4c3
+checksum=62388f8a13e8fd3c7befe9c12543eb9f1b53a5fb948390c69eb2985d39f927aa
 nopie_files="/usr/bin/hoogle"
 nocross=yes # Can't yet cross compile Haskell
 

From e24e0ae841fd377fb45423fe1c6d0057cd801d92 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 18:24:42 +0100
Subject: [PATCH 348/419] Revert "mdcat: update to 0.22.2."

This reverts commit e04e5c10da12b5c75aaff684d9f65826d5c97425.

There were zero functional changes in the release and it now
depends on non-portable stuff, which breaks build outside x86/arm
---
 srcpkgs/mdcat/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index 9a91d162d53..df89652f874 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,7 +1,8 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.22.2
-revision=1
+reverts="0.22.2_1"
+version=0.22.1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
@@ -11,4 +12,4 @@ maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"
 homepage="https://github.com/lunaryorn/mdcat"
 distfiles="https://github.com/lunaryorn/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=92102c448c1742aa69604817d7d209c69ce1db5261cb6d8f0bb98cdc6c4f02f9
+checksum=b14846542fb8b60ac0235b399136372df7569aa59ed63f3faf88ff7a485abe5f

From 4d2cc08dc567bc0e6091ff10c45568dc35c19aa2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 17:43:38 +0100
Subject: [PATCH 349/419] remove --with-locales-dir where it doesn't belong

---
 srcpkgs/brasero/template               | 3 +--
 srcpkgs/dia/template                   | 1 -
 srcpkgs/gconf-editor/template          | 1 -
 srcpkgs/gdmap/template                 | 2 +-
 srcpkgs/gimp-lqr-plugin/template       | 1 -
 srcpkgs/gmpc/template                  | 1 -
 srcpkgs/gnome-mime-data/template       | 1 -
 srcpkgs/gnome-mplayer/template         | 3 +--
 srcpkgs/gnome-nettool/template         | 1 -
 srcpkgs/gnome-system-log/template      | 2 +-
 srcpkgs/gpicview/template              | 2 +-
 srcpkgs/gtkpod/template                | 2 +-
 srcpkgs/gtkspell/template              | 2 +-
 srcpkgs/gxmessage/template             | 1 -
 srcpkgs/homebank/template              | 1 -
 srcpkgs/leafpad/template               | 1 -
 srcpkgs/libgnome-keyring/template      | 2 +-
 srcpkgs/libwnck2/template              | 2 +-
 srcpkgs/lxinput/template               | 2 +-
 srcpkgs/lxlauncher/template            | 2 +-
 srcpkgs/pcmanx-gtk2/template           | 2 +-
 srcpkgs/pidgin-libnotify/template      | 2 +-
 srcpkgs/pidgin-otr/template            | 1 -
 srcpkgs/pidgin-privacy-please/template | 1 -
 srcpkgs/xdg-user-dirs-gtk/template     | 1 -
 25 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index 9ff2a6468ea..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -4,8 +4,7 @@ version=3.12.2
 revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--with-locales-dir=/usr/share/locale
- --disable-schemas-compile --disable-caches"
+configure_args="--disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 4a4037c9cc4..45f48aab4dc 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -3,7 +3,6 @@ pkgname=dia
 version=0.97.3
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
  libart-devel libxslt-devel"
diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 4046a204711..d4d9fa79bd2 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -4,7 +4,6 @@ version=3.0.1
 revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
- --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 2dc46b6e074..47b0105feb3 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -3,7 +3,7 @@ pkgname=gdmap
 version=0.8.1
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
+configure_args="LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 45d8ce44f05..7878f6cb795 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -3,7 +3,6 @@ pkgname=gimp-lqr-plugin
 version=0.7.2
 revision=2
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index f3283baafb8..9993e6c49df 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -3,7 +3,6 @@ pkgname=gmpc
 version=11.8.16
 revision=3
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 4bb4769baa2..fdcd6137076 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -3,7 +3,6 @@ pkgname=gnome-mime-data
 version=2.18.0
 revision=6
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 1ec69337940..1004710eee4 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -3,8 +3,7 @@ pkgname=gnome-mplayer
 version=1.0.9
 revision=5
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale
- --disable-schemas-install"
+configure_args="--disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index fad533c4901..89f5705d629 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -3,7 +3,6 @@ pkgname=gnome-nettool
 version=3.8.1
 revision=6
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 653a2a94fce..7afbc3acc7c 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -3,7 +3,7 @@ pkgname=gnome-system-log
 version=3.9.90
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
+configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index be07a3dc96d..24ae856fa34 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -3,7 +3,7 @@ pkgname=gpicview
 version=0.2.5
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 15c75642635..bfcb41e6219 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -3,7 +3,7 @@ pkgname=gtkpod
 version=2.1.5
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+configure_args="--disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index 2b185f6ee9a..bf480eaae32 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -3,7 +3,7 @@ pkgname=gtkspell
 version=2.0.16
 revision=5
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+configure_args="--disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 0d349d8bbe5..76dffa85c97 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -3,7 +3,6 @@ pkgname=gxmessage
 version=3.4.3
 revision=2
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
 short_desc="Clone of xmessage based on GTK+"
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index c987e54e0e7..dad20250626 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -3,7 +3,6 @@ pkgname=homebank
 version=5.4.3
 revision=2
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bd613e392ae..f80347e452f 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -3,7 +3,6 @@ pkgname=leafpad
 version=0.8.18.1
 revision=5
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 193b8b21994..84418574389 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -4,7 +4,7 @@ version=3.12.0
 revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
+configure_args="$(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..08300d85b26 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -5,7 +5,7 @@ revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
+configure_args="$(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index 8736f3f854a..307d609f33d 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -3,7 +3,7 @@ pkgname=lxinput
 version=0.3.5
 revision=3
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index 44f7b806ea5..5b91dc9c720 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -3,7 +3,7 @@ pkgname=lxlauncher
 version=0.2.5
 revision=3
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 68269d5fea0..0c3d0e3bbf8 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -3,7 +3,7 @@ pkgname=pcmanx-gtk2
 version=1.3
 revision=2
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
+configure_args="--enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index bc71b0e602c..5a627f32383 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -3,7 +3,7 @@ pkgname=pidgin-libnotify
 version=0.14
 revision=3
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
+configure_args="--disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 1ec42101f17..32d3be6623e 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -3,7 +3,6 @@ pkgname=pidgin-otr
 version=4.0.2
 revision=2
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 18499372923..66f7edf6dde 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -3,7 +3,6 @@ pkgname=pidgin-privacy-please
 version=0.7.1
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool libtool pkg-config libpurple-devel
  pidgin-devel glib-devel"
 makedepends="libpurple-devel pidgin-devel libglib-devel"
diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index b89f1e28d63..600c013736f 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -3,7 +3,6 @@ pkgname=xdg-user-dirs-gtk
 version=0.10
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"

From 40c60038853576a0372d63d8215bf543c91e0ca5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Jan 2021 19:06:12 +0100
Subject: [PATCH 350/419] frei0r-plugins: update to 1.7.0.

Also added build options for cairo and gavl.
---
 srcpkgs/frei0r-plugins/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/frei0r-plugins/template b/srcpkgs/frei0r-plugins/template
index 54adf54a355..e980aa63617 100644
--- a/srcpkgs/frei0r-plugins/template
+++ b/srcpkgs/frei0r-plugins/template
@@ -1,12 +1,17 @@
 # Template file for 'frei0r-plugins'
 pkgname=frei0r-plugins
-version=1.6.1
+version=1.7.0
 revision=1
 build_style=cmake
 hostmakedepends="autoconf"
+# XXX: opencv should also be a possible dependency
+makedepends="$(vopt_if gavl gavl-devel) $(vopt_if cairo cairo-devel)"
 short_desc="Minimalistic API for a collection of free video effects plugins"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://frei0r.dyne.org/"
 distfiles="https://files.dyne.org/frei0r/releases/frei0r-plugins-${version}.tar.gz"
-checksum=e0c24630961195d9bd65aa8d43732469e8248e8918faa942cfb881769d11515e
+checksum=1b1ff8f0f9bc23eed724e94e9a7c1d8f0244bfe33424bb4fe68e6460c088523a
+
+build_options="cairo gavl"
+build_options_default="cairo"

From b0296b1252fa007007654ccd982e2c8aa57f502d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 12 Jan 2021 13:04:49 -0600
Subject: [PATCH 351/419] common/build-style/qmake: fix variable name

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

diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh
index 5808d7a60bd..fa54c005f36 100644
--- a/common/build-style/qmake.sh
+++ b/common/build-style/qmake.sh
@@ -13,7 +13,7 @@ do_configure() {
 		qmake="/usr/lib/qt/bin/qmake"
 	fi
 	if [ -z "${qmake}" ]; then
-		msg_error "${pkgver}: Could not find qmake - missing in hostdepends?\n"
+		msg_error "${pkgver}: Could not find qmake - missing in hostmakedepends?\n"
 	fi
 	if [ "$CROSS_BUILD" ] && [ "$qmake" == "/usr/lib/qt5/bin/qmake" ]; then
 		case $XBPS_TARGET_MACHINE in

From 1dbcfbafaa939219ace83c5714a3f6e29761b357 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Jan 2021 20:44:03 +0100
Subject: [PATCH 352/419] nmap: revert to 7.80 due to licensing issues

nmap >= 7.90 is distributed under a modified license that many consider
problematic.

https://github.com/nmap/nmap/issues/2199
Gentoo bug: https://bugs.gentoo.org/749390
Debian bug: https://bugs.debian.org/972216
Guix discussion: https://lists.gnu.org/archive/html/guix-devel/2020-10/msg00227.html

Along, link against libssh2 instead of using the bundled version.
---
 srcpkgs/nmap/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7d46635229b..db5d413cfb1 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -1,17 +1,19 @@
 # Template file for 'nmap'
 pkgname=nmap
-version=7.91
-revision=1
+reverts="7.90_1 7.91_1"
+version=7.80
+revision=2
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel pcre-devel $(vopt_if lua lua53-devel)"
+makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+ $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:nmap"
 homepage="https://nmap.org"
 distfiles="https://nmap.org/dist/nmap-${version}.tar.bz2"
-checksum=18cc4b5070511c51eb243cdd2b0b30ff9b2c4dc4544c6312f75ce3a67a593300
+checksum=fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa
 python_version=2
 
 build_options="lua"
@@ -22,7 +24,7 @@ alternatives="
 	nc:nc.1:/usr/share/man/man1/ncat.1"
 
 post_install() {
-	vlicense LICENSE
+	vlicense COPYING
 
 	# do not use bundled certificates, use only system ones
 	rm -f ${DESTDIR}/usr/share/ncat/ca-bundle.crt

From ce87a3f868135b27e500ac8c53769ebede579ffa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Jan 2021 21:30:48 +0100
Subject: [PATCH 353/419] linux5.10: update to 5.10.7.

---
 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 f987b44e16a..1bad20376bd 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.6
+version=5.10.7
 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=7767d02c1cb5eb2a8d3c2b15a3f93e85b98baa6e9d93a3b9e3ec0e959d0a690b
+checksum=4cbf6e09f90f2ae7160432c884d5a2aeb9d33a07ca7f50eb7d80f427706ffabe
 python_version=3
 patch_args="-Np1"
 

From 66b85a8b2bc23da5d5b403c44f43b9ed1cd3b5be Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 12 Jan 2021 15:26:06 -0600
Subject: [PATCH 354/419] nmap: correct revision

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

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index db5d413cfb1..7429d64cf81 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,7 +2,7 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=2
+revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"

From 47b13b95f5b5e0c6db54b986e06f678715b75aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 08:02:10 +0700
Subject: [PATCH 355/419] gns3-gui: not depends on python3-sip

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

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index f7f51364548..1d7d84c4c65 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,11 +1,11 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
 version=2.2.17
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema python3-sentry
- python3-PyQt5-svg python3-PyQt5-websockets python3-sip xterm inetutils-telnet
+ python3-PyQt5-svg python3-PyQt5-websockets xterm inetutils-telnet
  gns3-net-converter python3-distro"
 checkdepends="${depends}"
 short_desc="Graphical Network Simulator 3 - GUI"

From c452e6c46ab810b42dd2445c5bdeca67977a0ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 9 Jan 2021 17:25:29 +0100
Subject: [PATCH 356/419] doctl: update to 1.54.1.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 2c1ff591e98..67429c711ef 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.54.0
+version=1.54.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -11,4 +11,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=bdb2dfb18ac0047c55343a74aa872cd5251881657d88ceb432af894042767d09
+checksum=f61746217994a7270ac32d9707a7c2906e94821238bdb938b0e3be70f2f2dcb5

From 1500a2ae5032ac53b8d63b8e536e8dea19ef86f8 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Wed, 13 Jan 2021 13:28:26 +0100
Subject: [PATCH 357/419] dnscrypt-proxy: update to 2.0.45.

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

diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 969a152fab3..09d53d038dd 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,6 +1,6 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
-version=2.0.44
+version=2.0.45
 revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
@@ -11,7 +11,7 @@ license="ISC"
 homepage="https://github.com/DNSCrypt/dnscrypt-proxy"
 changelog="https://raw.githubusercontent.com/DNSCrypt/dnscrypt-proxy/master/ChangeLog"
 distfiles="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${version}.tar.gz"
-checksum=c2c9968f07a414e973ec5734f4598d756a35c32beedb18268590ea1355794237
+checksum=f7aac28c6a60404683d436072b89d18ed3bb309f8d8a95c8e87ad250da190821
 conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"

From 1423fd8ea85648f0f78afabd5d54a3ee5f468ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 08:05:44 +0700
Subject: [PATCH 358/419] sip: rename to sip4

---
 srcpkgs/python3-sip            |  2 +-
 srcpkgs/python3-sip-devel      |  2 +-
 srcpkgs/{sip => sip4}/template | 13 ++++++++-----
 srcpkgs/{sip => sip4}/update   |  0
 4 files changed, 10 insertions(+), 7 deletions(-)
 rename srcpkgs/{sip => sip4}/template (82%)
 rename srcpkgs/{sip => sip4}/update (100%)

diff --git a/srcpkgs/python3-sip b/srcpkgs/python3-sip
index 633f7c0bcce..27dcc148ae7 120000
--- a/srcpkgs/python3-sip
+++ b/srcpkgs/python3-sip
@@ -1 +1 @@
-sip
\ No newline at end of file
+sip4
\ No newline at end of file
diff --git a/srcpkgs/python3-sip-devel b/srcpkgs/python3-sip-devel
index 633f7c0bcce..27dcc148ae7 120000
--- a/srcpkgs/python3-sip-devel
+++ b/srcpkgs/python3-sip-devel
@@ -1 +1 @@
-sip
\ No newline at end of file
+sip4
\ No newline at end of file
diff --git a/srcpkgs/sip/template b/srcpkgs/sip4/template
similarity index 82%
rename from srcpkgs/sip/template
rename to srcpkgs/sip4/template
index 87d0c5c6ed6..30de98f8320 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip4/template
@@ -1,7 +1,8 @@
-# Template file for 'sip'
-pkgname=sip
+# Template file for 'sip4'
+pkgname=sip4
 version=4.19.24
-revision=3
+revision=4
+wrksrc="sip-$version"
 hostmakedepends="python3-devel"
 makedepends="${hostmakedepends}"
 short_desc="Python extension module generator for C/C++ libraries"
@@ -10,12 +11,14 @@ license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
 checksum=edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
+replaces="sip<=${version}_${revision}"
+provides="sip-${version}_${revision}"
 
 do_build() {
 	python3 configure.py \
 		CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 		LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
-		INCDIR="${XBPS_CROSS_BASE}/${py3_inc}" ${pyqt5}
+		INCDIR="${XBPS_CROSS_BASE}/${py3_inc}"
 	make ${makejobs}
 }
 
@@ -40,7 +43,7 @@ python3-sip_package() {
 }
 
 python3-sip-devel_package() {
-	depends="python3-sip-${version}_${revision} sip-${version}_${revision}"
+	depends="python3-sip-${version}_${revision} sip4-${version}_${revision}"
 	short_desc="Python3 SIP bindings - development files"
 	pkg_install() {
 		vmove ${py3_inc}
diff --git a/srcpkgs/sip/update b/srcpkgs/sip4/update
similarity index 100%
rename from srcpkgs/sip/update
rename to srcpkgs/sip4/update

From cb5c02d2498d7dcc4e7329bc006be64793d98145 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, 13 Jan 2021 07:36:15 +0700
Subject: [PATCH 359/419] python3-orocos-kdl: sip renamed to sip4

---
 srcpkgs/python3-orocos-kdl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-orocos-kdl/template b/srcpkgs/python3-orocos-kdl/template
index 728ed73d780..281ea8978c5 100644
--- a/srcpkgs/python3-orocos-kdl/template
+++ b/srcpkgs/python3-orocos-kdl/template
@@ -6,7 +6,7 @@ wrksrc=orocos_kinematics_dynamics-${version}
 build_wrksrc=python_orocos_kdl
 build_style=cmake
 configure_args="-DPYTHON_VERSION=3 -DSIP_EXECUTABLE=/usr/bin/sip"
-hostmakedepends="python3 python3-sip sip"
+hostmakedepends="python3 python3-sip sip4"
 makedepends="python3-sip-devel python3-devel orocos-kdl-devel eigen3.2"
 depends="python3 python3-sip"
 short_desc="Python3 Bindings for Orocos Kinematics and Dynamics C++ library"

From 8d81add5691c11ceb55219eb7eb4188914d291bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 08:07:11 +0700
Subject: [PATCH 360/419] sip5: rename to sip

---
 srcpkgs/{sip5 => sip}/template | 15 +++++++++++----
 srcpkgs/{sip5 => sip}/update   |  0
 srcpkgs/sip5                   |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)
 rename srcpkgs/{sip5 => sip}/template (69%)
 rename srcpkgs/{sip5 => sip}/update (100%)
 create mode 120000 srcpkgs/sip5

diff --git a/srcpkgs/sip5/template b/srcpkgs/sip/template
similarity index 69%
rename from srcpkgs/sip5/template
rename to srcpkgs/sip/template
index b8e3d0bf10d..72577b77f0c 100644
--- a/srcpkgs/sip5/template
+++ b/srcpkgs/sip/template
@@ -1,22 +1,29 @@
-# Template file for 'sip5'
-pkgname=sip5
+# Template file for 'sip'
+pkgname=sip
 version=5.5.0
 revision=1
-wrksrc="sip-$version"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
 makedepends="python3-devel"
 depends="python3-setuptools python3-packaging python3-toml"
-short_desc="SIP 5 - Python 3 bindings generator for C/C++ libraries"
+short_desc="SIP - Python 3 bindings generator for C/C++ libraries"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
 checksum=5d024c419b30fea8a6de8c71a560c7ab0bc3c221fbfb14d55a5b865bd58eaac5
 lib32disabled=yes
+replaces="sip5<=${version}_${revision}"
+provides="sip5-${version}_${revision}"
 
 post_install() {
 	sed -n '1,/SUCH DAMAGE/p' sipbuild/project.py >NOTICE
 	vlicense NOTICE
 	vlicense LICENSE
 }
+
+sip5_package() {
+	short_desc+=" - transition"
+	build_style=meta
+	depends="sip>=${version}_${revision}"
+}
diff --git a/srcpkgs/sip5/update b/srcpkgs/sip/update
similarity index 100%
rename from srcpkgs/sip5/update
rename to srcpkgs/sip/update
diff --git a/srcpkgs/sip5 b/srcpkgs/sip5
new file mode 120000
index 00000000000..633f7c0bcce
--- /dev/null
+++ b/srcpkgs/sip5
@@ -0,0 +1 @@
+sip
\ No newline at end of file

From 49e533fd77ac607cbbf6b3d9f8f39770a22b7461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 08:08:58 +0700
Subject: [PATCH 361/419] sip: update to 6.0.0.

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

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 72577b77f0c..eb7a4ac56f4 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=5.5.0
+version=6.0.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=5d024c419b30fea8a6de8c71a560c7ab0bc3c221fbfb14d55a5b865bd58eaac5
+checksum=6185160e1aa8e167b5919c4761cbbf68cc7478d34fb655b3a28b3eb9acb5943a
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"

From 085db837d3fd2dd13138903783680c024f358719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 07:52:02 +0700
Subject: [PATCH 362/419] python3-PyQt-builder: update to 1.7.0.

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

diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template
index 1d6c8fa73d4..956a6ab1cde 100644
--- a/srcpkgs/python3-PyQt-builder/template
+++ b/srcpkgs/python3-PyQt-builder/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-PyQt-builder'
 pkgname=python3-PyQt-builder
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc=PyQt-builder-$version
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3 sip5>=5.5.0"
+hostmakedepends="python3-setuptools sip"
+depends="python3 sip>=6.0.0"
 short_desc="PEP 517 compliant PyQt build system"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://www.riverbankcomputing.com/software/pyqt/"
 distfiles="$PYPI_SITE/P/PyQt-builder/PyQt-builder-$version.tar.gz"
-checksum=fb80f01407718bfc68f78e276f2543fcfc5b5900b1187c1fd1f2ff51a6f2a13c
+checksum=b6e3c826f98ff4006ecb34df491ac6062a023b63a32e9f9f50904867aff72f2e
 
 post_install() {
 	rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle

From 19389a3291974ff8f3f53fb11278897b5e059281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 07:54:12 +0700
Subject: [PATCH 363/419] python3-PyQt5-webengine: sip5 has been renamed to sip

---
 srcpkgs/python3-PyQt5-webengine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 920cae92627..ae385283b7f 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -3,7 +3,7 @@ pkgname=python3-PyQt5-webengine
 version=5.15.2
 revision=1
 wrksrc="PyQtWebEngine-${version}"
-hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip5 qt5-webengine-devel
+hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip qt5-webengine-devel
  python3-PyQt-builder python3-PyQt5-devel
  qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
 makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel

From 2787e6e18133cc0ce44e095d8a36863a28cd1cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 07:55:20 +0700
Subject: [PATCH 364/419] python3-PyQt5: depends on new sip

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

diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index bac89e57965..2a2733b439c 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt5'
 pkgname=python3-PyQt5
 version=5.15.2
-revision=1
+revision=2
 _sipver=12.8.0
 wrksrc="PyQt5-${version}"
 build_helper=qemu
@@ -193,7 +193,7 @@ python3-PyQt5-devel-tools_package() {
 	}
 }
 python3-PyQt5-devel_package() {
-	depends="sip5 python3-PyQt5-${version}_${revision}"
+	depends="sip>=6.0.0 python3-PyQt5-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove ${py3_sitelib}/PyQt5/bindings

From 65924c695333fa46eeaed01a590e9d3b37997a98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 07:56:13 +0700
Subject: [PATCH 365/419] python3-sip-PyQt5: build with new sip

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

diff --git a/srcpkgs/python3-sip-PyQt5/template b/srcpkgs/python3-sip-PyQt5/template
index e1d1c45603d..e144a1e91f2 100644
--- a/srcpkgs/python3-sip-PyQt5/template
+++ b/srcpkgs/python3-sip-PyQt5/template
@@ -4,7 +4,7 @@ version=12.8.1
 revision=1
 wrksrc="PyQt5_sip-$version"
 build_style=python3-module
-hostmakedepends="python3-devel python3-setuptools sip5"
+hostmakedepends="python3-devel python3-setuptools sip"
 makedepends="python3-devel"
 short_desc="Python 3 PyQt5 SIP bindings with C and C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,6 +14,11 @@ distfiles="${PYPI_SITE}/P/PyQt5_sip/PyQt5_sip-${version}.tar.gz"
 checksum=30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd
 lib32disabled=yes
 
+post_extract() {
+	# for do_check
+	mkdir -p PyQt5
+}
+
 post_install() {
-	vlicense /usr/share/licenses/sip5/LICENSE
+	vlicense /usr/share/licenses/sip/LICENSE
 }

From f36bb1af83315fdbdc84438c5793eedb1102d8e9 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, 12 Jan 2021 20:37:31 +0700
Subject: [PATCH 366/419] pcc: merge pcc-libs template

to break cyclic dependdencies.
---
 srcpkgs/pcc-libs                              |  1 +
 srcpkgs/pcc-libs/template                     | 24 -------
 .../{pcc-libs => pcc}/patches/build_PIC.patch | 12 ++--
 srcpkgs/pcc/patches/void.patch                |  4 +-
 srcpkgs/pcc/patches/x86-build-fix.patch       |  4 +-
 srcpkgs/pcc/template                          | 72 +++++++++++++++----
 6 files changed, 69 insertions(+), 48 deletions(-)
 create mode 120000 srcpkgs/pcc-libs
 delete mode 100644 srcpkgs/pcc-libs/template
 rename srcpkgs/{pcc-libs => pcc}/patches/build_PIC.patch (64%)

diff --git a/srcpkgs/pcc-libs b/srcpkgs/pcc-libs
new file mode 120000
index 00000000000..0f083540766
--- /dev/null
+++ b/srcpkgs/pcc-libs
@@ -0,0 +1 @@
+pcc
\ No newline at end of file
diff --git a/srcpkgs/pcc-libs/template b/srcpkgs/pcc-libs/template
deleted file mode 100644
index bca409786bd..00000000000
--- a/srcpkgs/pcc-libs/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'pcc-libs'
-pkgname=pcc-libs
-_snapshot=20190420
-_distver=1.1.0
-version=${_distver}.${_snapshot}
-revision=1
-archs="i686* x86_64*"
-wrksrc=${pkgname}-${_distver}.BETA
-build_style=gnu-configure
-configure_args="CC=pcc"
-hostmakedepends="flex pcc"
-short_desc="Portable C Compiler - Support Libraries"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="http://pcc.ludd.ltu.se/"
-distfiles="http://pcc.ludd.ltu.se/ftp/pub/pcc-beta/${pkgname}-${_distver}.BETA-${_snapshot}.tgz"
-checksum=e810aa4d6683e769f490f734b13a296b33c2511ddba646bc526eb85532f1a23a
-nodebug=1
-nocross=1
-
-post_install() {
-	sed -n '2,25p' libpcc/cxmuldiv.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/pcc-libs/patches/build_PIC.patch b/srcpkgs/pcc/patches/build_PIC.patch
similarity index 64%
rename from srcpkgs/pcc-libs/patches/build_PIC.patch
rename to srcpkgs/pcc/patches/build_PIC.patch
index a11fcff6c3a..3b7eea6a13f 100644
--- a/srcpkgs/pcc-libs/patches/build_PIC.patch
+++ b/srcpkgs/pcc/patches/build_PIC.patch
@@ -1,7 +1,7 @@
 Respect passed CFLAGS to configure and force PIC object generation.
 
---- csu/linux/Makefile.orig	2011-02-24 12:59:36.988078869 +0100
-+++ csu/linux/Makefile	2011-02-24 13:01:29.434007771 +0100
+--- pcc-libs/csu/linux/Makefile.orig	2011-02-24 12:59:36.988078869 +0100
++++ pcc-libs/csu/linux/Makefile	2011-02-24 13:01:29.434007771 +0100
 @@ -4,7 +4,7 @@ VERSION ?= 0.9.9
  PCCLIBDIR ?= /usr/local/lib/pcc/$(TARGET)/$(VERSION)/lib
  SRCDIR ?= .
@@ -11,8 +11,8 @@ Respect passed CFLAGS to configure and force PIC object generation.
  
  OBJS = crt0.o crt1.o gcrt1.o crti.o crtn.o crtbegin.o crtend.o
  
---- libpcc/Makefile.in.orig	2011-02-24 13:02:15.570566278 +0100
-+++ libpcc/Makefile.in	2011-02-24 13:02:33.577393664 +0100
+--- pcc-libs/libpcc/Makefile.in.orig	2011-02-24 13:02:15.570566278 +0100
++++ pcc-libs/libpcc/Makefile.in	2011-02-24 13:02:33.577393664 +0100
 @@ -12,6 +12,7 @@ exec_prefix = @exec_prefix@
  libdir = @libdir@
  
@@ -21,8 +21,8 @@ Respect passed CFLAGS to configure and force PIC object generation.
  TARGMACH = @targmach@
  TARGOS = @targos@
  TARGET = @target@
---- libsoftfloat/Makefile.in.orig	2011-02-24 13:02:54.937188695 +0100
-+++ libsoftfloat/Makefile.in	2011-02-24 13:03:09.281050924 +0100
+--- pcc-libs/libsoftfloat/Makefile.in.orig	2011-02-24 13:02:54.937188695 +0100
++++ pcc-libs/libsoftfloat/Makefile.in	2011-02-24 13:03:09.281050924 +0100
 @@ -12,6 +12,7 @@ exec_prefix = @exec_prefix@
  libdir = @libdir@
  
diff --git a/srcpkgs/pcc/patches/void.patch b/srcpkgs/pcc/patches/void.patch
index f38fbc8fded..beb390b8f1e 100644
--- a/srcpkgs/pcc/patches/void.patch
+++ b/srcpkgs/pcc/patches/void.patch
@@ -1,5 +1,5 @@
---- os/linux/ccconfig.h.orig	2019-04-21 12:16:53.029059057 +0200
-+++ os/linux/ccconfig.h	2019-04-21 12:18:19.757287684 +0200
+--- pcc/os/linux/ccconfig.h.orig	2019-04-21 12:16:53.029059057 +0200
++++ pcc/os/linux/ccconfig.h	2019-04-21 12:18:19.757287684 +0200
 @@ -39,26 +39,31 @@
  
  #if defined(mach_i386)
diff --git a/srcpkgs/pcc/patches/x86-build-fix.patch b/srcpkgs/pcc/patches/x86-build-fix.patch
index 2f4f376f1ce..3638bd37ac7 100644
--- a/srcpkgs/pcc/patches/x86-build-fix.patch
+++ b/srcpkgs/pcc/patches/x86-build-fix.patch
@@ -2,8 +2,8 @@ Fix x86 build failure: only use MULTIARCH_PATH if it's defined :-)
 
 	--xtraeme
 
---- cc/cc/cc.c.orig	2014-12-18 14:57:43.961103113 +0100
-+++ cc/cc/cc.c	2014-12-18 14:57:52.881207162 +0100
+--- pcc/cc/cc/cc.c.orig	2014-12-18 14:57:43.961103113 +0100
++++ pcc/cc/cc/cc.c	2014-12-18 14:57:52.881207162 +0100
 @@ -207,9 +207,9 @@ char *cppmdadd[] = CPPMDADD;
  #endif
  #ifndef DEFLIBDIRS	/* default library search paths */
diff --git a/srcpkgs/pcc/template b/srcpkgs/pcc/template
index 718dcb7332d..84b020278d6 100644
--- a/srcpkgs/pcc/template
+++ b/srcpkgs/pcc/template
@@ -3,31 +3,75 @@ pkgname=pcc
 _snapshot=20190420
 _distver=1.1.0
 version=${_distver}.${_snapshot}
-revision=2
-wrksrc=${pkgname}-${_distver}.BETA
-build_style=gnu-configure
+revision=3
+archs="i686* x86_64*"
+create_wrksrc=yes
 configure_args="--enable-tls --enable-native"
-hostmakedepends="flex"
+hostmakedepends="flex bison"
 depends="binutils pcc-libs>=${version}"
 short_desc="Portable C Compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, BSD-3-Clause, MIT, BSD-4-Clause"
 homepage="http://pcc.ludd.ltu.se/"
-distfiles="http://pcc.ludd.ltu.se/ftp/pub/pcc-beta/pcc-${_distver}.BETA-${_snapshot}.tgz"
-checksum=a114dfca04b8b0559ea5d67b87d2d0fcb2bae2b4d9b9ba16ebc27960b921c812
-nocross=1
+distfiles="
+ http://pcc.ludd.ltu.se/ftp/pub/pcc-beta/pcc-${_distver}.BETA-${_snapshot}.tgz
+ http://pcc.ludd.ltu.se/ftp/pub/pcc-beta/pcc-libs-${_distver}.BETA-${_snapshot}.tgz"
+checksum="a114dfca04b8b0559ea5d67b87d2d0fcb2bae2b4d9b9ba16ebc27960b921c812
+ e810aa4d6683e769f490f734b13a296b33c2511ddba646bc526eb85532f1a23a"
+nocross=yes
 
 CFLAGS="-fcommon"
 
-pre_configure() {
-	vsed -i '/GNUC_MINOR/s,3,1,g' cc/cc/cc.c cc/driver/platform.c
+post_extract() {
+	mv pcc-${_distver}.BETA pcc
+	mv pcc-libs-${_distver}.BETA pcc-libs
 }
-pre_build() {
+
+post_patch() {
+	vsed -i '/GNUC_MINOR/s,3,1,g' pcc/cc/cc/cc.c pcc/cc/driver/platform.c
+}
+
+do_configure() {
+	cd $wrksrc/pcc
+	./configure ${configure_args} --libexecdir=/usr/libexec/pcc
+	cd $wrksrc/pcc-libs
+	./configure ${configure_args} CC=pcc
+}
+
+do_build() {
+	local _tmp=$wrksrc/tmp
+	mkdir -p $_tmp/usr/bin
+
+	PATH=$_tmp/usr/bin:$_tmp/usr/libexec/pcc:$PATH
+	cd $wrksrc/pcc
 	cp common/*.[ch] mip
+	make ${makejobs}
+	make DESTDIR=$_tmp install
+	cd $wrksrc/pcc-libs
+	make ${makejobs}
 }
-post_install() {
-	sed -n '2,27p' arch/i386/code.c > LICENSE
-	vlicense LICENSE
+
+do_install() {
+	cd $wrksrc/pcc
+	make DESTDIR=$DESTDIR install
+	sed -n '3,27p' arch/amd64/code.c > LICENSE.3BSD
+	sed -n '3,25p' arch/amd64/local.c > LICENSE.2BSD
+	sed -n '3,25p' arch/arm/table.c > LICENSE.MIT
+	sed -n '3,33p' arch/i386/flocal.c > LICENSE.Caldera
+	cd $wrksrc/pcc-libs
+	make DESTDIR=$DESTDIR install
 	# Rename conflicting cpp.1 manpage.
 	mv ${DESTDIR}/usr/share/man/man1/{cpp,pcc-cpp}.1
 }
+
+pcc-libs_package() {
+	short_desc+=" - libraries"
+	nodebug=yes
+	pkg_install() {
+		vmove usr/lib/pcc
+		vlicense pcc/LICENSE.3BSD
+		vlicense pcc/LICENSE.2BSD
+		vlicense pcc/LICENSE.MIT
+		vlicense pcc/LICENSE.Caldera
+	}
+}

From eb31c1199b184c572413bbd2cbeddaadeb10c441 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 21:57:00 +0200
Subject: [PATCH 367/419] xfwm4: update to 4.16.1.

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

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index d248ea39c22..22c598246b1 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,7 +1,7 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
-version=4.16.0
-revision=3
+version=4.16.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/xfwm4/${version%.*}/xfwm4-${version}.tar.bz2"
-checksum=1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3
+checksum=b5b24ca04bd73c642db0a4b4df81d262381d758f01b51108257d48b391b8718c
 
 post_patch() {
 	# compositor may be buggy on old and big endian hardware

From e9b221a1396e4e5bcbea836a4aeff63510abfc26 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 21:39:57 +0200
Subject: [PATCH 368/419] catfish: update to 4.16.0.

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

diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index d07a83d55e1..9ecdc3112e5 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.15.0
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=cefc43d091c719690d0c4ad259a757c89038ccdf290626674f54b1b1ea9cefbe
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47

From 593cf391f073cca278376560e6c90ebe8fe136f7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Jan 2021 16:54:35 +0100
Subject: [PATCH 369/419] iana-etc: update to 20210106.

---
 srcpkgs/iana-etc/files/services | 4 ++--
 srcpkgs/iana-etc/template       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index 02e8a9fe767..eff20e860d0 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -7225,8 +7225,6 @@ secure-cfg-svr   3978/tcp
 secure-cfg-svr   3978/udp
 smwan            3979/tcp
 smwan            3979/udp
-acms             3980/tcp
-acms             3980/udp
 starfish         3981/tcp
 starfish         3981/udp
 eis              3982/tcp
@@ -7663,6 +7661,7 @@ pscl-mgt         4312/tcp
 perrla           4313/tcp
 choiceview-agt   4314/tcp
 choiceview-clt   4316/tcp
+opentelemetry    4317/tcp
 fdt-rcatp        4320/tcp
 fdt-rcatp        4320/udp
 rwhois           4321/tcp
@@ -10905,6 +10904,7 @@ sxuptp          19540/udp
 jcp             19541/tcp
 jcp             19541/udp
 mle             19788/udp
+faircom-db      19790/tcp
 iec-104-sec     19998/tcp
 dnp-sec         19999/tcp
 dnp-sec         19999/udp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index 72a9075d996..5f8eacb3304 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=20201124
+version=20210106
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"

From e98186c527f6495b9f3fa72dffc06c0450dfbd97 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Jan 2021 17:06:41 +0100
Subject: [PATCH 370/419] schilytools: update to 2021.01.05.

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

diff --git a/srcpkgs/schilytools/template b/srcpkgs/schilytools/template
index 873ec8fb5f2..341007f35cb 100644
--- a/srcpkgs/schilytools/template
+++ b/srcpkgs/schilytools/template
@@ -1,6 +1,6 @@
 # Template file for 'schilytools'
 pkgname=schilytools
-version=2020.11.25
+version=2021.01.05
 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=32aee7498f4c6dabef04107fe9b6d597688be90f4b4fae057b10776567ae4eeb
+checksum=20bfdaf57fa63b9613aa0d96f2ad0bfdf0c07722bc46f3146bac667a90e2dfe1
 nocross=yes  # configure + re-builds with itself
 
 do_build() {

From f1b022ede87570d7a121a0e925659de4ffb07e2b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 13 Jan 2021 18:11:07 +0100
Subject: [PATCH 371/419] New package: dumb-init-1.2.4

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

diff --git a/srcpkgs/dumb-init/template b/srcpkgs/dumb-init/template
new file mode 100644
index 00000000000..f3e5898f81e
--- /dev/null
+++ b/srcpkgs/dumb-init/template
@@ -0,0 +1,17 @@
+# Template file for 'dumb-init'
+pkgname=dumb-init
+version=1.2.4
+revision=1
+build_style=gnu-makefile
+short_desc="Minimal init system for Linux containers"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/Yelp/dumb-init"
+changelog="https://github.com/Yelp/dumb-init/releases"
+distfiles="https://github.com/Yelp/dumb-init/archive/v${version}.tar.gz"
+checksum=8834ce3a520991607e38e2df2f74624db1f28114cb670427745370fcde08cdcb
+
+do_install() {
+	vbin dumb-init
+	vlicense LICENSE
+}

From 1dafd986772fea56366d1be35298503171e68292 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 13 Jan 2021 18:15:58 +0100
Subject: [PATCH 372/419] u-boot-tools: update to 2021.01.

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

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c0752ff6456..c486f52927e 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
-version=2020.10
+version=2021.01
 revision=1
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.denx.de/wiki/U-Boot/"
 distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
-checksum=0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622
+checksum=b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"

From 0f0dc3cfa08142cf20613ecb90972a749606ef68 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <unknown>
Date: Wed, 13 Jan 2021 14:49:11 +0100
Subject: [PATCH 373/419] snapwm: update to 2.0.8

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

diff --git a/srcpkgs/snapwm/template b/srcpkgs/snapwm/template
index 95fbdf26f0b..c789d06af1d 100644
--- a/srcpkgs/snapwm/template
+++ b/srcpkgs/snapwm/template
@@ -1,16 +1,16 @@
 # Template file for 'snapwm'
 pkgname=snapwm
-version=2.0.7
+version=2.0.8
 revision=1
 wrksrc=${pkgname}-stable-${version}
 build_style=gnu-makefile
 makedepends="libX11-devel libXinerama-devel libXrandr-devel"
-short_desc="A minimal and lightweight dynamic tiling window manager"
+short_desc="Minimal and lightweight dynamic tiling window manager"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://github.com/moetunes/snapwm-stable"
 distfiles="https://github.com/moetunes/snapwm-stable/archive/v${version}.tar.gz"
-checksum=2b188563b09873f2b6fc2ac2e8b9054a6ea9c2438bacbdaf84590539cabff373
+checksum=75227f949274338094b68ca37ff99554dd9e43b0a67420f8454099b814110c72
 CFLAGS="-std=c99"
 
 post_install() {

From 9a9f13fb921fe536ac6e6a09ad507c7431163981 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 13 Jan 2021 09:01:13 +0100
Subject: [PATCH 374/419] htop: update to 3.0.5.

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

diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template
index d57b6323f70..2693e232c4b 100644
--- a/srcpkgs/htop/template
+++ b/srcpkgs/htop/template
@@ -1,6 +1,6 @@
 # Template file for 'htop'
 pkgname=htop
-version=3.0.4
+version=3.0.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-unicode --enable-cgroup --enable-taskstats"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://htop.dev/"
 changelog="https://github.com/htop-dev/htop/blob/master/ChangeLog"
 distfiles="https://github.com/htop-dev/htop/archive/${version}.tar.gz"
-checksum=d8a0536ce95e3d59f8e292e73ee037033a74a8cc118fd10d22048bd4aeb61324
+checksum=4c2629bd50895bd24082ba2f81f8c972348aa2298cc6edc6a21a7fa18b73990c
 
 CFLAGS="-fcommon"
 

From 67d6abd9dd4106e39080956bfb8cef2d623b86df Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 13 Jan 2021 10:44:34 +0100
Subject: [PATCH 375/419] miniflux: update to 2.0.27.

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

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index a55744a2ff7..aa50315ece7 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.26
+version=2.0.27
 revision=1
 wrksrc="v2-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
 distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
-checksum=c16c9386f7a7fa1f938453beaa84d5d704bb8a3e4338a09c7c56df99c776de13
+checksum=ec6696b1cf41ef50b76d02d1179838e03d9c3bcb3dce48febe2b5f4ecc450473
 system_accounts="_miniflux"
 
 post_install() {

From a487d6f17bc06724bf432ffb40308814f38741ec Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 13 Jan 2021 11:03:49 +0100
Subject: [PATCH 376/419] yq-go: update to 4.3.2.

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

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 4a0f3c3fe19..7c70e6810ff 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=3.4.1
+version=4.3.2
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -9,8 +9,8 @@ short_desc="Lightweight and portable command-line YAML processor written in go"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
-distfiles="https://github.com/mikefarah/yq/archive/${version}.tar.gz"
-checksum=73259f808d589d11ea7a18e4cd38a2e98b518a6c2c178d1ec57d9c5942277cb1
+distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
+checksum=7e739f3d96dfb508bf52f33741135121363cf1bf21e3a890e5d8a937877881dc
 
 do_check() {
 	go test -v

From 50e08054f76c594cec3255f9e5dd283d5bd7aa14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 12 Jan 2021 10:50:10 +0100
Subject: [PATCH 377/419] crispy-doom: update to 5.10.0.

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

diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 9a71785dd8e..bd04288a06d 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.9.2
+version=5.10.0
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=6e93769aeafff60ac7c40027565d947e4f15cd95501ca468ee2bb7e420731070
+checksum=0b6bac20816d057692e4f5c15dbbb27cc49e404e821f774e2b16ce997a6f3fe1
 
 CFLAGS="-fcommon"
 

From e44dfff752e4cf116a2857078fd6eb4a2d263d93 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 13 Jan 2021 21:02:05 +0100
Subject: [PATCH 378/419] build-style/void-cross: explicitly enable plugins in
 binutils

this is already enabled implicitly based on checks, but might as
well make it explicit; it does not actually make any practical
difference though
---
 common/build-style/void-cross.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 5b9076d7522..e923c846025 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -67,6 +67,7 @@ _void_cross_build_binutils() {
 		--disable-werror \
 		--disable-gold \
 		--enable-relro \
+		--enable-plugins \
 		--enable-64-bit-bfd \
 		--enable-deterministic-archives \
 		--enable-default-hash-style=gnu \

From 28f1823e1a01298495ecb7f4a2ec8411807f0968 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 12 Jan 2021 19:28:57 +1100
Subject: [PATCH 379/419] retroarch: fix typo

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

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 063ebf36e8c..87301c2c9ef 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -26,7 +26,7 @@ homepage="https://www.retroarch.com/"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc noen opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+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"
 
 desc_option_glslang="Enable support for GLSL shaders"

From c81fc2bbe7de54dbbcacc69b9add5a488b1a1702 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, 14 Jan 2021 08:05:18 +0700
Subject: [PATCH 380/419] kreport: restore loss symbol, fix ftbfs kexi

---
 srcpkgs/kreport/patches/symbol-loss.patch | 120 ++++++++++++++++++++++
 srcpkgs/kreport/template                  |   3 +-
 2 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kreport/patches/symbol-loss.patch

diff --git a/srcpkgs/kreport/patches/symbol-loss.patch b/srcpkgs/kreport/patches/symbol-loss.patch
new file mode 100644
index 00000000000..f030b675a5d
--- /dev/null
+++ b/srcpkgs/kreport/patches/symbol-loss.patch
@@ -0,0 +1,120 @@
+From 5d3053ea78b349b81b7a562974ad78f93d169791 Mon Sep 17 00:00:00 2001
+From: Jaroslaw Staniek <staniek@kde.org>
+Date: Tue, 16 Jun 2020 21:59:12 +0200
+Subject: [PATCH] Fix build with GCC 10 (make KReportGroupTracker use C++ file)
+
+BUG:422886
+CCMAIL:adam@piggz.co.uk
+
+FIXED-IN:3.2.1
+---
+ src/CMakeLists.txt                            |  5 +---
+ .../scripting/KReportGroupTracker.cpp         | 26 +++++++++++++++++++
+ src/renderer/scripting/KReportGroupTracker.h  | 25 +++++++++++++++---
+ 3 files changed, 48 insertions(+), 8 deletions(-)
+ create mode 100644 src/renderer/scripting/KReportGroupTracker.cpp
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1cf0b389..65bcf6e5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -106,6 +106,7 @@ set(kreport_TARGET_INCLUDE_DIRS
+ 
+ if(KREPORT_SCRIPTING)
+     list(APPEND kreport_LIB_SRCS
++        renderer/scripting/KReportGroupTracker.cpp
+         renderer/scripting/KReportScriptHandler.cpp
+         renderer/scripting/KReportScriptConstants.cpp
+         renderer/scripting/KReportScriptDebug.cpp
+@@ -133,10 +134,6 @@ if(KREPORT_SCRIPTING)
+         items/text/KReportScriptText.cpp
+     )
+ 
+-    qt_wrap_cpp(KReport kreport_LIB_SRCS
+-        renderer/scripting/KReportGroupTracker.h
+-    )
+-
+     list(APPEND kreport_INCLUDE_DIRS
+         ${CMAKE_CURRENT_SOURCE_DIR}/renderer/scripting
+     )
+diff --git a/src/renderer/scripting/KReportGroupTracker.cpp b/src/renderer/scripting/KReportGroupTracker.cpp
+new file mode 100644
+index 00000000..9274d4a5
+--- /dev/null
++++ b/src/renderer/scripting/KReportGroupTracker.cpp
+@@ -0,0 +1,26 @@
++/* This file is part of the KDE project
++ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "KReportGroupTracker.h"
++
++KReportGroupTracker::KReportGroupTracker()
++{
++}
++
++KReportGroupTracker::~KReportGroupTracker()
++{
++}
+diff --git a/src/renderer/scripting/KReportGroupTracker.h b/src/renderer/scripting/KReportGroupTracker.h
+index e434e05a..4c0852ea 100644
+--- a/src/renderer/scripting/KReportGroupTracker.h
++++ b/src/renderer/scripting/KReportGroupTracker.h
+@@ -1,3 +1,20 @@
++/* This file is part of the KDE project
++ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
+ #ifndef KREPORTGROUPTRACKER_H
+ #define KREPORTGROUPTRACKER_H
+ 
+@@ -7,16 +24,16 @@
+ /*!
+  * @brief Keeps track of groups as the data for the group changes
+  */
+-class KREPORT_EXPORT KReportGroupTracker : public QObject {
++class KREPORT_EXPORT KReportGroupTracker : public QObject
++{
+     Q_OBJECT
+ 
+ protected:
+-    KReportGroupTracker() {}
+-    ~KReportGroupTracker() override{}
++    KReportGroupTracker();
++    ~KReportGroupTracker() override;
+ 
+ public:
+     Q_SLOT virtual void setGroupData(const QMap<QString, QVariant> &groupData) = 0;
+ };
+ 
+ #endif // KREPORTGROUPTRACKER_H
+-
+-- 
+2.29.2
+
diff --git a/srcpkgs/kreport/template b/srcpkgs/kreport/template
index 71eedf2144e..2dade86a8f4 100644
--- a/srcpkgs/kreport/template
+++ b/srcpkgs/kreport/template
@@ -1,7 +1,7 @@
 # Template file for 'kreport'
 pkgname=kreport
 version=3.2.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kcoreaddons"
 makedepends="ecm-devel kconfig-devel kcoreaddons-devel kguiaddons-devel kproperty-devel
@@ -12,6 +12,7 @@ license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KReport"
 distfiles="${KDE_SITE}/kreport/src/kreport-${version}.tar.xz"
 checksum=22716d719654e8f887fe4d33654e252ddf3d3d818c44e15a8af0e6f2e7d6ccd7
+patch_args=-Np1
 
 kreport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} kproperty-devel qt5-declarative-devel"

From 90b804753004b0e12e657381d2e71a89dabf97f5 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, 14 Jan 2021 08:20:38 +0700
Subject: [PATCH 381/419] parrot: fix ftbfs

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

diff --git a/srcpkgs/parrot/template b/srcpkgs/parrot/template
index 55472a9726c..ec36cbd2afd 100644
--- a/srcpkgs/parrot/template
+++ b/srcpkgs/parrot/template
@@ -7,7 +7,7 @@ configure_args="--prefix=/usr --mandir=/usr/share/man"
 short_desc="Virtual machine designed for dynamic languages"
 maintainer="pancake <pancake@nopcode.org>"
 homepage="http://www.parrot.org"
-hostmakedepends="perl"
+hostmakedepends="perl perl-Pod-Parser"
 configure_script="perl Configure.pl"
 license="Artistic"
 distfiles="ftp://ftp.parrot.org/pub/parrot/releases/supported/${version}/parrot-${version}.tar.bz2"

From 887d0e03d5dc64ab2fd650bde27b9b25fa2a1d42 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, 14 Jan 2021 08:26:04 +0700
Subject: [PATCH 382/419] vte290: fix l10n dir

---
 srcpkgs/vte290/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/vte290/template b/srcpkgs/vte290/template
index 2d1922b505e..c030b2c06b4 100644
--- a/srcpkgs/vte290/template
+++ b/srcpkgs/vte290/template
@@ -1,7 +1,7 @@
 # Template file for 'vte290'
 pkgname=vte290
 version=0.36.5
-revision=4
+revision=5
 wrksrc=vte-${version}
 build_style=gnu-configure
 build_helper="gir"
@@ -23,6 +23,10 @@ CFLAGS="-D_GNU_SOURCE"
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+}
+
 post_install() {
 	# Rename conflicting file
 	mv ${DESTDIR}/etc/profile.d/{vte,vte290}.sh

From e852b9a51a97917c04ddff3e4ef1174f6a45041a Mon Sep 17 00:00:00 2001
From: John Rowley <hey@johnrowley.me>
Date: Wed, 13 Jan 2021 22:10:04 +0100
Subject: [PATCH 383/419] alacritty: update to 0.7.1.

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

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 673e345a348..0604f7bdc92 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,6 +1,6 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.7.0
+version=0.7.1
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b9b7e96ebc1725962de628dac7d7bc0766ff9aea5f4c09f399e95823369d5882
+checksum=90dc5cd49bf0bb01a3202de2170ba376f9530aa265a939f6b3af3d30f8361f50
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 845aaec59155dcc4d55e24778fe2d19c1aa60e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 13 Jan 2021 01:55:11 -0300
Subject: [PATCH 384/419] doxygen: update to 1.9.1.

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

diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index 9fe4729644b..ea22d0d43a6 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -1,7 +1,7 @@
 # Template file for 'doxygen'
 pkgname=doxygen
-version=1.8.20
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None"
 hostmakedepends="perl python3 flex"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-only"
 homepage="http://www.doxygen.org/"
 distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz"
-checksum=e0db6979286fd7ccd3a99af9f97397f2bae50532e4ecb312aa18862f8401ddec
+checksum=67aeae1be4e1565519898f46f1f7092f1973cce8a767e93101ee0111717091d1
 
 build_options="wizard"
 desc_option_wizard="build Qt5 GUI configuration tool, doxywizard"

From e5de1137dc0dde0a285dcd55e71adb246952476b Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Wed, 13 Jan 2021 09:02:59 -0800
Subject: [PATCH 385/419] vault: update to 1.6.1

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

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 5b34538ad0c..edfa5c95a91 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.5.4
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/${pkgname}"
 go_build_tags="release"
-_git_commit=e16495da552c996068e05574cddf69875199f949
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,11 +13,15 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/${pkgname}/archive/v${version}.tar.gz"
-checksum=99e3145a9b6f5ee6429b997f3e1f35f648d07c617ff6aef7041f91fcf34e1582
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
 
+case "$XBPS_TARGET_MACHINE" in
+	arm*) go_ldflags="$go_ldflags -linkmode=external";;
+esac
+
 post_install() {
 	vlicense LICENSE
 	vsv vault

From a1ad149b15ee14a99fc47f99d9d5371eb5abbcf5 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 14 Jan 2021 10:08:03 +0100
Subject: [PATCH 386/419] cmake: update to 3.19.3.

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

diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index d88833bb472..b5289095e4a 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.19.2
+version=3.19.3
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -15,7 +15,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0
+checksum=3faca7c131494a1e34d66e9f8972ff5369e48d419ea8ceaa3dc15b4c11367732
 
 pre_check() {
 	# use ctest of this build instead of requirig cmake to test cmake...

From 7eafcbec9d6e6543aa7db90a23fff11430deee4d 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, 14 Jan 2021 08:42:30 +0700
Subject: [PATCH 387/419] roccat-tools: fix ftbfs, make_dirs

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

diff --git a/srcpkgs/roccat-tools/template b/srcpkgs/roccat-tools/template
index 070b9305bcf..f753744458d 100644
--- a/srcpkgs/roccat-tools/template
+++ b/srcpkgs/roccat-tools/template
@@ -1,13 +1,12 @@
 # Template file for 'roccat-tools'
 pkgname=roccat-tools
 version=5.8.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DDEVICES=arvo;isku;iskufx;kiro;kone;koneplus;konepure;konepuremilitary;konepureoptical;konextd;konextdoptical;kovaplus;kova2016;lua;nyth;pyra;ryosmk;ryosmkfx;ryostkl;savu;skeltr;sova;suora;tyon
  -DWITH_LUA=5.3 -DUDEVDIR=/usr/lib/udev/rules.d
  -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/lib/cmake"
-make_dirs="/var/lib/roccat 2770 root roccat"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="lua53-devel gtk+-devel libgaminggear-devel dbus-glib-devel
  libgudev-devel"
@@ -18,8 +17,9 @@ homepage="https://roccat.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/roccat/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=181178da305e82267e45bcc6577dc03387322303b8c341be33e574afdf8a213b
 system_groups="_roccat"
+make_dirs="/var/lib/roccat 2770 root _roccat"
 
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -I$XBPS_CROSS_BASE/usr/include/harfbuzz"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus-glib-devel"

From 86d9b50061451a0b5dc3f95d95b0140f93fb9c18 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, 14 Jan 2021 08:35:01 +0700
Subject: [PATCH 388/419] stockfish: use upstream's cxxflags, fix ftbfs

---
 srcpkgs/stockfish/patches/makefile.patch | 33 ++++++++++++++++++------
 srcpkgs/stockfish/template               |  9 +++++--
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/stockfish/patches/makefile.patch b/srcpkgs/stockfish/patches/makefile.patch
index 00b7ef3c84b..b5fc75e7a0a 100644
--- a/srcpkgs/stockfish/patches/makefile.patch
+++ b/srcpkgs/stockfish/patches/makefile.patch
@@ -1,12 +1,29 @@
---- src/Makefile.orig
-+++ src/Makefile
-@@ -159,9 +159,6 @@
- 			CXXFLAGS += -m$(bits)
- 			LDFLAGS += -m$(bits)
- 		endif
+--- src/Makefile.orig	2020-09-02 21:19:30.000000000 +0700
++++ src/Makefile	2021-01-14 18:51:25.852600109 +0700
+@@ -306,26 +306,7 @@
+ 
+ ifeq ($(COMP),gcc)
+ 	comp=gcc
+-	CXX=g++
+ 	CXXFLAGS += -pedantic -Wextra -Wshadow
+-
+-	ifeq ($(arch),$(filter $(arch),armv7 armv8))
+-		ifeq ($(OS),Android)
+-			CXXFLAGS += -m$(bits)
+-			LDFLAGS += -m$(bits)
+-		endif
 -	else
 -		CXXFLAGS += -m$(bits)
 -		LDFLAGS += -m$(bits)
- 	endif
+-	endif
+-
+-	ifeq ($(arch),$(filter $(arch),armv7))
+-		LDFLAGS += -latomic
+-	endif
+-
+-	ifneq ($(KERNEL),Darwin)
+-	   LDFLAGS += -Wl,--no-as-needed
+-	endif
+ endif
  
- 	ifneq ($(KERNEL),Darwin)
+ ifeq ($(COMP),mingw)
diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index 8e0225e0df7..99d3e95e6f5 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,12 +1,13 @@
 # Template file for 'stockfish'
 pkgname=stockfish
 version=12
-revision=1
+revision=2
 _net_file=nn-82215d0fd0df.nnue
 wrksrc="Stockfish-sf_${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_build_target=build
+make_use_env=yes
 hostmakedepends="tar"
 short_desc="Free UCI chess engine derived from Glaurung"
 maintainer="cipr3s <cipr3s@gmx.com>"
@@ -20,14 +21,18 @@ skip_extraction="${_net_file}"
 
 LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"
 
+# We know how to optimize ourselves
+make_build_args="optimize=no "
+
 case $XBPS_TARGET_MACHINE in
 	x86_64*) make_build_args+="ARCH=x86-64" ;;
 	i686*) make_build_args+="ARCH=x86-32" ;;
-	aarch64*) make_build_args+="ARCH=general-64" ;;
+	aarch64*) make_build_args+="ARCH=armv8" ;;
 	armv[56]*) make_build_args+="ARCH=general-32";;
 	armv7*) make_build_args+="ARCH=armv7" ;;
 	ppc64*) make_build_args+="ARCH=ppc-64" ;;
 	ppc*) make_build_args+="ARCH=ppc-32" ;;
+	*) broken="not supported" ;;
 esac
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 56dd8bdbbc47f66a345de0aea78525172ebc665b 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, 14 Jan 2021 19:17:29 +0700
Subject: [PATCH 389/419] kakoune: use project's cxxflags

Not sure if it should warrant a rebuild but this package is cheap to be
built.
---
 srcpkgs/kakoune/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template
index 934795a45f6..4f308a8c698 100644
--- a/srcpkgs/kakoune/template
+++ b/srcpkgs/kakoune/template
@@ -2,11 +2,12 @@
 pkgname=kakoune
 reverts=20180409_1
 version=2020.09.01
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
-make_build_args="debug=no"
-make_install_args="debug=no"
+make_build_args="debug=no gzip_man=no"
+make_install_args="debug=no gzip_man=no"
+make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel"
 short_desc="Selection-based vim-like editor with less keystrokes"
@@ -15,3 +16,7 @@ license="Unlicense"
 homepage="https://kakoune.org"
 distfiles="https://github.com/mawww/kakoune/releases/download/v${version}/kakoune-${version}.tar.bz2"
 checksum=861a89c56b5d0ae39628cb706c37a8b55bc289bfbe3c72466ad0e2757ccf0175
+
+post_patch() {
+	vsed -i -e 's/-O3//' Makefile
+}

From 9fe84e14f54301ada96ceb920774be89cb6ce4d4 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, 14 Jan 2021 20:27:15 +0700
Subject: [PATCH 390/419] mpdas: fix ftbfs

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

diff --git a/srcpkgs/mpdas/template b/srcpkgs/mpdas/template
index 495033d8d19..4e64f1f8fdf 100644
--- a/srcpkgs/mpdas/template
+++ b/srcpkgs/mpdas/template
@@ -1,15 +1,16 @@
 # Template file for 'mpdas'
 pkgname=mpdas
 version=0.4.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr CONFIG=/etc"
 make_install_args="MANPREFIX=/usr/share/man/man1"
+make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="libmpdclient-devel libcurl-devel"
 short_desc="MPD AudioScrobbler written in C++ using libcurl"
 maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
-license="3-clause-BSD"
+license="BSD-3-Clause"
 homepage="http://50hz.ws/mpdas/"
 distfiles="https://github.com/hrkfdn/mpdas/archive/${version}.tar.gz"
 checksum=c9103d7b897e76cd11a669e1c062d74cb73574efc7ba87de3b04304464e8a9ca

From 117e6c30f49d034731a360c25ed28a5ee892b7f6 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, 14 Jan 2021 20:34:37 +0700
Subject: [PATCH 391/419] ponymix: make use env, fix ftbfs

---
 srcpkgs/ponymix/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/ponymix/template b/srcpkgs/ponymix/template
index 772c201e548..56db91f5a8a 100644
--- a/srcpkgs/ponymix/template
+++ b/srcpkgs/ponymix/template
@@ -3,6 +3,7 @@ pkgname=ponymix
 version=5
 revision=1
 build_style=gnu-makefile
+make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="pulseaudio-devel libnotify-devel"
 short_desc="CLI volume control for PulseAudio"

From 3f0d5b61fe37ec85e7a8dcfc9eea0441ef854400 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 13 Jan 2021 18:34:12 +0100
Subject: [PATCH 392/419] keepassxc: update to 2.6.3.

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

diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index b560bbb81a1..7778193f5fb 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,6 +1,6 @@
 # Template file for 'keepassxc'
 pkgname=keepassxc
-version=2.6.2
+version=2.6.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,
 homepage="https://keepassxc.org/"
 changelog="https://raw.githubusercontent.com/keepassxreboot/keepassxc/blob/${version}/CHANGELOG.md"
 distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz"
-checksum=101bfade0a760d6ec6b8c4f3556e7f1201f1edd29ceabc73ad5846f9a57d7e38
+checksum=e7e0b6ed8f3881c5b9579074bc3cde3991b28c1a3d1c852c46f2b7930a10f7d1
 
 # https://github.com/keepassxreboot/keepassxc/blob/a775031fe9471310e50232d1861d4991e2803aff/CMakeLists.txt#L46
 build_options="autotype browser fdosecrets keeshare network sshagent yubikey"

From 4b5a7fa1d5fbc6af80b4f16963b2e8f07f819c82 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, 14 Jan 2021 20:46:16 +0700
Subject: [PATCH 393/419] reminiscence: fix ftbfs

---
 srcpkgs/reminiscence/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/reminiscence/template b/srcpkgs/reminiscence/template
index 30e1d7b0123..33a2d85e828 100644
--- a/srcpkgs/reminiscence/template
+++ b/srcpkgs/reminiscence/template
@@ -4,6 +4,7 @@ version=0.4.6
 revision=1
 wrksrc="REminiscence-${version}"
 build_style=gnu-makefile
+make_use_env=yes
 makedepends="zlib-devel libmodplug-devel SDL2-devel"
 short_desc="Rewrite of the engine used in the game Flashback from Delphine Software"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6f74e7a539efd6416c9d1d63b5ff6c028403eafa 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, 14 Jan 2021 20:46:35 +0700
Subject: [PATCH 394/419] reminiscence: remove package

- The last GPLv3 version was 0.2.1 or so (Debian has this version)
- Our current version doesn't have any license, only Copyright notice,
  let's not play the politic game.
---
 srcpkgs/reminiscence/template | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 srcpkgs/reminiscence/template

diff --git a/srcpkgs/reminiscence/template b/srcpkgs/reminiscence/template
deleted file mode 100644
index 33a2d85e828..00000000000
--- a/srcpkgs/reminiscence/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'reminiscence'
-pkgname=reminiscence
-version=0.4.6
-revision=1
-wrksrc="REminiscence-${version}"
-build_style=gnu-makefile
-make_use_env=yes
-makedepends="zlib-devel libmodplug-devel SDL2-devel"
-short_desc="Rewrite of the engine used in the game Flashback from Delphine Software"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
-homepage="http://cyxdown.free.fr/reminiscence/"
-distfiles="http://cyxdown.free.fr/reminiscence/REminiscence-${version}.tar.bz2"
-checksum=a1738ca7df64cd34e75a0ada3110e70ed495260fda813bc9d8722b521fc6fee0
-
-pre_build() {
-	vsed -e 's,-DUSE_TREMOR,,' -i Makefile
-	vsed -e '/LIBS =/s/$(TREMOR_LIBS)//' -i Makefile
-}
-
-do_install() {
-	vbin rs ${pkgname}
-	vdoc README.txt
-}

From e9c0a6239367306156fd297dc44fd87816c7fc5b 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, 14 Jan 2021 21:47:48 +0700
Subject: [PATCH 395/419] xava: fix ftbfs for cross build

---
 srcpkgs/xava/patches/broken-cmake.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/xava/patches/broken-cmake.patch

diff --git a/srcpkgs/xava/patches/broken-cmake.patch b/srcpkgs/xava/patches/broken-cmake.patch
new file mode 100644
index 00000000000..ea0775a84fe
--- /dev/null
+++ b/srcpkgs/xava/patches/broken-cmake.patch
@@ -0,0 +1,22 @@
+--- CMakeLists.txt.orig	2020-08-27 15:31:42.000000000 +0700
++++ CMakeLists.txt	2021-01-14 21:44:51.704505119 +0700
+@@ -10,19 +10,6 @@
+ option(SNDIO "SNDIO" ON)
+ option(PORTAUDIO "PORTAUDIO" ON)
+ 
+-# Fix pkg-config for cross-builds (such as MinGW on ArchLinux)
+-if(CMAKE_FIND_ROOT_PATH)
+-    set(CMAKE_SYSROOT "${CMAKE_FIND_ROOT_PATH}")
+-
+-    set(ENV{PKG_CONFIG_DIR} "")
+-    set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share/pkgconfig")
+-    set(ENV{PKG_CONFIG_SYSROOT_DIR} ${CMAKE_SYSROOT})
+-endif()
+-
+-if(NOT CMAKE_BUILD_TYPE)
+-	set(CMAKE_BUILD_TYPE Debug)
+-endif()
+-
+ set(CMAKE_C_STANDARD 11)
+ set(xava_VERSION_MAJOR 0)
+ set(xava_VERSION_MINOR 6)

From 4a79f5c78472185fd3945a7b14531c922ae6dfd5 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, 14 Jan 2021 21:54:45 +0700
Subject: [PATCH 396/419] upx: fix ftbfs

---
 srcpkgs/upx/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/upx/template b/srcpkgs/upx/template
index d2f7292352e..c562348651d 100644
--- a/srcpkgs/upx/template
+++ b/srcpkgs/upx/template
@@ -6,6 +6,7 @@ wrksrc="upx-${version}-src"
 build_style=gnu-makefile
 make_build_target=all
 make_build_args="CHECK_WHITESPACE=:"
+make_use_env=yes
 hostmakedepends="perl"
 makedepends="ucl zlib-devel"
 short_desc="Ultimate Packer for eXecutables"

From b6559ea571851337cba3f33d3e696e2184476aee 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, 14 Jan 2021 21:58:24 +0700
Subject: [PATCH 397/419] Revert "reminiscence: remove package"

This reverts commit 6f74e7a539efd6416c9d1d63b5ff6c028403eafa.

Didn't mean to push this out, was rfc.
---
 srcpkgs/reminiscence/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/reminiscence/template

diff --git a/srcpkgs/reminiscence/template b/srcpkgs/reminiscence/template
new file mode 100644
index 00000000000..33a2d85e828
--- /dev/null
+++ b/srcpkgs/reminiscence/template
@@ -0,0 +1,24 @@
+# Template file for 'reminiscence'
+pkgname=reminiscence
+version=0.4.6
+revision=1
+wrksrc="REminiscence-${version}"
+build_style=gnu-makefile
+make_use_env=yes
+makedepends="zlib-devel libmodplug-devel SDL2-devel"
+short_desc="Rewrite of the engine used in the game Flashback from Delphine Software"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3"
+homepage="http://cyxdown.free.fr/reminiscence/"
+distfiles="http://cyxdown.free.fr/reminiscence/REminiscence-${version}.tar.bz2"
+checksum=a1738ca7df64cd34e75a0ada3110e70ed495260fda813bc9d8722b521fc6fee0
+
+pre_build() {
+	vsed -e 's,-DUSE_TREMOR,,' -i Makefile
+	vsed -e '/LIBS =/s/$(TREMOR_LIBS)//' -i Makefile
+}
+
+do_install() {
+	vbin rs ${pkgname}
+	vdoc README.txt
+}

From 497ea913dea82947193633de1e3b93bd26359b84 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 5 Jan 2021 23:15:47 +0100
Subject: [PATCH 398/419] pipewire: update to 0.3.19

* add ncurses makedep for pw-top
---
 srcpkgs/pipewire/INSTALL.msg            |  3 +++
 srcpkgs/pipewire/patches/ncursesw.patch | 11 +++++++++++
 srcpkgs/pipewire/template               |  6 +++---
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pipewire/INSTALL.msg
 create mode 100644 srcpkgs/pipewire/patches/ncursesw.patch

diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
new file mode 100644
index 00000000000..f7c4437683d
--- /dev/null
+++ b/srcpkgs/pipewire/INSTALL.msg
@@ -0,0 +1,3 @@
+WARNING: pipewire>=0.3.19 changed the config file format. If
+you edited /etc/pipewire/pipewire.conf you must recreate it from
+/etc/pipewire/pipewire.conf.new-0.3.19_1 with your changes on top.
diff --git a/srcpkgs/pipewire/patches/ncursesw.patch b/srcpkgs/pipewire/patches/ncursesw.patch
new file mode 100644
index 00000000000..92598546b11
--- /dev/null
+++ b/srcpkgs/pipewire/patches/ncursesw.patch
@@ -0,0 +1,11 @@
+--- meson.build.orig	2021-01-05 18:40:24.345620177 +0100
++++ meson.build	2021-01-05 18:40:43.209619527 +0100
+@@ -325,7 +325,7 @@
+ pthread_lib = dependency('threads')
+ dbus_dep = dependency('dbus-1')
+ sdl_dep = dependency('sdl2', required : false)
+-ncurses_dep = dependency('ncurses', required : false)
++ncurses_dep = dependency('ncursesw', required : false)
+ sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : false)
+ 
+ if get_option('gstreamer')
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index bd2bafdada7..7ad025fa5a5 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.18
+version=0.3.19
 revision=1
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
@@ -8,7 +8,7 @@ configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
  -Dudevrulesdir=/usr/lib/udev/rules.d"
 hostmakedepends="doxygen graphviz pkg-config xmltoman"
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
- sbc-devel v4l-utils-devel libva-devel libbluetooth-devel"
+ sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel"
 depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=a7317de8e54f57190a2e2fe5f469ed332b9a12151fade03bf984765a55e5e24b
+checksum=de2e757a57ff313362341f4b18b976c707d397d853c0cd2032975b76d0c540dc
 conf_files="/etc/pipewire/pipewire.conf"
 
 replaces="libpulseaudio-pipewire>=0"

From fa17c4a9b926a8e82d5864406a5e1bbdd44c236c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Jan 2021 16:39:26 +0100
Subject: [PATCH 399/419] python3-boto3: update to 1.16.54.

---
 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 eb982f6ff10..b3a17ca435b 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.16.51
+version=1.16.54
 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=95160b45df095801b4551f76dbd46496a587effe1e10890ab355be564d67a334
+checksum=29b031327dcd60cbb2eabe704ee7e4f0184513b85645057241fc0af16acae412
 
 post_install() {
 	vlicense LICENSE

From 98b05f220605392a368dfd4a17d33580d25a3b64 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Jan 2021 16:39:29 +0100
Subject: [PATCH 400/419] snooze: update to 0.5.

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

diff --git a/srcpkgs/snooze/template b/srcpkgs/snooze/template
index 4b5d9a27140..a38900dd41c 100644
--- a/srcpkgs/snooze/template
+++ b/srcpkgs/snooze/template
@@ -1,6 +1,6 @@
 # Template file for 'snooze'
 pkgname=snooze
-version=0.4
+version=0.5
 revision=1
 build_style=gnu-makefile
 short_desc="Run a command at a particular time"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/leahneukirchen/snooze"
 distfiles="https://github.com/leahneukirchen/snooze/archive/v${version}.tar.gz"
-checksum=1d1dc49edb3a96ddc6411b19e40e665dae47489fcc73465dd254e31816ca8eb0
+checksum=d63fde85d9333188bed5996baabd833eaa00842ce117443ffbf8719c094be414
 
 post_install() {
 	make -C sv install DESTDIR="$DESTDIR"

From 6bf152159c72be07a139f7adc1ef25ad335e88f0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Jan 2021 16:49:08 +0100
Subject: [PATCH 401/419] mblaze: update to 1.1.

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

diff --git a/srcpkgs/mblaze/template b/srcpkgs/mblaze/template
index f2f5c426bfb..88624be8f71 100644
--- a/srcpkgs/mblaze/template
+++ b/srcpkgs/mblaze/template
@@ -1,6 +1,6 @@
 # Template file for 'mblaze'
 pkgname=mblaze
-version=1.0
+version=1.1
 revision=1
 build_style=gnu-makefile
 checkdepends="perl"
@@ -9,13 +9,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain, MIT"
 homepage="https://github.com/leahneukirchen/mblaze"
 distfiles="https://leahneukirchen.org/releases/${pkgname}-${version}.tar.gz"
-checksum=316061e8d6cf6455a91105c550669638f6e0288c53c7185fb2429c54e80f2335
+checksum=edd8cb86f667543e703dee58263b81c7e47744339d23ebbb6a43e75059ba93b1
 
 post_install() {
 	vbin contrib/mcount
 	vbin contrib/mencrypt
 	vbin contrib/menter
 	vbin contrib/mgpg
+	vbin contrib/mmailto
 	vbin contrib/mp7m
 	vbin contrib/mraw
 	vbin contrib/mrecode

From ed12f7fd94ec51b9e97c91c2b9fb4bb6c47876eb Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 14 Jan 2021 17:04:19 +0100
Subject: [PATCH 402/419] linux5.4: update to 5.4.89.

---
 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 5b0b52acfbe..35de1cf56c2 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.87
+version=5.4.89
 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=6a34e93e2e84bb645155124962307ad9d3646124f43838d087209ed4ea595c31
+checksum=268dd5177b6df1867d4ed2452ffb11a016d955c43aba5e07940886f347ab0aaf
 python_version=3
 patch_args="-Np1"
 

From f71c3b8e8ec326bf37aa1fb0c02614a0681dd129 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 14 Jan 2021 17:05:42 +0100
Subject: [PATCH 403/419] linux4.19: update to 4.19.167.

---
 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 de6b8cff724..93d5896f818 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.165
+version=4.19.167
 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=a1c05649b0f28d041c34d09d710d2d18f83d42fea4eb90569320d216d4e4e2d0
+checksum=312c67677c75adc4324078c5afb11411df379d5573ad0a429b3f4919f26bed01
 python_version=2 #unverified
 patch_args="-Np1"
 

From ffe7a01640a416560d17c66d6e13cb3df985083b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 14 Jan 2021 17:26:04 +0100
Subject: [PATCH 404/419] xinetd: use libtirpc

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

diff --git a/srcpkgs/xinetd/template b/srcpkgs/xinetd/template
index 9d71592b6e7..dbdd441c063 100644
--- a/srcpkgs/xinetd/template
+++ b/srcpkgs/xinetd/template
@@ -1,9 +1,10 @@
 # Template file for 'xinetd'
 pkgname=xinetd
 version=2.3.15
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--without-libwrap"
+makedepends="libtirpc-devel"
 short_desc="A secure replacement for inetd"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="xinetd"
@@ -13,11 +14,13 @@ checksum=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3
 
 conf_files="/etc/xinetd.conf /etc/xinetd.d/servers /etc/xinetd.d/services"
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) export CFLAGS+=" -DNO_RPC"; configure_args+=" xinetd_cv_type_rlim_t=yes";;
-	esac
-}
+CFLAGS=" -I${XBPS_CROSS_BASE}/usr/include/tirpc"
+LDFLAGS=" -ltirpc"
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" xinetd_cv_type_rlim_t=yes"
+fi
+
 do_install() {
 	make prefix=${DESTDIR}/usr DAEMONDIR=${DESTDIR}/usr/bin MANDIR=${DESTDIR}/usr/share/man install
 

From 61064a9d5f177de5f76fb1d2073851c5a896d2b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 14 Jan 2021 18:40:19 +0100
Subject: [PATCH 405/419] so: update to 0.4.3.

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

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index bf59d26630c..ecdbb5331ee 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,6 +1,6 @@
 # Template file for 'so'
 pkgname=so
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/samtay/so"
 distfiles="https://github.com/samtay/so/archive/v${version}.tar.gz"
-checksum=402d3a07283375d92892802544481a417f9d017b5e80733183ccbce3a810ef84
+checksum=4e82cb8f6d31435eec03a74d0ea4297eb28ce3ee75d4612ca5b2233c27e19c2d
 
 post_install() {
 	vlicense LICENSE

From b2924d823e45c149eeb63de6f427f825fdff029b Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Sat, 9 Jan 2021 14:53:24 -0500
Subject: [PATCH 406/419] wine: Add wine-staging patchset as a (non-default)
 build option

closes #27612
---
 srcpkgs/wine/template | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index be0981ca546..36e99f6fafb 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,20 +1,25 @@
 # Template file for 'wine'
 pkgname=wine
 version=6.0rc6
-revision=1
-wrksrc=wine-${version/r/-r}
+revision=2
+_pkgver=${version/r/-r}
+create_wrksrc=yes
+build_wrksrc=wine-${_pkgver}
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
 short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz"
-checksum=e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz
+ https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
+checksum="e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+ 9ee8a6d9eefae3bca4a6550d5336edac96537e5da0c3669003d21f08b55cbd13"
 
-build_options="mingw"
+build_options="mingw staging"
 build_options_default="mingw"
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
+desc_option_staging="Apply the wine-staging patchset"
 
 lib32mode=full
 archs="i686* x86_64*"
@@ -28,7 +33,8 @@ if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 fi
 
 hostmakedepends="pkg-config flex gettext
- $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")"
+ $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")
+ $(vopt_if staging 'autoconf')"
 makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
  glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
  libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
@@ -64,6 +70,12 @@ if [ "${_nopie}" = yes ]; then
 	nopie_files+=" ${_wine_libexec}/wineserver${_wineserver_suffix}"
 fi
 
+post_patch() {
+	if [ "${build_option_staging}" ]; then
+		"../wine-staging-${_pkgver}/patches/patchinstall.sh" --all
+	fi
+}
+
 pre_build() {
 	if [ "${_nopie}" = yes ]; then
 		make ${makejobs} LDFLAGS="$LDFLAGS -no-pie" \

From 880f8b43f300c70bc2c9d0b659bcbb5ab8955317 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 14 Jan 2021 19:29:01 +0100
Subject: [PATCH 407/419] mesa-demos: fix DEMOS_DATA_DIR

---
 srcpkgs/mesa-demos/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index a10713008e1..6a6974d5f37 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,8 +1,9 @@
 # Template file for 'mesa-demos'
 pkgname=mesa-demos
 version=8.4.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-system-data-files"
 hostmakedepends="pkg-config"
 makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel"
 short_desc="Mesa 3D demos and tools"

From 84cff5ec39bb7972ea4cbdd927197b00be66d30f Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Wed, 13 Jan 2021 21:17:58 -0700
Subject: [PATCH 408/419] phpMyAdmin: update to 5.0.4, fix license

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

diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template
index 12cb1d5e4c4..a55d2b5dfe2 100644
--- a/srcpkgs/phpMyAdmin/template
+++ b/srcpkgs/phpMyAdmin/template
@@ -1,16 +1,16 @@
 # Template file for 'phpMyAdmin'
 pkgname=phpMyAdmin
-version=5.0.2
-revision=2
+version=5.0.4
+revision=1
 wrksrc="phpMyAdmin-${version}-all-languages"
 conf_files="/etc/webapps/phpMyAdmin/config.inc.php"
 depends="php mysql"
 short_desc="Web interface for MySQL and MariaDB"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="GPL-2.0-or-later"
+license="GPL-2.0-only"
 homepage="https://www.phpmyadmin.net"
 distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz"
-checksum=cbcc78d1499308d9329950fcba2ebaa84c559a934fe54efc027d459d8e4161c8
+checksum=1578c1a08e594da4f4f62e676ccbdbd17784c3de769b094ba42c35bf05c057db
 
 do_install() {
 	vmkdir usr/share/webapps/

From c203e65ab3b9441b1169e8c14b64f8613c700148 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 14:56:46 -0600
Subject: [PATCH 409/419] wine: update to 6.0.

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 36e99f6fafb..e8b1fda250c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.0rc6
-revision=2
+version=6.0
+revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
- 9ee8a6d9eefae3bca4a6550d5336edac96537e5da0c3669003d21f08b55cbd13"
+checksum="b493065f2f83ee429c62e2ec58698a3cf63ef78722e1b20765823152e8582c56
+ 194902cb880a657de386e0789f8ce1f369fb896468ca299fd5abbe921fee043c"
 
 build_options="mingw staging"
 build_options_default="mingw"

From a0b7385b960b40334288922d698460125de8ab29 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 14 Jan 2021 14:20:29 -0700
Subject: [PATCH 410/419] fonts-nanum-ttf: update to 20200506.

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

diff --git a/srcpkgs/fonts-nanum-ttf/template b/srcpkgs/fonts-nanum-ttf/template
index 3bba3856b17..fab4809376e 100644
--- a/srcpkgs/fonts-nanum-ttf/template
+++ b/srcpkgs/fonts-nanum-ttf/template
@@ -1,7 +1,7 @@
 # Template file for 'fonts-nanum-ttf'
 pkgname=fonts-nanum-ttf
-version=20180306
-revision=2
+version=20200506
+revision=1
 wrksrc=${pkgname%-*}-${version}
 depends="font-util"
 short_desc="Nanum Korean fonts"
@@ -9,7 +9,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="OFL-1.1"
 homepage="https://hangeul.naver.com/2017/nanum"
 distfiles="${DEBIAN_SITE}/main/f/${pkgname%-*}/${pkgname%-*}_${version}.orig.tar.xz"
-checksum=2761e62f3f3f500c7a50d40d5ee8bbd87abe22ab42a78df0496cf80c95fec6f0
+checksum=157803748198151250a3cf7cb03aef844e408e9c98849dd889e191846aacad4b
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {

From a2e0209b570ef9da4d7dfde2f5de6af67ecf2043 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <unknown>
Date: Wed, 13 Jan 2021 13:57:16 +0100
Subject: [PATCH 411/419] font-unifont-bdf: update to 13.0.05

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

diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template
index 3b8eac00a01..6f65dba0bad 100644
--- a/srcpkgs/font-unifont-bdf/template
+++ b/srcpkgs/font-unifont-bdf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-unifont-bdf'
 pkgname=font-unifont-bdf
-version=13.0.04
+version=13.0.05
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://unifoundry.com/unifont/index.html"
 distfiles="http://unifoundry.com/pub/unifont/unifont-${version}/font-builds/unifont-${version}.bdf.gz"
-checksum=5319d51779aa23e206268e6e6de71bb67b983033468d2c815118aecf5f7d57c0
+checksum=c4e61e9336d8d024479ea72616722c6c47c93f76dc173e8ad3edf9f9e07c3115
 font_dirs=/usr/share/fonts/misc
 
 do_install() {

From 003142cb848f42090ca07e82dc86f88152db6b48 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 12 Jan 2021 10:49:09 +0400
Subject: [PATCH 412/419] calibre: update to 5.9.0.

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

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 4d430e615a3..738dfda3d51 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.8.1
+version=5.9.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.yaml"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=23910db4cff74236f489a9720ad45a30afd1eb09dd05e944f383b1b3ac9d514e
+checksum=a71196af15372054c4a25697534a2df1ef6dd732b9db07aaecaac7a86d9b3a0a
 lib32disabled=yes
 nocross=yes
 

From b662b850c79b59ed4e9de10bfbf4edebca073c83 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 2 Jan 2021 15:58:31 -0700
Subject: [PATCH 413/419] yambar: update to 1.6.1.

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

diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index b558e6081ed..c880328f2d5 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,6 +1,6 @@
 # Template file for 'yambar'
 pkgname=yambar
-version=1.6.0
+version=1.6.1
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://codeberg.org/dnkl/yambar"
 changelog="https://codeberg.org/dnkl/yambar/raw/branch/master/CHANGELOG.md"
 distfiles="https://codeberg.org/dnkl/yambar/archive/${version}.tar.gz"
-checksum=143c09b256d3c042e908fd1b658fc513b476af780c213dc621cbeff2526a1e7a
+checksum=9ddf0bd7a708445697b4bf2f1d6d0fe5c29c5c7cd6df6058a739fe89413bd2c7
 
 do_check() {
 	xvfb-run ninja -C build/ test

From abbe4706337a54633bca8daa2281f281028cbea4 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, 14 Jan 2021 20:20:55 +0700
Subject: [PATCH 414/419] mpc-qt: fix ftbfs

Fetch the latest version of qthelper.hpp from mpv.
See https://github.com/mpv-player/mpv/commit/575197ff8b0a0d8cd14f7ee78461c1d61d045d72
---
 srcpkgs/mpc-qt/template | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/mpc-qt/template b/srcpkgs/mpc-qt/template
index 182072df113..28651df5cf4 100644
--- a/srcpkgs/mpc-qt/template
+++ b/srcpkgs/mpc-qt/template
@@ -4,16 +4,21 @@ version=18.08
 revision=1
 build_style=qmake
 configure_args="MPCQT_VERSION=${version}"
-hostmakedepends="pkg-config qt5-qmake"
+hostmakedepends="pkg-config qt5-qmake qt5-x11extras-devel"
 makedepends="qt5-devel qt5-x11extras-devel mpv-devel"
 short_desc="Clone of Media Player Classic reimplemented in Qt"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/cmdrkotori/mpc-qt"
 #distfiles="${homepage}/archive/v${version}.tar.gz"
-distfiles="https://sources.voidlinux.org/mpc-qt-18.08/v18.08.tar.gz"
-checksum=c58fd90926773c9da8bdfc1a8e4dba0b95cbc58cee6db9981e8de94fd9534406
+# https://github.com/mpv-player/mpv/commit/575197ff8b0a0d8cd14f7ee78461c1d61d045d72
+distfiles="https://sources.voidlinux.org/mpc-qt-18.08/v18.08.tar.gz
+ https://raw.githubusercontent.com/mpv-player/mpv/2337fa4e0213993398d36cb3222633766d677dfd/libmpv/qthelper.hpp"
+checksum="c58fd90926773c9da8bdfc1a8e4dba0b95cbc58cee6db9981e8de94fd9534406
+ 86e1fcba6001829b7e23a856db84d01ebc76e63528f74064d7bc5705015a2684"
+skip_extraction="qthelper.hpp"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel"
-fi
+post_extract() {
+	mkdir -p mpv
+	cp $XBPS_SRCDISTDIR/mpc-qt-$version/qthelper.hpp mpv/
+}

From b287b2fe1b3ffbbce66b414b54d3b3c10ef8b029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 15 Jan 2021 08:42:40 +0100
Subject: [PATCH 415/419] python-reportlab: fix cross

---
 srcpkgs/python-reportlab/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/python-reportlab/template b/srcpkgs/python-reportlab/template
index 4fcb53f8a79..65ad7fdd8db 100644
--- a/srcpkgs/python-reportlab/template
+++ b/srcpkgs/python-reportlab/template
@@ -14,6 +14,10 @@ homepage="https://www.reportlab.com/"
 distfiles="${PYPI_SITE}/r/reportlab/reportlab-${version}.tar.gz"
 checksum=9c21f202697a6cea57b9d716288fc919d99cbabeb30222eebfc7ff77eac32744
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" ${makedepends}"
+fi
+
 post_install() {
 	vlicense LICENSE.txt
 }

From f187f05685428d4b9c3dce366dfcbe6ea42fb0ad Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 12:47:00 +0100
Subject: [PATCH 416/419] New package: xfce4-hamster-plugin-1.8

---
 srcpkgs/xfce4-hamster-plugin/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xfce4-hamster-plugin/template

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
new file mode 100644
index 00000000000..2e37c34b6af
--- /dev/null
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -0,0 +1,20 @@
+# Template file for 'xfce4-hamster-plugin'
+pkgname=xfce4-hamster-plugin
+version=1.8
+revision=1
+wrksrc="xfce4-hamster-plugin-$version"
+build_style=gnu-configure
+configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
+makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
+depends="hamster-applet"
+short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster/xfce4-hamster-plugin"
+distfiles="https://github.com/projecthamster/${pkgname}/archive/v${version}.tar.gz"
+checksum=0802f8a695755153a2f89f7b99767ca7753521dadc3f20a7cec2e09b1b2bb032
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}

From 2977c1abbcce2f9e64b742e2b5f130ea44570735 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:24:23 +0100
Subject: [PATCH 417/419] New package: hamster-time-tracker-3.0.2 also adjust
 the xfce4-hamster-plugin from deprecated hamster-applet to
 hamster-time-tracker

---
 srcpkgs/hamster-time-tracker/template | 16 ++++++++++++++++
 srcpkgs/xfce4-hamster-plugin/template |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/hamster-time-tracker/template

diff --git a/srcpkgs/hamster-time-tracker/template b/srcpkgs/hamster-time-tracker/template
new file mode 100644
index 00000000000..988f19556cb
--- /dev/null
+++ b/srcpkgs/hamster-time-tracker/template
@@ -0,0 +1,16 @@
+# Template file for 'hamster-time-tracker'
+pkgname=hamster-time-tracker
+version=3.0.2
+revision=1
+wrksrc=hamster-${version}
+build_style=waf3
+hostmakedepends="pkg-config gettext intltool itstool glib-devel"
+makedepends="python3-gobject-devel python3-cairo"
+depends="python3-gobject"
+short_desc="Time tracking application for individuals"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster"
+distfiles="https://github.com/projecthamster/hamster/archive/v${version}.tar.gz"
+checksum=8bf28fe1f06cd950583ebfb24acf5254d3406ee29c3046f6a6fb648b98c929ef
+conflicts="hamster-applet"
diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 2e37c34b6af..0e499e24d81 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
-depends="hamster-applet"
+depends="hamster-time-tracker"
 short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
 maintainer="Hakan Erduman <hakan@erduman.de>"
 license="GPL-2.0-or-later"

From b756ae5fa3dabb1f04a88be26db98a3b6565379a Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:37:44 +0100
Subject: [PATCH 418/419] xfce4-hamster-plugin: update to 1.8. Also default to
 the newer icon.

---
 srcpkgs/xfce4-hamster-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 0e499e24d81..c9873909d8c 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -4,7 +4,7 @@ version=1.8
 revision=1
 wrksrc="xfce4-hamster-plugin-$version"
 build_style=gnu-configure
-configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+configure_args="--prefix=/usr --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
 depends="hamster-time-tracker"

From 4d3147fbe649485ce572e89ac8ef698fe897db60 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Fri, 15 Jan 2021 17:02:44 +0100
Subject: [PATCH 419/419] xfce4-hamster-plugin: update to 1.9.

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

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index c9873909d8c..6da8fb96ad4 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-hamster-plugin'
 pkgname=xfce4-hamster-plugin
-version=1.8
+version=1.9
 revision=1
 wrksrc="xfce4-hamster-plugin-$version"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Hakan Erduman <hakan@erduman.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/projecthamster/xfce4-hamster-plugin"
 distfiles="https://github.com/projecthamster/${pkgname}/archive/v${version}.tar.gz"
-checksum=0802f8a695755153a2f89f7b99767ca7753521dadc3f20a7cec2e09b1b2bb032
+checksum=8b3c6641c1bb277e1d0cd948f29f4d56f1f6eaf9190e99a50bc60da1f3d5a326
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

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

* Re: New package: xfce4-hamster-plugin-1.8
  2021-01-07 12:01 [PR PATCH] New package: xfce4-hamster-plugin-1.8 aquaherd
                   ` (8 preceding siblings ...)
  2021-01-15 16:16 ` [PR PATCH] [Updated] " aquaherd
@ 2021-01-15 16:59 ` aquaherd
  2021-01-15 17:04 ` [PR PATCH] [Updated] " aquaherd
                   ` (7 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: aquaherd @ 2021-01-15 16:59 UTC (permalink / raw)
  To: ml

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

New comment by aquaherd on void-packages repository

https://github.com/void-linux/void-packages/pull/27737#issuecomment-761060392

Comment:
Cant say I like autotools.

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

* Re: [PR PATCH] [Updated] New package: xfce4-hamster-plugin-1.8
  2021-01-07 12:01 [PR PATCH] New package: xfce4-hamster-plugin-1.8 aquaherd
                   ` (9 preceding siblings ...)
  2021-01-15 16:59 ` aquaherd
@ 2021-01-15 17:04 ` aquaherd
  2021-01-15 17:17 ` aquaherd
                   ` (6 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: aquaherd @ 2021-01-15 17:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/aquaherd/void-packages master
https://github.com/void-linux/void-packages/pull/27737

New package: xfce4-hamster-plugin-1.8
I am the author of this xfce4 panel plugin and I want it in void, so I packaged it.

A patch file from https://github.com/void-linux/void-packages/pull/27737.patch is attached

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

From 50f398cb1bd93d0d6ce567dab8071b2401bae671 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 12:47:00 +0100
Subject: [PATCH 001/420] New package: xfce4-hamster-plugin-1.8

---
 srcpkgs/xfce4-hamster-plugin/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/xfce4-hamster-plugin/template

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
new file mode 100644
index 00000000000..2e37c34b6af
--- /dev/null
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -0,0 +1,20 @@
+# Template file for 'xfce4-hamster-plugin'
+pkgname=xfce4-hamster-plugin
+version=1.8
+revision=1
+wrksrc="xfce4-hamster-plugin-$version"
+build_style=gnu-configure
+configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
+makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
+depends="hamster-applet"
+short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster/xfce4-hamster-plugin"
+distfiles="https://github.com/projecthamster/${pkgname}/archive/v${version}.tar.gz"
+checksum=0802f8a695755153a2f89f7b99767ca7753521dadc3f20a7cec2e09b1b2bb032
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}

From 65f1a255f932855aa341eed021ddadaac3f8027e Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:24:23 +0100
Subject: [PATCH 002/420] New package: hamster-time-tracker-3.0.2 also adjust
 the xfce4-hamster-plugin from deprecated hamster-applet to
 hamster-time-tracker

---
 srcpkgs/hamster-time-tracker/template | 16 ++++++++++++++++
 srcpkgs/xfce4-hamster-plugin/template |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/hamster-time-tracker/template

diff --git a/srcpkgs/hamster-time-tracker/template b/srcpkgs/hamster-time-tracker/template
new file mode 100644
index 00000000000..988f19556cb
--- /dev/null
+++ b/srcpkgs/hamster-time-tracker/template
@@ -0,0 +1,16 @@
+# Template file for 'hamster-time-tracker'
+pkgname=hamster-time-tracker
+version=3.0.2
+revision=1
+wrksrc=hamster-${version}
+build_style=waf3
+hostmakedepends="pkg-config gettext intltool itstool glib-devel"
+makedepends="python3-gobject-devel python3-cairo"
+depends="python3-gobject"
+short_desc="Time tracking application for individuals"
+maintainer="Hakan Erduman <hakan@erduman.de>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/projecthamster"
+distfiles="https://github.com/projecthamster/hamster/archive/v${version}.tar.gz"
+checksum=8bf28fe1f06cd950583ebfb24acf5254d3406ee29c3046f6a6fb648b98c929ef
+conflicts="hamster-applet"
diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 2e37c34b6af..0e499e24d81 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
-depends="hamster-applet"
+depends="hamster-time-tracker"
 short_desc="Recreation of the gnome-shell hamster extension for the xfce4 panel"
 maintainer="Hakan Erduman <hakan@erduman.de>"
 license="GPL-2.0-or-later"

From 090a84a36a90b470bb27e6fd57b5f4d7e7a02a1e Mon Sep 17 00:00:00 2001
From: Hakan Erduman <hakan@erduman.de>
Date: Thu, 7 Jan 2021 18:37:44 +0100
Subject: [PATCH 003/420] xfce4-hamster-plugin: update to 1.8. Also default to
 the newer icon.

---
 srcpkgs/xfce4-hamster-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-hamster-plugin/template b/srcpkgs/xfce4-hamster-plugin/template
index 0e499e24d81..c9873909d8c 100644
--- a/srcpkgs/xfce4-hamster-plugin/template
+++ b/srcpkgs/xfce4-hamster-plugin/template
@@ -4,7 +4,7 @@ version=1.8
 revision=1
 wrksrc="xfce4-hamster-plugin-$version"
 build_style=gnu-configure
-configure_args="--prefix=/usr --with-icon-name=hamster-applet --with-locales-dir=/usr/share/locale"
+configure_args="--prefix=/usr --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel"
 makedepends="xfce4-panel-devel glib-devel dbus-glib-devel"
 depends="hamster-time-tracker"

From 6015db0654a1c94f1468ffa451ef463ead81b7c8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:55:29 +0100
Subject: [PATCH 004/420] crawl: update to 0.26.0.

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

diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index 1cdaba5c356..e54831d1d85 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.25.1
+version=0.26.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=41ddf73543940a4d16a7f23c618e2f464dd6d3dd3affc999d2412d8af3f01126
+checksum=6306c835246057bf91b6690fde14c2c3433ebe1d526876f96c46fab6dc109d45
 nocross=yes
 
 post_extract() {
@@ -20,12 +20,9 @@ post_extract() {
 
 do_build() {
 	echo $version >util/release_ver
-	# crashes with relro?
-	make ${makejobs} CC="$CC" CXX="$CXX" \
-		EXTERNAL_FLAGS="$CFLAGS" V=1 build-rltiles
 	make ${makejobs} CC="$CC" CXX="$CXX" \
 		EXTERNAL_FLAGS="$CFLAGS" EXTERNAL_LDFLAGS="$LDFLAGS" \
-		${make_build_args} V=1 DESTDIR=${DESTDIR}
+		${make_build_args} V=1 NO_TRY_GOLD=1 DESTDIR=${DESTDIR}
 }
 
 do_install() {

From 4918ef52fe72710fc58ea00c023156518b72fc64 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:55:31 +0100
Subject: [PATCH 005/420] crawl-tiles: update to 0.26.0.

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

diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 48f96df65c4..af4ec047e10 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.25.1
+version=0.26.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=41ddf73543940a4d16a7f23c618e2f464dd6d3dd3affc999d2412d8af3f01126
+checksum=6306c835246057bf91b6690fde14c2c3433ebe1d526876f96c46fab6dc109d45
 nocross=yes
 
 post_extract() {
@@ -25,12 +25,9 @@ post_extract() {
 
 do_build() {
 	echo $version >util/release_ver
-	# crashes with relro?
-	make ${makejobs} CC="$CC" CXX="$CXX" \
-		${make_build_args} EXTERNAL_FLAGS="$CFLAGS" V=1 build-rltiles
 	make ${makejobs} CC="$CC" CXX="$CXX" \
 		EXTERNAL_FLAGS="$CFLAGS" EXTERNAL_LDFLAGS="$LDFLAGS" \
-		${make_build_args} V=1 DESTDIR=${DESTDIR}
+		${make_build_args} V=1 NO_TRY_GOLD=1 DESTDIR=${DESTDIR}
 }
 
 do_install() {

From d18b63ce89744021d7c3e28a4256b41f8be9e927 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:56:32 +0100
Subject: [PATCH 006/420] mcelog: update to 175.

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

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index e9434ac574e..0e0d77b4b7a 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
 # Template file for 'mcelog'
 pkgname=mcelog
-version=174
+version=175
 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=e326eda0c39926cfce89bad459ca631ecf5b778f1d7064c5fd677a7c5d238b65
+checksum=ed25a39bb20178e79e18cc5d3202b198868986ec3e964b6285f6a7bac8469fdf
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From 5587b24a7edd2e5c690fee4b6b4b8457fde5cae0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:57:02 +0100
Subject: [PATCH 007/420] python3-boto3: update to 1.16.51.

---
 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 acd9b54e1c2..eb982f6ff10 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.16.47
+version=1.16.51
 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=4cea6387bdde7c3d291ae1734a0530576abbd1e86e6cdf2a7f8d3aa44e9d9d11
+checksum=95160b45df095801b4551f76dbd46496a587effe1e10890ab355be564d67a334
 
 post_install() {
 	vlicense LICENSE

From a211cd2d79c291aecacd6e612b95b314aa576cb1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:58:05 +0100
Subject: [PATCH 008/420] rhash: update to 1.4.1.

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

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 1b434d2fe74..820963e9ede 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,6 +1,6 @@
 # Template file for 'rhash'
 pkgname=rhash
-version=1.4.0
+version=1.4.1
 revision=1
 wrksrc="RHash-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"
 homepage="https://github.com/rhash/RHash"
 distfiles="https://github.com/rhash/RHash/archive/v${version}.tar.gz"
-checksum=2ea39540f5c580da0e655f7b483c19e0d31506aed4202d88e8459fa7aeeb8861
+checksum=430c812733e69b78f07ce30a05db69563450e41e217ae618507a4ce2e144a297
 make_build_target="all lib-shared"
 make_install_target="install install-lib-shared"
 

From 8a027b98f792e13dd87d9b1d9a97d48f5ae4f4cb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 5 Jan 2021 04:38:41 +0100
Subject: [PATCH 009/420] ghc: initial patches for ppc64 elfv2

but ghc seems otherwise kinda broken on big endian, so we will
need more fixes...
---
 .../ghc/patches/no-atomic-64-on-32bit.patch   |  58 +++++
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch      | 199 ++++++++++++++++++
 2 files changed, 257 insertions(+)
 create mode 100644 srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
 create mode 100644 srcpkgs/ghc/patches/ppc64-be-elfv2.patch

diff --git a/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch b/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
new file mode 100644
index 00000000000..05ca275ea9d
--- /dev/null
+++ b/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
@@ -0,0 +1,58 @@
+From 5c5aa87d50dc4ea97e76e13f285a7b5dd71fcd88 Mon Sep 17 00:00:00 2001
+From: Ilias Tsitsimpis <iliastsi@debian.org>
+Date: Sun, 1 Mar 2020 16:25:13 +0200
+Subject: [PATCH] Do not define hs_atomic{read,write}64() on non-64bit
+
+Do not define hs_atomicread64() and hs_atomicwrite64() on machines where
+WORD_SIZE_IN_BITS is less than 64, just like we do with the rest of the atomic
+functions which work on 64-bit values.
+
+Without this, compilation fails on MIPSel and PowerPC with the following error:
+
+/usr/bin/ld: /<<PKGBUILDDIR>>/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3_p.a(atomic.p_o): in function `hs_atomicread64':
+atomic.c:(.text.hs_atomicread64+0x8): undefined reference to `__sync_add_and_fetch_8'
+/usr/bin/ld: /<<PKGBUILDDIR>>/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3_p.a(atomic.p_o): in function `hs_atomicwrite64':
+atomic.c:(.text.hs_atomicwrite64+0x38): undefined reference to `__sync_bool_compare_and_swap_8'
+
+Fixes #17886.
+---
+ libraries/ghc-prim/cbits/atomic.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libraries/ghc-prim/cbits/atomic.c b/libraries/ghc-prim/cbits/atomic.c
+index ac2e608ec2..01037d70ee 100644
+--- a/libraries/ghc-prim/cbits/atomic.c
++++ b/libraries/ghc-prim/cbits/atomic.c
+@@ -361,6 +361,7 @@ hs_atomicread32(StgWord x)
+ #endif
+ }
+ 
++#if WORD_SIZE_IN_BITS == 64
+ extern StgWord64 hs_atomicread64(StgWord x);
+ StgWord64
+ hs_atomicread64(StgWord x)
+@@ -371,6 +372,7 @@ hs_atomicread64(StgWord x)
+   return __sync_add_and_fetch((StgWord64 *) x, 0);
+ #endif
+ }
++#endif
+ 
+ // AtomicWriteByteArrayOp_Int
+ // Implies a full memory barrier (see compiler/prelude/primops.txt.pp)
+@@ -409,6 +411,7 @@ hs_atomicwrite32(StgWord x, StgWord val)
+ #endif
+ }
+ 
++#if WORD_SIZE_IN_BITS == 64
+ extern void hs_atomicwrite64(StgWord x, StgWord64 val);
+ void
+ hs_atomicwrite64(StgWord x, StgWord64 val)
+@@ -420,3 +423,5 @@ hs_atomicwrite64(StgWord x, StgWord64 val)
+ #endif
+ }
+ #endif
++
++#endif
+-- 
+GitLab
+
diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
new file mode 100644
index 00000000000..ac353ed417e
--- /dev/null
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -0,0 +1,199 @@
+From fd191973558cf4aeb0d5ca107357defd6f837c38 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Tue, 5 Jan 2021 04:10:25 +0100
+Subject: [PATCH] fix up runtime for ppc64 BE ELFv2 + ensure it's used
+
+---
+ aclocal.m4                        |  2 +-
+ configure                         |  2 +-
+ libraries/ghci/GHCi/InfoTable.hsc | 36 ++++++++++++-------------------
+ rts/Adjustor.c                    | 12 +++++------
+ rts/AdjustorAsm.S                 |  2 +-
+ rts/StgCRun.c                     |  4 ++--
+ rts/StgCRunAsm.S                  |  2 +-
+ 7 files changed, 26 insertions(+), 34 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 41cecf0..ba08bd2 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -190,7 +190,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
+             test -z "[$]2" || eval "[$]2=ArchPPC"
+             ;;
+         powerpc64)
+-            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V1}\""
++            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
+             ;;
+         powerpc64le)
+             test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
+diff --git a/configure b/configure
+index 183e661..8aae1bc 100755
+--- a/configure
++++ b/configure
+@@ -9868,7 +9868,7 @@ $as_echo "done" >&6; }
+             test -z "$2" || eval "$2=ArchPPC"
+             ;;
+         powerpc64)
+-            test -z "$2" || eval "$2=\"ArchPPC_64 {ppc_64ABI = ELF_V1}\""
++            test -z "$2" || eval "$2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
+             ;;
+         powerpc64le)
+             test -z "$2" || eval "$2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
+diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
+index ec3c18a..0359be7 100644
+--- a/libraries/ghci/GHCi/InfoTable.hsc
++++ b/libraries/ghci/GHCi/InfoTable.hsc
+@@ -228,30 +228,22 @@ mkJumpToAddr a = case platform of
+                 , fromIntegral w64
+                 , fromIntegral (w64 `shiftR` 32) ]
+     ArchPPC64 ->
+-        -- We use the compiler's register r12 to read the function
+-        -- descriptor and the linker's register r11 as a temporary
+-        -- register to hold the function entry point.
+-        -- In the medium code model the function descriptor
+-        -- is located in the first two gigabytes, i.e. the address
+-        -- of the function pointer is a non-negative 32 bit number.
+-        -- 0x0EADBEEF stands for the address of the function pointer:
+-        --    0:   3d 80 0e ad     lis     r12,0x0EAD
+-        --    4:   61 8c be ef     ori     r12,r12,0xBEEF
+-        --    8:   e9 6c 00 00     ld      r11,0(r12)
+-        --    c:   e8 4c 00 08     ld      r2,8(r12)
+-        --   10:   7d 69 03 a6     mtctr   r11
+-        --   14:   e9 6c 00 10     ld      r11,16(r12)
+-        --   18:   4e 80 04 20     bctr
+-       let  w32 = fromIntegral (funPtrToInt a)
++        -- The ABI requires r12 to point to the function's entry point.
++        -- We use the medium code model where code resides in the first
++        -- two gigabytes, so loading a non-negative32 bit address
++        -- with lis followed by ori is fine.
++        -- 0x0EADBEEF stands for the address:
++        -- 3D800EAD lis r12,0x0EAD
++        -- 618CBEEF ori r12,r12,0xBEEF
++        -- 7D8903A6 mtctr r12
++        -- 4E800420 bctr
++
++        let w32 = fromIntegral (funPtrToInt a)
+             hi16 x = (x `shiftR` 16) .&. 0xFFFF
+             lo16 x = x .&. 0xFFFF
+-       in Right [ 0x3D800000 .|. hi16 w32,
+-                  0x618C0000 .|. lo16 w32,
+-                  0xE96C0000,
+-                  0xE84C0008,
+-                  0x7D6903A6,
+-                  0xE96C0010,
+-                  0x4E800420]
++        in Right [ 0x3D800000 .|. hi16 w32,
++                   0x618C0000 .|. lo16 w32,
++                   0x7D8903A6, 0x4E800420 ]
+ 
+     ArchPPC64LE ->
+         -- The ABI requires r12 to point to the function's entry point.
+diff --git a/rts/Adjustor.c b/rts/Adjustor.c
+index d360cfe..ab7ede7 100644
+--- a/rts/Adjustor.c
++++ b/rts/Adjustor.c
+@@ -49,7 +49,7 @@ Haskell side.
+ 
+ #if defined(i386_HOST_ARCH)
+ extern void adjustorCode(void);
+-#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+ // from AdjustorAsm.s
+ // not declared as a function so that AIX-style
+ // fundescs can never get in the way.
+@@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
+ extern void obscure_ccall_ret_code(void);
+ #endif
+ 
+-#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+ #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
+ 
+ /* !!! !!! WARNING: !!! !!!
+@@ -318,7 +318,7 @@ typedef struct AdjustorStub {
+ } AdjustorStub;
+ #endif
+ 
+-#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+ static int totalArgumentSize(char *typeString)
+ {
+     int sz = 0;
+@@ -351,7 +351,7 @@ void*
+ createAdjustor(int cconv, StgStablePtr hptr,
+                StgFunPtr wptr,
+                char *typeString
+-#if !defined(powerpc_HOST_ARCH) && !defined(powerpc64_HOST_ARCH) && !defined(x86_64_HOST_ARCH)
++#if !defined(powerpc_HOST_ARCH) && (!defined(powerpc64_HOST_ARCH) || (_CALL_ELF == 2)) && !defined(x86_64_HOST_ARCH)
+                   STG_UNUSED
+ #endif
+               )
+@@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
+         }
+     }
+ 
+-#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+         
+ #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
+ #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
+@@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
+    return;
+  }
+  freeStablePtr(((StgStablePtr*)ptr)[1]);
+-#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+  if ( ((AdjustorStub*)ptr)->code != (StgFunPtr) &adjustorCode ) {
+    errorBelch("freeHaskellFunctionPtr: not for me, guv! %p\n", ptr);
+    return;
+diff --git a/rts/AdjustorAsm.S b/rts/AdjustorAsm.S
+index 2795b83..63cfe91 100644
+--- a/rts/AdjustorAsm.S
++++ b/rts/AdjustorAsm.S
+@@ -2,7 +2,7 @@
+ 
+ /* ******************************** PowerPC ******************************** */
+ 
+-#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+ #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
+     /* The following code applies, with some differences,
+        to all powerpc platforms except for powerpc32-linux,
+diff --git a/rts/StgCRun.c b/rts/StgCRun.c
+index 934926e..2ff8662 100644
+--- a/rts/StgCRun.c
++++ b/rts/StgCRun.c
+@@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
+    Everything is in assembler, so we don't have to deal with GCC...
+    -------------------------------------------------------------------------- */
+ 
+-#if defined(powerpc64_HOST_ARCH)
++#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
+ 
+ static void GNUC3_ATTRIBUTE(used)
+ StgRunIsImplementedInAssembler(void)
+@@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
+ 
+ #endif
+ 
+-#if defined(powerpc64le_HOST_ARCH)
++#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
+ /* -----------------------------------------------------------------------------
+    PowerPC 64 little endian architecture
+ 
+diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
+index 9274a44..3b4fc33 100644
+--- a/rts/StgCRunAsm.S
++++ b/rts/StgCRunAsm.S
+@@ -1,7 +1,7 @@
+ #include "ghcconfig.h"
+ #include "rts/Constants.h"
+ 
+-#if defined(powerpc64le_HOST_ARCH)
++#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
+ # ifdef linux_HOST_OS
+ # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
+ 	.file	"StgCRun.c"
+-- 
+2.30.0
+

From 3d6205540532b2f9ee87c8289f97d45bbfaf175b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Jan 2021 19:52:25 +0100
Subject: [PATCH 010/420] python3-pyqtgraph: update to 0.11.1.

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

diff --git a/srcpkgs/python3-pyqtgraph/template b/srcpkgs/python3-pyqtgraph/template
index 287a730c93a..89c3e582d1d 100644
--- a/srcpkgs/python3-pyqtgraph/template
+++ b/srcpkgs/python3-pyqtgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyqtgraph'
 pkgname=python3-pyqtgraph
-version=0.11.0
+version=0.11.1
 revision=1
 wrksrc="${pkgname#*-}-${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="http://www.pyqtgraph.org/"
 changelog="https://github.com/pyqtgraph/pyqtgraph/raw/master/CHANGELOG"
 distfiles="https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-${version}.tar.gz"
-checksum=082cdec1e559644e083cd8c5752fc06a18582fb2bebb83cdf6eb8ad33c735535
+checksum=9c103e965fb9398570f07c961030cc20fbb80d516a540011f868600a431c4a0d
 
 post_install() {
 	vlicense LICENSE.txt

From 40004c865e5201f1d447a45e8d81bf770d44832a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:29 +0100
Subject: [PATCH 011/420] subtle: broken

---
 srcpkgs/subtle/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index b2f8b67c3c9..28db062ae8a 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -10,6 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="http://subtle.subforge.org"
 conf_files="/etc/xdg/subtle/subtle.rb"
+broken="source location down"
 
 if [ "$CROSS_BUILD" ]; then
 	if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then

From 4aa3de803b7c4fba07dcf7c4b8921409988e3305 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 19:06:04 +0100
Subject: [PATCH 012/420] libucontext: update to 1.0

---
 common/shlibs                                 |  3 +-
 .../patches/arch-x86-i668_get_thunk_bx.patch  | 20 ----------
 srcpkgs/libucontext/template                  | 37 ++++++++++++-------
 3 files changed, 26 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch

diff --git a/common/shlibs b/common/shlibs
index de5cb65426e..17621bdb846 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2438,7 +2438,8 @@ libgemini.so.17 calligra-gemini-3.2.0_1
 libarpack.so.2 arpack-ng-3.3.0_2
 libfts.so.0 musl-fts-1.2_2
 libobstack.so.1 musl-obstack-1.2.1_1
-libucontext.so.0 libucontext-0.1.1_1
+libucontext.so.1 libucontext-1.0_1
+libucontext_posix.so.1 libucontext-1.0_1
 libgavl.so.1 gavl-1.40_1
 libmxml.so.1 mxml-2.9_1
 libKF5Pty.so.5 kpty-5.26.0_1
diff --git a/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch b/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch
deleted file mode 100644
index 702f06f5b28..00000000000
--- a/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- arch/x86/startcontext.S	2020-05-18 05:28:21.000000000 +0200
-+++ arch/x86/startcontext.S	2021-01-02 23:52:32.728187160 +0100
-@@ -18,7 +18,7 @@
- 	cmpl	$0, (%esp)
- 
- 	/* restore global offset table, exit@plt and __setcontext@plt need this */
--	call	__i686.get_pc_thunk.bx
-+	call	i686_get_pc_thunk_bx
- 	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
- 
- 	/* if we have no linked context, lets get out of here */
-@@ -35,7 +35,7 @@
- 	/* something is really hosed, call hlt to force termination */
- 	hlt
- 
--__i686.get_pc_thunk.bx:
-+i686_get_pc_thunk_bx:
- 	mov	(%esp), %ebx
- 	ret
- END(__start_context)
diff --git a/srcpkgs/libucontext/template b/srcpkgs/libucontext/template
index 738b1e317d0..aa3f130d1e4 100644
--- a/srcpkgs/libucontext/template
+++ b/srcpkgs/libucontext/template
@@ -1,8 +1,7 @@
 # Template file for 'libucontext'
 pkgname=libucontext
-reverts="0.13.1_1"
-version=0.11
-revision=2
+version=1.0
+revision=1
 archs="*-musl"
 wrksrc="${pkgname}-${pkgname}-${version}"
 short_desc="Compatibility layer providing ucontext functions"
@@ -10,27 +9,37 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="ISC"
 homepage="https://github.com/kaniini/libucontext"
 distfiles="https://github.com/kaniini/libucontext/archive/${pkgname}-${version}.tar.gz"
-checksum=ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb
+checksum=23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb
 
 case "${XBPS_TARGET_MACHINE}" in
-arm*)	export LIBUCONTEXT_ARCH="arm";;
-i686*)	export LIBUCONTEXT_ARCH="x86";;
-ppc64*) export LIBUCONTEXT_ARCH="ppc64";;
-ppc*)   export LIBUCONTEXT_ARCH="ppc";;
-mips*)  export LIBUCONTEXT_ARCH="mips";;
-*)	export LIBUCONTEXT_ARCH="${XBPS_TARGET_MACHINE%%-musl}";;
+	x86_64*)  _luctx_arch="x86_64"  ;;
+	i686*)    _luctx_arch="x86"     ;;
+	aarch64*) _luctx_arch="aarch64" ;;
+	arm*)     _luctx_arch="arm"     ;;
+	ppc64*)   _luctx_arch="ppc64"   ;;
+	ppc*)     _luctx_arch="ppc"     ;;
+	mips*64*) _luctx_arch="mips64"  ;;
+	mips*)    _luctx_arch="mips"    ;;
+	riscv64*) _luctx_arch="riscv64" ;;
+	s390x*)   _luctx_arch="s390x"   ;;
+	*) broken="libucontext not available for ${XBPS_TARGET_MACHINE}";;
 esac
 
+# we provide our own CFLAGS, which overwrite all of theirs
+export CFLAGS=" -DEXPORT_UNPREFIXED"
+
 do_build() {
-	make ARCH="${LIBUCONTEXT_ARCH}"
+	make ARCH="${_luctx_arch}" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 }
 
 do_check() {
-	make ARCH="${LIBUCONTEXT_ARCH}" check
+	make ARCH="${_luctx_arch}" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" check
 }
 
 do_install() {
-	make ARCH="${LIBUCONTEXT_ARCH}" DESTDIR="${DESTDIR}/usr" install
+	make ARCH="${_luctx_arch}" DESTDIR="${DESTDIR}" LIBDIR="/usr/lib" install
+	# missing from release?
+	ln -s libucontext_posix.so.1 ${DESTDIR}/usr/lib/libucontext_posix.so
 }
 
 post_install() {
@@ -41,6 +50,8 @@ libucontext-devel_package() {
 	depends="libucontext>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
 	}

From 6dbf0ea42e0091aa5cf30135a84d460e3864de1f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:17:21 +0100
Subject: [PATCH 013/420] gcompat: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gcompat/template b/srcpkgs/gcompat/template
index ca523bb2388..3988a933a5a 100644
--- a/srcpkgs/gcompat/template
+++ b/srcpkgs/gcompat/template
@@ -1,7 +1,7 @@
 # Template file for 'gcompat'
 pkgname=gcompat
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="musl-obstack-devel"
@@ -15,11 +15,7 @@ checksum=5bcf8bbe4b417bc66b22a7a3675273aa8834480144338172bbd8e81eaf41a7c4
 
 build_options="libucontext"
 desc_option_libucontext="Build with ucontext support via libucontext"
-
-case "$XBPS_TARGET_MACHINE" in
-	mips*) ;;
-	*) build_options_default+=" libucontext" ;;
-esac
+build_options_default=" libucontext"
 
 # https://sourceware.org/glibc/wiki/ABIList
 # https://wiki.linaro.org/RikuVoipio/LdSoTable

From 7b968129d2279a2ca5ececd8d6f8cee828c0772e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:20:38 +0100
Subject: [PATCH 014/420] libunwind: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template
index f520421b20d..67bd6303e01 100644
--- a/srcpkgs/libunwind/template
+++ b/srcpkgs/libunwind/template
@@ -1,7 +1,7 @@
 # Template file for 'libunwind'
 pkgname=libunwind
 version=1.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="libtool automake"
 makedepends="liblzma-devel"

From 663b75f09daff5a338b93d0bcf22ef4eaee6ad6d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:20:51 +0100
Subject: [PATCH 015/420] geary: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index 0bf2fe55363..a74b1ff16cd 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
 # Template file for 'geary'
 pkgname=geary
 version=3.38.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dcontractor=true"

From befcbab03b1dbd3dca661bf150c8b8e9ef5dd872 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:03 +0100
Subject: [PATCH 016/420] gperftools: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gperftools/template b/srcpkgs/gperftools/template
index 4d33ff78ed2..de7e9423d34 100644
--- a/srcpkgs/gperftools/template
+++ b/srcpkgs/gperftools/template
@@ -1,7 +1,7 @@
 # Template file for 'gperftools'
 pkgname=gperftools
 version=2.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="libunwind-devel"

From 021b51c0125f9fcade78433f1f193ad74c32f31e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:20 +0100
Subject: [PATCH 017/420] gstreamer1: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 16f7379fc93..7a5863b2765 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,7 +1,7 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
 version=1.16.2
-revision=1
+revision=2
 wrksrc="gstreamer-${version}"
 build_style=meson
 build_helper="gir"

From c43ec35af7f8eb74c7169880541fe0761d2b66d3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:41 +0100
Subject: [PATCH 018/420] plan9port: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/plan9port/template b/srcpkgs/plan9port/template
index 0e0faa85140..4b4c7efc1aa 100644
--- a/srcpkgs/plan9port/template
+++ b/srcpkgs/plan9port/template
@@ -1,7 +1,7 @@
 # Template file for 'plan9port'
 pkgname=plan9port
 version=20200927
-revision=1
+revision=2
 _githash=291f7411783bf6871b253f3b15ce691eea7a257e
 wrksrc="${pkgname}-${_githash}"
 hostmakedepends="perl which"

From 4bba0169dd8e84e1ee118e73ed1b41f3e1954e70 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:52 +0100
Subject: [PATCH 019/420] ruby: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 79241c6d48f..cd06d004172 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"

From bcbdb22d604ab9221b1b320fd3442ed05a9a4540 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:38:26 +0100
Subject: [PATCH 020/420] julia: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 32c8fc41b2a..56eb8f9511d 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,7 +1,7 @@
 # Template file for 'julia'
 pkgname=julia
 version=1.5.3
-revision=1
+revision=2
 archs="i686* x86_64* armv7l* aarch64*"
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share

From e85101b2f3b1c3d449bce89cfb5b10376497b4e7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:38:42 +0100
Subject: [PATCH 021/420] racket: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 98c5cc93756..85374e7c62f 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,7 +1,7 @@
 # Template file for 'racket'
 pkgname=racket
 version=7.7
-revision=2
+revision=3
 build_wrksrc=src
 build_style=gnu-configure
 configure_args="--enable-useprefix --disable-docs"

From 25f75fa3024ad571439c8ce37055f784c415157b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:59:12 +0100
Subject: [PATCH 022/420] gcc: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 02a7516002d..4ebca58e89e 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -8,7 +8,7 @@ _isl_version=0.21
 
 pkgname=gcc
 version=${_minorver}.0
-revision=8
+revision=9
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"

From d783895e66e4252401be8101513bbfc0bda51b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:15 +0100
Subject: [PATCH 023/420] filelight: update to 20.12.1.

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

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 8e7a6ab0b64..786f00ef213 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=445197abf17e03f0fcfb70b8be3d8e5b5eb5a7dfafc8fbc3177bd9f860781354
+checksum=91c82cc19aa3541885c1dbe8a849d99d79d7a025fba81de2b0401419f050f14c

From e038b5a3d2ff95b1139de5cfd03417b6d8f38f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:16 +0100
Subject: [PATCH 024/420] kaccounts-integration: update to 20.12.1.

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

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 8fd130fc16f..b01b00b4118 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=5bc0d40fd52a01bf6d80f7d2db54414dc5bcbf693d1c01e8546e1adaf9137f8d
+checksum=22d5879dff70075092748ae04575de7bd7df025eb9a9298bb39d7027601cbe07
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From fc9b285b7cbda4808cac085b97e1e6b093ceba35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:18 +0100
Subject: [PATCH 025/420] kaccounts-providers: update to 20.12.1.

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

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 4efb75cd6e2..4309601c6ee 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=77f4394b47e9787f6683dec5519d2118997baa32abcc1a09fbe4b2602d003bdd
+checksum=78a32db7363b44dae0670f50c68febea6698f57ef3d676a745eb542e87c96fb8
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 95189130f8bec0340402f835971706c956ef7a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:19 +0100
Subject: [PATCH 026/420] kcachegrind: update to 20.12.1.

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

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index d70535744de..dce27d6d0a0 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=e9543784589d7de2de8bfcd0e398f708f54543a208115ab492843cd996a06ac4
+checksum=b1477c26106d142111b050f542b6b91cc8756eafb0cb2c77cd44b5e56bf0066c
 python_version=2

From e8059530621ef91eb05e487f3c9cf48379c87494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:21 +0100
Subject: [PATCH 027/420] kcron: update to 20.12.1.

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

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 037b3bc7931..3081e78fdac 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=12a688f158d174b94f6ab67fb9e72b86ff5d8d34100f4093e26a837cf7894c87
+checksum=ac850bec99fd0da08b9a3ad7f48c133a4a20aa1b3f1302a799fc75d8155faa07

From 44242f819966a4c07b2f7b35b507b927b1feca8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:22 +0100
Subject: [PATCH 028/420] kdialog: update to 20.12.1.

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

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index ddbdc929235..a5f7b049123 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=2479ea4a4568314abbefff4d4edb84b2ac437f59805908044d001792efc46a1d
+checksum=c481729a5757d1668da648005b48b711eb4cb6fc7c6e7249343b45ac065bc68e

From 088f45d6ca0ac810f37f4a0e02d386b01d09598f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:23 +0100
Subject: [PATCH 029/420] keditbookmarks: update to 20.12.1.

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

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 2942b1c65f2..54f2e86f796 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=a17cc82f3698470eade7ed2e9437b2bd4c6b0ede211a5829d130d4e6efe21d90
+checksum=373563cb447a7894acc7aaf8aa7cb39d5ac1d85325a43ac2ad0d7f2ee8fd81a8
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 63e9125d30abfbffd3fb33725b2cafcdaa9ebd93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:25 +0100
Subject: [PATCH 030/420] kfind: update to 20.12.1.

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

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 4490bcfd304..e7adb6e46c0 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=006e6a842b85f4c3387b4333e2eba869d0ae13e0516b069325963630a74b768d
+checksum=b74934cba40298969f3cf7fb620fd8437c8e90f367abe559673e08411bc19d66

From a8610302a874ec6c6321c2013b1587666109231b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:27 +0100
Subject: [PATCH 031/420] kig: update to 20.12.1.

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

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 0d6a16ab798..432c0423549 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=16f09ee6fde0865ad2fb87528eae8d8ec4ab7e69a35ab43ec25fa91f0e200626
+checksum=3feabd92c5b4975c682e80f0b8038c4447b5f29ad0f2e4b194e70a8126cc445b

From 858a0cddc7d822490128d64fd0a36b07973a258c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:28 +0100
Subject: [PATCH 032/420] kio-gdrive: update to 20.12.1.

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

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 5e1498b78b8..390276a3216 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=332e60ae9df25cc40b31e7afabc0dc0cadc4129a9204832e5d93cdab4746e52e
+checksum=e07ef1431b2d9b7e12d9c09483c31f1f321351fc88177d1450d7b18c4640b02b

From eaf0143466d27e06efaaa6cf169936ae53f6cec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:29 +0100
Subject: [PATCH 033/420] kmag: update to 20.12.1.

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

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d44badeabdc..09b3f232050 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=0ade18c35210cd80827ba239a413343663f04efe9974efdf6fe2aa50a3549975
+checksum=12728dbb62fab21f63156859a08fd5694c668025c6b5ecdae7e48ab97cf09f54

From cf02bfa57d68481b0b81e4bb9a6a7d9580224cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:30 +0100
Subject: [PATCH 034/420] kmix: update to 20.12.1.

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

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index a9cf4ed0594..dd7e40d5417 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=161b743868a4fe3dad42c5a50a9568c61d8e44cf73f1f4f3e53e2de1c8936e72
+checksum=17c5bb01ddb61945439a116fc6615794a97b1e204f245e45b6255b5ec7f832e0

From 492d537c1fa5e0ca33f4cd436565bef1693ab303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:31 +0100
Subject: [PATCH 035/420] kolourpaint: update to 20.12.1.

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

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 9fbdcb3a380..6117d372f67 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d80940e27155304aa0842fa3c08d72f8e383eb45beff49dc1a66b12b030be4ca
+checksum=5ee17da9790d931953acedeebc434e11edb2f3e9a8593183913b47985c7e5ca8
 
 post_install() {
 	vlicense COPYING

From a218d24a005c02493fb3dfaef0e2b530ba4d255f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:32 +0100
Subject: [PATCH 036/420] kompare: update to 20.12.1.

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

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 26776ec9332..cbcf20b85ef 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6d838d59031dc91cbd0f690b881ec3b35e70e63a921c5454f709520f8646576a
+checksum=10b32f0556e8094ab6276c66d018310e47be0314c915ad9872f4f7737f43b18d

From 8d49db154e97022fd3ea569f5b0d4ca2f19f16b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:33 +0100
Subject: [PATCH 037/420] kpat: update to 20.12.1.

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

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index c4cb231d3d0..8b338960fc7 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,7 +13,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=c00f9afeb7b2d4e37e626a9379df08f30077d0c1965a674795b099dd11588d8f
+checksum=a9186b51156307060186b9546947f77f9cfe72c287cd863a01b17309f189a3cd
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 297285faa7e02f908a09a33f60ab2e235b611590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:35 +0100
Subject: [PATCH 038/420] kruler: update to 20.12.1.

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

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 7938b90e98c..7fc152eb110 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=4976fdef20abc10e05122f6d284f0b3cd187ce7bf56a3ae286ad693a5d6e259c
+checksum=78c02e727b0fa8d26fe35dfa1a1c479b01061ee7c78df748bccdae438c4e3fca

From 641d4e1b89c723ec8628e98c4c599df580523506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:36 +0100
Subject: [PATCH 039/420] ksystemlog: update to 20.12.1.

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

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 43cdc65b6f6..7750d20dabe 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=dd485238d4c2cd0ab2c603d5fc4ec60c6f4603ee5e3876cca577011cd0749508
+checksum=80f51e5dc1dcc6a7479ab4c2a10d39e04ef9ffe822f00e766f8c7182b5d16514
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 004de3a2f053d612963c8dc6e8355d0b8783f6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:37 +0100
Subject: [PATCH 040/420] kteatime: update to 20.12.1.

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

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index dabfd528e5c..93fcf6dda0a 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=fabef94581df93d805c69b62407599a4adf8fe504b60e3c2479db22223e0e9ee
+checksum=fd9b504cc37c4acf495a31c576048a53f735e8d93024e7230be6a3343c1f2c49

From ae25f8563c891b961d579ce8aad85c1575a04b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:38 +0100
Subject: [PATCH 041/420] kturtle: update to 20.12.1.

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

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index a5eb86542e1..bf3d351ed21 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=bf60bff1b207857faa9f970099e447d04962ce8c09018c10f5e6dd07f381e68d
+checksum=6b79f2f60517656501f6af0590f8464d37c698b88b7806c661fb4ac89626598a

From 107e6304ef8d8f0155a77984943c1d0536bb464a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:40 +0100
Subject: [PATCH 042/420] kwalletmanager: update to 20.12.1.

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

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 611212fa0e1..425f3d74adc 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=8253d2bdba00c8e016572296de60452fd0f82944e175d7914d7527131e74b8ee
+checksum=72ab9cd2a53b9cc7db144b712ef18d81b23de3ff6b05d92f961b9bff65174f5b

From b5ac63652e2e1285549c3b9e269dff7745150c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:41 +0100
Subject: [PATCH 043/420] libkcddb: update to 20.12.1.

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

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 3d24fb7c0d2..96e175a0fce 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=a922f201a9366f66ab3292f3f9e34d03fbd0183a6c23d8b5bd3730b69c567b25
+checksum=f3688d66a3026d5355a340e2d9a9e669d5b70afe187789ca7a0919713c257e1e
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From fa7021356b3f915a223ae84dd4de9fc5a00f90d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:42 +0100
Subject: [PATCH 044/420] libkomparediff2: update to 20.12.1.

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

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 54614d0261f..0cf9e8ac86a 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=8b92b729d2d1c7998b22ffd6a7ae95f46954785d4855ce6cfa7a1fb401cf66ec
+checksum=c3a79ea99dd4f4a72db628f46720049960e6b948f5e14b97a7857e04e1c67412
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 479a14ebd207da37c03f211a828a1b63da8dc6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:43 +0100
Subject: [PATCH 045/420] marble5: update to 20.12.1.

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

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index ef7feaa2e0b..1ab217abc56 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=20.12.0
+version=20.12.1
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=aa5a7891a7f8d0b6b9abdcbc99fc4dc783f6b93e898b3b9fcbe69b7348c1eb85
+checksum=65c936ceefdd368494778e55a921f9d111e6fabab718b948f3f59ede5f446970
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From d2f7e085fac634ac06d9de58632d8d9c8691a74f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:44 +0100
Subject: [PATCH 046/420] signon-kwallet-extension: update to 20.12.1.

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

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 33248ed6dca..b6d18130e12 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=7019c1b9b42930c2b0ab197674eeb435eccf6fef2aeda8b87a989479b1ee1e2e
+checksum=4b762208b8d48c0d56b4605f701ebadc1daa59b16054c238a132f38a6b518854

From ea3a7d7d7f08514720504935e8d2346696ff43fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:46 +0100
Subject: [PATCH 047/420] svgpart: update to 20.12.1.

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

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 8f67b404942..58a03476fb4 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=bc018419d05078f1ddf5b991c9c76448b1b1722dba914085553bde253b7895f5
+checksum=3eb7fe2ebb6cd32fc86fcb659189dd7e84ecda88019456ef7d8873a58bbbc026

From 5219de3f664ce5d03c1b37c1016a8219e2211fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:47 +0100
Subject: [PATCH 048/420] umbrello: update to 20.12.1.

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

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 7be67571b49..5744aaa0ce4 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=216bfa1bca11c28d41c3d2f8ba818b03090d138b00def56221d1901bff63b4b7
+checksum=74a787947b670024c8a39fc8fb764fba1e79dfcc2664390b903dd85fb8efdd1d
 python_version=2
 
 pre_configure() {

From bfdc67f29e906c73f47def0d7448eb851abe654a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:48 +0100
Subject: [PATCH 049/420] yakuake: update to 20.12.1.

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

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index fe96e4d1134..fd176e7eb3a 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=a1a1f914ffb4364ba57dd66daf9366aeb9da8fe0d14b4c41b5a7ad3befdcbb9c
+checksum=4a0d934335ec74e4a09b73792ad7a6587adb035742ef1adbe177f1d07ba2ea0a

From 9c820a9e247bfafaac9e1221eb8e7974250bb331 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 19 Dec 2020 16:49:32 -0600
Subject: [PATCH 050/420] nvidia340: remove

---
 common/shlibs                            |   3 -
 srcpkgs/nvidia340-dkms                   |   1 -
 srcpkgs/nvidia340-libs                   |   1 -
 srcpkgs/nvidia340-opencl                 |   1 -
 srcpkgs/nvidia340/INSTALL                |   7 -
 srcpkgs/nvidia340/INSTALL.msg            |  15 -
 srcpkgs/nvidia340/REMOVE                 |   7 -
 srcpkgs/nvidia340/files/kernel-5.8.patch |  92 ---
 srcpkgs/nvidia340/files/kernel-5.9.patch | 107 ----
 srcpkgs/nvidia340/files/kernel-5.x.patch | 781 -----------------------
 srcpkgs/nvidia340/files/nvidia-glx.conf  |   4 -
 srcpkgs/nvidia340/template               | 223 -------
 srcpkgs/nvidia340/update                 |   2 -
 srcpkgs/removed-packages/template        |   6 +-
 14 files changed, 5 insertions(+), 1245 deletions(-)
 delete mode 120000 srcpkgs/nvidia340-dkms
 delete mode 120000 srcpkgs/nvidia340-libs
 delete mode 120000 srcpkgs/nvidia340-opencl
 delete mode 100644 srcpkgs/nvidia340/INSTALL
 delete mode 100644 srcpkgs/nvidia340/INSTALL.msg
 delete mode 100644 srcpkgs/nvidia340/REMOVE
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.8.patch
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.9.patch
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.x.patch
 delete mode 100644 srcpkgs/nvidia340/files/nvidia-glx.conf
 delete mode 100644 srcpkgs/nvidia340/template
 delete mode 100644 srcpkgs/nvidia340/update

diff --git a/common/shlibs b/common/shlibs
index 17621bdb846..24c31d8621d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -131,16 +131,13 @@ libbrcmOpenVG.so rpi-userland-20180103_2
 libwayland-egl.so.1 wayland-1.15.0_4
 libnvidia-ml.so.1 nvidia-libs-346.47_1 ignore
 libnvidia-ml.so.1 nvidia304-libs-304.00_1 ignore
-libnvidia-ml.so.1 nvidia340-libs-340.46_1 ignore
 libnvidia-ml.so.1 nvidia390-libs-390.87_1 ignore
 libnvidia-tls.so.346.47 nvidia-libs-346.47_1 ignore
 libnvidia-glcore.so.346.47 nvidia-libs-346.47_1 ignore
 libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
-libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore
 libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore
 libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
-libnvidia-glsi.so.340.107 nvidia340-libs-340.107_7 ignore
 libnvidia-fatbinaryloader.so.390.138 nvidia390-libs-390.138_1 ignore
 libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore
 libglapi.so.0 libglapi-7.11_1
diff --git a/srcpkgs/nvidia340-dkms b/srcpkgs/nvidia340-dkms
deleted file mode 120000
index 383d067a70f..00000000000
--- a/srcpkgs/nvidia340-dkms
+++ /dev/null
@@ -1 +0,0 @@
-nvidia340
\ No newline at end of file
diff --git a/srcpkgs/nvidia340-libs b/srcpkgs/nvidia340-libs
deleted file mode 120000
index 383d067a70f..00000000000
--- a/srcpkgs/nvidia340-libs
+++ /dev/null
@@ -1 +0,0 @@
-nvidia340
\ No newline at end of file
diff --git a/srcpkgs/nvidia340-opencl b/srcpkgs/nvidia340-opencl
deleted file mode 120000
index 383d067a70f..00000000000
--- a/srcpkgs/nvidia340-opencl
+++ /dev/null
@@ -1 +0,0 @@
-nvidia340
\ No newline at end of file
diff --git a/srcpkgs/nvidia340/INSTALL b/srcpkgs/nvidia340/INSTALL
deleted file mode 100644
index 6b065bedb4a..00000000000
--- a/srcpkgs/nvidia340/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-# Regenerate initramfs.
-case ${ACTION} in
-post)
-	echo "Regenerating initramfs, please wait..."
-	dracut -f -q --regenerate-all
-	;;
-esac
diff --git a/srcpkgs/nvidia340/INSTALL.msg b/srcpkgs/nvidia340/INSTALL.msg
deleted file mode 100644
index 6301c36edbe..00000000000
--- a/srcpkgs/nvidia340/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-> Remove from your /etc/X11/xorg.conf blocks like this:
-
-Section "Files"
-...
-EndSection
-
-This is known to happen when the configuration is generated by nvidia-xconfig.
-Such a section interferes with the "Files" Section provided by the package.
-
--------------------------------------------------------------------------------
-
-> If you wish to go back to nouveau:
-
-# xbps-remove nvidia340 nvidia340-dkms
-# xbps-install libglvnd
diff --git a/srcpkgs/nvidia340/REMOVE b/srcpkgs/nvidia340/REMOVE
deleted file mode 100644
index e4d494ca015..00000000000
--- a/srcpkgs/nvidia340/REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-# Regenerate initramfs.
-case ${ACTION} in
-purge)
-	echo "Regenerating initramfs, please wait..."
-	dracut -f -q --regenerate-all
-	;;
-esac
diff --git a/srcpkgs/nvidia340/files/kernel-5.8.patch b/srcpkgs/nvidia340/files/kernel-5.8.patch
deleted file mode 100644
index 1d8b1a40e1e..00000000000
--- a/srcpkgs/nvidia340/files/kernel-5.8.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 2cc3342b4b3c96bcc4062513011d35c079b009a2 Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Thu, 22 Oct 2020 06:59:59 -0400
-Subject: [PATCH 2/3] kernel-5.8
-
-credit: https://launchpad.net/~kelebek333/+archive/ubuntu/nvidia-legacy/+packages
-extracted from: https://launchpadlibrarian.net/492468557/nvidia-graphics-drivers-340_340.108-1lmtrfocal3_340.108-2lmtrfocal.diff.gz
----
- kernel/nv-linux.h                | 8 ++++++++
- kernel/nvidia-modules-common.mk  | 1 +
- kernel/os-mlock.c                | 8 ++++++++
- kernel/uvm/nvidia_uvm_lite_api.c | 4 ++++
- 4 files changed, 21 insertions(+)
-
-diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
-index 83e6433..d055552 100644
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -669,11 +669,19 @@ extern nv_spinlock_t km_lock;
- #  define KM_FREE_RECORD(a,b,c)
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+#define NV_VMALLOC(ptr, size)                     \
-+    {                                             \
-+        (ptr) = __vmalloc(size, GFP_KERNEL);      \
-+        VM_ALLOC_RECORD(ptr, size, "vm_vmalloc"); \
-+    }
-+#else
- #define NV_VMALLOC(ptr, size)                               \
-     {                                                       \
-         (ptr) = __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);   \
-         VM_ALLOC_RECORD(ptr, size, "vm_vmalloc");           \
-     }
-+#endif
- 
- #define NV_VFREE(ptr, size)                         \
-     {                                               \
-diff --git a/kernel/nvidia-modules-common.mk b/kernel/nvidia-modules-common.mk
-index b94591b..0e4c228 100644
---- a/kernel/nvidia-modules-common.mk
-+++ b/kernel/nvidia-modules-common.mk
-@@ -222,6 +222,7 @@ build-sanity-checks:
- define BUILD_MODULE_RULE
-  $(1): build-sanity-checks $(3)
- 	@echo "NVIDIA: calling KBUILD..."; \
-+	touch .nv-kernel.o.cmd; \
- 	$$(MAKE) "CC=$$(CC)" NV_MODULE_SUFFIX=$$(strip $(2)) $$(KBUILD_PARAMS) modules; \
- 	echo "NVIDIA: left KBUILD."; \
- 	if ! [ -f $(1) ]; then \
-diff --git a/kernel/os-mlock.c b/kernel/os-mlock.c
-index 8a1fa2f..fc50543 100644
---- a/kernel/os-mlock.c
-+++ b/kernel/os-mlock.c
-@@ -44,11 +44,19 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
-         return rmStatus;
-     }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+    down_read(&mm->mmap_lock);
-+    ret = NV_GET_USER_PAGES((unsigned long)address,
-+                            page_count, write, force, user_pages, NULL);
-+    up_read(&mm->mmap_lock);
-+    pinned = ret;
-+#else
-     down_read(&mm->mmap_sem);
-     ret = NV_GET_USER_PAGES((unsigned long)address,
-                             page_count, write, force, user_pages, NULL);
-     up_read(&mm->mmap_sem);
-     pinned = ret;
-+#endif
- 
-     if (ret < 0)
-     {
-diff --git a/kernel/uvm/nvidia_uvm_lite_api.c b/kernel/uvm/nvidia_uvm_lite_api.c
-index 8448eb6..97a4818 100644
---- a/kernel/uvm/nvidia_uvm_lite_api.c
-+++ b/kernel/uvm/nvidia_uvm_lite_api.c
-@@ -30,6 +30,10 @@
- #include "uvm_gpu_ops_tests.h"
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+#define mmap_sem mmap_lock
-+#endif
-+
- //
- // nvidia_uvm_lite_api.c
- //
--- 
-2.29.0
-
diff --git a/srcpkgs/nvidia340/files/kernel-5.9.patch b/srcpkgs/nvidia340/files/kernel-5.9.patch
deleted file mode 100644
index d8584314f24..00000000000
--- a/srcpkgs/nvidia340/files/kernel-5.9.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From fea401df7500bfbead5a42b1e74560dbddf2f5a3 Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Thu, 22 Oct 2020 07:00:35 -0400
-Subject: [PATCH 3/3] kernel-5.9
-
-credit: https://github.com/warpme/minimyth2/blob/master/script/nvidia/nvidia-340.108/files/nvidia-340.108-fix-5.9-kernel-compile.patch
----
- kernel/nv-drm.c               | 8 ++++++++
- kernel/nv-linux.h             | 9 +++++++--
- kernel/nv.c                   | 4 ++++
- kernel/uvm/nvidia_uvm_linux.h | 2 ++
- 4 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
-index 85db07e..f0c1299 100644
---- a/kernel/nv-drm.c
-+++ b/kernel/nv-drm.c
-@@ -415,7 +415,11 @@ static struct drm_driver nv_drm_driver = {
-     .set_busid = drm_pci_set_busid,
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+    .gem_free_object_unlocked = nv_gem_free,
-+#else
-     .gem_free_object = nv_gem_free,
-+#endif
- 
-     .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
-     .gem_prime_export = drm_gem_prime_export,
-@@ -511,8 +515,12 @@ RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(
- 
- #if defined(NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT)
-     drm_gem_object_put_unlocked(&nv_obj->base);
-+#else
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+    drm_gem_object_put_locked(&nv_obj->base);
- #else
-     drm_gem_object_unreference_unlocked(&nv_obj->base);
-+#endif
- #endif
- 
-     status = RM_OK;
-diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
-index d055552..524a8fe 100644
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -136,8 +136,10 @@
- 
- #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
- #include <linux/syscalls.h>         /* sys_ioctl()                      */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
- #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
- #endif
-+#endif
- 
- #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
-   !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
-@@ -2249,10 +2251,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
-                                             pages, vmas, NULL);
- 
-         #else
--
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+               return get_user_pages_remote(mm, start, nr_pages, flags,
-+                                            pages, vmas, NULL);
-+#else
-                return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
-                                             pages, vmas);
--
-+#endif
-         #endif
- 
-         }
-diff --git a/kernel/nv.c b/kernel/nv.c
-index a218f83..be4e0f8 100644
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -2785,7 +2785,11 @@ nvidia_probe
- 
- #if defined(CONFIG_VGA_ARB)
- #if defined(VGA_DEFAULT_DEVICE)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+    vga_get(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK, 0);
-+#else
-     vga_tryget(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK);
-+#endif
- #endif
-     vga_set_legacy_decoding(dev, VGA_RSRC_NONE);
- #endif
-diff --git a/kernel/uvm/nvidia_uvm_linux.h b/kernel/uvm/nvidia_uvm_linux.h
-index 1625209..efc181f 100644
---- a/kernel/uvm/nvidia_uvm_linux.h
-+++ b/kernel/uvm/nvidia_uvm_linux.h
-@@ -158,8 +158,10 @@
- 
- #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
- #include <linux/syscalls.h>         /* sys_ioctl()                      */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
- #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
- #endif
-+#endif
- 
- #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
-   !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
--- 
-2.29.0
-
diff --git a/srcpkgs/nvidia340/files/kernel-5.x.patch b/srcpkgs/nvidia340/files/kernel-5.x.patch
deleted file mode 100644
index d7f763bbe39..00000000000
--- a/srcpkgs/nvidia340/files/kernel-5.x.patch
+++ /dev/null
@@ -1,781 +0,0 @@
-From 2154cc447a2377cfd60a7b7c5b619e689ebf71b1 Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Thu, 22 Oct 2020 06:58:53 -0400
-Subject: [PATCH 1/3] kernel-5.7
-
-Contains a bunch of stuff required for things up to 5.7.
-credit: https://gitlab.manjaro.org/packages?utf8=%E2%9C%93&filter=nvidia-340xx
----
- kernel/Makefile              |   5 +
- kernel/conftest.sh           |  81 +++++++++++++
- kernel/dkms.conf             |   8 +-
- kernel/nv-drm.c              | 229 ++++++++++++++++++++++++++++++++++-
- kernel/nv-linux.h            |  49 ++++++++
- kernel/nv-procfs.c           |  20 +++
- kernel/nv-time.h             |   9 +-
- kernel/nv.c                  |   2 +-
- kernel/os-interface.c        |   8 +-
- kernel/uvm/Makefile          |   1 +
- kernel/uvm/conftest.sh       |   4 +
- kernel/uvm/nvidia_uvm_lite.c |  29 ++++-
- 12 files changed, 431 insertions(+), 14 deletions(-)
-
-diff --git a/kernel/Makefile b/kernel/Makefile
-index 125a690..2597080 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -108,12 +108,14 @@ COMPILE_TESTS = \
- 	acquire_console_sem \
- 	console_lock \
- 	kmem_cache_create \
-+	kmem_cache_create_usercopy \
- 	outer_flush_all \
- 	on_each_cpu \
- 	smp_call_function \
- 	nvmap_support \
- 	acpi_evaluate_integer \
- 	ioremap_cache \
-+	ioremap_nocache \
- 	ioremap_wc \
- 	proc_dir_entry \
- 	INIT_WORK \
-@@ -122,6 +124,7 @@ COMPILE_TESTS = \
- 	pci_domain_nr \
- 	pci_dma_mapping_error \
- 	file_operations \
-+	proc_ops \
- 	sg_alloc_table \
- 	sg_init_table \
- 	pci_get_domain_bus_and_slot \
-@@ -147,6 +150,8 @@ COMPILE_TESTS = \
- 	vm_fault_present \
- 	vm_fault_has_address \
- 	drm_driver_unload_has_int_return_type \
-+	drm_get_pci_dev \
-+	drm_pci_init \
- 	drm_legacy_pci_init \
- 	timer_setup \
- 	do_gettimeofday \
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index b7a85f0..a5225e5 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -176,6 +176,7 @@ test_headers() {
-     FILES="$FILES linux/ktime.h"
-     FILES="$FILES linux/file.h"
- 
-+    FILES_ARCH="$FILES_ARCH asm/pgtable.h"
-     FILES_ARCH="$FILES_ARCH asm/set_memory.h"
- 
-     translate_and_find_header_files $HEADERS      $FILES
-@@ -440,6 +441,9 @@ compile_test() {
-             # Determine if the set_memory_array_uc() function is present.
-             #
-             CODE="
-+            #if defined(NV_ASM_PGTABLE_H_PRESENT)
-+            #include <asm/pgtable.h>
-+            #endif
-             #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
-             #include <asm/set_memory.h>
-             #else
-@@ -914,6 +918,21 @@ compile_test() {
-             fi
-         ;;
- 
-+        kmem_cache_create_usercopy)
-+            #
-+            # Determine if the kmem_cache_create_usercopy function exists.
-+            #
-+            # This function was added by:
-+            #   2017-06-10  8eb8284b412906181357c2b0110d879d5af95e52
-+            CODE="
-+            #include <linux/slab.h>
-+            void kmem_cache_create_usercopy(void) {
-+                kmem_cache_create_usercopy();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_KMEM_CACHE_CREATE_USERCOPY_PRESENT" "" "functions"
-+        ;;
-+
-         smp_call_function)
-             #
-             # Determine if the smp_call_function() function is
-@@ -1188,6 +1207,22 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_IOREMAP_CACHE_PRESENT" "" "functions"
-         ;;
- 
-+        ioremap_nocache)
-+            #
-+            # Determine if the ioremap_nocache() function is present.
-+            #
-+            # Removed by commit 4bdc0d676a64 ("remove ioremap_nocache and
-+            # devm_ioremap_nocache") in v5.6 (2020-01-06)
-+            #
-+            CODE="
-+            #include <asm/io.h>
-+            void conftest_ioremap_nocache(void) {
-+                ioremap_nocache();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_IOREMAP_NOCACHE_PRESENT" "" "functions"
-+        ;;
-+
-         ioremap_wc)
-             #
-             # Determine if the ioremap_wc() function is present.
-@@ -1371,6 +1406,16 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_FILE_OPERATIONS_HAS_COMPAT_IOCTL" "" "types"
-         ;;
- 
-+        proc_ops)
-+            CODE="
-+            #include <linux/proc_fs.h>
-+            int conftest_proc_ops(void) {
-+                return offsetof(struct proc_ops, proc_open);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_HAVE_PROC_OPS" "" "types"
-+        ;;
-+
-         sg_init_table)
-             #
-             # Determine if the sg_init_table() function is present.
-@@ -2044,6 +2089,42 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_DRM_DRIVER_UNLOAD_HAS_INT_RETURN_TYPE" "" "types"
-         ;;
- 
-+        drm_get_pci_dev)
-+            #
-+            # Determine if drm_get_pci_dev() is present.
-+            #
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            #if defined(NV_DRM_DRM_PCI_H_PRESENT)
-+            #include <drm/drm_pci.h>
-+            #endif
-+
-+            void conftest_drm_legacy_pci_init(void) {
-+                drm_get_pci_dev();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_GET_PCI_DEV_PRESENT" "" "functions"
-+        ;;
-+
-+        drm_pci_init)
-+            #
-+            # Determine if drm_pci_init() is present.
-+            #
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            void conftest_drm_legacy_pci_init(void) {
-+                drm_pci_init();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_PCI_INIT_PRESENT" "" "functions"
-+        ;;
-+
-         drm_legacy_pci_init)
-             #
-             # Determine if drm_legacy_pci_init() is present. drm_pci_init() was
-diff --git a/kernel/dkms.conf b/kernel/dkms.conf
-index 79a02ae..3140f03 100644
---- a/kernel/dkms.conf
-+++ b/kernel/dkms.conf
-@@ -1,7 +1,13 @@
-+if [ -x /usr/bin/nproc ]; then
-+  num_cpu_cores=$(nproc)
-+else
-+  num_cpu_cores=1
-+fi
-+
- PACKAGE_NAME="nvidia"
- PACKAGE_VERSION="340.108"
- BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
- DEST_MODULE_LOCATION[0]="/kernel/drivers/video"
--MAKE[0]="make module KERNEL_UNAME=${kernelver}"
-+MAKE[0]="make -j$num_cpu_cores module KERNEL_UNAME=${kernelver}"
- CLEAN="make clean"
- AUTOINSTALL="yes"
-diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
-index 0d1cdbf..85db07e 100644
---- a/kernel/nv-drm.c
-+++ b/kernel/nv-drm.c
-@@ -50,9 +50,236 @@
- #if defined(NV_DRM_LEGACY_PCI_INIT_PRESENT)
- #define nv_drm_pci_init drm_legacy_pci_init
- #define nv_drm_pci_exit drm_legacy_pci_exit
--#else
-+#elif defined(NV_DRM_PCI_INIT_PRESENT)
- #define nv_drm_pci_init drm_pci_init
- #define nv_drm_pci_exit drm_pci_exit
-+#else
-+#if defined(NV_DRM_GET_PCI_DEV_PRESENT)
-+#define nv_drm_get_pci_dev drm_get_pci_dev
-+#else
-+#include <drm/drm_agpsupport.h>
-+
-+struct nv_drm_agp_head {
-+    struct agp_kern_info agp_info;
-+    struct list_head memory;
-+    unsigned long mode;
-+    struct agp_bridge_data *bridge;
-+    int enabled;
-+    int acquired;
-+    unsigned long base;
-+    int agp_mtrr;
-+    int cant_use_aperture;
-+    unsigned long page_mask;
-+};
-+
-+struct nv_drm_agp_mem {
-+    unsigned long handle;
-+    struct agp_memory *memory;
-+    unsigned long bound;
-+    int pages;
-+    struct list_head head;
-+};
-+
-+/*
-+ * Code from drm_agp_init/nv_drm_{free,unbind}_agp
-+ * Extracted from commit: 5b8b9d0c6d0e0f1993c6c56deaf9646942c49d94, file: drivers/gpu/drm/drm_agpsupport.c
-+ */
-+struct drm_agp_head *nv_drm_agp_init(struct drm_device *dev)
-+{
-+    struct nv_drm_agp_head *head = NULL;
-+
-+    head = kzalloc(sizeof(*head), GFP_KERNEL);
-+    if (!head)
-+        return NULL;
-+    head->bridge = agp_find_bridge(dev->pdev);
-+    if (!head->bridge) {
-+        head->bridge = agp_backend_acquire(dev->pdev);
-+        if (!head->bridge) {
-+            kfree(head);
-+            return NULL;
-+        }
-+        agp_copy_info(head->bridge, &head->agp_info);
-+        agp_backend_release(head->bridge);
-+    } else {
-+        agp_copy_info(head->bridge, &head->agp_info);
-+    }
-+    if (head->agp_info.chipset == NOT_SUPPORTED) {
-+        kfree(head);
-+        return NULL;
-+    }
-+    INIT_LIST_HEAD(&head->memory);
-+    head->cant_use_aperture = head->agp_info.cant_use_aperture;
-+    head->page_mask = head->agp_info.page_mask;
-+    head->base = head->agp_info.aper_base;
-+    return (struct drm_agp_head *)head;
-+}
-+
-+void nv_drm_free_agp(struct agp_memory *handle, int pages)
-+{
-+    agp_free_memory(handle);
-+}
-+
-+int nv_drm_unbind_agp(struct agp_memory *handle)
-+{
-+    return agp_unbind_memory(handle);
-+}
-+
-+/*
-+ * Code from drm_pci_agp_{clear,destroy,init}/drm_get_pci_dev
-+ * Extracted from commit: 5b8b9d0c6d0e0f1993c6c56deaf9646942c49d94, file: drivers/gpu/drm/drm_pci.c
-+ */
-+static void nv_drm_pci_agp_init(struct drm_device *dev)
-+{
-+    if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
-+        if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
-+            dev->agp = nv_drm_agp_init(dev);
-+        if (dev->agp) {
-+            dev->agp->agp_mtrr = arch_phys_wc_add(
-+                dev->agp->agp_info.aper_base,
-+                dev->agp->agp_info.aper_size *
-+                1024 * 1024);
-+        }
-+    }
-+}
-+
-+void nv_drm_legacy_agp_clear(struct drm_device *dev)
-+{
-+    struct nv_drm_agp_mem *entry, *tempe;
-+
-+    if (!dev->agp)
-+        return;
-+    if (!drm_core_check_feature(dev, DRIVER_LEGACY))
-+        return;
-+
-+    list_for_each_entry_safe(entry, tempe, &dev->agp->memory, head) {
-+        if (entry->bound)
-+            nv_drm_unbind_agp(entry->memory);
-+        nv_drm_free_agp(entry->memory, entry->pages);
-+        kfree(entry);
-+    }
-+    INIT_LIST_HEAD(&dev->agp->memory);
-+
-+    if (dev->agp->acquired)
-+        drm_agp_release(dev);
-+
-+    dev->agp->acquired = 0;
-+    dev->agp->enabled = 0;
-+}
-+
-+void nv_drm_pci_agp_destroy(struct drm_device *dev)
-+{
-+    if (dev->agp) {
-+        arch_phys_wc_del(dev->agp->agp_mtrr);
-+        nv_drm_legacy_agp_clear(dev);
-+        kfree(dev->agp);
-+        dev->agp = NULL;
-+    }
-+}
-+
-+static int nv_drm_get_pci_dev(struct pci_dev *pdev,
-+               const struct pci_device_id *ent,
-+               struct drm_driver *driver)
-+{
-+    struct drm_device *dev;
-+    int ret;
-+
-+    DRM_DEBUG("\n");
-+
-+    dev = drm_dev_alloc(driver, &pdev->dev);
-+    if (IS_ERR(dev))
-+        return PTR_ERR(dev);
-+
-+    ret = pci_enable_device(pdev);
-+    if (ret)
-+        goto err_free;
-+
-+    dev->pdev = pdev;
-+#ifdef __alpha__
-+    dev->hose = pdev->sysdata;
-+#endif
-+
-+    if (drm_core_check_feature(dev, DRIVER_MODESET))
-+        pci_set_drvdata(pdev, dev);
-+
-+    nv_drm_pci_agp_init(dev);
-+
-+    ret = drm_dev_register(dev, ent->driver_data);
-+    if (ret)
-+        goto err_agp;
-+
-+    /* No locking needed since shadow-attach is single-threaded since it may
-+     * only be called from the per-driver module init hook. */
-+    if (drm_core_check_feature(dev, DRIVER_LEGACY))
-+        list_add_tail(&dev->legacy_dev_list, &driver->legacy_dev_list);
-+
-+    return 0;
-+
-+err_agp:
-+    nv_drm_pci_agp_destroy(dev);
-+    pci_disable_device(pdev);
-+err_free:
-+    drm_dev_put(dev);
-+    return ret;
-+}
-+#endif
-+
-+/*
-+ * Code from drm_legacy_pci_{init,exit}
-+ * Extracted from tag: v5.6.3, file: drivers/gpu/drm/drm_pci.c
-+ */
-+int nv_drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
-+{
-+    struct pci_dev *pdev = NULL;
-+    const struct pci_device_id *pid;
-+    int i;
-+
-+    DRM_DEBUG("\n");
-+
-+    if (WARN_ON(!(driver->driver_features & DRIVER_LEGACY)))
-+        return -EINVAL;
-+
-+    /* If not using KMS, fall back to stealth mode manual scanning. */
-+    INIT_LIST_HEAD(&driver->legacy_dev_list);
-+    for (i = 0; pdriver->id_table[i].vendor != 0; i++) {
-+        pid = &pdriver->id_table[i];
-+
-+        /* Loop around setting up a DRM device for each PCI device
-+         * matching our ID and device class.  If we had the internal
-+         * function that pci_get_subsys and pci_get_class used, we'd
-+         * be able to just pass pid in instead of doing a two-stage
-+         * thing.
-+         */
-+        pdev = NULL;
-+        while ((pdev =
-+            pci_get_subsys(pid->vendor, pid->device, pid->subvendor,
-+                       pid->subdevice, pdev)) != NULL) {
-+            if ((pdev->class & pid->class_mask) != pid->class)
-+                continue;
-+
-+            /* stealth mode requires a manual probe */
-+            pci_dev_get(pdev);
-+            nv_drm_get_pci_dev(pdev, pid, driver);
-+        }
-+    }
-+    return 0;
-+}
-+
-+void nv_drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver)
-+{
-+    struct drm_device *dev, *tmp;
-+    DRM_DEBUG("\n");
-+
-+    if (!(driver->driver_features & DRIVER_LEGACY)) {
-+        WARN_ON(1);
-+    } else {
-+        list_for_each_entry_safe(dev, tmp, &driver->legacy_dev_list,
-+                     legacy_dev_list) {
-+            list_del(&dev->legacy_dev_list);
-+            drm_put_dev(dev);
-+        }
-+    }
-+    DRM_INFO("Module unloaded\n");
-+}
- #endif
- 
- extern nv_linux_state_t *nv_linux_devices;
-diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
-index a1d2c68..83e6433 100644
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -688,11 +688,16 @@ extern nv_spinlock_t km_lock;
-         VM_ALLOC_RECORD(ptr, size, "vm_ioremap"); \
-     }
- 
-+#if defined(NV_IOREMAP_NOCACHE_PRESENT)
- #define NV_IOREMAP_NOCACHE(ptr, physaddr, size) \
-     { \
-         (ptr) = ioremap_nocache(physaddr, size); \
-         VM_ALLOC_RECORD(ptr, size, "vm_ioremap_nocache"); \
-     }
-+#else
-+#define NV_IOREMAP_NOCACHE(ptr, physaddr, size) \
-+    NV_IOREMAP(ptr, physaddr, size)
-+#endif
- 
- #if defined(NV_IOREMAP_CACHE_PRESENT)
- #define NV_IOREMAP_CACHE(ptr, physaddr, size)            \
-@@ -774,6 +779,17 @@ extern nv_spinlock_t km_lock;
- #error "NV_KMEM_CACHE_CREATE() undefined (kmem_cache_create() unavailable)!"
- #endif
- 
-+#if defined(NV_KMEM_CACHE_CREATE_USERCOPY_PRESENT)
-+#define NV_KMEM_CACHE_CREATE_USERCOPY(kmem_cache, name, type)       \
-+    {                                                               \
-+        kmem_cache = kmem_cache_create_usercopy(name, sizeof(type), \
-+                        0, 0, 0, sizeof(type), NULL);               \
-+    }
-+#else
-+#define NV_KMEM_CACHE_CREATE_USERCOPY(kmem_cache, name, type)       \
-+        NV_KMEM_CACHE_CREATE(kmem_cache, name, type)
-+#endif
-+
- #define NV_KMEM_CACHE_ALLOC(ptr, kmem_cache, type)              \
-     {                                                           \
-         (ptr) = kmem_cache_alloc(kmem_cache, GFP_KERNEL);       \
-@@ -1971,6 +1987,19 @@ extern NvU32 nv_assign_gpu_count;
-     })
- #endif
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+#define NV_CREATE_PROC_FILE(filename,parent,__name,__data)               \
-+   ({                                                                    \
-+        struct proc_dir_entry *__entry;                                  \
-+        int mode = (S_IFREG | S_IRUGO);                                  \
-+        const struct proc_ops *fops = &nv_procfs_##__name##_fops;        \
-+        if (fops->proc_write != 0)                                       \
-+            mode |= S_IWUSR;                                             \
-+        __entry = NV_CREATE_PROC_ENTRY(filename, mode, parent, fops,     \
-+            __data);                                                     \
-+        __entry;                                                         \
-+    })
-+#else
- #define NV_CREATE_PROC_FILE(filename,parent,__name,__data)               \
-    ({                                                                    \
-         struct proc_dir_entry *__entry;                                  \
-@@ -1982,6 +2011,7 @@ extern NvU32 nv_assign_gpu_count;
-             __data);                                                     \
-         __entry;                                                         \
-     })
-+#endif
- 
- /*
-  * proc_mkdir_mode exists in Linux 2.6.9, but isn't exported until Linux 3.0.
-@@ -2023,6 +2053,24 @@ extern NvU32 nv_assign_gpu_count;
-     remove_proc_entry(entry->name, entry->parent);
- #endif
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+#define NV_DEFINE_PROCFS_SINGLE_FILE(__name)                                  \
-+    static int nv_procfs_open_##__name(                                       \
-+        struct inode *inode,                                                  \
-+        struct file *filep                                                    \
-+    )                                                                         \
-+    {                                                                         \
-+        return single_open(filep, nv_procfs_read_##__name,                    \
-+            NV_PDE_DATA(inode));                                              \
-+    }                                                                         \
-+                                                                              \
-+    static const struct proc_ops nv_procfs_##__name##_fops = {                \
-+        .proc_open       = nv_procfs_open_##__name,                           \
-+        .proc_read       = seq_read,                                          \
-+        .proc_lseek      = seq_lseek,                                         \
-+        .proc_release    = single_release,                                    \
-+    };
-+#else
- #define NV_DEFINE_PROCFS_SINGLE_FILE(__name)                                  \
-     static int nv_procfs_open_##__name(                                       \
-         struct inode *inode,                                                  \
-@@ -2040,6 +2088,7 @@ extern NvU32 nv_assign_gpu_count;
-         .llseek     = seq_lseek,                                              \
-         .release    = single_release,                                         \
-     };
-+#endif
- 
- #endif  /* CONFIG_PROC_FS */
- 
-diff --git a/kernel/nv-procfs.c b/kernel/nv-procfs.c
-index ebca3e8..9365c3c 100644
---- a/kernel/nv-procfs.c
-+++ b/kernel/nv-procfs.c
-@@ -409,6 +409,15 @@ done:
-     return ((status < 0) ? status : (int)count);
- }
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+static struct proc_ops nv_procfs_registry_fops = {
-+    .proc_open    = nv_procfs_open_registry,
-+    .proc_read    = seq_read,
-+    .proc_write   = nv_procfs_write_file,
-+    .proc_lseek   = seq_lseek,
-+    .proc_release = nv_procfs_close_registry,
-+};
-+#else
- static struct file_operations nv_procfs_registry_fops = {
-     .owner   = THIS_MODULE,
-     .open    = nv_procfs_open_registry,
-@@ -417,6 +426,7 @@ static struct file_operations nv_procfs_registry_fops = {
-     .llseek  = seq_lseek,
-     .release = nv_procfs_close_registry,
- };
-+#endif
- 
- static int
- nv_procfs_read_unbind_lock(
-@@ -538,6 +548,15 @@ done:
-     return rc;
- }
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+static struct proc_ops nv_procfs_unbind_lock_fops = {
-+    .proc_open    = nv_procfs_open_unbind_lock,
-+    .proc_read    = seq_read,
-+    .proc_write   = nv_procfs_write_file,
-+    .proc_lseek   = seq_lseek,
-+    .proc_release = nv_procfs_close_unbind_lock,
-+};
-+#else
- static struct file_operations nv_procfs_unbind_lock_fops = {
-     .owner   = THIS_MODULE,
-     .open    = nv_procfs_open_unbind_lock,
-@@ -546,6 +565,7 @@ static struct file_operations nv_procfs_unbind_lock_fops = {
-     .llseek  = seq_lseek,
-     .release = nv_procfs_close_unbind_lock,
- };
-+#endif
- 
- static int
- nv_procfs_read_text_file(
-diff --git a/kernel/nv-time.h b/kernel/nv-time.h
-index a34ceb2..780f8bc 100644
---- a/kernel/nv-time.h
-+++ b/kernel/nv-time.h
-@@ -28,7 +28,12 @@
- #include <linux/ktime.h>
- #endif
- 
--static inline void nv_gettimeofday(struct timeval *tv)
-+struct nv_timeval {
-+    __kernel_long_t      tv_sec;
-+    __kernel_suseconds_t tv_usec;
-+};
-+
-+static inline void nv_gettimeofday(struct nv_timeval *tv)
- {
- #ifdef NV_DO_GETTIMEOFDAY_PRESENT
-     do_gettimeofday(tv);
-@@ -37,7 +42,7 @@ static inline void nv_gettimeofday(struct timeval *tv)
- 
-     ktime_get_real_ts64(&now);
- 
--    *tv = (struct timeval) {
-+    *tv = (struct nv_timeval) {
-         .tv_sec = now.tv_sec,
-         .tv_usec = now.tv_nsec/1000,
-     };
-diff --git a/kernel/nv.c b/kernel/nv.c
-index a167be9..a218f83 100644
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -752,7 +752,7 @@ int __init nvidia_init_module(void)
-     NV_SPIN_LOCK_INIT(&km_lock);
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
-+    NV_KMEM_CACHE_CREATE_USERCOPY(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
-     if (nv_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-diff --git a/kernel/os-interface.c b/kernel/os-interface.c
-index 7190b26..0c0dc05 100644
---- a/kernel/os-interface.c
-+++ b/kernel/os-interface.c
-@@ -439,7 +439,7 @@ RM_STATUS NV_API_CALL os_get_current_time(
-     NvU32 *useconds
- )
- {
--    struct timeval tm;
-+    struct nv_timeval tm;
- 
-     nv_gettimeofday(&tm);
- 
-@@ -474,7 +474,7 @@ RM_STATUS NV_API_CALL os_delay_us(NvU32 MicroSeconds)
-     unsigned long usec;
- 
- #ifdef NV_CHECK_DELAY_ACCURACY
--    struct timeval tm1, tm2;
-+    struct nv_timeval tm1, tm2;
- 
-     nv_gettimeofday(&tm1);
- #endif
-@@ -514,9 +514,9 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
-     unsigned long MicroSeconds;
-     unsigned long jiffies;
-     unsigned long mdelay_safe_msec;
--    struct timeval tm_end, tm_aux;
-+    struct nv_timeval tm_end, tm_aux;
- #ifdef NV_CHECK_DELAY_ACCURACY
--    struct timeval tm_start;
-+    struct nv_timeval tm_start;
- #endif
- 
-     nv_gettimeofday(&tm_aux);
-diff --git a/kernel/uvm/Makefile b/kernel/uvm/Makefile
-index 0cad8ff..043a08d 100644
---- a/kernel/uvm/Makefile
-+++ b/kernel/uvm/Makefile
-@@ -207,6 +207,7 @@ ccflags-y += $(EXTRA_CFLAGS)
- 
- RM_MODULE_SYMVERS:= $(RM_OUT_DIR)/Module.symvers
- UVM_MODULE_SYMVERS:= $(obj)/Module.symvers
-+KBUILD_EXTRA_SYMBOLS:= $(UVM_MODULE_SYMVERS)
- 
- module $(MODULE_NAME).ko: $(UVM_MODULE_SYMVERS) debug_diagnostics_printing
- 
-diff --git a/kernel/uvm/conftest.sh b/kernel/uvm/conftest.sh
-index b7a85f0..33e2a63 100755
---- a/kernel/uvm/conftest.sh
-+++ b/kernel/uvm/conftest.sh
-@@ -176,6 +176,7 @@ test_headers() {
-     FILES="$FILES linux/ktime.h"
-     FILES="$FILES linux/file.h"
- 
-+    FILES_ARCH="$FILES_ARCH asm/pgtable.h"
-     FILES_ARCH="$FILES_ARCH asm/set_memory.h"
- 
-     translate_and_find_header_files $HEADERS      $FILES
-@@ -440,6 +441,9 @@ compile_test() {
-             # Determine if the set_memory_array_uc() function is present.
-             #
-             CODE="
-+            #if defined(NV_ASM_PGTABLE_H_PRESENT)
-+            #include <asm/pgtable.h>
-+            #endif
-             #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
-             #include <asm/set_memory.h>
-             #else
-diff --git a/kernel/uvm/nvidia_uvm_lite.c b/kernel/uvm/nvidia_uvm_lite.c
-index 6943e7c..9a7e3b6 100644
---- a/kernel/uvm/nvidia_uvm_lite.c
-+++ b/kernel/uvm/nvidia_uvm_lite.c
-@@ -131,8 +131,8 @@ static
- RM_STATUS _preexisting_error_on_channel(UvmGpuMigrationTracking *pMigTracker,
-                                          UvmCommitRecord *pRecord);
- 
--static void _set_timeout_in_usec(struct timeval *src,
--                                 struct timeval *result,
-+static void _set_timeout_in_usec(struct nv_timeval *src,
-+                                 struct nv_timeval *result,
-                                  unsigned long timeoutInUsec)
- {
-     if (!src || !result)
-@@ -820,7 +820,13 @@ done:
- }
- 
- #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+vm_fault_t _fault(struct vm_fault *vmf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+int _fault(struct vm_fault *vmf)
-+#else
- int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+#endif
- {
- #if defined(NV_VM_FAULT_HAS_ADDRESS)
-     unsigned long vaddr = vmf->address;
-@@ -828,8 +834,15 @@ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-     unsigned long vaddr = (unsigned long)vmf->virtual_address;
- #endif
-     struct page *page = NULL;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+    vm_fault_t retval;
-+#else
-     int retval;
- 
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+   struct vm_area_struct *vma = vmf->vma;
-+#endif
-     retval = _fault_common(vma, vaddr, &page, vmf->flags);
- 
-     vmf->page = page;
-@@ -868,7 +881,13 @@ static struct vm_operations_struct uvmlite_vma_ops =
- // it's dealing with anonymous mapping (see handle_pte_fault).
- //
- #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+vm_fault_t _sigbus_fault(struct vm_fault *vmf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+int _sigbus_fault(struct vm_fault *vmf)
-+#else
- int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+#endif
- {
-     vmf->page = NULL;
-     return VM_FAULT_SIGBUS;
-@@ -1992,9 +2011,9 @@ void umvlite_destroy_per_process_gpu_resources(UvmGpuUuid *gpuUuidStruct)
- static RM_STATUS _check_ecc_errors(UvmGpuMigrationTracking *pMigTracker,
-                                     NvBool *pIsEccErrorSet)
- {
--    struct timeval eccErrorStartTime = {0};
--    struct timeval eccErrorCurrentTime = {0};
--    struct timeval eccTimeout = {0};
-+    struct nv_timeval eccErrorStartTime = {0};
-+    struct nv_timeval eccErrorCurrentTime = {0};
-+    struct nv_timeval eccTimeout = {0};
-     NvBool bEccErrorTimeout = NV_FALSE;
-     NvBool bEccIncomingError = NV_FALSE;
-     unsigned rmInterruptSet = 0;
--- 
-2.29.0
-
diff --git a/srcpkgs/nvidia340/files/nvidia-glx.conf b/srcpkgs/nvidia340/files/nvidia-glx.conf
deleted file mode 100644
index 7c76883abb3..00000000000
--- a/srcpkgs/nvidia340/files/nvidia-glx.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-Section "Files"
-    ModulePath "/usr/lib/nvidia/xorg"
-    ModulePath "/usr/lib/xorg/modules"
-EndSection
diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template
deleted file mode 100644
index 166f35756bc..00000000000
--- a/srcpkgs/nvidia340/template
+++ /dev/null
@@ -1,223 +0,0 @@
-# Template file for 'nvidia340'
-
-_desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)"
-
-pkgname=nvidia340
-version=340.108
-revision=4
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:NVIDIA proprietary"
-homepage="http://www.nvidia.com"
-
-archs="i686 x86_64"
-nopie=yes
-repository=nonfree
-create_wrksrc=yes
-short_desc="${_desc} - Libraries and Utilities"
-hostmakedepends="tar"
-depends="${pkgname}-dkms-${version}_${revision} pkg-config"
-conflicts="catalyst>=0 xserver-abi-video>24_1"
-
-provides="nvidia-${version}_${revision}"
-replaces="nvidia>=0 nvidia-stable>=0"
-subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs"
-
-if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	_pkg="NVIDIA-Linux-x86-${version}"
-	distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
-	checksum=2032aad612d9f3af1aecf979cfdfe423d79aa76929ef8bf8d3a403076f507cca
-else
-	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
-	distfiles="http://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=995d44fef587ff5284497a47a95d71adbee0c13020d615e940ac928f180f5b77
-fi
-
-do_extract() {
-	install -m755 ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_pkg}.run ${wrksrc}
-	cd ${wrksrc}
-	./${_pkg}.run --extract-only
-	rm -f ${_pkg}.run
-}
-
-do_patch() {
-	cd ${_pkg}
-	patch -p1 < ${FILESDIR}/kernel-5.x.patch
-	patch -p1 < ${FILESDIR}/kernel-5.8.patch
-	patch -p1 < ${FILESDIR}/kernel-5.9.patch
-}
-
-do_install() {
-	cd ${_pkg}
-
-	# X driver
-	vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers
-
-	# GLX extension module for X
-	vinstall libglx.so.${version} 755 usr/lib/nvidia/xorg
-	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/nvidia/xorg/libglx.so.1
-	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/nvidia/xorg/libglx.so
-	# Override default ModulePath to load nvidia's glx instead of xorg's
-	vinstall ${FILESDIR}/nvidia-glx.conf 644 /usr/share/X11/xorg.conf.d 10-nvidia-glx.conf
-
-	# OpenGL libraries (GL, EGL and GLES)
-	vinstall libGL.so.${version} 755 usr/lib
-	ln -sf libGL.so.${version} ${DESTDIR}/usr/lib/libGL.so.1
-	vinstall libEGL.so.${version} 755 usr/lib
-	ln -sf libEGL.so.${version} ${DESTDIR}/usr/lib/libEGL.so.1
-	vinstall libGLESv1_CM.so.${version} 755 usr/lib
-	ln -sf libGLESv1_CM.so.${version} ${DESTDIR}/usr/lib/libGLESv1_CM.so.1
-	vinstall libGLESv2.so.${version} 755 usr/lib
-	ln -sf libGLESv2.so.${version} ${DESTDIR}/usr/lib/libGLESv2.so.2
-	# Some programs link to these libglvnd links
-	ln -sf libGL.so.1 ${DESTDIR}/usr/lib/libOpenGL.so.0
-	ln -sf libGL.so.1 ${DESTDIR}/usr/lib/libGLX.so.0
-
-	# OpenGL core library
-	vinstall libnvidia-glcore.so.${version} 755 usr/lib
-	ln -sf libnvidia-glcore.so.${version} ${DESTDIR}/usr/lib/libnvidia-glcore.so
-
-	# VDPAU
-	vinstall libvdpau_nvidia.so.${version} 755 usr/lib/vdpau
-	ln -sf libvdpau_nvidia.so.${version} ${DESTDIR}/usr/lib/vdpau/libvdpau_nvidia.so
-	ln -sf libvdpau_nvidia.so.${version} ${DESTDIR}/usr/lib/vdpau/libvdpau_nvidia.so.1
-
-	# misc libraries
-	vinstall tls/libnvidia-tls.so.${version} 755 usr/lib
-	ln -sf libnvidia-tls.so.${version} ${DESTDIR}/usr/lib/libnvidia-tls.so
-
-	vinstall libnvidia-cfg.so.${version} 755 usr/lib
-	ln -sf libnvidia-cfg.so.${version} ${DESTDIR}/usr/lib/libnvidia-cfg.so
-	ln -sf libnvidia-cfg.so.${version} ${DESTDIR}/usr/lib/libnvidia-cfg.so.1
-
-	vinstall libnvidia-ml.so.${version} 755 usr/lib
-	ln -sf libnvidia-ml.so.${version} ${DESTDIR}/usr/lib/libnvidia-ml.so
-	ln -sf libnvidia-ml.so.${version} ${DESTDIR}/usr/lib/libnvidia-ml.so.1
-
-	vinstall libnvidia-encode.so.${version} 755 usr/lib
-	ln -sf libnvidia-encode.so.${version} ${DESTDIR}/usr/lib/libnvidia-encode.so
-	ln -sf libnvidia-encode.so.${version} ${DESTDIR}/usr/lib/libnvidia-encode.so.1
-
-	vinstall libnvidia-ifr.so.${version} 755 usr/lib
-	ln -sf libnvidia-ifr.so.${version} ${DESTDIR}/usr/lib/libnvidia-ifr.so
-	ln -sf libnvidia-ifr.so.${version} ${DESTDIR}/usr/lib/libnvidia-ifr.so.1
-
-	vinstall libnvidia-fbc.so.${version} 755 usr/lib
-	ln -sf libnvidia-fbc.so.${version} ${DESTDIR}/usr/lib/libnvidia-fbc.so
-	ln -sf libnvidia-fbc.so.${version} ${DESTDIR}/usr/lib/libnvidia-fbc.so.1
-
-	vinstall libnvidia-glsi.so.${version} 755 usr/lib
-
-	# CUDA
-	vbin nvidia-cuda-mps-control
-	vbin nvidia-cuda-mps-server
-	vman nvidia-cuda-mps-control.1.gz
-
-	vinstall libcuda.so.${version} 755 usr/lib
-	ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so
-	ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so.1
-
-	vinstall libnvcuvid.so.${version} 755 usr/lib
-	ln -sf libnvcuvid.so.${version} ${DESTDIR}/usr/lib/libnvcuvid.so
-	ln -sf libnvcuvid.so.${version} ${DESTDIR}/usr/lib/libnvcuvid.so.1
-
-	# nvidia-xconfig
-	vbin nvidia-xconfig
-	vman nvidia-xconfig.1.gz
-
-	# nvidia-settings
-	vbin nvidia-settings
-	vman nvidia-settings.1.gz
-	vinstall nvidia-settings.desktop 644 usr/share/applications
-	vinstall nvidia-settings.png 644 usr/share/pixmaps
-	sed -e 's:__UTILS_PATH__:/usr/bin:' \
-		-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
-		-i ${DESTDIR}/usr/share/applications/nvidia-settings.desktop
-
-	# nvidia-bug-report
-	vbin nvidia-bug-report.sh nvidia-bug-report
-	vbin nvidia-debugdump
-
-	# nvidia-smi
-	vbin nvidia-smi
-	vman nvidia-smi.1.gz
-
-	# License and documentation.
-	vlicense LICENSE
-	vdoc README.txt README
-	vdoc NVIDIA_Changelog
-
-	# opencl pkg
-	vinstall nvidia.icd 644 etc/OpenCL/vendors
-
-	vinstall libnvidia-compiler.so.${version} 755 usr/lib
-	ln -sf libnvidia-compiler.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-compiler.so
-	ln -sf libnvidia-compiler.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-compiler.so.1
-
-	vinstall libnvidia-opencl.so.${version} 755 usr/lib
-	ln -sf libnvidia-opencl.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-opencl.so
-	ln -sf libnvidia-opencl.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-opencl.so.1
-
-	# dkms pkg
-	vmkdir usr/src/nvidia-${version}
-	# add nvidia-uvm dkms submodule too.
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		cat kernel/uvm/dkms.conf.fragment >> kernel/dkms.conf
-	fi
-	vcopy "kernel/*" usr/src/nvidia-${version}
-
-	# systemd modules-load.d(5) file.
-	vmkdir usr/lib/modules-load.d
-	echo "nvidia" > ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf
-	chmod 644 ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		echo "nvidia-uvm" > ${DESTDIR}/usr/lib/modules-load.d/nvidia-uvm.conf
-		chmod 644 ${DESTDIR}/usr/lib/modules-load.d/nvidia-uvm.conf
-	fi
-
-	# Blacklist nouveau.
-	vmkdir usr/lib/modprobe.d
-	echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
-	chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
-
-	# Omit drm dracut module too.
-	vmkdir usr/lib/dracut/dracut.conf.d
-	echo "omit_dracutmodules+=\" drm \"" > ${DESTDIR}/usr/lib/dracut/dracut.conf.d/99-nvidia.conf
-}
-
-nvidia340-dkms_package() {
-	short_desc="${_desc} - DKMS kernel module"
-	dkms_modules="nvidia ${version}"
-	depends="dkms"
-	provides="nvidia-dkms-${version}_${revision}"
-	replaces="nvidia-dkms>=0 nvidia-stable-dkms>=0"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules-load.d
-		vmove usr/lib/modprobe.d
-		vmove usr/lib/dracut
-	}
-}
-nvidia340-opencl_package() {
-	short_desc="${_desc} - OpenCL implementation"
-	provides="nvidia-opencl-${version}_${revision}"
-	replaces="nvidia-opencl>=0 nvidia-stable-opencl>=0"
-	depends="libOpenCL"
-	pkg_install() {
-		vmove "usr/lib/libnvidia-compiler*"
-		vmove "usr/lib/libnvidia-opencl*"
-		vmove etc/OpenCL
-	}
-}
-nvidia340-libs_package() {
-	short_desc="${_desc} - libraries"
-	provides="libGL-7.11_1 libEGL-7.11_1 libGLES-7.11_1 libglvnd-1.3.0_1"
-	shlib_provides="libGLX.so.0 libOpenGL.so.0"
-	replaces="libGL>=0 libEGL>=0 libGLES>=0 libglvnd>=0"
-	pkg_install() {
-		vmove usr/lib
-	}
-}
diff --git a/srcpkgs/nvidia340/update b/srcpkgs/nvidia340/update
deleted file mode 100644
index 43bad67f7e8..00000000000
--- a/srcpkgs/nvidia340/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="http://www.nvidia.com/object/unix.html"
-pattern='340.+>\K[\d.]+(?=</A>)'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e07c160eafe..c3b79f436a5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=6
+revision=7
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -78,6 +78,10 @@ replaces="
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
  yt-play<=20140117_2
+ nvidia340<=340.108_4
+ nvidia340-dkms<=340.108_4
+ nvidia340-opencl<=340.108_4
+ nvidia340-libs<=340.108_4
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 8eb09b4216b263db4a947ec318449955dae239f0 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 22:13:36 +0100
Subject: [PATCH 051/420] sway: new maintainer.

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

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 84effd28b25..98ade688f1e 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -9,7 +9,7 @@ makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel"
 depends="swaybg xorg-server-xwayland"
 short_desc="Tiling Wayland compositor compatible with i3"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"

From c5fe2888efdc59804bf5774f95c20a885b077fa8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 10 Jan 2021 15:43:54 +0100
Subject: [PATCH 052/420] binutils: backport patch

this should fix chromium link on i686
---
 ...e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch | 60 +++++++++++++++++++
 srcpkgs/binutils/template                     |  2 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch

diff --git a/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch b/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch
new file mode 100644
index 00000000000..a55432d83cf
--- /dev/null
+++ b/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch
@@ -0,0 +1,60 @@
+From 1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Mon, 16 Nov 2020 06:37:53 -0800
+Subject: [PATCH] elf: Set rel_from_abs to 1 for __ehdr_start
+
+bfdlink.h has
+
+  /* Symbol will be converted from absolute to section-relative.  Set for
+     symbols defined by a script from "dot" (also SEGMENT_START or ORIGIN)
+     outside of an output section statement.  */
+  unsigned int rel_from_abs : 1;
+
+linker.c has
+
+.{* Return TRUE if the symbol described by a linker hash entry H
+.   is going to be absolute.  Linker-script defined symbols can be
+.   converted from absolute to section-relative ones late in the
+.   link.  Use this macro to correctly determine whether the symbol
+.   will actually end up absolute in output.  *}
+.#define bfd_is_abs_symbol(H) \
+.  (((H)->type == bfd_link_hash_defined \
+.    || (H)->type == bfd_link_hash_defweak) \
+.   && bfd_is_abs_section ((H)->u.def.section) \
+.   && !(H)->rel_from_abs)
+.
+
+Set rel_from_abs to 1 for __ehdr_start which will be converted from
+absolute to section-relative in assign_file_positions_for_load_sections.
+
+	PR ld/26869
+	* ldelf.c (ldelf_before_allocation): Set rel_from_abs to 1 for
+	__ehdr_start.
+	* testsuite/ld-i386/i386.exp: Run pr26869.
+	* testsuite/ld-i386/pr26869.d: New file.
+	* testsuite/ld-i386/pr26869.s: Likewise.
+
+(cherry picked from commit cbd5b99cce073273f668b154d4514e8e7e7ccc51)
+---
+ ld/ChangeLog                   |  9 +++++++++
+ ld/ldelf.c                     |  2 ++
+ ld/testsuite/ld-i386/i386.exp  |  1 +
+ ld/testsuite/ld-i386/pr26869.d | 14 ++++++++++++++
+ ld/testsuite/ld-i386/pr26869.s |  3 +++
+ 5 files changed, 29 insertions(+)
+ create mode 100644 ld/testsuite/ld-i386/pr26869.d
+ create mode 100644 ld/testsuite/ld-i386/pr26869.s
+
+diff --git a/ld/ldelf.c b/ld/ldelf.c
+index bada3ade2d7..831d032fe56 100644
+--- a/ld/ldelf.c
++++ b/ld/ldelf.c
+@@ -1589,6 +1589,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
+ 		      (char *) &ehdr_start->u + sizeof ehdr_start->u.def.next,
+ 		      sizeof ehdr_start_save_u);
+ 	      ehdr_start->type = bfd_link_hash_defined;
++	      /* It will be converted to section-relative later.  */
++	      ehdr_start->rel_from_abs = 1;
+ 	      ehdr_start->u.def.section = bfd_abs_section_ptr;
+ 	      ehdr_start->u.def.value = 0;
+ 	    }
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 0e6463ad431..b87e20315fb 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.35.1
-revision=1
+revision=2
 bootstrap=yes
 short_desc="GNU binary utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From d294c7b728cd1a4884cb7d2f0b635830099fd945 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 10 Jan 2021 15:44:38 +0100
Subject: [PATCH 053/420] chromium: broken on i686 until binutils is rebuilt

---
 srcpkgs/chromium/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 5e4d8129e5d..10b2c6c2d18 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -45,6 +45,10 @@ esac
 
 build_options_default="clang js_optimize vaapi pulseaudio pipewire"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) broken="until binutils update is done";;
+esac
+
 post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		for f in "${FILESDIR}"/musl-patches/*.patch; do

From 5f0b8fdb7104c7612cd87b4ed6dcc520159d68a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 10 Jan 2021 15:45:35 +0100
Subject: [PATCH 054/420] orion: update to 1.6.7

Add remaining patches from the archived repository.
---
 ...280a83521ac29a1438e05e8f7a331842bcb4.patch | 400 ++++++++++++++++++
 ...0bbd4a856ea45c770f882be9e63a663a9acd.patch |  32 ++
 ...b86f241df9e17238833c091992c80bb1d298.patch |  14 +
 srcpkgs/orion/patches/cpp.patch               |  11 -
 srcpkgs/orion/patches/mpv-setlocale.patch     |  14 -
 srcpkgs/orion/template                        |   4 +-
 6 files changed, 448 insertions(+), 27 deletions(-)
 create mode 100644 srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch
 create mode 100644 srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch
 create mode 100644 srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch
 delete mode 100644 srcpkgs/orion/patches/cpp.patch
 delete mode 100644 srcpkgs/orion/patches/mpv-setlocale.patch

diff --git a/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch b/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch
new file mode 100644
index 00000000000..67f7f15a163
--- /dev/null
+++ b/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch
@@ -0,0 +1,400 @@
+--- src/player/mpvobject.h
++++ src/player/mpvobject.h
+@@ -21,7 +21,7 @@ typedef mpv_opengl_cb_context mpv_context;
+ typedef mpv_render_context mpv_context;
+ #endif
+ 
+-#include <mpv/qthelper.hpp>
++#include "qthelper.hpp"
+ 
+ class MpvRenderer;
+
+--- /dev/null
++++ src/player/qthelper.hpp
+@@ -0,0 +1,386 @@
++/* Copyright (C) 2017 the mpv developers
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifndef MPV_CLIENT_API_QTHELPER_H_
++#define MPV_CLIENT_API_QTHELPER_H_
++
++#include <mpv/client.h>
++
++#if !MPV_ENABLE_DEPRECATED
++#error "This helper is deprecated. Copy it into your project instead."
++#else
++
++/**
++ * Note: these helpers are provided for convenience for C++/Qt applications.
++ * This is based on the public API in client.h, and it does not encode any
++ * knowledge that is not known or guaranteed outside of the C client API. You
++ * can even copy and modify this code as you like, or implement similar things
++ * for other languages.
++ */
++
++#include <cstring>
++
++#include <QVariant>
++#include <QString>
++#include <QList>
++#include <QHash>
++#include <QSharedPointer>
++#include <QMetaType>
++
++namespace mpv {
++namespace qt {
++
++// Wrapper around mpv_handle. Does refcounting under the hood.
++class Handle
++{
++    struct container {
++        container(mpv_handle *h) : mpv(h) {}
++        ~container() { mpv_terminate_destroy(mpv); }
++        mpv_handle *mpv;
++    };
++    QSharedPointer<container> sptr;
++public:
++    // Construct a new Handle from a raw mpv_handle with refcount 1. If the
++    // last Handle goes out of scope, the mpv_handle will be destroyed with
++    // mpv_terminate_destroy().
++    // Never destroy the mpv_handle manually when using this wrapper. You
++    // will create dangling pointers. Just let the wrapper take care of
++    // destroying the mpv_handle.
++    // Never create multiple wrappers from the same raw mpv_handle; copy the
++    // wrapper instead (that's what it's for).
++    static Handle FromRawHandle(mpv_handle *handle) {
++        Handle h;
++        h.sptr = QSharedPointer<container>(new container(handle));
++        return h;
++    }
++
++    // Return the raw handle; for use with the libmpv C API.
++    operator mpv_handle*() const { return sptr ? (*sptr).mpv : 0; }
++};
++
++static inline QVariant node_to_variant(const mpv_node *node)
++{
++    switch (node->format) {
++    case MPV_FORMAT_STRING:
++        return QVariant(QString::fromUtf8(node->u.string));
++    case MPV_FORMAT_FLAG:
++        return QVariant(static_cast<bool>(node->u.flag));
++    case MPV_FORMAT_INT64:
++        return QVariant(static_cast<qlonglong>(node->u.int64));
++    case MPV_FORMAT_DOUBLE:
++        return QVariant(node->u.double_);
++    case MPV_FORMAT_NODE_ARRAY: {
++        mpv_node_list *list = node->u.list;
++        QVariantList qlist;
++        for (int n = 0; n < list->num; n++)
++            qlist.append(node_to_variant(&list->values[n]));
++        return QVariant(qlist);
++    }
++    case MPV_FORMAT_NODE_MAP: {
++        mpv_node_list *list = node->u.list;
++        QVariantMap qmap;
++        for (int n = 0; n < list->num; n++) {
++            qmap.insert(QString::fromUtf8(list->keys[n]),
++                        node_to_variant(&list->values[n]));
++        }
++        return QVariant(qmap);
++    }
++    default: // MPV_FORMAT_NONE, unknown values (e.g. future extensions)
++        return QVariant();
++    }
++}
++
++struct node_builder {
++    node_builder(const QVariant& v) {
++        set(&node_, v);
++    }
++    ~node_builder() {
++        free_node(&node_);
++    }
++    mpv_node *node() { return &node_; }
++private:
++    Q_DISABLE_COPY(node_builder)
++    mpv_node node_;
++    mpv_node_list *create_list(mpv_node *dst, bool is_map, int num) {
++        dst->format = is_map ? MPV_FORMAT_NODE_MAP : MPV_FORMAT_NODE_ARRAY;
++        mpv_node_list *list = new mpv_node_list();
++        dst->u.list = list;
++        if (!list)
++            goto err;
++        list->values = new mpv_node[num]();
++        if (!list->values)
++            goto err;
++        if (is_map) {
++            list->keys = new char*[num]();
++            if (!list->keys)
++                goto err;
++        }
++        return list;
++    err:
++        free_node(dst);
++        return NULL;
++    }
++    char *dup_qstring(const QString &s) {
++        QByteArray b = s.toUtf8();
++        char *r = new char[b.size() + 1];
++        if (r)
++            std::memcpy(r, b.data(), b.size() + 1);
++        return r;
++    }
++    bool test_type(const QVariant &v, QMetaType::Type t) {
++        // The Qt docs say: "Although this function is declared as returning
++        // "QVariant::Type(obsolete), the return value should be interpreted
++        // as QMetaType::Type."
++        // So a cast really seems to be needed to avoid warnings (urgh).
++        return static_cast<int>(v.type()) == static_cast<int>(t);
++    }
++    void set(mpv_node *dst, const QVariant &src) {
++        if (test_type(src, QMetaType::QString)) {
++            dst->format = MPV_FORMAT_STRING;
++            dst->u.string = dup_qstring(src.toString());
++            if (!dst->u.string)
++                goto fail;
++        } else if (test_type(src, QMetaType::Bool)) {
++            dst->format = MPV_FORMAT_FLAG;
++            dst->u.flag = src.toBool() ? 1 : 0;
++        } else if (test_type(src, QMetaType::Int) ||
++                   test_type(src, QMetaType::LongLong) ||
++                   test_type(src, QMetaType::UInt) ||
++                   test_type(src, QMetaType::ULongLong))
++        {
++            dst->format = MPV_FORMAT_INT64;
++            dst->u.int64 = src.toLongLong();
++        } else if (test_type(src, QMetaType::Double)) {
++            dst->format = MPV_FORMAT_DOUBLE;
++            dst->u.double_ = src.toDouble();
++        } else if (src.canConvert<QVariantList>()) {
++            QVariantList qlist = src.toList();
++            mpv_node_list *list = create_list(dst, false, qlist.size());
++            if (!list)
++                goto fail;
++            list->num = qlist.size();
++            for (int n = 0; n < qlist.size(); n++)
++                set(&list->values[n], qlist[n]);
++        } else if (src.canConvert<QVariantMap>()) {
++            QVariantMap qmap = src.toMap();
++            mpv_node_list *list = create_list(dst, true, qmap.size());
++            if (!list)
++                goto fail;
++            list->num = qmap.size();
++            for (int n = 0; n < qmap.size(); n++) {
++                list->keys[n] = dup_qstring(qmap.keys()[n]);
++                if (!list->keys[n]) {
++                    free_node(dst);
++                    goto fail;
++                }
++                set(&list->values[n], qmap.values()[n]);
++            }
++        } else {
++            goto fail;
++        }
++        return;
++    fail:
++        dst->format = MPV_FORMAT_NONE;
++    }
++    void free_node(mpv_node *dst) {
++        switch (dst->format) {
++        case MPV_FORMAT_STRING:
++            delete[] dst->u.string;
++            break;
++        case MPV_FORMAT_NODE_ARRAY:
++        case MPV_FORMAT_NODE_MAP: {
++            mpv_node_list *list = dst->u.list;
++            if (list) {
++                for (int n = 0; n < list->num; n++) {
++                    if (list->keys)
++                        delete[] list->keys[n];
++                    if (list->values)
++                        free_node(&list->values[n]);
++                }
++                delete[] list->keys;
++                delete[] list->values;
++            }
++            delete list;
++            break;
++        }
++        default: ;
++        }
++        dst->format = MPV_FORMAT_NONE;
++    }
++};
++
++/**
++ * RAII wrapper that calls mpv_free_node_contents() on the pointer.
++ */
++struct node_autofree {
++    mpv_node *ptr;
++    node_autofree(mpv_node *a_ptr) : ptr(a_ptr) {}
++    ~node_autofree() { mpv_free_node_contents(ptr); }
++};
++
++#if MPV_ENABLE_DEPRECATED
++
++/**
++ * Return the given property as mpv_node converted to QVariant, or QVariant()
++ * on error.
++ *
++ * @deprecated use get_property() instead
++ *
++ * @param name the property name
++ */
++static inline QVariant get_property_variant(mpv_handle *ctx, const QString &name)
++{
++    mpv_node node;
++    if (mpv_get_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, &node) < 0)
++        return QVariant();
++    node_autofree f(&node);
++    return node_to_variant(&node);
++}
++
++/**
++ * Set the given property as mpv_node converted from the QVariant argument.
++
++ * @deprecated use set_property() instead
++ */
++static inline int set_property_variant(mpv_handle *ctx, const QString &name,
++                                       const QVariant &v)
++{
++    node_builder node(v);
++    return mpv_set_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
++}
++
++/**
++ * Set the given option as mpv_node converted from the QVariant argument.
++ *
++ * @deprecated use set_property() instead
++ */
++static inline int set_option_variant(mpv_handle *ctx, const QString &name,
++                                     const QVariant &v)
++{
++    node_builder node(v);
++    return mpv_set_option(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
++}
++
++/**
++ * mpv_command_node() equivalent. Returns QVariant() on error (and
++ * unfortunately, the same on success).
++ *
++ * @deprecated use command() instead
++ */
++static inline QVariant command_variant(mpv_handle *ctx, const QVariant &args)
++{
++    node_builder node(args);
++    mpv_node res;
++    if (mpv_command_node(ctx, node.node(), &res) < 0)
++        return QVariant();
++    node_autofree f(&res);
++    return node_to_variant(&res);
++}
++
++#endif
++
++/**
++ * This is used to return error codes wrapped in QVariant for functions which
++ * return QVariant.
++ *
++ * You can use get_error() or is_error() to extract the error status from a
++ * QVariant value.
++ */
++struct ErrorReturn
++{
++    /**
++     * enum mpv_error value (or a value outside of it if ABI was extended)
++     */
++    int error;
++
++    ErrorReturn() : error(0) {}
++    explicit ErrorReturn(int err) : error(err) {}
++};
++
++/**
++ * Return the mpv error code packed into a QVariant, or 0 (success) if it's not
++ * an error value.
++ *
++ * @return error code (<0) or success (>=0)
++ */
++static inline int get_error(const QVariant &v)
++{
++    if (!v.canConvert<ErrorReturn>())
++        return 0;
++    return v.value<ErrorReturn>().error;
++}
++
++/**
++ * Return whether the QVariant carries a mpv error code.
++ */
++static inline bool is_error(const QVariant &v)
++{
++    return get_error(v) < 0;
++}
++
++/**
++ * Return the given property as mpv_node converted to QVariant, or QVariant()
++ * on error.
++ *
++ * @param nam