Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] kiconthemes: added patch for icon rendering issues
@ 2021-04-02 11:58 tunefish777
  2021-04-02 15:41 ` ericonr
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: tunefish777 @ 2021-04-02 11:58 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tunefish777/void-packages master
https://github.com/void-linux/void-packages/pull/29949

kiconthemes: added patch for icon rendering issues
<!-- Mark items with [x] where applicable -->

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

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

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


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

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

From cbded82703d03060f5ea1120a1bdb3c8ece960f8 Mon Sep 17 00:00:00 2001
From: Moritz Waser <moritz.waser@student.tugraz.at>
Date: Fri, 2 Apr 2021 13:49:23 +0200
Subject: [PATCH] kiconthemes: added patch for icon rendering issues

---
 .../patches/qdir_searchpath_for_icons.patch   | 327 ++++++++++++++++++
 srcpkgs/kiconthemes/template                  |   3 +-
 2 files changed, 329 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch

diff --git a/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch b/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch
new file mode 100644
index 000000000000..cd776b6d8f29
--- /dev/null
+++ b/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch
@@ -0,0 +1,327 @@
+From 49bdb6310194cd899641b7d9cf8463d4fba6baea Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:18:17 +0100
+Subject: [PATCH 1/6] ensure qrc + QDir::searchPaths work for icons
+
+before we had some optimization to check which paths
+are absolute, but that one is wrong, applications
+might rely on set search paths
+
+BUG: 434451
+---
+ src/kiconloader.cpp | 19 ++++---------------
+ 1 file changed, 4 insertions(+), 15 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 011a292..2411af1 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -92,19 +92,6 @@ color:%7;\
+ }
+ }
+ 
+-/**
+- * Checks for relative paths quickly on UNIX-alikes, slowly on everything else.
+- */
+-static bool pathIsRelative(const QString &path)
+-{
+-#ifdef Q_OS_UNIX
+-    // catch both /xxx/yyy and :/xxx/yyy for resources
+-    return (!path.isEmpty() && path[0] != QLatin1Char('/') && path[0] != QLatin1Char(':'));
+-#else
+-    return QDir::isRelativePath(path);
+-#endif
+-}
+-
+ /**
+  * Holds a QPixmap for this process, along with its associated path on disk.
+  */
+@@ -1214,7 +1201,8 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+         return QString();
+     }
+ 
+-    if (_name.isEmpty() || !pathIsRelative(_name)) {
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
++    if (_name.isEmpty() || !QDir::isRelativePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+@@ -1352,7 +1340,8 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+         name = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + name + QStringLiteral(".png");
+     }
+ 
+-    bool absolutePath = !pathIsRelative(name);
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
++    bool absolutePath = !QDir::isRelativePath(name);
+     if (!absolutePath) {
+         name = d->removeIconExtension(name);
+     }
+-- 
+GitLab
+
+
+From 7cf21cdb6e209b62fea4de74c175aaa5b940fccb Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:38:36 +0100
+Subject: [PATCH 2/6] add unit test for QDir::setSearchPaths
+
+---
+ autotests/kiconloader_unittest.cpp | 15 +++++++++++++++
+ autotests/resources.qrc            |  1 +
+ 2 files changed, 16 insertions(+)
+
+diff --git a/autotests/kiconloader_unittest.cpp b/autotests/kiconloader_unittest.cpp
+index 9a1f6d0..813215d 100644
+--- a/autotests/kiconloader_unittest.cpp
++++ b/autotests/kiconloader_unittest.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include <kiconloader.h>
+ 
++#include <QDir>
+ #include <QRegularExpression>
+ #include <QStandardPaths>
+ #include <QTest>
+@@ -495,6 +496,20 @@ private Q_SLOTS:
+         uintToHex(testColorWithAlpha.rgba(), argbHex.data());
+         QCOMPARE(argbHex, QStringLiteral("7b6496c8"));
+     }
++
++    void testQDirSetSearchPaths()
++    {
++        // setup search path for testprefix: => we shall find the iconinspecialsearchpath.svg afterwards, see e.g. bug 434451
++        QDir::setSearchPaths("testprefix", QStringList(":/searchpathdefineddir"));
++        QPixmap pix = KIconLoader::global()->loadIcon(QStringLiteral("testprefix:iconinspecialsearchpath.svg"),
++                                                      KIconLoader::NoGroup,
++                                                      24,
++                                                      KIconLoader::DefaultState,
++                                                      QStringList(),
++                                                      nullptr,
++                                                      true);
++        QVERIFY(!pix.isNull());
++    }
+ };
+ 
+ QTEST_MAIN(KIconLoader_UnitTest)
+diff --git a/autotests/resources.qrc b/autotests/resources.qrc
+index d4000e5..4f4cd0c 100644
+--- a/autotests/resources.qrc
++++ b/autotests/resources.qrc
+@@ -10,5 +10,6 @@
+     <file>nonsquare.svg</file>
+     <file alias="/icons/themeinresource/index.theme">breeze.theme</file>
+     <file alias="/icons/themeinresource/22x22/appsNoContext/someiconintheme.png">test-22x22.png</file>
++    <file alias="/searchpathdefineddir/iconinspecialsearchpath.svg">coloredsvgicon.svg</file>
+ </qresource>
+ </RCC>
+-- 
+GitLab
+
+
+From 5a1690ba99d73e3e60f1a576af6b00ab29d6085f Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:41:04 +0100
+Subject: [PATCH 3/6] use QDir::isAbsolutePath, not !QDir::isRelativePath
+
+---
+ src/kiconloader.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 2411af1..784b06b 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -1201,8 +1201,8 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+         return QString();
+     }
+ 
+-    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
+-    if (_name.isEmpty() || !QDir::isRelativePath(_name)) {
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
++    if (_name.isEmpty() || QDir::isAbsolutePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+@@ -1340,8 +1340,8 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+         name = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + name + QStringLiteral(".png");
+     }
+ 
+-    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
+-    bool absolutePath = !QDir::isRelativePath(name);
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
++    const bool absolutePath = QDir::isAbsolutePath(name);
+     if (!absolutePath) {
+         name = d->removeIconExtension(name);
+     }
+-- 
+GitLab
+
+
+From 0bd39a510b103450dac69795e6ffbc4efc074734 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 17:23:46 +0100
+Subject: [PATCH 4/6] more robust handling of missing global KDE themes
+
+in may cases the loader will handle absolute file names
+
+=> no need for our themes
+
+just remove the two locations where we still just exit
+in all other cases we did already proceed before
+---
+ src/kiconloader.cpp | 25 +++++++++----------------
+ 1 file changed, 9 insertions(+), 16 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 784b06b..6257846 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -225,7 +225,7 @@ public:
+     /**
+      * @internal
+      */
+-    bool initIconThemes();
++    void initIconThemes();
+ 
+     /**
+      * @internal
+@@ -627,11 +627,10 @@ void KIconLoaderPrivate::init(const QString &_appname, const QStringList &extraS
+     }
+ }
+ 
+-bool KIconLoaderPrivate::initIconThemes()
++void KIconLoaderPrivate::initIconThemes()
+ {
+     if (mIconThemeInited) {
+-        // If mpThemeRoot isn't 0 then initing has succeeded
+-        return (mpThemeRoot != nullptr);
++        return;
+     }
+     // qCDebug(KICONTHEMES);
+     mIconThemeInited = true;
+@@ -644,9 +643,9 @@ bool KIconLoaderPrivate::initIconThemes()
+         qCDebug(KICONTHEMES) << "Couldn't find current icon theme, falling back to default.";
+         def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
+         if (!def->isValid()) {
+-            qWarning() << "Error: standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
++            qCDebug(KICONTHEMES) << "Standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
+             delete def;
+-            return false;
++            return;
+         }
+     }
+     mpThemeRoot = new KIconThemeNode(def);
+@@ -661,8 +660,6 @@ bool KIconLoaderPrivate::initIconThemes()
+     searchPaths.append(QStringLiteral("icons")); // was xdgdata-icon in KStandardDirs
+     // These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
+     searchPaths.append(QStringLiteral("pixmaps")); // was xdgdata-pixmaps in KStandardDirs
+-
+-    return true;
+ }
+ 
+ KIconLoader::~KIconLoader() = default;
+@@ -932,7 +929,7 @@ QImage KIconLoaderPrivate::createIconImage(const QString &path, const QSize &siz
+     QImageReader reader;
+     QBuffer buffer;
+ 
+-    if (q->theme()->followsColorScheme() && (path.endsWith(QLatin1String("svg")) || path.endsWith(QLatin1String("svgz")))) {
++    if (q->theme() && q->theme()->followsColorScheme() && (path.endsWith(QLatin1String("svg")) || path.endsWith(QLatin1String("svgz")))) {
+         buffer.setData(processSvg(path, state));
+         reader.setDevice(&buffer);
+     } else {
+@@ -1197,16 +1194,14 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+ 
+ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canReturnNull, qreal scale) const
+ {
+-    if (!d->initIconThemes()) {
+-        return QString();
+-    }
+-
+     // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
+     if (_name.isEmpty() || QDir::isAbsolutePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+ 
++    d->initIconThemes();
++
+     QString name = d->removeIconExtension(_name);
+ 
+     QString path;
+@@ -1381,9 +1376,7 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+     }
+ 
+     // Image is not cached... go find it and apply effects.
+-    if (!d->initIconThemes()) {
+-        return QPixmap();
+-    }
++    d->initIconThemes();
+ 
+     favIconOverlay = favIconOverlay && std::min(size.height(), size.width()) > 22;
+ 
+-- 
+GitLab
+
+
+From dd6fad78caaa0d1791bcc4a6675940cf4daf9f86 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 20:59:47 +0100
+Subject: [PATCH 5/6] assert hicolor default is always found
+
+we bundle a default .theme file inside the library
+resources
+
+this can't fail as fallback
+
+instead of allowing some "bad" state, just assert
+this
+---
+ src/kiconloader.cpp | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 6257846..3a6bf2b 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -641,12 +641,10 @@ void KIconLoaderPrivate::initIconThemes()
+         delete def;
+         // warn, as this is actually a small penalty hit
+         qCDebug(KICONTHEMES) << "Couldn't find current icon theme, falling back to default.";
++
++        // this can't fail, as defaultThemeName() == hicolor is in a resource of this library itself as last fallback!
+         def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
+-        if (!def->isValid()) {
+-            qCDebug(KICONTHEMES) << "Standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
+-            delete def;
+-            return;
+-        }
++        Q_ASSERT(def->isValid());
+     }
+     mpThemeRoot = new KIconThemeNode(def);
+     mThemesInTree.append(def->internalName());
+-- 
+GitLab
+
+
+From 3262669e3abfa7171463e3bf34f7c60eacf6bc77 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Fri, 19 Mar 2021 19:56:07 +0100
+Subject: [PATCH 6/6] don't register our engine per default
+
+---
+ src/kiconengineplugin.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kiconengineplugin.json b/src/kiconengineplugin.json
+index a5b4228..bc09e41 100644
+--- a/src/kiconengineplugin.json
++++ b/src/kiconengineplugin.json
+@@ -1,4 +1,4 @@
+ {
+-    "Keys": [ "KIconEngine", "svg", "svgz", "svg.gz" ]
++    "Keys": [ "KIconEngine" ]
+ }
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index ddc40a6ba1eb..30c808a58402 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,7 +1,7 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
 version=5.80.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -13,6 +13,7 @@ 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=92f2dc363fb8e6b7acdf1d7013d5b06f1f825466d8db00f79cd73cfc3ed9768c
+patch_args="-Np1"
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

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

* Re: kiconthemes: added patch for icon rendering issues
  2021-04-02 11:58 [PR PATCH] kiconthemes: added patch for icon rendering issues tunefish777
@ 2021-04-02 15:41 ` ericonr
  2021-04-02 22:35 ` Johnnynator
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-04-02 15:41 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29949#issuecomment-812583717

Comment:
There's likely to be a release in a week, but I'm not opposed to pulling this in. @Johnnynator ?

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

* Re: kiconthemes: added patch for icon rendering issues
  2021-04-02 11:58 [PR PATCH] kiconthemes: added patch for icon rendering issues tunefish777
  2021-04-02 15:41 ` ericonr
@ 2021-04-02 22:35 ` Johnnynator
  2021-04-06 11:26 ` [PR PATCH] [Updated] " tunefish777
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Johnnynator @ 2021-04-02 22:35 UTC (permalink / raw)
  To: ml

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/29949#issuecomment-812742037

Comment:
I'm opposed to pulling this in, in this state, parts of that patch did get reverted upsteam.
At least do not include `[PATCH 5/6] assert hicolor default is always found`

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

* Re: [PR PATCH] [Updated] kiconthemes: added patch for icon rendering issues
  2021-04-02 11:58 [PR PATCH] kiconthemes: added patch for icon rendering issues tunefish777
  2021-04-02 15:41 ` ericonr
  2021-04-02 22:35 ` Johnnynator
@ 2021-04-06 11:26 ` tunefish777
  2021-04-06 11:35 ` tunefish777
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: tunefish777 @ 2021-04-06 11:26 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tunefish777/void-packages master
https://github.com/void-linux/void-packages/pull/29949

kiconthemes: added patch for icon rendering issues
<!-- Mark items with [x] where applicable -->

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

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

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


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

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

From cbded82703d03060f5ea1120a1bdb3c8ece960f8 Mon Sep 17 00:00:00 2001
From: Moritz Waser <moritz.waser@student.tugraz.at>
Date: Fri, 2 Apr 2021 13:49:23 +0200
Subject: [PATCH 001/285] kiconthemes: added patch for icon rendering issues

---
 .../patches/qdir_searchpath_for_icons.patch   | 327 ++++++++++++++++++
 srcpkgs/kiconthemes/template                  |   3 +-
 2 files changed, 329 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch

diff --git a/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch b/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch
new file mode 100644
index 000000000000..cd776b6d8f29
--- /dev/null
+++ b/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch
@@ -0,0 +1,327 @@
+From 49bdb6310194cd899641b7d9cf8463d4fba6baea Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:18:17 +0100
+Subject: [PATCH 1/6] ensure qrc + QDir::searchPaths work for icons
+
+before we had some optimization to check which paths
+are absolute, but that one is wrong, applications
+might rely on set search paths
+
+BUG: 434451
+---
+ src/kiconloader.cpp | 19 ++++---------------
+ 1 file changed, 4 insertions(+), 15 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 011a292..2411af1 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -92,19 +92,6 @@ color:%7;\
+ }
+ }
+ 
+-/**
+- * Checks for relative paths quickly on UNIX-alikes, slowly on everything else.
+- */
+-static bool pathIsRelative(const QString &path)
+-{
+-#ifdef Q_OS_UNIX
+-    // catch both /xxx/yyy and :/xxx/yyy for resources
+-    return (!path.isEmpty() && path[0] != QLatin1Char('/') && path[0] != QLatin1Char(':'));
+-#else
+-    return QDir::isRelativePath(path);
+-#endif
+-}
+-
+ /**
+  * Holds a QPixmap for this process, along with its associated path on disk.
+  */
+@@ -1214,7 +1201,8 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+         return QString();
+     }
+ 
+-    if (_name.isEmpty() || !pathIsRelative(_name)) {
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
++    if (_name.isEmpty() || !QDir::isRelativePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+@@ -1352,7 +1340,8 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+         name = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + name + QStringLiteral(".png");
+     }
+ 
+-    bool absolutePath = !pathIsRelative(name);
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
++    bool absolutePath = !QDir::isRelativePath(name);
+     if (!absolutePath) {
+         name = d->removeIconExtension(name);
+     }
+-- 
+GitLab
+
+
+From 7cf21cdb6e209b62fea4de74c175aaa5b940fccb Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:38:36 +0100
+Subject: [PATCH 2/6] add unit test for QDir::setSearchPaths
+
+---
+ autotests/kiconloader_unittest.cpp | 15 +++++++++++++++
+ autotests/resources.qrc            |  1 +
+ 2 files changed, 16 insertions(+)
+
+diff --git a/autotests/kiconloader_unittest.cpp b/autotests/kiconloader_unittest.cpp
+index 9a1f6d0..813215d 100644
+--- a/autotests/kiconloader_unittest.cpp
++++ b/autotests/kiconloader_unittest.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include <kiconloader.h>
+ 
++#include <QDir>
+ #include <QRegularExpression>
+ #include <QStandardPaths>
+ #include <QTest>
+@@ -495,6 +496,20 @@ private Q_SLOTS:
+         uintToHex(testColorWithAlpha.rgba(), argbHex.data());
+         QCOMPARE(argbHex, QStringLiteral("7b6496c8"));
+     }
++
++    void testQDirSetSearchPaths()
++    {
++        // setup search path for testprefix: => we shall find the iconinspecialsearchpath.svg afterwards, see e.g. bug 434451
++        QDir::setSearchPaths("testprefix", QStringList(":/searchpathdefineddir"));
++        QPixmap pix = KIconLoader::global()->loadIcon(QStringLiteral("testprefix:iconinspecialsearchpath.svg"),
++                                                      KIconLoader::NoGroup,
++                                                      24,
++                                                      KIconLoader::DefaultState,
++                                                      QStringList(),
++                                                      nullptr,
++                                                      true);
++        QVERIFY(!pix.isNull());
++    }
+ };
+ 
+ QTEST_MAIN(KIconLoader_UnitTest)
+diff --git a/autotests/resources.qrc b/autotests/resources.qrc
+index d4000e5..4f4cd0c 100644
+--- a/autotests/resources.qrc
++++ b/autotests/resources.qrc
+@@ -10,5 +10,6 @@
+     <file>nonsquare.svg</file>
+     <file alias="/icons/themeinresource/index.theme">breeze.theme</file>
+     <file alias="/icons/themeinresource/22x22/appsNoContext/someiconintheme.png">test-22x22.png</file>
++    <file alias="/searchpathdefineddir/iconinspecialsearchpath.svg">coloredsvgicon.svg</file>
+ </qresource>
+ </RCC>
+-- 
+GitLab
+
+
+From 5a1690ba99d73e3e60f1a576af6b00ab29d6085f Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:41:04 +0100
+Subject: [PATCH 3/6] use QDir::isAbsolutePath, not !QDir::isRelativePath
+
+---
+ src/kiconloader.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 2411af1..784b06b 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -1201,8 +1201,8 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+         return QString();
+     }
+ 
+-    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
+-    if (_name.isEmpty() || !QDir::isRelativePath(_name)) {
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
++    if (_name.isEmpty() || QDir::isAbsolutePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+@@ -1340,8 +1340,8 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+         name = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + name + QStringLiteral(".png");
+     }
+ 
+-    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
+-    bool absolutePath = !QDir::isRelativePath(name);
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
++    const bool absolutePath = QDir::isAbsolutePath(name);
+     if (!absolutePath) {
+         name = d->removeIconExtension(name);
+     }
+-- 
+GitLab
+
+
+From 0bd39a510b103450dac69795e6ffbc4efc074734 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 17:23:46 +0100
+Subject: [PATCH 4/6] more robust handling of missing global KDE themes
+
+in may cases the loader will handle absolute file names
+
+=> no need for our themes
+
+just remove the two locations where we still just exit
+in all other cases we did already proceed before
+---
+ src/kiconloader.cpp | 25 +++++++++----------------
+ 1 file changed, 9 insertions(+), 16 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 784b06b..6257846 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -225,7 +225,7 @@ public:
+     /**
+      * @internal
+      */
+-    bool initIconThemes();
++    void initIconThemes();
+ 
+     /**
+      * @internal
+@@ -627,11 +627,10 @@ void KIconLoaderPrivate::init(const QString &_appname, const QStringList &extraS
+     }
+ }
+ 
+-bool KIconLoaderPrivate::initIconThemes()
++void KIconLoaderPrivate::initIconThemes()
+ {
+     if (mIconThemeInited) {
+-        // If mpThemeRoot isn't 0 then initing has succeeded
+-        return (mpThemeRoot != nullptr);
++        return;
+     }
+     // qCDebug(KICONTHEMES);
+     mIconThemeInited = true;
+@@ -644,9 +643,9 @@ bool KIconLoaderPrivate::initIconThemes()
+         qCDebug(KICONTHEMES) << "Couldn't find current icon theme, falling back to default.";
+         def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
+         if (!def->isValid()) {
+-            qWarning() << "Error: standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
++            qCDebug(KICONTHEMES) << "Standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
+             delete def;
+-            return false;
++            return;
+         }
+     }
+     mpThemeRoot = new KIconThemeNode(def);
+@@ -661,8 +660,6 @@ bool KIconLoaderPrivate::initIconThemes()
+     searchPaths.append(QStringLiteral("icons")); // was xdgdata-icon in KStandardDirs
+     // These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
+     searchPaths.append(QStringLiteral("pixmaps")); // was xdgdata-pixmaps in KStandardDirs
+-
+-    return true;
+ }
+ 
+ KIconLoader::~KIconLoader() = default;
+@@ -932,7 +929,7 @@ QImage KIconLoaderPrivate::createIconImage(const QString &path, const QSize &siz
+     QImageReader reader;
+     QBuffer buffer;
+ 
+-    if (q->theme()->followsColorScheme() && (path.endsWith(QLatin1String("svg")) || path.endsWith(QLatin1String("svgz")))) {
++    if (q->theme() && q->theme()->followsColorScheme() && (path.endsWith(QLatin1String("svg")) || path.endsWith(QLatin1String("svgz")))) {
+         buffer.setData(processSvg(path, state));
+         reader.setDevice(&buffer);
+     } else {
+@@ -1197,16 +1194,14 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+ 
+ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canReturnNull, qreal scale) const
+ {
+-    if (!d->initIconThemes()) {
+-        return QString();
+-    }
+-
+     // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
+     if (_name.isEmpty() || QDir::isAbsolutePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+ 
++    d->initIconThemes();
++
+     QString name = d->removeIconExtension(_name);
+ 
+     QString path;
+@@ -1381,9 +1376,7 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+     }
+ 
+     // Image is not cached... go find it and apply effects.
+-    if (!d->initIconThemes()) {
+-        return QPixmap();
+-    }
++    d->initIconThemes();
+ 
+     favIconOverlay = favIconOverlay && std::min(size.height(), size.width()) > 22;
+ 
+-- 
+GitLab
+
+
+From dd6fad78caaa0d1791bcc4a6675940cf4daf9f86 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 20:59:47 +0100
+Subject: [PATCH 5/6] assert hicolor default is always found
+
+we bundle a default .theme file inside the library
+resources
+
+this can't fail as fallback
+
+instead of allowing some "bad" state, just assert
+this
+---
+ src/kiconloader.cpp | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 6257846..3a6bf2b 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -641,12 +641,10 @@ void KIconLoaderPrivate::initIconThemes()
+         delete def;
+         // warn, as this is actually a small penalty hit
+         qCDebug(KICONTHEMES) << "Couldn't find current icon theme, falling back to default.";
++
++        // this can't fail, as defaultThemeName() == hicolor is in a resource of this library itself as last fallback!
+         def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
+-        if (!def->isValid()) {
+-            qCDebug(KICONTHEMES) << "Standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
+-            delete def;
+-            return;
+-        }
++        Q_ASSERT(def->isValid());
+     }
+     mpThemeRoot = new KIconThemeNode(def);
+     mThemesInTree.append(def->internalName());
+-- 
+GitLab
+
+
+From 3262669e3abfa7171463e3bf34f7c60eacf6bc77 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Fri, 19 Mar 2021 19:56:07 +0100
+Subject: [PATCH 6/6] don't register our engine per default
+
+---
+ src/kiconengineplugin.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kiconengineplugin.json b/src/kiconengineplugin.json
+index a5b4228..bc09e41 100644
+--- a/src/kiconengineplugin.json
++++ b/src/kiconengineplugin.json
+@@ -1,4 +1,4 @@
+ {
+-    "Keys": [ "KIconEngine", "svg", "svgz", "svg.gz" ]
++    "Keys": [ "KIconEngine" ]
+ }
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index ddc40a6ba1eb..30c808a58402 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,7 +1,7 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
 version=5.80.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -13,6 +13,7 @@ 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=92f2dc363fb8e6b7acdf1d7013d5b06f1f825466d8db00f79cd73cfc3ed9768c
+patch_args="-Np1"
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 157d52f982e61189b2682444bef16cad295bb952 Mon Sep 17 00:00:00 2001
From: Moritz Waser <moritz.waser@student.tugraz.at>
Date: Fri, 2 Apr 2021 13:49:23 +0200
Subject: [PATCH 002/285] kiconthemes: added patch for icon rendering issues

---
 .../patches/qdir_searchpath_for_icons.patch   | 287 ++++++++++++++++++
 srcpkgs/kiconthemes/template                  |   3 +-
 2 files changed, 289 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch

diff --git a/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch b/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch
new file mode 100644
index 000000000000..6892faadb6e2
--- /dev/null
+++ b/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch
@@ -0,0 +1,287 @@
+From 49bdb6310194cd899641b7d9cf8463d4fba6baea Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:18:17 +0100
+Subject: [PATCH 1/6] ensure qrc + QDir::searchPaths work for icons
+
+before we had some optimization to check which paths
+are absolute, but that one is wrong, applications
+might rely on set search paths
+
+BUG: 434451
+---
+ src/kiconloader.cpp | 19 ++++---------------
+ 1 file changed, 4 insertions(+), 15 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 011a292..2411af1 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -92,19 +92,6 @@ color:%7;\
+ }
+ }
+ 
+-/**
+- * Checks for relative paths quickly on UNIX-alikes, slowly on everything else.
+- */
+-static bool pathIsRelative(const QString &path)
+-{
+-#ifdef Q_OS_UNIX
+-    // catch both /xxx/yyy and :/xxx/yyy for resources
+-    return (!path.isEmpty() && path[0] != QLatin1Char('/') && path[0] != QLatin1Char(':'));
+-#else
+-    return QDir::isRelativePath(path);
+-#endif
+-}
+-
+ /**
+  * Holds a QPixmap for this process, along with its associated path on disk.
+  */
+@@ -1214,7 +1201,8 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+         return QString();
+     }
+ 
+-    if (_name.isEmpty() || !pathIsRelative(_name)) {
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
++    if (_name.isEmpty() || !QDir::isRelativePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+@@ -1352,7 +1340,8 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+         name = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + name + QStringLiteral(".png");
+     }
+ 
+-    bool absolutePath = !pathIsRelative(name);
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
++    bool absolutePath = !QDir::isRelativePath(name);
+     if (!absolutePath) {
+         name = d->removeIconExtension(name);
+     }
+-- 
+GitLab
+
+
+From 7cf21cdb6e209b62fea4de74c175aaa5b940fccb Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:38:36 +0100
+Subject: [PATCH 2/6] add unit test for QDir::setSearchPaths
+
+---
+ autotests/kiconloader_unittest.cpp | 15 +++++++++++++++
+ autotests/resources.qrc            |  1 +
+ 2 files changed, 16 insertions(+)
+
+diff --git a/autotests/kiconloader_unittest.cpp b/autotests/kiconloader_unittest.cpp
+index 9a1f6d0..813215d 100644
+--- a/autotests/kiconloader_unittest.cpp
++++ b/autotests/kiconloader_unittest.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include <kiconloader.h>
+ 
++#include <QDir>
+ #include <QRegularExpression>
+ #include <QStandardPaths>
+ #include <QTest>
+@@ -495,6 +496,20 @@ private Q_SLOTS:
+         uintToHex(testColorWithAlpha.rgba(), argbHex.data());
+         QCOMPARE(argbHex, QStringLiteral("7b6496c8"));
+     }
++
++    void testQDirSetSearchPaths()
++    {
++        // setup search path for testprefix: => we shall find the iconinspecialsearchpath.svg afterwards, see e.g. bug 434451
++        QDir::setSearchPaths("testprefix", QStringList(":/searchpathdefineddir"));
++        QPixmap pix = KIconLoader::global()->loadIcon(QStringLiteral("testprefix:iconinspecialsearchpath.svg"),
++                                                      KIconLoader::NoGroup,
++                                                      24,
++                                                      KIconLoader::DefaultState,
++                                                      QStringList(),
++                                                      nullptr,
++                                                      true);
++        QVERIFY(!pix.isNull());
++    }
+ };
+ 
+ QTEST_MAIN(KIconLoader_UnitTest)
+diff --git a/autotests/resources.qrc b/autotests/resources.qrc
+index d4000e5..4f4cd0c 100644
+--- a/autotests/resources.qrc
++++ b/autotests/resources.qrc
+@@ -10,5 +10,6 @@
+     <file>nonsquare.svg</file>
+     <file alias="/icons/themeinresource/index.theme">breeze.theme</file>
+     <file alias="/icons/themeinresource/22x22/appsNoContext/someiconintheme.png">test-22x22.png</file>
++    <file alias="/searchpathdefineddir/iconinspecialsearchpath.svg">coloredsvgicon.svg</file>
+ </qresource>
+ </RCC>
+-- 
+GitLab
+
+
+From 5a1690ba99d73e3e60f1a576af6b00ab29d6085f Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:41:04 +0100
+Subject: [PATCH 3/6] use QDir::isAbsolutePath, not !QDir::isRelativePath
+
+---
+ src/kiconloader.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 2411af1..784b06b 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -1201,8 +1201,8 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+         return QString();
+     }
+ 
+-    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
+-    if (_name.isEmpty() || !QDir::isRelativePath(_name)) {
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
++    if (_name.isEmpty() || QDir::isAbsolutePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+@@ -1340,8 +1340,8 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+         name = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + name + QStringLiteral(".png");
+     }
+ 
+-    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
+-    bool absolutePath = !QDir::isRelativePath(name);
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
++    const bool absolutePath = QDir::isAbsolutePath(name);
+     if (!absolutePath) {
+         name = d->removeIconExtension(name);
+     }
+-- 
+GitLab
+
+
+From 0bd39a510b103450dac69795e6ffbc4efc074734 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 17:23:46 +0100
+Subject: [PATCH 4/6] more robust handling of missing global KDE themes
+
+in may cases the loader will handle absolute file names
+
+=> no need for our themes
+
+just remove the two locations where we still just exit
+in all other cases we did already proceed before
+---
+ src/kiconloader.cpp | 25 +++++++++----------------
+ 1 file changed, 9 insertions(+), 16 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 784b06b..6257846 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -225,7 +225,7 @@ public:
+     /**
+      * @internal
+      */
+-    bool initIconThemes();
++    void initIconThemes();
+ 
+     /**
+      * @internal
+@@ -627,11 +627,10 @@ void KIconLoaderPrivate::init(const QString &_appname, const QStringList &extraS
+     }
+ }
+ 
+-bool KIconLoaderPrivate::initIconThemes()
++void KIconLoaderPrivate::initIconThemes()
+ {
+     if (mIconThemeInited) {
+-        // If mpThemeRoot isn't 0 then initing has succeeded
+-        return (mpThemeRoot != nullptr);
++        return;
+     }
+     // qCDebug(KICONTHEMES);
+     mIconThemeInited = true;
+@@ -644,9 +643,9 @@ bool KIconLoaderPrivate::initIconThemes()
+         qCDebug(KICONTHEMES) << "Couldn't find current icon theme, falling back to default.";
+         def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
+         if (!def->isValid()) {
+-            qWarning() << "Error: standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
++            qCDebug(KICONTHEMES) << "Standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
+             delete def;
+-            return false;
++            return;
+         }
+     }
+     mpThemeRoot = new KIconThemeNode(def);
+@@ -661,8 +660,6 @@ bool KIconLoaderPrivate::initIconThemes()
+     searchPaths.append(QStringLiteral("icons")); // was xdgdata-icon in KStandardDirs
+     // These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
+     searchPaths.append(QStringLiteral("pixmaps")); // was xdgdata-pixmaps in KStandardDirs
+-
+-    return true;
+ }
+ 
+ KIconLoader::~KIconLoader() = default;
+@@ -932,7 +929,7 @@ QImage KIconLoaderPrivate::createIconImage(const QString &path, const QSize &siz
+     QImageReader reader;
+     QBuffer buffer;
+ 
+-    if (q->theme()->followsColorScheme() && (path.endsWith(QLatin1String("svg")) || path.endsWith(QLatin1String("svgz")))) {
++    if (q->theme() && q->theme()->followsColorScheme() && (path.endsWith(QLatin1String("svg")) || path.endsWith(QLatin1String("svgz")))) {
+         buffer.setData(processSvg(path, state));
+         reader.setDevice(&buffer);
+     } else {
+@@ -1197,16 +1194,14 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+ 
+ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canReturnNull, qreal scale) const
+ {
+-    if (!d->initIconThemes()) {
+-        return QString();
+-    }
+-
+     // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
+     if (_name.isEmpty() || QDir::isAbsolutePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+ 
++    d->initIconThemes();
++
+     QString name = d->removeIconExtension(_name);
+ 
+     QString path;
+@@ -1381,9 +1376,7 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+     }
+ 
+     // Image is not cached... go find it and apply effects.
+-    if (!d->initIconThemes()) {
+-        return QPixmap();
+-    }
++    d->initIconThemes();
+ 
+     favIconOverlay = favIconOverlay && std::min(size.height(), size.width()) > 22;
+ 
+-- 
+GitLab
+
+
+From 3262669e3abfa7171463e3bf34f7c60eacf6bc77 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Fri, 19 Mar 2021 19:56:07 +0100
+Subject: [PATCH 6/6] don't register our engine per default
+
+---
+ src/kiconengineplugin.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kiconengineplugin.json b/src/kiconengineplugin.json
+index a5b4228..bc09e41 100644
+--- a/src/kiconengineplugin.json
++++ b/src/kiconengineplugin.json
+@@ -1,4 +1,4 @@
+ {
+-    "Keys": [ "KIconEngine", "svg", "svgz", "svg.gz" ]
++    "Keys": [ "KIconEngine" ]
+ }
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index ddc40a6ba1eb..30c808a58402 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,7 +1,7 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
 version=5.80.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -13,6 +13,7 @@ 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=92f2dc363fb8e6b7acdf1d7013d5b06f1f825466d8db00f79cd73cfc3ed9768c
+patch_args="-Np1"
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 7764b59e34ce279e25eb8c3f7512ff88321a88ff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 14:58:45 +0200
Subject: [PATCH 003/285] New package: texlive2021-bin-2021

---
 srcpkgs/texlive2021-bin/INSTALL            | 15 ++++++++
 srcpkgs/texlive2021-bin/INSTALL.msg        | 25 ++++++++++++
 srcpkgs/texlive2021-bin/REMOVE             |  8 ++++
 srcpkgs/texlive2021-bin/files/void.profile |  8 ++++
 srcpkgs/texlive2021-bin/template           | 45 ++++++++++++++++++++++
 5 files changed, 101 insertions(+)
 create mode 100644 srcpkgs/texlive2021-bin/INSTALL
 create mode 100644 srcpkgs/texlive2021-bin/INSTALL.msg
 create mode 100644 srcpkgs/texlive2021-bin/REMOVE
 create mode 100644 srcpkgs/texlive2021-bin/files/void.profile
 create mode 100644 srcpkgs/texlive2021-bin/template

diff --git a/srcpkgs/texlive2021-bin/INSTALL b/srcpkgs/texlive2021-bin/INSTALL
new file mode 100644
index 000000000000..9a5b1df97deb
--- /dev/null
+++ b/srcpkgs/texlive2021-bin/INSTALL
@@ -0,0 +1,15 @@
+case "${ACTION}" in
+post)
+	case "${UPDATE}" in
+	no)
+		cd opt/texlive2021-installer
+		case "${ARCH}" in
+			x86_64-musl)
+			./install-tl -profile void.profile -force-platform x86_64-linuxmusl
+			;;
+			*)
+			./install-tl -profile void.profile
+			;;
+		esac
+	esac
+esac
diff --git a/srcpkgs/texlive2021-bin/INSTALL.msg b/srcpkgs/texlive2021-bin/INSTALL.msg
new file mode 100644
index 000000000000..0d3107929a64
--- /dev/null
+++ b/srcpkgs/texlive2021-bin/INSTALL.msg
@@ -0,0 +1,25 @@
+- TeXLive is free software see the files:
+
+  /usr/share/licenses/texlive2021-bin/LICENSE.TL
+  /usr/share/licenses/texlive2021-bin/LICENSE.CTAN
+
+=====================================================================
+
+  To update you TeXLive installation use only the program 
+
+  /opt/texlive/2021/bin/<arch>/tlmgr
+
+  where <arch> is:
+    - x86_64-linux  ==> x86_64 architecture
+    - i386-linux    ==> i386 architecture
+
+  see:
+
+  http://www.tug.org/texlive/doc/tlmgr.html#EXAMPLES
+  
+  for the details and the documentation in 
+    		 		 
+  WARNING: To avoid messing up your TeXLive installation, DON'T use
+  the installation scripts in /opt/texlive-installer.
+
+  For a full installation, run "tlmgr install scheme-full".
diff --git a/srcpkgs/texlive2021-bin/REMOVE b/srcpkgs/texlive2021-bin/REMOVE
new file mode 100644
index 000000000000..ab00192b5165
--- /dev/null
+++ b/srcpkgs/texlive2021-bin/REMOVE
@@ -0,0 +1,8 @@
+# This script will clear the TeXLive directory  
+#
+case "${ACTION}" in
+post)
+	rm -rf opt/texlive/2021
+	rm -r opt/texlive2021-installer
+	;;
+esac
diff --git a/srcpkgs/texlive2021-bin/files/void.profile b/srcpkgs/texlive2021-bin/files/void.profile
new file mode 100644
index 000000000000..53bc9a044664
--- /dev/null
+++ b/srcpkgs/texlive2021-bin/files/void.profile
@@ -0,0 +1,8 @@
+# texlive.profile written for voidlinux
+TEXDIR ../texlive/2021
+TEXMFCONFIG ~/.texlive2021/texmf-config
+TEXMFHOME ~/texmf
+TEXMFLOCAL ../texlive/texmf-local
+TEXMFSYSCONFIG ../texlive/2021/texmf-config
+TEXMFSYSVAR ../texlive/2021/texmf-var
+TEXMFVAR ~/.texlive2021/texmf-var
diff --git a/srcpkgs/texlive2021-bin/template b/srcpkgs/texlive2021-bin/template
new file mode 100644
index 000000000000..5c9e334c788e
--- /dev/null
+++ b/srcpkgs/texlive2021-bin/template
@@ -0,0 +1,45 @@
+# Template file for 'texlive2021-bin'
+pkgname=texlive2021-bin
+version=2021
+revision=1
+archs="x86_64* i686 aarch64 arm*"
+create_wrksrc=yes
+depends="cairo pixman graphite gd poppler libsigsegv
+ zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
+ ghostscript xz"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
+homepage="http://tug.org/texlive/"
+distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
+checksum=74eac0855e1e40c8db4f28b24ef354bd7263c1f76031bdc02b52156b572b7a1d
+
+# Package build options
+build_options="basic small medium full"
+build_options_default="small"
+desc_option_basic="Install TeXLive using scheme-basic"
+desc_option_small="Install TeXLive using scheme-small"
+desc_option_medium="Install TeXLive using scheme-medium"
+desc_option_full="Install TeXLive using scheme-full"
+
+pre_install() {
+	rm -rf ${wrksrc}/install-tl*/tlpkg/installer/xz \
+		${wrksrc}/install-tl*/tlpkg/installer/wget
+}
+
+do_install() {
+	vmkdir opt/texlive${version}-installer
+	vcopy "install-tl-*/*" /opt/texlive${version}-installer
+	vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer
+	if [ "$build_option_basic" ]; then
+		echo "selected_scheme scheme-basic"
+	elif [ "$build_option_small" ]; then
+		echo "selected_scheme scheme-small"
+	elif [ "$build_option_medium" = "medium" ];then
+		echo "selected_scheme scheme-medium"
+	elif [ "$build_option_full" ];then
+		echo "selected_scheme scheme-full"
+	fi >>${DESTDIR}/opt/texlive${version}-installer/void.profile
+	vlicense ${DESTDIR}/opt/texlive${version}-installer/LICENSE.CTAN
+	vlicense ${DESTDIR}/opt/texlive${version}-installer/LICENSE.TL
+}

From 2df411fa9702dc9460e82bff781bc3f1a95795d6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 15:05:02 +0200
Subject: [PATCH 004/285] xscreensaver: update to 6.00.

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

diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template
index 518b33e5637f..12c037251f44 100644
--- a/srcpkgs/xscreensaver/template
+++ b/srcpkgs/xscreensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'xscreensaver'
 pkgname=xscreensaver
-version=5.45
+version=6.00
 revision=1
 build_style=gnu-configure
 configure_args="--with-pam --with-login-manager
@@ -9,7 +9,7 @@ configure_args="--with-pam --with-login-manager
  --libdir=${XBPS_CROSS_BASE}/lib"
 conf_files="/etc/pam.d/xscreensaver"
 hostmakedepends="bc intltool pkg-config"
-makedepends="glu-devel libXinerama-devel libXmu-devel libXpm-devel
+makedepends="glu-devel libXi-devel libXinerama-devel libXmu-devel libXpm-devel
  libXrandr-devel libglade-devel pam-devel"
 short_desc="Screen saver and locker for the X Window System"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -17,7 +17,7 @@ license="MIT"
 homepage="https://www.jwz.org/xscreensaver/"
 changelog="https://www.jwz.org/xscreensaver/changelog.html"
 distfiles="https://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz"
-checksum=7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d
+checksum=585088974721b828ebd71fd3ebb019d1bf312133c956eac9672d61f6b49d7706
 
 do_install() {
 	vmkdir etc/pam.d

From 70ea0ced384e6fdf8e947c3cda54c11e582b7b7d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 15:07:29 +0200
Subject: [PATCH 005/285] perltidy: update to 20210402.

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

diff --git a/srcpkgs/perltidy/template b/srcpkgs/perltidy/template
index 0b7008fab4a2..1509b974310a 100644
--- a/srcpkgs/perltidy/template
+++ b/srcpkgs/perltidy/template
@@ -1,6 +1,6 @@
 # Template file for 'perltidy'
 pkgname=perltidy
-version=20210111
+version=20210402
 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=207666ceaf5d4eaf7a608c8f4a77f212cae811bb88ce159c33e2d8a0b5da189f
+checksum=b6e9c75d4c8e6047fb5c2e9c60f3ea1cc5783ffde389ef90832d1965b345e663

From 759526afcb7595c2c147253f95bf19eb19f3fd22 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 15:08:59 +0200
Subject: [PATCH 006/285] sc-im: update to 0.8.1.

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

diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index f9bc91e23409..ec635fdb5cfe 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,6 +1,6 @@
 # Template file for 'sc-im'
 pkgname=sc-im
-version=0.8.0
+version=0.8.1
 revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-4-Clause"
 homepage="https://github.com/andmarti1424/sc-im/"
 distfiles="https://github.com/andmarti1424/${pkgname}/archive/v${version}.tar.gz"
-checksum=edc9b9d2dc5ac37c31a46462a1387605983149a1abba00d47ac22f2726ce6d27
+checksum=73958f2adf2548be138f90a1fa2cb3a9c316a6d8d78234ebb1dc408cbf83bac7
 
 post_extract() {
 	vsed -i -e 's/lua51/lua5.1/g' \

From 0307862689dbb553a17bf1b31b73491c4ed25268 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 15:28:51 +0200
Subject: [PATCH 007/285] coq: update to 8.13.2.

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

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index 2f8f04c5e5ec..ae46d8285868 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,6 +1,6 @@
 # Template file for 'coq'
 pkgname=coq
-version=8.13.1
+version=8.13.2
 revision=1
 hostmakedepends="camlp5 ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
@@ -8,7 +8,7 @@ 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=95e71b16e6f3592e53d8bb679f051b062afbd12069a4105ffc9ee50e421d4685
+checksum=1e7793d8483f1e939f62df6749f843df967a15d843a4a5acb024904b76e25a14
 nopie=yes
 nocross=yes
 

From 916dcb91cb10f8ee5ac1d07dc85d7812e0da649f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Apr 2021 15:29:00 +0200
Subject: [PATCH 008/285] mathcomp: rebuild for coq-8.13.2_1.

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

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index c8d20840bc18..17976c9e1ed2 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.12.0
-revision=3
+revision=4
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From 23e4f5a0f1a82dc00ccc0dfee43c68821ec28d9b Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Fri, 2 Apr 2021 21:54:52 +0700
Subject: [PATCH 009/285] vivaldi: update to 3.7.2218.52

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 81a02717c184..3ea0ec4e7192 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=3.7.2218.45
+version=3.7.2218.52
 revision=1
 _release=1
 archs="i686 x86_64"
@@ -18,10 +18,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=e4d6f791dbb823bf4c3680049328a6bf9d3c2959a5d8c7d8df7cd90038e40387
+	checksum=f131f182bc6dd6e735a83ffaa4ff2a3cca90184daa26e0996d1cb64ed765ab2a
 else
 	_debarch=i386
-	checksum=a30ccbe82261db9651457b01142bf0544db148cdbca7e515e8a03a430310dfdd
+	checksum=6f93e285e1cd48103fbdc3266e1188556ed2a98b08f7c6420eeb07c05c559a08
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"

From 0e1f00aee5471deab155b93c4211f47a7d27e9d4 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Fri, 2 Apr 2021 07:39:54 -0600
Subject: [PATCH 010/285] sanoid: update to 2.1.0

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

diff --git a/srcpkgs/sanoid/template b/srcpkgs/sanoid/template
index c6b509615751..18ed4725bf14 100644
--- a/srcpkgs/sanoid/template
+++ b/srcpkgs/sanoid/template
@@ -1,6 +1,6 @@
 # Template file for 'sanoid'
 pkgname=sanoid
-version=2.0.3
+version=2.1.0
 revision=1
 depends="perl perl-Config-IniFiles perl-Capture-Tiny"
 short_desc="Policy-driven snapshot management tool for ZFS filesystems"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
 homepage="http://www.openoid.net/products/"
 distfiles="https://github.com/jimsalterjrs/sanoid/archive/v$version.tar.gz"
 conf_files="/etc/sanoid/sanoid.conf /etc/sanoid/sanoid.defaults.conf"
-checksum=63115326695a00dc925d3ec8c307ed2543bb0a2479f2b15be3192bf2c7d50037
+checksum=97b41f689a7ea23671dac3fcb20540f6d3aee880ed3282df7448756f99e7040e
 
 do_install() {
 	     vdoc README.md

From f9e6b4744488b8ddd993fa0bc3f706a87ed75588 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 1 Apr 2021 18:06:16 +0300
Subject: [PATCH 011/285] qutebrowser: update to 2.1.1; adopt

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

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 063570d88889..0972f56d7ae5 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,18 +1,18 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-PyQt5-quick python3-Jinja2 python3-yaml
  python3-PyQt5-opengl python3-PyQt5-sql qt5-plugin-sqlite"
 short_desc="Keyboard-focused browser with a minimal GUI"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=1ddd373a4f31f16ba809870779918a8920b13dcb936f2d41ff4b27cfd4cae63b
+checksum=b71b00ad7d498911978e5bbd153a6dd0450ac6ade3e5bf398fc96e15328342ce
 nostrip=yes
 
 build_options="webengine"

From 57cb35fa4d5192a7a8f366f9030b466fdb9170da Mon Sep 17 00:00:00 2001
From: Jaume Devesa <jaume@mailbox.org>
Date: Fri, 2 Apr 2021 07:32:02 +0200
Subject: [PATCH 012/285] sfeed_curses: update to 0.9.10

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

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

From 3aaf3d28c735eecb3b53b63a05a605b30b7609f2 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Fri, 2 Apr 2021 07:32:52 +0200
Subject: [PATCH 013/285] python3-plotly: update to 4.14.3.

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

diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template
index e48cfde27c34..dde1b2c25226 100644
--- a/srcpkgs/python3-plotly/template
+++ b/srcpkgs/python3-plotly/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-plotly'
 pkgname=python3-plotly
-version=4.14.1
+version=4.14.3
 revision=1
 wrksrc="plotly-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://plot.ly/python/"
 changelog="https://github.com/plotly/plotly.py/blob/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz"
-checksum=f2a38726ddc7ce185a277c78a41b50bb8cfcfa4f53b45a481417401cadc0454c
+checksum=7d8aaeed392e82fb8e0e48899f2d3d957b12327f9d38cdd5802bc574a8a39d91
 conf_files="etc/jupyter/nbconfig/notebook.d/plotlywidget.json"
 
 do_check() {

From 291fa760270587d7f02e7a2dc673aed0a1f41d2c Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Thu, 1 Apr 2021 13:59:03 -0400
Subject: [PATCH 014/285] xf86-video-nouveau: update to 1.0.17.

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

diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template
index dabd68e3ea5b..5eb9af9c6e62 100644
--- a/srcpkgs/xf86-video-nouveau/template
+++ b/srcpkgs/xf86-video-nouveau/template
@@ -1,17 +1,17 @@
 # Template file for 'xf86-video-nouveau'
 pkgname=xf86-video-nouveau
-version=1.0.16
-revision=2
+version=1.0.17
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel libdrm-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg opensource NVIDIA video driver"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
 license="MIT"
-homepage="http://nouveau.freedesktop.org/wiki/"
+homepage="http://nouveau.freedesktop.org"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.gz"
-checksum=83553d4625e2990e569312e26540bebbdb2de14896ad4e9a9c872eda1df6cc7d
+checksum=21e9233b2c6304b976c526729ba48660c16976a757a319fa95cc8a8605316105
 lib32disabled=yes
 
 LDFLAGS="-Wl,-z,lazy"

From 2dc5ecabfa0a2f233eff983f114bc6905071cb90 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Fri, 2 Apr 2021 07:26:40 +0200
Subject: [PATCH 015/285] python3-xlrd: update to 2.0.1.

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

diff --git a/srcpkgs/python3-xlrd/template b/srcpkgs/python3-xlrd/template
index 8d6859e4dfdf..bf8cc5060c9d 100644
--- a/srcpkgs/python3-xlrd/template
+++ b/srcpkgs/python3-xlrd/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xlrd'
 pkgname=python3-xlrd
-version=1.2.0
-revision=2
+version=2.0.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="pulux <pulux@pf4sh.de>"
 license="BSD-3-Clause"
 homepage="http://www.python-excel.org/"
 distfiles="${PYPI_SITE}/x/xlrd/xlrd-${version}.tar.gz"
-checksum=546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2
+checksum=f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88
 
 post_install() {
 	vlicense LICENSE

From 80db7afc79852a67f2491c374d536bbb4daf3838 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Fri, 2 Apr 2021 07:23:21 +0200
Subject: [PATCH 016/285] python3-opcua: update to 0.98.13.

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

diff --git a/srcpkgs/python3-opcua/template b/srcpkgs/python3-opcua/template
index cd46a30efccf..f31b9971db66 100644
--- a/srcpkgs/python3-opcua/template
+++ b/srcpkgs/python3-opcua/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-opcua'
 pkgname=python3-opcua
-version=0.98.12
-revision=2
+version=0.98.13
+revision=1
 wrksrc="opcua-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-cryptography python3-dateutil python3-lxml"
+depends="python3-cryptography python3-dateutil python3-lxml python3-pytz"
+checkdepends="$depends"
 short_desc="Pure Python OPC-UA client and server library"
 maintainer="Pulux <pulux@pf4sh.de>"
 license="LGPL-3.0-or-later"
 homepage="http://freeopcua.github.io/"
 distfiles="${PYPI_SITE}/o/opcua/opcua-${version}.tar.gz"
-checksum=947cf0de842f9eee86ed2c39607c2b2c5a288ed42e0298d87c7a663ec7ee48aa
+checksum=3352f30b5fed863146a82778aaf09faa5feafcb9dd446a4f49ff34c0c3ebbde6

From f53b696aba78cf88101ce48d92426e9c85e911e8 Mon Sep 17 00:00:00 2001
From: Adrian Siekierka <kontakt@asie.pl>
Date: Fri, 2 Apr 2021 10:51:41 +0200
Subject: [PATCH 017/285] cherrytree: update to 0.99.33.

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

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index f3c8286b11d2..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,18 +1,19 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.27
+version=0.99.33
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
- libxml++-devel gtksourceviewmm-devel gspell-devel gtkmm-devel"
+ libxml++-devel gtksourceviewmm-devel gspell-devel gtkmm-devel
+ fmt-devel spdlog"
 depends="desktop-file-utils"
 short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
 distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=fff13c6b764eaa952616308a53cb5bd863b37f913bd74891117b4da20ff29832
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"

From df7b2a8066d3e0067afa61fb06f00212dd4e84a0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 2 Apr 2021 18:34:15 +0200
Subject: [PATCH 018/285] ldacBT: broken on big endian

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

diff --git a/srcpkgs/ldacBT/template b/srcpkgs/ldacBT/template
index 9d31ff7a8721..5f0638addee7 100644
--- a/srcpkgs/ldacBT/template
+++ b/srcpkgs/ldacBT/template
@@ -11,6 +11,10 @@ homepage="https://github.com/EHfive/ldacBT"
 distfiles="https://github.com/EHfive/ldacBT/releases/download/v${version}/ldacBT-${version}.tar.gz"
 checksum="4bd8eece78bb5c1361fab95743e7100506e2408a25c4a592a0f8d349746dc5b4"
 
+if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
+	broken="unsupported upstream"
+fi
+
 ldacBT-devel_package() {
 	depends="ldacBT>=${version}_${revision}"
 	short_desc+=" - development files"

From 1c2c28c1f264abb4c143edc9e151d782ff2b1d32 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 2 Apr 2021 18:36:05 +0200
Subject: [PATCH 019/285] pipewire: ldac only on little endian

---
 srcpkgs/pipewire/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 9c64ff428054..9ab2c72fb8f7 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -9,7 +9,7 @@ configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disab
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
  sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
- libopenaptx-devel fdk-aac-devel ldacBT-devel"
+ libopenaptx-devel fdk-aac-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>"
@@ -27,6 +27,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LDFLAGS+=" -latomic"
 fi
 
+if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
+	makedepends+=" ldacBT-devel"
+fi
+
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"

From 49ae54f6eb8916bc1dbb37678ce4908d718c257c Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 30 Mar 2021 12:07:44 +0200
Subject: [PATCH 020/285] libusb: update to 1.0.24.

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

diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 3660d0a45fd3..1f2036d0ecad 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,6 +1,6 @@
 # Template file for 'libusb'
 pkgname=libusb
-version=1.0.23
+version=1.0.24
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libusb.info"
 distfiles="https://github.com/libusb/libusb/releases/download/v${version}/libusb-${version}.tar.bz2"
-checksum=db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d
+checksum=7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a
 
 libusb-devel_package() {
 	short_desc+=" - development files"

From 4cae4164fd860f112e38658bfce93b1f3bacc131 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 2 Apr 2021 19:52:34 +0200
Subject: [PATCH 021/285] libvirt: update to 7.2.0.

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

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 52c0ee252845..1b7f3740c5b6 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.1.0
+version=7.2.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=870f180d80256411c5afc39bc5aac4f8acca04a4e0725c576ad24053dc64a06c
+checksum=01f459d0c7ba5009622a628dba1a026200e8f4a299fea783b936a71d7e0ed1d0
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From d7f8b2801ec59e70b5031200f29234d253e38107 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 2 Apr 2021 19:55:43 +0200
Subject: [PATCH 022/285] libvirt-python3: update to 7.2.0.

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

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 7988fa1482fc..f9dbeedc483a 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.1.0
+version=7.2.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=faafd31e407f9cb750a73349c007651ca8954ebd455e55b0a20e96de81c50037
+checksum=c0c3bac54c55622e17927b09cd9843869600d71842fb072c99491fe2608dcee7

From 5b82ad0ec6cc3e0e390361a805d072c49342f638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 2 Apr 2021 15:17:30 -0300
Subject: [PATCH 023/285] firefox: disable debug packages when built on 32-bit
 hosts.

cc1plus runs out of memory otherwise:
cargo:warning=cc1plus: out of memory allocating 65536 bytes after a total of 1010126848 bytes
---
 srcpkgs/firefox/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 0fd5d573c483..013422c663b7 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -40,6 +40,12 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
+# work around large debug symbols on 32-bit hosts
+# cargo:warning=cc1plus: out of memory allocating 65536 bytes after a total of 1010126848 bytes
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+	nodebug=yes
+fi
+
 # we need this because cargo verifies checksums of all files in vendor
 # crates when it builds and gives us no way to override or update the
 # file sanely... so just clear out the file list
@@ -129,8 +135,6 @@ do_build() {
 
 	# work around large debug symbols on 32-bit hosts
 	if [ "$XBPS_WORDSIZE" = "32" ]; then
-		export CFLAGS="${CFLAGS/-g/-g1}"
-		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
 		export LDFLAGS+=" -Wl,--no-keep-memory"
 		# patch the rust debug level, this is hardcoded
 		vsed -i 's/debug_info = "2"/debug_info = "0"/' \

From fb9e1148bfb782bd063aff6fcb5fc3e101fbb380 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 2 Apr 2021 20:26:34 +0200
Subject: [PATCH 024/285] tg_owt: disable NEON on armv7l

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

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 6c164865b87c..7fc356b67f61 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -7,7 +7,7 @@ _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 wrksrc="tg_owt-$_commit"
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=OFF"
+configure_args="-DBUILD_SHARED_LIBS=OFF -DTG_OWT_ARCH_ARMV7_USE_NEON=OFF"
 hostmakedepends="pkg-config yasm protobuf"
 makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  ffmpeg-devel libjpeg-turbo-devel protobuf-devel"

From d9d55dfe949208400cf1f5a37b442aaba6f91868 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 2 Apr 2021 20:54:40 +0200
Subject: [PATCH 025/285] lua54-luaposix: update to 35.0

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

diff --git a/srcpkgs/lua54-luaposix/template b/srcpkgs/lua54-luaposix/template
index d776c3a598af..a03cbe1debab 100644
--- a/srcpkgs/lua54-luaposix/template
+++ b/srcpkgs/lua54-luaposix/template
@@ -1,8 +1,8 @@
 # Template file for 'lua54-luaposix'
 pkgname=lua54-luaposix
-version=34.1.1
-revision=3
-wrksrc="luaposix-release-v${version}"
+version=35.0
+revision=1
+wrksrc=luaposix-${version}
 hostmakedepends="lua51-devel lua52-devel lua53-devel lua54-devel"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel"
 depends="lua54 lua54-stdlib-normalize"
@@ -11,8 +11,8 @@ short_desc="${_desc} (5.4.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://luaforge.net/projects/luaposix/"
-distfiles="https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz"
-checksum=273df2dbd9581a2f22e4265f14d0d759c487c0c9830f94395d7d690474382810
+distfiles="https://github.com/luaposix/luaposix/archive/refs/tags/v${version}.tar.gz"
+checksum=a4edf2f715feff65acb009e8d1689e57ec665eb79bc36a6649fae55eafd56809
 lib32disabled=yes
 
 post_extract() {

From 5533d5aae1fcda3ff9468ccbe95ca7511bc355e3 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 2 Apr 2021 19:28:31 +0300
Subject: [PATCH 026/285] github-cli: update to 1.8.1

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

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 77357dc600ad..4d9fc015800c 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.8.0
+version=1.8.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=13576c42a0cb1486370b876eccebe498c1ef84868893ae41a1f717229be4d6bb
+checksum=5bdbc589a6d5cca241b2dc467d846a8f23c465d78efd898271f18b636608d6e6
 
 pre_build() {
 	local _date

From a86a6c46bcf69d9db018374ffd8ae2a7387d8850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 2 Apr 2021 23:15:14 -0300
Subject: [PATCH 027/285] firefox: decrease memory requirements for 32bit
 builders.

Flags pulled from Alpine build.

Failure can be seen in
https://build.voidlinux.org/builders/i686_builder/builds/31550/steps/shell_3/logs/stdio
> 79:15.36   cargo:warning=virtual memory exhausted: Cannot allocate memory
---
 srcpkgs/firefox/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 013422c663b7..58cc021a39d2 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -135,6 +135,8 @@ do_build() {
 
 	# work around large debug symbols on 32-bit hosts
 	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+		echo "ac_add_options --disable-debug" >>.mozconfig
 		export LDFLAGS+=" -Wl,--no-keep-memory"
 		# patch the rust debug level, this is hardcoded
 		vsed -i 's/debug_info = "2"/debug_info = "0"/' \

From e6b1f6180fd91bbdbe46d1f97895a1a3c00fa3de 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, 3 Apr 2021 09:42:04 +0700
Subject: [PATCH 028/285] devil: patch for jasper 2.0.17

---
 srcpkgs/devil/patches/jasper-2.0.17.patch | 24 +++++++++++++++++++++++
 srcpkgs/devil/template                    |  1 -
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/devil/patches/jasper-2.0.17.patch

diff --git a/srcpkgs/devil/patches/jasper-2.0.17.patch b/srcpkgs/devil/patches/jasper-2.0.17.patch
new file mode 100644
index 000000000000..c19ebb465b17
--- /dev/null
+++ b/srcpkgs/devil/patches/jasper-2.0.17.patch
@@ -0,0 +1,24 @@
+ jasper 2.0.17 fixes some signed compare without breaking ABI
+ but it breaks API
+Index: DevIL/src-IL/src/il_jp2.cpp
+===================================================================
+--- DevIL/src-IL/src/il_jp2.cpp.orig
++++ DevIL/src-IL/src/il_jp2.cpp
+@@ -314,15 +314,15 @@ ILboolean iLoadJp2Internal(jas_stream_t
+ 
+ 
+ 
+-static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt)
++static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
+ {
+ 	obj;
+ 	return iread(buf, 1, cnt);
+ }
+ 
+-static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt)
++static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned cnt)
+ {
+ 	obj;
+ 	return iwrite(buf, 1, cnt);
+ }
+ 
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index e15ca174966f..95bc542c6d6e 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -5,7 +5,6 @@ revision=3
 wrksrc="DevIL"
 build_wrksrc="DevIL"
 build_style=cmake
-configure_args="--enable-ILU --enable-ILUT --with-examples"
 hostmakedepends="pkg-config"
 makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
  glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"

From c2c3e29d9cc34deef70a27db8c86ec3a715e9fa9 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, 14 Mar 2021 20:18:03 +0700
Subject: [PATCH 029/285] build-style/cmake: set CMAKE_BUILD_TYPE to None

- CMAKE_BUILD_TYPE=Release will force -O3 instead of respecting our
  CFLAGS and CXXFLAGS
- Theoretically, we could patch cmake to always use -O2 instead,
  however, patching will break users' expectation when compiling their
  our code.
- RelWithDebInfo could be another option if it's acceptable to always
  have debug symbol available.
- However, some projects ignore all CFLAGS and CXXFLAGS;
- Some other projects relies on CMAKE_BUILD_TYPE=Release to install to
  correct location and/or disable coverage.
- To get away with -O3, we need patching either ways, let's go with
  CMAKE_BUILD_TYPE=None, and patch all problematic softwares.
---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 5100a96dfd7b..9d1a1a7a1941 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -52,7 +52,7 @@ _EOF
 		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
-	cmake_args+=" -DCMAKE_BUILD_TYPE=Release"
+	cmake_args+=" -DCMAKE_BUILD_TYPE=None"
 	cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
 
 	if [[ $build_helper = *"qemu"* ]]; then

From cf07d838bd91e9c2ddd003dca4d2bb5cc5213599 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, 1 Apr 2021 21:33:44 +0700
Subject: [PATCH 030/285] cmake-bootstrap: update to 3.20.0.

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

diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index c97760473629..f9c6548ef0ad 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-bootstrap'
 pkgname=cmake-bootstrap
-version=3.19.7
+version=3.20.0
 revision=1
 wrksrc=cmake-$version
 bootstrap=yes
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
 conflicts="cmake>=0"
 
 CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
@@ -36,7 +36,6 @@ post_patch() {
 	rm -rf Utilities/cmexpat
 	rm -rf Utilities/cmlibarchive
 	rm -rf Utilities/cmliblzma
-	rm -rf Utilities/cmlibrhash
 	rm -rf Utilities/cmnghttp2
 	rm -rf Utilities/cmzlib
 	rm -rf Utilities/cmzstd

From 37eb752c6dbe3504a5cbf85ac351d0270662b29d 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, 1 Apr 2021 20:47:38 +0700
Subject: [PATCH 031/285] cmake: update to 3.20.0.

---
 ...onfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch | 13 +++++++++++++
 srcpkgs/cmake/template                              |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch

diff --git a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
new file mode 100644
index 000000000000..d0a2860cc86e
--- /dev/null
+++ b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
@@ -0,0 +1,13 @@
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..84ef26b0fd 100644
+--- Tests/ConfigSources/CMakeLists.txt
++++ Tests/ConfigSources/CMakeLists.txt
+@@ -75,7 +75,7 @@ add_custom_command(APPEND
+   )
+ foreach(n RANGE 1 5)
+   set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other None Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
+ endforeach()
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index aa32cea5f048..93dbc971646c 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.19.7
+version=3.20.0
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -16,7 +16,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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
 
 export CMAKE_GENERATOR="Unix Makefiles"
 

From a6960a26de2e4f2211fb30d47a286de22fe02e59 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, 1 Apr 2021 21:33:47 +0700
Subject: [PATCH 032/285] cmake-gui: update to 3.20.0.

---
 srcpkgs/cmake-gui/patches                 |  1 +
 srcpkgs/cmake-gui/patches/musl-test.patch | 15 ---------------
 srcpkgs/cmake-gui/template                |  4 ++--
 3 files changed, 3 insertions(+), 17 deletions(-)
 create mode 120000 srcpkgs/cmake-gui/patches
 delete mode 100644 srcpkgs/cmake-gui/patches/musl-test.patch

diff --git a/srcpkgs/cmake-gui/patches b/srcpkgs/cmake-gui/patches
new file mode 120000
index 000000000000..6f3ac554b361
--- /dev/null
+++ b/srcpkgs/cmake-gui/patches
@@ -0,0 +1 @@
+../cmake/patches
\ No newline at end of file
diff --git a/srcpkgs/cmake-gui/patches/musl-test.patch b/srcpkgs/cmake-gui/patches/musl-test.patch
deleted file mode 100644
index 4da8c2f9cfc6..000000000000
--- a/srcpkgs/cmake-gui/patches/musl-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig	2020-12-05 13:27:21.098078774 +0700
-+++ Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake	2020-12-05 13:29:19.931553018 +0700
-@@ -33,9 +33,9 @@
-   [[librunpath_parent_unresolved\.so]]
-   [[librunpath_unresolved\.so]]
-   )
--check_contents(deps/udeps1.txt "^${_check}$")
--check_contents(deps/udeps2.txt "^${_check}$")
--check_contents(deps/udeps3.txt "^${_check}$")
-+check_contents(deps/udeps1.txt "^(libc.so;)?${_check}$")
-+check_contents(deps/udeps2.txt "^(libc.so;)?${_check}$")
-+check_contents(deps/udeps3.txt "^(libc.so;)?${_check}$")
- set(_check
-   "^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$"
-   )
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 2643997e4f1c..461463b3bc30 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.19.7
+version=3.20.0
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
 
 # XXX: cmake is broken if cmake was built with -GNinja
 # https://bugs.gentoo.org/596460

From 334f8dc6e909e5a4d969cfa82d36c91e079b0500 Mon Sep 17 00:00:00 2001
From: Andrea D'Amore <a@d-amo.re>
Date: Wed, 17 Jun 2020 08:24:44 +0200
Subject: [PATCH 033/285] brother-brscan3: update to 0.2.13

Add license from website.
Drop building debug package, libs are stripped at the source.
Mimic description from package brother-brscan4 since this package
targets multiple Brother devices.

Closes: #22998 [via git-merge-pr]
---
 srcpkgs/brother-brscan3/template | 49 +++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/brother-brscan3/template b/srcpkgs/brother-brscan3/template
index 92e5759446b6..e51bddc1dbeb 100644
--- a/srcpkgs/brother-brscan3/template
+++ b/srcpkgs/brother-brscan3/template
@@ -1,26 +1,29 @@
 # Template file for 'brother-brscan3'
 pkgname=brother-brscan3
-version=0.2.11
-revision=6
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
-homepage="http://support.brother.com/g/b/index.aspx"
-license="GPL-2"
-short_desc="Scanner driver for the brother DCP-197C printer/scanner"
+version=0.2.13
+revision=1
 archs="i686 x86_64"
-makedepends="sane-devel"
-depends="sane"
 create_wrksrc=yes
+hostmakedepends="tar"
+makedepends="sane-devel curl"
+depends="sane"
+short_desc="SANE scanner driver for brscan3-compatible Brother scanners"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it.invalid>"
+license="custom:BrotherEULA"
+homepage="http://support.brother.com/g/b/index.aspx"
 nopie=yes
+nodebug=yes
+_license_checksum=4ab8b9269a74377ee85458cc4dfbacfbf6d26665426572fe16f7102af214bd3c
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	distfiles="http://download.brother.com/welcome/dlf006642/brscan3-${version}-5.amd64.deb"
-	checksum="cce23bd9481f0fb3856e6c1fecdb65d7b21d1efb74e1741ef6185fa952319beb"
-	debpkgid="5.amd64"
+	debpkgid="1.amd64"
+	distfiles="http://download.brother.com/welcome/dlf006642/brscan3-${version}-${debpkgid}.deb"
+	checksum="446adf531bf39032892e9504ce34b7bf889e0f8628c0732cebb3b83fafb327b8"
 	mylibdir="lib64"
 elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	distfiles="http://download.brother.com/welcome/dlf006641/brscan3-${version}-4.i386.deb"
-	checksum="3d2c8aace27a694c0984c6a1913fb2ebbd6cfd7a46bcdce3d54ae3693009d835"
-	debpkgid="4.i386"
+	debpkgid="1.i386"
+	distfiles="http://download.brother.com/welcome/dlf006641/brscan3-${version}-${debpkgid}.deb"
+	checksum="ad06665cac32035893f614d9305dabf73145af454f1aeb6b8b7c7fa2700fe2e6"
 	mylibdir="lib"
 fi
 
@@ -41,4 +44,22 @@ do_install() {
 	ln -sf /usr/lib/libbrscandec3.so.1.0.0 ${DESTDIR}/usr/lib/libbrscandec3.so
 	vmkdir /opt/Brother
 	vcopy "./usr/local/Brother/*" /opt/Brother/
+	vlicense LICENSE
+}
+
+post_extract() {
+	curl -sk https://support.brother.com/g/s/agreement/English_lpr/agree.html | \
+		sed -n \
+			-e 's,</\?p>,,' \
+			-e 's/\&quot;/"/g' \
+			-e 's, \?^M,,' \
+			-e 's,^[ \t]\+,,' \
+			-e '14,18p' \
+			-e '28,45p' \
+		> LICENSE
+
+	filesum="$(xbps-digest LICENSE)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for LICENSE:\n$filesum\n"
+	fi
 }

From 1ad79192b2a235c7e2327dd573bdcb255c327e85 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:22:16 -0400
Subject: [PATCH 034/285] python3-Pillow: update to 8.2.0.

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

diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template
index 4f6757ef4a03..379e7add3856 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pillow'
 pkgname=python3-Pillow
-version=8.1.2
+version=8.2.0
 revision=1
 wrksrc="Pillow-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="custom:PIL"
 homepage="https://python-pillow.org"
 changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
-checksum=b07c660e014852d98a00a91adfbe25033898a9d90a8f39beb2437d22a203fc44
+checksum=a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1
 
 do_check() {
 	PYTHONPATH=$(cd build/lib.linux-* && pwd) python3 -m pytest

From 06459761f55861fb980b4a0e6df509c4014dab8c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:23:13 -0400
Subject: [PATCH 035/285] python3-breathe: update to 4.28.0.

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

diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template
index 35c19a0b8e67..c4c3550b3a68 100644
--- a/srcpkgs/python3-breathe/template
+++ b/srcpkgs/python3-breathe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-breathe'
 pkgname=python3-breathe
-version=4.27.0
+version=4.28.0
 revision=1
 wrksrc="breathe-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/michaeljones/breathe"
 changelog="https://raw.githubusercontent.com/michaeljones/breathe/master/README.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=21fe14b241fe8596f008e799706e2c5f15371bb3325fabdf4b6aab8e60e8c59f
+checksum=6948cf4700582c5b7115940367c87f74fbc4510b0a7db67fbcb5165181a784ad
 
 post_install() {
 	vlicense LICENSE

From aa9fd8ea0eafddb3ca8f3cce117e0d332a150ae1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:24:42 -0400
Subject: [PATCH 036/285] python3-matplotlib: update to 3.4.1.

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

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 9319a10f0fac..43c126fc4811 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.0
+version=3.4.1
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=a145cd4ec257fd659c4950a4485a860836f1ad615add756a4dcb203fad80c4cb
+checksum=e662bdde3f493b0f14f658095d91c36521d0f2d96c0a4b9fad55fca6d6300a87
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From 569cc96bd43ea81e11358e7d452422ef0fc97187 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:25:24 -0400
Subject: [PATCH 037/285] python3-parso: update to 0.8.2.

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

diff --git a/srcpkgs/python3-parso/template b/srcpkgs/python3-parso/template
index bdca7f917155..c4406bc39bed 100644
--- a/srcpkgs/python3-parso/template
+++ b/srcpkgs/python3-parso/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-parso'
 pkgname=python3-parso
-version=0.8.1
+version=0.8.2
 revision=1
 wrksrc="parso-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/davidhalter/parso"
 distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz"
-checksum=8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e
+checksum=12b83492c6239ce32ff5eed6d3639d6a536170723c6f3f1506869f1ace413398
 
 post_install() {
 	vlicense LICENSE.txt

From 97a527226538757558b44132a500f1623d02762b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:25:51 -0400
Subject: [PATCH 038/285] python3-tifffile: update to 2021.3.31.

---
 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 b4b4f3673988..821635e7d88c 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.3.17
+version=2021.3.31
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,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=dd21b981a0d42f4847de5bd4e52a00c0718fdf8a26d1cb5c00a6d678e6d1e779
+checksum=82ce2f4f4d49415e95ae03f839f84eae4018435051106a1223e8b85d1a27b6f4
 # Tests require unpackaged fsspec
 make_check=no
 

From d8974d6572ec207f50ee2afe1dfa7cfd45f33c26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:30:11 -0400
Subject: [PATCH 039/285] protobuf26: update to 3.15.7.

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

diff --git a/srcpkgs/protobuf26/template b/srcpkgs/protobuf26/template
index e21142f3fac8..8e8cfbe6bece 100644
--- a/srcpkgs/protobuf26/template
+++ b/srcpkgs/protobuf26/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf26'
 pkgname=protobuf26
-version=3.15.6
+version=3.15.7
 revision=1
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=65e020a42bdab44a66664d34421995829e9e79c60e5adaa08282fd14ca552f57
+checksum=efdd6b932a2c0a88a90c4c80f88e4b2e1bf031e7514dbb5a5db5d0bf4f295504
 
 # Switch to versioned package
 conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0"

From 55fc39867c99a709f1fc8d3bb92914284878c195 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:34:02 -0400
Subject: [PATCH 040/285] python3-protobuf: update to 3.15.7.

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

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index f987b0238757..1a61e9218f75 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
-version=3.15.6
+version=3.15.7
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=2b974519a2ae83aa1e31cff9018c70bbe0e303a46a598f982943c49ae1d4fcd3
+checksum=2d03fc2591543cd2456d0b72230b50c4519546a8d379ac6fd3ecd84c6df61e5d
 
 build_options="cppext"
 build_options_default="cppext"

From 9adf5e371d55819cb3f8d77ec205ded714d994cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:41:31 -0400
Subject: [PATCH 041/285] python3-hypothesis: update to 6.8.4.

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

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

From 49b6e8e069df9c06ab878d96b048a4b3ad94ae1a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:42:37 -0400
Subject: [PATCH 042/285] python3-pytools: update to 2021.2.2.

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

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index fe9083a702f4..2d679f9f9a93 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.1
+version=2021.2.2
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ 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=ebbcc38c7a30b1a0ce1a74816c85db9f2556bb4d5b9a71f85f5d88f69ddcb96b
+checksum=7d3c37714c0ccdfe40296f526927735080e9defb8e09dd3d438e5328badadf14
 
 post_install() {
 	vlicense LICENSE

From 5e27f02d4c8edec8f9e335c0e785b9f0dc6c8b64 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Apr 2021 22:43:42 -0400
Subject: [PATCH 043/285] python3-pyopencl: update to 2021.1.5.

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

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 3a1d79ac75bb..811a5ca6290d 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2021.1.4
+version=2021.1.5
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=6a9665e89c15e1c684789263bd3a632567e7c7bd25a657092df4b185b3468971
+checksum=aaa438b87fbb6d5a185b22666ad0ada5f396a0ac259db95a59620e7900d3b837
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From 3e826c3ca1ffa1dc7fa8b14e91d318c14c9547a2 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: Mon, 15 Mar 2021 08:07:16 +0700
Subject: [PATCH 044/285] amdvlk: allow CMAKE_BUILD_TYPE=None

---
 .../patches/cmake-build-type-none.patch       | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 srcpkgs/amdvlk/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..7a629e58548e
--- /dev/null
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -0,0 +1,60 @@
+Index: llvm-project/llvm/CMakeLists.txt
+===================================================================
+--- llvm-project/llvm/CMakeLists.txt.orig
++++ llvm-project/llvm/CMakeLists.txt
+@@ -251,11 +251,6 @@ endif()
+ 
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+ 
+-if (CMAKE_BUILD_TYPE AND
+-    NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-  message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-endif()
+-
+ set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
+ 
+ set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- pal/cmake/Modules/AmdCmakeHelper.cmake.orig
++++ pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
+Index: xgl/CMakeLists.txt
+===================================================================
+--- xgl/CMakeLists.txt.orig
++++ xgl/CMakeLists.txt
+@@ -181,11 +181,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
+Index: xgl/icd/CMakeLists.txt
+===================================================================
+--- xgl/icd/CMakeLists.txt.orig
++++ xgl/icd/CMakeLists.txt
+@@ -84,7 +84,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Cl
+     endif()
+ 
+     if(CMAKE_BUILD_TYPE_RELEASE)
+-        target_compile_options(xgl PRIVATE -O3)
+         if(XGL_ENABLE_LTO)
+             if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
+                 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)

From 19f584d93d4c28a17eb3c8952e7077c74aa32e1f 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, 17 Mar 2021 06:24:04 +0700
Subject: [PATCH 045/285] eigen*: set CMAKE_BUILD_TYPE to Release

We're going to set default CMAKE_BUILD_TYPE to None soon. Those packages
are header only libraries, no need to waste time on patching.
---
 srcpkgs/eigen/template    | 1 +
 srcpkgs/eigen3.2/template | 1 +
 2 files changed, 2 insertions(+)

diff --git a/srcpkgs/eigen/template b/srcpkgs/eigen/template
index ee825e95f273..072228c16915 100644
--- a/srcpkgs/eigen/template
+++ b/srcpkgs/eigen/template
@@ -3,6 +3,7 @@ pkgname=eigen
 version=3.3.9
 revision=1
 build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
 short_desc="C++ template library for linear algebra (version 3.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
diff --git a/srcpkgs/eigen3.2/template b/srcpkgs/eigen3.2/template
index 5715fc1b3a19..7b710534b5e5 100644
--- a/srcpkgs/eigen3.2/template
+++ b/srcpkgs/eigen3.2/template
@@ -4,6 +4,7 @@ version=3.2.10
 revision=3
 wrksrc="eigen-${version}"
 build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
 short_desc="C++ template library for linear algebra (version 3.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"

From 2d71e8a846433ed9cb33639067f8c4b2bf37f011 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, 17 Mar 2021 07:04:48 +0700
Subject: [PATCH 046/285] embree: don't ignore CXXFLAGS, fix build with ispc
 1.13+

---
 .../embree/patches/uintNN-is-part-of-ispc-1.13.patch | 12 ++++++++++++
 srcpkgs/embree/template                              |  6 ++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch

diff --git a/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch b/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
new file mode 100644
index 000000000000..5d0b02f3b2e5
--- /dev/null
+++ b/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
@@ -0,0 +1,12 @@
+Index: embree-2.17.7/tutorials/common/common.isph
+===================================================================
+--- embree-2.17.7.orig/tutorials/common/common.isph
++++ embree-2.17.7/tutorials/common/common.isph
+@@ -16,7 +16,3 @@
+ 
+ #pragma once
+ 
+-typedef unsigned int64 uint64;
+-typedef unsigned int32 uint32;
+-typedef unsigned int16 uint16;
+-typedef unsigned int8  uint8;
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 0bc72f46b6d8..849ec3c26c1d 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -4,6 +4,7 @@ version=2.17.7
 revision=2
 archs="x86_64"
 build_style=cmake
+configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
 hostmakedepends="ispc"
 makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
  libopenexr-devel libjpeg-turbo-devel libmagick-devel"
@@ -13,10 +14,7 @@ license="Apache-2.0"
 homepage="https://embree.github.io/"
 distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
 checksum=c0694f287fa1fbb382aba3a895702e248d92f7e89c0e5f64aefee965482ec04c
-
-nopie=y
-
-configure_args="-DTBB_ROOT=/usr -DENABLE_TUTORIALS=OFF"
+patch_args=-Np1
 
 embree-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6fac0cf6e754cc00090a23c1fe055e4bbda57fd6 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, 17 Mar 2021 07:35:19 +0700
Subject: [PATCH 047/285] ettercap: remove libressl patch,
 CMAKE_BUILD_TYPE=None

---
 .../patches/allow-build-type-none.patch       | 24 ++++++++++++++
 srcpkgs/ettercap/patches/libressl.patch       | 31 -------------------
 srcpkgs/ettercap/template                     |  9 ++++--
 3 files changed, 31 insertions(+), 33 deletions(-)
 create mode 100644 srcpkgs/ettercap/patches/allow-build-type-none.patch
 delete mode 100644 srcpkgs/ettercap/patches/libressl.patch

diff --git a/srcpkgs/ettercap/patches/allow-build-type-none.patch b/srcpkgs/ettercap/patches/allow-build-type-none.patch
new file mode 100644
index 000000000000..324d75086b05
--- /dev/null
+++ b/srcpkgs/ettercap/patches/allow-build-type-none.patch
@@ -0,0 +1,24 @@
+Index: ettercap-0.8.3.1/CMakeLists.txt
+===================================================================
+--- ettercap-0.8.3.1.orig/CMakeLists.txt
++++ ettercap-0.8.3.1/CMakeLists.txt
+@@ -22,19 +22,6 @@ option(LIBRARY_BUILD "Build for libetter
+ option(INSTALL_DESKTOP "Install ettercap desktop files" ON)
+ 
+ 
+-set(VALID_BUILD_TYPES Debug Release RelWithDebInfo)
+-
+-if(NOT CMAKE_BUILD_TYPE)
+-  # Default to using "Release" as our build type.
+-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING
+-    "Choose the type of build, options are: ${VALID_BUILD_TYPES}." FORCE)
+-endif()
+-list(FIND VALID_BUILD_TYPES ${CMAKE_BUILD_TYPE} contains_valid)
+-if(contains_valid EQUAL -1)
+-  message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: '${CMAKE_BUILD_TYPE}'. Valid options are: ${VALID_BUILD_TYPES}")
+-endif()
+-unset(contains_valid)
+-
+ include(CMakeDependentOption)
+ 
+ # If SYSTEM_LIBS is set to off, then all SYSTEM_* options will be
diff --git a/srcpkgs/ettercap/patches/libressl.patch b/srcpkgs/ettercap/patches/libressl.patch
deleted file mode 100644
index 15e0d3c1c9e7..000000000000
--- a/srcpkgs/ettercap/patches/libressl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b2f7634c9dbc0ef68640f0571787d92300e9f9f9 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan@steils.org>
-Date: Sat, 15 Aug 2020 07:18:31 +0300
-Subject: [PATCH] ec_sslwrap: fix compilation with LibreSSL
-
-Disable taking over SNI extension from ClientHello and SSL configuration
-operations until LibreSSL supports the required API.
-
-Fixes: https://github.com/Ettercap/ettercap/issues/1068
----
- src/ec_sslwrap.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git src/ec_sslwrap.c src/ec_sslwrap.c
-index b9f26a142..1e4c24fc1 100644
---- src/ec_sslwrap.c
-+++ src/ec_sslwrap.c
-@@ -71,11 +71,11 @@
- #define TLS_server_method SSLv23_server_method
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #define HAVE_OPENSSL_1_1_0
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #define HAVE_OPENSSL_1_1_1
- #endif
- 
diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 7fe4c340a079..611b4e9aded7 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -3,8 +3,8 @@ pkgname=ettercap
 version=0.8.3.1
 revision=2
 build_style=cmake
-configure_args="-DENABLE_GTK=OFF"
-hostmakedepends="flex"
+configure_args="-DENABLE_GTK=OFF -DBUNDLED_LIBS=OFF"
+hostmakedepends="flex pkg-config"
 makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
@@ -15,5 +15,10 @@ homepage="http://ettercap.github.com/ettercap/"
 distfiles="https://github.com/Ettercap/ettercap/archive/v${version}.tar.gz"
 checksum=d0c3ef88dfc284b61d3d5b64d946c1160fd04276b448519c1ae4438a9cdffaf3
 lib32disabled=yes
+patch_args=-Np1
 
 CFLAGS="-fcommon"
+
+post_extract() {
+	rm -rf bundled_deps
+}

From 6e8dd6b5f88fd232a0e3a00a53447254d00a8cc0 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, 17 Mar 2021 08:27:10 +0700
Subject: [PATCH 048/285] injeqt: disable coverage

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

diff --git a/srcpkgs/injeqt/template b/srcpkgs/injeqt/template
index 1e5777fc0f18..78eba09a0249 100644
--- a/srcpkgs/injeqt/template
+++ b/srcpkgs/injeqt/template
@@ -3,7 +3,8 @@ pkgname=injeqt
 version=1.2.0
 revision=2
 build_style=cmake
-hostmakedepends="pkg-config"
+configure_args="-DDISABLE_COVERAGE=ON"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 short_desc="Dependency injection framework for Qt"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -12,9 +13,6 @@ homepage="https://github.com/vogel/injeqt/"
 distfiles="https://github.com/vogel/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=77540cedb0b26affe993dd18124d796059e34c80a51d9ae6433fdff1860db135
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
 CXXFLAGS="-fno-lifetime-dse -Wno-error=cast-align"
 
 injeqt-devel_package() {

From a1bf547b77ec2c81d161cbf83f612fc5985877fd 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, 17 Mar 2021 22:26:37 +0700
Subject: [PATCH 049/285] kindd: build with CMAKE_BUILD_TYPE=None

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

diff --git a/srcpkgs/kindd/template b/srcpkgs/kindd/template
index e634b0f69bf6..4416041de58c 100644
--- a/srcpkgs/kindd/template
+++ b/srcpkgs/kindd/template
@@ -15,7 +15,7 @@ distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=e596f1b1577ff3e83a779e6181252ae2f09731f513d17dd6b95cbc2cf204654f
 
 do_install() {
-	vbin release/kindd
+	vbin build/core/kindd
 	vinstall assets/appconf/kindd.svg 644 usr/share/pixmaps
 	vinstall assets/appconf/kindd.desktop 644 usr/share/applications
 }

From 68ef81e401a16a03448060341a595334fb78a4c6 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, 18 Mar 2021 23:58:53 +0700
Subject: [PATCH 050/285] occt: allow CMAKE_BUILD_TYPE=None

---
 srcpkgs/occt/patches/cmake-build-type-none.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/occt/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/occt/patches/cmake-build-type-none.patch b/srcpkgs/occt/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..acb06fb55766
--- /dev/null
+++ b/srcpkgs/occt/patches/cmake-build-type-none.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
+ 
+ set (CMAKE_SUPPRESS_REGENERATION TRUE)
+ 
+-set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
++set (CMAKE_CONFIGURATION_TYPES None Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
+ 
+ # macro: include patched file if it exists
+ macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)

From fd14226b79b4b55dde73b1b39762794cbc9822cb 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, 19 Mar 2021 23:07:05 +0700
Subject: [PATCH 051/285] renderdoc: devendor zstd, lz4

---
 .../patches/build-type-none-is-release.patch  | 12 ++++
 .../renderdoc/patches/qmake-no-rpath.patch    | 13 ++++
 .../renderdoc/patches/unvendor-zstd-lz4.patch | 68 +++++++++++++++++++
 srcpkgs/renderdoc/template                    | 15 ++--
 4 files changed, 99 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/renderdoc/patches/build-type-none-is-release.patch
 create mode 100644 srcpkgs/renderdoc/patches/qmake-no-rpath.patch
 create mode 100644 srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch

diff --git a/srcpkgs/renderdoc/patches/build-type-none-is-release.patch b/srcpkgs/renderdoc/patches/build-type-none-is-release.patch
new file mode 100644
index 000000000000..f16b944bc12c
--- /dev/null
+++ b/srcpkgs/renderdoc/patches/build-type-none-is-release.patch
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -315,6 +315,7 @@ set(RELEASE_MODE 0)
+ 
+ if(cmake_build_type_lower STREQUAL "release" OR
+    cmake_build_type_lower STREQUAL "relwithdebinfo" OR
++   cmake_build_type_lower STREQUAL "none" OR
+    cmake_build_type_lower STREQUAL "minsizerel")
+     add_definitions(-D_RELEASE)
+     message(STATUS "Building RenderDoc in Release mode: ${CMAKE_BUILD_TYPE}")
diff --git a/srcpkgs/renderdoc/patches/qmake-no-rpath.patch b/srcpkgs/renderdoc/patches/qmake-no-rpath.patch
new file mode 100644
index 000000000000..6e6325c53555
--- /dev/null
+++ b/srcpkgs/renderdoc/patches/qmake-no-rpath.patch
@@ -0,0 +1,13 @@
+Index: qrenderdoc/CMakeLists.txt
+===================================================================
+--- qrenderdoc/CMakeLists.txt.orig
++++ qrenderdoc/CMakeLists.txt
+@@ -144,7 +144,7 @@ endif()
+ # and finding dependencies from the cmake build
+ file(WRITE
+      ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
+-     "CONFIG+=${QMAKE_CONFIG}\n"
++     "CONFIG+=${QMAKE_CONFIG} no_qt_rpath\n"
+      "\n"
+      "QMAKE_CC=${CMAKE_C_COMPILER}\n"
+      "QMAKE_CXX=${CMAKE_CXX_COMPILER}\n"
diff --git a/srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch b/srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch
new file mode 100644
index 000000000000..d4003ded9161
--- /dev/null
+++ b/srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch
@@ -0,0 +1,68 @@
+Index: renderdoc/CMakeLists.txt
+===================================================================
+--- renderdoc/CMakeLists.txt.orig
++++ renderdoc/CMakeLists.txt
+@@ -213,54 +213,10 @@ set(sources
+     3rdparty/pugixml/pugixml.cpp
+     3rdparty/pugixml/pugixml.hpp
+     3rdparty/pugixml/pugiconfig.hpp
+-    3rdparty/lz4/lz4.c
+-    3rdparty/lz4/lz4.h
+     3rdparty/miniz/miniz.c
+     3rdparty/miniz/miniz.h
+     3rdparty/superluminal/superluminal.cpp
+     3rdparty/superluminal/superluminal.h
+-    3rdparty/zstd/bitstream.h
+-    3rdparty/zstd/compiler.h
+-    3rdparty/zstd/cpu.h
+-    3rdparty/zstd/debug.c
+-    3rdparty/zstd/debug.h
+-    3rdparty/zstd/entropy_common.c
+-    3rdparty/zstd/error_private.c
+-    3rdparty/zstd/error_private.h
+-    3rdparty/zstd/fse.h
+-    3rdparty/zstd/fse_compress.c
+-    3rdparty/zstd/fse_decompress.c
+-    3rdparty/zstd/hist.c
+-    3rdparty/zstd/hist.h
+-    3rdparty/zstd/huf.h
+-    3rdparty/zstd/huf_compress.c
+-    3rdparty/zstd/huf_decompress.c
+-    3rdparty/zstd/mem.h
+-    3rdparty/zstd/pool.c
+-    3rdparty/zstd/pool.h
+-    3rdparty/zstd/threading.c
+-    3rdparty/zstd/threading.h
+-    3rdparty/zstd/xxhash.c
+-    3rdparty/zstd/xxhash.h
+-    3rdparty/zstd/zstd.h
+-    3rdparty/zstd/zstd_common.c
+-    3rdparty/zstd/zstd_compress.c
+-    3rdparty/zstd/zstd_compress_internal.h
+-    3rdparty/zstd/zstd_decompress.c
+-    3rdparty/zstd/zstd_double_fast.c
+-    3rdparty/zstd/zstd_double_fast.h
+-    3rdparty/zstd/zstd_errors.h
+-    3rdparty/zstd/zstd_fast.c
+-    3rdparty/zstd/zstd_fast.h
+-    3rdparty/zstd/zstd_internal.h
+-    3rdparty/zstd/zstd_lazy.c
+-    3rdparty/zstd/zstd_lazy.h
+-    3rdparty/zstd/zstd_ldm.c
+-    3rdparty/zstd/zstd_ldm.h
+-    3rdparty/zstd/zstd_opt.c
+-    3rdparty/zstd/zstd_opt.h
+-    3rdparty/zstd/zstdmt_compress.c
+-    3rdparty/zstd/zstdmt_compress.h
+     3rdparty/stb/stb_image.h
+     3rdparty/stb/stb_image_write.h
+     3rdparty/stb/stb_image_resize.h
+@@ -271,6 +227,8 @@ set(sources
+     3rdparty/tinyfiledialogs/tinyfiledialogs.c
+     3rdparty/tinyfiledialogs/tinyfiledialogs.h)
+ 
++list(APPEND RDOC_LIBRARIES -llz4 -lzstd)
++
+ if(ANDROID)
+     list(APPEND sources
+         data/embedded_files.h
diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template
index 7240e9ebc307..4615d45c52c9 100644
--- a/srcpkgs/renderdoc/template
+++ b/srcpkgs/renderdoc/template
@@ -1,13 +1,14 @@
 # Template file for 'renderdoc'
 pkgname=renderdoc
 version=1.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GL=ON -DENABLE_GLES=ON -DENABLE_QRENDERDOC=ON
  -DENABLE_RENDERDOCCMD=ON -DENABLE_VULKAN=ON -DENABLE_XCB=ON -DENABLE_XLIB=ON
  -DENABLE_PYRENDERDOC=ON"
-hostmakedepends="bison autoconf automake pkg-config python3"
+hostmakedepends="bison autoconf automake pkg-config python3 swig"
 makedepends="libX11-devel libxcb-devel xcb-util-keysyms-devel qt5-devel
+ libzstd-devel liblz4-devel
  qt5-svg-devel qt5-x11extras-devel pcre-devel python3-devel"
 short_desc="Stand-alone graphics debugging tool for Vulkan and OpenGL"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
@@ -19,19 +20,14 @@ checksum=4dece1b4cb859a76533b28fcd50e17321acfaa81c3435500a006c4a5ba15fddb
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"
 	LDLIBS="-lexecinfo"
+	broken="uses RTLD_DL_LINKMAP, RTLD_DEEPBIND, _r_debug"
 fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="uses RTLD_DL_LINKMAP, RTLD_DEEPBIND, _r_debug" ;;
-esac
-
-if [ "$CROSS_BUILD" ]; then
-	broken="Cross-compilation can't find python3 interpreter"
-fi
+nocross="Cross-compilation can't find python3 interpreter"
 
 post_patch() {
 	[ -z "$XBPS_TARGET_NO_ATOMIC8" ] && return 0
@@ -40,4 +36,5 @@ post_patch() {
 
 post_install() {
 	vlicense LICENSE.md
+	vlicense docs/credits_acknowledgements.rst
 }

From 0701d95da462490a681c11e91575751d7d7af559 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, 20 Mar 2021 00:47:52 +0700
Subject: [PATCH 052/285] python3-occ: build with CMAKE_BUILD_TYPE=None

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

diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 705f37457943..3ea0ef5e6387 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -5,6 +5,7 @@ revision=1
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 wrksrc="pythonocc-core-${version}"
 build_style=cmake
+configure_args="-DPYTHONOCC_BUILD_TYPE=None -DCMAKE_BUILD_TYPE=None"
 hostmakedepends="python3 swig"
 makedepends="python3-devel occt-devel freetype-devel swig"
 depends="python3 occt freetype"

From 271f36002a92e7fa4b4660b6e11c48260165a51f 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, 19 Mar 2021 23:38:10 +0700
Subject: [PATCH 053/285] widelands: allow CMAKE_BUILD_TYPE=None

---
 srcpkgs/widelands-data                        |  1 -
 .../patches/cmake-build-type-none.patch       | 63 +++++++++++++++++++
 .../widelands/patches/fix-install-path.patch  | 40 ++++++++++++
 srcpkgs/widelands/template                    | 21 +------
 4 files changed, 105 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/widelands-data
 create mode 100644 srcpkgs/widelands/patches/cmake-build-type-none.patch
 create mode 100644 srcpkgs/widelands/patches/fix-install-path.patch

diff --git a/srcpkgs/widelands-data b/srcpkgs/widelands-data
deleted file mode 120000
index e9fbf89517f2..000000000000
--- a/srcpkgs/widelands-data
+++ /dev/null
@@ -1 +0,0 @@
-widelands
\ No newline at end of file
diff --git a/srcpkgs/widelands/patches/cmake-build-type-none.patch b/srcpkgs/widelands/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..3d210854741b
--- /dev/null
+++ b/srcpkgs/widelands/patches/cmake-build-type-none.patch
@@ -0,0 +1,63 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -202,7 +202,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWit
+   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+   option(OPTION_ASAN "Build with AddressSanitizer" ON)
+ else()
+-  message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
++  set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+ endif()
+ 
+ wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
+@@ -353,7 +353,7 @@ endif (OPTION_BUILD_TESTS)
+ install (
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
+   DESTINATION ${WL_INSTALL_BASEDIR}
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug
+   COMPONENT CoreVersionFile
+ )
+ 
+@@ -378,7 +378,6 @@ install(
+     data/txts
+     data/world
+   DESTINATION ${WL_INSTALL_DATADIR}
+-  CONFIGURATIONS Debug;Release
+   COMPONENT CoreDataFiles
+ )
+ 
+@@ -386,7 +385,6 @@ install(
+   DIRECTORY
+     data/maps
+   DESTINATION ${WL_INSTALL_DATADIR}
+-  CONFIGURATIONS Debug;Release
+   COMPONENT MapFiles
+ )
+ 
+@@ -395,7 +393,6 @@ install(
+     data/music
+     data/sound
+   DESTINATION ${WL_INSTALL_DATADIR}
+-  CONFIGURATIONS Debug;Release
+   COMPONENT MusicFiles
+ )
+ 
+@@ -405,7 +402,7 @@ install(
+     CREDITS
+     ChangeLog
+   DESTINATION ${WL_INSTALL_BASEDIR}
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug
+   COMPONENT CoreLicenseFiles
+ )
+ 
+@@ -424,7 +421,6 @@ install(
+   DIRECTORY
+     ${CMAKE_CURRENT_BINARY_DIR}/locale/
+   DESTINATION ${WL_INSTALL_DATADIR}/locale
+-  CONFIGURATIONS Debug;Release
+   COMPONENT CoreLanguageFiles
+ )
+ 
diff --git a/srcpkgs/widelands/patches/fix-install-path.patch b/srcpkgs/widelands/patches/fix-install-path.patch
new file mode 100644
index 000000000000..6bb461389f03
--- /dev/null
+++ b/srcpkgs/widelands/patches/fix-install-path.patch
@@ -0,0 +1,40 @@
+Index: cmake/WlFunctions.cmake
+===================================================================
+--- cmake/WlFunctions.cmake.orig
++++ cmake/WlFunctions.cmake
+@@ -289,5 +289,5 @@ function(wl_binary NAME)
+ 
+   #Quoting the CMake documentation on DESTINATION:
+   #"If a relative path is given it is interpreted relative to the value of CMAKE_INSTALL_PREFIX"
+-  install(TARGETS ${NAME} DESTINATION "." COMPONENT ExecutableFiles)
++  install(TARGETS ${NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ExecutableFiles)
+ endfunction()
+Index: xdg/CMakeLists.txt
+===================================================================
+--- xdg/CMakeLists.txt.orig
++++ xdg/CMakeLists.txt
+@@ -6,19 +6,19 @@ set(XDG_APPLICATION_ID "org.widelands.Wi
+ list(APPEND icon_sizes "16" "32" "48" "64" "128")
+ foreach (icon_size ${icon_sizes})
+   #install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png)
+-  install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ../share/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png)
++  install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION share/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png)
+ endforeach (icon_size ${icon_sizes})
+ #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6           DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6           DESTINATION ../share/man/man6)
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6           DESTINATION share/man/man6)
+ #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop     DESTINATION ../share/applications)
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop     DESTINATION share/applications)
+ #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ../share/metainfo)
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION share/metainfo)
+ 
+ find_program(GTK_UPDATE_ICON_CACHE NAMES gtk-update-icon-cache)
+ if (GTK_UPDATE_ICON_CACHE)
+   #install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor ||: )")
+-  install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/../share/icons/hicolor ||: )")
++  install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor ||: )")
+ else (GTK_UPDATE_ICON_CACHE)
+   message(WARNING "gtk-update-icon-cache not found!")
+ endif (GTK_UPDATE_ICON_CACHE)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 6cee85087ea7..cfa2c10993e0 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=3
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -10,13 +10,13 @@ hostmakedepends="python3 pkg-config gettext"
 makedepends="boost-devel icu-devel minizip-devel gettext-devel
  glu-devel glew-devel SDL2-devel SDL2_gfx-devel SDL2_image-devel
  SDL2_net-devel SDL2_mixer-devel SDL2_ttf-devel"
-depends="${pkgname}-data-${version}_${revision}"
 short_desc="Real-time strategy game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://www.widelands.org/"
 distfiles="https://github.com/widelands/widelands/archive/build${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=601e0e4c6f91b3fb0ece2cd1b83ecfb02344a1b9194fbb70ef3f70e06994e357
+replaces="widelands-data>=0"
 
 CXXFLAGS="-DU_USING_ICU_NAMESPACE=1"
 
@@ -29,22 +29,5 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 post_install() {
-	# For some reason the binary is installed as /usr/widelands - move it
-	vmkdir usr/bin
-	mv ${DESTDIR}/usr/${pkgname} ${DESTDIR}/usr/bin
-	vmkdir usr/share
-	mv ${DESTDIR}/share/* ${DESTDIR}/usr/share/
-	rmdir ${DESTDIR}/share
-
-	# Remove files not needed in the package
-	rm -f ${DESTDIR}/usr/COPYING ${DESTDIR}/usr/CREDITS ${DESTDIR}/usr/ChangeLog ${DESTDIR}/usr/VERSION
-
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
 }
-
-widelands-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/widelands
-	}
-}

From 0a0473b401e82593a7acfa1d81ec6d5bdfcd30e1 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, 20 Mar 2021 09:49:25 +0700
Subject: [PATCH 054/285] zziplib: fix SONAME when build with
 -DCMAKE_BUILD_TYPE=None

---
 .../cmake-build-type-none-soname.patch        | 35 +++++++++++++++++++
 srcpkgs/zziplib/template                      |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 srcpkgs/zziplib/patches/cmake-build-type-none-soname.patch

diff --git a/srcpkgs/zziplib/patches/cmake-build-type-none-soname.patch b/srcpkgs/zziplib/patches/cmake-build-type-none-soname.patch
new file mode 100644
index 000000000000..2d31b5b8a46a
--- /dev/null
+++ b/srcpkgs/zziplib/patches/cmake-build-type-none-soname.patch
@@ -0,0 +1,35 @@
+Index: zziplib-0.13.72/zzip/CMakeLists.txt
+===================================================================
+--- zziplib-0.13.72.orig/zzip/CMakeLists.txt
++++ zziplib-0.13.72/zzip/CMakeLists.txt
+@@ -190,15 +190,18 @@ target_include_directories (libzzipmmapp
+ endif()
+ 
+ set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip" RELEASE_POSTFIX "-${RELNUM}")
++set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip" NONE_POSTFIX "-${RELNUM}")
+ SET_TARGET_PROPERTIES(libzzip PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+ 
+ if(ZZIPFSEEKO)
+ set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko" RELEASE_POSTFIX "-${RELNUM}")
++set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko" NONE_POSTFIX "-${RELNUM}")
+ SET_TARGET_PROPERTIES(libzzipfseeko PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+ endif()
+ 
+ if(ZZIPMMAPPED)
+ set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEASE_POSTFIX "-${RELNUM}")
++set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" NONE_POSTFIX "-${RELNUM}")
+ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+ endif()
+ 
+Index: zziplib-0.13.72/zzipwrap/CMakeLists.txt
+===================================================================
+--- zziplib-0.13.72.orig/zzipwrap/CMakeLists.txt
++++ zziplib-0.13.72/zzipwrap/CMakeLists.txt
+@@ -49,6 +49,7 @@ target_link_libraries(libzzipwrap libzzi
+ target_include_directories(libzzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+ 
+ set_target_properties(libzzipwrap PROPERTIES OUTPUT_NAME "zzipwrap" RELEASE_POSTFIX "-${RELNUM}")
++set_target_properties(libzzipwrap PROPERTIES OUTPUT_NAME "zzipwrap" NONE_POSTFIX "-${RELNUM}")
+ SET_TARGET_PROPERTIES(libzzipwrap PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+ set_target_properties(libzzipwrap PROPERTIES DEFINE_SYMBOL "libzzip_EXPORTS")
+ 
diff --git a/srcpkgs/zziplib/template b/srcpkgs/zziplib/template
index ab5af234af62..2026f3e4a521 100644
--- a/srcpkgs/zziplib/template
+++ b/srcpkgs/zziplib/template
@@ -12,6 +12,7 @@ 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=93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc
+patch_args=-Np1
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DZZIPTEST=OFF"

From 49483e47672f7b008ee72eafd734d436bfbc00f8 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, 21 Mar 2021 15:28:04 +0700
Subject: [PATCH 055/285] mellowplayer: fix build

---
 srcpkgs/mellowplayer/patches/no-werror.patch | 13 +++++++++++++
 srcpkgs/mellowplayer/template                | 13 +++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/mellowplayer/patches/no-werror.patch

diff --git a/srcpkgs/mellowplayer/patches/no-werror.patch b/srcpkgs/mellowplayer/patches/no-werror.patch
new file mode 100644
index 000000000000..7e678453a123
--- /dev/null
+++ b/srcpkgs/mellowplayer/patches/no-werror.patch
@@ -0,0 +1,13 @@
+Index: MellowPlayer-3.6.6/src/3rdparty/boost/di.hpp
+===================================================================
+--- MellowPlayer-3.6.6.orig/src/3rdparty/boost/di.hpp
++++ MellowPlayer-3.6.6/src/3rdparty/boost/di.hpp
+@@ -67,7 +67,7 @@ BOOST_DI_CFG_FWD
+ #pragma clang diagnostic error "-Wundefined-internal"
+ #pragma clang diagnostic ignored "-Wmissing-field-initializers"
+ #elif defined(__GCC__)
+-#pragma GCC diagnostic error "-Wdeprecated-declarations"
++#pragma GCC diagnostic warning "-Wdeprecated-declarations"
+ #pragma GCC diagnostic push
+ #if (__GNUC__ < 6)
+ #pragma GCC diagnostic error "-Werror"
diff --git a/srcpkgs/mellowplayer/template b/srcpkgs/mellowplayer/template
index 2f8f13960ca6..cfd8a185556f 100644
--- a/srcpkgs/mellowplayer/template
+++ b/srcpkgs/mellowplayer/template
@@ -4,7 +4,7 @@ version=3.6.6
 revision=1
 wrksrc="MellowPlayer-${version}"
 build_style=cmake
-hostmakedepends="pkg-config qt5-tools qt5-qmake"
+hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols2-devel
  qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite
  qt5-plugin-tds qt5-plugin-odbc
@@ -17,11 +17,12 @@ license="GPL-2.0-or-later"
 homepage="https://colinduquesnoy.gitlab.io/MellowPlayer/"
 distfiles="https://gitlab.com/ColinDuquesnoy/MellowPlayer/-/archive/${version}/MellowPlayer-${version}.tar.bz2"
 checksum=17b8b25ca6b3d27b223f8be6ad80186ae5bd17ce762eb04ecd8b0e82e687b327
+patch_args=-Np1
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools"
+if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	arm*) broken="qt5-webengine not available" ;;
-esac
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi

From c14f08c76ff09177b5a29e6114e54bc631286b86 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, 21 Mar 2021 15:43:09 +0700
Subject: [PATCH 056/285] ispc: fix CMAKE_BUILD_TYPE=None

---
 .../ispc/patches/cmake-build-type-none.patch   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/ispc/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/ispc/patches/cmake-build-type-none.patch b/srcpkgs/ispc/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..411e353c7314
--- /dev/null
+++ b/srcpkgs/ispc/patches/cmake-build-type-none.patch
@@ -0,0 +1,18 @@
+Index: ispc-1.15.0/CMakeLists.txt
+===================================================================
+--- ispc-1.15.0.orig/CMakeLists.txt
++++ ispc-1.15.0/CMakeLists.txt
+@@ -157,13 +157,6 @@ set(OUTPUT_RELEASE Release/bin)
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin )
+ 
+ if(CMAKE_BUILD_TYPE)
+-    # Validate build type
+-    set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
+-
+-    string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
+-    if (${MATCHED_CONFIG} EQUAL -1)
+-         message(FATAL_ERROR "CMAKE_BUILD_TYPE (${CMAKE_BUILD_TYPE}) allows only the following values: ${CONFIGURATION_TYPES}")
+-    endif()
+ else(NOT CMAKE_BUILD_TYPE)
+     set(CMAKE_BUILD_TYPE "Release")
+     message(STATUS "Build type not specified: Use Release by default.")

From 44081fc5dbf570db8f7e49066735e6bc252cf4a7 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, 21 Mar 2021 15:56:50 +0700
Subject: [PATCH 057/285] darktable: fix CMAKE_BUILD_TYPE=None

---
 .../darktable/patches/cmake-build-type-none.patch  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/darktable/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/darktable/patches/cmake-build-type-none.patch b/srcpkgs/darktable/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..7101f9c1a0e7
--- /dev/null
+++ b/srcpkgs/darktable/patches/cmake-build-type-none.patch
@@ -0,0 +1,14 @@
+Index: src/external/rawspeed/cmake/build-type.cmake
+===================================================================
+--- src/external/rawspeed/cmake/build-type.cmake.orig
++++ src/external/rawspeed/cmake/build-type.cmake
+@@ -27,9 +27,6 @@ string(TOUPPER "${RAWSPEED_SPECIAL_BUILD
+ 
+ # is this one of the known build types?
+ list (FIND CMAKE_CONFIGURATION_TYPES_UPPERCASE ${CMAKE_BUILD_TYPE_UPPERCASE} BUILD_TYPE_IS_KNOWN)
+-if (${BUILD_TYPE_IS_KNOWN} EQUAL -1)
+- message(SEND_ERROR "Unknown build type: ${CMAKE_BUILD_TYPE_UPPERCASE}. Please specify one of: ${CMAKE_CONFIGURATION_TYPES}")
+-endif()
+ 
+ # is this a special build?
+ list (FIND RAWSPEED_SPECIAL_BUILD_TYPES_UPPERCASE ${CMAKE_BUILD_TYPE_UPPERCASE} IS_SPECIAL_BUILD)

From b4be32c233bfe2406ef22b196d571c01925b3c01 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, 21 Mar 2021 15:33:29 +0700
Subject: [PATCH 058/285] hedgewars: merge -data back

---
 srcpkgs/hedgewars-data                        |  1 -
 .../patches/cmake-build-type-none.patch       | 30 +++++++++++++++++++
 srcpkgs/hedgewars/template                    | 23 +++++---------
 3 files changed, 38 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/hedgewars-data
 create mode 100644 srcpkgs/hedgewars/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/hedgewars-data b/srcpkgs/hedgewars-data
deleted file mode 120000
index b57dc45ebadc..000000000000
--- a/srcpkgs/hedgewars-data
+++ /dev/null
@@ -1 +0,0 @@
-hedgewars
\ No newline at end of file
diff --git a/srcpkgs/hedgewars/patches/cmake-build-type-none.patch b/srcpkgs/hedgewars/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..b4e0c186717c
--- /dev/null
+++ b/srcpkgs/hedgewars/patches/cmake-build-type-none.patch
@@ -0,0 +1,30 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -54,7 +54,7 @@ option(NOVERSIONINFOUPDATE "Disable upda
+ 
+ 
+ if(BUILD_ENGINE_C AND NOT NOVIDEOREC)
+-    if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
++    if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+         message("NOTE: Video recorder support disabled. It's incompatible with BUILD_ENGINE_C")
+         set(BUILD_ENGINE_C ON CACHE STRING "Required for BUILD_ENGINE_JS" FORCE)
+     else()
+@@ -93,7 +93,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR 1)
+ set(CPACK_PACKAGE_VERSION_MINOR 0)
+ set(CPACK_PACKAGE_VERSION_PATCH 0)
+ set(HEDGEWARS_PROTO_VER 59)
+-if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
++if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+     set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ else()
+     set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-dev")
+@@ -114,6 +114,7 @@ include(${CMAKE_MODULE_PATH}/platform.cm
+ if(CMAKE_BUILD_TYPE)
+     if(NOT((CMAKE_BUILD_TYPE STREQUAL "Release") OR
+            (CMAKE_BUILD_TYPE STREQUAL "Debug") OR
++	   (CMAKE_BUILD_TYPE STREQUAL "None") OR
+            (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")))
+         set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release/RelWithDebInfo)" FORCE)
+         message(STATUS "Unknown build type ${CMAKE_BUILD_TYPE}, using default (${default_build_type})")
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index d2294cf572f5..aed3c03caf89 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -1,15 +1,16 @@
 # Template file for 'hedgewars'
 pkgname=hedgewars
 version=1.0.0
-revision=2
+revision=3
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
 configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
- -DPHYSFS_SYSTEM=1 -DCMAKE_VERBOSE_MAKEFILE=1 -DMINIMAL_FLAGS=1"
-hostmakedepends="lua51 pkg-config"
+ -DPHYSFS_SYSTEM=1 -DMINIMAL_FLAGS=1"
+make_cmd=make
+hostmakedepends="lua51 pkg-config qt5-qmake qt5-host-tools"
 makedepends="ffmpeg-devel lua51-devel physfs-devel qt5-tools-devel SDL2_image-devel
  SDL2_mixer-devel SDL2_net-devel SDL2_ttf-devel"
-depends="hedgewars-data>=${version}_${revision} libfreeglut"
+depends="libfreeglut"
 short_desc="Funny turn-based artillery game, featuring fighting Hedgehogs!"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-2.0-only"
@@ -18,10 +19,8 @@ distfiles="https://hedgewars.org/download/releases/hedgewars-src-${version}.tar.
 checksum=211634e61f2e4beecc3c98c6f749601fcd08321fda1ba969b3b3832a004f155b
 nopie_files="/usr/bin/hwengine"
 nocross="Needs investigation: fails to link hwengine"
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
+replaces="hedgewars-data>=0"
+export CMAKE_GENERATOR="Unix Makefiles"
 
 case $XBPS_TARGET_MACHINE in
 	x86_64*)
@@ -38,6 +37,7 @@ esac
 
 if [ -n "$_use_c_engine" ]; then
 	hostmakedepends+=" glew-devel libatomic-devel ghc clang"
+	makedepends+=" glew-devel libatomic-devel"
 	configure_args+=" -DBUILD_ENGINE_C=1"
 	nopie_files+=" /usr/bin/hedgewars"
 fi
@@ -56,10 +56,3 @@ pre_configure() {
 post_install() {
 	vinstall ${DESTDIR}/usr/share/hedgewars/Data/misc/hedgewars.desktop 644 usr/share/applications
 }
-
-hedgewars-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/hedgewars/Data
-	}
-}

From bf3a8f6ceb48b90d5858de998d352cb0c173a936 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, 21 Mar 2021 16:41:58 +0700
Subject: [PATCH 059/285] mariadb: fix for CMAKE_BUILD_TYPE=None

---
 srcpkgs/mariadb/template | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 437ff757b383..78d5e2dbdbe8 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -34,35 +34,31 @@ replaces="mysql>=0"
 conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon"
+CFLAGS="-w -fcommon -DDBUG_OFF=1"
+CXXFLAGS="-DDBUG_OFF=1"
 
 pre_configure() {
 	# We need some host binaries before starting cross compilation.
 	if [ "$CROSS_BUILD" ]; then
+		mkdir -p build.native
 		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake .
-		make comp_err comp_sql gen_lex_hash gen_lex_token
-		mkdir bin.host
-		cp extra/comp_err bin.host
-		cp scripts/comp_sql bin.host
-		cp sql/gen_lex_hash bin.host
-		cp sql/gen_lex_token bin.host
-		make clean
-		rm CMakeCache.txt
+		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
+			cmake -S . -B build.native
+		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
 	fi
 }
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		# CMake complains if those binaries ain't in build
-		cp bin.host/comp_err ${wrksrc}/extra
-		cp bin.host/comp_err ${wrksrc}/build/extra
-		cp bin.host/comp_sql ${wrksrc}/scripts
-		cp bin.host/comp_sql ${wrksrc}/build/scripts
-		cp bin.host/gen_lex_hash ${wrksrc}/sql
-		cp bin.host/gen_lex_hash ${wrksrc}/build/sql
-		cp bin.host/gen_lex_token ${wrksrc}/sql
-		cp bin.host/gen_lex_token ${wrksrc}/build/sql
+		cp build.native/extra/comp_err ${wrksrc}/extra
+		cp build.native/extra/comp_err ${wrksrc}/build/extra
+		cp build.native/scripts/comp_sql ${wrksrc}/scripts
+		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
+		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
+		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
+		cp build.native/sql/gen_lex_token ${wrksrc}/sql
+		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
 		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
 	fi
 	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability

From 905b74ffbd6acd1f10d05150e5dd02fdc92cd099 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, 25 Mar 2021 07:58:28 +0700
Subject: [PATCH 060/285] EternalTerminal: remove -ggdb3

---
 .../EternalTerminal/patches/fix-cflags.patch    | 17 +++++++++++++++++
 srcpkgs/EternalTerminal/template                |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/EternalTerminal/patches/fix-cflags.patch

diff --git a/srcpkgs/EternalTerminal/patches/fix-cflags.patch b/srcpkgs/EternalTerminal/patches/fix-cflags.patch
new file mode 100644
index 000000000000..e6fcd432f7e7
--- /dev/null
+++ b/srcpkgs/EternalTerminal/patches/fix-cflags.patch
@@ -0,0 +1,17 @@
+Index: EternalTerminal-et-v6.0.13/CMakeLists.txt
+===================================================================
+--- EternalTerminal-et-v6.0.13.orig/CMakeLists.txt
++++ EternalTerminal-et-v6.0.13/CMakeLists.txt
+@@ -26,12 +26,6 @@ if(DISABLE_CRASH_LOG)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DELPP_DISABLE_DEFAULT_CRASH_HANDLING")
+ ENDIF(DISABLE_CRASH_LOG)
+ 
+-if(UNIX)
+-  # Enable debug info
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -ggdb3")
+-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -ggdb3")
+-endif()
+-
+ # Enable C++-11
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index 7bac78d2ffd4..bc92e47743dd 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -13,6 +13,7 @@ homepage="https://eternalterminal.dev/"
 distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz"
 checksum=728c3a444d666897c710e33fe473d8d289263a59574451b13aa53ec3c6ac88b3
 system_accounts="_eternal"
+patch_args=-Np1
 
 LDFLAGS="-lgflags"
 

From e892439322c343739731c12d07e05e8085c93033 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, 25 Mar 2021 08:20:29 +0700
Subject: [PATCH 061/285] OTPClient: respect CFLAGS

---
 srcpkgs/OTPClient/patches/fix-cflags.patch | 17 +++++++++++++++++
 srcpkgs/OTPClient/template                 |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/OTPClient/patches/fix-cflags.patch

diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
new file mode 100644
index 000000000000..ae70f441538f
--- /dev/null
+++ b/srcpkgs/OTPClient/patches/fix-cflags.patch
@@ -0,0 +1,17 @@
+Index: OTPClient-2.4.2/CMakeLists.txt
+===================================================================
+--- OTPClient-2.4.2.orig/CMakeLists.txt
++++ OTPClient-2.4.2/CMakeLists.txt
+@@ -11,11 +11,10 @@ option(BUILD_GUI "Build the GUI" ON)
+ option(BUILD_CLI "Build the CLI" ON)
+ 
+ set(CMAKE_C_STANDARD 11)
+-set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always -Wstrict-prototypes -Wunreachable-code")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wchar-subscripts -Wwrite-strings -Wpointer-arith -Wbad-function-cast -Wcast-align")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=format-security -Werror=implicit-function-declaration -Wno-sign-compare")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
+ if(CMAKE_COMPILER_IS_GNUCC)
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE")
+ endif()
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index e8c0099850b7..f5af76e655a6 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -12,3 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/paolostivanin/OTPClient"
 distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
 checksum=74bc4312aa1cd336ca983434e3bed951c5ead327091e7708e3beb08508813495
+patch_args=-Np1

From a27c675baf32dea5891350952fc9ecf72fdf3267 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, 25 Mar 2021 08:30:31 +0700
Subject: [PATCH 062/285] crex: hardening

---
 srcpkgs/crex/patches/fix-cflags.patch | 20 ++++++++++++++++++++
 srcpkgs/crex/template                 |  7 ++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/crex/patches/fix-cflags.patch

diff --git a/srcpkgs/crex/patches/fix-cflags.patch b/srcpkgs/crex/patches/fix-cflags.patch
new file mode 100644
index 000000000000..d191fb1e9ec0
--- /dev/null
+++ b/srcpkgs/crex/patches/fix-cflags.patch
@@ -0,0 +1,20 @@
+Index: crex-0.2.5/CMakeLists.txt
+===================================================================
+--- crex-0.2.5.orig/CMakeLists.txt
++++ crex-0.2.5/CMakeLists.txt
+@@ -13,9 +13,6 @@ endif(CCACHE_FOUND)
+ set (CMAKE_CXX_STANDARD 14)
+ set (CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+-set (CMAKE_CXX_FLAGS "-fdiagnostics-color=auto")
+-set (CMAKE_C_FLAGS "-fdiagnostics-color=auto")
+-
+ set (DEBUG_FLAGS "-Wpedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused -std=c++14 -g")
+ set (DEBUG_LINK_FLAGS "-fprofile-arcs -ftest-coverage -flto")
+ 
+@@ -56,4 +53,4 @@ target_link_libraries (
+   ${TARGET}
+ )
+ 
+-install (TARGETS ${TARGET} DESTINATION "/usr/local/bin")
++install (TARGETS ${TARGET} DESTINATION "/usr/bin")
diff --git a/srcpkgs/crex/template b/srcpkgs/crex/template
index a54697a93adc..2f455a0b0c72 100644
--- a/srcpkgs/crex/template
+++ b/srcpkgs/crex/template
@@ -1,7 +1,7 @@
 # Template file for 'crex'
 pkgname=crex
 version=0.2.5
-revision=1
+revision=2
 build_style=cmake
 short_desc="Explore, test, and check regular expressions in the terminal"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -9,10 +9,7 @@ license="MIT"
 homepage="https://github.com/octobanana/crex"
 distfiles="https://github.com/octobanana/crex/archive/${version}.tar.gz"
 checksum=c6a166b7a1e696a7babeaf7c5728eece1624704a18357f827129fc95ef2ecc56
-
-pre_configure() {
-	sed -e 's|/local/|/|' -i CMakeLists.txt
-}
+patch_args=-Np1
 
 post_install() {
 	vlicense LICENSE

From 7b994b88c9ae654bbc567717c24f886a91773433 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, 25 Mar 2021 08:34:32 +0700
Subject: [PATCH 063/285] libbaseencode: hardening

---
 srcpkgs/libbaseencode/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/libbaseencode/template                 |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libbaseencode/patches/fix-cflags.patch

diff --git a/srcpkgs/libbaseencode/patches/fix-cflags.patch b/srcpkgs/libbaseencode/patches/fix-cflags.patch
new file mode 100644
index 000000000000..1bb86a0b15a4
--- /dev/null
+++ b/srcpkgs/libbaseencode/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: libbaseencode-1.0.9/CMakeLists.txt
+===================================================================
+--- libbaseencode-1.0.9.orig/CMakeLists.txt
++++ libbaseencode-1.0.9/CMakeLists.txt
+@@ -15,7 +15,7 @@ set(CMAKE_C_STANDARD 11)
+ set(BASEENCODE_HEADERS src/baseencode.h)
+ set(SOURCE_FILES src/base32.c src/base64.c)
+ 
+-set(CMAKE_C_FLAGS "-Wall -Werror -fPIC")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -fPIC")
+ 
+ add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES})
+ 
diff --git a/srcpkgs/libbaseencode/template b/srcpkgs/libbaseencode/template
index 384a189224df..d5929ad7bb51 100644
--- a/srcpkgs/libbaseencode/template
+++ b/srcpkgs/libbaseencode/template
@@ -1,7 +1,7 @@
 # Template file for 'libbaseencode'
 pkgname=libbaseencode
 version=1.0.9
-revision=1
+revision=2
 build_style=cmake
 short_desc="Library for encoding decoding data use base32 or base64"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -9,6 +9,7 @@ license="Apache-2.0"
 homepage="https://github.com/paolostivanin/libbaseencode"
 distfiles="https://github.com/paolostivanin/libbaseencode/archive/v${version}.tar.gz"
 checksum=a183d7cf30d931b2a078d6f0ef64616b71ab26f9258e5f4e191778c7ace7175d
+patch_args=-Np1
 
 libbaseencode-devel_package() {
 	depends="libbaseencode-${version}_${revision}"

From 370942822d212bd0c62072b09a373921f216ff10 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, 26 Mar 2021 08:46:56 +0700
Subject: [PATCH 064/285] bibletime: clean build flags

---
 srcpkgs/bibletime/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/bibletime/template                 |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/bibletime/patches/fix-cflags.patch

diff --git a/srcpkgs/bibletime/patches/fix-cflags.patch b/srcpkgs/bibletime/patches/fix-cflags.patch
new file mode 100644
index 000000000000..480c5ca4ac1e
--- /dev/null
+++ b/srcpkgs/bibletime/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: bibletime-3.0/cmake/BTApplication.cmake
+===================================================================
+--- bibletime-3.0.orig/cmake/BTApplication.cmake
++++ bibletime-3.0/cmake/BTApplication.cmake
+@@ -41,7 +41,7 @@ IF(WIN32)
+     ADD_COMPILE_OPTIONS("/Zi")
+ ELSE()
+     ADD_COMPILE_OPTIONS(
+-        "-ggdb" "-Wall" "-Wextra"
++        "-Wall" "-Wextra" "-DNDEBUG" "-DQT_NO_DEBUG"
+         "$<$<STREQUAL:$<CONFIGURATION>,Release>:-O2>"
+         "$<$<STREQUAL:$<CONFIGURATION>,Release>:-DNDEBUG>"
+         "$<$<STREQUAL:$<CONFIGURATION>,Release>:-DQT_NO_DEBUG>"
diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template
index 224881c45516..85bcc7f22f87 100644
--- a/srcpkgs/bibletime/template
+++ b/srcpkgs/bibletime/template
@@ -18,6 +18,7 @@ license="GPL-2.0-or-later"
 homepage="http://bibletime.info"
 distfiles="https://github.com/bibletime/bibletime/releases/download/v${version}/bibletime-${version}.tar.xz"
 checksum=d6beef62ad44b255e3dc4c5e89214bf01a0e85c9136073b0be12fca3d2b22622
+patch_args=-Np1
 
 pre_build() {
 	. /etc/profile.d/10_openjdk11.sh

From bfc81fa0168e20a28ad2ec2f5fae55e5cba9fa10 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, 26 Mar 2021 08:54:25 +0700
Subject: [PATCH 065/285] boomerang: clean build flags

---
 srcpkgs/boomerang/patches/fix-cflags.patch | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/boomerang/patches/fix-cflags.patch

diff --git a/srcpkgs/boomerang/patches/fix-cflags.patch b/srcpkgs/boomerang/patches/fix-cflags.patch
new file mode 100644
index 000000000000..eb59766c1c5b
--- /dev/null
+++ b/srcpkgs/boomerang/patches/fix-cflags.patch
@@ -0,0 +1,21 @@
+Index: cmake-scripts/boomerang-flags.cmake
+===================================================================
+--- cmake-scripts/boomerang-flags.cmake
++++ cmake-scripts/boomerang-flags.cmake
+@@ -104,16 +104,6 @@ endif ()
+ 
+ 
+ if (NOT MSVC)
+-    if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+-        BOOMERANG_ADD_COMPILE_FLAGS(-O0)
+-    elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
+-        # No special flags
+-    elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel")
+-        BOOMERANG_ADD_COMPILE_FLAGS(-Os)
+-    else () # Release
+-        BOOMERANG_ADD_COMPILE_FLAGS(-O3)
+-    endif ()
+-
+     if (BOOMERANG_ENABLE_COVERAGE)
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")

From b7ef31b86be8063dc7b1e944ed7c04e2f970d5ef 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, 26 Mar 2021 08:58:11 +0700
Subject: [PATCH 066/285] catimg: don't change our build-type

---
 srcpkgs/catimg/patches/fix-cflags.patch | 12 ++++++++++++
 srcpkgs/catimg/template                 |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/catimg/patches/fix-cflags.patch

diff --git a/srcpkgs/catimg/patches/fix-cflags.patch b/srcpkgs/catimg/patches/fix-cflags.patch
new file mode 100644
index 000000000000..9b9f1074ef20
--- /dev/null
+++ b/srcpkgs/catimg/patches/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: catimg-2.7.0/CMakeLists.txt
+===================================================================
+--- catimg-2.7.0.orig/CMakeLists.txt
++++ catimg-2.7.0/CMakeLists.txt
+@@ -11,7 +11,6 @@ endif()
+ #set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra -g -std=c99 -Wno-unused-result")
+ #set(CMAKE_BUILD_TYPE Debug)
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -Wextra -Os -std=c99 -Wno-unused-result")
+-set(CMAKE_BUILD_TYPE Release)
+ 
+ set(SRC ${PROJECT_SOURCE_DIR}/src)
+ 
diff --git a/srcpkgs/catimg/template b/srcpkgs/catimg/template
index 374351c45379..6fbc5f1d9140 100644
--- a/srcpkgs/catimg/template
+++ b/srcpkgs/catimg/template
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/posva/catimg"
 distfiles="https://github.com/posva/catimg/archive/${version}.tar.gz"
 checksum=3a6450316ff62fb07c3facb47ea208bf98f62abd02783e88c56f2a6508035139
-
+patch_args=-Np1
 CFLAGS="-fcommon"
 
 post_install() {

From d09e05812c5c398f6cb27afe7738debbba881697 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, 26 Mar 2021 09:09:37 +0700
Subject: [PATCH 067/285] libcotp: fix build flags

---
 srcpkgs/libcotp/patches/fix-cflags.patch | 14 ++++++++++++++
 srcpkgs/libcotp/template                 |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 srcpkgs/libcotp/patches/fix-cflags.patch

diff --git a/srcpkgs/libcotp/patches/fix-cflags.patch b/srcpkgs/libcotp/patches/fix-cflags.patch
new file mode 100644
index 000000000000..397b3960e9f4
--- /dev/null
+++ b/srcpkgs/libcotp/patches/fix-cflags.patch
@@ -0,0 +1,14 @@
+Index: libcotp-1.2.2/CMakeLists.txt
+===================================================================
+--- libcotp-1.2.2.orig/CMakeLists.txt
++++ libcotp-1.2.2/CMakeLists.txt
+@@ -25,8 +25,7 @@ set(CMAKE_C_STANDARD 11)
+ set(COTP_HEADERS src/cotp.h)
+ set(SOURCE_FILES src/otp.c)
+ 
+-set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wno-format-truncation -fstack-protector-strong -fPIC")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-format-truncation -fstack-protector-strong -fPIC")
+ 
+ add_library(cotp SHARED ${SOURCE_FILES})
+ 
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 9e147ff7deb6..88337290d1e8 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
 homepage="https://github.com/paolostivanin/libcotp"
 distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
 checksum=25b45ffa4aece5cc689503ebea7356a2f760c194f0c41805934495d2fe7165b1
+patch_args=-Np1
 
 libcotp-devel_package() {
 	depends="libcotp-${version}_${revision}"

From fd6378a4dc9bab38f1e81876f1e6cb6a2619c226 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, 26 Mar 2021 21:06:07 +0700
Subject: [PATCH 068/285] loudgain: hardening

---
 srcpkgs/loudgain/patches/fix-cflags.patch | 20 ++++++++++++++++++++
 srcpkgs/loudgain/template                 |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch

diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
new file mode 100644
index 000000000000..25b2c969bef4
--- /dev/null
+++ b/srcpkgs/loudgain/patches/fix-cflags.patch
@@ -0,0 +1,20 @@
+Index: loudgain-0.6.8/CMakeLists.txt
+===================================================================
+--- loudgain-0.6.8.orig/CMakeLists.txt
++++ loudgain-0.6.8/CMakeLists.txt
+@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
+ )
+ 
+ SET_TARGET_PROPERTIES(loudgain PROPERTIES
+-  COMPILE_FLAGS "-Wall -pedantic -g"
++  COMPILE_FLAGS "-Wall -pedantic"
+ )
+ 
+-SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
+ 
+-SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
+ 
+ INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+ 
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
index f29167883439..00b2d20d27d6 100644
--- a/srcpkgs/loudgain/template
+++ b/srcpkgs/loudgain/template
@@ -1,7 +1,7 @@
 # Template file for 'loudgain'
 pkgname=loudgain
 version=0.6.8
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libebur128-devel taglib-devel ffmpeg-devel"
@@ -11,6 +11,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/Moonbase59/loudgain"
 distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
 checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
+patch_args=-Np1
 
 post_install() {
 	vlicense COPYING

From e0ad9292b3d52bd62c41385cfb31855cdd35083b 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, 26 Mar 2021 21:20:13 +0700
Subject: [PATCH 069/285] msg2: hardening

---
 srcpkgs/msg2/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/msg2/template                 |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/msg2/patches/fix-cflags.patch

diff --git a/srcpkgs/msg2/patches/fix-cflags.patch b/srcpkgs/msg2/patches/fix-cflags.patch
new file mode 100644
index 000000000000..64404bf44fcb
--- /dev/null
+++ b/srcpkgs/msg2/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -3,7 +3,7 @@ project(msg2)
+ 
+ # Flags
+ set(CMAKE_CXX_STANDARD 17)
+-set(CMAKE_CXX_FLAGS "-Os -pipe -fPIC -fno-plt -fstack-protector-strong -Wall -Wshadow -pedantic -Wno-parentheses -Wfatal-errors")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -fPIC -fno-plt -fstack-protector-strong -Wall -Wshadow -pedantic -Wno-parentheses -Wfatal-errors")
+ 
+ # Add source files
+ add_executable(msg2 main.cpp)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index b4f77400bf22..473b3c4ec4d2 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
 # Template file for 'msg2'
 pkgname=msg2
 version=1.2.0
-revision=1
+revision=2
 build_style=cmake
 short_desc="Output a blue arrow and a white message on the commandline"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 85f9cfa1c645a4a9bb571c2dd314078967892400 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, 26 Mar 2021 21:22:55 +0700
Subject: [PATCH 070/285] ippusbxd: fix cflags -O2 not -o2

---
 srcpkgs/ippusbxd/patches/fix-cflags.patch | 12 ++++++++++++
 srcpkgs/ippusbxd/template                 |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/ippusbxd/patches/fix-cflags.patch

diff --git a/srcpkgs/ippusbxd/patches/fix-cflags.patch b/srcpkgs/ippusbxd/patches/fix-cflags.patch
new file mode 100644
index 000000000000..5d36903c3ffd
--- /dev/null
+++ b/srcpkgs/ippusbxd/patches/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 2.6)
+ project(ippusbxd)
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -o2 -g -std=c99 -Wall -Wextra -pedantic -pedantic-errors")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -pedantic -pedantic-errors")
+ 
+ 
+ # Compiler specific configuration
diff --git a/srcpkgs/ippusbxd/template b/srcpkgs/ippusbxd/template
index ce4ff2ea9125..e81064e8b91d 100644
--- a/srcpkgs/ippusbxd/template
+++ b/srcpkgs/ippusbxd/template
@@ -1,7 +1,7 @@
 # Template file for 'ippusbxd'
 pkgname=ippusbxd
 version=1.34
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make

From f32eab398875a97d9869239368990d41f813aee3 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, 26 Mar 2021 21:34:52 +0700
Subject: [PATCH 071/285] tlsh: respect -g + hardening

---
 srcpkgs/tlsh/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/tlsh/template                 |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/tlsh/patches/fix-cflags.patch

diff --git a/srcpkgs/tlsh/patches/fix-cflags.patch b/srcpkgs/tlsh/patches/fix-cflags.patch
new file mode 100644
index 000000000000..8715563715c7
--- /dev/null
+++ b/srcpkgs/tlsh/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -125,7 +125,7 @@ if (CMAKE_BUILD_TYPE STREQUAL Debug)
+     endif()
+ else(CMAKE_BUILD_TYPE STREQUAL Debug)
+     if(CMAKE_COMPILER_IS_GNUCXX)
+-        set(CMAKE_CXX_FLAGS "-O2 -fvisibility=internal")  ## Remove TlshImpl symbols
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=internal")  ## Remove TlshImpl symbols
+     endif()
+     if(MSVC)
+         set(CMAKE_CXX_FLAGS "/O2")        ## Optimize
diff --git a/srcpkgs/tlsh/template b/srcpkgs/tlsh/template
index 1f96834107cc..4ee1ccdc728a 100644
--- a/srcpkgs/tlsh/template
+++ b/srcpkgs/tlsh/template
@@ -1,7 +1,7 @@
 # Template file for 'tlsh'
 pkgname=tlsh
 version=3.19.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-devel"

From 64fec7d3c9836c153a5b0e9060c083cc972f626b 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, 26 Mar 2021 21:59:06 +0700
Subject: [PATCH 072/285] poppler: hardening + respect -g

---
 srcpkgs/poppler/patches/fix-cflags.patch | 21 +++++++++++++++++++++
 srcpkgs/poppler/template                 |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/poppler/patches/fix-cflags.patch

diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
new file mode 100644
index 000000000000..9e62b11010ba
--- /dev/null
+++ b/srcpkgs/poppler/patches/fix-cflags.patch
@@ -0,0 +1,21 @@
+Index: cmake/modules/PopplerMacros.cmake
+===================================================================
+--- cmake/modules/PopplerMacros.cmake.orig
++++ cmake/modules/PopplerMacros.cmake
+@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+ 
+   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
++  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+   set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+   set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
+   set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+   set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+   set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
++  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
+   set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+   set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+   set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index ed0db8de7ab6..1aebd7f7e177 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -4,7 +4,7 @@
 #
 pkgname=poppler
 version=20.09.0
-revision=2
+revision=3
 build_style=cmake
 build_helper="gir"
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON

From ae0248dbbd60fd404028c9c8ef5f3a264c37674f 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, 26 Mar 2021 21:59:29 +0700
Subject: [PATCH 073/285] poppler-qt5: hardening + respect -g

---
 srcpkgs/poppler-qt5/patches  | 1 +
 srcpkgs/poppler-qt5/template | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/poppler-qt5/patches

diff --git a/srcpkgs/poppler-qt5/patches b/srcpkgs/poppler-qt5/patches
new file mode 120000
index 000000000000..636e4ac2cbd9
--- /dev/null
+++ b/srcpkgs/poppler-qt5/patches
@@ -0,0 +1 @@
+../poppler/patches
\ No newline at end of file
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 0dc45c05c58b..c2ec35dbbad3 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -5,7 +5,7 @@
 #
 pkgname=poppler-qt5
 version=20.09.0
-revision=1
+revision=2
 wrksrc="poppler-${version}"
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF

From cebee1894717c1d67aa76300df590b2345516c4c 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, 27 Mar 2021 11:17:35 +0700
Subject: [PATCH 074/285] artyfx: remove -O1 -g

---
 srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch | 4 ++--
 srcpkgs/artyfx/patches/respect-our-cflags.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch b/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
index 1a832155a566..47ef4dd9b84e 100644
--- a/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
+++ b/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
@@ -6,8 +6,8 @@
  
 -SET(CMAKE_C_FLAGS   "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address
 -SET(CMAKE_CXX_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address
-+SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fPIC -g") # -fsanitize=address
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g") # -fsanitize=address
++SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fPIC") # -fsanitize=address
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # -fsanitize=address
 +
 +IF(BUILD_SSE)
 +	SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -msse -msse2 -mfpmath=sse")
diff --git a/srcpkgs/artyfx/patches/respect-our-cflags.patch b/srcpkgs/artyfx/patches/respect-our-cflags.patch
index ee9155c7729e..7a32fd9df73b 100644
--- a/srcpkgs/artyfx/patches/respect-our-cflags.patch
+++ b/srcpkgs/artyfx/patches/respect-our-cflags.patch
@@ -10,8 +10,8 @@ Index: CMakeLists.txt
 -SET(CMAKE_C_FLAGS "-g -Wall -O1 -Wno-unused-variable")
 -SET(CMAKE_CXX_FLAGS "-g -Wall -O1 -Wno-unused-variable -ftree-vectorize")
 +SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -shared -L./src/avtk -Wl,--no-undefined")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -O1 -Wno-unused-variable")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -O1 -Wno-unused-variable -ftree-vectorize")
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall  -Wno-unused-variable")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall  -Wno-unused-variable -ftree-vectorize")
  
  
  # DSP sources

From e3626349cbd7728458f16a8961d4b91b435e14f5 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, 27 Mar 2021 11:27:28 +0700
Subject: [PATCH 075/285] coin3: build with CMAKE_BUILD_TYPE=None

---
 srcpkgs/coin3/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/coin3/template b/srcpkgs/coin3/template
index d5483ee048c3..8f7218c2e8c3 100644
--- a/srcpkgs/coin3/template
+++ b/srcpkgs/coin3/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="coin-Coin-${version}"
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/Coin3
- -DCMAKE_BUILD_TYPE=Release -DCOIN_BUILD_TESTS=OFF -DCOIN_BUILD_DOCUMENTATION=ON"
+ -DCOIN_BUILD_TESTS=OFF -DCOIN_BUILD_DOCUMENTATION=ON"
 hostmakedepends="doxygen graphviz"
 makedepends="boost-devel glu-devel"
 short_desc="High-level 3D graphics toolkit"
@@ -15,6 +15,9 @@ homepage="https://coin3d.github.io/"
 distfiles="https://github.com/coin3d/coin/archive/Coin-${version}.tar.gz"
 checksum=b00d2a8e9d962397cf9bf0d9baa81bcecfbd16eef675a98c792f5cf49eb6e805
 
+CFLAGS=-DNDEBUG
+CXXFLAGS=-DNDEBUG
+
 if [ "$CROSS_BUILD" ]; then
 	# bypass runtime test (quote hashing is fine with gcc 9.3)
 	configure_args+=" -DHAVE_HASH_QUOTING_EXITCODE=0"

From 87d6ec38fff1501f0846d65cf26cb4dea88724d9 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, 27 Mar 2021 11:46:46 +0700
Subject: [PATCH 076/285] conky: don't overwrite CMAKE_BUILD_TYPE

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

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 8b95a628edfb..f05c7d4a1bf2 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -5,7 +5,7 @@ version=1.12.1
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
-configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DRELEASE=ON
+configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
  -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON
  -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON
  -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON

From 8af5386c0f486577b9835886072f8617623b25ab 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, 27 Mar 2021 11:46:46 +0700
Subject: [PATCH 077/285] conky-cli: don't overwrite CMAKE_BUILD_TYPE

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

diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index b61bdcca0504..7d512b65ab3e 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -6,7 +6,7 @@ revision=1
 wrksrc="${pkgname/-cli/}-${version}"
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
-configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DRELEASE=ON
+configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
  -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF
  -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON
  -DBUILD_DOCS=ON"

From 4d2c0bed8782381e2b0fb182192e74478b617ebc 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, 27 Mar 2021 11:48:25 +0700
Subject: [PATCH 078/285] crossguid: don't overwrite -O2

---
 srcpkgs/crossguid/fix-cflags.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/crossguid/fix-cflags.patch

diff --git a/srcpkgs/crossguid/fix-cflags.patch b/srcpkgs/crossguid/fix-cflags.patch
new file mode 100644
index 000000000000..983360a07ccf
--- /dev/null
+++ b/srcpkgs/crossguid/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.5.1)
+ project(CrossGuid)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+ 
+ option(XG_TESTS "Build test runner" ON)
+ 

From 536605459012c0130fe62ff731c9b68c0b848ff7 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, 27 Mar 2021 12:19:04 +0700
Subject: [PATCH 079/285] rapidjson: define -DNDEBUG

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

diff --git a/srcpkgs/rapidjson/template b/srcpkgs/rapidjson/template
index 8597f8fb2706..99d92702cc9d 100644
--- a/srcpkgs/rapidjson/template
+++ b/srcpkgs/rapidjson/template
@@ -11,7 +11,7 @@ distfiles="https://github.com/miloyip/${pkgname}/archive/v${version}.tar.gz"
 checksum=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
 
 # class-memaccess is required by https://github.com/Tencent/rapidjson/issues/1700
-CXXFLAGS="-Wno-type-limits -Wno-error=class-memaccess"
+CXXFLAGS="-Wno-type-limits -Wno-error=class-memaccess -DNDEBUG"
 
 post_patch() {
 	# Remove bin/jsonchecker, which is the JSON licensed files

From 6f961a5698cc066ced2ed11967b3fccfec0610fe 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, 27 Mar 2021 12:18:36 +0700
Subject: [PATCH 080/285] cura-engine: ignore -O3

---
 srcpkgs/cura-engine/patches/fix-cflags.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/cura-engine/patches/fix-cflags.patch

diff --git a/srcpkgs/cura-engine/patches/fix-cflags.patch b/srcpkgs/cura-engine/patches/fix-cflags.patch
new file mode 100644
index 000000000000..e48a665523b8
--- /dev/null
+++ b/srcpkgs/cura-engine/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -42,7 +42,7 @@ endif()
+ if(CMAKE_BUILD_TYPE_UPPER MATCHES "DEBUG")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG_INIT}")
+ else()
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG")
+ endif()
+ 
+ set(CMAKE_CXX_STANDARD 11)

From 8148708fe3aefa5bd6a730febe28ea838cb2b14e 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, 27 Mar 2021 12:22:29 +0700
Subject: [PATCH 081/285] dislocker: remove -O1

---
 srcpkgs/dislocker/patches/fix-cflags.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/dislocker/patches/fix-cflags.patch

diff --git a/srcpkgs/dislocker/patches/fix-cflags.patch b/srcpkgs/dislocker/patches/fix-cflags.patch
new file mode 100644
index 000000000000..1229efeeaf0c
--- /dev/null
+++ b/srcpkgs/dislocker/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -71,7 +71,7 @@ if(NOT DEFINED WARN_FLAGS)
+ 	set (WARN_FLAGS "-Wall -Wextra" CACHE STRING "" FORCE)
+ endif()
+ if(NOT DEFINED HARDEN_FLAGS)
+-	set (HARDEN_FLAGS "-fstack-protector -fstrict-aliasing -D_FORTIFY_SOURCE=2 -O1" CACHE STRING "" FORCE)
++	set (HARDEN_FLAGS "-fstack-protector -fstrict-aliasing" CACHE STRING "" FORCE)
+ endif()
+ 
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")

From 33f4882b9b135c772f18534697d6954f760fd20b 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, 27 Mar 2021 12:29:31 +0700
Subject: [PATCH 082/285] freeorion: remove -O3

---
 srcpkgs/freeorion/patches/fix-cflags.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/freeorion/patches/fix-cflags.patch

diff --git a/srcpkgs/freeorion/patches/fix-cflags.patch b/srcpkgs/freeorion/patches/fix-cflags.patch
new file mode 100644
index 000000000000..c66d54599556
--- /dev/null
+++ b/srcpkgs/freeorion/patches/fix-cflags.patch
@@ -0,0 +1,18 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -432,13 +432,6 @@ if(MSVC)
+     )
+ endif()
+ 
+-target_compile_options(freeorionparseobj
+-    PRIVATE
+-        $<$<CXX_COMPILER_ID:Clang>:-ftemplate-depth=512>
+-        $<$<CXX_COMPILER_ID:AppleClang>:-ftemplate-depth=512>
+-        $<$<AND:$<NOT:$<BOOL:${BUILD_TESTING}>>,$<CXX_COMPILER_ID:GNU>>:-O3>
+-)
+-
+ target_compile_definitions(freeorionparseobj
+     PUBLIC
+         -DBOOST_ALL_DYN_LINK

From 9bc55a219469b25733ab5cad54461805f3393869 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, 26 Mar 2021 09:01:12 +0700
Subject: [PATCH 083/285] cglm: fix build flags

---
 srcpkgs/cglm/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/cglm/template                 |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/cglm/patches/fix-cflags.patch

diff --git a/srcpkgs/cglm/patches/fix-cflags.patch b/srcpkgs/cglm/patches/fix-cflags.patch
new file mode 100644
index 000000000000..c74de6ea62d7
--- /dev/null
+++ b/srcpkgs/cglm/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: cglm-0.7.6/CMakeLists.txt
+===================================================================
+--- cglm-0.7.6.orig/CMakeLists.txt
++++ cglm-0.7.6/CMakeLists.txt
+@@ -25,7 +25,7 @@ if(MSVC)
+ 	add_definitions(-DNDEBUG -D_WINDOWS -D_USRDLL -DCGLM_EXPORTS -DCGLM_DLL)
+ 	add_compile_options(/W3 /Ox /Gy /Oi /TC)
+ else()
+-  add_compile_options(-Wall -Werror -O3)
++  add_compile_options(-Wall)
+ endif()
+ 
+ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index f00a093edab9..311b4c79a7d3 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -9,6 +9,7 @@ license="MIT"
 homepage="https://github.com/recp/cglm"
 distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
 checksum=29ff8af4edc03697e36d3e6f99a80b884a80ee09d46055ce45765e5d6b2456d9
+patch_args=-Np1
 
 post_install() {
 	vlicense LICENSE

From a0d88c5baa19b36b0e99fcec2eef73a3082b2a2a 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, 27 Mar 2021 12:36:19 +0700
Subject: [PATCH 084/285] glyr: don't force Release build

---
 srcpkgs/glyr/patches/fix-cflags.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/glyr/patches/fix-cflags.patch

diff --git a/srcpkgs/glyr/patches/fix-cflags.patch b/srcpkgs/glyr/patches/fix-cflags.patch
new file mode 100644
index 000000000000..498ffe09a38f
--- /dev/null
+++ b/srcpkgs/glyr/patches/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -60,7 +60,6 @@ exec_program(
+ IF(CMAKE_BUILD_TYPE STREQUAL "debug")
+     SET(GLYR_DEBUG TRUE)
+ ELSE()
+-    SET(CMAKE_BUILD_TYPE "release")
+     SET(GLYR_DEBUG FALSE)
+ ENDIF()
+ MESSAGE("-- Building Target: ${CMAKE_BUILD_TYPE}")

From 463c5d4e862caa446e0520171a0f0be92e25c63a 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, 27 Mar 2021 12:41:50 +0700
Subject: [PATCH 085/285] hugin: remove -O3

---
 srcpkgs/hugin/patches/fix-cflags.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/hugin/patches/fix-cflags.patch

diff --git a/srcpkgs/hugin/patches/fix-cflags.patch b/srcpkgs/hugin/patches/fix-cflags.patch
new file mode 100644
index 000000000000..02fa56bef0e1
--- /dev/null
+++ b/srcpkgs/hugin/patches/fix-cflags.patch
@@ -0,0 +1,15 @@
+Index: src/celeste/CMakeLists.txt
+===================================================================
+--- src/celeste/CMakeLists.txt.orig
++++ src/celeste/CMakeLists.txt
+@@ -16,10 +16,6 @@
+ #    You should have received a copy of the GNU General Public License
+ #    along with Hugin  If not, see <http://www.gnu.org/licenses/>.
+  
+-IF(NOT WIN32)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+-ENDIF(NOT WIN32)
+-
+ # a list of all files belonging to celeste library
+ 
+ SET(CELESTE_SRC

From b5426a0509beb1ded4375e7a06b5d7ac0561dcf9 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, 27 Mar 2021 13:05:27 +0700
Subject: [PATCH 086/285] ledger: don't overwrite CMAKE_BUILD_TYPE

---
 srcpkgs/ledger/patches/fix-cflags.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/ledger/patches/fix-cflags.patch

diff --git a/srcpkgs/ledger/patches/fix-cflags.patch b/srcpkgs/ledger/patches/fix-cflags.patch
new file mode 100644
index 000000000000..179ab79cd148
--- /dev/null
+++ b/srcpkgs/ledger/patches/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -41,7 +41,6 @@ if (BUILD_DEBUG)
+   set(CMAKE_BUILD_TYPE Debug)
+   set(DEBUG_MODE 1)
+ else()
+-  set(CMAKE_BUILD_TYPE Release)
+   set(DEBUG_MODE 0)
+ endif()
+ 

From 27d36f981db26d3c058330c038254172a97f40ce 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, 27 Mar 2021 13:18:24 +0700
Subject: [PATCH 087/285] libmygpo-qt: remove -ggdb3

---
 srcpkgs/libmygpo-qt/patches/fix-cflags.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/libmygpo-qt/patches/fix-cflags.patch

diff --git a/srcpkgs/libmygpo-qt/patches/fix-cflags.patch b/srcpkgs/libmygpo-qt/patches/fix-cflags.patch
new file mode 100644
index 000000000000..9940b6fc4323
--- /dev/null
+++ b/srcpkgs/libmygpo-qt/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -69,7 +69,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+        -Wwrite-strings -Wpacked -Wformat-security -Wmissing-format-attribute
+        -Wold-style-cast -Woverloaded-virtual -Wnon-virtual-dtor  -Wall -Wextra
+        -Wformat=2 -Wundef -Wstack-protector -Wmissing-include-dirs
+-       -Winit-self -Wunsafe-loop-optimizations  -ggdb3 -fno-inline -DQT_STRICT_ITERATORS )
++       -Winit-self -Wunsafe-loop-optimizations  -fno-inline -DQT_STRICT_ITERATORS )
+     if ( NOT WIN32 )
+         add_definitions( -fvisibility=hidden )
+     endif()

From ab66967027e8221f4ab87283f0f016ab24104087 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, 27 Mar 2021 13:48:38 +0700
Subject: [PATCH 088/285] libogre: don't build vendored libraries

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

diff --git a/srcpkgs/libogre/template b/srcpkgs/libogre/template
index 784e3a648bac..df60f7b4f542 100644
--- a/srcpkgs/libogre/template
+++ b/srcpkgs/libogre/template
@@ -1,25 +1,22 @@
-# Template file for 'ogre'
+# Template file for 'libogre'
 pkgname=libogre
 version=1.12.9
 revision=1
+wrksrc=ogre-$version
 build_style=cmake
-configure_args="-DCMAKE_INSTALL_PREFIX=/usr \
-	-DOGRE_INSTALL_SAMPLES=TRUE \
-	-DOGRE_INSTALL_DOCS=TRUE \
-	-DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \
-	-DCMAKE_BUILD_TYPE=Release"
+configure_args="-DOGRE_INSTALL_SAMPLES=TRUE -DOGRE_INSTALL_DOCS=TRUE
+ -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE -DOGRE_BUILD_DEPENDENCIES=FALSE"
+make_build_target="all OgreDoc"
 hostmakedepends="pkg-config graphviz doxygen dejavu-fonts-ttf"
 makedepends="boost-devel freetype-devel libXaw-devel libXrandr-devel
  MesaLib-devel zziplib-devel libcppunit-devel glu-devel libatomic-devel
  freeimage-devel pugixml-devel python3-devel"
 short_desc="Scene-oriented, flexible 3D engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-homepage="http://www.ogre3d.org"
 license="MIT"
+homepage="http://www.ogre3d.org"
 distfiles="https://github.com/OGRECave/ogre/archive/v$version.tar.gz"
 checksum=028e7d0bbfce8fd254e1102666b07b7cbb9379321e88885d82feee5e061342aa
-make_build_target="all OgreDoc"
-wrksrc=ogre-$version
 
 pre_configure() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From a95f7959d5e2c9b180455ac816c342fef5f0b213 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, 27 Mar 2021 13:52:50 +0700
Subject: [PATCH 089/285] libopenglrecorder: remove -O3

---
 srcpkgs/libopenglrecorder/patches/fix-cflags.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/libopenglrecorder/patches/fix-cflags.patch

diff --git a/srcpkgs/libopenglrecorder/patches/fix-cflags.patch b/srcpkgs/libopenglrecorder/patches/fix-cflags.patch
new file mode 100644
index 000000000000..7c48a0d2d822
--- /dev/null
+++ b/srcpkgs/libopenglrecorder/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -21,7 +21,7 @@ if (UNIX OR MINGW)
+     if (CMAKE_BUILD_TYPE MATCHES Debug)
+         add_definitions(-std=gnu++0x -O0)
+     else()
+-        add_definitions(-std=gnu++0x -O3)
++        add_definitions(-std=gnu++0x)
+     endif()
+ endif()
+ 

From a11cb620c85254fb5787c6c5e20aafbbfb25555b 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, 27 Mar 2021 13:55:41 +0700
Subject: [PATCH 090/285] libvidstab: remove -O3

---
 srcpkgs/libvidstab/patches/fix-cflags.patch | 39 +++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 srcpkgs/libvidstab/patches/fix-cflags.patch

diff --git a/srcpkgs/libvidstab/patches/fix-cflags.patch b/srcpkgs/libvidstab/patches/fix-cflags.patch
new file mode 100644
index 000000000000..51c357efb101
--- /dev/null
+++ b/srcpkgs/libvidstab/patches/fix-cflags.patch
@@ -0,0 +1,39 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -25,7 +25,7 @@ else()
+     set(LIBSUFFIX "")
+ endif()
+ 
+-add_definitions( -Wall -O3 -g -Wno-pointer-sign -fPIC -std=gnu99)
++add_definitions( -Wall -Wno-pointer-sign -fPIC -std=gnu99)
+ # add_definitions(  -Wall -O0 -g -Wno-pointer-sign )
+ 
+ ### ORC is not used in any active code at the moment  ###
+Index: tests/CMakeLists.txt
+===================================================================
+--- tests/CMakeLists.txt.orig
++++ tests/CMakeLists.txt
+@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
+ option(USE_OMP "use parallelization use OMP" ON)
+ 
+ #add_definitions( -Wall -O3 -Wno-pointer-sign -DTESTING  -std=gnu99)
+-add_definitions(  -Wall -O0 -g -Wno-pointer-sign -DTESTING -std=gnu99)
++add_definitions(  -Wall -Wno-pointer-sign -DTESTING -std=gnu99)
+ find_package(Orc)
+ if(ORC_FOUND)
+ add_definitions( -DUSE_ORC ${ORC_DEFINITIONS})
+Index: transcode/CMakeLists.txt
+===================================================================
+--- transcode/CMakeLists.txt.orig
++++ transcode/CMakeLists.txt
+@@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
+ set(TRANSCODE_ROOT ../../transcode)
+ 
+ 
+-add_definitions( -Wall -O3 -Wno-pointer-sign -DTRANSCODE -std=gnu99)
++add_definitions( -Wall -Wno-pointer-sign -DTRANSCODE -std=gnu99)
+ #add_definitions(  -Wall -O0 -g -Wno-pointer-sign )
+ # I tried it with 0.4.14
+ #  0.4.10 did not work (not all opcode implemented)

From ba1c25b3b94f6e6330fb7e31c31fc4b708609711 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, 27 Mar 2021 14:18:34 +0700
Subject: [PATCH 091/285] openlierox: don't overwrote CMAKE_BUILD_TYPE

---
 srcpkgs/openlierox/patches/fix-cflags.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/openlierox/patches/fix-cflags.patch

diff --git a/srcpkgs/openlierox/patches/fix-cflags.patch b/srcpkgs/openlierox/patches/fix-cflags.patch
new file mode 100644
index 000000000000..4fe6652fd0a2
--- /dev/null
+++ b/srcpkgs/openlierox/patches/fix-cflags.patch
@@ -0,0 +1,17 @@
+Index: CMakeOlxCommon.cmake
+===================================================================
+--- CMakeOlxCommon.cmake.orig
++++ CMakeOlxCommon.cmake
+@@ -36,12 +36,6 @@ OPTION(BREAKPAD "Google Breakpad support
+ OPTION(DISABLE_JOYSTICK "Disable joystick support" No)
+ OPTION(MINGW_CROSS_COMPILE "Cross-compile Windows .EXE using i686-w64-mingw32-gcc compiler" No)
+ 
+-IF (DEBUG)
+-	SET(CMAKE_BUILD_TYPE Debug)
+-ELSE (DEBUG)
+-	SET(CMAKE_BUILD_TYPE Release)
+-ENDIF (DEBUG)
+-
+ IF (DEDICATED_ONLY)
+ 	SET(X11 No)
+ 	SET(WITH_G15 No)

From 370f5741acfca9f2a681bbb30b3cef7e73c17ae0 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, 27 Mar 2021 14:25:12 +0700
Subject: [PATCH 092/285] opensonic: don't overwrite CMAKE_BUILD_TYPE

---
 srcpkgs/opensonic/patches/fix-cflags.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/opensonic/patches/fix-cflags.patch

diff --git a/srcpkgs/opensonic/patches/fix-cflags.patch b/srcpkgs/opensonic/patches/fix-cflags.patch
new file mode 100644
index 000000000000..10d2c7c80e64
--- /dev/null
+++ b/srcpkgs/opensonic/patches/fix-cflags.patch
@@ -0,0 +1,17 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -25,12 +25,10 @@ SET(GAME_NAME "Open Sonic")
+ SET(GAME_VERSION "0.1.4")
+ SET(RTFM "Please read the user manual (readme.html) to get help.")
+ SET(ALLEGRO_RECOMMENDED_VERSION "4.4.1")
+-SET(CMAKE_BUILD_TYPE Release)
+ MESSAGE("${GAME_NAME} version ${GAME_VERSION}")
+ 
+ # configuring...
+ SET(DEFS "")
+-SET(CFLAGS_EXTRA "-g")
+ SET(CFLAGS "${CFLAGS} ${CMAKE_C_FLAGS}")
+ MESSAGE("Using CFLAGS='${CFLAGS}'")
+ 

From 90ef39248d5001922f7ef9901dca15fd2350bd73 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, 27 Mar 2021 15:17:28 +0700
Subject: [PATCH 093/285] rocksdb: don't overwrite CMAKE_BUILD_TYPE

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

diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template
index e39329e5d6a6..2ae7db40ab91 100644
--- a/srcpkgs/rocksdb/template
+++ b/srcpkgs/rocksdb/template
@@ -3,15 +3,16 @@ pkgname=rocksdb
 version=5.18.3
 revision=2
 build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DWITH_TESTS=0
- -DUSE_RTTI=0 -DWITH_LZ4=1"
+configure_args="-DPORTABLE=1 -DWITH_TESTS=0 -DUSE_RTTI=0 -DWITH_LZ4=1"
 makedepends="liblz4-devel"
 short_desc="RocksDB is a embeddable, persistent key-value store for fast storage"
 maintainer="magenbluten <mb0@codemonkey.cc>"
-license="GPL-2.0-or-later, Apache-2.0"
+license="GPL-2.0-or-later, Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/facebook/rocksdb"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=7fb6738263d3f2b360d7468cf2ebe333f3109f3ba1ff80115abd145d75287254
+CFLAGS=-DNDEBUG
+CXXFLAGS=-DNDEBUG
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a988c9939916fbf3a40a554814c3b9f17759e6f8 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, 27 Mar 2021 15:40:26 +0700
Subject: [PATCH 094/285] seexpr-krita: don't overwrite CMAKE_BUILD_TYPE

---
 .../patches/cmake-build-type-none.patch       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch b/srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..94bb1f37db75
--- /dev/null
+++ b/srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch
@@ -0,0 +1,32 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -42,14 +42,6 @@ endif()
+ 
+ ## Choose build options
+ # Disney specific method of choosing variant
+-if (${FLAVOR} STREQUAL "optimize")
+-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "type of build" FORCE)
+-endif()
+-
+-if (${FLAVOR} STREQUAL "debug")
+-    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "type of build" FORCE)
+-endif()
+-
+ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+     execute_process(
+         COMMAND sh -c "echo `uname -s`-`uname -r | cut -d- -f1`-`uname -m`"
+@@ -212,12 +204,6 @@ else()
+ endif()
+ 
+ # Set to release if nothing else defined
+-if (NOT CMAKE_BUILD_TYPE)
+-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING
+-      "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
+-      FORCE)
+-endif()
+-
+ if (ENABLE_QT5)
+     find_package(Qt5 5.9.0 COMPONENTS Core Gui Widgets REQUIRED)
+     set_package_properties(Qt5 PROPERTIES

From f5204c91a1ca1695ca49de261a364c085deccd38 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, 27 Mar 2021 15:50:53 +0700
Subject: [PATCH 095/285] speed-dreams: hardening

---
 srcpkgs/speed-dreams/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index 722f0c5ed87a..df7164f9c808 100644
--- a/srcpkgs/speed-dreams/template
+++ b/srcpkgs/speed-dreams/template
@@ -1,13 +1,13 @@
 # Template file for 'speed-dreams'
 pkgname=speed-dreams
 version=2.2.2
-revision=2
+revision=3
 archs="i686* x86_64* ppc64le*"
 _rev=r6553
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DSD_BINDIR=/usr/bin -DSD_DATADIR=/usr/share/speed-dreams-2 -DSD_LIBDIR=/usr/lib/speed-dreams-2
- -DOPTION_OFFICIAL_ONLY=ON -DCMAKE_CXX_FLAGS=-fpermissive -DCMAKE_C_FLAGS=-fpermissive"
+configure_args="-DSD_BINDIR=/usr/bin -DSD_DATADIR=/usr/share/speed-dreams-2
+ -DSD_LIBDIR=/usr/lib/speed-dreams-2 -DOPTION_OFFICIAL_ONLY=ON"
 hostmakedepends="pkg-config"
 makedepends="freealut-devel libenet-devel libfreeglut-devel libjpeg-turbo-devel
  libpng-devel libvorbis-devel libXrandr-devel osg-devel plib-devel SDL2-devel
@@ -26,6 +26,8 @@ checksum="32aa55c17f8dafc1c54fb0d0b7b993d2688d431899cfc5db9eeece148c6887d0
  0b7b417d007ab3b7f0f4dcfdc868aafee1722150b81af519e1cd4c082b408183"
 nocross=yes
 replaces="speed-dreams-data>=0"
+CFLAGS=-fpermissive
+CXXFLAGS=-fpermissive
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	broken="Segmentation fault"

From 78f0e780d89825e60f91c2cdab2a9cf44e3cd9db 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, 27 Mar 2021 19:04:09 +0700
Subject: [PATCH 096/285] traverso: hardening

---
 .../patches/cmake-build-type-none.patch       | 28 +++++++++++++++++++
 srcpkgs/traverso/template                     |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/traverso/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/traverso/patches/cmake-build-type-none.patch b/srcpkgs/traverso/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..75b3fd941eb8
--- /dev/null
+++ b/srcpkgs/traverso/patches/cmake-build-type-none.patch
@@ -0,0 +1,28 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -65,13 +65,7 @@ SET(TRAVERSO_DEFINES -DSTATIC_BUILD)
+ 
+ #BUILD SETUP
+ #None, Debug, Release, .. or custom ones
+-IF(WANT_DEBUG)
+-  SET(CMAKE_BUILD_TYPE DEBUG)
+-  SET(WANT_TRAVERSO_DEBUG ON)
+-ELSE(WANT_DEBUG)
+-  SET(CMAKE_BUILD_TYPE RELEASE)
+-  LIST(APPEND TRAVERSO_DEFINES -DQT_NO_DEBUG)
+-ENDIF(WANT_DEBUG)
++LIST(APPEND TRAVERSO_DEFINES -DQT_NO_DEBUG)
+ 
+ 
+ IF(WANT_TRAVERSO_DEBUG)
+@@ -326,7 +320,7 @@ ${Qt5Xml_INCLUDE_DIRS}
+ ${Qt5Xml_INCLUDES}
+ )
+ 
+-set(CMAKE_CXX_FLAGS "-fPIC")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ 
+ #Set up libraries to link with all found packages
+ LINK_LIBRARIES (
diff --git a/srcpkgs/traverso/template b/srcpkgs/traverso/template
index 105924d4f0c6..4b93460f63d7 100644
--- a/srcpkgs/traverso/template
+++ b/srcpkgs/traverso/template
@@ -1,7 +1,7 @@
 # Template file for 'traverso'
 pkgname=traverso
 version=0.49.6
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWANT_MP3_ENCODE=ON -DDETECT_HOST_CPU_FEATURES=OFF"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 918d1bab8882245c07e422ff926f06be0f8add1d 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, 27 Mar 2021 19:08:11 +0700
Subject: [PATCH 097/285] xstarter: hardening

---
 .../patches/cmake-build-type-none.patch       | 22 +++++++++++++++++++
 srcpkgs/xstarter/template                     |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xstarter/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/xstarter/patches/cmake-build-type-none.patch b/srcpkgs/xstarter/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..4f793e4c473c
--- /dev/null
+++ b/srcpkgs/xstarter/patches/cmake-build-type-none.patch
@@ -0,0 +1,22 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -5,16 +5,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+ 
+ project(xstarter)
+ 
+-if(NOT CMAKE_BUILD_TYPE)
+-  set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build (Debug or Release)" FORCE)
+-endif()
+-
+ set(PROJECT_VERSION "0.8.0")
+-if (CMAKE_BUILD_TYPE STREQUAL Debug)
+-  set(CMAKE_C_FLAGS "-g -Wall -pedantic")
+-else()
+-  set(CMAKE_C_FLAGS "-Wall -pedantic -O3")
+-endif()
++set(CMAKE_C_FLAGS "-Wall -pedantic ${CMAKE_C_FLAGS}")
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
+ 
+ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
diff --git a/srcpkgs/xstarter/template b/srcpkgs/xstarter/template
index aa9a47e45e5c..4363d36e3c39 100644
--- a/srcpkgs/xstarter/template
+++ b/srcpkgs/xstarter/template
@@ -1,7 +1,7 @@
 # Template file for 'xstarter'
 pkgname=xstarter
 version=0.8.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glib-devel ncurses-devel"

From 50dd380a05ed7037988e8859d67d14544980b288 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, 27 Mar 2021 19:15:48 +0700
Subject: [PATCH 098/285] yabause-gtk: ignore -O3

---
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch

diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
new file mode 100644
index 000000000000..52c1cae61799
--- /dev/null
+++ b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -659,7 +659,7 @@ else ()
+ 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
+ endif ()
+ 
+-set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
++set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
+ 
+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")

From ff6bd18452df7b64b2a9a5bcb84bc11d42421baf 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, 27 Mar 2021 19:26:47 +0700
Subject: [PATCH 099/285] ympd: hardening

---
 srcpkgs/ympd/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/ympd/template                 |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/ympd/patches/fix-cflags.patch

diff --git a/srcpkgs/ympd/patches/fix-cflags.patch b/srcpkgs/ympd/patches/fix-cflags.patch
new file mode 100644
index 000000000000..4720dd39e748
--- /dev/null
+++ b/srcpkgs/ympd/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -24,7 +24,7 @@ include_directories(${PROJECT_BINARY_DIR
+ 
+ include(CheckCSourceCompiles)
+ 
+-set(CMAKE_C_FLAGS "-std=gnu99 -Wall")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall")
+ set(CMAKE_C_FLAGS_DEBUG "-ggdb -pedantic")
+ if(WITH_IPV6)
+     set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS NS_ENABLE_IPV6)
diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index 14437beb5384..450c079b2ca3 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,7 +1,7 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="perl pkg-config"
 makedepends="libmpdclient-devel openssl-devel"

From 818483c7c274e231a5dd6c6942fe2b9b2c5850a5 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, 27 Mar 2021 19:29:31 +0700
Subject: [PATCH 100/285] z80ex: hardening

---
 srcpkgs/z80ex/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/z80ex/template                 |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/z80ex/patches/fix-cflags.patch

diff --git a/srcpkgs/z80ex/patches/fix-cflags.patch b/srcpkgs/z80ex/patches/fix-cflags.patch
new file mode 100644
index 000000000000..6743da255e5c
--- /dev/null
+++ b/srcpkgs/z80ex/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -11,7 +11,7 @@ option (OPSTEP_FAST_AND_ROUGH "Fast and
+ 
+ #ALL_CFLAGS := -fPIC -fno-common -ansi -pedantic -Wall -pipe -O2 -I. -I./include
+ if (CMAKE_COMPILER_IS_GNUCC)
+-    set (CMAKE_C_FLAGS "-fPIC -fno-common -ansi -pedantic -Wall -pipe -O2")
++    set (CMAKE_C_FLAGS "-fPIC -fno-common -ansi -pedantic -Wall -pipe ${CMAKE_C_FLAGS}")
+ endif ()
+ 
+ include_directories(BEFORE . include)
diff --git a/srcpkgs/z80ex/template b/srcpkgs/z80ex/template
index 00a24a6fb902..5437f53d33d5 100644
--- a/srcpkgs/z80ex/template
+++ b/srcpkgs/z80ex/template
@@ -1,11 +1,11 @@
 # Template file for 'z80ex'
 pkgname=z80ex
 version=1.1.21
-revision=1
+revision=2
 build_style=cmake
 short_desc="ZiLOG Z80 CPU emulation library"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://sourceforge.net/projects/z80ex/"
 distfiles="${SOURCEFORGE_SITE}/project/z80ex/z80ex/${version}/z80ex-${version}.tar.gz"
 checksum=6f5e521d068a614b41e10180ad4ae45b1bc258ec28c962543feb9078856c2530

From 332221a11f5b5536edb309f8030fa9e50bbbd355 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, 27 Mar 2021 19:17:13 +0700
Subject: [PATCH 101/285] scribus: don't overwrite cmake-build-type

---
 .../patches/cmake-build-type-none.patch       | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/scribus/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/scribus/patches/cmake-build-type-none.patch b/srcpkgs/scribus/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..670c83cc48f5
--- /dev/null
+++ b/srcpkgs/scribus/patches/cmake-build-type-none.patch
@@ -0,0 +1,33 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -35,11 +35,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ 
+ 
+ #RPATH setup - more below too
+-if (WANT_NORPATH OR WANT_DISTROBUILD)
+-	set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-else()
+-	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+-endif()
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+ set(CMAKE_SKIP_BUILD_RPATH TRUE)
+@@ -309,16 +304,6 @@ include (CMakeLists_Directories.cmake)
+ #Convert our simpler command line option to the CMake style
+ #None, Debug, Release, .. or custom ones
+ # set(WANT_DEBUG ON)
+-if(WANT_DEBUG)
+-	set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Set Debug Build Type" FORCE)
+-endif()
+-if (WANT_RELEASEWITHDEBUG)
+-	set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Set Release with Debug Info Build Type" FORCE)
+-endif()
+-if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
+-	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
+-endif()
+-
+ 
+ 
+ #Based on our build type, setup our build options

From 2e2110dca496dcde9b1f1f7e57e4cc7d1de40f81 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, 28 Mar 2021 10:39:04 +0700
Subject: [PATCH 102/285] yoshimi: cleanup, don't overwrite CMAKE_BUILD_TYPE

---
 srcpkgs/yoshimi/patches/fix-cflags.patch | 12 ++++++++++++
 srcpkgs/yoshimi/template                 | 13 +------------
 2 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/yoshimi/patches/fix-cflags.patch

diff --git a/srcpkgs/yoshimi/patches/fix-cflags.patch b/srcpkgs/yoshimi/patches/fix-cflags.patch
new file mode 100644
index 000000000000..4baeb82ef4e3
--- /dev/null
+++ b/srcpkgs/yoshimi/patches/fix-cflags.patch
@@ -0,0 +1,12 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -262,7 +262,6 @@ if (BuildForDebug)
+     set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug})
+     message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
+ else()
+-    set (CMAKE_BUILD_TYPE "Release")
+     set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
+     message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
+ endif ()
diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 0096f7f05710..64a6c9ad433f 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -4,6 +4,7 @@ version=1.7.4
 revision=2
 build_wrksrc=src
 build_style=cmake
+configure_args="-DCMAKE_INSTALL_DATAROOTDIR=/usr/share"
 hostmakedepends="pkg-config fltk"
 makedepends="boost-devel jack-devel fltk-devel fftw-devel mxml-devel cairo-devel
  lv2 readline-devel ncurses-devel"
@@ -17,15 +18,3 @@ checksum=27a8e33bda72aafae604e14841bed6373fc9e00ff70c98f1e13215d6a8808318
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;
 esac
-
-configure_args="-DCMAKE_INSTALL_DATAROOTDIR=/usr/share"
-
-pre_configure() {
-	sed -i 's|ncurses|ncursesw|g' CMakeLists.txt
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) ;;
-		x86_64*) ;;
-		*) sed -i -e "s|-msse -msse2 -mfpmath=sse||g" CMakeLists.txt;;
-	esac
-}

From c8fea44ce74e9ece1574c5a709a23f8a79e17f01 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, 28 Mar 2021 10:49:25 +0700
Subject: [PATCH 103/285] zulucrypt: remove -O3

---
 srcpkgs/zulucrypt/patches/fix-cflags.patch | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/zulucrypt/patches/fix-cflags.patch

diff --git a/srcpkgs/zulucrypt/patches/fix-cflags.patch b/srcpkgs/zulucrypt/patches/fix-cflags.patch
new file mode 100644
index 000000000000..d77c539c6c13
--- /dev/null
+++ b/srcpkgs/zulucrypt/patches/fix-cflags.patch
@@ -0,0 +1,26 @@
+Index: external_libraries/tcplay/CMakeLists.txt
+===================================================================
+--- external_libraries/tcplay/CMakeLists.txt.orig
++++ external_libraries/tcplay/CMakeLists.txt
+@@ -13,7 +13,7 @@ set (SRCS_LINUX  crypto-gcrypt.c)
+ set (CFLAGS_LINUX  "-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE")
+ set (CFLAGS_WARN "-w")
+ set (CFLAGS_DEBUG  "-O0 -g3 -DDEBUG")
+-set (CFLAGS_OPT    "-O3")
++set (CFLAGS_OPT    "")
+ set (CFLAGS_VER    "-DMAJ_VER=${VERSION_MAJOR} -DMIN_VER=${VERSION_MINOR}")
+ set (CFLAGS_COMMON "-std=c99 -fPIC  ${CFLAGS_LINUX} ${CFLAGS_WARN} ${CFLAGS_VER}")
+ if ($ENV{DEBUG})
+Index: external_libraries/tcplay/Makefile.classic
+===================================================================
+--- external_libraries/tcplay/Makefile.classic.orig
++++ external_libraries/tcplay/Makefile.classic
+@@ -47,8 +47,6 @@ COMMON_CFLAGS= $(WARNFLAGS) -fPIC $(VER_
+ 
+ ifeq ($(DEBUG), yes)
+   COMMON_CFLAGS+= -O0 -g -DDEBUG
+-else
+-  COMMON_CFLAGS+= -O3
+ endif
+ 
+ ifeq (${SYSTEM}, linux)

From f901e0092871bad82af2814b3135322d92c6625e 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, 28 Mar 2021 10:43:24 +0700
Subject: [PATCH 104/285] zbackup: don't overwrite CMAKE_BUILD_TYPE

---
 .../patches/cmake-build-type-none.patch       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/zbackup/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/zbackup/patches/cmake-build-type-none.patch b/srcpkgs/zbackup/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..6d6ebc8e124d
--- /dev/null
+++ b/srcpkgs/zbackup/patches/cmake-build-type-none.patch
@@ -0,0 +1,26 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -6,8 +6,6 @@ project( zbackup )
+ 
+ set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" )
+ 
+-set( CMAKE_BUILD_TYPE Release )
+-
+ find_package( ZLIB REQUIRED )
+ include_directories( ${ZLIB_INCLUDE_DIRS} )
+ 
+Index: tartool/CMakeLists.txt
+===================================================================
+--- tartool/CMakeLists.txt.orig
++++ tartool/CMakeLists.txt
+@@ -4,8 +4,6 @@
+ cmake_minimum_required( VERSION 2.6.0 )
+ project( tartool )
+ 
+-set( CMAKE_BUILD_TYPE Release )
+-
+ add_executable( tartool tartool.cc ../file.cc ../dir.cc )
+ 
+ install( TARGETS tartool DESTINATION bin )

From 90bff0298035ee5a3a8566d8e7203a6ccdd55537 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, 27 Mar 2021 15:19:47 +0700
Subject: [PATCH 105/285] rofs-filtered: hardening

---
 srcpkgs/rofs-filtered/patches/fix-cflags.patch | 13 +++++++++++++
 srcpkgs/rofs-filtered/template                 | 10 +++-------
 2 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/rofs-filtered/patches/fix-cflags.patch

diff --git a/srcpkgs/rofs-filtered/patches/fix-cflags.patch b/srcpkgs/rofs-filtered/patches/fix-cflags.patch
new file mode 100644
index 000000000000..b77600f66784
--- /dev/null
+++ b/srcpkgs/rofs-filtered/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -9,7 +9,7 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PA
+      "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ 
+ add_definitions(-D_GNU_SOURCE)
+-set(CMAKE_C_FLAGS "-Wall -std=c99")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -Wall -std=c99")
+ 
+ # find fuse library
+ find_package (FUSE REQUIRED)
diff --git a/srcpkgs/rofs-filtered/template b/srcpkgs/rofs-filtered/template
index 332cd57a9902..2bb8a2304312 100644
--- a/srcpkgs/rofs-filtered/template
+++ b/srcpkgs/rofs-filtered/template
@@ -1,17 +1,13 @@
 # Template file for 'rofs-filtered'
 pkgname=rofs-filtered
 version=1.7
-revision=1
+revision=2
+wrksrc="${pkgname}-rel-${version}"
 build_style=cmake
 makedepends="fuse-devel"
 short_desc="Filtered read only filesystem for FUSE"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/gburca/rofs-filtered"
 distfiles="https://github.com/gburca/rofs-filtered/archive/rel-${version}.tar.gz"
 checksum=d66066dfd0274a2fb7b71dd929445377dd23100b9fa43e3888dbe3fc7e8228e8
-wrksrc="${pkgname}-rel-${version}"
-
-pre_configure() {
-	sed -i -e 's/CMAKE_C_FLAGS "/CMAKE_C_FLAGS "-fPIC /' ${wrksrc}/CMakeLists.txt
-}

From dd9ee87d3cad715b1ab97233f8bf20dce6c5845d Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 3 Feb 2021 20:30:36 +0100
Subject: [PATCH 106/285] audit: update to 3.0.1

Closes: #28447 [via git-merge-pr]
---
 ...uparse-caused-by-corrected-event-ord.patch | 31 ------
 ...uparse-caused-by-corrected-event-ord.patch | 41 --------
 srcpkgs/audit/patches/musl.patch              | 97 -------------------
 srcpkgs/audit/patches/seed-random.patch       | 13 +++
 srcpkgs/audit/template                        | 10 +-
 5 files changed, 18 insertions(+), 174 deletions(-)
 delete mode 100644 srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
 delete mode 100644 srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
 delete mode 100644 srcpkgs/audit/patches/musl.patch
 create mode 100644 srcpkgs/audit/patches/seed-random.patch

diff --git a/srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch b/srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
deleted file mode 100644
index 0c2b320bb0a4..000000000000
--- a/srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c2544c220bb1b1045589ceae3dbb69f195b860e5 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Tue, 26 Mar 2019 09:18:00 -0400
-Subject: [PATCH 1/2] Fix memleak in auparse caused by corrected event ordering
-
----
- auparse/auparse.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git auparse/auparse.c auparse/auparse.c
-index 34aa90c..ecea88e 100644
---- auparse/auparse.c
-+++ auparse/auparse.c
-@@ -265,6 +265,14 @@ static event_list_t *au_get_ready_event(auparse_state_t *au, int is_test)
- 			au_lolnode *ptr = lowest;
- 			while (ptr->status == EBS_EMPTY && lol->maxi > 0) {
- 				lol->maxi--;
-+				if (ptr->l) {
-+					aup_list_clear(ptr->l);
-+					free(ptr->l);
-+					ptr->l = NULL;
-+					au->le = NULL;	// this should crash
-+							// usage of au->le
-+							// until reset
-+				}
- 				ptr = &lol->array[lol->maxi];
- 			}
- 		}
--- 
-2.24.0
-
diff --git a/srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch b/srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
deleted file mode 100644
index ed6a89911314..000000000000
--- a/srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce0debf94f93d787d3bed635952133b2a5ff3551 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Tue, 26 Mar 2019 17:24:37 -0400
-Subject: [PATCH 2/2] Fix memleak in auparse caused by corrected event ordering
- part 2
-
----
- auparse/auparse.c | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git auparse/auparse.c auparse/auparse.c
-index ecea88e..5318d25 100644
---- auparse/auparse.c
-+++ auparse/auparse.c
-@@ -259,23 +259,6 @@ static event_list_t *au_get_ready_event(auparse_state_t *au, int is_test)
- 	if (lowest && lowest->status == EBS_COMPLETE) {
- 		lowest->status = EBS_EMPTY;
- 		au->au_ready--;
--		// Try to consolidate the array so that we iterate
--		// over a smaller portion next time
--		if (lowest == &lol->array[lol->maxi]) {
--			au_lolnode *ptr = lowest;
--			while (ptr->status == EBS_EMPTY && lol->maxi > 0) {
--				lol->maxi--;
--				if (ptr->l) {
--					aup_list_clear(ptr->l);
--					free(ptr->l);
--					ptr->l = NULL;
--					au->le = NULL;	// this should crash
--							// usage of au->le
--							// until reset
--				}
--				ptr = &lol->array[lol->maxi];
--			}
--		}
- 		return lowest->l;
- 	}
- 
--- 
-2.24.0
-
diff --git a/srcpkgs/audit/patches/musl.patch b/srcpkgs/audit/patches/musl.patch
deleted file mode 100644
index ba5942a99f04..000000000000
--- a/srcpkgs/audit/patches/musl.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From d579a08bb1cde71f939c13ac6b2261052ae9f77e Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Tue, 26 Feb 2019 18:33:33 -0500
-Subject: [PATCH] Add substitue functions for strndupa & rawmemchr
-
-diff --git auparse/auparse.c auparse/auparse.c
-index 69127b7a..042ea2b0 100644
---- auparse/auparse.c
-+++ auparse/auparse.c
-@@ -1119,6 +1119,16 @@ static int str2event(char *s, au_event_t *e)
- 	return 0;
- }
- 
-+#ifndef HAVE_STRNDUPA
-+static inline char *strndupa(const char *old, size_t n)
-+{
-+	size_t len = strnlen(old, n);
-+	char *tmp = alloca(len + 1);
-+	tmp[len] = 0;
-+	return memcpy(tmp, old, len);
-+}
-+#endif
-+
- /* Returns 0 on success and 1 on error */
- static int extract_timestamp(const char *b, au_event_t *e)
- {
-diff --git auparse/interpret.c auparse/interpret.c
-index 88523c6d..f19ee854 100644
---- auparse/interpret.c
-+++ auparse/interpret.c
-@@ -855,6 +855,13 @@ static const char *print_escaped_ext(const idata *id)
- 		return print_escaped(id->val);
- }
- 
-+// rawmemchr is faster. Let's use it if we have it.
-+#ifdef HAVE_RAWMEMCHR
-+#define STRCHR rawmemchr
-+#else
-+#define STRCHR strchr
-+#endif
-+
- static const char *print_proctitle(const char *val)
- {
- 	char *out = (char *)print_escaped(val);
-@@ -865,7 +872,7 @@ static const char *print_proctitle(const char *val)
- 		// Proctitle has arguments separated by NUL bytes
- 		// We need to write over the NUL bytes with a space
- 		// so that we can see the arguments
--		while ((ptr  = rawmemchr(ptr, '\0'))) {
-+		while ((ptr  = STRCHR(ptr, '\0'))) {
- 			if (ptr >= end)
- 				break;
- 			*ptr = ' ';
-diff --git configure.ac configure.ac
-index acd6d615..00658d4f 100644
---- configure.ac
-+++ configure.ac
-@@ -72,6 +72,18 @@ dnl; posix_fallocate is used in audisp-remote
- AC_CHECK_FUNCS([posix_fallocate])
- dnl; signalfd is needed for libev
- AC_CHECK_FUNC([signalfd], [], [ AC_MSG_ERROR([The signalfd system call is necessary for auditd]) ])
-+dnl; check if rawmemchr is available
-+AC_CHECK_FUNCS([rawmemchr])
-+dnl; check if strndupa is available
-+AC_LINK_IFELSE(
-+  [AC_LANG_SOURCE(
-+    [[
-+      #define _GNU_SOURCE
-+      #include <string.h>
-+      int main() { (void) strndupa("test", 10); return 0; }]])],
-+ [AC_DEFINE(HAVE_STRNDUPA, 1, [Let us know if we have it or not])],
-+ []
-+)
- 
- ALLWARNS=""
- ALLDEBUG="-g"
-diff --git src/ausearch-lol.c src/ausearch-lol.c
-index bebbcf4b..0babd517 100644
---- src/ausearch-lol.c
-+++ src/ausearch-lol.c
-@@ -152,6 +152,16 @@ static int compare_event_time(event *e1, event *e2)
- 	return 0;
- }
- 
-+#ifndef HAVE_STRNDUPA
-+static inline char *strndupa(const char *old, size_t n)
-+{
-+	size_t len = strnlen(old, n);
-+	char *tmp = alloca(len + 1);
-+	tmp[len] = 0;
-+	return memcpy(tmp, old, len);
-+}
-+#endif
-+
- /*
-  * This function will look at the line and pick out pieces of it.
-  */
diff --git a/srcpkgs/audit/patches/seed-random.patch b/srcpkgs/audit/patches/seed-random.patch
new file mode 100644
index 000000000000..4bdfc90e72f2
--- /dev/null
+++ b/srcpkgs/audit/patches/seed-random.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/test/lookup_test.c b/lib/test/lookup_test.c
+index 03f40aa..7d17a90 100644
+--- a/lib/test/lookup_test.c
++++ b/lib/test/lookup_test.c
+@@ -48,6 +48,7 @@ gen_id(char *dest)
+ {
+ 	size_t i, len;
+ 
++	srand(300);
+ 	assert(S_LEN >= 2);
+ 	len = 1 + rand() % (S_LEN - 1);
+ 	assert('A' == 0x41 && 'a' == 0x61); /* ASCII */
+
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 3294ac19927e..fcd5de93732d 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
 # Template file for 'audit'
 pkgname=audit
-version=2.8.5
-revision=5
+version=3.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
  --with-apparmor --with-libcap-ng --with-python3"
@@ -13,10 +13,10 @@ short_desc="Linux Security Auditing Framework"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://people.redhat.com/sgrubb/audit"
+changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=0e5d4103646e00f8d1981e1cd2faea7a2ae28e854c31a803e907a383c5e2ecb7
-
-CFLAGS="-fcommon"
+checksum=994c4250d8fd43f3087a3c2ce73461832e30f1e9b278bf5bb03c3e07091155a5
+patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" --disable-zos-remote" ;;

From b20d3d1717454799a7d05c31c5addf9931e0cba2 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 3 Apr 2021 00:41:57 +0300
Subject: [PATCH 107/285] gallery-dl: update to 1.17.2

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

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 2b9e0b000db1..0e339265881a 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/mikf/gallery-dl"
 changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
 distfiles="https://github.com/mikf/gallery-dl/archive/v${version}.tar.gz"
-checksum=b18e822a4d0aa61a4bdb7dd0023b339e5df7370cf9d69724feffe1a6d66714e8
+checksum=a486c10c6d00abe1f7f2d650b0a99d98b8499586d8b1fcd421e6f30420ebf704
 
 do_check() {
 	make test

From 2473d76da4dd5cf16a6d19575b9c3cd36b4e438a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 2 Apr 2021 23:41:42 +0200
Subject: [PATCH 108/285] containerd: update to 1.4.4.

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

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index 33f3d27a0613..948e57aa6019 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,6 +1,6 @@
 # Template file for 'containerd'
 pkgname=containerd
-version=1.4.3
+version=1.4.4
 revision=1
 build_style=go
 go_import_path=github.com/containerd/containerd
@@ -20,7 +20,7 @@ maintainer="Paul Knopf <pauldotknopf@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/containerd/containerd"
 distfiles="https://github.com/containerd/containerd/archive/v${version}.tar.gz"
-checksum=@6069273fb93a162a2a11e29ef3b631c92ed1b4942be461f781a2aabbaed97701
+checksum=ac62c64664bf62fd44df0891c896eecdb6d93def3438271d7892dca75bc069d1
 make_dirs="/var/lib/containerd 0755 root root"
 
 post_build() {

From ee9455329c8cc4e342131ebf2e5cab44bfa87774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 2 Apr 2021 22:56:19 +0200
Subject: [PATCH 109/285] busybox: add upstream patch for CVE-2021-28831

---
 ...ss_gunzip-Fix-DoS-if-gzip-is-corrupt.patch | 57 +++++++++++++++++++
 srcpkgs/busybox/template                      |  4 +-
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/busybox/patches/decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch

diff --git a/srcpkgs/busybox/patches/decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch b/srcpkgs/busybox/patches/decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
new file mode 100644
index 000000000000..fe973506737d
--- /dev/null
+++ b/srcpkgs/busybox/patches/decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
@@ -0,0 +1,57 @@
+From dbd3b883a891f076911d752f56f7a906d5650a17 Mon Sep 17 00:00:00 2001
+From: Samuel Sapalski <samuel.sapalski@nokia.com>
+Date: Wed, 3 Mar 2021 16:31:22 +0100
+Subject: [PATCH] decompress_gunzip: Fix DoS if gzip is corrupt
+
+On certain corrupt gzip files, huft_build will set the error bit on
+the result pointer. If afterwards abort_unzip is called huft_free
+might run into a segmentation fault or an invalid pointer to
+free(p).
+
+In order to mitigate this, we check in huft_free if the error bit
+is set and clear it before the linked list is freed.
+
+Signed-off-by: Samuel Sapalski <samuel.sapalski@nokia.com>
+Signed-off-by: Peter Kaestle <peter.kaestle@nokia.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ archival/libarchive/decompress_gunzip.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git archival/libarchive/decompress_gunzip.c archival/libarchive/decompress_gunzip.c
+index 03049cc9b..e0520190a 100644
+--- archival/libarchive/decompress_gunzip.c
++++ archival/libarchive/decompress_gunzip.c
+@@ -220,10 +220,20 @@ static const uint8_t border[] ALIGN1 = {
+  * each table.
+  * t: table to free
+  */
++#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
++#define ERR_RET     ((huft_t*)(uintptr_t)1)
+ static void huft_free(huft_t *p)
+ {
+ 	huft_t *q;
+ 
++	/*
++	 * If 'p' has the error bit set we have to clear it, otherwise we might run
++	 * into a segmentation fault or an invalid pointer to free(p)
++	 */
++	if (BAD_HUFT(p)) {
++		p = (huft_t*)((uintptr_t)(p) ^ (uintptr_t)(ERR_RET));
++	}
++
+ 	/* Go through linked list, freeing from the malloced (t[-1]) address. */
+ 	while (p) {
+ 		q = (--p)->v.t;
+@@ -289,8 +299,6 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current
+  * or a valid pointer to a Huffman table, ORed with 0x1 if incompete table
+  * is given: "fixed inflate" decoder feeds us such data.
+  */
+-#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
+-#define ERR_RET     ((huft_t*)(uintptr_t)1)
+ static huft_t* huft_build(const unsigned *b, const unsigned n,
+ 			const unsigned s, const struct cp_ext *cp_ext,
+ 			unsigned *m)
+-- 
+2.31.1
+
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index de8a606f02df..1d24e7ea1108 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,13 +1,13 @@
 # Template file for 'busybox'
 pkgname=busybox
 version=1.32.1
-revision=1
+revision=2
 hostmakedepends="perl"
 checkdepends="tar which zip"
 short_desc="Swiss Army Knife of Embedded Linux"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-only"
-homepage="http://www.busybox.net"
+homepage="https://www.busybox.net"
 distfiles="${homepage}/downloads/busybox-${version}.tar.bz2"
 checksum=9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee
 

From a94e341ad6dd8bdca9bd6711004b011f6dfe0094 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 17:39:55 +0200
Subject: [PATCH 110/285] gumbo-parser: rebuild to let packages use dynamic
 library

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

diff --git a/srcpkgs/gumbo-parser/template b/srcpkgs/gumbo-parser/template
index db546f7640f1..c742091fd7d7 100644
--- a/srcpkgs/gumbo-parser/template
+++ b/srcpkgs/gumbo-parser/template
@@ -1,7 +1,7 @@
 # Template file for 'gumbo-parser'
 pkgname=gumbo-parser
 version=0.10.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool"
 checkdepends="gtest-devel"

From d3bff8254d4e34dad53cde6fdb76f17f60112556 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 17:40:40 +0200
Subject: [PATCH 111/285] httpdirfs: revbump to use dynamic gumbo-parser

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

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 642e893c0435..0028d235c5db 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=4
+revision=5
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 232531c83b52da0a092d7c1ca5be36789970567a Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 16:35:10 +0200
Subject: [PATCH 112/285] mupdf: revbump to use dynamic gumbo-parser

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

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index c8f05d1d3459..1279d8c680d4 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 81e632355d1f0de8e28bdcd98913bd0f1c637ec0 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 16:35:10 +0200
Subject: [PATCH 113/285] FeedReader: revbump to use dynamic gumbo-parser

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

diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template
index 53dc7acb745f..ab71a0c6f042 100644
--- a/srcpkgs/FeedReader/template
+++ b/srcpkgs/FeedReader/template
@@ -1,7 +1,7 @@
 # Template file for 'FeedReader'
 pkgname=FeedReader
 version=2.11.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel intltool itstool pkg-config vala"
 makedepends="gnome-online-accounts-devel gst-plugins-base1-devel json-glib-devel

From d6063065378bfbe122e98d133482553b3868d7c3 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 16:35:10 +0200
Subject: [PATCH 114/285] fbpdf: revbump to use dynamic gumbo-parser

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

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index 805f90a4ca17..ec6965ef45a8 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -1,7 +1,7 @@
 # Template file for 'fbpdf'
 pkgname=fbpdf
 version=0.0.20200616
-revision=1
+revision=2
 _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"

From 67fbc77a23f254037bfcc81189dec5a5f6bd0075 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 1 Apr 2021 16:35:11 +0200
Subject: [PATCH 115/285] zimwriterfs: revbump to use dynamic gumbo-parser

Closes: #29936 [via git-merge-pr]
---
 srcpkgs/zimwriterfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zimwriterfs/template b/srcpkgs/zimwriterfs/template
index 5d42e16a119d..bf13bf7e65bc 100644
--- a/srcpkgs/zimwriterfs/template
+++ b/srcpkgs/zimwriterfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zimwriterfs'
 pkgname=zimwriterfs
 version=1.3.7
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="file-devel gumbo-parser-devel icu-devel libzim-devel

From fae27d3866e599b788109297ec6e7eba5c3180b7 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, 3 Apr 2021 08:50:31 +0700
Subject: [PATCH 116/285] crossguid: remove -O3

---
 srcpkgs/crossguid/patches/no-O3.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/crossguid/patches/no-O3.patch

diff --git a/srcpkgs/crossguid/patches/no-O3.patch b/srcpkgs/crossguid/patches/no-O3.patch
new file mode 100644
index 000000000000..983360a07ccf
--- /dev/null
+++ b/srcpkgs/crossguid/patches/no-O3.patch
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.5.1)
+ project(CrossGuid)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+ 
+ option(XG_TESTS "Build test runner" ON)
+ 

From f3fdc89cf0f16100a98075310d2281de6177cfbf 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, 3 Apr 2021 10:59:21 +0700
Subject: [PATCH 117/285] openssl: ignore -c_rehash on bootstrapping

---
 srcpkgs/openssl/template | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 3d6db1275ab1..01dfd74de14d 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -26,6 +26,9 @@ build_options=asm
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl"
 	build_options_default="asm"
+else
+	# openssl-c_rehash depends on perl, ignore on bootstrap
+	subpackages="libcrypto1.1 libssl1.1 openssl-devel"
 fi
 
 case $XBPS_TARGET_MACHINE in
@@ -49,6 +52,12 @@ pre_build() {
 	make ${makejobs} depend
 }
 
+post_install() {
+	if [ ! "$CHROOT_READY" ]; then
+		rm -f "${DESTDIR}/usr/bin/c_rehash"
+	fi
+}
+
 libcrypto1.1_package() {
 	short_desc+=" - crypto library"
 	pkg_install() {

From 3d0f4e97ee6e6dd0fa8ae98b2bfdbce75c77b689 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, 3 Apr 2021 11:03:46 +0700
Subject: [PATCH 118/285] speed-dreams: mark broken for now

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

diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index df7164f9c808..73344d26ef39 100644
--- a/srcpkgs/speed-dreams/template
+++ b/srcpkgs/speed-dreams/template
@@ -28,6 +28,7 @@ nocross=yes
 replaces="speed-dreams-data>=0"
 CFLAGS=-fpermissive
 CXXFLAGS=-fpermissive
+broken="https://build.voidlinux.org/builders/x86_64_builder/builds/31603/steps/shell_3/logs/stdio"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	broken="Segmentation fault"

From c254c6f5cd3bfae2177b2a7efbe826ed046a61a5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 19:52:34 -0700
Subject: [PATCH 119/285] flac: fix license, take maintainership

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

diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 1644c37e086e..bc126d52029c 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,19 +1,21 @@
 # Template file for 'flac'
 pkgname=flac
 version=1.3.3
-revision=2
-patch_args="-Np1"
+revision=3
 build_style=gnu-configure
 configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
---with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
+ --with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
 hostmakedepends="pkg-config nasm"
 makedepends="libogg-devel"
 short_desc="Free Lossless Audio Codec"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Colin Booth <colin-void@heliocat.net>"
+license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://flac.sourceforge.net/"
-license="BSD-3-Clause, GPL-2"
 distfiles="https://downloads.xiph.org/releases/flac/flac-${version}.tar.xz"
 checksum=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748
+patch_args="-Np1"
+# the tests fail when run as root and as such break in the CI containers
+make_check=extended
 
 # TODO: make into options
 case "$XBPS_TARGET_MACHINE" in

From 8ee6c9f2be55b01bb7feffe4bbd64ace5ac0741c Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 1 Apr 2021 05:38:59 -0700
Subject: [PATCH 120/285] libinput: update to 1.17.1.

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

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 757347e32a87..9a7244523b00 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.16.4
+version=1.17.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=65923a06d5a8970e4a999c4668797b9b689614b62b1d44432ab1c87b65e39e29
+checksum=e51c50f3ce253961bed452d9f93102cc26128406975ab88ff9ec9e6c3b875137
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"

From 9e440b2644577dbaec8b6d99cfdbdb5036c1237c Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 31 Mar 2021 00:55:19 +0300
Subject: [PATCH 121/285] nushell: update to 0.29.0

Closes: #29896 [via git-merge-pr]
---
 srcpkgs/nushell/patches/avoid-ring.patch | 325 -----------------------
 srcpkgs/nushell/template                 |  18 +-
 2 files changed, 3 insertions(+), 340 deletions(-)
 delete mode 100644 srcpkgs/nushell/patches/avoid-ring.patch

diff --git a/srcpkgs/nushell/patches/avoid-ring.patch b/srcpkgs/nushell/patches/avoid-ring.patch
deleted file mode 100644
index 09c2752d5c10..000000000000
--- a/srcpkgs/nushell/patches/avoid-ring.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-From 2e58576e6ec9a038a63d7dfb8658a7323acf8931 Mon Sep 17 00:00:00 2001
-From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
-Date: Wed, 10 Mar 2021 15:09:10 -0600
-Subject: [PATCH] move from h1-client-rustls to hyper-client
-
----
- Cargo.lock                        | 174 ++----------------------------
- crates/nu_plugin_fetch/Cargo.toml |   2 +-
- 2 files changed, 7 insertions(+), 169 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 851dff856..a2b5a8c39 100644
---- Cargo.lock
-+++ Cargo.lock
-@@ -204,16 +204,6 @@ dependencies = [
-  "futures-core",
- ]
- 
--[[package]]
--name = "async-dup"
--version = "1.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c"
--dependencies = [
-- "futures-io",
-- "simple-mutex",
--]
--
- [[package]]
- name = "async-executor"
- version = "1.4.0"
-@@ -242,24 +232,7 @@ dependencies = [
-  "futures-lite",
-  "num_cpus",
-  "once_cell",
--]
--
--[[package]]
--name = "async-h1"
--version = "2.3.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3e9e2a9745d9cd0d92ed7641ce4d07568985762f92633260f0afe8ac7917d9d7"
--dependencies = [
-- "async-channel",
-- "async-dup",
-- "async-std",
-- "byte-pool",
-- "futures-core",
-- "http-types",
-- "httparse",
-- "lazy_static 1.4.0",
-- "log 0.4.14",
-- "pin-project 1.0.4",
-+ "tokio 0.2.24",
- ]
- 
- [[package]]
-@@ -345,19 +318,6 @@ version = "4.0.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
- 
--[[package]]
--name = "async-tls"
--version = "0.10.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52"
--dependencies = [
-- "futures-core",
-- "futures-io",
-- "rustls",
-- "webpki",
-- "webpki-roots",
--]
--
- [[package]]
- name = "async-trait"
- version = "0.1.42"
-@@ -602,16 +562,6 @@ version = "3.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
- 
--[[package]]
--name = "byte-pool"
--version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1e38e98299d518ec351ca016363e0cbfc77059dcd08dfa9700d15e405536097a"
--dependencies = [
-- "crossbeam-queue 0.2.3",
-- "stable_deref_trait",
--]
--
- [[package]]
- name = "byte-tools"
- version = "0.2.0"
-@@ -1045,16 +995,6 @@ dependencies = [
-  "maybe-uninit",
- ]
- 
--[[package]]
--name = "crossbeam-queue"
--version = "0.3.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756"
--dependencies = [
-- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.1",
--]
--
- [[package]]
- name = "crossbeam-utils"
- version = "0.6.6"
-@@ -1282,20 +1222,6 @@ version = "2.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
- 
--[[package]]
--name = "deadpool"
--version = "0.7.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d"
--dependencies = [
-- "async-trait",
-- "config",
-- "crossbeam-queue 0.3.1",
-- "num_cpus",
-- "serde 1.0.123",
-- "tokio 1.2.0",
--]
--
- [[package]]
- name = "decimal"
- version = "2.0.4"
-@@ -2331,15 +2257,14 @@ version = "6.3.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "663563ebc56b0bac7e08722cca7742612fd99d9bd6d05cf904ed9d9212065a34"
- dependencies = [
-- "async-h1",
-  "async-std",
-- "async-tls",
-  "async-trait",
-  "cfg-if 1.0.0",
-  "dashmap",
-- "deadpool",
-- "futures 0.3.12",
-+ "futures-util",
-  "http-types",
-+ "hyper 0.13.9",
-+ "hyper-tls",
-  "isahc 0.9.14",
-  "log 0.4.14",
- ]
-@@ -2356,6 +2281,7 @@ dependencies = [
-  "base64 0.13.0",
-  "cookie",
-  "futures-lite",
-+ "http 0.2.3",
-  "infer",
-  "pin-project-lite 0.2.4",
-  "rand 0.7.3",
-@@ -4930,21 +4856,6 @@ version = "1.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "194d8e591e405d1eecf28819740abed6d719d1a2db87fc0bcdedee9a26d55560"
- 
--[[package]]
--name = "ring"
--version = "0.16.20"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
--dependencies = [
-- "cc",
-- "libc",
-- "once_cell",
-- "spin",
-- "untrusted",
-- "web-sys",
-- "winapi 0.3.9",
--]
--
- [[package]]
- name = "roxmltree"
- version = "0.14.0"
-@@ -5066,19 +4977,6 @@ dependencies = [
-  "semver 0.9.0",
- ]
- 
--[[package]]
--name = "rustls"
--version = "0.18.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
--dependencies = [
-- "base64 0.12.3",
-- "log 0.4.14",
-- "ring",
-- "sct",
-- "webpki",
--]
--
- [[package]]
- name = "rustversion"
- version = "1.0.4"
-@@ -5209,16 +5107,6 @@ version = "1.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
- 
--[[package]]
--name = "sct"
--version = "0.6.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
--dependencies = [
-- "ring",
-- "untrusted",
--]
--
- [[package]]
- name = "security-framework"
- version = "2.0.0"
-@@ -5557,15 +5445,6 @@ dependencies = [
-  "libc",
- ]
- 
--[[package]]
--name = "simple-mutex"
--version = "1.1.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6"
--dependencies = [
-- "event-listener",
--]
--
- [[package]]
- name = "siphasher"
- version = "0.3.3"
-@@ -5649,12 +5528,6 @@ dependencies = [
-  "winapi 0.3.9",
- ]
- 
--[[package]]
--name = "spin"
--version = "0.5.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
--
- [[package]]
- name = "spinning_top"
- version = "0.2.2"
-@@ -6201,16 +6074,6 @@ dependencies = [
-  "tokio-macros",
- ]
- 
--[[package]]
--name = "tokio"
--version = "1.2.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a"
--dependencies = [
-- "autocfg",
-- "pin-project-lite 0.2.4",
--]
--
- [[package]]
- name = "tokio-codec"
- version = "0.1.2"
-@@ -6371,7 +6234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
- dependencies = [
-  "crossbeam-deque 0.7.3",
-- "crossbeam-queue 0.2.3",
-+ "crossbeam-queue",
-  "crossbeam-utils 0.7.2",
-  "futures 0.1.30",
-  "lazy_static 1.4.0",
-@@ -6633,12 +6496,6 @@ dependencies = [
-  "subtle",
- ]
- 
--[[package]]
--name = "untrusted"
--version = "0.7.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
--
- [[package]]
- name = "url"
- version = "2.2.1"
-@@ -6903,25 +6760,6 @@ dependencies = [
-  "wasm-bindgen",
- ]
- 
--[[package]]
--name = "webpki"
--version = "0.21.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
--dependencies = [
-- "ring",
-- "untrusted",
--]
--
--[[package]]
--name = "webpki-roots"
--version = "0.20.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
--dependencies = [
-- "webpki",
--]
--
- [[package]]
- name = "weezl"
- version = "0.1.3"
-diff --git a/crates/nu_plugin_fetch/Cargo.toml b/crates/nu_plugin_fetch/Cargo.toml
-index ddb62e9e4..8c112e37c 100644
---- crates/nu_plugin_fetch/Cargo.toml
-+++ crates/nu_plugin_fetch/Cargo.toml
-@@ -16,7 +16,7 @@ nu-errors = { path = "../nu-errors", version = "0.28.0" }
- nu-plugin = { path = "../nu-plugin", version = "0.28.0" }
- nu-protocol = { path = "../nu-protocol", version = "0.28.0" }
- nu-source = { path = "../nu-source", version = "0.28.0" }
--surf = { version = "2.2.0", features = ["h1-client-rustls"] }
-+surf = { version = "2.2.0", features = ["hyper-client"] }
- url = "2.2.1"
- mime = "0.3.16"
- 
diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 1f699bc73d75..49a1ea9527ff 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,7 +1,7 @@
 # Template file for 'nushell'
 pkgname=nushell
-version=0.28.0
-revision=2
+version=0.29.0
+revision=1
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
@@ -12,23 +12,11 @@ license="MIT"
 homepage="https://www.nushell.sh/"
 changelog="https://www.nushell.sh/blog/"
 distfiles="https://github.com/nushell/nushell/archive/${version}.tar.gz"
-checksum=aa6769f614a031ad33738064030d1c0d9ab500b2b0924adca71edacb1bd1d85d
+checksum=1572c5e48c7b460e1693eb4dd153902cfff9b5069abd05297b79563e6ffbf9f1
 register_shell="/usr/bin/nu"
 # all tests fail with argument --target
 make_check=no
 
-post_patch() {
-	# pull in updates for https://github.com/alkis/decimal
-	# the latest release (2.0.4) is missing fixes needed for
-	# platforms with unsigned char type; pin it to a specific
-	# revision until a new release is made
-	#
-	# remove this post_patch once that has happened
-	echo '[patch.crates-io.decimal]' >> Cargo.toml
-	echo 'git = "https://github.com/alkis/decimal"' >> Cargo.toml
-	echo 'rev = "c27d9a165afc55ec98fb4db79b12841df578387e"' >> Cargo.toml
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 6779a7d0a514ad3a4bd33a00c7879f554b9e61e3 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 30 Mar 2021 01:35:53 +0200
Subject: [PATCH 122/285] ccache: update to 4.2.1.

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

diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index c7b94db6d679..bb9dde861f67 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,6 +1,6 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=4.2
+version=4.2.1
 revision=1
 bootstrap=yes
 build_style=cmake
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://ccache.samba.org/"
 changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=2f14b11888c39778c93814fc6843fc25ad60ff6ba4eeee3dff29a1bad67ba94f
+checksum=9d6ba1cdefdc690401f404b747d81a9a1802b17af4235815866b7620d980477e
 
 if [ -z "$CHROOT_READY" ]; then
 	hostmakedepends="cmake-bootstrap"

From 70f35f6755ac1022c46741b888d22acde344794d Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 16 Mar 2021 00:49:24 +0100
Subject: [PATCH 123/285] wabt: update to 1.0.23.

Closes: #29500 [via git-merge-pr]
---
 srcpkgs/wabt/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/wabt/template b/srcpkgs/wabt/template
index 752dfd31e6b3..0a025a820edc 100644
--- a/srcpkgs/wabt/template
+++ b/srcpkgs/wabt/template
@@ -1,6 +1,6 @@
 # Template file for 'wabt'
 pkgname=wabt
-version=1.0.20
+version=1.0.23
 revision=1
 build_style=cmake
 make_check_target=check
@@ -9,19 +9,19 @@ short_desc="WebAssembly Binary Toolkit"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/WebAssembly/wabt"
-_gtest_commit=7888184f28509dba839e3683409443e0b5bb8948
-_testsuite_commit=18f83401a47a0e43772cf7d9f216e994bf7c7fa6
+_gtest_commit=703bd9caab50b139428cea1aaff9974ebee5742e
+_testsuite_commit=9994915e0cca8b42a16c577e4c85491822367dde
 _wasm_c_api_commit=d9a80099d496b5cdba6f3fe8fc77586e0e505ddc
 distfiles="https://github.com/WebAssembly/wabt/archive/${version}.tar.gz
  https://github.com/google/googletest/archive/${_gtest_commit}.tar.gz
  https://github.com/WebAssembly/testsuite/archive/${_testsuite_commit}.tar.gz
  https://github.com/WebAssembly/wasm-c-api/archive/${_wasm_c_api_commit}.tar.gz"
-checksum="39def40e8719030e0d11b1abbd81427fb1731c0372fcb24e2baaea067acba66f
- acc72b0cde04828fd4640576fdbd0727fc202f08b7701ae0bb318e2510f44b22
- 9d82be5b4dcfaadb9c0b0455c0c8b2989b942f75b9f698fa8e70329e403f4f74
+checksum="925f47020705cd2cc00a4ff6a36ab08f8adf6d08c7eac5057db0db38b6b2f16d
+ d17b1b83a57b3933565a6d0616fe261107326d47de20288d0949ed038e1c342d
+ baf8a7f68ddd21fb7ad255acc765391c972c12f3857af8e9a979342b160e6a5a
  aea8cd095e9937f1e14f2c93e026317b197eb2345e7a817fe3932062eb7b792c"
 
-pre_configure() {
+post_extract() {
 	# move submodule to proper location
 	rmdir third_party/gtest
 	rmdir third_party/testsuite

From 7e1e997bd2ead4c6596c023a4514867e1269b713 Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Tue, 9 Mar 2021 22:55:24 +0100
Subject: [PATCH 124/285] pango: update to 1.48.4

Add some fonts to pass tests.

Still printed during build:

1. /usr/include/features.h:397:4:
warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]

2. pangofc.pc was not found in the pkg-config search patch

By ericonr: bumb to 1.48.4

Closes: #29361 [via git-merge-pr]
---
 srcpkgs/pango/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 2b4a70d0d776..2ecd0a05a641 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,18 +1,20 @@
 # Template file for 'pango'
 pkgname=pango
-version=1.48.0
-revision=2
+version=1.48.4
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel help2man pkg-config"
 makedepends="fribidi-devel harfbuzz-devel libXft-devel libthai-devel"
+checkdepends="liberation-fonts-ttf cantarell-fonts"
 short_desc="Library for layout and rendering of text"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.pango.org/"
+changelog="https://gitlab.gnome.org/GNOME/pango/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6
+checksum=418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a
 
 # Package build options
 build_options="gir"
@@ -26,7 +28,7 @@ post_install() {
 pango-xft_package() {
 	short_desc+=" - X font rendering"
 	pkg_install() {
-		vmove usr/lib/libpangoxft*.so.*
+		vmove "usr/lib/libpangoxft*.so.*"
 		if [ "$build_option_gir" ]; then
 			vmove usr/lib/girepository-1.0/PangoXft-1.0.typelib
 		fi

From 35f7135cefb241158c93eda5c5974ea9226bdd06 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 13 Mar 2021 17:26:59 +1100
Subject: [PATCH 125/285] mbedtls: update to 2.16.10

Also:
- Fix changelog location.
- Use scripts/config.pl instead of sed.

Closes: #29430 [via git-merge-pr]
---
 srcpkgs/mbedtls/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 4793fa29f240..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.9
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -11,15 +11,13 @@ short_desc="Portable cryptographic TLS library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://tls.mbed.org/"
-changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/development/ChangeLog"
+changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=b7ca99ee10551b5b13242b7effebefd2a5cc38c287e5f5be1267d51ee45effe3
-
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
-	sed -i include/mbedtls/config.h \
-		-e 's/.*\(#define MBEDTLS_THREADING_C\)/\1/' \
-		-e 's/.*\(#define MBEDTLS_THREADING_PTHREAD\)/\1/'
+	./scripts/config.pl set MBEDTLS_THREADING_C
+	./scripts/config.pl set MBEDTLS_THREADING_PTHREAD
 }
 
 mbedtls-utils_package() {

From 6670ab5c4cd085889c86ec2460e72111bc87b52d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 8 Mar 2021 14:50:43 +0300
Subject: [PATCH 126/285] olm: update to 3.2.2

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

diff --git a/srcpkgs/olm/template b/srcpkgs/olm/template
index 39aabed41d32..8af7a1520f24 100644
--- a/srcpkgs/olm/template
+++ b/srcpkgs/olm/template
@@ -1,6 +1,6 @@
 # Template file for 'olm'
 pkgname=olm
-version=3.2.1
+version=3.2.2
 revision=1
 build_style=cmake
 short_desc="Implementation of the Double Ratchet cryptographic ratchet"
@@ -8,7 +8,7 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=a0482f8c8e80eb11578e8a8655b677fe943b86ac33affd46d67dff4261afeb6a
+checksum=a180af4bcdfcd4b8f3e4aa306869d80f7610c81f651347e8e71bd03c31a2b697
 
 do_check() {
 	cd build/tests

From 25d6c50ef12f9e94b7af819738d8c4de6682ce2f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 8 Mar 2021 14:54:09 +0300
Subject: [PATCH 127/285] olm-python3: update to 3.2.2

Disable tests.

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

diff --git a/srcpkgs/olm-python3/template b/srcpkgs/olm-python3/template
index 2ac1d725ac7e..8ebb131e0978 100644
--- a/srcpkgs/olm-python3/template
+++ b/srcpkgs/olm-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'olm-python3'
 pkgname=olm-python3
-version=3.2.1
+version=3.2.2
 revision=1
 wrksrc="olm-${version}"
 build_wrksrc=python
@@ -14,7 +14,9 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=a0482f8c8e80eb11578e8a8655b677fe943b86ac33affd46d67dff4261afeb6a
+checksum=a180af4bcdfcd4b8f3e4aa306869d80f7610c81f651347e8e71bd03c31a2b697
+# requires unpackaged pytest-{benchmark,isort}
+make_check=no
 
 pre_build() {
 	make include/olm/olm.h

From 552fbb0b82631877a1fc813d8a6ff0fb55f5eaca Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 8 Mar 2021 19:50:17 +0100
Subject: [PATCH 128/285] hitch: update to 1.7.0.

Merging with known test failure on musl:
FAIL tests/test39-client-cert-proxy.sh (exit status: 1)

It's a test introduced with this update, and Alpine is shipping this
version, so made the decision to go ahead with the update.

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

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 2ccae03e3065..805170a687f6 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,7 +1,7 @@
 # Template file for 'hitch'
 pkgname=hitch
-version=1.5.2
-revision=3
+version=1.7.0
+revision=1
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
@@ -12,11 +12,9 @@ maintainer="Jannis Christ <hello@jannis.ovh>"
 license="BSD-2-Clause"
 homepage="https://hitch-tls.org/"
 distfiles="https://hitch-tls.org/source/hitch-${version}.tar.gz"
-checksum=b1a4fd64584cd4ff816b8513ee5522db34a4431747057421b6e870f722c6dfda
+checksum=c97ef8f1e115156640c40dfdfe9662d5f6d57a796fccad3bbad198ec797ce5c4
 system_accounts="_hitch"
 
-CFLAGS="-fcommon"
-
 post_patch() {
 	vsed -i -e "s/grep -Pq/grep -q/" -e 's/\\t/\t/' \
 		src/tests/test32-proxy-authority.sh

From 3658948e2c31f5dbd41597bf740e9ca8602d3d3c Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 10 Mar 2021 15:40:05 +0100
Subject: [PATCH 129/285] python3-s-tui: update to 1.1.1.

Closes: #29377 [via git-merge-pr]
---
 srcpkgs/python3-s-tui/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-s-tui/template b/srcpkgs/python3-s-tui/template
index 3c7fec4c6e8f..ae57dfc0ebee 100644
--- a/srcpkgs/python3-s-tui/template
+++ b/srcpkgs/python3-s-tui/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-s-tui'
 pkgname=python3-s-tui
-version=1.0.2
-revision=2
+version=1.1.1
+revision=1
 wrksrc="s-tui-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools stress python3-urwid python3-psutil"
+checkdepends="$depends"
 short_desc="Terminal based CPU stress and monitoring utility"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://amanusk.github.io/s-tui"
 distfiles="https://github.com/amanusk/s-tui/archive/v${version}.tar.gz"
-checksum=0906db4b87f6b68a41c05102be35e47ed7dcf01cd69ec2cc155bd847e84bee0b
+checksum=d999f40e7809b84b45c1c01aff76cf4fc37a058a92c6c8b80c1098941842d0de

From 36605bce41966af38afec5c6f135c86fd514b765 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, 3 Apr 2021 15:34:55 +0700
Subject: [PATCH 130/285] dcraw: upstream moved

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

diff --git a/srcpkgs/dcraw/template b/srcpkgs/dcraw/template
index 66b968d556eb..67cb2f426ef1 100644
--- a/srcpkgs/dcraw/template
+++ b/srcpkgs/dcraw/template
@@ -8,8 +8,8 @@ makedepends="jasper-devel lcms2-devel"
 short_desc="Convert raw photos"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="GPL-2.0-or-later"
-homepage="https://www.cybercom.net/~dcoffin/dcraw/"
-distfiles="https://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${version}.tar.gz"
+homepage="https://www.dechifro.org/dcraw/"
+distfiles="https://www.dechifro.org/dcraw/archive/${pkgname}-${version}.tar.gz"
 checksum=2890c3da2642cd44c5f3bfed2c9b2c1db83da5cec09cc17e0fa72e17541fb4b9
 
 do_build() {

From 66f723b62e7ed9a73b6fac8f4af5c5b1ea2163bf 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, 3 Apr 2021 15:08:33 +0700
Subject: [PATCH 131/285] speed-dreams: fix build with cmake 3.20

---
 srcpkgs/speed-dreams/patches/cmake-3.20.patch | 356 ++++++++++++++++++
 srcpkgs/speed-dreams/template                 |   4 +-
 2 files changed, 358 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/speed-dreams/patches/cmake-3.20.patch

diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch
new file mode 100644
index 000000000000..5e2334117d32
--- /dev/null
+++ b/srcpkgs/speed-dreams/patches/cmake-3.20.patch
@@ -0,0 +1,356 @@
+Index: cmake/robot.cmake
+===================================================================
+--- cmake/robot.cmake.orig
++++ cmake/robot.cmake
+@@ -229,7 +229,7 @@ ENDMACRO(ROBOT_MODULE)
+ #  
+ MACRO(ROBOT_DATA)
+ 
+-  SET(RBD_SYNTAX "NAME,1,1,RBD_HAS_NAME,RBD_NAME")
++  SET(RBD_SYNTAX "RNAME,1,1,RBD_HAS_NAME,RBD_NAME")
+   SET(RBD_SYNTAX ${RBD_SYNTAX} "PREFIX,0,1,RBD_HAS_PREFIX,RBD_PREFIX")
+   SET(RBD_SYNTAX ${RBD_SYNTAX} "FILES,0,-1,RBD_HAS_FILES,RBD_FILES")
+   SET(RBD_SYNTAX ${RBD_SYNTAX} "SUBDIRS,0,-1,RBD_HAS_SUBDIRS,RBD_SUBDIRS")
+@@ -311,6 +311,6 @@ MACRO(ROBOT)
+ 
+   ROBOT_MODULE(NAME ${RB_NAME} INTERFACE ${RB_INTERFACE} SOURCES ${RB_SOURCES})
+ 
+-  ROBOT_DATA(NAME ${RB_NAME} PREFIX ${RB_PREFIX} FILES ${RB_FILES} SUBDIRS ${RB_SUBDIRS})
++  ROBOT_DATA(RNAME ${RB_NAME} PREFIX ${RB_PREFIX} FILES ${RB_FILES} SUBDIRS ${RB_SUBDIRS})
+ 
+ ENDMACRO(ROBOT)
+Index: data/drivers/dandroid_36GP/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_36GP/CMakeLists.txt.orig
++++ data/drivers/dandroid_36GP/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   36gp-tridenti-6c34 36gp-tridenti-v8ri
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_36GP
++ROBOT_DATA(RNAME dandroid_36GP
+            FILES dandroid_36GP.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_ls1/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_ls1/CMakeLists.txt.orig
++++ data/drivers/dandroid_ls1/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   ls1-taipan-ltsr ls1-marisatech-gt4r
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_ls1
++ROBOT_DATA(RNAME dandroid_ls1
+            FILES dandroid_ls1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_ls2/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_ls2/CMakeLists.txt.orig
++++ data/drivers/dandroid_ls2/CMakeLists.txt
+@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   ls2-cavallo-360r ls2-morley-r900 ls2-vulture-v6rs2
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_ls2
++ROBOT_DATA(RNAME dandroid_ls2
+            FILES dandroid_ls2.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_mpa1/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_mpa1/CMakeLists.txt.orig
++++ data/drivers/dandroid_mpa1/CMakeLists.txt
+@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
+                   mpa1-team-lynx mpa1-ffr
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_mpa1
++ROBOT_DATA(RNAME dandroid_mpa1
+            FILES dandroid_mpa1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_rs/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_rs/CMakeLists.txt.orig
++++ data/drivers/dandroid_rs/CMakeLists.txt
+@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
+                   rs2-fai-dot rs2-lion-2m
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_rs
++ROBOT_DATA(RNAME dandroid_rs
+            FILES dandroid_rs.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_sc/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_sc/CMakeLists.txt.orig
++++ data/drivers/dandroid_sc/CMakeLists.txt
+@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   sc-lynx-220 sc-murasama-nsx sc-kanagawa-z35gts sc-kongei-kk8s
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_sc
++ROBOT_DATA(RNAME dandroid_sc
+            FILES dandroid_sc.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/dandroid_srw/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_srw/CMakeLists.txt.orig
++++ data/drivers/dandroid_srw/CMakeLists.txt
+@@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7
+                   srw-kanagawa-gtr
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_srw
++ROBOT_DATA(RNAME dandroid_srw
+            FILES dandroid_srw.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/dandroid_trb1/CMakeLists.txt
+===================================================================
+--- data/drivers/dandroid_trb1/CMakeLists.txt.orig
++++ data/drivers/dandroid_trb1/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   trb1-zaxxon-rb trb1-vieringe-5rb
+                   tracks)
+ 
+-ROBOT_DATA(NAME dandroid_trb1
++ROBOT_DATA(RNAME dandroid_trb1
+            FILES dandroid_trb1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
+Index: data/drivers/human/CMakeLists.txt
+===================================================================
+--- data/drivers/human/CMakeLists.txt.orig
++++ data/drivers/human/CMakeLists.txt
+@@ -2,10 +2,10 @@ INCLUDE(../../../cmake/macros.cmake)
+ 
+ SET(ROBOT_NAME "human")
+ 
+-ROBOT_DATA(NAME ${ROBOT_NAME}
++ROBOT_DATA(RNAME ${ROBOT_NAME}
+            FILES logo.png logo.rgb
+            SUBDIRS cars PATTERNS *.xml)
+ 
+-ROBOT_DATA(NAME ${ROBOT_NAME}
++ROBOT_DATA(RNAME ${ROBOT_NAME}
+            FILES ${ROBOT_NAME}.xml preferences.xml car.xml
+            USER)
+Index: data/drivers/networkhuman/CMakeLists.txt
+===================================================================
+--- data/drivers/networkhuman/CMakeLists.txt.orig
++++ data/drivers/networkhuman/CMakeLists.txt
+@@ -2,10 +2,10 @@ INCLUDE(../../../cmake/macros.cmake)
+ 
+ SET(ROBOT_NAME "networkhuman")
+ 
+-ROBOT_DATA(NAME ${ROBOT_NAME}
++ROBOT_DATA(RNAME ${ROBOT_NAME}
+            FILES logo.png)
+ #           SUBDIRS cars PATTERNS *.xml)
+ 
+-ROBOT_DATA(NAME ${ROBOT_NAME}
++ROBOT_DATA(RNAME ${ROBOT_NAME}
+            FILES ${ROBOT_NAME}.xml preferences.xml car.xml
+            USER)
+Index: data/drivers/shadow_sc/CMakeLists.txt
+===================================================================
+--- data/drivers/shadow_sc/CMakeLists.txt.orig
++++ data/drivers/shadow_sc/CMakeLists.txt
+@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9
+                   sc-lynx-220 sc-murasama-nsx sc-spirit-300 
+                   tracks)
+ 
+-ROBOT_DATA(NAME shadow_sc
++ROBOT_DATA(RNAME shadow_sc
+            FILES shadow_sc.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix/CMakeLists.txt.orig
++++ data/drivers/simplix/CMakeLists.txt
+@@ -10,6 +10,6 @@ SET(ROBOT_SUBDIRS trb1-cavallo-360rb
+                   tracks
+                   0)
+ 
+-ROBOT_DATA(NAME simplix
++ROBOT_DATA(RNAME simplix
+            FILES simplix.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml *.rgb)
+Index: data/drivers/simplix_36GP/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_36GP/CMakeLists.txt.orig
++++ data/drivers/simplix_36GP/CMakeLists.txt
+@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
+                   36gp-tridenti-6c34 36gp-tridenti-v8ri
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_36GP
++ROBOT_DATA(RNAME simplix_36GP
+            FILES simplix_36GP.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_ls1/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_ls1/CMakeLists.txt.orig
++++ data/drivers/simplix_ls1/CMakeLists.txt
+@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   ls1-taipan-ltsr
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_ls1
++ROBOT_DATA(RNAME simplix_ls1
+            FILES simplix_ls1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_ls2/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_ls2/CMakeLists.txt.orig
++++ data/drivers/simplix_ls2/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0
+                   ls2-bavaria-g3gtr
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_ls2
++ROBOT_DATA(RNAME simplix_ls2
+            FILES simplix_ls2.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_mp5/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_mp5/CMakeLists.txt.orig
++++ data/drivers/simplix_mp5/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5
+                   mp5-fmc mp5-fmc-drift mp5-fmc-speedy
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_mp5
++ROBOT_DATA(RNAME simplix_mp5
+            FILES simplix_mp5.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_mpa1/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_mpa1/CMakeLists.txt.orig
++++ data/drivers/simplix_mpa1/CMakeLists.txt
+@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
+                   mpa1-team-lynx mpa1-ffr
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_mpa1
++ROBOT_DATA(RNAME simplix_mpa1
+            FILES simplix_mpa1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_sc/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_sc/CMakeLists.txt.orig
++++ data/drivers/simplix_sc/CMakeLists.txt
+@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   sc-lynx-220 sc-murasama-nsx
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_sc
++ROBOT_DATA(RNAME simplix_sc
+            FILES simplix_sc.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_srw/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_srw/CMakeLists.txt.orig
++++ data/drivers/simplix_srw/CMakeLists.txt
+@@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7
+                   srw-kanagawa-gtr
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_srw
++ROBOT_DATA(RNAME simplix_srw
+            FILES simplix_srw.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/simplix_trb1/CMakeLists.txt
+===================================================================
+--- data/drivers/simplix_trb1/CMakeLists.txt.orig
++++ data/drivers/simplix_trb1/CMakeLists.txt
+@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
+                   trb1-zaxxon-rb trb1-vieringe-5rb
+                   tracks)
+ 
+-ROBOT_DATA(NAME simplix_trb1
++ROBOT_DATA(RNAME simplix_trb1
+            FILES simplix_trb1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_36GP/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_36GP/CMakeLists.txt.orig
++++ data/drivers/usr_36GP/CMakeLists.txt
+@@ -8,7 +8,7 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
+                   36gp-tridenti-v8ri
+                   tracks)
+ 
+-ROBOT_DATA(NAME usr_36GP
++ROBOT_DATA(RNAME usr_36GP
+            FILES usr_36GP.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+ 
+Index: data/drivers/usr_ls1/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_ls1/CMakeLists.txt.orig
++++ data/drivers/usr_ls1/CMakeLists.txt
+@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
+                   ls1-taipan-ltsr ls1-toro-rgt
+                   tracks)
+ 
+-ROBOT_DATA(NAME usr_ls1
++ROBOT_DATA(RNAME usr_ls1
+            FILES usr_ls1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_ls2/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_ls2/CMakeLists.txt.orig
++++ data/drivers/usr_ls2/CMakeLists.txt
+@@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8
+ 		  ls2-vortex-gt ls2-lynx-xkr
+                   )
+ 
+-ROBOT_DATA(NAME usr_ls2
++ROBOT_DATA(RNAME usr_ls2
+            FILES usr_ls2.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_mpa1/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_mpa1/CMakeLists.txt.orig
++++ data/drivers/usr_mpa1/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 #9 10
+                   mpa1-ffr mpa1-furia mpa1-hartbill-2002
+                   mpa1-murasama mpa1-team-lynx)
+ 
+-ROBOT_DATA(NAME usr_mpa1
++ROBOT_DATA(RNAME usr_mpa1
+            FILES usr_mpa1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_rs/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_rs/CMakeLists.txt.orig
++++ data/drivers/usr_rs/CMakeLists.txt
+@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 1
+                   rs1-kenji-08
+                   )
+ 
+-ROBOT_DATA(NAME usr_rs
++ROBOT_DATA(RNAME usr_rs
+            FILES usr_rs.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_sc/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_sc/CMakeLists.txt.orig
++++ data/drivers/usr_sc/CMakeLists.txt
+@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
+                   sc-lynx-220 sc-murasama-nsx sc-spirit-300 
+                   tracks)
+ 
+-ROBOT_DATA(NAME usr_sc
++ROBOT_DATA(RNAME usr_sc
+            FILES usr_sc.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
+Index: data/drivers/usr_trb1/CMakeLists.txt
+===================================================================
+--- data/drivers/usr_trb1/CMakeLists.txt.orig
++++ data/drivers/usr_trb1/CMakeLists.txt
+@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
+                   trb1-zaxxon-rb
+                   tracks)
+ 
+-ROBOT_DATA(NAME usr_trb1
++ROBOT_DATA(RNAME usr_trb1
+            FILES usr_trb1.xml default.xml logo.rgb readme.txt
+            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index 73344d26ef39..fadabc891c88 100644
--- a/srcpkgs/speed-dreams/template
+++ b/srcpkgs/speed-dreams/template
@@ -7,7 +7,7 @@ _rev=r6553
 create_wrksrc=yes
 build_style=cmake
 configure_args="-DSD_BINDIR=/usr/bin -DSD_DATADIR=/usr/share/speed-dreams-2
- -DSD_LIBDIR=/usr/lib/speed-dreams-2 -DOPTION_OFFICIAL_ONLY=ON"
+ -DSD_LIBDIR=/usr/lib/speed-dreams-2 -DOPTION_OFFICIAL_ONLY=ON -Wno-dev"
 hostmakedepends="pkg-config"
 makedepends="freealut-devel libenet-devel libfreeglut-devel libjpeg-turbo-devel
  libpng-devel libvorbis-devel libXrandr-devel osg-devel plib-devel SDL2-devel
@@ -28,7 +28,7 @@ nocross=yes
 replaces="speed-dreams-data>=0"
 CFLAGS=-fpermissive
 CXXFLAGS=-fpermissive
-broken="https://build.voidlinux.org/builders/x86_64_builder/builds/31603/steps/shell_3/logs/stdio"
+lib32disabled=yes
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	broken="Segmentation fault"

From f34fbd4cd1bd72a4b47aac2daab8b7ec0ca7802b 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, 3 Apr 2021 17:38:16 +0700
Subject: [PATCH 132/285] libogdf: fix libdir

---
 srcpkgs/libogdf/patches/libdir.patch | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/libogdf/patches/libdir.patch

diff --git a/srcpkgs/libogdf/patches/libdir.patch b/srcpkgs/libogdf/patches/libdir.patch
new file mode 100644
index 000000000000..511064d40f04
--- /dev/null
+++ b/srcpkgs/libogdf/patches/libdir.patch
@@ -0,0 +1,32 @@
+Index: OGDF-snapshot/cmake/coin.cmake
+===================================================================
+--- OGDF-snapshot.orig/cmake/coin.cmake
++++ OGDF-snapshot/cmake/coin.cmake
+@@ -55,9 +55,9 @@ else()
+ endif()
+ 
+ # installation
+-set(COIN_INSTALL_LIBRARY_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path of COIN library")
++set(COIN_INSTALL_LIBRARY_DIR "lib" CACHE PATH "Installation path of COIN library")
+ set(COIN_INSTALL_INCLUDE_DIR "include" CACHE PATH "Installation path of COIN header files (creates subdirectory)")
+-set(COIN_INSTALL_CMAKE_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/OGDF/" CACHE PATH "Installation path of COIN files for CMake")
++set(COIN_INSTALL_CMAKE_DIR "lib/cmake/OGDF/" CACHE PATH "Installation path of COIN files for CMake")
+ mark_as_advanced(COIN_INSTALL_LIBRARY_DIR COIN_INSTALL_INCLUDE_DIR COIN_INSTALL_CMAKE_DIR)
+ install(TARGETS COIN
+   EXPORT CoinTargets
+Index: OGDF-snapshot/cmake/ogdf.cmake
+===================================================================
+--- OGDF-snapshot.orig/cmake/ogdf.cmake
++++ OGDF-snapshot/cmake/ogdf.cmake
+@@ -166,9 +166,9 @@ if(SHOW_STACKTRACE)
+ endif()
+ 
+ # installation
+-set(OGDF_INSTALL_LIBRARY_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path of OGDF library")
++set(OGDF_INSTALL_LIBRARY_DIR "lib" CACHE PATH "Installation path of OGDF library")
+ set(OGDF_INSTALL_INCLUDE_DIR "include" CACHE PATH "Installation path of OGDF header files (creates subdirectory)")
+-set(OGDF_INSTALL_CMAKE_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/OGDF/" CACHE PATH "Installation path of OGDF files for CMake")
++set(OGDF_INSTALL_CMAKE_DIR "lib/cmake/OGDF/" CACHE PATH "Installation path of OGDF files for CMake")
+ mark_as_advanced(OGDF_INSTALL_LIBRARY_DIR OGDF_INSTALL_INCLUDE_DIR OGDF_INSTALL_CMAKE_DIR)
+ configure_file(cmake/ogdf-config.cmake "${PROJECT_BINARY_DIR}/ogdf-config.cmake" @ONLY)
+ install(TARGETS OGDF

From 6f662fc7d72a3d1492d17a0b5bb476db259d00c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 13 Mar 2021 17:39:19 +0100
Subject: [PATCH 133/285] bfs: update to 2.2.

---
 ...pabilities-when-run-as-root-on-Linux.patch | 90 +++++++++++++++++++
 ...ing-forever-when-failing-to-drop-cap.patch | 41 +++++++++
 ...emove-capabilities-after-dropping-th.patch | 47 ++++++++++
 srcpkgs/bfs/template                          |  6 +-
 4 files changed, 181 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
 create mode 100644 srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
 create mode 100644 srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch

diff --git a/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch b/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
new file mode 100644
index 000000000000..a2e54c397f8b
--- /dev/null
+++ b/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
@@ -0,0 +1,90 @@
+From f2e6186ed0ce9b68362ad25d897f1e3c697728ec Mon Sep 17 00:00:00 2001
+From: Tavian Barnes <tavianator@tavianator.com>
+Date: Sun, 21 Mar 2021 13:18:43 -0400
+Subject: [PATCH] tests: Drop capabilities when run as root on Linux
+
+bfs's tests rely on file permissions being enforced, which leads them to
+work incorrectly when run as root.  This is probably the most common
+packaging issue for bfs, most recently seen with Void Linux's update to
+bfs 2.2.
+
+Make it easier on packagers by using capsh, if it's available, to drop
+the DAC privileges for the tests.
+
+Link: https://github.com/void-linux/void-packages/pull/29437#issuecomment-798670288
+Link: https://salsa.debian.org/lamby/pkg-bfs/-/commit/b173efb35da126adb39b0984219d6a2fd9ff428f
+---
+ tests.sh | 35 +++++++++++++++++++++++++++++------
+ 1 file changed, 29 insertions(+), 6 deletions(-)
+
+diff --git tests.sh tests.sh
+index b039eea..0bdd1d4 100755
+--- tests.sh
++++ tests.sh
+@@ -34,10 +34,25 @@ if [ -t 1 ]; then
+     RST="$(printf '\033[0m')"
+ fi
+ 
+-if [ "$EUID" -eq 0 ]; then
++if command -v capsh &>/dev/null; then
++    if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
++        cat >&2 <<EOF
++${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
++${BLD}CAP_DAC_READ_SEARCH${RST}.
++
++EOF
++
++        exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
++    fi
++elif [ "$EUID" -eq 0 ]; then
++    UNLESS=
++    if [ "$(uname)" = "Linux" ]; then
++	UNLESS=" unless ${GRN}capsh${RST} is installed"
++    fi
++
+     cat >&2 <<EOF
+ ${RED}error:${RST} These tests expect filesystem permissions to be enforced, and therefore
+-will not work when run as ${BLD}$(id -un)${RST}.
++will not work when run as ${BLD}$(id -un)${RST}${UNLESS}.
+ EOF
+     exit 1
+ fi
+@@ -1209,11 +1224,15 @@ function test_gid() {
+ }
+ 
+ function test_gid_plus() {
+-    bfs_diff basic -gid +0
++    if [ "$(id -g)" -ne 0 ]; then
++	bfs_diff basic -gid +0
++    fi
+ }
+ 
+ function test_gid_plus_plus() {
+-    bfs_diff basic -gid +0
++    if [ "$(id -g)" -ne 0 ]; then
++	bfs_diff basic -gid ++0
++    fi
+ }
+ 
+ function test_gid_minus() {
+@@ -1229,11 +1248,15 @@ function test_uid() {
+ }
+ 
+ function test_uid_plus() {
+-    bfs_diff basic -uid +0
++    if [ "$(id -u)" -ne 0 ]; then
++	bfs_diff basic -uid +0
++    fi
+ }
+ 
+ function test_uid_plus_plus() {
+-    bfs_diff basic -uid ++0
++    if [ "$(id -u)" -ne 0 ]; then
++	bfs_diff basic -uid ++0
++    fi
+ }
+ 
+ function test_uid_minus() {
+-- 
+2.31.0
+
diff --git a/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch b/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
new file mode 100644
index 000000000000..5e951faea29c
--- /dev/null
+++ b/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
@@ -0,0 +1,41 @@
+From dbc77fd3b6e48a17eb79f9ff3a5f810b7554bf6f Mon Sep 17 00:00:00 2001
+From: Tavian Barnes <tavianator@tavianator.com>
+Date: Mon, 22 Mar 2021 17:19:31 -0400
+Subject: [PATCH] tests: Avoid looping forever when failing to drop
+ capabilities
+
+Link: https://github.com/void-linux/void-packages/pull/29437/checks?check_run_id=2169825021
+---
+ tests.sh | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git tests.sh tests.sh
+index 0bdd1d4..ad71894 100755
+--- tests.sh
++++ tests.sh
+@@ -36,13 +36,21 @@ fi
+ 
+ if command -v capsh &>/dev/null; then
+     if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
++	if [ -n "$BFS_TRIED_DROP" ]; then
++            cat >&2 <<EOF
++${RED}error: ${RST} Failed to drop capabilities.
++EOF
++
++	    exit 1
++	fi
++
+         cat >&2 <<EOF
+ ${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
+ ${BLD}CAP_DAC_READ_SEARCH${RST}.
+ 
+ EOF
+ 
+-        exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
++        BFS_TRIED_DROP=y exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
+     fi
+ elif [ "$EUID" -eq 0 ]; then
+     UNLESS=
+-- 
+2.31.0
+
diff --git a/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch b/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch
new file mode 100644
index 000000000000..acf3d32f9113
--- /dev/null
+++ b/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch
@@ -0,0 +1,47 @@
+From d36ece2ca7498b7ba5485d5010439b57f006c9c8 Mon Sep 17 00:00:00 2001
+From: Tavian Barnes <tavianator@tavianator.com>
+Date: Tue, 23 Mar 2021 11:46:26 -0400
+Subject: [PATCH] tests: Actually remove capabilities after dropping them
+
+---
+ tests.sh | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git tests.sh tests.sh
+index ad71894..8eb4dc0 100755
+--- tests.sh
++++ tests.sh
+@@ -35,22 +35,25 @@ if [ -t 1 ]; then
+ fi
+ 
+ if command -v capsh &>/dev/null; then
+-    if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
++    if capsh --has-p=cap_dac_override &>/dev/null || capsh --has-p=cap_dac_read_search &>/dev/null; then
+ 	if [ -n "$BFS_TRIED_DROP" ]; then
+             cat >&2 <<EOF
+-${RED}error: ${RST} Failed to drop capabilities.
++${RED}error:${RST} Failed to drop capabilities.
+ EOF
+ 
+ 	    exit 1
+ 	fi
+ 
+         cat >&2 <<EOF
+-${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
+-${BLD}CAP_DAC_READ_SEARCH${RST}.
++${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}cap_dac_override${RST} and
++${BLD}cap_dac_read_search${RST}.
+ 
+ EOF
+ 
+-        BFS_TRIED_DROP=y exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
++        BFS_TRIED_DROP=y exec capsh \
++            --drop=cap_dac_override,cap_dac_read_search \
++            --caps=cap_dac_override,cap_dac_read_search-eip \
++            -- "$0" "$@"
+     fi
+ elif [ "$EUID" -eq 0 ]; then
+     UNLESS=
+-- 
+2.31.1
+
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index 68ccaff63a4c..ebc526cec78f 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,17 +1,17 @@
 # Template file for 'bfs'
 pkgname=bfs
-version=2.1
+version=2.2
 revision=1
 build_style=gnu-makefile
 makedepends="acl-devel libcap-devel"
-checkdepends="acl-progs"
+checkdepends="acl-progs libcap-progs"
 short_desc="Breadth-first version of the UNIX find command"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="0BSD"
 homepage="https://github.com/tavianator/bfs"
 changelog="https://raw.githubusercontent.com/tavianator/bfs/main/RELEASES.md"
 distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=be51966ca3bcc0167fb16c89f81fa37ee13c6326c616c31b87fd564a54bdc5f2
+checksum=09cff2033544cbaa31af2ad7d59347056a53c04ff7c469bb5904e575d3641053
 
 post_install() {
 	vlicense LICENSE

From 3329483deb03c4e6883fd023bae2b4af775350ed 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, 3 Apr 2021 22:14:43 +0700
Subject: [PATCH 134/285] firefox: mark broken for i686 temporary

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

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 58cc021a39d2..a8ba08719eb4 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -46,6 +46,10 @@ if [ "$XBPS_WORDSIZE" = "32" ]; then
 	nodebug=yes
 fi
 
+if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
+	broken="out of memory allocating 65536 bytes after a total of 1181696000 bytes"
+fi
+
 # we need this because cargo verifies checksums of all files in vendor
 # crates when it builds and gives us no way to override or update the
 # file sanely... so just clear out the file list

From e7b7e6a1ee53e71502394ec4d64f1f4be25e8b74 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 3 Apr 2021 16:11:55 +0200
Subject: [PATCH 135/285] bpftrace: update to 0.12.0.

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

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 0d6a2a2c14b0..f8357249eec3 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,6 +1,6 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
-version=0.11.4
+version=0.12.0
 revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=5b9c7509887e4337841e3188eabcc7247bc2c1cc312c983cbb8b77e341d20242
+checksum=8752c9eac8d9ab16d2227bb68f1d723ec83310895ab6f503ab6cfcf8b193acc0
 
 post_install() {
 	# clashes with bcc-tools

From 860c949888bbf785109b99fa7e675e7a2e396586 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 3 Apr 2021 18:45:13 +0200
Subject: [PATCH 136/285] erlang: update to 23.3.1.

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

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

From 98704b4bc6948df337cfc28fc1a4b1a19d43837e Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 3 Apr 2021 11:33:00 +0200
Subject: [PATCH 137/285] lutris: update to 0.5.8.3.

---
 srcpkgs/lutris/patches/fix-dxvk.patch | 22 ----------------------
 srcpkgs/lutris/template               |  6 +++---
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/lutris/patches/fix-dxvk.patch

diff --git a/srcpkgs/lutris/patches/fix-dxvk.patch b/srcpkgs/lutris/patches/fix-dxvk.patch
deleted file mode 100644
index 1a7c135d06ed..000000000000
--- a/srcpkgs/lutris/patches/fix-dxvk.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-upstream: yes
---- lutris/util/wine/dxvk.py
-+++ lutris/util/wine/dxvk.py
-@@ -53,7 +53,8 @@ def version(self):
-         """Return version of DXVK (latest known version if not provided)"""
-         if self._version:
-             return self._version
--        return self.versions[0]
-+        if self.versions:
-+            return self.versions[0]
- 
-     @property
-     def dxvk_path(self):
-@@ -62,6 +62,8 @@ def dxvk_path(self):
- 
-     def load_dxvk_versions(self):
-         versions_path = os.path.join(self.base_dir, "dxvk_versions.json")
-+        if not system.path_exists(versions_path):
-+            return []
-         with open(versions_path, "r") as dxvk_version_file:
-             dxvk_versions = [v["tag_name"] for v in json.load(dxvk_version_file)]
-         return dxvk_versions
diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index c8008f65f8fc..eaf360cbc3c2 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,7 +1,7 @@
 # Template file for 'lutris'
 pkgname=lutris
-version=0.5.8.2
-revision=3
+version=0.5.8.3
+revision=1
 build_style=meson
 hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
 depends="python3-dbus python3-gobject python3-yaml python3-evdev python3-Pillow
@@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://lutris.net"
 changelog="https://raw.githubusercontent.com/lutris/lutris/master/debian/changelog"
 distfiles="https://github.com/lutris/lutris/archive/v${version}.tar.gz"
-checksum=6c2ac4810764fbae9fc6b4e68fb76c47371046ac4e5bdf9e7fcd9777d1b9d8c7
+checksum=2459db033c8648598c1a19718807b4978a165ff11b40050162ed005b44a52cd3

From 06d4d05b26057665a2e2e842ded3ce255c54fa86 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Sat, 3 Apr 2021 10:32:27 -0400
Subject: [PATCH 138/285] chezmoi: update to 2.0.7.

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

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3e16e9951cf7..bebfed8d5b91 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.0.5
+version=2.0.7
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=36f52b8a519f43a64a3317920259eb43b183ad103302c6a3c8056ee3416fd4b4
+checksum=2c4000af2580009abc0057a2a4c6288ea1b61ff16917d6de6640c3bebb47378b
 
 post_install() {
 	vlicense LICENSE

From 7843bbb4204dbfcb1d84349e6d4aeb38e5cb0aa5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 09:41:59 -0700
Subject: [PATCH 139/285] OpenCPN: fix license

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

diff --git a/srcpkgs/OpenCPN/template b/srcpkgs/OpenCPN/template
index 7ba81e8fb966..ee67dbaff01c 100644
--- a/srcpkgs/OpenCPN/template
+++ b/srcpkgs/OpenCPN/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenCPN'
 pkgname=OpenCPN
 version=5.2.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON
@@ -16,7 +16,7 @@ depends="gpsd hicolor-icon-theme OpenCPN-tcdata-${version}_${revision}
  OpenCPN-gshhs-crude"
 short_desc="Concise ChartPlotter/Navigator"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, wxWidgets, JasPer-2.0, BSD-3-Clause, SGI-B-2.0"
+license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, WxWindows-exception-3.1, JasPer-2.0, BSD-3-Clause, SGI-B-2.0"
 homepage="https://opencpn.org/"
 distfiles="https://github.com/OpenCPN/OpenCPN/archive/v${version}.tar.gz"
 checksum=f6ec38989bc38f5a7f63234c5e0230adeb73f5626b4e3d3dfa680f0c240badc7

From 11442260f0d53a6e355266c78f815878a383953b Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 3 Apr 2021 06:29:13 -0700
Subject: [PATCH 140/285] qimgv: Add support for additional image formats

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

diff --git a/srcpkgs/qimgv/template b/srcpkgs/qimgv/template
index 7c5d5d18b8df..e206fe931d74 100644
--- a/srcpkgs/qimgv/template
+++ b/srcpkgs/qimgv/template
@@ -1,14 +1,14 @@
 # Template file for 'qimgv'
 pkgname=qimgv
 version=0.9.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="$(vopt_if video -DVIDEO_SUPPORT=ON -DVIDEO_SUPPORT=OFF)
  $(vopt_if scale -DOPENCV_SUPPORT=ON -DOPENCV_SUPPORT=OFF)"
 hostmakedepends="pkg-config"
 makedepends="exiv2-devel qt5-devel $(vopt_if video mpv-devel)
  $(vopt_if scale libopencv4-devel)"
-depends="hicolor-icon-theme"
+depends="hicolor-icon-theme qt5-imageformats"
 short_desc="Cross-platform image viewer with webm support"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"

From fa536eceddc352e5e28463f90f907223c8f8c53f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 00:12:33 -0700
Subject: [PATCH 141/285] Lucene++: fix license, short_desc

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

diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template
index d677c1c6c1c5..3873189f2dfc 100644
--- a/srcpkgs/Lucene++/template
+++ b/srcpkgs/Lucene++/template
@@ -1,14 +1,14 @@
 # Template file for 'Lucene++'
 pkgname=Lucene++
 version=3.0.7
-revision=10
+revision=11
 wrksrc=LucenePlusPlus-rel_$version
 build_style=cmake
 configure_args="-Wno-dev"
 makedepends="boost-devel gtest-devel"
-short_desc="A C++ port of the popular text search engine"
+short_desc="C++ port of the popular text search engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="LGPL-3.0-or-later, Apache-2.0"
 homepage="https://github.com/luceneplusplus/LucenePlusPlus"
 distfiles="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${version}.tar.gz"
 checksum=6c19f203311e4b44a0ccf7b1127db77436eb47159ea1c54f7531a0b1ca585e0c

From ea0f368a826220aed1e2ad5bc6705cc35c4fd134 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 3 Apr 2021 09:11:53 +0300
Subject: [PATCH 142/285] lcms2: update to 2.12.

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

diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 766613fbc645..31cb74664549 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -1,15 +1,15 @@
 # Template file for 'lcms2'
 pkgname=lcms2
-version=2.11
+version=2.12
 revision=1
 build_style=gnu-configure
 makedepends="tiff-devel"
 short_desc="Small-footprint color management engine, version 2"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://littlecms.com"
 distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-${version}.tar.gz"
-checksum=dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e
+checksum=18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5
 
 post_install() {
 	vlicense COPYING

From 4a22905d0f5db65e1a1d298167d96a97d802ca89 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 1 Apr 2021 12:41:11 +0300
Subject: [PATCH 143/285] sakura: update to 3.8.0.

Also enable localization.

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

diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template
index 378c3e43b5b8..096bc37d9bc7 100644
--- a/srcpkgs/sakura/template
+++ b/srcpkgs/sakura/template
@@ -1,9 +1,9 @@
 # Template file for 'sakura'
 pkgname=sakura
-version=3.7.1
+version=3.8.0
 revision=1
 build_style=cmake
-hostmakedepends="perl pkg-config"
+hostmakedepends="perl pkg-config gettext"
 makedepends="vte3-devel"
 depends="desktop-file-utils"
 short_desc="Simple but powerful libvte based terminal emulator"
@@ -11,5 +11,5 @@ maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-only"
 homepage="https://launchpad.net/sakura"
 distfiles="https://launchpad.net/sakura/trunk/${version}/+download/sakura-${version}.tar.bz2"
-checksum=729a4e0e750a4294bd9059243aac54df2a801250159fc550b50b0fe026ab928b
+checksum=0c414b368cb8f4263d3a899cd2b96e8caf839d916f3ee806e9f50d098fc2fa0f
 patch_args="-Np1"

From 58af1d912851ca1243ae696239d258361f1c212a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 3 Apr 2021 21:38:02 +0200
Subject: [PATCH 144/285] libmanette: update to 0.2.5

---
 srcpkgs/libmanette/patches/time64.patch | 13 -------------
 srcpkgs/libmanette/template             |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/libmanette/patches/time64.patch

diff --git a/srcpkgs/libmanette/patches/time64.patch b/srcpkgs/libmanette/patches/time64.patch
deleted file mode 100644
index 50eec643171e..000000000000
--- a/srcpkgs/libmanette/patches/time64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/manette-device.c	2019-03-11 10:04:16.000000000 +0100
-+++ src/manette-device.c	2020-12-11 16:39:51.368792737 +0100
-@@ -415,8 +415,8 @@
-   ManetteEvent manette_event;
- 
-   manette_event.any.device = self;
--  manette_event.any.time = evdev_event->time.tv_sec * 1000 +
--                           evdev_event->time.tv_usec / 1000;
-+  manette_event.any.time = evdev_event->input_event_sec * 1000 +
-+                           evdev_event->input_event_usec / 1000;
-   manette_event.any.hardware_type = evdev_event->type;
-   manette_event.any.hardware_code = evdev_event->code;
-   manette_event.any.hardware_value = evdev_event->value;
diff --git a/srcpkgs/libmanette/template b/srcpkgs/libmanette/template
index 2e9ae80e6245..c05dff01bf1c 100644
--- a/srcpkgs/libmanette/template
+++ b/srcpkgs/libmanette/template
@@ -1,6 +1,6 @@
 # Template file for 'libmanette'
 pkgname=libmanette
-version=0.2.2
+version=0.2.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/aplazas/libmanette"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b1b9fbaf84f1e383141a5715a2494f507e62313721ad993c39a868fc5ccf7d2
+checksum=8006e08480c0cbd4f749ec155827d100447cf23903fad8240a7c4c321aa09a2b
 
 libmanette-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"

From 304aa1184beda851da49462d9922f6d922755dd2 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 3 Apr 2021 17:41:47 +0200
Subject: [PATCH 145/285] plasma-workspace: make sure that m_twinSpacer is
 initialized

this prevents a crash of panelspacers on musl (and maybe also 32bit
glibc)
---
 srcpkgs/plasma-workspace/patches/panelspacer-musl.patch | 9 +++++++++
 srcpkgs/plasma-workspace/template                       | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/plasma-workspace/patches/panelspacer-musl.patch

diff --git a/srcpkgs/plasma-workspace/patches/panelspacer-musl.patch b/srcpkgs/plasma-workspace/patches/panelspacer-musl.patch
new file mode 100644
index 000000000000..184c349ce628
--- /dev/null
+++ b/srcpkgs/plasma-workspace/patches/panelspacer-musl.patch
@@ -0,0 +1,9 @@
+--- applets/panelspacer/plugin/panelspacer.h	2021-03-16 13:40:14.000000000 +0100
++++ -	2021-04-03 21:55:05.981463376 +0200
+@@ -73,5 +73,5 @@
+     void twinSpacerChanged();
+ 
+ private:
+-    PlasmaQuick::AppletQuickItem *m_twinSpacer;
++    PlasmaQuick::AppletQuickItem *m_twinSpacer = nullptr;
+ };
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 15366088e54a..015319ed3d03 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.21.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons

From 39e3abdb55f6731a9a03c4b176b946970f99d942 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 3 Apr 2021 21:32:49 +0200
Subject: [PATCH 146/285] webkit2gtk: update to 2.32.0

---
 .../webkit2gtk/patches/be-typedarray.patch    | 22 +++++-----
 .../webkit2gtk/patches/bwrap-libdir32.patch   |  2 +-
 .../webkit2gtk/patches/fix-eglmesaext_h.patch |  2 +-
 .../patches/fix-musl-javascriptcore.patch     | 16 +++++---
 srcpkgs/webkit2gtk/patches/fix_armv6l.patch   |  2 +-
 srcpkgs/webkit2gtk/patches/ppc-llint.patch    | 40 -------------------
 srcpkgs/webkit2gtk/patches/x86-no-sse2.patch  |  2 +-
 srcpkgs/webkit2gtk/template                   |  6 +--
 8 files changed, 29 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/webkit2gtk/patches/ppc-llint.patch

diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 347728bbb92e..d7cb99473c2e 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -5,7 +5,7 @@ https://tenfourfox.tenderapp.com/discussions/problems/7505-problems-uploading-to
 Updated by @q66.
 
 diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-index f08f852..53e2813 100644
+index dbe211d..4da5fbd 100644
 --- Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
 +++ Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
 @@ -28,6 +28,7 @@
@@ -16,7 +16,7 @@ index f08f852..53e2813 100644
  
  namespace JSC {
  
-@@ -147,7 +148,18 @@ public:
+@@ -146,7 +147,18 @@ public:
      
      JSValue getIndexQuickly(unsigned i) const
      {
@@ -24,18 +24,18 @@ index f08f852..53e2813 100644
 +        switch (Adaptor::typeValue) {
 +        case TypeFloat32:
 +        case TypeFloat64:
-+            return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
++            return Adaptor::toJSValue(nullptr, getIndexQuicklyAsNativeValue(i));
 +        default:
 +            // typed array views are commonly expected to be little endian views of the underlying data
-+            return Adaptor::toJSValue(flipBytes(getIndexQuicklyAsNativeValue(i)));
++            return Adaptor::toJSValue(nullptr, flipBytes(getIndexQuicklyAsNativeValue(i)));
 +        }
 +#else
-         return Adaptor::toJSValue(getIndexQuicklyAsNativeValue(i));
+         return Adaptor::toJSValue(nullptr, getIndexQuicklyAsNativeValue(i));
 +#endif
      }
      
      void setIndexQuicklyToNativeValue(unsigned i, typename Adaptor::Type value)
-@@ -164,7 +176,20 @@ public:
+@@ -158,7 +170,20 @@ public:
      void setIndexQuickly(unsigned i, JSValue value)
      {
          ASSERT(!value.isObject());
@@ -56,8 +56,8 @@ index f08f852..53e2813 100644
      }
      
      bool setIndex(JSGlobalObject* globalObject, unsigned i, JSValue jsValue)
-@@ -183,13 +208,54 @@ public:
-         if (i >= m_length)
+@@ -172,13 +197,54 @@ public:
+         if (isDetached() || i >= m_length)
              return false;
  
 +#if CPU(BIG_ENDIAN)
@@ -114,12 +114,12 @@ index f08f852..53e2813 100644
      void sort()
      {
 diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-index 5bca5d7..8a7111c 100644
+index 126f33c..0913af5 100644
 --- Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
 +++ Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -209,9 +209,36 @@ EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
+@@ -208,9 +208,36 @@ ALWAYS_INLINE EncodedJSValue genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
      scope.assertNoException();
-     RELEASE_ASSERT(!thisObject->isNeutered());
+     RELEASE_ASSERT(!thisObject->isDetached());
  
 -    if (std::isnan(static_cast<double>(*targetOption))) {
 +    double targetOptionLittleEndianAsDouble;
diff --git a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
index c136a64d9392..7b399660fab8 100644
--- a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
+++ b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
@@ -4,7 +4,7 @@ diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Sour
 index 69b4dc6a6a0b..dc660f399257 100644
 --- Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
 +++ Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-@@ -758,9 +758,15 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
+@@ -759,9 +759,15 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
          "--ro-bind-try", "/usr/lib", "/usr/lib",
          "--ro-bind-try", "/usr/local/lib", "/usr/local/lib",
          "--ro-bind-try", LIBDIR, LIBDIR,
diff --git a/srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch b/srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch
index 294c73ba24d7..7ab9e26d2088 100644
--- a/srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch
+++ b/srcpkgs/webkit2gtk/patches/fix-eglmesaext_h.patch
@@ -1,6 +1,6 @@
 --- Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2019-09-23 10:17:18.000000000 +0200
 +++ Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2019-12-16 11:30:00.971252320 +0100
-@@ -31,6 +31,7 @@
+@@ -32,6 +32,7 @@
  #include "WebKitWaylandServerProtocol.h"
  #include <EGL/egl.h>
  #include <EGL/eglext.h>
diff --git a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch b/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
index a88b61fbc831..16b4189c96c0 100644
--- a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
+++ b/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
@@ -4,6 +4,8 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
 
 Updated for latest webkit2gtk.
 
+-diff --git Source/JavaScriptCore/runtime/MachineContext.h Source/JavaScriptCore/runtime/MachineContext.h
+index ead9cdf..09dc28a 100644
 --- Source/JavaScriptCore/runtime/MachineContext.h
 +++ Source/JavaScriptCore/runtime/MachineContext.h
 @@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
@@ -51,11 +53,13 @@ Updated for latest webkit2gtk.
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
+diff --git Source/JavaScriptCore/runtime/OptionsList.h Source/JavaScriptCore/runtime/OptionsList.h
+index bc1cedb..f161f1c 100644
 --- Source/JavaScriptCore/runtime/OptionsList.h
 +++ Source/JavaScriptCore/runtime/OptionsList.h
-@@ -43,6 +43,16 @@ constexpr bool enableWebAssemblyStreamingApi = true;
- constexpr bool enableWebAssemblyStreamingApi = false;
- #endif
+@@ -39,6 +39,16 @@ namespace JSC {
+ 
+ JS_EXPORT_PRIVATE bool canUseJITCage();
  
 +#if defined(__GLIBC__)
 +constexpr unsigned jscMaxPerThreadStack = 5 * MB;
@@ -70,7 +74,7 @@ Updated for latest webkit2gtk.
  // How do JSC VM options work?
  // ===========================
  // The FOR_EACH_JSC_OPTION() macro below defines a list of all JSC options in use,
-@@ -90,9 +100,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
+@@ -86,9 +96,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
      \
      v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
      \
@@ -81,8 +85,10 @@ Updated for latest webkit2gtk.
 +    v(Unsigned, softReservedZoneSize, jscSoftReservedZoneSize, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
 +    v(Unsigned, reservedZoneSize, jscReservedZoneSize, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
      \
+     v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \
      v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
-     v(Unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
+diff --git Source/WebCore/xml/XPathGrammar.cpp Source/WebCore/xml/XPathGrammar.cpp
+index 0875a5e..98d5153 100644
 --- Source/WebCore/xml/XPathGrammar.cpp
 +++ Source/WebCore/xml/XPathGrammar.cpp
 @@ -966,7 +966,7 @@ int yydebug;
diff --git a/srcpkgs/webkit2gtk/patches/fix_armv6l.patch b/srcpkgs/webkit2gtk/patches/fix_armv6l.patch
index 284929f035d3..dc9c0776c39d 100644
--- a/srcpkgs/webkit2gtk/patches/fix_armv6l.patch
+++ b/srcpkgs/webkit2gtk/patches/fix_armv6l.patch
@@ -4,7 +4,7 @@ and https://bugs.webkit.org/show_bug.cgi?id=141288
 
 --- Source/JavaScriptCore/offlineasm/arm.rb	2015-07-22 14:37:57.000000000 +0200
 +++ Source/JavaScriptCore/offlineasm/arm.rb	2015-08-08 00:31:21.011824644 +0200
-@@ -473,8 +473,16 @@
+@@ -546,8 +546,16 @@
                  $asm.puts "mov #{armFlippedOperands(operands)}"
              end
          when "mvlbl"
diff --git a/srcpkgs/webkit2gtk/patches/ppc-llint.patch b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
deleted file mode 100644
index 80448614717a..000000000000
--- a/srcpkgs/webkit2gtk/patches/ppc-llint.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=221710
-
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 66571beb5c60..e273c6dd28a8 100644
---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1579,13 +1579,13 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (size, get, dispatch, metadat
-     loadp StructureChain::m_vector[t3], t3
-     assert(macro (ok) btpnz t3, ok end)
- 
--    loadp Structure::m_prototype[t2], t2
-+    loadp Structure::m_prototype + PayloadOffset[t2], t2
-     btpz t2, .opPutByIdTransitionChainDone
- .opPutByIdTransitionChainLoop:
-     loadp [t3], t1
-     bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
-     addp 4, t3
--    loadp Structure::m_prototype[t1], t2
-+    loadp Structure::m_prototype + PayloadOffset[t1], t2
-     btpnz t2, .opPutByIdTransitionChainLoop
- 
- .opPutByIdTransitionChainDone:
-@@ -2251,7 +2251,7 @@ end)
- 
- 
- op(llint_throw_from_slow_path_trampoline, macro()
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
- 
-@@ -2260,7 +2260,7 @@ op(llint_throw_from_slow_path_trampoline, macro()
-     # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
-     # the throw target is not necessarily interpreted code, we come to here.
-     # This essentially emulates the JIT's throwing protocol.
--    loadp Callee[cfr], t1
-+    loadp Callee + PayloadOffset[cfr], t1
-     convertCalleeToVM(t1)
-     jmp VM::targetMachinePCForThrow[t1]
- end)
diff --git a/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch b/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
index c6c4c803bcfa..2b085c3a2294 100644
--- a/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
+++ b/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
@@ -1,7 +1,7 @@
  Source: Debian
 --- Source/cmake/WebKitCompilerFlags.cmake.orig	2020-12-15 15:29:50.240722972 +0700
 +++ Source/cmake/WebKitCompilerFlags.cmake	2020-12-15 15:29:59.659853014 +0700
-@@ -138,15 +138,6 @@
+@@ -141,15 +141,6 @@
      if (CMAKE_COMPILER_IS_GNUCXX)
          WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-expansion-to-defined)
      endif ()
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 60ab9db8861f..54cbb79f455d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.30.6
+version=2.32.0
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
@@ -35,14 +35,14 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
- qt5-devel $(vopt_if x11 libXt-devel)
+ qt5-devel libmanette-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e
+checksum=9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser"
 build_options_default="gir wayland x11 bubblewrap minibrowser"

From 53eb0aecb1ee5b119bb47fcc0d51df8ee280a643 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 3 Apr 2021 00:21:55 +0200
Subject: [PATCH 147/285] python3-aiorpcx: update to 0.18.7.

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

diff --git a/srcpkgs/python3-aiorpcx/template b/srcpkgs/python3-aiorpcx/template
index 4d44cf495c26..c8b4b39d53a7 100644
--- a/srcpkgs/python3-aiorpcx/template
+++ b/srcpkgs/python3-aiorpcx/template
@@ -1,20 +1,20 @@
 # Template file for 'python3-aiorpcx'
 pkgname=python3-aiorpcx
-version=0.18.4
-revision=2
+version=0.18.7
+revision=1
 wrksrc="aiorpcX-${version}"
 build_style=python3-module
-pycompile_module="aiorpcx"
 hostmakedepends="python3-setuptools"
 depends="python3-attrs"
-checkdepends="${depends} python3-pytest"
+checkdepends="${depends} python3-pytest python3-pytest-asyncio python3-uvloop
+ python3-websockets iana-etc"
 short_desc="Generic async RPC implementation"
 maintainer="Christian Buschau <christian.buschau@mailbox.org>"
 license="MIT"
 homepage="https://github.com/kyuupichan/aiorpcX"
 # missing license in PyPI tarball
 distfiles="https://github.com/kyuupichan/aiorpcX/archive/${version}.tar.gz"
-checksum=cfce9d4a6af83d6be8619b2268e57bb21db0a0b36ac29226db580b448c286498
+checksum=ce98d20a22535651c1479dd66a0e68674e1677632cb43e9706908a4c1e04deb9
 
 do_check() {
 	python3 -m pytest

From 19e26478d99aff32e8345bfa139d34338a6144ca Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 3 Apr 2021 00:22:08 +0200
Subject: [PATCH 148/285] electrum: update to 4.1.1.

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

diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index c8f9aa4c6cff..5a7f44bcd334 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.0.9
+version=4.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=67e63afe6a9d8944f872500fbf6312a3840f3fa8ebd0c1aadfbba3147d8b3c24
+checksum=359e14d91cdbeff4dd3c1c9973831c2d9dc3b95a84e795314705a73d72ecfbc8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \

From 6bebf3007dd341c1917a9ec16c923cfe99cbd2b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 3 Apr 2021 18:27:38 -0400
Subject: [PATCH 149/285] python3: update to 3.9.3.

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

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 9fa79661ba83..a80fa7f6481d 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,8 +3,8 @@
 # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.9.2
-revision=2
+version=3.9.3
+revision=1
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
@@ -17,7 +17,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d
+checksum=30811039c65e04c14fc698e423947e464f9316e69fb44610bd38446046bb82b5
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From 478d20f320f93e447c025bf3d5353d4ce668bcc4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 3 Apr 2021 18:30:03 -0400
Subject: [PATCH 150/285] python3-tkinter: update to 3.9.3.

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

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 626392bc88fd..d499752ff0a1 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.9.2
+version=3.9.3
 revision=1
 wrksrc="Python-${version}"
 pycompile_dirs="
@@ -23,7 +23,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 homepage="https://www.python.org"
 license="Python-2.0"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d
+checksum=30811039c65e04c14fc698e423947e464f9316e69fb44610bd38446046bb82b5
 
 pre_configure() {
 	# Ensure that internal copies of expat and libffi are not used.

From 4ad453e0bdfd18187540b3d334efec4ff675c6e7 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sat, 3 Apr 2021 21:57:16 +0200
Subject: [PATCH 151/285] vips: update to 8.10.6.

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

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index c0edf21dcdba..ccb0b01441ba 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.10.5
+version=8.10.6
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -33,7 +33,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=a4eef2f5334ab6dbf133cd3c6d6394d5bdb3e76d5ea4d578b02e1bc3d9e1cfd8
+checksum=2468088d958e0e2de1be2991ff8940bf45664a826c0dad12342e1804e2805a6e
 python_version=3
 
 build_options="gir hdf5"

From abc2d4af3ebe62e5204e6fc58cc062ef0c4ded4d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 4 Apr 2021 03:04:14 +0200
Subject: [PATCH 152/285] webkit2gtk: also set ndebug for none configuration

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

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 54cbb79f455d..8dd10c32be9a 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -10,9 +10,11 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
  -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG
  -DCMAKE_CXX_FLAGS_DEBUG=-DNDEBUG
  -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_NONE=-DNDEBUG
  -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG
  -DCMAKE_C_FLAGS_DEBUG=-DNDEBUG
  -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_C_FLAGS_NONE=-DNDEBUG
  -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc
  -DRUBY_VERSION=2.7
  -DUSE_SYSTEMD=OFF

From 7220b13781c916b51f084b355fafed92f96ac0c9 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, 4 Apr 2021 07:26:20 +0700
Subject: [PATCH 153/285] Revert "cmake-bootstrap: update to 3.20.0."

This reverts commit 2709e170ae89fbf6f57574e2bdb96f49ec3dbf7c.

See: https://gitlab.kitware.com/cmake/cmake/-/issues/22024
---
 srcpkgs/cmake-bootstrap/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index f9c6548ef0ad..8b1c0b5aded8 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,7 +1,8 @@
 # Template file for 'cmake-bootstrap'
 pkgname=cmake-bootstrap
-version=3.20.0
-revision=1
+reverts="3.20.0_1"
+version=3.19.7
+revision=2
 wrksrc=cmake-$version
 bootstrap=yes
 build_style=configure
@@ -16,7 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
+checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
 conflicts="cmake>=0"
 
 CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
@@ -36,6 +37,7 @@ post_patch() {
 	rm -rf Utilities/cmexpat
 	rm -rf Utilities/cmlibarchive
 	rm -rf Utilities/cmliblzma
+	rm -rf Utilities/cmlibrhash
 	rm -rf Utilities/cmnghttp2
 	rm -rf Utilities/cmzlib
 	rm -rf Utilities/cmzstd

From 3182e5bb9b7e79084f4edad1cd37fb0489e7c61f 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, 3 Apr 2021 22:55:05 +0700
Subject: [PATCH 154/285] Revert "cmake: update to 3.20.0."

This reverts commit 392c1eec4d0163186cfaa8b17b338fa417df894a.

See: https://gitlab.kitware.com/cmake/cmake/-/issues/22024
---
 ...onfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch | 13 -------------
 srcpkgs/cmake/template                              |  7 ++++---
 2 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch

diff --git a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
deleted file mode 100644
index d0a2860cc86e..000000000000
--- a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..84ef26b0fd 100644
---- Tests/ConfigSources/CMakeLists.txt
-+++ Tests/ConfigSources/CMakeLists.txt
-@@ -75,7 +75,7 @@ add_custom_command(APPEND
-   )
- foreach(n RANGE 1 5)
-   set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other None Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
- endforeach()
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 93dbc971646c..b3d3d4c5159d 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,8 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.20.0
-revision=1
+reverts="3.20.0_1"
+version=3.19.7
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
  -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1"
@@ -16,7 +17,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=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
+checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
 
 export CMAKE_GENERATOR="Unix Makefiles"
 

From 2a5b71d1f8ffc06fee714007fb0894904883a2a9 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, 4 Apr 2021 07:27:15 +0700
Subject: [PATCH 155/285] Revert "cmake-gui: update to 3.20.0."

This reverts commit f8ba38f3b912d1f71a6a4b50eec8f6c995946d51.

See: https://gitlab.kitware.com/cmake/cmake/-/issues/22024
---
 srcpkgs/cmake-gui/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 461463b3bc30..19b2def02d63 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,7 +1,8 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.0
-revision=1
+reverts="3.20.0_1"
+version=3.19.7
+revision=2
 wrksrc="cmake-${version}"
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -17,7 +18,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
+checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
 
 # XXX: cmake is broken if cmake was built with -GNinja
 # https://bugs.gentoo.org/596460

From 5a3eb5fffb0df360cc015304fb57e40ed890693d 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, 4 Apr 2021 07:23:41 +0700
Subject: [PATCH 156/285] zynaddsubfx: don't overwrite CMAKE_BUILD_TYPE

---
 .../patches/cmake-build-type-none.patch       | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 srcpkgs/zynaddsubfx/patches/cmake-build-type-none.patch

diff --git a/srcpkgs/zynaddsubfx/patches/cmake-build-type-none.patch b/srcpkgs/zynaddsubfx/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..64e6f1d19d94
--- /dev/null
+++ b/srcpkgs/zynaddsubfx/patches/cmake-build-type-none.patch
@@ -0,0 +1,47 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -185,7 +185,6 @@ option (BuildForDebug "Include gdb debug
+ option (IncludeWhatYouUse "Check for useless includes" OFF)
+ mark_as_advanced(IncludeWhatYouUse)
+ 
+-set(CMAKE_BUILD_TYPE "Release")
+ 
+ 
+ set (BuildOptions_x86_64AMD
+@@ -321,34 +320,6 @@ if(NOT AVOID_ASM)
+     add_definitions(-DASM_F2I_YES)
+ endif()
+ 
+-if (BuildForDebug)
+-	set (CMAKE_BUILD_TYPE "Debug")
+-	set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug})
+-	message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_DEBUG}")
+-else (BuildForDebug)
+-	set (CMAKE_BUILD_TYPE "Release")
+-	
+-	set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
+-	
+-	if (BuildForAMD_X86_64)
+-		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_x86_64AMD}")
+-	endif (BuildForAMD_X86_64)
+-	
+-	if (BuildForCore2_X86_64)
+-			set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_X86_64Core2}")
+-	endif (BuildForCore2_X86_64)
+-				
+-	if (SUPPORT_SSE)
+-		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_SSE}")
+-	endif (SUPPORT_SSE)
+-	
+-    if (SUPPORT_NEON AND NOT NoNeonPlease)
+-		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_NEON}")
+-	endif (SUPPORT_NEON AND NOT NoNeonPlease)
+-	
+-	message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_RELEASE}")
+-endif (BuildForDebug)
+-
+ if(NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows"))
+     add_definitions(-fPIC)
+ endif()

From 45608783e87049347400b65888b95c8c3b8ef2d0 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, 20 Mar 2021 10:39:23 +0700
Subject: [PATCH 157/285] vtk: devendor most of dependencies

---
 common/shlibs                                 |  7 -------
 ...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 +++++++++++++++++++
 srcpkgs/vtk/template                          | 16 +++++++++++-----
 3 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch

diff --git a/common/shlibs b/common/shlibs
index c33da050a02c..9aa0a601250b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3221,7 +3221,6 @@ libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
 libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
 libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
 libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistryOpenGL2-9.0.so.1 vtk-9.0.1_1
 libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
 libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
 libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
@@ -3253,7 +3252,6 @@ libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
 libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
 libvtkIOExport-9.0.so.1 vtk-9.0.1_1
 libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportOpenGL2-9.0.so.1 vtk-9.0.1_1
 libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
 libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
 libvtkIOImage-9.0.so.1 vtk-9.0.1_1
@@ -3263,7 +3261,6 @@ libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
 libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
 libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
 libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMPIParallel-9.0.so.1 vtk-9.0.1_1
 libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
 libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
 libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
@@ -3293,10 +3290,8 @@ libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
 libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
 libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
 libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkParallelMPI-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContextOpenGL2-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
@@ -3314,10 +3309,8 @@ libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
 libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
 libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
 libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtkgl2ps-9.0.so.1 vtk-9.0.1_1
 libvtklibharu-9.0.so.1 vtk-9.0.1_1
 libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtkpugixml-9.0.so.1 vtk-9.0.1_1
 libvtksys-9.0.so.1 vtk-9.0.1_1
 libvtkverdict-9.0.so.1 vtk-9.0.1_1
 libvolume_key.so.1 volume_key-0.3.9_1
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
new file mode 100644
index 000000000000..b95015c859cf
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
@@ -0,0 +1,19 @@
+ https://gitlab.kitware.com/vtk/vtk/-/issues/18033
+--- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
++++ VTK/ThirdParty/freetype/vtk_freetype.h.in
+@@ -20,6 +20,15 @@
+ 
+ #ifdef VTK_USE_SYSTEM_FREETYPE
+ # include <ft2build.h>
++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
++/* has been moved to <freetype/internal/compiler-macros.h> */
++# ifndef FT_CALLBACK_DEF
++#  ifdef __cplusplus
++#   define FT_CALLBACK_DEF( x )  extern "C"  x
++#  else
++#   define FT_CALLBACK_DEF( x )  static  x
++#  endif
++# endif /* FT_CALLBACK_DEF */
+ #else
+ # include <vtkfreetype/include/ft2build.h>
+ #endif
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 1b2051aba307..7ca38759c59f 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,24 +1,30 @@
 # Template file for 'vtk'
 pkgname=vtk
 version=9.0.1
-revision=3
+revision=4
 wrksrc=VTK-${version}
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
 configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
+ -DVTK_USE_EXTERNAL=ON
+ -DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
+# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
  libXt-devel libjpeg-turbo-devel tiff-devel hdf5-devel netcdf-devel
  libxml2-devel jsoncpp-devel openmpi-devel libogg-devel libtheora-devel
- eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel python3-devel"
+ eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel
+ gl2ps-devel proj-devel python3-devel"
 short_desc="System for 3D computer graphics, image processing, and visualization"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
 checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
-
+patch_args=-Np1
 nocross="hdf5 is nocross"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -42,12 +48,12 @@ post_install() {
 
 	# Mangle CPython extension names in CMake like xbps-src will do
 	vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
-		-i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-release.cmake"
+		-i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
 }
 
 vtk-devel_package() {
 	short_desc+=" - development files"
-	depends="vtk-python3>=${version}_${revision}"
+	depends="vtk-python3>=${version}_${revision} ${makedepends}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so

From 333d497755ad99cb5f033813b613374de9bad391 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, 25 Mar 2021 07:30:43 +0700
Subject: [PATCH 158/285] alure: enable all options, no dlopen

While we'at it, switch distfiles to DEBIAN
---
 srcpkgs/alure/patches/include-close.patch | 12 ++++++++++++
 srcpkgs/alure/template                    | 13 +++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/alure/patches/include-close.patch

diff --git a/srcpkgs/alure/patches/include-close.patch b/srcpkgs/alure/patches/include-close.patch
new file mode 100644
index 000000000000..b7fe5226b5cf
--- /dev/null
+++ b/srcpkgs/alure/patches/include-close.patch
@@ -0,0 +1,12 @@
+Index: alure-1.2/src/codec_fluidsynth.cpp
+===================================================================
+--- alure-1.2.orig/src/codec_fluidsynth.cpp
++++ alure-1.2/src/codec_fluidsynth.cpp
+@@ -30,6 +30,7 @@
+ #ifdef _WIN32
+ #include <io.h>
+ #endif
++#include <unistd.h>
+ 
+ #include <istream>
+ 
diff --git a/srcpkgs/alure/template b/srcpkgs/alure/template
index d6f6ae17607a..af57f0f163c4 100644
--- a/srcpkgs/alure/template
+++ b/srcpkgs/alure/template
@@ -1,15 +1,20 @@
 # Template file for 'alure'
 pkgname=alure
 version=1.2
-revision=1
+revision=2
 build_style=cmake
-makedepends="libopenal-devel"
+configure_args="-DMODPLUG=ON -DDYNLOAD=OFF"
+hostmakedepends="pkg-config"
+makedepends="libopenal-devel libsndfile-devel libvorbis-devel libflac-devel
+ mpg123-devel libmodplug-devel fluidsynth-devel"
 short_desc="Utility library to help manage common tasks with OpenAL applications"
 maintainer="Simon Whelan <si.whelan@gmail.com>"
 license="MIT"
-homepage="http://kcat.strangesoft.net/alure.html"
-distfiles="http://kcat.strangesoft.net/alure-releases/alure-${version}.tar.bz2"
+# homepage="http://kcat.strangesoft.net/alure.html"
+homepage="https://github.com/kcat/alure"
+distfiles="${DEBIAN_SITE}/main/a/alure/alure_${version}.orig.tar.bz2"
 checksum=465e6adae68927be3a023903764662d64404e40c4c152d160e3a8838b1d70f71
+patch_args=-Np1
 
 post_install() {
 	vlicense COPYING

From 0a5ae147b56fe94d19905540796b0888b18cef77 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, 27 Mar 2021 15:13:24 +0700
Subject: [PATCH 159/285] rmilter: de-vendor most of dependencies

While we're at it, set the group to _rmilter.
---
 srcpkgs/rmilter/patches/de-vendor.patch  | 58 ++++++++++++++++++++++++
 srcpkgs/rmilter/patches/fix-cflags.patch | 24 ++++++++++
 srcpkgs/rmilter/template                 | 14 ++++--
 3 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/rmilter/patches/de-vendor.patch
 create mode 100644 srcpkgs/rmilter/patches/fix-cflags.patch

diff --git a/srcpkgs/rmilter/patches/de-vendor.patch b/srcpkgs/rmilter/patches/de-vendor.patch
new file mode 100644
index 000000000000..078b15d4e661
--- /dev/null
+++ b/srcpkgs/rmilter/patches/de-vendor.patch
@@ -0,0 +1,58 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -240,10 +240,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}
+ 					"${CMAKE_BINARY_DIR}/src"
+ 					"${CMAKE_BINARY_DIR}/"
+ 					"${CMAKE_SOURCE_DIR}/compat"
+-					"${CMAKE_SOURCE_DIR}/uthash"
+-					"${CMAKE_SOURCE_DIR}/contrib/libucl"
+-					"${CMAKE_SOURCE_DIR}/contrib/http-parser"
+-					"${CMAKE_SOURCE_DIR}/contrib/xxhash")
++					)
+ 
+ BISON_TARGET(CfgParser src/cfg_file.y ${CMAKE_CURRENT_BINARY_DIR}/cfg_yacc.c)
+ FLEX_TARGET(CfgScanner src/cfg_file.l  ${CMAKE_CURRENT_BINARY_DIR}/cfg_lex.c)
+@@ -376,16 +373,17 @@ IF(ENABLE_MEMCACHED MATCHES "ON")
+ 		MODULES libmemcached)
+ ENDIF()
+ 
++pkg_check_modules(hiredis REQUIRED hiredis)
++pkg_check_modules(libucl REQUIRED libucl)
++pkg_check_modules(libzstd REQUIRED libzstd)
++
+ ################################ SOURCES SECTION ###########################
+-ADD_SUBDIRECTORY(hiredis)
+-INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/hiredis")
++INCLUDE_DIRECTORIES(${hiredis_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(${libucl_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(${libzstd_INCLUDE_DIRS})
+ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/lc-btrie")
+ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/")
+-ADD_SUBDIRECTORY(contrib/libucl)
+-ADD_SUBDIRECTORY(contrib/http-parser)
+-ADD_SUBDIRECTORY(contrib/xxhash)
+ ADD_SUBDIRECTORY(contrib/lc-btrie)
+-ADD_SUBDIRECTORY(contrib/zstd)
+ 
+ SET(RMILTERSRC
+                 compat/blake2b-ref.c
+@@ -410,12 +408,12 @@ CONFIGURE_FILE(config.h.in config.h)
+ ADD_EXECUTABLE(rmilter ${RMILTERSRC})
+ SET_TARGET_PROPERTIES(rmilter PROPERTIES LINKER_LANGUAGE C)
+ TARGET_LINK_LIBRARIES(rmilter ${RMILTER_REQUIRED_LIBRARIES})
+-TARGET_LINK_LIBRARIES(rmilter rmilter-hiredis)
+-TARGET_LINK_LIBRARIES(rmilter ucl)
+-TARGET_LINK_LIBRARIES(rmilter xxhash)
+-TARGET_LINK_LIBRARIES(rmilter rmilter-http-parser)
++TARGET_LINK_LIBRARIES(rmilter ${hiredis_LINK_LIBRARIES})
++TARGET_LINK_LIBRARIES(rmilter ${libucl_LINK_LIBRARIES})
++TARGET_LINK_LIBRARIES(rmilter -lxxhash)
++TARGET_LINK_LIBRARIES(rmilter -lhttp_parser)
+ TARGET_LINK_LIBRARIES(rmilter lcbtrie)
+-TARGET_LINK_LIBRARIES(rmilter rmilter-zstd)
++TARGET_LINK_LIBRARIES(rmilter ${libzstd_LINK_LIBRARIES})
+ 
+ ##################### INSTALLATION ##########################################
+ 
diff --git a/srcpkgs/rmilter/patches/fix-cflags.patch b/srcpkgs/rmilter/patches/fix-cflags.patch
new file mode 100644
index 000000000000..7983764ecf94
--- /dev/null
+++ b/srcpkgs/rmilter/patches/fix-cflags.patch
@@ -0,0 +1,24 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -296,18 +296,7 @@ IF(SUPPORT_STD_FLAG)
+ ENDIF(SUPPORT_STD_FLAG)
+ 
+ # Optimization flags
+-IF(NOT CMAKE_C_OPT_FLAGS)
+-	IF(ENABLE_OPTIMIZATION MATCHES "ON")
+-		SET(CMAKE_C_OPT_FLAGS "-O3 -fstrict-aliasing")
+-	ELSE(ENABLE_OPTIMIZATION MATCHES "ON")
+-		SET(CMAKE_C_OPT_FLAGS "-g -O2 -fstrict-aliasing")
+-	ENDIF(ENABLE_OPTIMIZATION MATCHES "ON")
+-ENDIF(NOT CMAKE_C_OPT_FLAGS)
+-
+-IF(ENABLE_DEBUG MATCHES "ON")
+-	SET(CMAKE_BUILD_TYPE "Debug")
+-    SET(WITH_DEBUG 1)
+-ENDIF(ENABLE_DEBUG MATCHES "ON")
++SET(CMAKE_C_OPT_FLAGS "-fstrict-aliasing")
+ 
+ SET(CMAKE_C_FLAGS "${CMAKE_C_OPT_FLAGS} ${CMAKE_C_FLAGS} ${CMAKE_C_WARN_FLAGS}")
+ 
diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a131af6c7f07..0c2e00b5169d 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -3,21 +3,27 @@ pkgname=rmilter
 version=1.10.0
 revision=1
 build_style=cmake
-configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
+configure_args="-DMILTER_USER=rmilter -DMILTER_GROUP=_rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel
+ libsasl-devel libmemcached-devel glib-devel xxHash-devel libzstd-devel
+ http-parser-devel hiredis-devel libucl-devel uthash"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
-license="BSD"
+license="BSD-2-Clause, BSD-3-Clause"
 homepage="https://github.com/vstakhov/rmilter"
 distfiles="$homepage/archive/${version}.tar.gz"
 checksum=ea80563fa7636afed0b5fd9a29aa2300f15793ed85788e4ce69c187d341a7d54
 system_accounts="rmilter"
+rmilter_pgroup="_rmilter"
 rmilter_homedir="/var/lib/rmilter"
 
 post_install() {
 	vdoc rmilter.conf.sample
 	vdoc rmilter-grey.conf
 	vsv rmilter
-	vlicense src/rmilter.c
+	head -26 src/rmilter.c >rmilter.LICENSE
+	head -38 contrib/lc-btrie/btrie.h >btrie.LICENSE
+	vlicense rmilter.LICENSE
+	vlicense btrie.LICENSE
 }

From 5ba36e124c09fc6139d05cb78574fdfa5379b600 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Apr 2021 16:38:59 +0200
Subject: [PATCH 160/285] ugrep: update to 3.1.11.

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

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index ce874e4647e3..567a712401c4 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.10
+version=3.1.11
 revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=185984cf7f7e713feb91bcac396d0d16f1f21b6b60b37f1a2269e324af727130
+checksum=43542115612f066ae22610da1510356955b142135bb23e97ed4266be28ec3e13
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 1f3d47ab8182048c483ddb778953ac1fe87807a1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 1 Apr 2021 14:39:00 +0300
Subject: [PATCH 161/285] font-manjari: update to 2.000.

Closes: #29928 [via git-merge-pr]
---
 srcpkgs/font-manjari/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/font-manjari/template b/srcpkgs/font-manjari/template
index 3303e7b2e0df..92524f3a82f6 100644
--- a/srcpkgs/font-manjari/template
+++ b/srcpkgs/font-manjari/template
@@ -1,6 +1,6 @@
 # Template file for 'font-manjari'
 pkgname=font-manjari
-version=1.920
+version=2.000
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -8,10 +8,8 @@ short_desc="Malayalam font with smooth curves"
 maintainer="Ashish Kurian Thomas <a@aktsbot.in>"
 license="OFL-1.1"
 homepage="https://smc.org.in/fonts/manjari"
-distfiles="https://releases.smc.org.in/fonts/manjari/Version${version}/manjari-Version${version}.tar.gz
- https://gitlab.com/smc/fonts/manjari/-/raw/Version${version}/LICENSE.txt"
-checksum="77cfe8fbb18ed5325e228d96b4b69cfd21cc9434eab18656fb9bc48ce691b9c3
- 3ff5ecb5ffbfe008bcc1e2861f2124aabd5571ad1ae9badc245a4e383727ccd2"
+distfiles="https://releases.smc.org.in/fonts/manjari/Version${version}/manjari-Version${version}.tar.gz"
+checksum=c7d99a8fc70137d99297ce20f9a20a58a159450fbf6b4722138f7698cb99a102
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
@@ -21,6 +19,4 @@ do_install() {
 
 	# install fontconfig file
 	vinstall 67-fonts-smc-manjari.conf 0644 etc/fonts/conf.avail/67-fonts-smc-manjari.conf
-
-	vlicense LICENSE.txt
 }

From 5c034ed1a7f076bbf8899c1edd9c316e64320adf Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 29 Mar 2021 09:00:36 +0200
Subject: [PATCH 162/285] geonkick: update to 2.8.0.

---
 srcpkgs/geonkick/patches/musl.patch | 39 -----------------------------
 srcpkgs/geonkick/template           |  8 +++---
 2 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/geonkick/patches/musl.patch

diff --git a/srcpkgs/geonkick/patches/musl.patch b/srcpkgs/geonkick/patches/musl.patch
deleted file mode 100644
index 281752a92ecb..000000000000
--- a/srcpkgs/geonkick/patches/musl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git dsp/src/compressor.h dsp/src/compressor.h
-index 2b246be..e6cac5d 100644
---- dsp/src/compressor.h
-+++ dsp/src/compressor.h
-@@ -26,6 +26,8 @@
- 
- #include "geonkick_internal.h"
- 
-+#include <pthread.h>
-+
- struct gkick_compressor {
-         int enabled;
- 
-diff --git dsp/src/distortion.h dsp/src/distortion.h
-index 4e42f11..b06e6e5 100644
---- dsp/src/distortion.h
-+++ dsp/src/distortion.h
-@@ -26,6 +26,8 @@
- 
- #include "geonkick_internal.h"
- 
-+#include <pthread.h>
-+
- struct gkick_distortion {
-         int enabled;
- 	/* Input limiter for distortion. */
-diff --git dsp/src/synthesizer.h dsp/src/synthesizer.h
-index 303f810..d4d4f9b 100644
---- dsp/src/synthesizer.h
-+++ dsp/src/synthesizer.h
-@@ -31,6 +31,8 @@
- 
- #include <stdatomic.h>
- 
-+#include <pthread.h>
-+
- struct gkick_synth {
-       	atomic_size_t id;
-         char name[30];
diff --git a/srcpkgs/geonkick/template b/srcpkgs/geonkick/template
index 3af40e196c69..e3acec2aa4a0 100644
--- a/srcpkgs/geonkick/template
+++ b/srcpkgs/geonkick/template
@@ -1,17 +1,17 @@
 # Template file for 'geonkick'
 pkgname=geonkick
-version=2.7.2
+version=2.8.0
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config tar xz redkite"
-makedepends="redkite-devel jack-devel libsndfile-devel rapidjson
+hostmakedepends="pkg-config tar xz"
+makedepends="jack-devel libsndfile-devel rapidjson
  lv2 libX11-devel cairo-devel"
 short_desc="Free software percussion synthesizer"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/iurie-sw/geonkick"
 distfiles="https://github.com/iurie-sw/geonkick/archive/v${version}.tar.gz"
-checksum=ee4afd97657620ffdcae34192c1d51953059b79d382bc4f165252085b6e24010
+checksum=ec656e76df13ae1226bba6eeb8146c4f0ddbae2c34d28a89db473c16497eaff4
 make_check=extended # No target to "ninja test".
 
 if [[ ! ${XBPS_TARGET_MACHINE} == "x86_64" ]]; then

From 8628b37771f4c24c212b1f33c11639dbdefe57ad Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 4 Apr 2021 20:23:53 +0200
Subject: [PATCH 163/285] redkite: remove package.

Closes: #29845 [via git-merge-pr]
---
 srcpkgs/redkite-devel             |  1 -
 srcpkgs/redkite/template          | 22 ----------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 120000 srcpkgs/redkite-devel
 delete mode 100644 srcpkgs/redkite/template

diff --git a/srcpkgs/redkite-devel b/srcpkgs/redkite-devel
deleted file mode 120000
index 98f68eebb4c0..000000000000
--- a/srcpkgs/redkite-devel
+++ /dev/null
@@ -1 +0,0 @@
-redkite
\ No newline at end of file
diff --git a/srcpkgs/redkite/template b/srcpkgs/redkite/template
deleted file mode 100644
index 994865d7668a..000000000000
--- a/srcpkgs/redkite/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'redkite'
-pkgname=redkite
-version=1.3.1
-revision=1
-build_style=cmake
-makedepends="cairo-devel libX11-devel"
-short_desc="GUI toolkit"
-maintainer="teldra <teldra@rotce.de>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/iurie-sw/redkite"
-distfiles="https://github.com/iurie-sw/redkite/archive/v${version}.tar.gz"
-checksum=18f2e3808201e350624279db6553baf53113a7351d80edc3604dccfc32a68e67
-make_check=extended # No target to "ninja test".
-
-redkite-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/include"
-		vmove "usr/lib"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4838a7e25874..79e7c4d1c77e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -259,6 +259,7 @@ replaces="
  qt5dxcb-plugin<=5.0.11_1
  qt5integration<=5.0.0_7
  r2-bindings<=1.0.1_2
+ redkite<=1.3.1_1
  reminiscence<=0.4.6_1
  rkt<=1.30.0_3
  rkt-stage1-fly<=1.30.0_3

From 73b37482668f81d2c440c228cc396cb7a1b4000e Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 4 Apr 2021 20:36:01 +0200
Subject: [PATCH 164/285] py3status: update to 3.36.

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

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index dbc52049950e..d139f2cfe49e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.35
+version=3.36
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,8 +10,9 @@ short_desc="Alternative i3bar implementation in Python3"
 maintainer="teldra <teldra@rotce.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
+changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=8069e35ff7dead4feecdd714b6c36985c4dbfd2cc133ff0ae6d190e99549f55b
+checksum=d5c26058217975014e0b5590b4a0df535b3e7969455bdf566d96d801ae46fbba
 
 do_check() {
 	python3 -m pytest

From 50bb47a646b666b3001f2f76e2678c356541ebc7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 20:07:56 +0300
Subject: [PATCH 165/285] foliate: update to 2.6.3.

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

diff --git a/srcpkgs/foliate/template b/srcpkgs/foliate/template
index ba9e6c7c956b..1893c8b2a677 100644
--- a/srcpkgs/foliate/template
+++ b/srcpkgs/foliate/template
@@ -1,6 +1,6 @@
 # Template file for 'foliate'
 pkgname=foliate
-version=2.6.2
+version=2.6.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext gjs glib-devel"
@@ -11,7 +11,7 @@ maintainer="lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://johnfactotum.github.io/foliate/"
 distfiles="https://github.com/johnfactotum/foliate/archive/${version}.tar.gz"
-checksum=974cac48d8ade2c623dfa5f45cfeafb99e646d7bf2df11a3928237c2829c1ac4
+checksum=de685facecb1d014c6041dbad75a5609948a0b18b97c74e31e3a1722bccafbe4
 python_version=3
 
 post_install() {

From 24dfe51198730b06e955670e342c2050233c0f52 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 19:49:46 +0300
Subject: [PATCH 166/285] icewm: update to 2.3.1.

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

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 1eaf2c37ce20..6b893aa533f8 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,8 +1,9 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.2.1
+version=2.3.1
 revision=1
 build_style=cmake
+make_cmd=make
 configure_args="-DENABLE_LTO=ON -DCONFIG_LIBRSVG=ON -DENABLE_ALSA=ON
  -DCONFIG_XPM=ON -DCONFIG_LIBJPEG=ON -DCFGDIR=/etc/icewm"
 hostmakedepends="asciidoc gettext-devel libtool mkfontdir perl
@@ -16,10 +17,13 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=199a37a395e8788b4c2eeb73c46248654d785b2862b89bb5b01709eb33968dc8
+checksum=b44136a519fc2c5b8077879d1d13f2375646ff1580f3db54dd418dfc3b98e5fe
 # broken tests
 make_check=no
 
+# Ninja build files generation fails
+export CMAKE_GENERATOR="Unix Makefiles"
+
 # No c++ warnings for 'One Defintion Rules' and make sure LTO goes ok
 CXXFLAGS="-Wno-odr -fno-strict-aliasing"
 

From 8e6140f86c478938d42004a6e986a9c13f91c60c Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 4 Apr 2021 19:44:46 +0200
Subject: [PATCH 167/285] perl-CryptX: update to 0.071

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

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

From f03882c00c8838ff266c68291b400e473eb2f36c Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 4 Apr 2021 19:23:20 +0200
Subject: [PATCH 168/285] praat: update to 6.1.41

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

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 6fed29714eab..fdd7e8cc3097 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.1.40
+version=6.1.41
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.praat.org/"
 changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=86bdcbe7810080532ffe65c92d44028cedf54813ec2d31674a53b3e7ceb8e100
+checksum=886e835c733ba88eec408893169c797132ed670d8beae2d9c5c52bb8a2609b03
 
 # there are a number of pre-defined Makefiles for certain configurations
 # build options are used to choose which one to use among a selected few

From b4ef8839d1c2880043d1207fc45b97cb99fe75c2 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 4 Apr 2021 20:16:15 +0200
Subject: [PATCH 169/285] portage: update to 3.0.18.

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

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 618be8d2781b..bee8c380162a 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.17
+version=3.0.18
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=96cf79d8d28cf66214871ae9cacb8246d60b443a1eb42c7ae40876f43ae6803e
+checksum=78613290807e80d49ecb4c530639056eb32953f669d1600e7f0a6667871335e5
 
 conf_files="
 	/etc/dispatch-conf.conf

From 27e95928589f73bef0c35b5a921a1f69514544bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 4 Apr 2021 16:02:57 +0200
Subject: [PATCH 170/285] exiftool: update to 12.23.

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

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index d90e9d91c6af..8a29db2e1e34 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.22
+version=12.23
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=8c913623b9007e9cf18f15a43d31a05459dbdb9aa5daaef8201eaec753fe5a6d
+checksum=825188ea0721b6db9c35a2fa4cd680342a129f6fa5bae41bb17da2d4299771d1

From 57b9e973bbf59fdadd2b1ebcc7954d29acab1bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Sun, 4 Apr 2021 16:00:02 +0200
Subject: [PATCH 171/285] Clight: update to 4.5

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

diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index be2ad8c973e7..cff8201154a1 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,6 +1,6 @@
 # Template file for 'Clight'
 pkgname=Clight
-version=4.4
+version=4.5
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/FedeDP/Clight"
 distfiles="https://github.com/FedeDP/Clight/archive/${version}.tar.gz"
-checksum=1371ac6f537cec4fc61581dbb6ceb143df08f20e24f884fa148068008864b054
+checksum=2ce204edd58284c178b99e2ffec0105fc8e78d8a076350f64424b66c9878e91e
 
 post_install() {
 	vcompletion Extra/completions/_clight zsh

From 7997a3d54977daa440d1dd5fde1469ea0b429d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Sun, 4 Apr 2021 16:07:50 +0200
Subject: [PATCH 172/285] Clightd: update to 5.3

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

diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index 5d63698607ec..e1ff136a3f43 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,7 +1,7 @@
 # Template file for 'Clightd'
 pkgname=Clightd
-version=5.2
-revision=2
+version=5.3
+revision=1
 build_style=cmake
 cmake_builddir=build
 configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1"
@@ -15,7 +15,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/FedeDP/Clightd"
 distfiles="https://github.com/FedeDP/Clightd/archive/${version}.tar.gz"
-checksum=6636d58eae7aff4780534258940d1f680637fc1b983320e15aa2fd5be8648853
+checksum=05e109618cf2d4b31bc37780bbc60c58bc7064fe1d27e8d504d3fef318099a31
 
 post_install() {
 	vinstall Scripts/i2c_clightd.conf 644 /usr/lib/modules-load.d/

From c5e0acba83963f61f0a3b92b4b42e75dfa06bb50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 4 Apr 2021 16:19:40 +0200
Subject: [PATCH 173/285] doomretro: update to 4.0.7.

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

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 4728e9c04703..d1a30b8a050b 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.0.6
+version=4.0.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=68ecdfe52e76a3258f3144cf006edb91723c1033d958589f47341aff1895ecdb
+checksum=3914b63be559cf1fa2ddd852cadbfe619cd733ee9ef5e671806179c57fe84f8f

From a0841ab66c87ec47737ad5f3e11a841ba5b0ae29 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 15:40:06 +0300
Subject: [PATCH 174/285] wine-mono: update to 6.1.1.

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

diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index da8a3e647f7a..1bab384c2fad 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.0.0
+version=6.1.1
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0
+checksum=ac3b14beafde34b8482287e597000113dc06a915f32c9fd06c77eb819079e38b
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever

From 0dc2026e39f5b9be2764ccb16e9a7bb9dcc9717c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 15:19:17 +0300
Subject: [PATCH 175/285] mousepad: update to 0.5.4, adopt.

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

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 7159c772fa11..ebf5fba1a24b 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,6 +1,6 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.3
+version=0.5.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -8,9 +8,9 @@ hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://git.xfce.org/apps/mousepad/tree/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=e7208bb9e96a1525d3358a64f9cdd165005078e84e81984a953a2a03491fcaa8
+checksum=d90f492e5d0cba5f5b3b0c1eb7fd7c1701aef57e3fa244d2c457e7f9b0a42aa1

From c8dc210156ba9e8cea37e80e5d33b3bb3aea5ca5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 15:13:13 +0300
Subject: [PATCH 176/285] mtpaint: update to 3.50.09.

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

diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index dd64ea47d727..6f0bef61139d 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,8 +1,8 @@
 # Template file for 'mtpaint'
 pkgname=mtpaint
-version=3.50.08
+version=3.50.09
 revision=1
-_commit=4ea607e44f7fe9373d399f56d59e048d62034619
+_commit=199472ad6a4ecee6c8583fb5a504a2e99712b4fc
 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=1d482e493b7ff27677168952192fc2663357fa408f1a98893c0c07d4a2604c06
+checksum=d4e00175ada01ec02135cc9c3d5235c5be6c24a957d694553d25e3370ec81035
 
 post_install() {
 	vdoc doc/vcode.t2t

From 7afad7370028cb1e3584d0bd1b67592999ab5a06 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 4 Apr 2021 14:59:05 +0300
Subject: [PATCH 177/285] stremio-shell: update to 4.4.135.

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

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index d641db31930c..15165e817d88 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.134
+version=4.4.135
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="d332ce065f7c214e3bcbd556d41e265a4fe8e76dec4960051f17bd971de6da37
+checksum="f272b7d7f22f7d882f3c19035322d2efb702992d6add98cf8acb996a6a80f84d
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- afcef98cbbefcac0d7a9e30a7d1285be83262a83723e982b6116d8854d16a880
- 08cb738d9d1a4104a1181bf56ebcaf43008ac37cb8943c70736113c6fb6823df"
+ 1560580101ec49d577f1840bc4215a584d01ee04a254826194b87f727f73bdc5
+ 03173f78f1de32522c3cad4f3db3e315b7d4f409795e30347aa13c617321ce39"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {

From c8104e1a2d09489b3f17841b8e682727a1e333ce Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 4 Apr 2021 19:26:31 +0200
Subject: [PATCH 178/285] build-style/void-cross.sh: fix leftover _triplet
 variable

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

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 00fa1985c947..d1e1ffef2d6d 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -607,7 +607,7 @@ do_install() {
 		${DESTDIR}/${sysroot}/usr/include/c++/${gcc_patch}
 
 	# Symlinks for gnarl and gnat shared libraries
-	local adalib=usr/lib/gcc/${_triplet}/${gcc_patch}/adalib
+	local adalib=usr/lib/gcc/${tgt}/${gcc_patch}/adalib
 	mv ${DESTDIR}/${adalib}/libgnarl-${gcc_major}.so \
 		${DESTDIR}/${sysroot}/usr/lib
 	mv ${DESTDIR}/${adalib}/libgnat-${gcc_major}.so \

From fcbccf60a5d9640d8961cfb3e47d76579f760510 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sat, 3 Apr 2021 21:48:13 -0400
Subject: [PATCH 179/285] python3-trimesh: update to 3.9.10.

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

diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index c9df7c5a1ae6..5bcb7ad98725 100644
--- a/srcpkgs/python3-trimesh/template
+++ b/srcpkgs/python3-trimesh/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-trimesh'
 pkgname=python3-trimesh
-version=3.9.9
+version=3.9.10
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -17,7 +17,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://trimsh.org/"
 distfiles="https://github.com/mikedh/trimesh/archive/${version}.tar.gz"
-checksum=d18fb30884dd4380d31938e5992dc2a138c5e6072ede28e6889feb4e5adae588
+checksum=ca1aeb6fb5eb1e6bf4793fe7b9dbfaee30e7e1506f57ead6f0f1db156c64d735
 
 post_install() {
 	vlicense LICENSE.md

From 24250b1c948879274f4d9a51318ab25ee93019a9 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 29 Mar 2021 17:00:04 -0400
Subject: [PATCH 180/285] python3-zeroconf: update to 0.29.0.

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

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index 61d6f48cedcf..46e78473d8ce 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,14 +1,19 @@
 # Template file for 'python3-zeroconf'
 pkgname=python3-zeroconf
-version=0.28.8
+version=0.29.0
 revision=1
 wrksrc="python-zeroconf-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-ifaddr"
+checkdepends="python3-pytest python3-mypy $depends"
 short_desc="Pure Python3 implementation of multicast DNS service discovery"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/jstasiak/python-zeroconf"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=5272431bf88611c722119504504b86738f9366f518781deb24e520e382d1f337
+checksum=b8e7c55f36973362314b7d8cf716a76afea3c91abe9d2f435329dc67b973fe06
+
+do_check() {
+	python3 -m pytest zeroconf/test.py
+}

From 4cadc1c8fcaf0df0aa64765448ebd86265a1ac2b Mon Sep 17 00:00:00 2001
From: Bleznudd <bleznudd@pm.me>
Date: Tue, 30 Mar 2021 10:56:19 +0200
Subject: [PATCH 181/285] New package: python3-pdfminer.six-20201018

---
 .../python3-pdfminer.six/patches/dep.patch    | 26 +++++++++++++++++++
 srcpkgs/python3-pdfminer.six/template         | 19 ++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 srcpkgs/python3-pdfminer.six/patches/dep.patch
 create mode 100644 srcpkgs/python3-pdfminer.six/template

diff --git a/srcpkgs/python3-pdfminer.six/patches/dep.patch b/srcpkgs/python3-pdfminer.six/patches/dep.patch
new file mode 100644
index 000000000000..c5c7186184fb
--- /dev/null
+++ b/srcpkgs/python3-pdfminer.six/patches/dep.patch
@@ -0,0 +1,26 @@
+--- ./CHANGELOG.md
++++ ./CHANGELOG.md
+@@ -3,6 +3,11 @@ All notable changes in pdfminer.six will be documented in this file.
+ 
+ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+ 
++## [Unreleased]
++
++### Removed
++- Unused dependency on `sortedcontainers` package ([#525](https://github.com/pdfminer/pdfminer.six/pull/525))
++
+ ## [20201018]
+ 
+ ### Deprecated
+
+--- ./setup.py
++++ ./setup.py
+@@ -15,7 +15,6 @@
+     install_requires=[
+         'chardet ; python_version > "3.0"',
+         'cryptography',
+-        'sortedcontainers',
+     ],
+     extras_require={
+         "dev": ["nose", "tox"],
+
diff --git a/srcpkgs/python3-pdfminer.six/template b/srcpkgs/python3-pdfminer.six/template
new file mode 100644
index 000000000000..753dbfb9b816
--- /dev/null
+++ b/srcpkgs/python3-pdfminer.six/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pdfminer.six'
+pkgname=python3-pdfminer.six
+version=20201018
+revision=1
+wrksrc=pdfminer.six-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-cryptography python3-chardet"
+checkdepends="$depends tox python3-nose"
+short_desc="Tool for extracting information from PDF documents"
+maintainer="Bleznudd <bleznudd@pm.me>"
+license="MIT"
+homepage="https://github.com/pdfminer/pdfminer.six"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=0e9c8b0a9c40c2aee044c3091ad6b18b5e6279722e64b6b975f8aedc26bf8e38
+
+post_install() {
+	vlicense LICENSE
+}

From 24065a2f48b49bcb9066eca64e289e8644e8c1b9 Mon Sep 17 00:00:00 2001
From: Bleznudd <bleznudd@pm.me>
Date: Tue, 30 Mar 2021 10:56:26 +0200
Subject: [PATCH 182/285] setzer: update to 0.4.1.

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

diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index df80eaee0111..4546753dbd66 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,14 +1,14 @@
 # Template file for 'setzer'
 pkgname=setzer
-version=0.3.9
+version=0.4.1
 revision=1
 wrksrc=Setzer-${version}
 build_style=meson
 hostmakedepends="gettext"
-depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-PyPDF2"
+depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-pdfminer.six"
 short_desc="Simple yet full-featured LaTeX editor written in Python with Gtk"
 maintainer="Bleznudd <bleznudd@pm.me>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/cvfosammmm/setzer"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=abddd4b85f41a84fc0ce18377cf955df8f9a10e0350133692e187f74f0828dad
+checksum=a76182c16a8dc699d6e36f0b330fa498a6b718fe44e0a0959db6ff05362c628f

From 65d3147941b488438778b04106dd11fc7ff32906 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 1 Apr 2021 10:25:33 -0700
Subject: [PATCH 183/285] CellWriter: fix license

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

diff --git a/srcpkgs/CellWriter/template b/srcpkgs/CellWriter/template
index 13f6816868f4..fbaefb338aca 100644
--- a/srcpkgs/CellWriter/template
+++ b/srcpkgs/CellWriter/template
@@ -1,14 +1,14 @@
 # Template file for 'CellWriter'
 pkgname=CellWriter
 version=1.3.6
-revision=1
+revision=2
 wrksrc=cellwriter-${version}
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel libXtst-devel"
 short_desc="Grid-entry natural handwriting input panel"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/risujin/cellwriter"
 distfiles="https://github.com/risujin/cellwriter/archive/${version}.tar.gz"
 checksum=17bb07226d4680b565b18a60494cb19cdf9067b427c8df7454c16d809de9963b

From 51c0643aa2789e627342610ba4dde9482867c6ff Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 2 Apr 2021 23:41:45 -0700
Subject: [PATCH 184/285] GConf: fix license, verify python version

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

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index c107d556988c..4365c11e5844 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=10
+revision=11
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -13,11 +13,11 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From a7151e3d069c8283e933b3273d335a71f30fce11 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 2 Apr 2021 23:44:24 -0700
Subject: [PATCH 185/285] GCP-base: fix license

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

diff --git a/srcpkgs/GCP-base/template b/srcpkgs/GCP-base/template
index 2bc890b9ce49..cd2477e3644a 100644
--- a/srcpkgs/GCP-base/template
+++ b/srcpkgs/GCP-base/template
@@ -1,7 +1,7 @@
 # Template file for 'GCP-base'
 pkgname=GCP-base
 version=1
-revision=2
+revision=3
 archs="x86_64*"
 build_style=meta
 depends="grub GCP-Guest-Environment"
@@ -11,5 +11,5 @@ short_desc="Base components for the Google Cloud Platform images"
 # when I have free time.  I use my work email for this only because it
 # makes a little more sense to me than my VoidLinux email.
 maintainer="Michael Aldridge <themaldridge@google.com>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="http://cloud.google.com/"

From a8c3cb383604e87cf125c67d5d85e7da8ea87095 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 09:55:46 -0700
Subject: [PATCH 186/285] SDL2_gfx: fix license, orphan

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

diff --git a/srcpkgs/SDL2_gfx/template b/srcpkgs/SDL2_gfx/template
index 3309d66d14be..3271922c112d 100644
--- a/srcpkgs/SDL2_gfx/template
+++ b/srcpkgs/SDL2_gfx/template
@@ -1,13 +1,13 @@
 # Template file for 'SDL2_gfx'
 pkgname=SDL2_gfx
 version=1.0.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel"
 short_desc="SDL graphics drawing primitives"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="zlib"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Zlib"
 homepage="http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"
 distfiles="http://www.ferzkopp.net/Software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=63e0e01addedc9df2f85b93a248f06e8a04affa014a835c2ea34bfe34e576262
@@ -35,4 +35,3 @@ SDL2_gfx-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
-

From d861919c020bf70cb2d1d16c8c12b374f2d48307 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 13:19:35 -0700
Subject: [PATCH 187/285] SDL_gfx: fix license, orphan

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

diff --git a/srcpkgs/SDL_gfx/template b/srcpkgs/SDL_gfx/template
index 65afe0ead7b1..5af9730e6143 100644
--- a/srcpkgs/SDL_gfx/template
+++ b/srcpkgs/SDL_gfx/template
@@ -1,13 +1,13 @@
 # Template file for 'SDL_gfx'
 pkgname=SDL_gfx
 version=2.0.26
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL-devel"
 short_desc="Graphics drawing primitives for SDL"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="BSD"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
 homepage="http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"
 distfiles="http://www.ferzkopp.net/Software/SDL_gfx-${version%.*}/SDL_gfx-${version}.tar.gz"
 checksum=7ceb4ffb6fc63ffba5f1290572db43d74386cd0781c123bc912da50d34945446
@@ -36,4 +36,3 @@ SDL_gfx-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
-

From 4d8ac345acee1d4a91f9c8754dfbd76b2785ce97 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 13:28:40 -0700
Subject: [PATCH 188/285] SDL_image: fix license

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

diff --git a/srcpkgs/SDL_image/template b/srcpkgs/SDL_image/template
index 5a85cda78ff5..05681e6da03c 100644
--- a/srcpkgs/SDL_image/template
+++ b/srcpkgs/SDL_image/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_image'
 pkgname=SDL_image
 version=1.2.12
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ makedepends="libpng-devel tiff-devel SDL-devel libwebp-devel"
 depends="libpng>=1.6 tiff libjpeg-turbo libwebp>=0.4.0"
 short_desc="Load images as SDL surfaces"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://www.libsdl.org/projects/SDL_image/"
 distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
 checksum=0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699

From bb7e106412ce585c6e5d8b54dd6c1aa79aa0cb38 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 13:31:16 -0700
Subject: [PATCH 189/285] SDL_mixer: fix license

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

diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index 14c9815b4f60..0d05685fb0d9 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_mixer'
 pkgname=SDL_mixer
 version=1.2.12
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ makedepends="SDL-devel libvorbis-devel libmikmod-devel libflac-devel smpeg-devel
 depends="libvorbis libmikmod smpeg libflac"
 short_desc="Multi-channel audio mixer library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://www.libsdl.org/projects/SDL_mixer/"
 distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
 checksum=1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a

From 3b36cb397945336b53f6f7eff3dbb562e6f680dd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 13:32:00 -0700
Subject: [PATCH 190/285] SDL_net: fix license

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

diff --git a/srcpkgs/SDL_net/template b/srcpkgs/SDL_net/template
index 49a5bed74b65..81fadf794bc3 100644
--- a/srcpkgs/SDL_net/template
+++ b/srcpkgs/SDL_net/template
@@ -1,14 +1,14 @@
 # Template file for 'SDL_net'
 pkgname=SDL_net
 version=1.2.8
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="SDL-devel"
 short_desc="Small sample cross-platform networking library for SDL"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://www.libsdl.org/projects/SDL_net/"
 distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
 checksum=5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4

From a696f1d5130cfacd101fd28a179c9bc470ba4065 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 3 Apr 2021 13:37:13 -0700
Subject: [PATCH 191/285] SDL_sound: fix license

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

diff --git a/srcpkgs/SDL_sound/template b/srcpkgs/SDL_sound/template
index 8ff6d577906e..18500ef3f2af 100644
--- a/srcpkgs/SDL_sound/template
+++ b/srcpkgs/SDL_sound/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_sound'
 pkgname=SDL_sound
 version=1.0.3
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="SDL-devel libmikmod-devel libvorbis-devel
  libflac-devel speex-devel smpeg-devel"
 short_desc="Library to decode several popular sound file formats"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://icculus.org/SDL_sound/"
 distfiles="http://icculus.org/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
 checksum=3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df

From 52307a5001b1c133e2f20fdab43786454c42e2d5 Mon Sep 17 00:00:00 2001
From: DirectorX <DirectorX@users.noreply.github.com>
Date: Sat, 3 Apr 2021 01:31:15 +0300
Subject: [PATCH 192/285] hopper: update to 4.7.3.

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

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index a139bb5be275..65aab3cee604 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.2
+version=4.7.3
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=04b38a512896c220b8aa1870564ab0cce3d1b477037bde4071034f4670863ac4
+checksum=141aa160e37e39c4bab244589999f7e977dffc241a1a5c21b8868079485bcbe8
 
 archs="x86_64"
 restricted=yes

From fa010e0b12541ef7586bc02645133304273b3ebd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 30 Mar 2021 23:26:44 -0700
Subject: [PATCH 193/285] fastjar: fix license

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

diff --git a/srcpkgs/fastjar/template b/srcpkgs/fastjar/template
index 8cf752699d20..6eab069f60ef 100644
--- a/srcpkgs/fastjar/template
+++ b/srcpkgs/fastjar/template
@@ -1,12 +1,12 @@
 # Template file for 'fastjar'
 pkgname=fastjar
 version=0.98
-revision=2
+revision=3
 build_style=gnu-configure
 makedepends="zlib-devel"
 short_desc="C implementation of Oracle's jar utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://savannah.nongnu.org/projects/fastjar"
 distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145

From b24a6b2049d2e777e293fb30afc6168d8aee45d5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 30 Mar 2021 23:30:41 -0700
Subject: [PATCH 194/285] fbset: fix license

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

diff --git a/srcpkgs/fbset/template b/srcpkgs/fbset/template
index 05b2c28c27dc..22c51fae0eb7 100644
--- a/srcpkgs/fbset/template
+++ b/srcpkgs/fbset/template
@@ -1,13 +1,13 @@
 # Template file for 'fbset'
 pkgname=fbset
 version=2.1
-revision=5
+revision=6
 conf_files="/etc/fb.modes"
 hostmakedepends="flex"
 makedepends="libfl-devel"
 short_desc="Framebuffer device maintenance program"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://users.telenet.be/geertu/Linux/fbdev/"
 distfiles="${DEBIAN_SITE}/main/f/fbset/fbset_${version}.orig.tar.gz"
 checksum=517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338

From 70d132ebaa0f72204b7da1f78dc80a597e84552f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 30 Mar 2021 23:53:10 -0700
Subject: [PATCH 195/285] fcron: fix license

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

diff --git a/srcpkgs/fcron/template b/srcpkgs/fcron/template
index 231dd79c02b9..11efd44b0bbd 100644
--- a/srcpkgs/fcron/template
+++ b/srcpkgs/fcron/template
@@ -1,7 +1,7 @@
 # Template file for 'fcron'
 pkgname=fcron
 version=3.3.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="
 	--sysconfdir=/etc/fcron
@@ -27,7 +27,7 @@ makedepends="pam-devel readline-devel"
 depends="run-parts"
 short_desc="Feature-rich cron implementation"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://fcron.free.fr"
 distfiles="$homepage/archives/$pkgname-$version.src.tar.gz"
 checksum=9aead33a0926e2eec123698c502114c6d67b483fe1ec232969fae6809b0bab60

From ba7024059a92e6564588d3be6c34e6ce5033ab54 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 20:07:59 -0700
Subject: [PATCH 196/285] flowcanvas: fix license

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

diff --git a/srcpkgs/flowcanvas/template b/srcpkgs/flowcanvas/template
index 261538cf56d8..4b61be701061 100644
--- a/srcpkgs/flowcanvas/template
+++ b/srcpkgs/flowcanvas/template
@@ -1,13 +1,13 @@
 # Template file for 'flowcanvas'
 pkgname=flowcanvas
 version=0.7.1
-revision=8
+revision=9
 build_style=waf
 hostmakedepends="pkg-config python"
 makedepends="gtkmm2-devel libgnomecanvasmm-devel graphviz-devel boost-devel"
 short_desc="Interactive canvas widget for boxes-and-lines style environments"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://drobilla.net/software/flowcanvas/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
 checksum=047928d858fd1e9296a9984de7468c86bbe23fc42e286691b8f273541402c596

From a793dca60df1bc5b543a214cf6c5ad7b3a3954a0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 21:18:28 -0700
Subject: [PATCH 197/285] fltk: fix license

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

diff --git a/srcpkgs/fltk/template b/srcpkgs/fltk/template
index de19b7a86c4d..9da862de10b7 100644
--- a/srcpkgs/fltk/template
+++ b/srcpkgs/fltk/template
@@ -1,7 +1,7 @@
 # Template file for 'fltk'
 pkgname=fltk
 version=1.3.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-threads --enable-xft --enable-shared"
 hostmakedepends="man-db"
@@ -9,7 +9,7 @@ makedepends="libjpeg-turbo-devel libpng-devel MesaLib-devel alsa-lib-devel
  freetype-devel libXinerama-devel libXft-devel"
 short_desc="Cross-platform C++ GUI toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.0-only WITH FLTK-exception"
+license="custom:LGPL-2.0-only WITH FLTK-exception"
 homepage="https://www.fltk.org/"
 distfiles="https://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"
 checksum=8729b2a055f38c1636ba20f749de0853384c1d3e9d1a6b8d4d1305143e115702
@@ -26,6 +26,7 @@ post_build() {
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/man/cat[13]
+	vlicense COPYING
 }
 
 fltk-devel_package() {

From 640a0a2ace43c4cd899a728f21e63abc868972ed Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 21:25:00 -0700
Subject: [PATCH 198/285] flvstreamer: orphan package, fix license

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

diff --git a/srcpkgs/flvstreamer/template b/srcpkgs/flvstreamer/template
index c8de3e6555dd..423cdf54bfa7 100644
--- a/srcpkgs/flvstreamer/template
+++ b/srcpkgs/flvstreamer/template
@@ -1,11 +1,11 @@
 # Template file for 'flvstreamer'
 pkgname=flvstreamer
 version=2.1c1
-revision=2
+revision=3
 wrksrc="${pkgname}"
 short_desc="Command-line RTMP client"
-maintainer="Juergen Buchmueller <pullmoll@t-online.de>"
-license="GPL-2"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="https://savannah.nongnu.org/projects/flvstreamer"
 distfiles="http://download.savannah.gnu.org/releases/flvstreamer/source/${pkgname}-${version}.tar.gz"
 checksum=e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee

From e17a474b81d3786d696a2ea4c8b20af8232601e0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 21:37:19 -0700
Subject: [PATCH 199/285] font-adobe-*: fix license

Upstream considers this an MIT license, even if the text doesn't match.
Fixes 75dpi, 100dpi, utopia-100dpi, utopia-75dpi, utopia-type1
---
 srcpkgs/font-adobe-100dpi/template        | 7 ++++---
 srcpkgs/font-adobe-75dpi/template         | 7 ++++---
 srcpkgs/font-adobe-utopia-100dpi/template | 7 ++++---
 srcpkgs/font-adobe-utopia-75dpi/template  | 7 ++++---
 srcpkgs/font-adobe-utopia-type1/template  | 7 ++++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/font-adobe-100dpi/template b/srcpkgs/font-adobe-100dpi/template
index 37862db9ec72..0043b1810eff 100644
--- a/srcpkgs/font-adobe-100dpi/template
+++ b/srcpkgs/font-adobe-100dpi/template
@@ -1,19 +1,20 @@
 # Template file for 'font-adobe-100dpi'
 pkgname=font-adobe-100dpi
 version=1.0.3
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
 depends="font-util"
-font_dirs="/usr/share/fonts/X11/100dpi"
 short_desc="Standard 100dpi Adobe PCF fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="opensource"
+license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054
+font_dirs="/usr/share/fonts/X11/100dpi"
 
 post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+	vlicense COPYING
 }
diff --git a/srcpkgs/font-adobe-75dpi/template b/srcpkgs/font-adobe-75dpi/template
index 672a2d464921..e1abd11a928b 100644
--- a/srcpkgs/font-adobe-75dpi/template
+++ b/srcpkgs/font-adobe-75dpi/template
@@ -1,19 +1,20 @@
 # Template file for 'font-adobe-75dpi'
 pkgname=font-adobe-75dpi
 version=1.0.3
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
 depends="font-util"
-font_dirs="/usr/share/fonts/X11/75dpi"
 short_desc="Standard 75pi Adobe PCF fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="opensource"
+license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=c6024a1e4a1e65f413f994dd08b734efd393ce0a502eb465deb77b9a36db4d09
+font_dirs="/usr/share/fonts/X11/75dpi"
 
 post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+	vlicense COPYING
 }
diff --git a/srcpkgs/font-adobe-utopia-100dpi/template b/srcpkgs/font-adobe-utopia-100dpi/template
index 3d6c43168650..495998ba7324 100644
--- a/srcpkgs/font-adobe-utopia-100dpi/template
+++ b/srcpkgs/font-adobe-utopia-100dpi/template
@@ -1,19 +1,20 @@
 # Template file for 'font-adobe-utopia-100dpi'
 pkgname=font-adobe-utopia-100dpi
 version=1.0.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
 depends="font-util"
-font_dirs="/usr/share/fonts/X11/100dpi"
 short_desc="100dpi Adobe Utopia PCF fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="opensource"
+license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5
+font_dirs="/usr/share/fonts/X11/100dpi"
 
 post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+	vlicense COPYING
 }
diff --git a/srcpkgs/font-adobe-utopia-75dpi/template b/srcpkgs/font-adobe-utopia-75dpi/template
index f83ecda61076..78d1c28a7b75 100644
--- a/srcpkgs/font-adobe-utopia-75dpi/template
+++ b/srcpkgs/font-adobe-utopia-75dpi/template
@@ -1,19 +1,20 @@
 # Template file for 'font-adobe-utopia-75dpi'
 pkgname=font-adobe-utopia-75dpi
 version=1.0.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
 depends="font-util"
-font_dirs="/usr/share/fonts/X11/75dpi"
 short_desc="100dpi Adobe Utopia PCF fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="opensource"
+license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=8732719c61f3661c8bad63804ebfd54fc7de21ab848e9a26a19b1778ef8b5c94
+font_dirs="/usr/share/fonts/X11/75dpi"
 
 post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+	vlicense COPYING
 }
diff --git a/srcpkgs/font-adobe-utopia-type1/template b/srcpkgs/font-adobe-utopia-type1/template
index 3304aeef8442..e2ab4f439d9f 100644
--- a/srcpkgs/font-adobe-utopia-type1/template
+++ b/srcpkgs/font-adobe-utopia-type1/template
@@ -1,19 +1,20 @@
 # Template file for 'font-adobe-utopia-type1'
 pkgname=font-adobe-utopia-type1
 version=1.0.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
 depends="font-util"
-font_dirs="/usr/share/fonts/X11/Type1"
 short_desc="Adobe Utopia Type1 fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="opensource"
+license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=979435105f897a70f8993fa02c8362160b0513366c2ab896965416f96dbb8077
+font_dirs="/usr/share/fonts/X11/Type1"
 
 post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+	vlicense COPYING
 }

From 3f5b853a1c075bd0ceb36ca3e4d91c151b607dd9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 21:52:09 -0700
Subject: [PATCH 200/285] font-go-ttf: fix license, short_desc

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

diff --git a/srcpkgs/font-go-ttf/template b/srcpkgs/font-go-ttf/template
index 35df3ecac91e..4e3bfa69526b 100644
--- a/srcpkgs/font-go-ttf/template
+++ b/srcpkgs/font-go-ttf/template
@@ -1,12 +1,12 @@
 # Template file for 'font-go-ttf'
 pkgname=font-go-ttf
 version=0.0.20170330
-revision=1
+revision=2
 _gitrev=f03a046406d4d7fbfd4ed29f554da8f6114049fc
 wrksrc="image-${_gitrev}"
-short_desc="A typeface designed for go source code"
+short_desc="Typeface designed for go source code"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://blog.golang.org/go-fonts"
 distfiles="https://github.com/golang/image/archive/${_gitrev}.tar.gz"
 checksum=0bf07c87451c69540f2ebf85d0602393cff5b0c18e91b4d0104d1095070dcc71

From 2983d308545a876c083db06dab72c634e5c5a19b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 21:55:12 -0700
Subject: [PATCH 201/285] font-open-dyslexic-ttf: fix license

---
 srcpkgs/font-open-dyslexic-ttf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-open-dyslexic-ttf/template b/srcpkgs/font-open-dyslexic-ttf/template
index ac882e135416..2d798b86a8b0 100644
--- a/srcpkgs/font-open-dyslexic-ttf/template
+++ b/srcpkgs/font-open-dyslexic-ttf/template
@@ -1,12 +1,12 @@
 # Template file for 'font-open-dyslexic-ttf'
 pkgname=font-open-dyslexic-ttf
 version=20160623
-revision=3
+revision=4
 wrksrc="open-dyslexic-${version}-Stable"
 depends="font-util xbps-triggers"
 short_desc="Font created to increase readability for readers with dyslexia"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="CC-BY-3.0, Bitstream"
+license="CC-BY-3.0, custom:Bitstream"
 homepage="http://opendyslexic.org/"
 distfiles="https://github.com/antijingoist/open-dyslexic/archive/${version}-Stable.tar.gz"
 checksum=a44fde7d5fcf1e3825d00de20f7d71fb7b339a7e71067cd9566e8ab16692802a

From 784b59303de220dcb876a3b4b034c102ac75dc74 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 22:03:13 -0700
Subject: [PATCH 202/285] font-tamsyn: fix license

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

diff --git a/srcpkgs/font-tamsyn/template b/srcpkgs/font-tamsyn/template
index 06a9102aaf81..37ad77637fed 100644
--- a/srcpkgs/font-tamsyn/template
+++ b/srcpkgs/font-tamsyn/template
@@ -1,12 +1,12 @@
 # Template file for 'font-tamsyn'
 pkgname=font-tamsyn
 version=1.11
-revision=2
+revision=3
 wrksrc=tamsyn-font-${version}
 depends="font-util xbps-triggers"
-short_desc="A monospaced programming font for the console and X11"
+short_desc="Monospaced programming font for the console and X11"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="custom"
+license="custom:Tamsyn"
 homepage="http://www.fial.com/~scott/tamsyn-font"
 distfiles="http://www.fial.com/~scott/tamsyn-font/download/tamsyn-font-${version}.tar.gz"
 checksum=97be1b604441b725548c454a92603993eb96e493f508845638a86c8d64fbf24e

From 0813dfabdd461ae8440024be124259a3e5833929 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 22:05:30 -0700
Subject: [PATCH 203/285] font-tamzen: fix license

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

diff --git a/srcpkgs/font-tamzen/template b/srcpkgs/font-tamzen/template
index 91faf9c56395..2ad2e7d2d2c2 100644
--- a/srcpkgs/font-tamzen/template
+++ b/srcpkgs/font-tamzen/template
@@ -1,13 +1,13 @@
 # Template file for 'font-tamzen'
 pkgname=font-tamzen
 version=1.11.4
-revision=2
+revision=3
 wrksrc="tamzen-font-Tamzen-${version}"
 makedepends="font-util"
 depends="$makedepends"
 short_desc="Monospaced bitmap font based on Tamsyn"
 maintainer='Peter Bui <pbui@github.bx612.space>'
-license="custom"
+license="custom:Tamzen"
 homepage="https://sunaku.github.io/tamsyn-1.7b-font-review.html"
 distfiles="https://github.com/sunaku/tamzen-font/archive/Tamzen-${version}.tar.gz"
 checksum=da677aaa4bb7a30fd23f92c0e93b6a3e66ca27817561390ec78a476cee3bcde7

From 742894d28c9619426412ff43531d82b4a2014709 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 22:28:08 -0700
Subject: [PATCH 204/285] foomatic-db-engine: fix license

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

diff --git a/srcpkgs/foomatic-db-engine/template b/srcpkgs/foomatic-db-engine/template
index 3db8efce3504..dc1a21716e5a 100644
--- a/srcpkgs/foomatic-db-engine/template
+++ b/srcpkgs/foomatic-db-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'foomatic-db-engine'
 pkgname=foomatic-db-engine
 version=4.0.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --libdir=/usr/lib PERL_INSTALLDIRS=vendor"
 hostmakedepends="wget perl foomatic-db cups-filters ghostscript cups libxml2-devel"
@@ -9,7 +9,7 @@ makedepends="libxml2-devel cups-devel"
 depends="${hostmakedepends/libxml2-devel/}"
 short_desc="OpenPrinting printer support - programs"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.openprinting.org/"
 distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz"
 checksum=b5c89027aa26967d2e6db62e2af7db0c4039d2480d4fbf2476a6ddcf609a5faf

From 33b34f79c10aa77da01fcd0d57c86697331d2604 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 22:35:31 -0700
Subject: [PATCH 205/285] foremost: fix license

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

diff --git a/srcpkgs/foremost/template b/srcpkgs/foremost/template
index d4f13a8e336a..cb463049d370 100644
--- a/srcpkgs/foremost/template
+++ b/srcpkgs/foremost/template
@@ -1,11 +1,11 @@
 # Template file for 'foremost'
 pkgname=foremost
 version=1.5.7
-revision=5
+revision=6
 conf_files="/etc/foremost.conf"
 short_desc="Forensic program to recover lost files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain, GPL-2"
+license="Public Domain"
 homepage="http://foremost.sourceforge.net/"
 distfiles="http://foremost.sourceforge.net/pkg/foremost-${version}.tar.gz"
 checksum=502054ef212e3d90b292e99c7f7ac91f89f024720cd5a7e7680c3d1901ef5f34

From bdab3a21855c2aab5993a92a9bc8185afe2afadf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 22:46:12 -0700
Subject: [PATCH 206/285] frame: fix license

---
 srcpkgs/frame/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/frame/template b/srcpkgs/frame/template
index 88ed8ae738e5..faf98cc44932 100644
--- a/srcpkgs/frame/template
+++ b/srcpkgs/frame/template
@@ -1,17 +1,17 @@
-# Template build file for 'frame'
+# Template file for 'frame'
 pkgname=frame
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--enable-x11"
+hostmakedepends="pkg-config"
+makedepends="libXi-devel xorg-server-devel"
 short_desc="Touch Frame Library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-makedepends="libXi-devel xorg-server-devel"
-hostmakedepends="pkg-config"
-license="LGPL-2.1"
+license="LGPL-3.0-only"
 homepage="https://launchpad.net/frame"
 distfiles="https://launchpad.net/${pkgname}/trunk/v${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f
-configure_args="--enable-x11"
 
 frame-devel_package() {
 	depends="frame>=${version}_${revision}"

From a05731c6e0d4e994216a7b10ffb52348ea9c16bf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 23:13:54 -0700
Subject: [PATCH 207/285] fs-utils: fix license

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

diff --git a/srcpkgs/fs-utils/template b/srcpkgs/fs-utils/template
index df850a17090d..91a0d1dcc0d6 100644
--- a/srcpkgs/fs-utils/template
+++ b/srcpkgs/fs-utils/template
@@ -1,14 +1,14 @@
-# Template file for 'fs-utils'.
+# Template file for 'fs-utils'
 pkgname=fs-utils
 version=1.10
-revision=2
+revision=3
 archs="~*-musl"
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="netbsd-rumpkernel-devel"
 short_desc="NetBSD File System Access Utilities in Userland"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"
 homepage="https://github.com/rumpkernel/fs-utils"
 distfiles="$homepage/archive/v$version.tar.gz
  https://raw.githubusercontent.com/rumpkernel/fs-utils/master/LICENSE"

From b8230f6978c6e446a178af5c840aa59da9928423 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 28 Mar 2021 23:05:01 +0200
Subject: [PATCH 208/285] duf: update to 0.6.2.

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

diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index 87191e9e8fbc..3797726fb76f 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,15 +1,16 @@
 # Template file for 'duf'
 pkgname=duf
-version=0.6.0
+version=0.6.2
 revision=1
 build_style=go
+go_ldflags="-X main.Version=$version"
 go_import_path="github.com/muesli/duf"
 short_desc="Disk Usage/Free Utility"
 maintainer="Paper <paper@tilde.institute>"
 license="MIT"
 homepage="https://github.com/muesli/duf/"
 distfiles="https://github.com/muesli/duf/archive/v$version.tar.gz"
-checksum=238ace11966ab3b1f99e5488a9f161ebc97aba7600a8f09884110d0572309491
+checksum=f2314d8e5e133a6ce93968b3450c1710a3e432cb4a5dfc528aa0317d968a8988
 
 post_install() {
 	vlicense LICENSE

From e35d1432e8daf41dcf256b0c8fefda7deecab953 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Mon, 29 Mar 2021 03:53:00 +1100
Subject: [PATCH 209/285] libopenmpt: update to 0.5.7

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

diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index 3e427baeed40..d9ba1879ff41 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,6 +1,6 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.6
+version=0.5.7
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="BSD-3-Clause"
 homepage="https://lib.openmpt.org/libopenmpt/"
 distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=17dea782b334c146f4acd948c7c31ffdd2afc899eb347ebe01be1606ea79f4b8
+checksum=c86026c47e208f1849676d1b6c5c9a068247154f38d368628c05c1f354d72c77
 
 post_install() {
 	vlicense LICENSE

From 9bb21c09c8095570f6a87638abf10e2c0fe48654 Mon Sep 17 00:00:00 2001
From: mag <mag-one@autistici.org>
Date: Sun, 28 Mar 2021 15:51:13 +0200
Subject: [PATCH 210/285] faust: update to 2.30.5

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

diff --git a/srcpkgs/faust/template b/srcpkgs/faust/template
index 65352639d6af..03b44b2f2580 100644
--- a/srcpkgs/faust/template
+++ b/srcpkgs/faust/template
@@ -1,6 +1,6 @@
 # Template file for 'faust'
 pkgname=faust
-version=2.27.2
+version=2.30.5
 revision=1
 build_style=gnu-makefile
 hostmakedepends="cmake pkg-config llvm"
@@ -10,7 +10,7 @@ maintainer="mag <mag-one@autistici.org>"
 license="GPL-2.0-or-later"
 homepage="http://faust.grame.fr/"
 distfiles=https://github.com/grame-cncm/faust/releases/download/${version}/${pkgname}-${version}.tar.gz
-checksum="c9b21de69253d5a02a779c2eed74491fc62209d86c24724b429f68098191c39c"
+checksum="6cf64b8ee92c2db74d7d83d726b0ecb6f7e141deeadf4cd40c60e467893e0bfc"
 
 # Android stuffs, used by the 'faust2android' script.
 nostrip_files="libsndfile.so "

From cee4e202981fc5e2a42834f2070ced8f93fe7a6a Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 28 Mar 2021 13:12:35 +0200
Subject: [PATCH 211/285] zlib: fix license

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

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..a6462e5616a2 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,12 +1,12 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
 revision=3
 bootstrap=yes
 build_style=configure
-short_desc="A compression/decompression Library"
+short_desc="Compression/decompression Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
 checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1

From c96727f97b1a58c0a8466dc75704958f303d06cc Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Sat, 27 Mar 2021 18:28:06 -0300
Subject: [PATCH 212/285] circleci-cli: update to 0.1.15195.

This update provides shell completion for Bash and ZSH.

Commit information has been removed for ease of maintenance.

Closes: #29791 [via git-merge-pr]
---
 srcpkgs/circleci-cli/template | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index f0eac722b454..1932703e601b 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,17 +1,21 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
-version=0.1.15108
+version=0.1.15195
 revision=1
 build_style=go
+build_helper=qemu
 go_import_path=github.com/CircleCI-Public/${pkgname}
-go_ldflags="-s -w -X github.com/CircleCI-Public/${pkgname}/version.Version=${version} -X github.com/CircleCI-Public/${pkgname}/version.Commit=cf6a918 -X github.com/CircleCI-Public/${pkgname}/version.packageManager=xbps"
+go_ldflags="-s -w
+ -X github.com/CircleCI-Public/${pkgname}/version.Version=${version}
+ -X github.com/CircleCI-Public/${pkgname}/version.packageManager=xbps"
 hostmakedepends="packr2"
 short_desc="Use CircleCI from the command line"
 maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="MIT"
 homepage="https://circleci-public.github.io/circleci-cli/"
 distfiles="https://github.com/CircleCI-Public/${pkgname}/archive/v${version}.tar.gz"
-checksum=930bc37c181389cebbbcf9a2b836eb55f8c7ebcb9e853666ce5f4213b084a551
+checksum=c9f7bb5a81a173b4c87c9343c7bf12412f9e45ffa742478ffde74a9b10e879da
+_completions="bash zsh"
 
 pre_build() {
 	packr2
@@ -19,6 +23,12 @@ pre_build() {
 
 post_build() {
 	packr2 clean
+
+	# Generate completion for shells.
+	cli=$(find $GOPATH/bin -name $pkgname)
+	for shell in $_completions; do
+		vtargetrun $cli completion $shell > ${pkgname}.${shell}
+	done
 }
 
 post_install() {
@@ -26,4 +36,8 @@ post_install() {
 
 	# Rename the binary according to CircleCI's own releases.
 	mv ${DESTDIR}/usr/bin/circleci{-cli,}
+
+	for shell in $_completions; do
+		vcompletion ${pkgname}.${shell} $shell circleci
+	done
 }

From 4602276e69c4286a87615ce67e7791e678d6e28d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 25 Mar 2021 22:12:33 +0200
Subject: [PATCH 213/285] opera: update to 75.0.3969.93.

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

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index d709282efc79..5b1abd449ce2 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=74.0.3911.75
+version=75.0.3969.93
 revision=1
 archs="x86_64"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb"
-checksum=358e125db7e27e85582263c3ffa94a5c12c0b90c05e1811937a5e50276ecd83d
+checksum=0805334a1d236f44bfe9a34fa2fd829fe19587c480dd9559145a3a620e42fac8
 repository="nonfree"
 nostrip=yes
 

From 77a7ccf457e7c1a9f8bb37e1cf6e759a49cab32b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 11:00:42 -0700
Subject: [PATCH 214/285] corkscrew: fix license, fix homepage

Since we are switching to a git tarball instead of a release tarball,
autoreconf becomes necessary.

Closes: #29764 [via git-merge-pr]
---
 srcpkgs/corkscrew/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/corkscrew/template b/srcpkgs/corkscrew/template
index a7c4327bc7da..39321f2f72c4 100644
--- a/srcpkgs/corkscrew/template
+++ b/srcpkgs/corkscrew/template
@@ -1,12 +1,16 @@
 # Template file for 'corkscrew'
 pkgname=corkscrew
 version=2.0
-revision=1
+revision=2
 build_style=gnu-configure
+hostmakedepends="automake"
 short_desc="Corkscrew is a tool for tunneling SSH through HTTP proxies"
 maintainer="pulux <pulux@pf4sh.de>"
-license="GPL-2"
-homepage="http://www.agroman.net/corkscrew/"
-#distfiles="http://agroman.net/corkscrew/$pkgname-$version.tar.gz"
-distfiles="https://ftp.heanet.ie/mirrors/OpenBSD/distfiles/corkscrew-${version}.tar.gz"
-checksum=0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be
+license="GPL-2.0-or-later"
+homepage="https://github.com/bryanpkc/corkscrew"
+distfiles="https://github.com/bryanpkc/corkscrew/archive/refs/tags/v${version}.tar.gz"
+checksum=09d70daaa3145070a1e463dbab6ae1cbc62449b1e09c94e158f6017e7c79c9f6
+
+pre_configure() {
+	autoreconf -fi
+}

From 3117ad93f94892ef27643a47ce48bb0f425ab128 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 20:58:03 -0700
Subject: [PATCH 215/285] avr-gcc: fix license

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

diff --git a/srcpkgs/avr-gcc/template b/srcpkgs/avr-gcc/template
index bf65e60bf13d..093c66c9dbe4 100644
--- a/srcpkgs/avr-gcc/template
+++ b/srcpkgs/avr-gcc/template
@@ -1,11 +1,11 @@
 # Template file for 'avr-gcc'
 pkgname=avr-gcc
 version=9.3.0
-revision=1
+revision=2
 wrksrc="gcc-$version"
 short_desc="GNU C Compiler for AVR"
 maintainer="allan <mail@may.mooo.com>"
-license="GFDL-1.2, GPL-3, LGPL-2.1"
+license="GFDL-1.3-or-later, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, GCC-exception-3.1"
 homepage="http://gcc.gnu.org"
 distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
 checksum=71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1

From 3e9553cee67b11d602320c9c0b3255c8d7fe44fa Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Thu, 25 Mar 2021 11:13:56 +0100
Subject: [PATCH 216/285] synapse: update to 1.30.1.

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

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 98cef830f2c3..f4452df2997d 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.29.0
+version=1.30.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=01650226eabe9dbf04e01a457aafb8d6b147707b4d764d18692bde1786d608f3
+checksum=8c93abb1ed84c1f383d6179fdd74f7afec56b15401073e12f4a7a5a4ef75849a
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From b014910b08e5330ac1792f862ce3b28b514c5bb0 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 10:37:16 -0400
Subject: [PATCH 217/285] python3-pygame: update to 2.0.1.

---
 srcpkgs/python3-pygame/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-pygame/template b/srcpkgs/python3-pygame/template
index c136b750713d..80ed8b637837 100644
--- a/srcpkgs/python3-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,24 +1,19 @@
 # Template file for 'python3-pygame'
 pkgname=python3-pygame
-version=1.9.6
-revision=4
+version=2.0.1
+revision=1
 wrksrc="pygame-${version}"
 build_style=python3-module
 make_build_args="cython"
 hostmakedepends="pkg-config python3-setuptools python3-Cython
- SDL_mixer-devel SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-makedepends="python3-devel SDL_mixer-devel SDL_image-devel
- SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
+ SDL2_mixer-devel SDL2_image-devel SDL2_ttf-devel libjpeg-turbo-devel portmidi-devel"
+makedepends="python3-devel SDL2_mixer-devel SDL2_image-devel
+ SDL2_ttf-devel libjpeg-turbo-devel portmidi-devel"
 short_desc="Collection of Python modules for writing games (Python3)"
 maintainer="Archaeme <normandy@firemail.cc>"
 license="LGPL-2.1-or-later"
 homepage="https://www.pygame.org/"
 distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz"
-checksum=301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957
+checksum=8b1e7b63f47aafcdd8849933b206778747ef1802bd3d526aca45ed77141e4001
 
 export PORTMIDI_INC_PORTTIME=1
-
-pre_build() {
-	# Remove the C source to re-cythonize, which avoids some API changes
-	rm src_c/pypm.c src_c/_sdl2/{sdl2,audio,video}.c
-}

From 81aa1dd0e6616dab9619e291d64d22d53aefe525 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 10:37:19 -0400
Subject: [PATCH 218/285] python3-pgzero: update to 1.2.1.

Closes: #29720 [via git-merge-pr]
---
 srcpkgs/python3-pgzero/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pgzero/template b/srcpkgs/python3-pgzero/template
index ee3e285ca08a..b9be3f993aff 100644
--- a/srcpkgs/python3-pgzero/template
+++ b/srcpkgs/python3-pgzero/template
@@ -1,10 +1,9 @@
 # Template file for 'python3-pgzero'
 pkgname=python3-pgzero
-version=1.2
-revision=3
+version=1.2.1
+revision=1
 wrksrc="pgzero-${version}"
 build_style=python3-module
-pycompile_module="pgzero pgzrun.py"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-pygame python3-numpy"
 short_desc="Zero-boilerplate games programming framework based on Pygame (Python3)"
@@ -12,4 +11,5 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="LGPL-3.0-or-later"
 homepage="https://pygame-zero.readthedocs.io/en/stable/"
 distfiles="${PYPI_SITE}/p/pgzero/pgzero-${version}.tar.gz"
-checksum=91e641d545c6235a24719dea0fd83c8429e92a8b5ab1756bef145128e8db9017
+checksum=8cadc020f028cbac3e0cbd3bb9311a1c045f1deedac7917ff433f986c38e6106
+make_check=no # Tests require video device

From 2dd5cb5ee9e635e55f9f6f8b9b40649836b68e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 22 Mar 2021 23:18:57 +0100
Subject: [PATCH 219/285] tarpaulin: update to 0.17.0.

Closes: #29688 [via git-merge-pr]
---
 srcpkgs/tarpaulin/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index 56fceeb4c436..1c95f61183f4 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,9 +1,10 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
-version=0.14.3
-revision=2
+version=0.17.0
+revision=1
 archs="x86_64*"
 build_style=cargo
+make_check_args="-- --test-threads 1"
 hostmakedepends="pkg-config cmake"
 makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
@@ -11,7 +12,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/xd009642/tarpaulin"
 distfiles="https://github.com/xd009642/tarpaulin/archive/${version}.tar.gz"
-checksum=f1624dac8124420cf921fc81d9b7fd513f116362d83abe0bcbd7d91fd4af952f
+checksum=54b282eedf4bcf67c3ec63bec8ae7d995efc1c398cd8e6d5c78ab85bfd5f3ade
 
 post_install() {
 	vlicense LICENSE-MIT

From 974958c85db9013b29856c19188c5d7d1713d4df Mon Sep 17 00:00:00 2001
From: Corey Thomas <cthomas@oisf.net>
Date: Mon, 22 Mar 2021 23:02:10 -0400
Subject: [PATCH 220/285] mupen64plus: update to 2.5.9

Closes: #29692 [via git-merge-pr]
---
 srcpkgs/mupen64plus/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 0323d321803c..f0e6fe2c4173 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,18 +1,19 @@
 # Template file for 'mupen64plus'
 pkgname=mupen64plus
-version=2.5
-revision=13
+version=2.5.9
+revision=1
+nocross="yes"
 wrksrc="mupen64plus-bundle-src-${version}"
-hostmakedepends="pkg-config which"
+hostmakedepends="pkg-config which nasm"
 makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
 depends="desktop-file-utils"
-short_desc="A Nintendo64 Emulator"
+short_desc="Nintendo64 Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.mupen64plus.org"
 distfiles="https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/${pkgname}-bundle-src-${version}.tar.gz"
-checksum=9c75b9d826f2d24666175f723a97369b3a6ee159b307f7cc876bbb4facdbba66
-archs="i686* x86_64*"
+checksum=d5243ddc00388ee2e538b3826a78a719dec2bd5da54ac6f3344fed861fb141a8
+nopie=yes
 
 CFLAGS="-fcommon"
 

From 35c0e758ccef07ed36ae04c1e962b62e0115f333 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 4 Apr 2021 23:31:03 +0300
Subject: [PATCH 221/285] exa: update to 0.10.0; adopt

---
 srcpkgs/exa/template | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index 5ea748de3627..ea3ad487fa43 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -1,21 +1,30 @@
 # Template file for 'exa'
 pkgname=exa
-version=0.9.0
-revision=2
+version=0.10.0
+revision=1
 build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config libgit2-devel"
 makedepends="libgit2-devel"
 short_desc="Modern replacement for ls"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
 license="MIT"
 homepage="https://the.exa.website/"
-distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz"
-checksum=@facbe3b234f403e1e1919f28f009f1733a0fbbbb11f0bc2ba89ac3eba11bc5e8
+distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz
+ https://github.com/ogham/exa/releases/download/v${version}/exa-accoutrements-v${version}.zip"
+checksum="27420f7b805941988399d63f388be4f6077eee94a505bf01c2fb0e7d15cbf78d
+ c1ab340af63e64bc3fd854c03f6161aa240a533e928688036a7d4544aecabc05"
+
+post_extract() {
+	mkdir -p accoutrements
+	mv ../man accoutrements/
+	mv ../completions accoutrements/
+}
 
 post_install() {
-	vman contrib/man/exa.1
-	vcompletion contrib/completions.bash bash
-	vcompletion contrib/completions.fish fish
-	vcompletion contrib/completions.zsh zsh
+	vman accoutrements/man/exa.1
+	vman accoutrements/man/exa_colors.5
+	vcompletion completions/completions.bash bash
+	vcompletion completions/completions.fish fish
+	vcompletion completions/completions.zsh zsh
 	vlicense LICENCE
 }

From 02b602b0c8de7b024795d0e1768e70138fba0a32 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 12:54:23 -0700
Subject: [PATCH 222/285] badvpn: fix license, add changelog

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

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 3b35580d8b34..048186d81cfb 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,16 +1,21 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=13
+revision=14
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
-homepage="https://github.com/ambrop72/$pkgname"
+license="BSD-3-Clause"
+homepage="https://github.com/ambrop72/badvpn"
+changelog="https://raw.githubusercontent.com/ambrop72/badvpn/master/ChangeLog"
 distfiles="https://github.com/ambrop72/$pkgname/archive/${version}.tar.gz"
 checksum=bfd4bbfebd7274bcec792558c9a2fd60e39cd92e04673825ade5d04154766109
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="-DBUILD_NCD=0" ;;
 esac
+
+post_install() {
+	vlicense COPYING
+}

From 024189571185ffa049d99330641b6e46c972f40b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 13:22:28 -0700
Subject: [PATCH 223/285] bam: fix license

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

diff --git a/srcpkgs/bam/template b/srcpkgs/bam/template
index 5913d7fd5ec3..53c8c50740c4 100644
--- a/srcpkgs/bam/template
+++ b/srcpkgs/bam/template
@@ -1,11 +1,11 @@
 # Template file for 'bam'
 pkgname=bam
 version=0.5.1
-revision=3
+revision=4
 makedepends="lua53-devel"
 short_desc="Fast and flexible build system using Lua"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="Zlib, MIT"
 homepage="http://github.com/matricks/bam"
 distfiles="https://github.com/matricks/bam/archive/v${version}.tar.gz"
 checksum=cc8596af3325ecb18ebd6ec2baee550e82cb7b2da19588f3f843b02e943a15a9

From 08b3079f5ad8254a5fdfab93bf1207302628f8fc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 13:37:57 -0700
Subject: [PATCH 224/285] banner: fix license

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

diff --git a/srcpkgs/banner/template b/srcpkgs/banner/template
index 08a21fae58c6..d7d0dbf414c6 100644
--- a/srcpkgs/banner/template
+++ b/srcpkgs/banner/template
@@ -1,11 +1,11 @@
 # Template file for 'banner'
 pkgname=banner
 version=1.2
-revision=5
+revision=6
 build_style=gnu-configure
 short_desc="Prints ASCII banners"
 maintainer="allan <mail@may.mooo.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.moria.de/~michael/comp/banner"
 distfiles="http://www.moria.de/~michael/comp/banner/banner-${version}.tar.gz"
 checksum=84828f417e6139733cff98c8bb4765a70070352ab7d471ecd1f54d8fa8a9f746

From 5c77c3ef2cf09e73a28b92a491a47f59ae466caf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 13:53:00 -0700
Subject: [PATCH 225/285] batman-adv14: fix license

GPL-2.0-only is a best guess based on a lack of "... or newer" in the
source file licensing comment and there not being a COPYING or LICENSE
(or equivalent) file with the source.
---
 srcpkgs/batman-adv14/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/batman-adv14/template b/srcpkgs/batman-adv14/template
index e5f3028dc49e..8fb35827056a 100644
--- a/srcpkgs/batman-adv14/template
+++ b/srcpkgs/batman-adv14/template
@@ -1,16 +1,16 @@
 # Template file for 'batman-adv14'
 pkgname=batman-adv14
 version=2013.4.0
-revision=8
+revision=9
+wrksrc="batman-adv-$version"
 short_desc="B.A.T.M.A.N. routing protocol kernel module (protocol version 14)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.open-mesh.org/"
 distfiles="http://downloads.open-mesh.org/batman/releases/batman-adv-${version}/batman-adv-${version}.tar.gz"
 checksum=a9b1b7542c94cc6bf7c97b7b0d02bf071b5632a64480ae419358b9cb9cab6870
-conflicts="batman-adv>=0"
-wrksrc="batman-adv-$version"
 provides="batman-adv-${version}_${revision}"
+conflicts="batman-adv>=0"
 
 dkms_modules="batman-adv14 ${version}"
 depends="dkms"

From d5248a74936d19ea54db6bfe6bb3fd063efe13cc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:01:10 -0700
Subject: [PATCH 226/285] bchunk: fix license

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

diff --git a/srcpkgs/bchunk/template b/srcpkgs/bchunk/template
index 9476ef42e3d1..602ea4856227 100644
--- a/srcpkgs/bchunk/template
+++ b/srcpkgs/bchunk/template
@@ -1,11 +1,11 @@
 # Template file for 'bchunk'
 pkgname=bchunk
 version=1.2.2
-revision=1
+revision=2
+short_desc="Convert a CD image in a .bin/.cue format to .iso and .cdr tracks"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://he.fi/bchunk/"
-short_desc="Convert a CD image in a .bin/.cue format to .iso and .cdr tracks"
 distfiles="http://he.fi/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=e7d99b5b60ff0b94c540379f6396a670210400124544fb1af985dd3551eabd89
 

From 8a4bd7b071e37983517ac9493f860d2370c1ab48 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:03:30 -0700
Subject: [PATCH 227/285] bdf2sfd: fix license

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

diff --git a/srcpkgs/bdf2sfd/template b/srcpkgs/bdf2sfd/template
index 1d3f7b463160..fdccefbc7534 100644
--- a/srcpkgs/bdf2sfd/template
+++ b/srcpkgs/bdf2sfd/template
@@ -1,11 +1,11 @@
 # Template file for 'bdf2sfd'
 pkgname=bdf2sfd
 version=1.1.6
-revision=1
+revision=2
 build_style=cmake
 short_desc="BDF to SFD converter to vectorize bitmap fonts"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="BSD-2-clause"
+license="BSD-2-Clause"
 homepage="https://github.com/fcambus/bdf2sfd"
 changelog="https://github.com/fcambus/bdf2sfd/raw/master/ChangeLog"
 distfiles="https://github.com/fcambus/bdf2sfd/archive/${version}.tar.gz"

From 0f326a6e2928250fb1d8331881b5373aad29f1e3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:06:34 -0700
Subject: [PATCH 228/285] beep: fix license

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

diff --git a/srcpkgs/beep/template b/srcpkgs/beep/template
index 91724238f8a1..0f3c10d9781f 100644
--- a/srcpkgs/beep/template
+++ b/srcpkgs/beep/template
@@ -1,13 +1,13 @@
 # Template file for 'beep'
 pkgname=beep
 version=1.3
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="beep"
+depends="libcap-progs"
 short_desc="Beep music composer"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
-depends="libcap-progs"
+license="GPL-2.0-or-later"
 homepage="http://www.johnath.com/beep/"
 distfiles="http://www.johnath.com/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=59acef7a987de5557cefd1a904666cc2691f132929af39e65450b182a581ec2d

From 1b26b9fa3db0e7ae7a915e1d395a1369ea38b7b2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:16:31 -0700
Subject: [PATCH 229/285] bitchx: fix license

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

diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index f4746e263f89..450fde27deed 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,13 +1,13 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=16
+revision=17
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
 makedepends="openssl-devel ncurses-devel"
-short_desc="A simple IRC client (Internet Relay Chat)"
+short_desc="Simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="3-clause-BSD"
+license="BSD-3-Clause"
 homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
@@ -15,3 +15,7 @@ checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 disable_parallel_build=yes
 
 CFLAGS="-fcommon"
+
+post_install() {
+	vlicense COPYRIGHT
+}

From a4ea6d5caa387a2b821b1db9431b2e4fc9193905 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:21:34 -0700
Subject: [PATCH 230/285] bitlbee-steam: fix license

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

diff --git a/srcpkgs/bitlbee-steam/template b/srcpkgs/bitlbee-steam/template
index c6c2790f0af0..9f7a8b645fb8 100644
--- a/srcpkgs/bitlbee-steam/template
+++ b/srcpkgs/bitlbee-steam/template
@@ -1,13 +1,13 @@
 # Template file for 'bitlbee-steam'
 pkgname=bitlbee-steam
 version=1.4.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
 makedepends="bitlbee-devel"
 short_desc="Steam protocol plugin for BitlBee"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/jgeboski/bitlbee-steam"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=fced6878906e14d96f899d362620de17c41a7fb84c2460068a9c08fc6904de38

From 526489b4bcaba12cfbd1008b1f501ff0ee9df7bd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:23:36 -0700
Subject: [PATCH 231/285] bridge-utils: fix license

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

diff --git a/srcpkgs/bridge-utils/template b/srcpkgs/bridge-utils/template
index 969d5902ecb8..08827cd6ad58 100644
--- a/srcpkgs/bridge-utils/template
+++ b/srcpkgs/bridge-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'bridge-utils'
 pkgname=bridge-utils
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--sbindir=/usr/bin"
 hostmakedepends="automake"
 short_desc="Layer2 ethernet bridging for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge"
 distfiles="${KERNEL_SITE}/utils/net/bridge-utils/bridge-utils-${version}.tar.xz"
 checksum=cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8
-configure_args="--sbindir=/usr/bin"
 
 pre_configure() {
 	sed "s/u_int\([0-9]*\)_t/uint\1_t/" -i libbridge/libbridge.h

From 3ea9985caf0bd10bb00e5baba4919419bf68507b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:26:09 -0700
Subject: [PATCH 232/285] broadcom-bt-firmware: fix license

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

diff --git a/srcpkgs/broadcom-bt-firmware/template b/srcpkgs/broadcom-bt-firmware/template
index 2345f00f7a56..93314460c88b 100644
--- a/srcpkgs/broadcom-bt-firmware/template
+++ b/srcpkgs/broadcom-bt-firmware/template
@@ -1,13 +1,13 @@
 # Template file for 'broadcom-bt-firmware'
 pkgname=broadcom-bt-firmware
 version=12.0.1.1105
-revision=2
+revision=3
 _patch=_p1
 wrksrc="${pkgname}-${version}${_patch}"
 hostmakedepends="perl"
 short_desc="Broadcom Bluetooth firmware for Linux kernel"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="Custom"
+license="custom:Broadcom"
 homepage="https://github.com/winterheart/broadcom-bt-firmware"
 distfiles="https://github.com/winterheart/broadcom-bt-firmware/archive/v${version}${_patch}.tar.gz"
 checksum=df1bbbdac950f99b33d797236c7f91696f2f12a52d5682af6e9fb686b410d0c8

From 16c03d5b0b8d34d8a3a0aad17e538fda3e85f6e9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 21:33:57 -0700
Subject: [PATCH 233/285] bsdunzip: fix license

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

diff --git a/srcpkgs/bsdunzip/template b/srcpkgs/bsdunzip/template
index fe26c540d5f1..e6ac1e4a369f 100644
--- a/srcpkgs/bsdunzip/template
+++ b/srcpkgs/bsdunzip/template
@@ -1,12 +1,12 @@
 # Template file for 'bsdunzip'
 pkgname=bsdunzip
 version=20160115
-revision=1
+revision=2
 build_style=gnu-makefile
 makedepends="libarchive-devel"
 short_desc="Libarchive(3)-utilizing unzip implementation from FreeBSD"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD, ISC"
+license="BSD-2-Clause, ISC"
 homepage="https://github.com/somasis/bsdunzip"
 distfiles="https://github.com/somasis/bsdunzip/archive/${version}.tar.gz"
 checksum=06c52c77fa518732665aa2daa73f364cd2470a5d47a83c9c79f86f207cf3ecc1

From 344cee466ae7388985be5c1491cc204e8b90c9c5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 21:43:54 -0700
Subject: [PATCH 234/285] bti: fix license

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

diff --git a/srcpkgs/bti/template b/srcpkgs/bti/template
index 174b9c4139d5..a914e9e75d60 100644
--- a/srcpkgs/bti/template
+++ b/srcpkgs/bti/template
@@ -1,14 +1,14 @@
 # Template file for 'bti'
 pkgname=bti
 version=034
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="pcre-devel libxml2-devel libcurl-devel json-c-devel liboauth-devel"
 depends="bash wget"
 short_desc="Console client for Twitter and identi.ca"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://gregkh.github.com/bti/"
 distfiles="https://www.kernel.org/pub/software/web/bti/bti-${version}.tar.xz"
 checksum=8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83

From 084b0d40cd5a76c7ca88d3310806b59217753567 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 21:44:07 -0700
Subject: [PATCH 235/285] buffer: fix license

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

diff --git a/srcpkgs/buffer/template b/srcpkgs/buffer/template
index 9e4c738ea186..df0fb0c0c640 100644
--- a/srcpkgs/buffer/template
+++ b/srcpkgs/buffer/template
@@ -1,13 +1,13 @@
 # Template file for 'buffer'
 pkgname=buffer
 version=2014.11.26
-revision=2
+revision=3
 _gitrev=2b58f5b78f7511b4d4e2eb0e9f8b0af16dea3985
 wrksrc=${pkgname}-${_gitrev}
 build_style=gnu-makefile
 short_desc="Speed up writing tapes on remote tape drives"
 maintainer="jbu <pullmoll@t-online.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/scotte/buffer"
 distfiles="https://github.com/scotte/buffer/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=14a881fcd070b1dcd8ec91d8d036f22094c22ac3769c274f0d7d6799038a73c3

From c473df306d7cf6898aca6cb0ad61a25994efba30 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Mar 2021 14:23:56 +0100
Subject: [PATCH 236/285] instead: update to 3.3.4, drop gtk3 and sdl2 build
 option

Both are enabled by default in upstream.

Closes: #29628 [via git-merge-pr]
---
 srcpkgs/instead/template | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/instead/template b/srcpkgs/instead/template
index 81b5e1b39d28..66800783564b 100644
--- a/srcpkgs/instead/template
+++ b/srcpkgs/instead/template
@@ -1,23 +1,17 @@
 # Template file for 'instead'
 pkgname=instead
-version=3.3.2
+version=3.3.4
 revision=1
 build_style=cmake
-configure_args="-DWITH_SDL2=$(vopt_if sdl2 ON OFF)
- -DWITH_GTK3=$(vopt_if gtk3 ON OFF)"
-makedepends="lua51-devel $(vopt_if gtk3 'gtk+3-devel' 'gtk+-devel')
- $(vopt_if sdl2 'SDL2_image-devel SDL2_mixer-devel
- SDL2_ttf-devel' 'SDL_image-devel SDL_mixer-devel SDL_ttf-devel')"
+hostmakedepends="pkg-config"
+makedepends="lua51-devel gtk+3-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel"
 short_desc="Interactive fiction interpreter"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://instead-hub.github.io"
 changelog="https://raw.githubusercontent.com/instead-hub/instead/master/ChangeLog"
 distfiles="https://github.com/instead-hub/instead/releases/download/${version}/instead_${version}.tar.gz"
-checksum=bb98f6903291bcc40fb06f2203ab8e05272ec84fded412482b6faa54bea3a90b
-
-build_options="gtk3 sdl2"
-build_options_default="sdl2"
+checksum=ff705290646b764a189f08e852deee82baa56f467f5f3fe9e687df81c3c819d6
 
 post_install() {
 	vlicense COPYING

From 0461dc900907a902fdd8d5adbf8d26f34f2f03b8 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 23 Mar 2021 21:02:24 +0300
Subject: [PATCH 237/285] starship: update to 0.51.0

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

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 9362f5664cba..f7e0d45bd71b 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,7 +1,7 @@
 # Template file for 'starship'
 pkgname=starship
-version=0.50.0
-revision=2
+version=0.51.0
+revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
@@ -12,7 +12,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="ISC"
 homepage="https://starship.rs"
 distfiles="https://github.com/starship/starship/archive/v${version}.tar.gz"
-checksum=d8f4dc9bd266f2a5c34926d361c62fdddb61cd7da4acadba5f9c175eb07602e5
+checksum=87a9e2ad206a7397e52e00a0a650d364ca2ea941cb9fbe75704d56a43f11cef9
 
 post_build() {
 	STARSHIP="target/${RUST_TARGET}/release/starship"

From 54517e349af2a99ffde2472579916401e001e66f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 5 Apr 2021 02:46:19 +0300
Subject: [PATCH 238/285] font-iosevka: update to 5.2.1

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

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 521d9ab3b5ff..41f0e6194abf 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=5.1.1
+version=5.2.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -12,8 +12,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d5025d8cc1e969fa2364d28f08a82478a839788ceb7d41d10367c25cbf79ca6b
- 80c1d9ea390414e645efadc9fd6792d8e05be8a983c2add505ae1b62c963ec8b"
+ c160178621f7c2943b3c00b2f33146e5c0b7945cecfb5008bd8f80aa5f1946bc
+ f12ad8fe3a1ccb398302456154107420b0411fc039993a5966b36dc43f361435"
 
 font_dirs="/usr/share/fonts/TTF"
 

From c06fce86d3ccad9fc5b3321a8f337c91aa131705 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 5 Apr 2021 02:49:03 +0300
Subject: [PATCH 239/285] font-sarasa-gothic: update to 0.21.0

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

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

From c59f1f0790f679233ee5b19a9fadc34d5f6ee01e Mon Sep 17 00:00:00 2001
From: Brad Ackerman <brad@facefault.org>
Date: Sat, 3 Apr 2021 21:37:47 -0700
Subject: [PATCH 240/285] fpc: add ppc64le support

Closes https://github.com/void-linux/void-packages/pull/29986.
---
 srcpkgs/fpc/template | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template
index 7cf3e9adffe6..876b3587ec17 100644
--- a/srcpkgs/fpc/template
+++ b/srcpkgs/fpc/template
@@ -2,7 +2,7 @@
 pkgname=fpc
 version=3.2.0
 revision=1
-archs="x86_64* i686*"
+archs="x86_64* i686* ppc64le"
 create_wrksrc=yes
 build_wrksrc="${pkgname}build-${version}"
 conf_files="/etc/fpc.cfg /etc/fppkg.cfg"
@@ -23,6 +23,9 @@ i686*)
 	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}-1.i686.rpm"
 	checksum+=" 05c5600c9461362a08df100cf50ca125cb2b4d5bfe4da48cf8c144f2bf4617a2"
 	;;
+ppc64le*)
+	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc64le-linux.tar"
+	checksum+=" 9bf59ae3d336f0de4624c63e4e892ea95de4be2ca66182d185defc50b69b65f3"
 esac
 # TODO: figure out cross-build and how to unwrap the ARM .tar.
 nocross=yes
@@ -30,9 +33,25 @@ nopie=yes
 noverifyrdeps=yes
 
 post_extract() {
-	# relative links needed
-	ln -sf ../lib64/fpc/${version}/ppcx64 usr/bin
-	ln -sf ../lib/fpc/${version}/ppc386 usr/bin
+	# extract recursive tar files or otherwise post-process.
+	case "$XBPS_TARGET_MACHINE" in
+	ppc64le*)
+		mkdir ${wrksrc}/usr
+		cd ${wrksrc}/${pkgname}-${version}.powerpc64-linux
+		for f in $(bsdtar -tf binary.powerpc64-linux.tar)
+		do
+			bsdtar -xOf binary.powerpc64-linux.tar $f | bsdtar -C ${wrksrc}/usr -xzf -
+		done
+		cd ${wrksrc}
+		ln -sf ../lib/fpc/${version}/ppcppc64 usr/bin
+		;;
+	x86_64*|i686*)
+		# relative links needed
+		ln -sf ../lib64/fpc/${version}/ppcx64 usr/bin
+		ln -sf ../lib/fpc/${version}/ppc386 usr/bin
+		;;
+	esac
+
 
 	# tweak PT_INTERP for musl targets
 	case "$XBPS_TARGET_MACHINE" in

From 91050ae1ad02a6db5239d9b4505749c8c8064da3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 5 Apr 2021 01:53:25 +0200
Subject: [PATCH 241/285] fpc: also add support fpr ppc64 and ppc

---
 srcpkgs/fpc/patches/ppc64.patch | 25 +++++++++++++++++++++++++
 srcpkgs/fpc/template            | 24 ++++++++++++++++++------
 2 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/fpc/patches/ppc64.patch

diff --git a/srcpkgs/fpc/patches/ppc64.patch b/srcpkgs/fpc/patches/ppc64.patch
new file mode 100644
index 000000000000..624f6cdc0fbf
--- /dev/null
+++ b/srcpkgs/fpc/patches/ppc64.patch
@@ -0,0 +1,25 @@
+commit 5120237db67c066764563df36fcf171699ff7c6f
+Author: q66 <daniel@octaforge.org>
+Date:   Mon Apr 5 01:50:14 2021 +0200
+
+    always use elfv2 abi by default on ppc64
+
+diff --git fpcsrc/compiler/options.pas fpcsrc/compiler/options.pas
+index 2cc36670..c35cc785 100644
+--- fpcbuild-3.2.0/fpcsrc/compiler/options.pas
++++ fpcbuild-3.2.0/fpcsrc/compiler/options.pas
+@@ -4299,13 +4299,8 @@ begin
+      likely to fail in spectacular ways" }
+   if not option.ABISetExplicitly then
+     begin
+-      if (target_info.abi=abi_powerpc_sysv) and
+-         (target_info.endian=endian_little) then
++      if (target_info.abi=abi_powerpc_sysv) then
+         target_info.abi:=abi_powerpc_elfv2
+-      else
+-        if (target_info.abi=abi_powerpc_elfv2) and
+-         (target_info.endian=endian_big) then
+-        target_info.abi:=abi_powerpc_sysv
+     end;
+ {$endif}
+ 
diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template
index 876b3587ec17..7967b25165b1 100644
--- a/srcpkgs/fpc/template
+++ b/srcpkgs/fpc/template
@@ -2,7 +2,7 @@
 pkgname=fpc
 version=3.2.0
 revision=1
-archs="x86_64* i686* ppc64le"
+archs="x86_64* i686* ppc64le ppc64 ppc"
 create_wrksrc=yes
 build_wrksrc="${pkgname}build-${version}"
 conf_files="/etc/fpc.cfg /etc/fppkg.cfg"
@@ -26,6 +26,15 @@ i686*)
 ppc64le*)
 	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc64le-linux.tar"
 	checksum+=" 9bf59ae3d336f0de4624c63e4e892ea95de4be2ca66182d185defc50b69b65f3"
+	;;
+ppc64*)
+	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc64-linux.tar"
+	checksum+=" b7700e126ae37f32ee03c6113c4d07c8b97e451022419387a1da7744dfaa7e25"
+	;;
+ppc*)
+	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc-linux.tar"
+	checksum+=" cd35d8f520ddcd3020862658b9a5273724dbaab1e265d5e227cefb59173de81d"
+	;;
 esac
 # TODO: figure out cross-build and how to unwrap the ARM .tar.
 nocross=yes
@@ -35,15 +44,18 @@ noverifyrdeps=yes
 post_extract() {
 	# extract recursive tar files or otherwise post-process.
 	case "$XBPS_TARGET_MACHINE" in
-	ppc64le*)
+	ppc*)
+		case "$XBPS_TARGET_MACHINE" in
+			ppc64*) PPC_SUFFIX="64";;
+		esac
 		mkdir ${wrksrc}/usr
-		cd ${wrksrc}/${pkgname}-${version}.powerpc64-linux
-		for f in $(bsdtar -tf binary.powerpc64-linux.tar)
+		cd ${wrksrc}/${pkgname}-${version}.powerpc${PPC_SUFFIX}-linux
+		for f in $(bsdtar -tf binary.powerpc${PPC_SUFFIX}-linux.tar)
 		do
-			bsdtar -xOf binary.powerpc64-linux.tar $f | bsdtar -C ${wrksrc}/usr -xzf -
+			bsdtar -xOf binary.powerpc${PPC_SUFFIX}-linux.tar $f | bsdtar -C ${wrksrc}/usr -xzf -
 		done
 		cd ${wrksrc}
-		ln -sf ../lib/fpc/${version}/ppcppc64 usr/bin
+		ln -sf ../lib/fpc/${version}/ppcppc${PPC_SUFFIX} usr/bin
 		;;
 	x86_64*|i686*)
 		# relative links needed

From 55ad20a7c427acd5c32fe3ca4b5cceb2b693d193 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 5 Apr 2021 01:59:11 +0200
Subject: [PATCH 242/285] hedgewars: use fpc on glibc ppc64*

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

diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index aed3c03caf89..7060dbc37d95 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -23,7 +23,7 @@ replaces="hedgewars-data>=0"
 export CMAKE_GENERATOR="Unix Makefiles"
 
 case $XBPS_TARGET_MACHINE in
-	x86_64*)
+	x86_64*|ppc64le|ppc64)
 		hostmakedepends+=" fpc"
 		;;
 	*)

From 353381c08dc9f3ed8af1589bb7356801abe5ebbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 4 Apr 2021 21:20:19 -0300
Subject: [PATCH 243/285] python-Cython: revbump for python 3.9.3.

This fixes an issue where running

    python3 setup.py [other targets] cython

segfaults on i686. This was observed only after the python 3.9.3 update,
though it isn't clear what mismatch caused it (therefore the related
issue won't be closed yet).

Log for build failure (python3-pygame package):
https://build.voidlinux.org/builders/i686_builder/builds/31607/steps/shell_3/logs/stdio
Related issue: #30008
---
 srcpkgs/python-Cython/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 6a75941059ba..8b5ae8841be7 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
 version=0.29.22
-revision=1
+revision=2
 wrksrc="Cython-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 923be786b11c6ea55e9816037bffaaebd3f5dde3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 4 Apr 2021 20:44:29 -0400
Subject: [PATCH 244/285] python3: update to 3.9.4.

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

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

From f40c424139f83e04d65c3656489614a4b0b077e9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 4 Apr 2021 20:46:05 -0400
Subject: [PATCH 245/285] python3-tkinter: update to 3.9.4.

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

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

From a0759856546c92b01dc70adab382f780e5f76bcb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 4 Apr 2021 20:47:26 -0400
Subject: [PATCH 246/285] vtk: rebuild for python3-3.9.4 ABI compatibility fix

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

diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 7ca38759c59f..edaf9dfc827a 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
 # Template file for 'vtk'
 pkgname=vtk
 version=9.0.1
-revision=4
+revision=5
 wrksrc=VTK-${version}
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"

From 02551d6c0fc226cd09e50e52ea557017998f5b2c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 4 Apr 2021 20:47:26 -0400
Subject: [PATCH 247/285] python-Cython: rebuild for python3-3.9.4 ABI
 compatibility fix

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

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 8b5ae8841be7..00c790ce5d32 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
 version=0.29.22
-revision=2
+revision=3
 wrksrc="Cython-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 7a759fadf5154c75b9145c5f77cfce91b5ffe573 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 4 Apr 2021 20:48:45 -0400
Subject: [PATCH 248/285] python3-pygame: rebuild for python3-3.9.4 ABI
 compatibility fix

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

diff --git a/srcpkgs/python3-pygame/template b/srcpkgs/python3-pygame/template
index 80ed8b637837..eeb29dd59b11 100644
--- a/srcpkgs/python3-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pygame'
 pkgname=python3-pygame
 version=2.0.1
-revision=1
+revision=2
 wrksrc="pygame-${version}"
 build_style=python3-module
 make_build_args="cython"

From 57346a543869305c424421d564238b0e896c6175 Mon Sep 17 00:00:00 2001
From: Noel Cower <ncower@nil.dev>
Date: Sun, 28 Mar 2021 14:22:10 -0700
Subject: [PATCH 249/285] varnish: update to 6.6.0.

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

diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template
index d9a105350ac5..fff05f21f786 100644
--- a/srcpkgs/varnish/template
+++ b/srcpkgs/varnish/template
@@ -1,6 +1,6 @@
 # Template file for 'varnish'
 pkgname=varnish
-version=6.5.1
+version=6.6.0
 revision=1
 build_style=gnu-configure
 configure_args="--cache-file=config.void --disable-static $(vopt_enable pcrejit pcre-jit)"
@@ -11,7 +11,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-2-Clause"
 homepage="https://varnish-cache.org/"
 distfiles="https://varnish-cache.org/_downloads/${pkgname}-${version}.tgz"
-checksum=11964c688f9852237c99c1e327d54dc487549ddb5f0f5aa7996e521333d7cdb5
+checksum=d5ff82f2041276dfaeb9a652a88b6d7287cfcf7ca345bb02c438fb65d2bca2e5
 lib32disabled=yes
 
 build_options="pcrejit"
@@ -24,6 +24,10 @@ system_accounts="_varnish _vcache"
 _varnish_homedir="/var/lib/varnish"
 _vcache_pgroup="_varnish"
 
+if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+	broken="vcltest failure on i686 in c00059.vtc"
+fi
+
 if [ yes = "$(vopt_if pcrejit yes)" ]; then
 	# Don't permit cross builds if pcrejit is set.
 	nocross="Cannot run test program when cross compiling (PCRE_JIT)"

From ee4a1c9e556c95de18bb6ad432ee3d8c27ec90fb Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 5 Apr 2021 09:11:54 +0200
Subject: [PATCH 250/285] warzone2100: update to 4.0.0.

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

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index a73c6c8a734e..8d6de60569c0 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,21 +1,21 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=3.4.1
-revision=2
+version=4.0.0
+revision=1
 wrksrc="warzone2100"
 build_style=cmake
 configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
-hostmakedepends="zip unzip asciidoc gettext pkg-config qt5-qmake qt5-host-tools"
+hostmakedepends="zip unzip asciidoc gettext pkg-config shaderc"
 makedepends="libpng-devel fribidi-devel fontconfig-devel SDL2-devel libvorbis-devel
  libtheora-devel libopenal-devel glew-devel physfs-devel harfbuzz-devel
- qt5-script-devel libsodium-devel libcurl-devel"
+ libsodium-devel libcurl-devel"
 depends="desktop-file-utils warzone2100-data"
 short_desc="3D realtime strategy game on a future Earth"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69
+checksum=3368f6653a5ebe5579938f0ebbcfe7907b1f0fc635f0a7aecc5d68ebc50124b5
 nocross="fails to detect SDL2 when cross-compiling"
 
 warzone2100-data_package() {

From f24966beeb17291a4526d7e5b47ffad475cdbad4 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Mon, 5 Apr 2021 13:08:00 +0200
Subject: [PATCH 251/285] alsa-tools: add hdajacksensetest

also fix python_version 2 -> 3 (for hwmixvolume)
---
 srcpkgs/alsa-tools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/alsa-tools/template b/srcpkgs/alsa-tools/template
index 45593c372fba..1078472c79ae 100644
--- a/srcpkgs/alsa-tools/template
+++ b/srcpkgs/alsa-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'alsa-tools'
 pkgname=alsa-tools
 version=1.2.2
-revision=1
+revision=2
 hostmakedepends="pkg-config"
 makedepends="fltk-devel gtk+-devel gtk+3-devel"
 depends="python3-gobject python3-alsa"
@@ -11,11 +11,11 @@ license="GPL-2.0-only"
 homepage="http://alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/tools/alsa-tools-${version}.tar.bz2"
 checksum=bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349
-python_version=2 #unverified
+python_version=3
 
 _tools="
-	as10k1 echomixer envy24control hdajackretask hda-verb hdspconf hdsploader
-	hdspmixer hwmixvolume ld10k1 mixartloader pcxhrloader rmedigicontrol
+	as10k1 echomixer envy24control hdajackretask hdajacksensetest hda-verb hdspconf
+	hdsploader hdspmixer hwmixvolume ld10k1 mixartloader pcxhrloader rmedigicontrol
 	sb16_csp seq/sbiload sscape_ctl us428control usx2yloader vxloader
 "
 

From cd67a1b1bd4e8579849fa73dec8a2819c7fd1c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 5 Apr 2021 12:15:43 +0200
Subject: [PATCH 252/285] visidata: update to 2.3.

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

diff --git a/srcpkgs/visidata/template b/srcpkgs/visidata/template
index 8ec4a94a004e..21be128580d4 100644
--- a/srcpkgs/visidata/template
+++ b/srcpkgs/visidata/template
@@ -1,6 +1,6 @@
 # Template file for 'visidata'
 pkgname=visidata
-version=2.2.1
+version=2.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ license="GPL-3.0-only"
 homepage="https://visidata.org/"
 changelog="https://raw.githubusercontent.com/saulpw/visidata/stable/CHANGELOG.md"
 distfiles="https://github.com/saulpw/visidata/archive/v${version}.tar.gz"
-checksum=8e73e8290f8ac01d0a9b7ed44613170f55a4687c1087ac92f5dd92e9f0546cf4
+checksum=11a859ef45a7932b10da34bb0978975d052933e747303c055a2d40ccc0472b30

From 4af2d5a02dad638057d7f7156c81c422c9511ee7 Mon Sep 17 00:00:00 2001
From: Noel Cower <ncower@nil.dev>
Date: Sun, 4 Apr 2021 20:10:39 -0700
Subject: [PATCH 253/285] glusterfs: update to 9.0.

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

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 158a5c5b7954..93fd87eeda76 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,7 +1,7 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
-version=8.3
-revision=2
+version=9.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
@@ -17,7 +17,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://www.gluster.org/"
 distfiles="https://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz"
-checksum=d7e68391db9ab8bee8cb2ccc01cc4e4bc2ea2c04402080860b9b06050b69ce1d
+checksum=6f29ae4ab2c270ade0cd14a3f733d7d33fda78e79e81b148cd50711f65069d87
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="not yet supported";;

From e4b755496362fbf012ac0cc0ca405cc530929a81 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 2 Mar 2021 20:36:07 +1100
Subject: [PATCH 254/285] libuv: update to 1.41.0.

---
 srcpkgs/libuv/patches/disable-fs-chown.patch  | 10 +++++-----
 .../libuv/patches/disable-setuid-test.patch   | 20 +++++++++----------
 srcpkgs/libuv/template                        |  6 ++++--
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/libuv/patches/disable-fs-chown.patch b/srcpkgs/libuv/patches/disable-fs-chown.patch
index e2dd0899fad1..893d09edfa02 100644
--- a/srcpkgs/libuv/patches/disable-fs-chown.patch
+++ b/srcpkgs/libuv/patches/disable-fs-chown.patch
@@ -1,6 +1,6 @@
---- test/test-list.h.orig	2018-04-16 19:13:01.184197428 +0200
-+++ test/test-list.h	2018-04-16 19:13:28.144260600 +0200
-@@ -287,7 +287,7 @@ TEST_DECLARE   (fs_unlink_readonly)
+--- test/test-list.h.orig	2021-03-02 21:59:17.718832425 +1100
++++ test/test-list.h	2021-03-02 21:59:41.809157112 +1100
+@@ -344,7 +344,7 @@
  #ifdef _WIN32
  TEST_DECLARE   (fs_unlink_archive_readonly)
  #endif
@@ -9,12 +9,12 @@
  TEST_DECLARE   (fs_link)
  TEST_DECLARE   (fs_readlink)
  TEST_DECLARE   (fs_realpath)
-@@ -821,7 +821,7 @@ TASK_LIST_START
+@@ -997,7 +997,7 @@
  #ifdef _WIN32
    TEST_ENTRY  (fs_unlink_archive_readonly)
  #endif
 -  TEST_ENTRY  (fs_chown)
 +  /* TEST_ENTRY  (fs_chown) */
    TEST_ENTRY  (fs_utime)
+   TEST_ENTRY  (fs_utime_round)
    TEST_ENTRY  (fs_futime)
-   TEST_ENTRY  (fs_readlink)
diff --git a/srcpkgs/libuv/patches/disable-setuid-test.patch b/srcpkgs/libuv/patches/disable-setuid-test.patch
index 27ccb7464451..9dbd6bcee612 100644
--- a/srcpkgs/libuv/patches/disable-setuid-test.patch
+++ b/srcpkgs/libuv/patches/disable-setuid-test.patch
@@ -1,6 +1,6 @@
---- test/test-list.h.orig	2018-04-16 19:13:01.184197428 +0200
-+++ test/test-list.h	2018-04-16 19:15:11.042501710 +0200
-@@ -254,8 +254,8 @@ TEST_DECLARE   (spawn_detached)
+--- test/test-list.h.orig	2021-03-02 21:59:17.718832425 +1100
++++ test/test-list.h	2021-03-02 22:05:18.359833402 +1100
+@@ -305,8 +305,8 @@
  TEST_DECLARE   (spawn_and_kill_with_std)
  TEST_DECLARE   (spawn_and_ping)
  TEST_DECLARE   (spawn_preserve_env)
@@ -11,16 +11,16 @@
  TEST_DECLARE   (spawn_stdout_to_file)
  TEST_DECLARE   (spawn_stdout_and_stderr_to_file)
  TEST_DECLARE   (spawn_stdout_and_stderr_to_file2)
-@@ -391,7 +391,7 @@ TEST_DECLARE   (win32_signum_number)
+@@ -477,7 +477,7 @@
+ TEST_DECLARE   (win32_signum_number)
+ #else
  TEST_DECLARE   (emfile)
- TEST_DECLARE   (close_fd)
- TEST_DECLARE   (spawn_fs_open)
 -TEST_DECLARE   (spawn_setuid_setgid)
 +/* TEST_DECLARE   (spawn_setuid_setgid) */
  TEST_DECLARE   (we_get_signal)
  TEST_DECLARE   (we_get_signals)
  TEST_DECLARE   (we_get_signal_one_shot)
-@@ -755,8 +755,8 @@ TASK_LIST_START
+@@ -923,8 +923,8 @@
    TEST_ENTRY  (spawn_and_kill_with_std)
    TEST_ENTRY  (spawn_and_ping)
    TEST_ENTRY  (spawn_preserve_env)
@@ -31,10 +31,10 @@
    TEST_ENTRY  (spawn_stdout_to_file)
    TEST_ENTRY  (spawn_stdout_and_stderr_to_file)
    TEST_ENTRY  (spawn_stdout_and_stderr_to_file2)
-@@ -790,7 +790,7 @@ TASK_LIST_START
+@@ -963,7 +963,7 @@
+   TEST_ENTRY  (win32_signum_number)
+ #else
    TEST_ENTRY  (emfile)
-   TEST_ENTRY  (close_fd)
-   TEST_ENTRY  (spawn_fs_open)
 -  TEST_ENTRY  (spawn_setuid_setgid)
 +  /* TEST_ENTRY  (spawn_setuid_setgid) */
    TEST_ENTRY  (we_get_signal)
diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template
index 458c4ed52aab..76a36863f4b9 100644
--- a/srcpkgs/libuv/template
+++ b/srcpkgs/libuv/template
@@ -1,6 +1,6 @@
 # Template file for 'libuv'
 pkgname=libuv
-version=1.39.0
+version=1.41.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,9 @@ license="MIT, CC-BY-SA-4.0"
 homepage="https://libuv.org/"
 changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog"
 distfiles="https://github.com/libuv/libuv/archive/v${version}.tar.gz"
-checksum=dc7b21f1bb7ef19f4b42c5ea058afabe51132d165da18812b70fb319659ba629
+checksum=6cfeb5f4bab271462b4a2cc77d4ecec847fdbdc26b72019c27ae21509e6f94fa
+# the tests fail when run as root and as such break in the CI containers
+make_check="extended"
 
 LDFLAGS="-pthread"
 

From e4121443a18e16669bdd93f105bc74d8f3c0f7d8 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 1 Mar 2021 20:35:27 +1100
Subject: [PATCH 255/285] MoarVM: update to 2021.03.

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

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index 75ada16bfce3..52236814e470 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2020.11
+version=2021.03
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@@ -15,6 +15,6 @@ license="Artistic-2.0"
 homepage="https://moarvm.org"
 changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog"
 distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz"
-checksum=6d028273b6ed5ba7b972e7b3f2681ce1deff1897ebdf7bcd5cfcd1e7c2fec384
+checksum=8a0cf32273e473af884f409a02ad13c4aed5646628facf86544f6b3757e5cacf
 nocross=yes
 shlib_provides="libmoar.so"

From 6762c7736fadeff151d6e539555be1e9b0bb024c Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 1 Mar 2021 20:37:34 +1100
Subject: [PATCH 256/285] nqp: update to 2021.03.

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

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index e75d67b6a366..b6d660c413ab 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2020.11
+version=2021.03
 revision=1
 build_style=configure
 make_check_target=test
@@ -15,5 +15,5 @@ maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://github.com/Raku/nqp"
 distfiles="https://rakudo.org/dl/nqp/${pkgname}-${version}.tar.gz"
-checksum=7985f587c43801650316745f055cb5fc3f9063c5bb34de5ae695d76518ad900f
+checksum=73498f685b8efbd54e43176d41a8f001c32abd27bcb0a801dcd69d38f4e61c11
 nocross=yes

From 8384edbf3f1bfab9c678c563d53ce7f27ef1242a Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 1 Mar 2021 20:40:49 +1100
Subject: [PATCH 257/285] rakudo: update to 2021.03.

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

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index fcef8d7dcfce..903206d04182 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2020.11
+version=2021.03
 revision=1
 build_style=configure
 make_check_target=test
@@ -32,7 +32,7 @@ license="Artistic-2.0"
 homepage="https://rakudo.org"
 changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog"
 distfiles="https://rakudo.org/dl/rakudo/${pkgname}-${version}.tar.gz"
-checksum=b6f086553dfdfbf878d8b1f7659c3a0028f770e6655fb947bdd65ce0ded4fa80
+checksum=98eb57fa0f4953aa6617111f36a2706799d8082b42e22c37cf104a918d914ec2
 nocross=yes
 provides="raku-${version}_${revision}"
 

From 11e2bfe7c40c76f73f6062562343a758e66f7455 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 5 Apr 2021 15:42:39 +0200
Subject: [PATCH 258/285] dbeaver: update to 21.0.2.

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

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 0573665b8a32..74249a296838 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.0.1
+version=21.0.2
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=f7ebd07bb85022d715df48e191f24293af23eadc29478c402fd67e871fa4dc0f
+checksum=39f9d518d057884a2bfd2a4cee656190fe849b06fd7184b465d159c618a28837
 nopie=true
 
 do_build() {

From 10a3a8840cbacc00caab3b7b68ea8a243c04c651 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 5 Apr 2021 15:52:41 +0200
Subject: [PATCH 259/285] dte: update to 1.10.

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

diff --git a/srcpkgs/dte/template b/srcpkgs/dte/template
index eb53f00f87cc..99d194321313 100644
--- a/srcpkgs/dte/template
+++ b/srcpkgs/dte/template
@@ -1,13 +1,12 @@
 # Template file for 'dte'
 pkgname=dte
-version=1.9.1
-revision=2
+version=1.10
+revision=1
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
-makedepends="ncurses-devel"
 short_desc="Small, configurable console text editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://craigbarnes.gitlab.io/dte/index.html"
 distfiles="https://craigbarnes.gitlab.io/dist/dte/dte-${version}.tar.gz"
-checksum=80d2732269a308b5e1126ecc16c28cda032864f625a95184821a73c054f81a2d
+checksum=db62aab235764f735adc8378f796d6474596582b7dae357e0bddf31304189800

From 4800fada6a937a3b977a73872060061193a66e61 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 5 Apr 2021 16:06:25 +0200
Subject: [PATCH 260/285] passwdqc: update to 2.0.2.

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

diff --git a/srcpkgs/passwdqc/template b/srcpkgs/passwdqc/template
index 5df4fb5d68d1..d5ec411bd2ae 100644
--- a/srcpkgs/passwdqc/template
+++ b/srcpkgs/passwdqc/template
@@ -1,6 +1,6 @@
 # Template file for 'passwdqc'
 pkgname=passwdqc
-version=2.0.1
+version=2.0.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SHARED_LIBDIR=/usr/lib SECUREDIR=/usr/lib/security"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause,0BSD"
 homepage="http://www.openwall.com/passwdqc/"
 distfiles="http://www.openwall.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5637e2c72b2738128f378b350f69253cbd5ebeffa7b550820640d1ae2638a868
+checksum=ff1f505764c020f6a4484b1e0cc4fdbf2e3f71b522926d90b4709104ca0604ab
 
 do_build() {
 	make ${makejobs} CC="$CC" LD="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \

From d39f5ae06f9b9fa38858a500fac6cd32291d7402 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, 12 Mar 2021 07:29:34 +0700
Subject: [PATCH 261/285] supercollider: use system glob(3) on musl

---
 srcpkgs/supercollider/template | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index bded2fc4908c..c7a878f91c09 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,12 +1,12 @@
 # Template file for 'supercollider'
 pkgname=supercollider
 version=3.11.1
-revision=1
+revision=2
 wrksrc="SuperCollider-${version}-Source"
 build_style=cmake
 make_cmd=make
 configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON"
-hostmakedepends="emacs pkg-config"
+hostmakedepends="emacs pkg-config qt5-host-tools qt5-qmake"
 makedepends="avahi-libs-devel boost-devel fftw-devel jack-devel libatomic-devel
  libsndfile-devel libXt-devel qt5-declarative-devel qt5-location-devel
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
@@ -19,10 +19,6 @@ homepage="https://github.com/supercollider/supercollider"
 distfiles="https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"
 checksum=2dd2f8179a55de4735ac940e2e2d0df4e68cc3a33172628e4dd99ae89c74856b
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 export CMAKE_GENERATOR="Unix Makefiles"
 
 build_options="webengine"
@@ -40,30 +36,13 @@ else
 	configure_args+=" -DSC_USE_QTWEBENGINE=OFF"
 fi
 
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libglob-devel"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*);;
 	*) configure_args+=" -DSSE=OFF -DSSE2=OFF";;
 esac
 
 pre_configure() {
-	rm -rf external_libraries/boost # https://github.com/supercollider/supercollider/issues/4096
+	# https://github.com/supercollider/supercollider/issues/4096
+	rm -rf external_libraries/boost
 	sed -i 's/yaml/yaml-cpp/g' CMakeLists.txt editors/sc-ide/CMakeLists.txt
-	case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		sed -i \
-		 -e '/include/s,glob\.h,libglob/glob.h,g' \
-		 -e 's/glob(/g_glob(/g' \
-		 -e 's/globfree(/g_globfree(/g' \
-		 common/SC_Filesystem_unix.cpp
-		sed -i 's/__va_copy/va_copy/g' common/SC_StringBuffer.cpp
-		echo 'target_link_libraries(sclang glob)' >> lang/CMakeLists.txt
-		echo 'target_link_libraries(scsynth glob)' >> server/scsynth/CMakeLists.txt
-		echo 'target_link_libraries(supernova glob)' >> server/supernova/CMakeLists.txt
-		echo 'target_link_libraries(SuperCollider glob)' >> editors/sc-ide/CMakeLists.txt
-		;;
-	esac
 }

From fa02c402d5b588140d5cb8a7ee5572566c638ec4 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, 13 Mar 2021 07:47:08 +0700
Subject: [PATCH 262/285] eudev: update to 3.2.10.

---
 srcpkgs/eudev/template | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
index 77e291d78eb5..df783c562bca 100644
--- a/srcpkgs/eudev/template
+++ b/srcpkgs/eudev/template
@@ -3,30 +3,34 @@
 _UDEV_VERSION="243" # compatible udev version provided
 
 pkgname=eudev
-version=3.2.9
+version=3.2.10
 revision=1
 build_style=gnu-configure
 configure_args="--enable-hwdb --enable-manpages --disable-introspection"
-hostmakedepends="automake libtool pkg-config gperf libxslt docbook-xsl"
+hostmakedepends="pkg-config gperf"
 makedepends="libblkid-devel libkmod-devel"
-checkdepends="xz"
+checkdepends="xz tar perl"
 short_desc="Gentoo's fork of systemd-udev (enhanced userland device daemon)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/gentoo/eudev"
-distfiles="https://github.com/gentoo/eudev/archive/v${version}.tar.gz"
-checksum=7d281276b480da3935d1acb239748c2c9db01a8043aad7e918ce57a223d8cd24
+# Gentoo's ebuild uses this tarball
+distfiles="https://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"
+checksum=87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034
 conf_files="/etc/udev/udev.conf"
 
-pre_configure() {
-	autoreconf -fi
-}
-
 post_install() {
 	mv "${DESTDIR}/etc/udev/hwdb.d" "${DESTDIR}/usr/lib/udev"
 	vsv udevd
 }
 
+do_check() {
+	# requires unshare(2) which is not available in chroot
+	if [ ! "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
+		make check
+	fi
+}
+
 eudev-libudev-devel_package() {
 	provides="libudev-devel-${_UDEV_VERSION}_${revision}"
 	depends="eudev-libudev>=${version}_${revision}"

From 75a1951af7851a1a7cd432b587b71569c7731822 Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
Date: Mon, 5 Apr 2021 22:47:26 +0800
Subject: [PATCH 263/285] goatcounter: update to 2.0.3

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

diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index 01090e13c77d..734920ce5987 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,6 +1,6 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
-version=2.0.0
+version=2.0.3
 revision=1
 build_style=go
 go_import_path=zgo.at/goatcounter
@@ -12,4 +12,4 @@ maintainer="Martin Tournoij <martin@arp242.net>"
 license="EUPL-1.2"
 homepage="https://www.goatcounter.com/"
 distfiles="https://github.com/zgoat/goatcounter/archive/v${version}.tar.gz"
-checksum=bca27f65a302482ae018e9d7c5449c4e91aec11a4eea2f62cfe2ed8743a9b241
+checksum=d7477240602c4d6522fb528276378879cda35dea0ba4b174143e36a410398023

From 378130f1d00f84ccd7a543f092b84133d6f6b25a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 5 Apr 2021 13:57:29 -0300
Subject: [PATCH 264/285] mpv: update to 0.33.1.

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

diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f43662480cb3..f3ac99c6c335 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,6 +1,6 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.33.0
+version=0.33.1
 revision=1
 build_style=waf3
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
@@ -29,7 +29,7 @@ license="GPL-2.0-or-later"
 homepage="https://mpv.io"
 changelog="https://github.com/mpv-player/mpv/releases"
 distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4
+checksum=100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 1b5404453d69515bbc1752bcffe57965236191ad Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 5 Apr 2021 18:58:07 +0200
Subject: [PATCH 265/285] mupen64plus: fix archs= again and fix lint

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

diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index f0e6fe2c4173..4984a7f4a777 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -2,7 +2,7 @@
 pkgname=mupen64plus
 version=2.5.9
 revision=1
-nocross="yes"
+archs="x86_64* i686*"
 wrksrc="mupen64plus-bundle-src-${version}"
 hostmakedepends="pkg-config which nasm"
 makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
@@ -14,6 +14,7 @@ homepage="http://www.mupen64plus.org"
 distfiles="https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/${pkgname}-bundle-src-${version}.tar.gz"
 checksum=d5243ddc00388ee2e538b3826a78a719dec2bd5da54ac6f3344fed861fb141a8
 nopie=yes
+nocross=yes
 
 CFLAGS="-fcommon"
 

From b5e569aaf096bdf94d1f09f7878c3c91fa019fa8 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 5 Apr 2021 17:32:20 +0300
Subject: [PATCH 266/285] qalculate: update to 3.18.0

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

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index c223601ef705..0fae47109711 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
 pkgname=qalculate
-version=3.17.0
+version=3.18.0
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=7ea06b140b9238b44473e07b60e1e8cb5271e45b80cbdc27e7eb2e6f82c2ec8c
+checksum=ed7263f48d12a1dd94fe105156a6563125e9b3fe6361e9a9deb5b0ea5cbf03cf
 
 libqalculate_package() {
 	short_desc+=" - library files"

From 9a9d742708a5fc3e59075eb6243a15016e025a78 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 5 Apr 2021 17:36:12 +0300
Subject: [PATCH 267/285] qalculate-gtk: update to 3.18.0

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

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index c8d3c8e309a8..6b96f80e781d 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
 pkgname=qalculate-gtk
-version=3.17.0
+version=3.18.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=b95f4be3c6fd883dec280a92d46b4678f8a7de2e5b654344246bb9d87695626b
+checksum=3e727087877c7c367c223948d8ed807fd0bbc19386dd9f6f4741c213cd6d3311

From 78659c3308d6c9d91310bbdabd2f44f71f28ba6b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 5 Apr 2021 16:41:52 -0500
Subject: [PATCH 268/285] python3-rich: update to 10.1.0.

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

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 3b9eaac8a2af..54f6080d7698 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=10.0.0
+version=10.1.0
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=4674bd3056a72bb282ad581e3f8092dc110cdcc456b5ba76e34965cb85a69724
+checksum=8f05431091601888c50341697cfc421dc398ce37b12bca0237388ef9c7e2c9e9
 
 post_install() {
 	vlicense LICENSE

From 9d5b6ff1cd77dc1caeea91be66762ed359b33808 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 5 Apr 2021 16:38:49 -0500
Subject: [PATCH 269/285] eggdrop: update to 1.9.0.

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

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 7790a5d6dafe..ebe5eee57fe3 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,7 +1,7 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
-version=1.8.4
-revision=3
+version=1.9.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
 makedepends="tcl-devel openssl-devel zlib-devel"
@@ -10,7 +10,8 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.eggheads.org/"
 distfiles="https://ftp.eggheads.org/pub/eggdrop/source/${version%.*}/eggdrop-${version}.tar.gz"
-checksum=79644eb27a5568934422fa194ce3ec21cfb9a71f02069d39813e85d99cdebf9e
+checksum=281bd6fb913db2ea9609e2b20315e242cbd7c582598c7b0d2854ad5afc54777b
+conf_files="/etc/eggdrop/text/banner /etc/eggdrop/text/motd"
 
 pre_build() {
 	make config

From 3f6c136b10f949898499984bfddad504d597e7b5 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 5 Apr 2021 17:49:07 +0200
Subject: [PATCH 270/285] qdirstat: update to 1.7.1.

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

diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template
index 070bd37742bf..efed1890b409 100644
--- a/srcpkgs/qdirstat/template
+++ b/srcpkgs/qdirstat/template
@@ -1,7 +1,7 @@
 # Template file for 'qdirstat'
 pkgname=qdirstat
-version=1.7
-revision=2
+version=1.7.1
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="zlib-devel qt5-devel"
@@ -10,7 +10,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/shundhammer/qdirstat"
 distfiles="https://github.com/shundhammer/qdirstat/archive/${version}.tar.gz"
-checksum=9a8ec22a19290794147f727bca27deb7e02b4d9c537deb2fd0d3e647621f8c4a
+checksum=fb40181972092d80994d3d04802c43298b70a21f1e636d5490a2bfbd1cb407d9
 
 post_install() {
 	vman man/qdirstat.1

From 646577da5d98421151026a2a5edf72a1f17bffa3 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 5 Apr 2021 17:59:36 +0200
Subject: [PATCH 271/285] sigrok-cli: update to 0.7.2.

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

diff --git a/srcpkgs/sigrok-cli/template b/srcpkgs/sigrok-cli/template
index 7a77169393da..c3e8d07d39b5 100644
--- a/srcpkgs/sigrok-cli/template
+++ b/srcpkgs/sigrok-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'sigrok-cli'
 pkgname=sigrok-cli
-version=0.7.1
+version=0.7.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3"
 homepage="https://sigrok.org/"
 distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f52413429f47d457c333db0fd068416ab7a3f9e35ca76de8624dc5ac6fb07797
+checksum=71d0443f36897bf565732dec206830dbea0f2789b6601cf10536b286d1140ab8

From 1a970b34a52a7c158d45b262ee47a186a0cf3cb1 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 5 Apr 2021 23:50:45 +0200
Subject: [PATCH 272/285] libosmgpsmap: update to 1.2.0.

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

diff --git a/srcpkgs/libosmgpsmap/template b/srcpkgs/libosmgpsmap/template
index 420b3630c8e7..63dc740d9cb4 100644
--- a/srcpkgs/libosmgpsmap/template
+++ b/srcpkgs/libosmgpsmap/template
@@ -1,7 +1,7 @@
 # Template file for 'libosmgpsmap'
 pkgname=libosmgpsmap
-version=1.1.0
-revision=6
+version=1.2.0
+revision=1
 wrksrc="osm-gps-map-${version}"
 build_style=gnu-configure
 build_helper="gir"
@@ -13,7 +13,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-or-later"
 homepage="http://nzjrs.github.io/osm-gps-map/"
 distfiles="https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz"
-checksum=8f2ff865ed9ed9786cc5373c37b341b876958416139d0065ebb785cf88d33586
+checksum=ddec11449f37b5dffb4bca134d024623897c6140af1f9981a8acc512dbf6a7a5
 
 build_options="gir"
 build_options_default="gir"

From 091dc2401172e30eefc61efe0cbb21bf0506eed5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 5 Apr 2021 16:55:58 -0500
Subject: [PATCH 273/285] Amass: update to 3.11.13.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 05d7ef6765fe..914353276941 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,12 +1,12 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.11.12
+version=3.11.13
 revision=1
 build_style=go
-go_import_path="github.com/OWASP/Amass/..."
+go_import_path="github.com/OWASP/Amass/v3/..."
 short_desc="In-depth Attack Surface Mapping and Asset Discovery"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=27fef5b24b8b3be5b3f6843b61265447afaa19b649e4cc9e947abc296c2c3184
+checksum=012b5c01209c56b4698c605c74c39001341a5319b90e65d484329fd4a3e2b7cf

From 982c8184a59abb7bc17d02e388d59623dbb4eaf0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 6 Apr 2021 01:02:04 +0200
Subject: [PATCH 274/285] warzone2100: fix -latomic

---
 srcpkgs/warzone2100/template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8d6de60569c0..3af4ebc401f0 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -18,6 +18,16 @@ distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version
 checksum=3368f6653a5ebe5579938f0ebbcfe7907b1f0fc635f0a7aecc5d68ebc50124b5
 nocross="fails to detect SDL2 when cross-compiling"
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+post_extract() {
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		echo "target_link_libraries(warzone2100 atomic)" >> CMakeLists.txt
+	fi
+}
+
 warzone2100-data_package() {
 	short_desc+=" - data files"
 	pkg_install() {

From 0c26e299d6fa42cb9e44ec50bea802e13eba33e7 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Mon, 5 Apr 2021 20:33:36 +0200
Subject: [PATCH 275/285] hcloud: update to 1.22.0.

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

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index d50726090832..d5eb343c9338 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.21.1
+version=1.22.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=0c76bd22e0891f4073b73d16fe233ab704fe5c0cf539f091d20d2e43ccbc5a1b
+checksum=fec0f1ae490ed4e1079138661fffcbf489544c460f631a6a4e5910d3645dad86
 
 post_install() {
 	vlicense LICENSE

From 816c8ab1496bc757f1bcd18c3318688b57596347 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 5 Apr 2021 08:07:07 +0200
Subject: [PATCH 276/285] wire-desktop: update to 3.24.2939

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

diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index 6e9ac6b90c0a..edb4bb21be61 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'wire-desktop'
 pkgname=wire-desktop
-version=3.6.2885
-revision=2
+version=3.24.2939
+revision=1
 wrksrc="${pkgname}-linux-${version}"
 hostmakedepends="nodejs yarn git"
 short_desc="Wire for desktop"
@@ -9,9 +9,8 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wire.com"
 distfiles="https://github.com/wireapp/wire-desktop/archive/linux/${version}.tar.gz"
-checksum=524db450d41a2dc677b8450cdf4e13dcc753280b2f6565ed5e23e6f59c14bed4
+checksum=69e70d39286f29b2fb186da30ec828be0a30329c457e829111b863223ed64127
 nocross=yes
-shlib_provides="libGLVESv2.so"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="glibc artefacts are installed" ;;
@@ -20,13 +19,11 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	vsed -i '/node-addressbook/d' electron/package.json
 	yarn
-	yarn build:ts
 }
 
 do_build() {
-	npx grunt --target=dir linux-other
+	LINUX_TARGET=dir yarn build:linux
 }
 
 do_install() {
@@ -38,5 +35,4 @@ do_install() {
 	vcopy resources/icons/256x256.png usr/share/icons/hicolor/256x256/apps/wire-desktop.png
 	vmkdir usr/share/icons/hicolor/32x32/apps
 	vcopy resources/icons/32x32.png usr/share/icons/hicolor/32x32/apps/wire-desktop.png
-	vlicense LICENSE
 }

From 0c9386ab8a2b20fb0a6160be869891db4e6a684b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 23 Mar 2021 22:58:58 +0100
Subject: [PATCH 277/285] New package: sslscan-2.0.9

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

diff --git a/srcpkgs/sslscan/template b/srcpkgs/sslscan/template
new file mode 100644
index 000000000000..0f4f07071ded
--- /dev/null
+++ b/srcpkgs/sslscan/template
@@ -0,0 +1,15 @@
+# Template file for 'sslscan'
+pkgname=sslscan
+version=2.0.9
+revision=1
+build_style=gnu-makefile
+makedepends="openssl-devel"
+short_desc="Fast SSL/TLS scanner"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/rbsec/sslscan"
+changelog="https://github.com/rbsec/sslscan/raw/master/Changelog"
+distfiles="https://github.com/rbsec/sslscan/archive/refs/tags/${version}.tar.gz"
+checksum=22a3b0664cd12c06b716eee818fdcefa545803f5f52033723ce2f76743beb647
+# No test suite
+make_check=no

From 127bb8e1993b3a4307201866b43060430e32bbf4 Mon Sep 17 00:00:00 2001
From: Kye Shi <shi.kye@gmail.com>
Date: Sun, 4 Apr 2021 20:48:38 -0700
Subject: [PATCH 278/285] openscad: update to 2021.01

---
 ...70cc5dd1bc677176ee732cdb0ddae57e5cf0.patch | 24 -------------------
 srcpkgs/openscad/template                     |  6 ++---
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch

diff --git a/srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch b/srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch
deleted file mode 100644
index f0d80d2f97eb..000000000000
--- a/srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Fri, 25 Oct 2019 15:10:26 +0000
-Subject: [PATCH] Add missing header bootlegged by Boost < 1.72
-
-src/parser.y:76:6: error: no template named 'stack' in namespace 'std'
-std::stack<LocalScope *> scope_stack;
-~~~~~^
----
- src/parser.y | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git src/parser.y src/parser.y
-index 7f4fd56ca7..4c77c989ea 100644
---- src/parser.y
-+++ src/parser.y
-@@ -46,6 +46,7 @@
- #include "printutils.h"
- #include "memory.h"
- #include <sstream>
-+#include <stack>
- #include <boost/filesystem.hpp>
- #include "boost-utils.h"
- #include "feature.h"
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 5e846402ddd3..693931379a26 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
 # Template file for 'openscad'
 pkgname=openscad
-version=2019.05
-revision=3
+version=2021.01
+revision=1
 build_style=qmake
 hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
 makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
@@ -11,4 +11,4 @@ maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.openscad.org"
 distfiles="http://files.openscad.org/${pkgname}-${version}.src.tar.gz"
-checksum=0a16c4263ce52380819dd91c609a719d38f12f6b8c4da0e828dcbe5b70996f59
+checksum=d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359

From 4056089131dcec1ce582e3510357fdc06dd12c45 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 5 Apr 2021 22:06:18 -0400
Subject: [PATCH 279/285] python3-zeroconf: fix do_check.

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

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index 46e78473d8ce..614001d14339 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -15,5 +15,6 @@ distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=b8e7c55f36973362314b7d8cf716a76afea3c91abe9d2f435329dc67b973fe06
 
 do_check() {
-	python3 -m pytest zeroconf/test.py
+	# IPv6 doesn't work on github CI
+	SKIP_IPV6=1 python3 -m pytest zeroconf/test.py
 }

From 3f6921714a24f57c6ec3f5cb59f1ee69399ec759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 5 Apr 2021 23:32:32 -0300
Subject: [PATCH 280/285] thunderbird: update to 78.9.0.

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

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

From 6c496e8bbb90fafd4ac791a799825692fbb96a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 5 Apr 2021 23:32:41 -0300
Subject: [PATCH 281/285] thunderbird-i18n: update to 78.9.0.

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

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 8db783cc2a36..e00b1cb59577 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.8.1
+version=78.9.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="3b5caf336a8745d04f33ea7f1f49ff418d07b1f45b1c405a5b6aec4aff40ff5a
- ef2c57a0837e10b8907b0f79387113a1455eb4a2012e4657a2fde579c597b8e6
- bf8f2a717308963b1141e83ecdf0a692a4b2157145b0529ee21adf265c7ee623
- 0a0cdf0d9c7657800c873c1fbf0d38576ef8def43698c2a5a268a560edc248db
- 4999fb95a43ffe02febdc30edd64eb7c428b54fec5ac0222bf129a044eba54e3
- a63ee258b84dabc1f540fb71bcd43a57e62647864d9bb301c17bfce3f819442d
- 2731288a62486e544e8f950af6a24abe7fb111a35072205aef262be48bf53028
- 5d356f0ebb24d9cf8e76e9099cdc399145f0c636c69bf4824fc4e21284b75bfb
- 035f9cecea490c8f2b0686ae05b23ac75fbd356cd512174925529f1082ac6b9f
- cd8f59690c872bb6029ee86a681a246eafd4a4400234a2aa899b3093900b4d95
- 0b3cc842492d67586e8b9ab8a73c96c19e86ba8b15a77b60c31f05ed07ce9f86
- 94c36a768ea104a480e71c3991446f8285f3f2f5afe91e9239607704b72709ac
- ace84f5769e7c120585ecb2baa4ad758aaeec44cdca09232ca3d48e5f6640ed9
- c482477cbc043e44e446cd0c74de711dc7789ae8813ff2771db433c91f49dce7
- a2eed0c82901778094b79637f3d389c7273b8b9d99be81445d9689e87854dfa5
- 95113edd17076555542713b3c7a54eee25f9283e410bf02b3a0ce02172cbc3e4
- 0778d1ab5a52e1d658bccea604c851a7e13b32b6ce2f08f6e306ed80697b1338
- c0a603a62fc97768bb02a1b5907f0175bb2047354d2dac05319c233b896f4d64
- 3e79273f15994c4b7c7a8f350e5a20a255b1907cdd084b5e99912a86406f3167
- 168f8d9590e41d57e242e24d181ed246f608eb6581482d20bdfb434650b9b8c8
- 9fbb1fa328728bc5972f12c808d474ffad3eb17e9726e78593bb008e95bc0cad
- b5909d54a31540d5c1027f50f100c7b35ef1cdd785123a3e760c9bc7be02a8dd
- c32bdb8eac84fdf70d37cd8561fa9b7cbe7feda9fe39460ab3e30de65f1b6ea5
- f87c979d0c90b4d6167654d8a03fc1f1402719d915d8d68f2c15756b7b63019d
- a7f9a5ab5c05f3f1e56a51c7df4245c3f210ff0bc1b0dd18df4f331e52a98d29
- dd4e3e14357a88116138bdacdb4ea262c3969726a193ad8037ae96423e54067b
- e84e60069fcf580b4ebdc714fc908c62650daa3f610800b96f1a5da2f20304a0
- 909e92d13592ac33718dd918c5d93c38b5467ac5ee7d43d346a21acd34e2fbd8
- 0d984a9d089ba8b5d52a73948e1ac571c6a0fd1e07529cd207ff65164584b203
- 6543f4a0046c4b80d3d4d369d7f332c860a2f0d88ceda54cae3f7a1001a3635e
- 2a87b79515bb276455b82f38a5be0aef736aa1fecda6942d78948b8097ba54bc
- 6e9a69b9fcbce800ae1545a6816a6bbd4e9233c13c2dc6cfd97c88c4002d9f43
- f067c252a9f4625744138a16051290675c76f0c48c674bea7b4a6c6abd4367ab
- 9f157020814ed8000eebb211c8161275660a44cd62f7e731d9aea71c28de1b45
- 41f41a33717b0628486a47b94d0aa09acf1b77d3ccb15a3a7709673a8659444c
- 8651f251b0db764a6880b84bc993b749db4f7caaba2e41e8ec3bdb2f29c7e55d
- 55b1100d77dee61ffb232872162d5543e6104f044fb7193436d75a4f528c316f
- 404af38ab6c28369edd2c9bbf2abb63e223c17f58fd4c8fc70052eae03a01f03
- c442d5c44f85c4d50d582790fc90e989af57f31d04c3bbd528b2e91393ec408e
- 50cf3279da4dfaecefd7963a20fc47eb4205959dd18fe8e3d9d275ce69b85a39
- 9a12508720f0ff8968cd20dfc4bf0bdffe7bc6e76d071cfd87c6227323162b49
- 10b9fdf09e5f3b45ab5e41eb0d76ee01667810a0711c4406fa5547d10275466e
- 3247fae4d15d56eba36d9fa272e0ff6130b0d59c4aed604545a4bfd209fd0367
- 4e1e066b39b20ddac404af5cfa992eafe137c2578b5ccaa6d2a7d4b1bbd96bcd
- ff853296394e6b6e297a593b2220a5b23bebc22481fe84b3f1bd942116686fdc
- 1f0a87eb63c33698e28c2aba01d87a9919065dbd1d67801f1f2e7bfabf3de127
- 6f1fc3812ad3df192aa36baef400d194d1238c5630242ae6a2306cce5188609d
- 4533c4bfbf71b25977b5d9e5b951545f0f8d036c2711c35ffce058e66e88b37f
- cd93569d7f5d9dfbac5720188d25828a30b3e36c08a2e74a6f4188b342fd4603
- 771c561fb6b821dad83a3772720bc835bc14305f0b4c60eab9e3e72595da91e7
- e1565ba9f1712de7348ffacc4189b9c09209803b80a190481625946099e419e0
- e946252285a1462ab7f099268efdb0cc15bc13bc42f70de744bbbce0672a3188
- 78a9ddd5291e5efecec3ab339b7b821540abc22aacf00c06227ba4a4bf44ee2f
- 6877de0d388f75e96c4b22b27a2ef4affad94bde1bc890c3eea1f30b7f4e06fa
- 03c562d04b1d1fe6b84326cc833223d7a6998c3ab7f3c2d65920bc0c331ecf51"
+checksum="63771cab0ed5fda4da901b6b6ecd2c88d87ddb9db019e0d5150e6a7111be6be3
+ efd68277617e53282fbcb54bb63274d55c13211eac7340e6ba481d6b083604d3
+ 9d9d566a8a71ce6bcbf7fdc4adf0d4e621bfcfffb792d582e86dbbd393f4eb4c
+ 3edf831839f3d3a5ae3edce5578748cc6a73a2b3a4f413a10c32e7808eb4a242
+ e2968ec5aabddb23249acb95a56f3f4c5068a3024f4a987cfcec29f46d1295df
+ a254d31294909e4007811c8ab1f21f2814863765da71cf999332a04910b8cc1c
+ 82a842c5d4fe297b1adfbed74fc8a63831b9507a4b1098db26f31a59d268dad0
+ 295f9730a9c9baa4325b346c163cd0ee1e19bf589cba595c151f7a31311a43c0
+ cb21492b06e6d4d7dc10f93e1a9c673297af7f010cbc6807245a776795d56486
+ ed1ce2005e42d5796596863344913506f7423ca31bb0640167964b7c36395585
+ 873a10bfc3f54c3240830eae45310f137823c0b83fb83dfc2098cc3a89acd802
+ e87877e537c49be2ce03cf8a41d6776e8f861f1f9d90bc862224df18acfc52bb
+ 8cdc746af4060d0260b1cf1c7efbd102ed4eabf57bdfb0e62167a39a08b526e1
+ 39363f37a388c7b82df2d3cf868803682d8d6612a2b6557f1fdb9ae1466d4be7
+ 48f51bb821ffe212f15e2065a6b3377cc33704f0a07a18b3deaa79d839bef89d
+ 11c649466c6df3d2a62402711be46d74a02b668ec95de83f87e0675692b4633f
+ 5e4cf5c5b24cfabe35971dec28e47c337749a3d382b43f7a2558deadc73a7864
+ 1c49fe83d149bb1bbe4adce5f43bbf9e6bff1c6a917f898c029ce3fd46a7174c
+ e3ed198a41f20b4168b23e29324eec3e5149de2cc454675f1a30d68baaa301c3
+ b3fece3eaaccedcf28702e747307e11988eec65ef0cadccc0a01ea4092df8ac0
+ fd8f4cec4dba5ba66f905c0428f01c9be9a2a20f8d3996828f54da6fff331028
+ b6031ea780b0bf7b4f8c96aaf38d96dc686f0e2f3d58a4ec9918ad282f554c94
+ e7f28b4333ea0d2db01af8496192769af1cf2666585bb463dc39d1ba1fd73345
+ 2a80d9ca7e942c5eca5cbd8b82ca47901728f52c2de074fb9751c6c37fcb37ec
+ 3dc2a28bf96db0d678457f86e46d7a24e683c38579c0b480f59c1eb9ef2573b9
+ ff9079655352bdf9f5c1bb2e4e1596d1755300eda7e1670dbdb796a99223158a
+ 71a1964cc36893f217a3c778a3fa17810843f830245241af27054ac1222a14e5
+ 70b03fb570e5f3443d3be9970dd65fdd4fcd81bff4cd8319f028c0a4c8c166a8
+ 78833bae90336e27256341a6b7ff1e53be9dd65447a1e71528ead725504f330d
+ ac5276b4a13bb4a07c92160a6c3cbdb3d76bd622c49163eb0e82f84153259b5b
+ c1f8180207e1abdbeaed39337c9bbf5d421eb2c85146646a888bd02e5de8c27e
+ 800eb1b98bbb145a5bf22fa8a1e7cb8581371939655d61dcd642bba0de8250ba
+ f39cb90898efc60c0f977f3f9abb94db5c1e18e2ace7317240784dc6382bccb3
+ 496275439573f95f41a28d08d434ccea79e86d40f2a8321b47b98daa6dd3036c
+ cc3229a2a009fcec836b2056ccbf50cdd4aba461517dad9a04331ae5f95a3a2f
+ d20ff56ab68e53e3e4365247b564f6efc3c0cbdb301ff79ff9a80aae986c3b7d
+ 998224c8e059afc068b004c0dd3887f85974a0af56b9d0ef0dad945e049db2b0
+ fcf47de621e9f75729b1fa8c6c5f2135eb5b6d3dd78c8fae01acd6ad857604d2
+ c7b3a6b7c0a59620e65877b3eaef92b2b2b7b4f5e7e152b7297db3d24a00b399
+ 7fae97e71b183f55292feed9847a8d6141671d703e2af8aa1d64a71db2c377ec
+ c8aa778fcf6c1c32b0038affadf540145cee44c9e59d278b55c4d1966ffa27d3
+ 14065be7c50080586aa36cd43814dcabfae8572065cc3ec1ee8344e77cae9ce1
+ af30877d15eecc65804528bbd4fde0897663526f4d25fdef00b4eaf84be8e580
+ 925ea6a7f6e1a1fb17004cc7ab16bc0a307995541b9741264497f51d8a60679e
+ 419b8bd06dd680b27b0843f5cf6af1b787695dc608136970a417ebafe3ae325a
+ 7d9eb5e2bea78aa75dc345598e62ccc3efb37e64f21ec19a92920f826f486651
+ e8e88cfad04351f1cc3ecb811011bcd964d6b4ef3a6a30f98e0f8a1363c93d37
+ 1ca503db23e2648c4ebb40b117c652e0d8b95e4d07e843031db0530e00bfdd6f
+ d02b1a07f824644e336a9e92a8342d58f5eaec903fa6b80067f3c650659b3756
+ 7caf4222472434b465fca8f072a29503d38c143c1900b71bac7a607a7120d359
+ 9a7c0186b6fca8e48ec3d0c94f0bfaeb73f378178799adc04c79164b300e575a
+ abac946215c6a41be19aeacd271a2a2b2040bda87906d7e1c6f76ea19a35e507
+ 5a3827a6f662950fdb001863ce8367d02fabe1c40d44500ee6b7019874119d23
+ d1a1f0a30e037d65b667e1cff856a195c4747af4bf599f1bc8211347259fedf6
+ dcdd87071b6b16eafb39d752119f60105d461dae5155c9b33d00bc3037a98dbe"

From e3b697fcd096f1b73317c0cdfb6beb4ae32eae49 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 6 Apr 2021 14:34:03 +1000
Subject: [PATCH 282/285] retroarch: update to 1.9.1

---
 .../retroarch/patches/conflicting-types.patch    | 16 ----------------
 srcpkgs/retroarch/patches/musl-time_h.patch      | 15 ---------------
 srcpkgs/retroarch/template                       |  7 ++++---
 3 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
 delete mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch

diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
deleted file mode 100644
index d089b1dc761d..000000000000
--- a/srcpkgs/retroarch/patches/conflicting-types.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch has been merged upstream and shouldn't be needed for 1.9.1:
-https://github.com/libretro/RetroArch/pull/11171
-
-diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
-index 3c52edb96a..dba0e038f4 100644
---- gfx/drivers_context/vc_egl_ctx.c
-+++ gfx/drivers_context/vc_egl_ctx.c
-@@ -81,6 +81,8 @@ typedef struct
- /* TODO/FIXME - static globals */
- static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
- 
-+static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
-+
- static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
- {
-    const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
deleted file mode 100644
index bf0ae3b7c0d7..000000000000
--- a/srcpkgs/retroarch/patches/musl-time_h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch has been merged upstream and shouldn't be needed for 1.9.1:
-https://github.com/libretro/RetroArch/pull/11170
-
-diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
-index 70e3a98..0c2d857 100644
---- libretro-common/file/nbio/nbio_linux.c
-+++ libretro-common/file/nbio/nbio_linux.c
-@@ -36,6 +36,7 @@
- #include <fcntl.h>
- #include <sys/syscall.h>
- #include <linux/aio_abi.h>
-+#include <time.h>
- 
- struct nbio_linux_t
- {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 87301c2c9efa..8b2d3fb445f4 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,12 +1,13 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.9.0
-revision=2
+version=1.9.1
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  --enable-udev --disable-builtinflac --disable-builtinglslang
  --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ --disable-git_version
  $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
  $(vopt_enable miniupnpc) $(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
@@ -24,7 +25,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
+checksum=153f7057cecd22441904f557302d50f969d199c4b6ff263bfe87d9cf4a9bab75
 
 build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"

From 1a50018587ca6e5eaa6905bba0552072910b6086 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 5 Apr 2021 23:45:12 -0300
Subject: [PATCH 283/285] atril: update to 1.24.1.

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

diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index b2747e50f063..b26399624b01 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,6 +1,6 @@
 # Template file for 'atril'
 pkgname=atril
-version=1.24.0
+version=1.24.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=be245d445333de35bdad22e4299252e6b30851d94f02caef14100b78787fc724
+checksum=b48372a89813f31d2635de02d9e92ba38e794daddf625f06d80c3793248bde1a
 patch_args=-Np1
 
 build_options="gir"

From 24f7c3803441c4954614ed1b1ee4538850b2fee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 5 Apr 2021 22:45:40 -0300
Subject: [PATCH 284/285] waypipe: update to 0.8.0.

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

diff --git a/srcpkgs/waypipe/template b/srcpkgs/waypipe/template
index eb8a103ea516..c9da48718a2d 100644
--- a/srcpkgs/waypipe/template
+++ b/srcpkgs/waypipe/template
@@ -1,6 +1,6 @@
 # Template file for 'waypipe'
 pkgname=waypipe
-version=0.7.2
+version=0.8.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -16,7 +16,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/mstoeckl/waypipe"
 distfiles="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=b280079b05aef9b243be3644fc803e3feaa2fc2952d11a6c02ab33257fb52479
+checksum=e61fa816a770d0bc22aa2545547c61edc24cf52ca5bb3da32351f2ac9ff94d02
 
 post_install() {
 	vlicense COPYING LICENSE

From bbe4105cc46c9978f655021c5c3982bb30402510 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 6 Apr 2021 11:12:47 +0200
Subject: [PATCH 285/285] ruby: update to 2.7.3.

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

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index f260af814c68..29c1c2eac3c3 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -2,8 +2,8 @@
 _ruby_abiver=2.7.0
 
 pkgname=ruby
-version=2.7.2
-revision=3
+version=2.7.3
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
@@ -17,7 +17,7 @@ homepage="http://www.ruby-lang.org/en/"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Ruby, BSD-2-Clause"
 distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=65a590313d244d48dc2ef9a9ad015dd8bc6faf821621bbb269aa7462829c75ed
+checksum=3e90e5a41d4df90e19c307ab0fb41789992c0b0128e6bbaa669b89ed44a0b68b
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally

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

* Re: [PR PATCH] [Updated] kiconthemes: added patch for icon rendering issues
  2021-04-02 11:58 [PR PATCH] kiconthemes: added patch for icon rendering issues tunefish777
                   ` (2 preceding siblings ...)
  2021-04-06 11:26 ` [PR PATCH] [Updated] " tunefish777
@ 2021-04-06 11:35 ` tunefish777
  2021-04-06 11:37 ` tunefish777
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: tunefish777 @ 2021-04-06 11:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tunefish777/void-packages master
https://github.com/void-linux/void-packages/pull/29949

kiconthemes: added patch for icon rendering issues
<!-- Mark items with [x] where applicable -->

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

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

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


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

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

From cbded82703d03060f5ea1120a1bdb3c8ece960f8 Mon Sep 17 00:00:00 2001
From: Moritz Waser <moritz.waser@student.tugraz.at>
Date: Fri, 2 Apr 2021 13:49:23 +0200
Subject: [PATCH] kiconthemes: added patch for icon rendering issues

---
 .../patches/qdir_searchpath_for_icons.patch   | 327 ++++++++++++++++++
 srcpkgs/kiconthemes/template                  |   3 +-
 2 files changed, 329 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch

diff --git a/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch b/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch
new file mode 100644
index 000000000000..cd776b6d8f29
--- /dev/null
+++ b/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch
@@ -0,0 +1,327 @@
+From 49bdb6310194cd899641b7d9cf8463d4fba6baea Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:18:17 +0100
+Subject: [PATCH 1/6] ensure qrc + QDir::searchPaths work for icons
+
+before we had some optimization to check which paths
+are absolute, but that one is wrong, applications
+might rely on set search paths
+
+BUG: 434451
+---
+ src/kiconloader.cpp | 19 ++++---------------
+ 1 file changed, 4 insertions(+), 15 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 011a292..2411af1 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -92,19 +92,6 @@ color:%7;\
+ }
+ }
+ 
+-/**
+- * Checks for relative paths quickly on UNIX-alikes, slowly on everything else.
+- */
+-static bool pathIsRelative(const QString &path)
+-{
+-#ifdef Q_OS_UNIX
+-    // catch both /xxx/yyy and :/xxx/yyy for resources
+-    return (!path.isEmpty() && path[0] != QLatin1Char('/') && path[0] != QLatin1Char(':'));
+-#else
+-    return QDir::isRelativePath(path);
+-#endif
+-}
+-
+ /**
+  * Holds a QPixmap for this process, along with its associated path on disk.
+  */
+@@ -1214,7 +1201,8 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+         return QString();
+     }
+ 
+-    if (_name.isEmpty() || !pathIsRelative(_name)) {
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
++    if (_name.isEmpty() || !QDir::isRelativePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+@@ -1352,7 +1340,8 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+         name = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + name + QStringLiteral(".png");
+     }
+ 
+-    bool absolutePath = !pathIsRelative(name);
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
++    bool absolutePath = !QDir::isRelativePath(name);
+     if (!absolutePath) {
+         name = d->removeIconExtension(name);
+     }
+-- 
+GitLab
+
+
+From 7cf21cdb6e209b62fea4de74c175aaa5b940fccb Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:38:36 +0100
+Subject: [PATCH 2/6] add unit test for QDir::setSearchPaths
+
+---
+ autotests/kiconloader_unittest.cpp | 15 +++++++++++++++
+ autotests/resources.qrc            |  1 +
+ 2 files changed, 16 insertions(+)
+
+diff --git a/autotests/kiconloader_unittest.cpp b/autotests/kiconloader_unittest.cpp
+index 9a1f6d0..813215d 100644
+--- a/autotests/kiconloader_unittest.cpp
++++ b/autotests/kiconloader_unittest.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include <kiconloader.h>
+ 
++#include <QDir>
+ #include <QRegularExpression>
+ #include <QStandardPaths>
+ #include <QTest>
+@@ -495,6 +496,20 @@ private Q_SLOTS:
+         uintToHex(testColorWithAlpha.rgba(), argbHex.data());
+         QCOMPARE(argbHex, QStringLiteral("7b6496c8"));
+     }
++
++    void testQDirSetSearchPaths()
++    {
++        // setup search path for testprefix: => we shall find the iconinspecialsearchpath.svg afterwards, see e.g. bug 434451
++        QDir::setSearchPaths("testprefix", QStringList(":/searchpathdefineddir"));
++        QPixmap pix = KIconLoader::global()->loadIcon(QStringLiteral("testprefix:iconinspecialsearchpath.svg"),
++                                                      KIconLoader::NoGroup,
++                                                      24,
++                                                      KIconLoader::DefaultState,
++                                                      QStringList(),
++                                                      nullptr,
++                                                      true);
++        QVERIFY(!pix.isNull());
++    }
+ };
+ 
+ QTEST_MAIN(KIconLoader_UnitTest)
+diff --git a/autotests/resources.qrc b/autotests/resources.qrc
+index d4000e5..4f4cd0c 100644
+--- a/autotests/resources.qrc
++++ b/autotests/resources.qrc
+@@ -10,5 +10,6 @@
+     <file>nonsquare.svg</file>
+     <file alias="/icons/themeinresource/index.theme">breeze.theme</file>
+     <file alias="/icons/themeinresource/22x22/appsNoContext/someiconintheme.png">test-22x22.png</file>
++    <file alias="/searchpathdefineddir/iconinspecialsearchpath.svg">coloredsvgicon.svg</file>
+ </qresource>
+ </RCC>
+-- 
+GitLab
+
+
+From 5a1690ba99d73e3e60f1a576af6b00ab29d6085f Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:41:04 +0100
+Subject: [PATCH 3/6] use QDir::isAbsolutePath, not !QDir::isRelativePath
+
+---
+ src/kiconloader.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 2411af1..784b06b 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -1201,8 +1201,8 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+         return QString();
+     }
+ 
+-    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
+-    if (_name.isEmpty() || !QDir::isRelativePath(_name)) {
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
++    if (_name.isEmpty() || QDir::isAbsolutePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+@@ -1340,8 +1340,8 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+         name = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + name + QStringLiteral(".png");
+     }
+ 
+-    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
+-    bool absolutePath = !QDir::isRelativePath(name);
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
++    const bool absolutePath = QDir::isAbsolutePath(name);
+     if (!absolutePath) {
+         name = d->removeIconExtension(name);
+     }
+-- 
+GitLab
+
+
+From 0bd39a510b103450dac69795e6ffbc4efc074734 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 17:23:46 +0100
+Subject: [PATCH 4/6] more robust handling of missing global KDE themes
+
+in may cases the loader will handle absolute file names
+
+=> no need for our themes
+
+just remove the two locations where we still just exit
+in all other cases we did already proceed before
+---
+ src/kiconloader.cpp | 25 +++++++++----------------
+ 1 file changed, 9 insertions(+), 16 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 784b06b..6257846 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -225,7 +225,7 @@ public:
+     /**
+      * @internal
+      */
+-    bool initIconThemes();
++    void initIconThemes();
+ 
+     /**
+      * @internal
+@@ -627,11 +627,10 @@ void KIconLoaderPrivate::init(const QString &_appname, const QStringList &extraS
+     }
+ }
+ 
+-bool KIconLoaderPrivate::initIconThemes()
++void KIconLoaderPrivate::initIconThemes()
+ {
+     if (mIconThemeInited) {
+-        // If mpThemeRoot isn't 0 then initing has succeeded
+-        return (mpThemeRoot != nullptr);
++        return;
+     }
+     // qCDebug(KICONTHEMES);
+     mIconThemeInited = true;
+@@ -644,9 +643,9 @@ bool KIconLoaderPrivate::initIconThemes()
+         qCDebug(KICONTHEMES) << "Couldn't find current icon theme, falling back to default.";
+         def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
+         if (!def->isValid()) {
+-            qWarning() << "Error: standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
++            qCDebug(KICONTHEMES) << "Standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
+             delete def;
+-            return false;
++            return;
+         }
+     }
+     mpThemeRoot = new KIconThemeNode(def);
+@@ -661,8 +660,6 @@ bool KIconLoaderPrivate::initIconThemes()
+     searchPaths.append(QStringLiteral("icons")); // was xdgdata-icon in KStandardDirs
+     // These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
+     searchPaths.append(QStringLiteral("pixmaps")); // was xdgdata-pixmaps in KStandardDirs
+-
+-    return true;
+ }
+ 
+ KIconLoader::~KIconLoader() = default;
+@@ -932,7 +929,7 @@ QImage KIconLoaderPrivate::createIconImage(const QString &path, const QSize &siz
+     QImageReader reader;
+     QBuffer buffer;
+ 
+-    if (q->theme()->followsColorScheme() && (path.endsWith(QLatin1String("svg")) || path.endsWith(QLatin1String("svgz")))) {
++    if (q->theme() && q->theme()->followsColorScheme() && (path.endsWith(QLatin1String("svg")) || path.endsWith(QLatin1String("svgz")))) {
+         buffer.setData(processSvg(path, state));
+         reader.setDevice(&buffer);
+     } else {
+@@ -1197,16 +1194,14 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+ 
+ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canReturnNull, qreal scale) const
+ {
+-    if (!d->initIconThemes()) {
+-        return QString();
+-    }
+-
+     // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
+     if (_name.isEmpty() || QDir::isAbsolutePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+ 
++    d->initIconThemes();
++
+     QString name = d->removeIconExtension(_name);
+ 
+     QString path;
+@@ -1381,9 +1376,7 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+     }
+ 
+     // Image is not cached... go find it and apply effects.
+-    if (!d->initIconThemes()) {
+-        return QPixmap();
+-    }
++    d->initIconThemes();
+ 
+     favIconOverlay = favIconOverlay && std::min(size.height(), size.width()) > 22;
+ 
+-- 
+GitLab
+
+
+From dd6fad78caaa0d1791bcc4a6675940cf4daf9f86 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 20:59:47 +0100
+Subject: [PATCH 5/6] assert hicolor default is always found
+
+we bundle a default .theme file inside the library
+resources
+
+this can't fail as fallback
+
+instead of allowing some "bad" state, just assert
+this
+---
+ src/kiconloader.cpp | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 6257846..3a6bf2b 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -641,12 +641,10 @@ void KIconLoaderPrivate::initIconThemes()
+         delete def;
+         // warn, as this is actually a small penalty hit
+         qCDebug(KICONTHEMES) << "Couldn't find current icon theme, falling back to default.";
++
++        // this can't fail, as defaultThemeName() == hicolor is in a resource of this library itself as last fallback!
+         def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
+-        if (!def->isValid()) {
+-            qCDebug(KICONTHEMES) << "Standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
+-            delete def;
+-            return;
+-        }
++        Q_ASSERT(def->isValid());
+     }
+     mpThemeRoot = new KIconThemeNode(def);
+     mThemesInTree.append(def->internalName());
+-- 
+GitLab
+
+
+From 3262669e3abfa7171463e3bf34f7c60eacf6bc77 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Fri, 19 Mar 2021 19:56:07 +0100
+Subject: [PATCH 6/6] don't register our engine per default
+
+---
+ src/kiconengineplugin.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kiconengineplugin.json b/src/kiconengineplugin.json
+index a5b4228..bc09e41 100644
+--- a/src/kiconengineplugin.json
++++ b/src/kiconengineplugin.json
+@@ -1,4 +1,4 @@
+ {
+-    "Keys": [ "KIconEngine", "svg", "svgz", "svg.gz" ]
++    "Keys": [ "KIconEngine" ]
+ }
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index ddc40a6ba1eb..30c808a58402 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,7 +1,7 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
 version=5.80.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -13,6 +13,7 @@ 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=92f2dc363fb8e6b7acdf1d7013d5b06f1f825466d8db00f79cd73cfc3ed9768c
+patch_args="-Np1"
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

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

* Re: [PR PATCH] [Updated] kiconthemes: added patch for icon rendering issues
  2021-04-02 11:58 [PR PATCH] kiconthemes: added patch for icon rendering issues tunefish777
                   ` (3 preceding siblings ...)
  2021-04-06 11:35 ` tunefish777
@ 2021-04-06 11:37 ` tunefish777
  2021-04-06 11:44 ` tunefish777
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: tunefish777 @ 2021-04-06 11:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tunefish777/void-packages master
https://github.com/void-linux/void-packages/pull/29949

kiconthemes: added patch for icon rendering issues
<!-- Mark items with [x] where applicable -->

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

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

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


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

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

From 156a608bc2d7a95729601fc1b1cc2cf4ed3bf09a Mon Sep 17 00:00:00 2001
From: Moritz Waser <moritz.waser@student.tugraz.at>
Date: Fri, 2 Apr 2021 13:49:23 +0200
Subject: [PATCH] kiconthemes: added patch for icon rendering issues

---
 .../patches/qdir_searchpath_for_icons.patch   | 287 ++++++++++++++++++
 srcpkgs/kiconthemes/template                  |   3 +-
 2 files changed, 289 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch

diff --git a/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch b/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch
new file mode 100644
index 000000000000..6892faadb6e2
--- /dev/null
+++ b/srcpkgs/kiconthemes/patches/qdir_searchpath_for_icons.patch
@@ -0,0 +1,287 @@
+From 49bdb6310194cd899641b7d9cf8463d4fba6baea Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:18:17 +0100
+Subject: [PATCH 1/6] ensure qrc + QDir::searchPaths work for icons
+
+before we had some optimization to check which paths
+are absolute, but that one is wrong, applications
+might rely on set search paths
+
+BUG: 434451
+---
+ src/kiconloader.cpp | 19 ++++---------------
+ 1 file changed, 4 insertions(+), 15 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 011a292..2411af1 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -92,19 +92,6 @@ color:%7;\
+ }
+ }
+ 
+-/**
+- * Checks for relative paths quickly on UNIX-alikes, slowly on everything else.
+- */
+-static bool pathIsRelative(const QString &path)
+-{
+-#ifdef Q_OS_UNIX
+-    // catch both /xxx/yyy and :/xxx/yyy for resources
+-    return (!path.isEmpty() && path[0] != QLatin1Char('/') && path[0] != QLatin1Char(':'));
+-#else
+-    return QDir::isRelativePath(path);
+-#endif
+-}
+-
+ /**
+  * Holds a QPixmap for this process, along with its associated path on disk.
+  */
+@@ -1214,7 +1201,8 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+         return QString();
+     }
+ 
+-    if (_name.isEmpty() || !pathIsRelative(_name)) {
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
++    if (_name.isEmpty() || !QDir::isRelativePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+@@ -1352,7 +1340,8 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+         name = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + name + QStringLiteral(".png");
+     }
+ 
+-    bool absolutePath = !pathIsRelative(name);
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
++    bool absolutePath = !QDir::isRelativePath(name);
+     if (!absolutePath) {
+         name = d->removeIconExtension(name);
+     }
+-- 
+GitLab
+
+
+From 7cf21cdb6e209b62fea4de74c175aaa5b940fccb Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:38:36 +0100
+Subject: [PATCH 2/6] add unit test for QDir::setSearchPaths
+
+---
+ autotests/kiconloader_unittest.cpp | 15 +++++++++++++++
+ autotests/resources.qrc            |  1 +
+ 2 files changed, 16 insertions(+)
+
+diff --git a/autotests/kiconloader_unittest.cpp b/autotests/kiconloader_unittest.cpp
+index 9a1f6d0..813215d 100644
+--- a/autotests/kiconloader_unittest.cpp
++++ b/autotests/kiconloader_unittest.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include <kiconloader.h>
+ 
++#include <QDir>
+ #include <QRegularExpression>
+ #include <QStandardPaths>
+ #include <QTest>
+@@ -495,6 +496,20 @@ private Q_SLOTS:
+         uintToHex(testColorWithAlpha.rgba(), argbHex.data());
+         QCOMPARE(argbHex, QStringLiteral("7b6496c8"));
+     }
++
++    void testQDirSetSearchPaths()
++    {
++        // setup search path for testprefix: => we shall find the iconinspecialsearchpath.svg afterwards, see e.g. bug 434451
++        QDir::setSearchPaths("testprefix", QStringList(":/searchpathdefineddir"));
++        QPixmap pix = KIconLoader::global()->loadIcon(QStringLiteral("testprefix:iconinspecialsearchpath.svg"),
++                                                      KIconLoader::NoGroup,
++                                                      24,
++                                                      KIconLoader::DefaultState,
++                                                      QStringList(),
++                                                      nullptr,
++                                                      true);
++        QVERIFY(!pix.isNull());
++    }
+ };
+ 
+ QTEST_MAIN(KIconLoader_UnitTest)
+diff --git a/autotests/resources.qrc b/autotests/resources.qrc
+index d4000e5..4f4cd0c 100644
+--- a/autotests/resources.qrc
++++ b/autotests/resources.qrc
+@@ -10,5 +10,6 @@
+     <file>nonsquare.svg</file>
+     <file alias="/icons/themeinresource/index.theme">breeze.theme</file>
+     <file alias="/icons/themeinresource/22x22/appsNoContext/someiconintheme.png">test-22x22.png</file>
++    <file alias="/searchpathdefineddir/iconinspecialsearchpath.svg">coloredsvgicon.svg</file>
+ </qresource>
+ </RCC>
+-- 
+GitLab
+
+
+From 5a1690ba99d73e3e60f1a576af6b00ab29d6085f Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 10:41:04 +0100
+Subject: [PATCH 3/6] use QDir::isAbsolutePath, not !QDir::isRelativePath
+
+---
+ src/kiconloader.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 2411af1..784b06b 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -1201,8 +1201,8 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+         return QString();
+     }
+ 
+-    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
+-    if (_name.isEmpty() || !QDir::isRelativePath(_name)) {
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
++    if (_name.isEmpty() || QDir::isAbsolutePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+@@ -1340,8 +1340,8 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+         name = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + name + QStringLiteral(".png");
+     }
+ 
+-    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451
+-    bool absolutePath = !QDir::isRelativePath(name);
++    // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
++    const bool absolutePath = QDir::isAbsolutePath(name);
+     if (!absolutePath) {
+         name = d->removeIconExtension(name);
+     }
+-- 
+GitLab
+
+
+From 0bd39a510b103450dac69795e6ffbc4efc074734 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 18 Mar 2021 17:23:46 +0100
+Subject: [PATCH 4/6] more robust handling of missing global KDE themes
+
+in may cases the loader will handle absolute file names
+
+=> no need for our themes
+
+just remove the two locations where we still just exit
+in all other cases we did already proceed before
+---
+ src/kiconloader.cpp | 25 +++++++++----------------
+ 1 file changed, 9 insertions(+), 16 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 784b06b..6257846 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -225,7 +225,7 @@ public:
+     /**
+      * @internal
+      */
+-    bool initIconThemes();
++    void initIconThemes();
+ 
+     /**
+      * @internal
+@@ -627,11 +627,10 @@ void KIconLoaderPrivate::init(const QString &_appname, const QStringList &extraS
+     }
+ }
+ 
+-bool KIconLoaderPrivate::initIconThemes()
++void KIconLoaderPrivate::initIconThemes()
+ {
+     if (mIconThemeInited) {
+-        // If mpThemeRoot isn't 0 then initing has succeeded
+-        return (mpThemeRoot != nullptr);
++        return;
+     }
+     // qCDebug(KICONTHEMES);
+     mIconThemeInited = true;
+@@ -644,9 +643,9 @@ bool KIconLoaderPrivate::initIconThemes()
+         qCDebug(KICONTHEMES) << "Couldn't find current icon theme, falling back to default.";
+         def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
+         if (!def->isValid()) {
+-            qWarning() << "Error: standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
++            qCDebug(KICONTHEMES) << "Standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
+             delete def;
+-            return false;
++            return;
+         }
+     }
+     mpThemeRoot = new KIconThemeNode(def);
+@@ -661,8 +660,6 @@ bool KIconLoaderPrivate::initIconThemes()
+     searchPaths.append(QStringLiteral("icons")); // was xdgdata-icon in KStandardDirs
+     // These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
+     searchPaths.append(QStringLiteral("pixmaps")); // was xdgdata-pixmaps in KStandardDirs
+-
+-    return true;
+ }
+ 
+ KIconLoader::~KIconLoader() = default;
+@@ -932,7 +929,7 @@ QImage KIconLoaderPrivate::createIconImage(const QString &path, const QSize &siz
+     QImageReader reader;
+     QBuffer buffer;
+ 
+-    if (q->theme()->followsColorScheme() && (path.endsWith(QLatin1String("svg")) || path.endsWith(QLatin1String("svgz")))) {
++    if (q->theme() && q->theme()->followsColorScheme() && (path.endsWith(QLatin1String("svg")) || path.endsWith(QLatin1String("svgz")))) {
+         buffer.setData(processSvg(path, state));
+         reader.setDevice(&buffer);
+     } else {
+@@ -1197,16 +1194,14 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR
+ 
+ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canReturnNull, qreal scale) const
+ {
+-    if (!d->initIconThemes()) {
+-        return QString();
+-    }
+-
+     // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isAbsolutePath, see bug 434451
+     if (_name.isEmpty() || QDir::isAbsolutePath(_name)) {
+         // we have either an absolute path or nothing to work with
+         return _name;
+     }
+ 
++    d->initIconThemes();
++
+     QString name = d->removeIconExtension(_name);
+ 
+     QString path;
+@@ -1381,9 +1376,7 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name,
+     }
+ 
+     // Image is not cached... go find it and apply effects.
+-    if (!d->initIconThemes()) {
+-        return QPixmap();
+-    }
++    d->initIconThemes();
+ 
+     favIconOverlay = favIconOverlay && std::min(size.height(), size.width()) > 22;
+ 
+-- 
+GitLab
+
+
+From 3262669e3abfa7171463e3bf34f7c60eacf6bc77 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Fri, 19 Mar 2021 19:56:07 +0100
+Subject: [PATCH 6/6] don't register our engine per default
+
+---
+ src/kiconengineplugin.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kiconengineplugin.json b/src/kiconengineplugin.json
+index a5b4228..bc09e41 100644
+--- a/src/kiconengineplugin.json
++++ b/src/kiconengineplugin.json
+@@ -1,4 +1,4 @@
+ {
+-    "Keys": [ "KIconEngine", "svg", "svgz", "svg.gz" ]
++    "Keys": [ "KIconEngine" ]
+ }
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index ddc40a6ba1eb..30c808a58402 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,7 +1,7 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
 version=5.80.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -13,6 +13,7 @@ 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=92f2dc363fb8e6b7acdf1d7013d5b06f1f825466d8db00f79cd73cfc3ed9768c
+patch_args="-Np1"
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

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

* Re: kiconthemes: added patch for icon rendering issues
  2021-04-02 11:58 [PR PATCH] kiconthemes: added patch for icon rendering issues tunefish777
                   ` (4 preceding siblings ...)
  2021-04-06 11:37 ` tunefish777
@ 2021-04-06 11:44 ` tunefish777
  2022-05-16  2:08 ` github-actions
  2022-05-30  2:15 ` [PR PATCH] [Closed]: " github-actions
  7 siblings, 0 replies; 9+ messages in thread
From: tunefish777 @ 2021-04-06 11:44 UTC (permalink / raw)
  To: ml

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

New comment by tunefish777 on void-packages repository

https://github.com/void-linux/void-packages/pull/29949#issuecomment-814054305

Comment:
I removed the patch @Johnnynator 

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

* Re: kiconthemes: added patch for icon rendering issues
  2021-04-02 11:58 [PR PATCH] kiconthemes: added patch for icon rendering issues tunefish777
                   ` (5 preceding siblings ...)
  2021-04-06 11:44 ` tunefish777
@ 2022-05-16  2:08 ` github-actions
  2022-05-30  2:15 ` [PR PATCH] [Closed]: " github-actions
  7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2022-05-16  2:08 UTC (permalink / raw)
  To: ml

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/29949#issuecomment-1127140502

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

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

* Re: [PR PATCH] [Closed]: kiconthemes: added patch for icon rendering issues
  2021-04-02 11:58 [PR PATCH] kiconthemes: added patch for icon rendering issues tunefish777
                   ` (6 preceding siblings ...)
  2022-05-16  2:08 ` github-actions
@ 2022-05-30  2:15 ` github-actions
  7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2022-05-30  2:15 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

kiconthemes: added patch for icon rendering issues
https://github.com/void-linux/void-packages/pull/29949

Description:
<!-- Mark items with [x] where applicable -->

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

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

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


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

end of thread, other threads:[~2022-05-30  2:15 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-02 11:58 [PR PATCH] kiconthemes: added patch for icon rendering issues tunefish777
2021-04-02 15:41 ` ericonr
2021-04-02 22:35 ` Johnnynator
2021-04-06 11:26 ` [PR PATCH] [Updated] " tunefish777
2021-04-06 11:35 ` tunefish777
2021-04-06 11:37 ` tunefish777
2021-04-06 11:44 ` tunefish777
2022-05-16  2:08 ` github-actions
2022-05-30  2:15 ` [PR PATCH] [Closed]: " github-actions

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).