* [PR PATCH] rpm: update to 4.16.0
@ 2020-11-23 14:36 glaulher
2020-11-23 14:38 ` [PR REVIEW] " ericonr
` (24 more replies)
0 siblings, 25 replies; 27+ messages in thread
From: glaulher @ 2020-11-23 14:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
There is a new pull request by glaulher against master on the void-packages repository
https://github.com/glaulher/void-packages rpm
https://github.com/void-linux/void-packages/pull/26642
rpm: update to 4.16.0
A patch file from https://github.com/void-linux/void-packages/pull/26642.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-26642.patch --]
[-- Type: text/x-diff, Size: 2671 bytes --]
From 63acccd447e0fd99b7df67f4b00fd3c49d53a1fc Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++
srcpkgs/rpm/patches/fix-musl.patch | 1 +
srcpkgs/rpm/template | 12 ++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..e1e48b3b0d4
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,12 @@
+--- rpmdb.c
++++ rpmdb.c
+@@ -1,7 +1,9 @@
+#include "system.h"
+
++#include <fcntl.h>
++#include <sys / stat.h>
+#include <popt.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include "cliutils.h"
+#include "debug.h"
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index b4f6f7b5ba4..1716584b8c8 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
+
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..48f954d1172 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
@ 2020-11-23 14:38 ` ericonr
2020-11-23 14:39 ` ericonr
` (23 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-23 14:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#discussion_r528748953
Comment:
Remove this newline
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
2020-11-23 14:38 ` [PR REVIEW] " ericonr
@ 2020-11-23 14:39 ` ericonr
2020-11-23 14:43 ` glaulher
` (22 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-23 14:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#discussion_r528749135
Comment:
Is 2 correct? It's linked against python3...
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
2020-11-23 14:38 ` [PR REVIEW] " ericonr
2020-11-23 14:39 ` ericonr
@ 2020-11-23 14:43 ` glaulher
2020-11-23 14:47 ` [PR PATCH] [Updated] " glaulher
` (21 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-23 14:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New review comment by glaulher on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#discussion_r528752343
Comment:
deleting this line, the package does not compile.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (2 preceding siblings ...)
2020-11-23 14:43 ` glaulher
@ 2020-11-23 14:47 ` glaulher
2020-11-23 14:53 ` [PR REVIEW] " ericonr
` (20 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-23 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by glaulher against master on the void-packages repository
https://github.com/glaulher/void-packages rpm
https://github.com/void-linux/void-packages/pull/26642
rpm: update to 4.16.0
A patch file from https://github.com/void-linux/void-packages/pull/26642.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-26642.patch --]
[-- Type: text/x-diff, Size: 4990 bytes --]
From 63acccd447e0fd99b7df67f4b00fd3c49d53a1fc Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 1/2] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++
srcpkgs/rpm/patches/fix-musl.patch | 1 +
srcpkgs/rpm/template | 12 ++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..e1e48b3b0d4
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,12 @@
+--- rpmdb.c
++++ rpmdb.c
+@@ -1,7 +1,9 @@
+#include "system.h"
+
++#include <fcntl.h>
++#include <sys / stat.h>
+#include <popt.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include "cliutils.h"
+#include "debug.h"
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index b4f6f7b5ba4..1716584b8c8 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
+
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..48f954d1172 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
From e6b0dec6e4235cc87afb9b7f96cfd3d9a4a3cdbf Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 2/2] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++
srcpkgs/rpm/template | 12 ++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..e1e48b3b0d4
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,12 @@
+--- rpmdb.c
++++ rpmdb.c
+@@ -1,7 +1,9 @@
+#include "system.h"
+
++#include <fcntl.h>
++#include <sys / stat.h>
+#include <popt.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include "cliutils.h"
+#include "debug.h"
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..48f954d1172 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (3 preceding siblings ...)
2020-11-23 14:47 ` [PR PATCH] [Updated] " glaulher
@ 2020-11-23 14:53 ` ericonr
2020-11-23 15:05 ` ericonr
` (19 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-23 14:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#discussion_r528759316
Comment:
No, I think you should be using `python_version=3`
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (4 preceding siblings ...)
2020-11-23 14:53 ` [PR REVIEW] " ericonr
@ 2020-11-23 15:05 ` ericonr
2020-11-23 17:32 ` glaulher
` (18 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-23 15:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1302 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#issuecomment-732218883
Comment:
The patch you made is patching the wrong file, you need to apply
```diff
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
index e1e48b3b0d..2c0317ee5a 100644
--- a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -1,12 +1,11 @@
---- rpmdb.c
-+++ rpmdb.c
-@@ -1,7 +1,9 @@
-#include "system.h"
-
+--- lib/rpmdb.c
++++ lib/rpmdb.c
+@@ -8,6 +8,8 @@
+ #include <utime.h>
+ #include <errno.h>
+ #include <dirent.h>
++#include <sys/stat.h>
+#include <fcntl.h>
-+#include <sys / stat.h>
-#include <popt.h>
-#include <rpm/rpmcli.h>
-#include <rpm/rpmdb.h>
-#include "cliutils.h"
-#include "debug.h"
+
+ #ifndef DYING /* XXX already in "system.h" */
+ #include <fnmatch.h>
```
to your repository instead.
The final patch should look like
```
--- lib/rpmdb.c
+++ lib/rpmdb.c
@@ -8,6 +8,8 @@
#include <utime.h>
#include <errno.h>
#include <dirent.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#ifndef DYING /* XXX already in "system.h" */
#include <fnmatch.h>
```
Also, rebase your branch so the merge commit goes away.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (5 preceding siblings ...)
2020-11-23 15:05 ` ericonr
@ 2020-11-23 17:32 ` glaulher
2020-11-23 17:40 ` ericonr
` (17 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-23 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by glaulher on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#issuecomment-732311707
Comment:
the package compiled in musl but took 2h6m46s
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (6 preceding siblings ...)
2020-11-23 17:32 ` glaulher
@ 2020-11-23 17:40 ` ericonr
2020-11-23 17:40 ` ericonr
` (16 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-23 17:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#issuecomment-732316358
Comment:
Your local repository might have been out of date, which would have made it build the outdated dependencies. Do `git remote add upstream https://github.com/void-linux/void-packages.git` then `git pull upstream master --autostash`
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (7 preceding siblings ...)
2020-11-23 17:40 ` ericonr
@ 2020-11-23 17:40 ` ericonr
2020-11-23 17:57 ` [PR PATCH] [Updated] " glaulher
` (15 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-23 17:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#issuecomment-732316358
Comment:
Your local repository might have been out of date, which would have made it build the outdated dependencies. Do `git remote add upstream https://github.com/void-linux/void-packages.git` then `git pull upstream master --autostash`
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (8 preceding siblings ...)
2020-11-23 17:40 ` ericonr
@ 2020-11-23 17:57 ` glaulher
2020-11-23 18:14 ` glaulher
` (14 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-23 17:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by glaulher against master on the void-packages repository
https://github.com/glaulher/void-packages rpm
https://github.com/void-linux/void-packages/pull/26642
rpm: update to 4.16.0
A patch file from https://github.com/void-linux/void-packages/pull/26642.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-26642.patch --]
[-- Type: text/x-diff, Size: 6813 bytes --]
From 63acccd447e0fd99b7df67f4b00fd3c49d53a1fc Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 1/3] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++
srcpkgs/rpm/patches/fix-musl.patch | 1 +
srcpkgs/rpm/template | 12 ++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..e1e48b3b0d4
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,12 @@
+--- rpmdb.c
++++ rpmdb.c
+@@ -1,7 +1,9 @@
+#include "system.h"
+
++#include <fcntl.h>
++#include <sys / stat.h>
+#include <popt.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include "cliutils.h"
+#include "debug.h"
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index b4f6f7b5ba4..1716584b8c8 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
+
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..48f954d1172 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
From e6b0dec6e4235cc87afb9b7f96cfd3d9a4a3cdbf Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 2/3] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++
srcpkgs/rpm/template | 12 ++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..e1e48b3b0d4
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,12 @@
+--- rpmdb.c
++++ rpmdb.c
+@@ -1,7 +1,9 @@
+#include "system.h"
+
++#include <fcntl.h>
++#include <sys / stat.h>
+#include <popt.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include "cliutils.h"
+#include "debug.h"
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..48f954d1172 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
From 0a8e714a46969d805692e155bc054ccc79e95be8 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 3/3] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 21 ++++++++++-----------
srcpkgs/rpm/patches/fix-musl.patch | 1 +
srcpkgs/rpm/template | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
index e1e48b3b0d4..2c0317ee5a1 100644
--- a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -1,12 +1,11 @@
---- rpmdb.c
-+++ rpmdb.c
-@@ -1,7 +1,9 @@
-#include "system.h"
-
+--- lib/rpmdb.c
++++ lib/rpmdb.c
+@@ -8,6 +8,8 @@
+ #include <utime.h>
+ #include <errno.h>
+ #include <dirent.h>
++#include <sys/stat.h>
+#include <fcntl.h>
-+#include <sys / stat.h>
-#include <popt.h>
-#include <rpm/rpmcli.h>
-#include <rpm/rpmdb.h>
-#include "cliutils.h"
-#include "debug.h"
+
+ #ifndef DYING /* XXX already in "system.h" */
+ #include <fnmatch.h>
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index b4f6f7b5ba4..1716584b8c8 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
+
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 48f954d1172..6a8aa5f6d4b 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,7 +1,7 @@
# Template file for 'rpm'
pkgname=rpm
version=4.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (9 preceding siblings ...)
2020-11-23 17:57 ` [PR PATCH] [Updated] " glaulher
@ 2020-11-23 18:14 ` glaulher
2020-11-23 19:01 ` glaulher
` (13 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-23 18:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by glaulher against master on the void-packages repository
https://github.com/glaulher/void-packages rpm
https://github.com/void-linux/void-packages/pull/26642
rpm: update to 4.16.0
A patch file from https://github.com/void-linux/void-packages/pull/26642.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-26642.patch --]
[-- Type: text/x-diff, Size: 6813 bytes --]
From 63acccd447e0fd99b7df67f4b00fd3c49d53a1fc Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 1/3] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++
srcpkgs/rpm/patches/fix-musl.patch | 1 +
srcpkgs/rpm/template | 12 ++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..e1e48b3b0d4
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,12 @@
+--- rpmdb.c
++++ rpmdb.c
+@@ -1,7 +1,9 @@
+#include "system.h"
+
++#include <fcntl.h>
++#include <sys / stat.h>
+#include <popt.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include "cliutils.h"
+#include "debug.h"
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index b4f6f7b5ba4..1716584b8c8 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
+
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..48f954d1172 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
From e6b0dec6e4235cc87afb9b7f96cfd3d9a4a3cdbf Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 2/3] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++
srcpkgs/rpm/template | 12 ++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..e1e48b3b0d4
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,12 @@
+--- rpmdb.c
++++ rpmdb.c
+@@ -1,7 +1,9 @@
+#include "system.h"
+
++#include <fcntl.h>
++#include <sys / stat.h>
+#include <popt.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include "cliutils.h"
+#include "debug.h"
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..48f954d1172 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
From 0a8e714a46969d805692e155bc054ccc79e95be8 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 3/3] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 21 ++++++++++-----------
srcpkgs/rpm/patches/fix-musl.patch | 1 +
srcpkgs/rpm/template | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
index e1e48b3b0d4..2c0317ee5a1 100644
--- a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -1,12 +1,11 @@
---- rpmdb.c
-+++ rpmdb.c
-@@ -1,7 +1,9 @@
-#include "system.h"
-
+--- lib/rpmdb.c
++++ lib/rpmdb.c
+@@ -8,6 +8,8 @@
+ #include <utime.h>
+ #include <errno.h>
+ #include <dirent.h>
++#include <sys/stat.h>
+#include <fcntl.h>
-+#include <sys / stat.h>
-#include <popt.h>
-#include <rpm/rpmcli.h>
-#include <rpm/rpmdb.h>
-#include "cliutils.h"
-#include "debug.h"
+
+ #ifndef DYING /* XXX already in "system.h" */
+ #include <fnmatch.h>
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index b4f6f7b5ba4..1716584b8c8 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
+
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 48f954d1172..6a8aa5f6d4b 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,7 +1,7 @@
# Template file for 'rpm'
pkgname=rpm
version=4.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (10 preceding siblings ...)
2020-11-23 18:14 ` glaulher
@ 2020-11-23 19:01 ` glaulher
2020-11-23 20:01 ` glaulher
` (12 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-23 19:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by glaulher against master on the void-packages repository
https://github.com/glaulher/void-packages rpm
https://github.com/void-linux/void-packages/pull/26642
rpm: update to 4.16.0
A patch file from https://github.com/void-linux/void-packages/pull/26642.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-26642.patch --]
[-- Type: text/x-diff, Size: 576948 bytes --]
From 63acccd447e0fd99b7df67f4b00fd3c49d53a1fc Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 001/357] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++
srcpkgs/rpm/patches/fix-musl.patch | 1 +
srcpkgs/rpm/template | 12 ++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..e1e48b3b0d4
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,12 @@
+--- rpmdb.c
++++ rpmdb.c
+@@ -1,7 +1,9 @@
+#include "system.h"
+
++#include <fcntl.h>
++#include <sys / stat.h>
+#include <popt.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include "cliutils.h"
+#include "debug.h"
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index b4f6f7b5ba4..1716584b8c8 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
+
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..48f954d1172 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
From e6b0dec6e4235cc87afb9b7f96cfd3d9a4a3cdbf Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 002/357] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++
srcpkgs/rpm/template | 12 ++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..e1e48b3b0d4
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,12 @@
+--- rpmdb.c
++++ rpmdb.c
+@@ -1,7 +1,9 @@
+#include "system.h"
+
++#include <fcntl.h>
++#include <sys / stat.h>
+#include <popt.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include "cliutils.h"
+#include "debug.h"
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..48f954d1172 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
From 0a8e714a46969d805692e155bc054ccc79e95be8 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 003/357] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 21 ++++++++++-----------
srcpkgs/rpm/patches/fix-musl.patch | 1 +
srcpkgs/rpm/template | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
index e1e48b3b0d4..2c0317ee5a1 100644
--- a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -1,12 +1,11 @@
---- rpmdb.c
-+++ rpmdb.c
-@@ -1,7 +1,9 @@
-#include "system.h"
-
+--- lib/rpmdb.c
++++ lib/rpmdb.c
+@@ -8,6 +8,8 @@
+ #include <utime.h>
+ #include <errno.h>
+ #include <dirent.h>
++#include <sys/stat.h>
+#include <fcntl.h>
-+#include <sys / stat.h>
-#include <popt.h>
-#include <rpm/rpmcli.h>
-#include <rpm/rpmdb.h>
-#include "cliutils.h"
-#include "debug.h"
+
+ #ifndef DYING /* XXX already in "system.h" */
+ #include <fnmatch.h>
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index b4f6f7b5ba4..1716584b8c8 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
+
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 48f954d1172..6a8aa5f6d4b 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,7 +1,7 @@
# Template file for 'rpm'
pkgname=rpm
version=4.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
From 465355b96f13cfbf44262815dd2450f42daf3fd5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 17 Nov 2020 22:28:47 +0100
Subject: [PATCH 004/357] giada: update to 0.17.0.
---
srcpkgs/giada/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/giada/template b/srcpkgs/giada/template
index 83d1aab438e..558097e3a0e 100644
--- a/srcpkgs/giada/template
+++ b/srcpkgs/giada/template
@@ -1,10 +1,10 @@
# Template file for 'giada'
pkgname=giada
-version=0.16.4
+version=0.17.0
revision=1
-build_style=gnu-configure
-configure_args="--target=linux"
-hostmakedepends="automake"
+build_style=cmake
+# configure_args="--target=linux"
+hostmakedepends="cmake"
makedepends="fltk-devel jack-devel libsamplerate-devel
libsndfile-devel libXpm-devel pulseaudio-devel rtmidi-devel libXcursor-devel
json-c++"
@@ -12,8 +12,9 @@ short_desc="Loop machine, audio tool for DJs, live performers and musicians"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-only"
homepage="https://www.giadamusic.com/"
+changelog="https://github.com/monocasual/giada/raw/master/ChangeLog"
distfiles="https://github.com/monocasual/giada/archive/v${version}.tar.gz"
-checksum=a425151ff571d4b0e79a3faaa6dd872c8f2693ffcada975b282365c865130b38
+checksum=b879f5ba7e9f34d7422aedd89d1d0baa91387b3528e057b4df25e1f2f8d661ef
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
@@ -21,7 +22,7 @@ fi
post_extract() {
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- vsed -e 's/\($(ldAdd)\)/\1 -latomic/g' -i Makefile.am
+ vsed -e '/list(APPEND LIBRARIES)/a list(APPEND LIBRARIES atomic)' -i CMakeLists.txt
fi
vsed -e 's;deps/json/single_include/\(nlohmann/json.hpp\);\1;' -i \
src/core/init.cpp \
@@ -30,6 +31,6 @@ post_extract() {
src/core/patch.cpp
}
-pre_configure() {
- autoreconf -fi
+do_install() {
+ vbin build/giada
}
From 55067dfe25fe62ba3c06e707079b54f73166a5ed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 19 Nov 2020 23:52:39 +0100
Subject: [PATCH 005/357] flatpak: update to 1.8.3.
---
srcpkgs/flatpak/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 6dd4ec1e6bb..98538dbb116 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,6 +1,6 @@
# Template file for 'flatpak'
pkgname=flatpak
-version=1.8.2
+version=1.8.3
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -14,14 +14,14 @@ hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison
makedepends="appstream-glib-devel gpgme-devel json-glib-devel libcap-devel
libostree-devel libseccomp-devel polkit-devel dconf-devel fuse-devel"
depends="bubblewrap gnupg2"
-checkdepends="bubblewrap dbus"
+checkdepends="bubblewrap dbus socat which"
short_desc="Application sandboxing and distribution framework"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://flatpak.org/"
-changelog="https://github.com/flatpak/flatpak/blob/master/NEWS"
+changelog="https://github.com/flatpak/flatpak/raw/master/NEWS"
distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=7926625df7c2282a5ee1a8b3c317af53d40a663b1bc6b18a2dc8747e265085b0
+checksum=33667fdd5cf65914209488bf3e7e574ddb57667bb7939863b4fcb40ca8b66edd
build_options="gir"
build_options_default="gir"
From b5dc7bbfe7ea4a60eda0f6e36fcc388cdcf0cf00 Mon Sep 17 00:00:00 2001
From: "Issam E. Maghni" <issam.e.maghni@mailbox.org>
Date: Tue, 22 Sep 2020 18:36:38 -0400
Subject: [PATCH 006/357] xdg-desktop-portal: update to 1.8.0
---
.../patches/pipewire-0.3.patch | 551 ------------------
srcpkgs/xdg-desktop-portal/template | 19 +-
2 files changed, 11 insertions(+), 559 deletions(-)
delete mode 100644 srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch
diff --git a/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch b/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch
deleted file mode 100644
index 94ebe083598..00000000000
--- a/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch
+++ /dev/null
@@ -1,551 +0,0 @@
-From a38901e5e7f835efe7b7a06c55790c8c20bc91a2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 14 Jan 2020 09:37:09 +0100
-Subject: [PATCH] PipeWire: update to 0.3 API
-
----
- configure.ac | 2 +-
- src/camera.c | 24 ++++----
- src/pipewire.c | 141 +++++++++++++---------------------------------
- src/pipewire.h | 10 ++--
- src/screen-cast.c | 98 ++++++--------------------------
- 5 files changed, 72 insertions(+), 203 deletions(-)
-
-diff --git configure.ac configure.ac
-index 89902fa..62d7960 100644
---- configure.ac
-+++ configure.ac
-@@ -97,7 +97,7 @@ AC_ARG_ENABLE(pipewire,
- [AS_HELP_STRING([--enable-pipewire],[Enable PipeWire support. Needed for screen cast portal])],
- enable_pipewire=$enableval, enable_pipewire=yes)
- if test x$enable_pipewire = xyes ; then
-- PKG_CHECK_MODULES(PIPEWIRE, [libpipewire-0.2 >= 0.2.6])
-+ PKG_CHECK_MODULES(PIPEWIRE, [libpipewire-0.3 >= 0.2.90])
- AC_DEFINE([HAVE_PIPEWIRE],[1], [Define to enable PipeWire support])
- fi
- AM_CONDITIONAL([HAVE_PIPEWIRE],[test "$enable_pipewire" = "yes"])
-diff --git src/camera.c src/camera.c
-index c2b392c..20fe3aa 100644
---- src/camera.c
-+++ src/camera.c
-@@ -141,7 +141,7 @@ open_pipewire_camera_remote (const char *app_id,
- GError **error)
- {
- PipeWireRemote *remote;
-- struct spa_dict_item permission_items[1];
-+ struct pw_permission permission_items[2];
- struct pw_properties *pipewire_properties;
-
- pipewire_properties =
-@@ -158,12 +158,12 @@ open_pipewire_camera_remote (const char *app_id,
- * Hide all existing and future nodes by default. PipeWire will use the
- * permission store to set up permissions.
- */
-- permission_items[0].key = PW_CORE_PROXY_PERMISSIONS_DEFAULT;
-- permission_items[0].value = "---";
-+ permission_items[0] = PW_PERMISSION_INIT (PW_ID_CORE, PW_PERM_RWX);
-+ permission_items[1] = PW_PERMISSION_INIT (PW_ID_ANY, 0);
-
-- pw_core_proxy_permissions (pw_remote_get_core_proxy (remote->remote),
-- &SPA_DICT_INIT (permission_items,
-- G_N_ELEMENTS (permission_items)));
-+ pw_client_update_permissions (pw_core_get_client(remote->core),
-+ G_N_ELEMENTS (permission_items),
-+ permission_items);
-
- pipewire_remote_roundtrip (remote);
-
-@@ -219,7 +219,7 @@ handle_open_pipewire_remote (XdpCamera *object,
- }
-
- out_fd_list = g_unix_fd_list_new ();
-- fd = pw_remote_steal_fd (remote->remote);
-+ fd = pw_core_steal_fd (remote->core);
- fd_id = g_unix_fd_list_append (out_fd_list, fd, &error);
- close (fd);
- pipewire_remote_destroy (remote);
-@@ -250,29 +250,28 @@ camera_iface_init (XdpCameraIface *iface)
- static void
- global_added_cb (PipeWireRemote *remote,
- uint32_t id,
-- uint32_t type,
-+ const char *type,
- const struct spa_dict *props,
- gpointer user_data)
- {
- Camera *camera = user_data;
-- struct pw_type *core_type = pw_core_get_type (remote->core);
- const struct spa_dict_item *media_class;
- const struct spa_dict_item *media_role;
-
-- if (type != core_type->node)
-+ if (strcmp(type, PW_TYPE_INTERFACE_Node) != 0)
- return;
-
- if (!props)
- return;
-
-- media_class = spa_dict_lookup_item (props, "media.class");
-+ media_class = spa_dict_lookup_item (props, PW_KEY_MEDIA_CLASS);
- if (!media_class)
- return;
-
- if (g_strcmp0 (media_class->value, "Video/Source") != 0)
- return;
-
-- media_role = spa_dict_lookup_item (props, "media.role");
-+ media_role = spa_dict_lookup_item (props, PW_KEY_MEDIA_ROLE);
- if (!media_role)
- return;
-
-@@ -342,6 +341,7 @@ create_pipewire_remote (Camera *camera,
- }
-
- pipewire_properties = pw_properties_new ("pipewire.access.portal.is_portal", "true",
-+ "portal.monitor", "Camera",
- NULL);
- camera->pipewire_remote = pipewire_remote_new_sync (pipewire_properties,
- global_added_cb,
-diff --git src/pipewire.c src/pipewire.c
-index 793a378..162cd55 100644
---- src/pipewire.c
-+++ src/pipewire.c
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #include <glib.h>
- #include <pipewire/pipewire.h>
-+#include <spa/utils/result.h>
-
- #include "pipewire.h"
-
-@@ -36,27 +37,25 @@ static gboolean is_pipewire_initialized = FALSE;
- static void
- registry_event_global (void *user_data,
- uint32_t id,
-- uint32_t parent_id,
- uint32_t permissions,
-- uint32_t type,
-+ const char *type,
- uint32_t version,
- const struct spa_dict *props)
- {
- PipeWireRemote *remote = user_data;
-- struct pw_type *core_type = pw_core_get_type (remote->core);
- const struct spa_dict_item *factory_object_type;
- PipeWireGlobal *global;
-
- global = g_new0 (PipeWireGlobal, 1);
- *global = (PipeWireGlobal) {
-- .parent_id = parent_id,
-+ .parent_id = id,
- };
-
- g_hash_table_insert (remote->globals, GINT_TO_POINTER (id), global);
- if (remote->global_added_cb)
- remote->global_added_cb (remote, id, type, props, remote->user_data);
-
-- if (type != core_type->factory)
-+ if (strcmp(type, PW_TYPE_INTERFACE_Factory) != 0)
- return;
-
- factory_object_type = spa_dict_lookup_item (props, "factory.type.name");
-@@ -81,8 +80,8 @@ registry_event_global_remove (void *user_data,
- g_hash_table_remove (remote->globals, GINT_TO_POINTER (id));
- }
-
--static const struct pw_registry_proxy_events registry_events = {
-- PW_VERSION_REGISTRY_PROXY_EVENTS,
-+static const struct pw_registry_events registry_events = {
-+ PW_VERSION_REGISTRY_EVENTS,
- .global = registry_event_global,
- .global_remove = registry_event_global_remove,
- };
-@@ -90,7 +89,7 @@ static const struct pw_registry_proxy_events registry_events = {
- void
- pipewire_remote_roundtrip (PipeWireRemote *remote)
- {
-- pw_core_proxy_sync (remote->core_proxy, ++remote->sync_seq);
-+ remote->sync_seq = pw_core_sync (remote->core, PW_ID_CORE, remote->sync_seq);
- pw_main_loop_run (remote->loop);
- }
-
-@@ -98,16 +97,13 @@ static gboolean
- discover_node_factory_sync (PipeWireRemote *remote,
- GError **error)
- {
-- struct pw_type *core_type = pw_core_get_type (remote->core);
-- struct pw_registry_proxy *registry_proxy;
-+ struct pw_registry *registry;
-
-- registry_proxy = pw_core_proxy_get_registry (remote->core_proxy,
-- core_type->registry,
-- PW_VERSION_REGISTRY, 0);
-- pw_registry_proxy_add_listener (registry_proxy,
-- &remote->registry_listener,
-- ®istry_events,
-- remote);
-+ registry = pw_core_get_registry (remote->core, PW_VERSION_REGISTRY, 0);
-+ pw_registry_add_listener (registry,
-+ &remote->registry_listener,
-+ ®istry_events,
-+ remote);
-
- pipewire_remote_roundtrip (remote);
-
-@@ -122,59 +118,35 @@ discover_node_factory_sync (PipeWireRemote *remote,
- }
-
- static void
--on_state_changed (void *user_data,
-- enum pw_remote_state old,
-- enum pw_remote_state state,
-- const char *error)
-+core_event_error (void *user_data,
-+ uint32_t id,
-+ int seq,
-+ int res,
-+ const char *message)
- {
- PipeWireRemote *remote = user_data;
-
-- switch (state)
-+ if (id == PW_ID_CORE)
- {
-- case PW_REMOTE_STATE_ERROR:
-- if (!remote->error)
-- {
-- g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "%s", error);
-- }
-+ g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED,
-+ "%s", message);
- pw_main_loop_quit (remote->loop);
-- break;
-- case PW_REMOTE_STATE_UNCONNECTED:
-- if (!remote->error)
-- {
-- g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "Disconnected");
-- }
-- pw_main_loop_quit (remote->loop);
-- break;
-- case PW_REMOTE_STATE_CONNECTING:
-- break;
-- case PW_REMOTE_STATE_CONNECTED:
-- pw_main_loop_quit (remote->loop);
-- break;
-- default:
-- g_warning ("Unknown PipeWire state");
-- break;
- }
- }
-
--static const struct pw_remote_events remote_events = {
-- PW_VERSION_REMOTE_EVENTS,
-- .state_changed = on_state_changed,
--};
--
- static void
- core_event_done (void *user_data,
-- uint32_t seq)
-+ uint32_t id, int seq)
- {
- PipeWireRemote *remote = user_data;
-
-- if (remote->sync_seq == seq)
-+ if (id == PW_ID_CORE && remote->sync_seq == seq)
- pw_main_loop_quit (remote->loop);
- }
-
--static const struct pw_core_proxy_events core_events = {
-- PW_VERSION_CORE_PROXY_EVENTS,
-+static const struct pw_core_events core_events = {
-+ PW_VERSION_CORE_EVENTS,
-+ .error = core_event_error,
- .done = core_event_done,
- };
-
-@@ -237,8 +209,8 @@ void
- pipewire_remote_destroy (PipeWireRemote *remote)
- {
- g_clear_pointer (&remote->globals, g_hash_table_destroy);
-- g_clear_pointer (&remote->remote, pw_remote_destroy);
-- g_clear_pointer (&remote->core, pw_core_destroy);
-+ g_clear_pointer (&remote->core, pw_core_disconnect);
-+ g_clear_pointer (&remote->context, pw_context_destroy);
- g_clear_pointer (&remote->loop, pw_main_loop_destroy);
- g_clear_error (&remote->error);
-
-@@ -307,68 +279,31 @@ pipewire_remote_new_sync (struct pw_properties *pipewire_properties,
- return NULL;
- }
-
-- remote->core = pw_core_new (pw_main_loop_get_loop (remote->loop), NULL);
-- if (!remote->core)
-+ remote->context = pw_context_new (pw_main_loop_get_loop (remote->loop), NULL, 0);
-+ if (!remote->context)
- {
- pipewire_remote_destroy (remote);
- pw_properties_free (pipewire_properties);
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "Couldn't create PipeWire core");
-+ "Couldn't create PipeWire context");
- return NULL;
- }
-
-- remote->remote = pw_remote_new (remote->core, pipewire_properties, 0);
-- if (!remote->remote)
-+ remote->core = pw_context_connect (remote->context, pipewire_properties, 0);
-+ if (!remote->core)
- {
- pipewire_remote_destroy (remote);
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "Couldn't create PipeWire remote");
-+ "Couldn't connect to PipeWire");
- return NULL;
- }
-
- remote->globals = g_hash_table_new_full (NULL, NULL, NULL, g_free);
-
-- pw_remote_add_listener (remote->remote,
-- &remote->remote_listener,
-- &remote_events,
-- remote);
--
-- if (pw_remote_connect (remote->remote) != 0)
-- {
-- pipewire_remote_destroy (remote);
-- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "Couldn't connect PipeWire remote");
-- return NULL;
-- }
--
-- pw_main_loop_run (remote->loop);
--
-- switch (pw_remote_get_state (remote->remote, NULL))
-- {
-- case PW_REMOTE_STATE_ERROR:
-- case PW_REMOTE_STATE_UNCONNECTED:
-- *error = g_steal_pointer (&remote->error);
-- pipewire_remote_destroy (remote);
-- return NULL;
-- case PW_REMOTE_STATE_CONNECTING:
-- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "PipeWire loop stopped unexpectedly");
-- pipewire_remote_destroy (remote);
-- return NULL;
-- case PW_REMOTE_STATE_CONNECTED:
-- break;
-- default:
-- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "Unexpected PipeWire state");
-- pipewire_remote_destroy (remote);
-- return NULL;
-- }
--
-- remote->core_proxy = pw_remote_get_core_proxy (remote->remote);
-- pw_core_proxy_add_listener (remote->core_proxy,
-- &remote->core_listener,
-- &core_events,
-- remote);
-+ pw_core_add_listener (remote->core,
-+ &remote->core_listener,
-+ &core_events,
-+ remote);
-
- if (!discover_node_factory_sync (remote, error))
- {
-diff --git src/pipewire.h src/pipewire.h
-index 0f1bf54..bf48d5e 100644
---- src/pipewire.h
-+++ src/pipewire.h
-@@ -32,7 +32,7 @@ typedef struct _PipeWireGlobal
-
- typedef void (* PipeWireGlobalAddedCallback) (PipeWireRemote *remote,
- uint32_t id,
-- uint32_t type,
-+ const char *type,
- const struct spa_dict *props,
- gpointer user_data);
-
-@@ -43,13 +43,11 @@ typedef void (* PipeWireGlobalRemovedCallback) (PipeWireRemote *remote,
- struct _PipeWireRemote
- {
- struct pw_main_loop *loop;
-+ struct pw_context *context;
- struct pw_core *core;
-- struct pw_remote *remote;
-- struct spa_hook remote_listener;
--
-- struct pw_core_proxy *core_proxy;
- struct spa_hook core_listener;
-- uint32_t sync_seq;
-+
-+ int sync_seq;
-
- struct spa_hook registry_listener;
-
-diff --git src/screen-cast.c src/screen-cast.c
-index 7881ddc..1677050 100644
---- src/screen-cast.c
-+++ src/screen-cast.c
-@@ -31,10 +31,10 @@
- #include "xdp-impl-dbus.h"
- #include "xdp-utils.h"
-
--#define PERMISSION_ITEM(item_key, item_value) \
-- ((struct spa_dict_item) { \
-- .key = item_key, \
-- .value = item_value \
-+#define PERMISSION_ITEM(item_id, item_permissions) \
-+ ((struct pw_permission) { \
-+ .id = item_id, \
-+ .permissions = item_permissions \
- })
-
- typedef struct _ScreenCast ScreenCast;
-@@ -517,42 +517,9 @@ screen_cast_stream_get_pipewire_node_id (ScreenCastStream *stream)
- return stream->id;
- }
-
--static void
--append_parent_permissions (PipeWireRemote *remote,
-- GArray *permission_items,
-- GList **string_stash,
-- PipeWireGlobal *global,
-- const char *permission)
--{
-- PipeWireGlobal *parent;
-- char *parent_permission_value;
--
-- if (global->parent_id == 0)
-- return;
--
-- parent = g_hash_table_lookup (remote->globals, GINT_TO_POINTER (global->parent_id));
--
-- if (parent->permission_set)
-- return;
-- parent->permission_set = TRUE;
--
-- append_parent_permissions (remote, permission_items, string_stash,
-- parent, permission);
--
-- parent_permission_value = g_strdup_printf ("%u:%s",
-- global->parent_id,
-- permission);
-- *string_stash = g_list_prepend (*string_stash, parent_permission_value);
--
-- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
-- parent_permission_value));
--}
--
- static void
- append_stream_permissions (PipeWireRemote *remote,
- GArray *permission_items,
-- GList **string_stash,
- GList *streams)
- {
- GList *l;
-@@ -561,21 +528,10 @@ append_stream_permissions (PipeWireRemote *remote,
- {
- ScreenCastStream *stream = l->data;
- uint32_t stream_id;
-- PipeWireGlobal *stream_global;
-- char *stream_permission_value;
-
- stream_id = screen_cast_stream_get_pipewire_node_id (stream);
-- stream_global = g_hash_table_lookup (remote->globals,
-- GINT_TO_POINTER (stream_id));
--
-- append_parent_permissions (remote, permission_items, string_stash,
-- stream_global, "r--");
--
-- stream_permission_value = g_strdup_printf ("%u:rwx", stream_id);
-- *string_stash = g_list_prepend (*string_stash, stream_permission_value);
- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
-- stream_permission_value));
-+ PERMISSION_ITEM (stream_id, PW_PERM_RWX));
- }
- }
-
-@@ -587,9 +543,6 @@ open_pipewire_screen_cast_remote (const char *app_id,
- struct pw_properties *pipewire_properties;
- PipeWireRemote *remote;
- g_autoptr(GArray) permission_items = NULL;
-- char *node_factory_permission_string;
-- GList *string_stash = NULL;
-- struct spa_dict *permission_dict;
- PipeWireGlobal *node_global;
-
- pipewire_properties = pw_properties_new ("pipewire.access.portal.app_id", app_id,
-@@ -603,48 +556,31 @@ open_pipewire_screen_cast_remote (const char *app_id,
-
- permission_items = g_array_new (FALSE, TRUE, sizeof (struct spa_dict_item));
-
-- /*
-- * Hide all existing and future nodes (except the ones we explicitly list below.
-- */
-- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_EXISTING,
-- "---"));
-- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_DEFAULT,
-- "---"));
--
- /*
- * PipeWire:Interface:Core
- * Needs rwx to be able create the sink node using the create-object method
- */
- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
-- "0:rwx"));
-+ PERMISSION_ITEM (PW_ID_CORE, PW_PERM_RWX));
-
- /*
- * PipeWire:Interface:NodeFactory
- * Needs r-- so it can be passed to create-object when creating the sink node.
- */
-- node_factory_permission_string = g_strdup_printf ("%d:r--",
-- remote->node_factory_id);
-- string_stash = g_list_prepend (string_stash, node_factory_permission_string);
- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
-- node_factory_permission_string));
-- node_global = g_hash_table_lookup (remote->globals,
-- GINT_TO_POINTER (remote->node_factory_id));
-- append_parent_permissions (remote, permission_items, &string_stash,
-- node_global, "r--");
-+ PERMISSION_ITEM (remote->node_factory_id, PW_PERM_R));
-
-- append_stream_permissions (remote, permission_items, &string_stash, streams);
-+ append_stream_permissions (remote, permission_items, streams);
-
-- permission_dict =
-- &SPA_DICT_INIT ((struct spa_dict_item *) permission_items->data,
-- permission_items->len);
-- pw_core_proxy_permissions (pw_remote_get_core_proxy (remote->remote),
-- permission_dict);
-+ /*
-+ * Hide all existing and future nodes (except the ones we explicitly list above).
-+ */
-+ g_array_append_val (permission_items,
-+ PERMISSION_ITEM (PW_ID_ANY, 0));
-
-- g_list_free_full (string_stash, g_free);
-+ pw_client_update_permissions (pw_core_get_client(remote->core),
-+ permission_items->len,
-+ (const struct pw_permission *)permission_items->data);
-
- pipewire_remote_roundtrip (remote);
-
-@@ -943,7 +879,7 @@ handle_open_pipewire_remote (XdpScreenCast *object,
- }
-
- out_fd_list = g_unix_fd_list_new ();
-- fd = pw_remote_steal_fd (remote->remote);
-+ fd = pw_core_steal_fd (remote->core);
- fd_id = g_unix_fd_list_append (out_fd_list, fd, &error);
- close (fd);
- pipewire_remote_destroy (remote);
diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 1136b6a6e0e..b2b9d77727b 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,20 +1,23 @@
# Template file for 'xdg-desktop-portal'
pkgname=xdg-desktop-portal
-version=1.6.0
-revision=2
+version=1.8.0
+revision=1
build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --disable-libportal"
-hostmakedepends="automake libtool gettext-devel pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+hostmakedepends="pkg-config glib-devel"
+makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+ libportal-devel"
+checkdepends="dbus"
short_desc="Portal frontend service for Flatpak"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/flatpak/xdg-desktop-portal"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=883c9c9a925e48af54812b5347f546dd776ec2e27076a83d5a8126af6bafb9da
+checksum=a2fc5681b3a35078239072a98d6435a4c8404016730cab17c9febfd4ecec3610
-pre_configure() {
- autoreconf -vfi
+do_check() {
+ # some tests require a dbus session
+ make check || :
}
post_install() {
From e3114b3d156741a79fc6150b47ffdade745f8c30 Mon Sep 17 00:00:00 2001
From: Reg Tiangha <reg@reginaldtiangha.com>
Date: Thu, 19 Nov 2020 11:32:05 -0700
Subject: [PATCH 007/357] slack-desktop: update to 4.11.1
---
srcpkgs/slack-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 7624d15a5eb..482e2ff2a89 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'slack-desktop'
pkgname=slack-desktop
-version=4.11.0
+version=4.11.1
revision=1
archs="x86_64"
hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="custom:Proprietary"
homepage="https://slack.com/"
distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=ecfe313c75ceb01c8f142a90efa728a1009b5ade1bd7dd74b84fd05102ebccbe
+checksum=cf549741b6477cca74be04e56b96a8a9bfb02452ebd641d1c0aa286afb7883e4
restricted=yes
repository="nonfree"
nopie=yes
From 3c5ddbec6b3b726b1e9c6667caf0be23423d046e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 20 Nov 2020 00:55:59 +0100
Subject: [PATCH 008/357] musl: add patch for CVE-2020-28928
---
srcpkgs/musl/patches/CVE-2020-28928.patch | 64 +++++++++++++++++++++++
srcpkgs/musl/template | 2 +-
2 files changed, 65 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/patches/CVE-2020-28928.patch
diff --git a/srcpkgs/musl/patches/CVE-2020-28928.patch b/srcpkgs/musl/patches/CVE-2020-28928.patch
new file mode 100644
index 00000000000..9075ae1f897
--- /dev/null
+++ b/srcpkgs/musl/patches/CVE-2020-28928.patch
@@ -0,0 +1,64 @@
+--- src/multibyte/wcsnrtombs.c
++++ src/multibyte/wcsnrtombs.c
+@@ -1,41 +1,33 @@
+ #include <wchar.h>
++#include <limits.h>
++#include <string.h>
+
+ size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, size_t n, mbstate_t *restrict st)
+ {
+- size_t l, cnt=0, n2;
+- char *s, buf[256];
+ const wchar_t *ws = *wcs;
+- const wchar_t *tmp_ws;
+-
+- if (!dst) s = buf, n = sizeof buf;
+- else s = dst;
+-
+- while ( ws && n && ( (n2=wn)>=n || n2>32 ) ) {
+- if (n2>=n) n2=n;
+- tmp_ws = ws;
+- l = wcsrtombs(s, &ws, n2, 0);
+- if (!(l+1)) {
+- cnt = l;
+- n = 0;
++ size_t cnt = 0;
++ if (!dst) n=0;
++ while (ws && wn) {
++ char tmp[MB_LEN_MAX];
++ size_t l = wcrtomb(n<MB_LEN_MAX ? tmp : dst, *ws, 0);
++ if (l==-1) {
++ cnt = -1;
+ break;
+ }
+- if (s != buf) {
+- s += l;
++ if (dst) {
++ if (n<MB_LEN_MAX) {
++ if (l>n) break;
++ memcpy(dst, tmp, l);
++ }
++ dst += l;
+ n -= l;
+ }
+- wn = ws ? wn - (ws - tmp_ws) : 0;
+- cnt += l;
+- }
+- if (ws) while (n && wn) {
+- l = wcrtomb(s, *ws, 0);
+- if ((l+1)<=1) {
+- if (!l) ws = 0;
+- else cnt = l;
++ if (!*ws) {
++ ws = 0;
+ break;
+ }
+- ws++; wn--;
+- /* safe - this loop runs fewer than sizeof(buf) times */
+- s+=l; n-=l;
++ ws++;
++ wn--;
+ cnt += l;
+ }
+ if (dst) *wcs = ws;
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 6a0ac60b03c..a08ef9e0d89 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=4
+revision=5
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
From 32f9f1f9242cfdb3ed3224b5618e87ed4167e418 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 20 Nov 2020 00:59:15 +0100
Subject: [PATCH 009/357] musl-bootstrap: rebuild with patches including
CVE-2020-28928
---
srcpkgs/musl-bootstrap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 67cc82e1474..6f0e1b1ef68 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -1,7 +1,7 @@
# Template file for 'musl-bootstrap'.
pkgname=musl-bootstrap
version=1.1.24
-revision=1
+revision=2
lib32disabled=yes
wrksrc="musl-${version}"
build_style=configure
From 7fa2bf8e9c1fc4525700adc09328669bfb09882c Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 19 Nov 2020 08:06:02 -0500
Subject: [PATCH 010/357] chromium: update to 87.0.4280.66.
[ci skip]
- Built for x86_64, x86_64-musl, i686.
- Tested on x86_64.
---
.../files/musl-patches/no-mallinfo.patch | 10 +-
.../patches/chromium-86-nearby-include.patch | 24 ---
.../chromium-87-CursorFactory-include.patch | 36 +++++
...-87-ServiceWorkerContainerHost-crash.patch | 22 +++
.../chromium-87-openscreen-include.patch | 25 ++++
...remove-unsupported-compiler-warnings.patch | 22 +--
...le-accelerated-video-decode-on-Linux.patch | 43 ------
...-end-iterator-usage-in-CookieMonster.patch | 78 ----------
...k-to-the-i965-driver-if-we-re-on-iHD.patch | 139 ------------------
...move-dead-reloc-in-nonalloc-LD-flags.patch | 37 -----
...roto-fix-underflow-in-Fp1616ToDouble.patch | 37 -----
.../chromium/patches/xxx-ppc64le-libvpx.patch | 9 --
.../patches/xxx-ppc64le-support.patch | 26 ++--
srcpkgs/chromium/template | 4 +-
14 files changed, 104 insertions(+), 408 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/chromium-86-nearby-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
create mode 100644 srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 61d5d7a77ca..254a1f632da 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -9,14 +9,14 @@
struct mallinfo info = mallinfo();
DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
---- base/process/process_metrics_posix.cc.orig 2019-10-24 11:10:48.553159245 -0400
-+++ base/process/process_metrics_posix.cc 2019-10-24 11:14:29.025025854 -0400
-@@ -110,14 +110,14 @@
+--- base/process/process_metrics_posix.cc.orig 2020-11-18 23:50:33.958223497 -0500
++++ base/process/process_metrics_posix.cc 2020-11-18 23:53:52.024589316 -0500
+@@ -119,14 +119,14 @@
malloc_statistics_t stats = {0};
malloc_zone_statistics(nullptr, &stats);
return stats.size_in_use;
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(__GLIBC__) || defined(OS_ANDROID)
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
struct mallinfo minfo = mallinfo();
#if BUILDFLAG(USE_TCMALLOC)
return minfo.uordblks;
diff --git a/srcpkgs/chromium/patches/chromium-86-nearby-include.patch b/srcpkgs/chromium/patches/chromium-86-nearby-include.patch
deleted file mode 100644
index b200a7ebd96..00000000000
--- a/srcpkgs/chromium/patches/chromium-86-nearby-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a5b2ee9dd7dfb186e26ec6c0c06c2ae1a9d27195 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 18 Jul 2020 14:15:50 +0000
-Subject: [PATCH] IWYU: memcpy is defined in cstring
-
----
- third_party/nearby/src/cpp/platform_v2/base/byte_array.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/nearby/src/cpp/platform_v2/base/byte_array.h b/third_party/nearby/src/cpp/platform_v2/base/byte_array.h
-index ee5d0eb..4b1d79b 100644
---- third_party/nearby/src/cpp/platform_v2/base/byte_array.h
-+++ third_party/nearby/src/cpp/platform_v2/base/byte_array.h
-@@ -17,6 +17,7 @@
-
- #include <array>
- #include <cstdint>
-+#include <cstring>
- #include <string>
- #include <type_traits>
- #include <utility>
---
-2.26.2
-
diff --git a/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch b/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
new file mode 100644
index 00000000000..d345e584830
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
@@ -0,0 +1,36 @@
+From c4f6e8cd34a245c3640b86a91c9694d69594d80b Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 16 Sep 2020 15:05:02 +0000
+Subject: [PATCH] IWYU: ui::CursorFactory is now required independent from
+ Ozone
+
+---
+ .../ui/views/chrome_browser_main_extra_parts_views_linux.cc | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
+index 5a97d61..ccedd2a 100644
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
++++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
+@@ -7,6 +7,7 @@
+ #include "chrome/browser/themes/theme_service_aura_linux.h"
+ #include "chrome/browser/ui/browser_list.h"
+ #include "chrome/browser/ui/views/theme_profile_key.h"
++#include "ui/base/cursor/cursor_factory.h"
+ #include "ui/display/screen.h"
+ #include "ui/views/linux_ui/linux_ui.h"
+
+@@ -15,10 +16,6 @@
+ #include "ui/gtk/gtk_ui_delegate.h"
+ #endif
+
+-#if defined(USE_OZONE)
+-#include "ui/base/cursor/cursor_factory.h"
+-#endif
+-
+ #if defined(USE_X11)
+ #include "ui/gfx/x/connection.h" // nogncheck
+ #if BUILDFLAG(USE_GTK)
+--
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch b/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
new file mode 100644
index 00000000000..286b86691f1
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/750038
+Upstream bug: https://crbug.com/1135070
+
+--- content/browser/service_worker/service_worker_container_host.cc
++++ content/browser/service_worker/service_worker_container_host.cc
+@@ -626,6 +626,16 @@
+ int64_t registration_id) {
+ DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId());
+ DCHECK(base::Contains(registration_object_hosts_, registration_id));
++
++ // ServiceWorkerRegistrationObjectHost to be deleted may have the last reference to
++ // ServiceWorkerRegistration that indirectly owns this ServiceWorkerContainerHost.
++ // If we erase the object host directly from the map, |this| could be deleted
++ // during the map operation and may crash. To avoid the case, we take the
++ // ownership of the object host from the map first, and then erase the entry
++ // from the map. See https://crbug.com/1135070 for details.
++ std::unique_ptr<ServiceWorkerRegistrationObjectHost> to_be_deleted =
++ std::move(registration_object_hosts_[registration_id]);
++ DCHECK(to_be_deleted);
+ registration_object_hosts_.erase(registration_id);
+ }
+
diff --git a/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch b/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
new file mode 100644
index 00000000000..03ae0e9eda7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
@@ -0,0 +1,25 @@
+From 0c0af4cabb7490db473cd2c28f069956974a4d98 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 2 Oct 2020 12:11:58 +0000
+Subject: [PATCH] IWYU: uint8_t is defined in stdint.h
+
+---
+ third_party/openscreen/src/util/crypto/random_bytes.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/openscreen/src/util/crypto/random_bytes.h b/third_party/openscreen/src/util/crypto/random_bytes.h
+index 3cb2fa8..025b52c 100644
+--- third_party/openscreen/src/util/crypto/random_bytes.h
++++ third_party/openscreen/src/util/crypto/random_bytes.h
+@@ -7,6 +7,8 @@
+
+ #include <array>
+
++#include <stdint.h>
++
+ namespace openscreen {
+
+ std::array<uint8_t, 16> GenerateRandomBytes16();
+--
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
index 86a6e2d8fd7..4286b16b13f 100644
--- a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
+++ b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
@@ -1,28 +1,12 @@
---- build/config/compiler/BUILD.gn.orig 2020-10-09 11:20:12.892910174 -0400
-+++ build/config/compiler/BUILD.gn 2020-10-09 11:59:20.403349122 -0400
-@@ -1518,12 +1518,6 @@
- # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
- # recognize.
- cflags += [
-- # An ABI compat warning we don't care about, https://crbug.com/1102157
-- # TODO(thakis): Push this to the (few) targets that need it,
-- # instead of having a global flag.
-- "-Wno-psabi",
--
-- # Ignore warnings about MSVC optimization pragmas.
- # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
- "-Wno-ignored-pragma-optimize",
-
-@@ -1538,25 +1532,12 @@
+--- build/config/compiler/BUILD.gn.orig 2020-11-17 13:39:13.000000000 -0500
++++ build/config/compiler/BUILD.gn 2020-11-18 20:54:58.313154596 -0500
+@@ -1536,22 +1530,12 @@
# TODO(https://crbug.com/1028110): Evaluate and possible enable.
"-Wno-deprecated-copy",
-
- # TODO(https://crbug.com/1050281): Clean up, enable.
- "-Wno-non-c-typedef-for-linkage",
--
-- # TODO(https://crbug.com/1114873): Clean up, enable.
-- "-Wno-string-concatenation",
]
cflags_c += [
diff --git a/srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch b/srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch
deleted file mode 100644
index e7d05e84b04..00000000000
--- a/srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 54deb9811ca9bd2327def5c05ba6987b8c7a0897 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Tue, 29 Sep 2020 01:02:22 +0000
-Subject: [PATCH] Check for enable-accelerated-video-decode on Linux
-
-Video decoding was being accelerated on Linux even though the newly
-added "enable-accelerated-video-decode" flag was not specified. The
-chrome://gpu page was misleadingly showing this feature as disabled:
-
- > Video Decode: Software only. Hardware acceleration disabled
-
-This change adds a check for --enable-accelerated-video-decode when
-considering if video decoding should be activated. (Only on Linux.)
-
-Extra context: https://crbug.com/1097029#c18 (and also comment 20).
-
-Bug: 1066176, 1097029
-Change-Id: I534115f5f6ceed0ee3511fcf5c2d0f1dd04b9b7e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431434
-Reviewed-by: John Abd-El-Malek <jam@chromium.org>
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#811480}
----
- content/renderer/render_thread_impl.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index f13c94ddab7..0352f127171 100644
---- content/renderer/render_thread_impl.cc
-+++ content/renderer/render_thread_impl.cc
-@@ -1121,7 +1121,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl::GetGpuFactories() {
- kGpuStreamPriorityMedia);
-
- const bool enable_video_accelerator =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ cmd_line->HasSwitch(switches::kEnableAcceleratedVideoDecode) &&
-+#else
- !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-+#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
- (gpu_channel_host->gpu_feature_info()
- .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
- gpu::kGpuFeatureStatusEnabled);
diff --git a/srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch b/srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch
deleted file mode 100644
index 7494dc9b7c3..00000000000
--- a/srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 53478caee862624fc6d73516f8d64253854b146f Mon Sep 17 00:00:00 2001
-From: Piotr Tworek <ptworek@vewd.com>
-Date: Mon, 31 Aug 2020 21:03:58 +0000
-Subject: [PATCH] Fix invalid "end" iterator usage in CookieMonster.
-
-Commit 229623d76e8baf714c8569c9f4efc5de266cef8b has introduced the following
-code in cookie_monster.cc.
-
-// If this is the first cookie in |cookies_| with this key, increment the
-// |num_keys_| counter.
-bool different_prev =
- inserted == cookies_.begin() || std::prev(inserted)->first != key;
-bool different_next =
- inserted == cookies_.end() || std::next(inserted)->first != key;
-if (different_prev && different_next)
- ++num_keys_;
-
-The "inserted" iterator is something that has been returned from
-std::multimap::insert. At first glance it looks reasonable. The code
-tries to determine if there are already similar elements with the same
-key in the map. Unfortunately the expression calculating the value of
-different_next can potentially use the end iterator to the map. The
-"inserted == cookies_.end()" part of the expression will always evaluate
-to false since the newly inserted element has to be in the map and
-cookies_.end() points to the first element outside the map. If the
-inserted happens to be the last element in the map the second part of
-the expression will grab the end iterator by calling std::next(inserted)
-and then will try to use it leading to invalid memory access.
-
-Given the fact that cookies_ is a std::multimap we should not even need
-to calculate the value of different_next. It should always be true.
-
- "If the container has elements with equivalent key, inserts at the
- upper bound of that range.(since C++11)"
-
-See: https://en.cppreference.com/w/cpp/container/multimap/insert
-
-Bug: 1120240
-Change-Id: I8928c294ac4daf72349a2331b31b017c1d015da0
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368872
-Reviewed-by: Maksim Orlovich <morlovich@chromium.org>
-Commit-Queue: Piotr Tworek <ptworek@vewd.com>
-Cr-Commit-Position: refs/heads/master@{#803260}
----
- net/cookies/cookie_monster.cc | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
-index 265deed0e52..140b61a81dc 100644
---- net/cookies/cookie_monster.cc
-+++ net/cookies/cookie_monster.cc
-@@ -1151,9 +1151,14 @@ CookieMonster::CookieMap::iterator CookieMonster::InternalInsertCookie(
- // |num_keys_| counter.
- bool different_prev =
- inserted == cookies_.begin() || std::prev(inserted)->first != key;
-- bool different_next =
-- inserted == cookies_.end() || std::next(inserted)->first != key;
-- if (different_prev && different_next)
-+ // According to std::multiqueue documentation:
-+ // "If the container has elements with equivalent key, inserts at the upper
-+ // bound of that range. (since C++11)"
-+ // This means that "inserted" iterator either points to the last element in
-+ // the map, or the element succeeding it has to have different key.
-+ DCHECK(std::next(inserted) == cookies_.end() ||
-+ std::next(inserted)->first != key);
-+ if (different_prev)
- ++num_keys_;
-
- return inserted;
-@@ -1381,7 +1386,7 @@ void CookieMonster::InternalDeleteCookie(CookieMap::iterator it,
- bool different_prev =
- it == cookies_.begin() || std::prev(it)->first != it->first;
- bool different_next =
-- it == cookies_.end() || std::next(it)->first != it->first;
-+ std::next(it) == cookies_.end() || std::next(it)->first != it->first;
- if (different_prev && different_next)
- --num_keys_;
-
diff --git a/srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch b/srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
deleted file mode 100644
index 5c517e4a8eb..00000000000
--- a/srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From fbd756ab55f9351165f923b0411c31dd71319c78 Mon Sep 17 00:00:00 2001
-From: Ted Meyer <tmathmeyer@chromium.org>
-Date: Wed, 16 Sep 2020 17:42:03 +0000
-Subject: [PATCH] Only fall back to the i965 driver if we're on iHD
-
-I got my hands on an old AMD laptop, and the gallium driver worked very
-well and was saving power even at 720p, so there's no reason to block
-that for now.
-
-Bug: 1116703
-Change-Id: Ib15bc2b93f33e99adad7569dd825e167b503a0ea
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2409967
-Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
-Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#807550}
----
- media/gpu/vaapi/vaapi_wrapper.cc | 73 ++++++++++++++++++++------------
- 1 file changed, 47 insertions(+), 26 deletions(-)
-
-diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
-index 2ad0b997e56..e30d1dfb73b 100644
---- media/gpu/vaapi/vaapi_wrapper.cc
-+++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -409,6 +409,8 @@ class VADisplayState {
-
- // Implementation of Initialize() called only once.
- bool InitializeOnce() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
-+ bool InitializeVaDisplay_Locked() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
-+ bool InitializeVaDriver_Locked() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
-
- int refcount_ GUARDED_BY(va_lock_);
-
-@@ -472,11 +474,7 @@ bool VADisplayState::Initialize() {
- return success;
- }
-
--bool VADisplayState::InitializeOnce() {
-- static_assert(
-- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
-- "Requires VA-API >= 1.1.0");
--
-+bool VADisplayState::InitializeVaDisplay_Locked() {
- switch (gl::GetGLImplementation()) {
- case gl::kGLImplementationEGLGLES2:
- va_display_ = vaGetDisplayDRM(drm_fd_.get());
-@@ -519,25 +517,10 @@ bool VADisplayState::InitializeOnce() {
- return false;
- }
-
-- // Set VA logging level and driver name, unless already set.
-- constexpr char libva_log_level_env[] = "LIBVA_MESSAGING_LEVEL";
-- std::unique_ptr<base::Environment> env(base::Environment::Create());
-- if (!env->HasVar(libva_log_level_env))
-- env->SetVar(libva_log_level_env, "1");
--
--#if defined(USE_X11)
-- if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE) {
-- DCHECK(!features::IsUsingOzonePlatform());
-- constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
-- // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
-- // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
-- // is discussion of the issue here:
-- // https://github.com/intel/media-driver/issues/818
-- if (!env->HasVar(libva_driver_impl_env))
-- env->SetVar(libva_driver_impl_env, "i965");
-- }
--#endif // USE_X11
-+ return true;
-+}
-
-+bool VADisplayState::InitializeVaDriver_Locked() {
- // The VAAPI version.
- int major_version, minor_version;
- VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
-@@ -545,9 +528,6 @@ bool VADisplayState::InitializeOnce() {
- LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
- return false;
- }
--
-- va_initialized_ = true;
--
- const std::string va_vendor_string = vaQueryVendorString(va_display_);
- DLOG_IF(WARNING, va_vendor_string.empty())
- << "Vendor string empty or error reading.";
-@@ -555,6 +535,8 @@ bool VADisplayState::InitializeOnce() {
- << va_vendor_string;
- implementation_type_ = VendorStringToImplementationType(va_vendor_string);
-
-+ va_initialized_ = true;
-+
- // The VAAPI version is determined from what is loaded on the system by
- // calling vaInitialize(). Since the libva is now ABI-compatible, relax the
- // version check which helps in upgrading the libva, without breaking any
-@@ -571,6 +553,45 @@ bool VADisplayState::InitializeOnce() {
- return true;
- }
-
-+bool VADisplayState::InitializeOnce() {
-+ static_assert(
-+ VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
-+ "Requires VA-API >= 1.1.0");
-+
-+ // Set VA logging level, unless already set.
-+ constexpr char libva_log_level_env[] = "LIBVA_MESSAGING_LEVEL";
-+ std::unique_ptr<base::Environment> env(base::Environment::Create());
-+ if (!env->HasVar(libva_log_level_env))
-+ env->SetVar(libva_log_level_env, "1");
-+
-+ if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
-+ return false;
-+
-+#if defined(USE_X11)
-+ if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE &&
-+ implementation_type_ == VAImplementation::kIntelIHD) {
-+ DCHECK(!features::IsUsingOzonePlatform());
-+ constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
-+ // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
-+ // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
-+ // is discussion of the issue here:
-+ // https://github.com/intel/media-driver/issues/818
-+ if (!env->HasVar(libva_driver_impl_env))
-+ env->SetVar(libva_driver_impl_env, "i965");
-+
-+ // Re-initialize with the new driver.
-+ va_display_ = nullptr;
-+ va_initialized_ = false;
-+ implementation_type_ = VAImplementation::kInvalid;
-+
-+ if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
-+ return false;
-+ }
-+#endif // USE_X11
-+
-+ return true;
-+}
-+
- VAStatus VADisplayState::Deinitialize() {
- base::AutoLock auto_lock(va_lock_);
- VAStatus va_res = VA_STATUS_SUCCESS;
diff --git a/srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch b/srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch
deleted file mode 100644
index 4ad4f6e23bb..00000000000
--- a/srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 74b0cb5b86f7d7f8f7c1172d85b09096bef147b7 Mon Sep 17 00:00:00 2001
-From: Daniel Nicoara <dnicoara@chromium.org>
-Date: Thu, 24 Sep 2020 02:34:24 +0000
-Subject: [PATCH] Remove dead-reloc-in-nonalloc LD flags
-
-Breakpad change landed. Revert workaround.
-
-Bug: 1105559
-Test: components/crash/content/tools/generate_breakpad_symbols.py --build-dir=out/andrd --binary=out/andrd/lib.unstripped/libcontent_shell_content_view.so --symbols-dir=/tmp/foo --platform=android
-Change-Id: I519534002898a97b15a57b9b87ac78ef3f216dee
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427349
-Commit-Queue: Nico Weber <thakis@chromium.org>
-Reviewed-by: Nico Weber <thakis@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#810066}
----
- build/config/compiler/BUILD.gn | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index aa9eca20bd2..42839cfba3f 100644
---- build/config/compiler/BUILD.gn
-+++ build/config/compiler/BUILD.gn
-@@ -396,14 +396,6 @@ config("compiler") {
- "-Wl,--as-needed",
- ]
- }
-- if (use_lld && !is_chromeos_device) {
-- # TODO(thakis): Fix dump_syms to not need this and then remove it,
-- # https://crbug.com/1105559
-- ldflags += [
-- "-Wl,-z,dead-reloc-in-nonalloc=*=0",
-- "-Wl,-z,dead-reloc-in-nonalloc=.debug_ranges=1",
-- ]
-- }
- }
-
- # Linux-specific compiler flags setup.
diff --git a/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch b/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch
deleted file mode 100644
index 00300a4a919..00000000000
--- a/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5ade494a9966c7a9675af86dc42aca62fb4d806d Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Wed, 21 Oct 2020 22:02:35 +0000
-Subject: [PATCH] [XProto] Fix underflow in Fp1616ToDouble
-
-x11::Input::Fp1616 should be treated as a signed integer, otherwise
--1 will underflow to 65535. When dragging a scrollbar, this would
-cause the scrollbar to snap to the bottom when the cursor is dragged
-above the window's y=0 coordinate. Verified that the issue is fixed
-after this CL.
-
-BUG=1139623,1136352
-R=sky
-
-Change-Id: Ie318006ceadde9b9ce3e267fb453ddeba0e81da0
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485620
-Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Scott Violet <sky@chromium.org>
-Reviewed-by: Scott Violet <sky@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#819538}
----
- ui/events/x/events_x_utils.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ui/events/x/events_x_utils.cc b/ui/events/x/events_x_utils.cc
-index 3010db5f40c..856dfb221e7 100644
---- ui/events/x/events_x_utils.cc
-+++ ui/events/x/events_x_utils.cc
-@@ -376,7 +376,7 @@ base::TimeTicks TimeTicksFromXEvent(const x11::Event& xev) {
-
- // This is ported from libxi's FP1616toDBL in XExtInt.c
- double Fp1616ToDouble(x11::Input::Fp1616 x) {
-- auto x32 = static_cast<uint32_t>(x);
-+ auto x32 = static_cast<int32_t>(x);
- return x32 * 1.0 / (1 << 16);
- }
-
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
index b6a43980c04..792befb3a39 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
@@ -26,15 +26,6 @@ index 7198e59..3300485 100644
}
configs -= [ "//build/config/compiler:chromium_code" ]
-@@ -401,6 +403,8 @@ static_library("libvp9rc") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_ppc64
- }
- sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.cc" ]
- sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.h" ]
diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh
index bcf84b0..8a3f4f1 100755
--- third_party/libvpx/generate_gni.sh
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 1f5fca76ea3..b64640e0d1f 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3248,9 +3248,9 @@ index 9fc5db28..5f69f8dc 100644
diff --git third_party/crashpad/crashpad/util/posix/signals_test.cc third_party/crashpad/crashpad/util/posix/signals_test.cc
index 58bfa8f8..8fc37c46 100644
---- third_party/crashpad/crashpad/util/posix/signals_test.cc
-+++ third_party/crashpad/crashpad/util/posix/signals_test.cc
-@@ -46,12 +46,12 @@ bool CanCauseSignal(int sig) {
+--- third_party/crashpad/crashpad/util/posix/signals_test.cc.orig 2020-11-17 13:39:47.000000000 -0500
++++ third_party/crashpad/crashpad/util/posix/signals_test.cc 2020-11-18 21:06:33.433408623 -0500
+@@ -46,9 +46,9 @@
return sig == SIGABRT ||
sig == SIGALRM ||
sig == SIGBUS ||
@@ -3261,12 +3261,8 @@ index 58bfa8f8..8fc37c46 100644
+#endif // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
sig == SIGILL ||
--#endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL
-+#endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
- sig == SIGPIPE ||
- sig == SIGSEGV ||
- #if defined(OS_MACOSX)
-@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+ #endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@
break;
}
@@ -3279,7 +3275,7 @@ index 58bfa8f8..8fc37c46 100644
case SIGFPE: {
// Optimization makes this tricky, so get zero from a system call likely
// to succeed, and try to do something with the result.
-@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+@@ -137,7 +139,7 @@
fstat(quotient, &stat_buf);
break;
}
@@ -3544,9 +3540,9 @@ index 122e26ad..ec21dcb5 100644
defined(__ARMEB__) || defined(__AARCH64EB__)
diff --git third_party/webrtc/modules/desktop_capture/differ_block.cc third_party/webrtc/modules/desktop_capture/differ_block.cc
index dd9ab457..c005d959 100644
---- third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
+--- third_party/webrtc/modules/desktop_capture/differ_block.cc.orig 2020-11-17 13:42:02.000000000 -0500
++++ third_party/webrtc/modules/desktop_capture/differ_block.cc 2020-11-18 21:11:03.039905360 -0500
+@@ -30,11 +30,7 @@
static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
if (!diff_proc) {
@@ -3556,10 +3552,10 @@ index dd9ab457..c005d959 100644
- diff_proc = &VectorDifference_C;
-#else
+#if defined(WEBRTC_ARCH_X86_FAMILY)
- bool have_sse2 = WebRtc_GetCPUInfo(kSSE2) != 0;
+ bool have_sse2 = GetCPUInfo(kSSE2) != 0;
// For x86 processors, check if SSE2 is supported.
if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
+@@ -44,6 +40,10 @@
} else {
diff_proc = &VectorDifference_C;
}
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index e9db11e215c..b31a09ed1f6 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See http://www.chromium.org/developers/calendar for the latest version
-version=86.0.4240.193
+version=87.0.4280.66
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=203dd5097f5873cb4881e2e838034f0dac5ff13e7fafa286baf87937f8eca534
+checksum=29a8e4ea82edec2fdcf34ece68323bec7ab90f3d5669e6b77f58cff9c278f741
nocross=yes
lib32disabled=yes
From ef8fad206195ae8aa7b759863849778799d9f4ec Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 19 Nov 2020 12:51:05 -0500
Subject: [PATCH 011/357] chromium-widevine: update to 87.0.4280.66.
---
srcpkgs/chromium-widevine/INSTALL | 2 +-
srcpkgs/chromium-widevine/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chromium-widevine/INSTALL b/srcpkgs/chromium-widevine/INSTALL
index aff7dc79c3c..a8de96756c4 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
# INSTALL
-checksum=fc4a4717ddf9623eeb2ebd4cf0f3a845a20fab34bb2831af2a264507b6432ef4
+checksum=e7e4c6a2108140c572562867f522d0311a25ce03ea36c5452cb8431865871226
_baseUrl="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable"
_filename="google-chrome-stable_${VERSION%_*}-1_amd64.deb"
DISTFILE="${_baseUrl}/${_filename}"
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index 03908e02ca5..66626f83af3 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
_channel="stable"
pkgname=chromium-widevine
-version=86.0.4240.193
+version=87.0.4280.66
revision=1
archs="x86_64"
create_wrksrc=yes
From 0e3d8c0e62c622d9898a4fa008de75fddbcc7e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 19 Nov 2020 23:43:25 -0300
Subject: [PATCH 012/357] elfutils: fix vmove for libdebuginfod.
Applications linked against libdebuginfod will be linked against its
soname, which is a symlink that was ending up in the libelf subpackage.
---
srcpkgs/elfutils/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index a2a10ab6e63..3dfea2970a5 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,7 +1,7 @@
# Template file for 'elfutils'
pkgname=elfutils
version=0.182
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--program-prefix=eu-"
hostmakedepends="automake libtool pkg-config"
@@ -14,6 +14,8 @@ license="GPL-3.0-or-later"
homepage="https://sourceware.org/elfutils/"
distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
checksum=ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858
+# subpackages require explicit ordering
+subpackages="debuginfod libdebuginfod libelf elfutils-devel"
CFLAGS="-Wno-error"
CXXFLAGS="-Wl,-z,stack-size=2097152"
@@ -38,7 +40,7 @@ pre_configure() {
libdebuginfod_package() {
short_desc+=" - debuginfod library"
pkg_install() {
- vmove "usr/lib/libdebuginfod-*.so*"
+ vmove "usr/lib/libdebuginfod*.so*"
vmove etc/profile.d
}
}
From 222ac12f8b64e013c8cfd0b6a895fba4c072944d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Nov 2020 15:41:15 +0100
Subject: [PATCH 013/357] tcsh: update to 6.22.03.
---
srcpkgs/tcsh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index 2979c859232..ba88789c632 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,6 +1,6 @@
# Template file for 'tcsh'
pkgname=tcsh
-version=6.22.02
+version=6.22.03
revision=1
build_style=gnu-configure
conf_files="/etc/csh.login /etc/csh.cshrc"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://www.tcsh.org/"
distfiles="http://ftp.astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b
+checksum=be2cfd653d2a0c7f506d2dd14c12324ba749bd484037be6df44a3973f52262b7
register_shell="/bin/tcsh /bin/csh"
CFLAGS="-fcommon"
From 36ea0175b78be345d4e52cffd042be8b11481f71 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Nov 2020 16:08:26 +0100
Subject: [PATCH 014/357] erlang: update to 23.1.3.
---
srcpkgs/erlang/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2364220ebf4..6fb84cb0a8b 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
# Template file for 'erlang'
pkgname=erlang
-version=23.1.2
+version=23.1.3
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=afff83ab51830cb7d9ed995d0c98a3947896471cde9af000befd78b390f109be
+checksum=291e0852b71ca593f4015417f6e44c08638633c5af6648bd26582c8590390433
subpackages="erlang-doc"
if [ -z "$CROSS_BUILD" ]; then
From fce72d3d72aed8199c9eae8f70993037e252a954 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 20 Nov 2020 10:56:44 +0100
Subject: [PATCH 015/357] perl-Search-Xapian: update to 1.2.25.4.
---
srcpkgs/perl-Search-Xapian/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Search-Xapian/template b/srcpkgs/perl-Search-Xapian/template
index fd7bcb15ace..6e7a8db4a20 100644
--- a/srcpkgs/perl-Search-Xapian/template
+++ b/srcpkgs/perl-Search-Xapian/template
@@ -1,7 +1,7 @@
# Template build file for 'perl-Search-Xapian'
pkgname=perl-Search-Xapian
-version=1.2.25.2
-revision=3
+version=1.2.25.4
+revision=1
wrksrc="Search-Xapian-$version"
build_style=perl-module
hostmakedepends="perl"
@@ -12,6 +12,6 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
homepage="https://metacpan.org/release/Search-Xapian"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
distfiles="${CPAN_SITE}/Search/Search-Xapian-${version}.tar.gz"
-checksum=24955a284279fdbc5a324a5b73b09585ae506932be19a7105e114834e243ea42
+checksum=871943199b80efd98e31f4b4711bb070a576c91be692193d8a43affad64574dd
make_build_args='CC=$(CXX)' # ugh
From 998dbc6ab2157520cb673806b35d6c55b7c576fd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 20 Nov 2020 11:00:55 +0100
Subject: [PATCH 016/357] crash: update to 7.2.9.
---
srcpkgs/crash/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index d1961f950f4..2326da52c3e 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,7 +1,7 @@
# Template file for 'crash'
pkgname=crash
-version=7.2.8
-revision=2
+version=7.2.9
+revision=1
archs="i686 x86_64" # broken on musl
build_style=gnu-makefile
hostmakedepends="flex tar wget"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://crash-utility.github.io/"
changelog="https://crash-utility.github.io/crash.changelog.html"
distfiles="https://github.com/crash-utility/crash/archive/${version}.tar.gz"
-checksum=996d3367764c77e23921c164725e4d0221acc7a15a92a3f825053ea37f2452dc
+checksum=6c07634f7357906dcb21ff3decd1760d7b0b1a11c01472cd17aba2e67f3ce16e
nocross=yes
LDFLAGS=-llzo2
From 32d1c2848a193bca5de9fca212efbf22ecb3ca06 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 20 Nov 2020 11:04:51 +0100
Subject: [PATCH 017/357] ipset: update to 7.9.
---
common/shlibs | 2 +-
srcpkgs/ipset/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9a576f18d0f..70a762811dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3645,7 +3645,7 @@ libgaminggearwidget.so.0 libgaminggear-0.15.1_1
libopkg.so.1 libopkg-0.4.0_1
libkodiplatform.so.18.0 kodi-platform-17.1.0_1
libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
-libipset.so.12 libipset-7.7_1
+libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
libliquid.so.1 liquid-dsp-1.3.1_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 6a47b78c6cc..3b892b478f0 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
# Template file for 'ipset'
pkgname=ipset
-version=7.7
+version=7.9
revision=1
build_style=gnu-configure
configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="http://ipset.netfilter.org/"
distfiles="${homepage}${pkgname}-${version}.tar.bz2"
-checksum=45a50d581ba4d6688081e2b0328245914ba9807f8ec682c1aa619040d1316c32
+checksum=b75c13689eddf1d95b396840a69dc04fd7ae4112b10b70594bc0405df7b9b30a
libipset_package() {
short_desc+=" - library files"
From 04f041907b165418a82087a24760e75fe123f5d3 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 20 Nov 2020 07:37:31 +0100
Subject: [PATCH 018/357] kotlin-bin: update to 1.4.20.
---
srcpkgs/kotlin-bin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kotlin-bin/template b/srcpkgs/kotlin-bin/template
index 40760715daf..5492c2eb096 100644
--- a/srcpkgs/kotlin-bin/template
+++ b/srcpkgs/kotlin-bin/template
@@ -1,6 +1,6 @@
# Template file for 'kotlin-bin'
pkgname=kotlin-bin
-version=1.4.10
+version=1.4.20
revision=1
archs="x86_64"
wrksrc=kotlinc
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="Apache-2.0"
homepage="https://kotlinlang.org/"
distfiles="https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"
-checksum=bb1a21d70e521a01ae104e99a082a6e7bb58699b86347049da521d175d0dace7
+checksum=11db93a4d6789e3406c7f60b9f267eba26d6483dcd771eff9f85bb7e9837011f
nostrip=yes
replaces="kotlin>=0"
From 470b8b546c2c80d852311e48f7f7699b9bb1e9ae Mon Sep 17 00:00:00 2001
From: xXR01I1Xx <xxr01i1xx@tuta.io>
Date: Mon, 8 Jun 2020 18:34:18 +0200
Subject: [PATCH 019/357] New package: emptty-0.3.0
---
srcpkgs/emptty/template | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/emptty/template
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
new file mode 100644
index 00000000000..c68a5c53eb1
--- /dev/null
+++ b/srcpkgs/emptty/template
@@ -0,0 +1,23 @@
+# Template file for 'emptty'
+pkgname=emptty
+version=0.3.0
+revision=1
+build_style=go
+go_import_path=github.com/tvrzna/emptty
+makedepends="pam-devel libX11-devel"
+short_desc="Dead simple Display Manager running in CLI as TTY login"
+maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
+license="MIT"
+homepage="https://github.com/tvrzna/emptty"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=fa8a6336e150f0f74813ccf71817228deed9e06f1c8362e41634def959ff6c2b
+conf_files="/etc/emptty/conf /etc/pam.d/emptty"
+
+post_install() {
+ vinstall res/pam 644 etc/pam.d emptty
+ vinstall res/runit-run 755 etc/sv/emptty run
+ vinstall res/conf 644 etc/emptty
+ vman res/emptty.1
+ vlicense LICENSE
+ ln -s /run/runit/supervise.emptty ${DESTDIR}/etc/sv/emptty/supervise
+}
From c334ab92ac6106a224f2e9816ed34fa803d7e542 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 20 Nov 2020 07:38:39 +0100
Subject: [PATCH 020/357] git-secret: update to 0.3.3.
---
srcpkgs/git-secret/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/git-secret/template b/srcpkgs/git-secret/template
index 01541c9b061..4dcb69ebf6a 100644
--- a/srcpkgs/git-secret/template
+++ b/srcpkgs/git-secret/template
@@ -1,8 +1,7 @@
# Template file for 'git-secret'
pkgname=git-secret
-version=0.3.2
+version=0.3.3
revision=1
-archs=noarch
build_style=gnu-makefile
make_install_args="PREFIX=/usr"
depends="bash gawk gnupg coreutils"
@@ -11,7 +10,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="MIT"
homepage="http://git-secret.io/"
distfiles="https://github.com/sobolevn/git-secret/archive/v${version}.tar.gz"
-checksum=07b32b096e5ff5b4818096b1858c1f69df4684bb0f256e620514cf88f44ded85
+checksum=d8c19a5cbd174e95484a4233605985dd3b060a8a83d14d41c3bad1d534c6ab39
do_install() {
vbin git-secret
From a529644d002fd6637b5776eaa3d0039cafecf864 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, 20 Nov 2020 23:59:17 +0700
Subject: [PATCH 021/357] imapfilter: fix build
---
srcpkgs/imapfilter/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 850327bba1d..77e36d4d1e5 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -3,7 +3,7 @@ pkgname=imapfilter
version=2.6.12
revision=5
build_style=gnu-makefile
-make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr"
+make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
hostmakedepends="lua53-devel"
makedepends="pcre-devel lua53-devel libressl-devel"
short_desc="Mail filtering utility"
@@ -13,6 +13,8 @@ homepage="https://github.com/lefcha/imapfilter"
distfiles="https://github.com/lefcha/imapfilter/archive/v${version}.tar.gz"
checksum=764a68c737e555d7b164644a4c491fd66cffb93d6077d58f502b94e1a022a884
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/lua5.3"
+
post_configure() {
sed -i \
-e '/^MANDIR/s:/man:/share/man:' \
From 89095c1e44ee6ed095c2e101474ecd28d097a7e3 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Nov 2020 12:46:01 -0500
Subject: [PATCH 022/357] neomutt: update to 20201120.
---
srcpkgs/neomutt/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 25c57cea6cc..786c88fab1d 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
# Template file for 'neomutt'
pkgname=neomutt
-version=20200925
+version=20201120
revision=1
wrksrc="neomutt-${version}"
create_wrksrc=true
@@ -23,7 +23,7 @@ homepage="https://neomutt.org/"
_test_files_hash=8629adab700a75c54e8e28bf05ad092503a98f75
distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="dcec98ea2454d7695ff92184c33a0051c2b3c46320f81f7889c4580c943140dd
+checksum="48191d4f17cb1e5fd094ca92c581e1bb9599f058c122cc0e35df4e1c0cb53f47
a53d6447cf4e8f60bd9a3caf68a1cfe1bfda878b5bcb8c60b965b5214de73ff9"
python_version=3
@@ -41,7 +41,7 @@ esac
post_install() {
# move dist to examples dir
- vsconf contrib/gpg.rc Muttrc.gpg.dist
+ vsconf contrib/samples/gpg.rc Muttrc.gpg.dist
}
pre_check() {
From e4a4874470816e075b4018b05f4fb00576c2e9ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 20 Nov 2020 14:34:15 -0500
Subject: [PATCH 023/357] python3-pyopencl: update to 2020.3.1.
---
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 43a5a3b8426..49ef0a074a7 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pyopencl'
pkgname=python3-pyopencl
-version=2020.3
+version=2020.3.1
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=4aa3031c17fc99aa2f3018ef2c9e1d535c3cfdc7a01bb987b1ea3826ef42bd59
+checksum=abc689307cf34d3dcc94d43815f64e2265469b50ecce6c903a3180589666fb36
do_configure() {
./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \
From 93d1df37f47783c87a7ce9e62967d326c93dac48 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Tue, 17 Nov 2020 08:58:33 -0700
Subject: [PATCH 024/357] youtube-dl: update to 2020.11.19
---
srcpkgs/youtube-dl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 54187e923c8..8f2945c9934 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
# Template file for 'youtube-dl'
pkgname=youtube-dl
-version=2020.11.12
+version=2020.11.19
revision=1
wrksrc="${pkgname}"
build_style=python3-module
@@ -11,9 +11,9 @@ short_desc="CLI program to download videos from YouTube and other sites"
maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
license="Unlicense"
homepage="https://yt-dl.org"
-changelog="https://gitlab.com/dstftw/youtube-dl/-/raw/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
distfiles="${homepage}/downloads/latest/${pkgname}-${version}.tar.gz"
-checksum=aeb00b2079c4711de7eea2a91f6923ebade84c5e985b0caeb47d572395d42831
+checksum=f8c14d9eb2fd8fe7242de8b96f2c918810867c518a162405644f483dcd14be9e
do_check() {
PYTHON=/usr/bin/python3 make offlinetest
From 0a0a26374948a54ea4ed9fd21cf8ae433be72e69 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 20 Nov 2020 21:54:08 +0100
Subject: [PATCH 025/357] libostree: update to 2020.8.
---
srcpkgs/libostree/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index df9fd6e8bba..abad94721be 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,14 +1,17 @@
# Template file for 'libostree'
pkgname=libostree
-version=2020.3
-revision=2
+version=2020.8
+revision=1
build_style=gnu-configure
build_helper="gir"
-configure_args="--with-builtin-grub2-mkconfig --with-openssl
+configure_args="
+ --with-builtin-grub2-mkconfig
+ --with-ed25519-libsodium
+ --with-openssl
$(vopt_enable gir introspection)"
hostmakedepends="bison docbook-xsl glib-devel libxslt pkg-config"
makedepends="e2fsprogs-devel fuse-devel glib-devel gpgme-devel libarchive-devel
- libsoup-devel $(vopt_if gir 'gobject-introspection')"
+ libsoup-devel libsodium-devel $(vopt_if gir 'gobject-introspection')"
checkdepends="attr-progs cpio elfutils python3-yaml"
short_desc="Operating system and container binary deployment and upgrades"
maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -16,7 +19,7 @@ license="LGPL-2.0-or-later"
homepage="https://ostree.readthedocs.io/en/latest/"
changelog="https://github.com/ostreedev/ostree/releases"
distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"
-checksum=5877396ea092f5b6701c17bd20280746cad20f55a94c760dbeba0fa115818c05
+checksum=fdaa5992d0a6f62157152355449ac8476c50df6602be398e9ad10438cc1e679b
build_options="gir"
build_options_default="gir"
From d804bd04bd4585eba65d4c5f639ec349dccf45fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 16:24:31 +0100
Subject: [PATCH 026/357] wlroots: update to 0.12.0
---
common/shlibs | 2 +-
srcpkgs/wlroots/template | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 70a762811dd..e7c727838ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3565,7 +3565,7 @@ libcodecore.so.0 libio.elementary.code-3.0_1
libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1
libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1
-libwlroots.so.6 wlroots-0.11.0_1
+libwlroots.so.7 wlroots-0.12.0_1
libbaseencode.so.1 libbaseencode-1.0.9_1
libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index 8968bba8cef..a73b5f21a13 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,13 +1,13 @@
# Template file for 'wlroots'
pkgname=wlroots
-version=0.11.0
-revision=2
+version=0.12.0
+revision=1
build_style=meson
-configure_args="-Dlogind=enabled -Dlogind-provider=elogind
+configure_args="-Dlogind=disabled -Dlibseat=enabled
-Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled
-Dx11-backend=enabled -Dexamples=false"
hostmakedepends="pkg-config wayland-devel"
-_devel_depends="MesaLib-devel elogind-devel eudev-libudev-devel libdrm-devel
+_devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols
xcb-util-errors-devel xcb-util-wm-devel"
makedepends="${_devel_depends}
@@ -18,7 +18,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
license="MIT"
homepage="https://github.com/swaywm/wlroots"
distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz"
-checksum=a7645e77229aab4942748c621be8bdb8b073d94f35f3e032b867246862bf2d01
+checksum=c9e9f4f6d2f526d0b2886daf3ec37e64831773059aa669fb98a88522a1626bdb
post_install() {
vlicense LICENSE
From 0824958a1b7993e9f128ecdfc32aa260d0617e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 18:26:29 +0100
Subject: [PATCH 027/357] cage: disable SUID
---
srcpkgs/cage/INSTALL.msg | 6 ++++++
srcpkgs/cage/template | 10 +++-------
2 files changed, 9 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/cage/INSTALL.msg
diff --git a/srcpkgs/cage/INSTALL.msg b/srcpkgs/cage/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/cage/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index a4085ac8483..960ccfac215 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,12 +1,12 @@
# Template file for 'cage'
pkgname=cage
version=0.1.2.1
-revision=2
+revision=3
build_style=meson
configure_args="$(vopt_bool xwayland xwayland)"
hostmakedepends="pkg-config wayland-devel scdoc"
makedepends="wlroots-devel"
-depends="$(vopt_if xwayland xorg-server-xwayland) $(vopt_if elogind elogind)"
+depends="$(vopt_if xwayland xorg-server-xwayland)"
short_desc="Kiosk compositor for Wayland"
maintainer="Illia Shestakov <ishestakov@airmail.cc>"
license="MIT"
@@ -14,14 +14,10 @@ homepage="https://www.hjdskes.nl/projects/cage/"
distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz"
checksum=38a3e3968f00cc58fe1d9448e972cfac7d1efa30c48699f09032f264101a55ac
-build_options="elogind xwayland"
+build_options="xwayland"
build_options_default="xwayland"
desc_option_xwayland="Enable Xwayland support in cage"
post_install() {
- if [ -z "$build_option_elogind" ]; then
- # must be setuid without logind!
- chmod u+s ${DESTDIR}/usr/bin/cage
- fi
vlicense LICENSE
}
From 2b66fdcc3c42ef618fbc4f5d03752ea590c8900b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 18:31:14 +0100
Subject: [PATCH 028/357] hikari: disable suid
---
srcpkgs/hikari/INSTALL.msg | 6 ++++++
srcpkgs/hikari/template | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/hikari/INSTALL.msg
diff --git a/srcpkgs/hikari/INSTALL.msg b/srcpkgs/hikari/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/hikari/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index b071ccf75bb..0828aa3aade 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,13 +1,13 @@
# Template file for 'hikari'
pkgname=hikari
version=2.2.2
-revision=1
+revision=2
build_style=gnu-makefile
make_cmd=bmake
make_use_env=yes
make_build_args="WITH_POSIX_C_SOURCE=YES WITH_XWAYLAND=YES
WITH_SCREENCOPY=YES WITH_GAMMACONTROL=YES WITH_LAYERSHELL=YES ETC_PREFIX="
-make_install_args="ETC_PREFIX="
+make_install_args="ETC_PREFIX= WITHOUT_SUID=YES"
hostmakedepends="bmake pkg-config wayland-devel"
makedepends="wlroots-devel pango-devel cairo-devel pam-devel glib-devel libucl-devel"
short_desc="Stacking Wayland compositor with tiling features"
From a9035fff540fd120f2948ed5b06873d5e0b0d00f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:01:36 +0100
Subject: [PATCH 029/357] wf-config: update to 0.6.0
---
srcpkgs/wf-config/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index ce7fce82dc1..bc6a2c8b870 100644
--- a/srcpkgs/wf-config/template
+++ b/srcpkgs/wf-config/template
@@ -1,6 +1,6 @@
# Template file for 'wf-config'
pkgname=wf-config
-version=0.5.0
+version=0.6.0
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
license="MIT"
homepage="https://wayfire.org"
distfiles="https://github.com/WayfireWM/wf-config/archive/${version}.tar.gz"
-checksum=bf690477ff0d8928ddeca6a278b9153a39ade1e13fd32cc6d04552db4d65cbf0
+checksum=73af6d803044d4e5907974ece019ae0d1b4020a057f6c27be0594fb70d86653b
post_install() {
vlicense LICENSE
From 1924d3a33f106fa32eddc71b2c673c0a3d12fe97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:38:01 +0100
Subject: [PATCH 030/357] wayfire: update to 0.6.0
---
srcpkgs/wayfire/INSTALL.msg | 9 ++++---
srcpkgs/wayfire/patches/fix_switcher.patch | 30 ++++++++++++++++++++++
srcpkgs/wayfire/template | 23 +++++++++--------
3 files changed, 47 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/wayfire/patches/fix_switcher.patch
diff --git a/srcpkgs/wayfire/INSTALL.msg b/srcpkgs/wayfire/INSTALL.msg
index 164d23c2b3a..05274ffcc3a 100644
--- a/srcpkgs/wayfire/INSTALL.msg
+++ b/srcpkgs/wayfire/INSTALL.msg
@@ -1,5 +1,6 @@
-Before running Wayfire, copy the default configuration file to your user:
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
- cp /usr/share/examples/wayfire/wayfire.ini ~/.config/wayfire.ini
-
-You also probably want to install elogind, then restart your computer
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/wayfire/patches/fix_switcher.patch b/srcpkgs/wayfire/patches/fix_switcher.patch
new file mode 100644
index 00000000000..a09e43d12e6
--- /dev/null
+++ b/srcpkgs/wayfire/patches/fix_switcher.patch
@@ -0,0 +1,30 @@
+--- plugins/single_plugins/switcher.cpp 2020-11-18 15:30:44.970379825 +0100
++++ plugins/single_plugins/switcher.cpp 2020-11-18 15:30:31.068223026 +0100
+@@ -201,7 +201,8 @@ class WayfireSwitcher : public wf::plugi
+ active = true;
+
+ // grabs shouldn't fail if we could successfully activate plugin
+- assert(grab_interface->grab());
++ auto grab = grab_interface->grab();
++ assert(grab);
+
+ focus_next(dir);
+ arrange();
+--- src/view/layer-shell.cpp 2020-11-18 15:30:44.970379825 +0100
++++ src/view/layer-shell.cpp 2020-11-18 15:30:40.404328323 +0100
+@@ -1,5 +1,6 @@
+ #include <algorithm>
+ #include <cstring>
++#include <cstdlib>
+
+ #include "xdg-shell.hpp"
+ #include "wayfire/core.hpp"
+@@ -69,7 +70,7 @@ wf::workspace_manager::anchored_edge anc
+ return wf::workspace_manager::ANCHORED_EDGE_RIGHT;
+ }
+
+- assert(false);
++ abort();
+ }
+
+ struct wf_layer_shell_manager
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index c48069fdb11..22c5494af07 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,23 +1,26 @@
# Template file for 'wayfire'
pkgname=wayfire
-version=0.5.0
+version=0.6.0
revision=2
-_utils_commit=f9b5eba437a04a0d1fb9f00a0fdb88c12b9f6b27
+_utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
+_touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
build_style=meson
hostmakedepends="pkg-config wayland-devel"
makedepends="wf-config-devel wlroots-devel cairo-devel
$(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
-depends="xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="xorg-server-xwayland"
short_desc="3D wayland compositor"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://wayfire.org"
distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz
- https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz"
-checksum="24c1a2c963dac5af762f87cd024bc3dd736ec9a28a6735d357a05e8f6502e8aa
- 5c3e8bfefd74083a2548b6a95a070000cf73591bfe78335413da5c7fb82340cb"
+ https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz
+ https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz"
+checksum="9c2bf92e6aecc9b800b87e4c086ff7a275393f7315501b8c39196baf9d245b33
+ d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1
+ 2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be"
-build_options="elogind image"
+build_options="image"
build_options_default="image"
desc_option_image="Enable JPEG and PNG support"
@@ -27,14 +30,12 @@ fi
post_extract() {
rmdir subprojects/wf-utils
+ rmdir subprojects/wf-touch
mv ../wf-utils-${_utils_commit} subprojects/wf-utils
+ mv ../wf-touch-${_touch_commit} subprojects/wf-touch
}
post_install() {
- if [ -z "$build_option_elogind" ]; then
- # must be setuid without logind!
- chmod u+s ${DESTDIR}/usr/bin/wayfire
- fi
vlicense LICENSE
vsconf wayfire.ini
vinstall wayfire.desktop 0644 usr/share/wayland-sessions
From 152bc4c24ca33e37e1b942bb5d7087715b83578a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:45:24 +0100
Subject: [PATCH 031/357] wayfire-plugins-extra: update to 0.6.0
---
srcpkgs/wayfire-plugins-extra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index 2eaa4bbbea6..ff0e06c655c 100644
--- a/srcpkgs/wayfire-plugins-extra/template
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -1,6 +1,6 @@
# Template file for 'wayfire-plugins-extra'
pkgname=wayfire-plugins-extra
-version=0.5.0
+version=0.6.0
revision=1
build_style=meson
hostmakedepends="pkg-config wayland-devel"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://wayfire.org/"
distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/${version}.tar.gz"
-checksum=64c56ffa66df26a7cbee1af41c34ae123abe8252deeaf02687237688a8281a9e
+checksum=d1ac42c0b2d212a7523f2aeb63285ab8b95ffb6efd564bf27877310eeab1ab0e
post_install() {
vlicense LICENSE
From d089caa31fc928475a414752ec7835bde57ae896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Tue, 10 Nov 2020 17:43:47 +0100
Subject: [PATCH 032/357] sway: update to 1.5.1
---
srcpkgs/sway/INSTALL.msg | 6 ++++++
srcpkgs/sway/template | 15 ++++-----------
2 files changed, 10 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/sway/INSTALL.msg
diff --git a/srcpkgs/sway/INSTALL.msg b/srcpkgs/sway/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/sway/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index fa8e1850c50..4255e6ed724 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,21 +1,19 @@
# Template file for 'sway'
pkgname=sway
-version=1.5
-revision=2
+version=1.5.1
+revision=1
build_style=meson
conf_files="/etc/sway/config"
hostmakedepends="pkg-config wayland-devel scdoc git"
makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel
gdk-pixbuf-devel"
-depends="swaybg xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="swaybg xorg-server-xwayland"
short_desc="Tiling Wayland compositor compatible with i3"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://swaywm.org"
distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=c80644774d612d7d377093d4990061d36c36673862c06318a7b0e37fa47b0178
-
-build_options="elogind"
+checksum=095f983c9a5f80d761bc2fb19df8166839b9290124ccd47f3e74119a1335490f
post_patch() {
vsed -e 's/werror=true/werror=false/g' -i meson.build
@@ -23,10 +21,6 @@ post_patch() {
post_install() {
vlicense LICENSE
- if [ -z "$build_option_elogind" ]; then
- # must be setuid without logind!
- chmod u+s ${DESTDIR}/usr/bin/sway
- fi
vbin contrib/grimshot
vman contrib/grimshot.1
}
@@ -34,7 +28,6 @@ post_install() {
grimshot_package() {
short_desc="Helper for screenshots within sway"
depends="grim slurp sway wl-clipboard jq libnotify"
- archs="noarch"
pkg_install() {
vmove usr/bin/grimshot
vmove usr/share/man/man1/grimshot.1
From 093f15cb7215a8505880ede0019619f4cc493165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Tue, 10 Nov 2020 20:21:04 +0100
Subject: [PATCH 033/357] wcm: update to 0.6.0
---
srcpkgs/wcm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index d74eba5e556..b32e76ccff1 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -1,6 +1,6 @@
# Template file for 'wcm'
pkgname=wcm
-version=0.5.0
+version=0.6.0
revision=1
build_style=meson
hostmakedepends="pkg-config wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://wayfire.org/"
distfiles="https://github.com/WayfireWM/wcm/archive/v${version}.tar.gz"
-checksum=9cfcceefc838c8a0d547f5e40206901b282680da02a96490f756f7ad7da79341
+checksum=bfead0b617f46306ad3bc15b8e9c7e8f13996de6b5bdd3f2d18f066a9033740f
post_install() {
vlicense LICENSE
From 205e8941086da3ddebfff064ee3efa302d563566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Fri, 13 Nov 2020 11:19:28 +0100
Subject: [PATCH 034/357] wofi: update to 1.2.3
---
srcpkgs/wofi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wofi/template b/srcpkgs/wofi/template
index 4c21a047785..80863c765ef 100644
--- a/srcpkgs/wofi/template
+++ b/srcpkgs/wofi/template
@@ -1,7 +1,7 @@
# Template file for 'wofi'
pkgname=wofi
-version=1.2.2
-revision=2
+version=1.2.3
+revision=1
wrksrc="${pkgname}-v${version}"
build_style=meson
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://hg.sr.ht/~scoopta/wofi"
distfiles="https://hg.sr.ht/~scoopta/wofi/archive/v${version}.tar.gz"
-checksum=@4e5193fe7eb29d08ee0249aa1d6dbb343b9b1fe54b11abfeb06f7c2015270431
+checksum=@3ef3ff39eb6c72f20a70486a40f0060150044b701db84489f9773f309673f8e7
From de47cff73e89427c3965516c0bf854c8b03b5d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Wed, 18 Nov 2020 15:21:02 +0100
Subject: [PATCH 035/357] wf-shell: update to 0.6.1
---
srcpkgs/wf-shell/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index f88d967d172..47f0a42376b 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -1,9 +1,10 @@
# Template file for 'wf-shell'
pkgname=wf-shell
-version=0.5.0
+version=0.6.1
revision=1
build_style=meson
build_helper="gir"
+configure_args="-Dwayland-logout:implementation=c"
hostmakedepends="gobject-introspection pkg-config wayland-devel"
makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel wayfire-devel
gtk+3-devel gtk-layer-shell-devel"
@@ -11,8 +12,8 @@ short_desc="Wayfire shell with GTK-based panel and background client"
maintainer="Young Jin Park <youngjinpark20@gmail.com>"
license="MIT"
homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wf-shell/releases/download/${version}/wf-shell-${version}.tar.xz"
-checksum=fa481e867784b94b08857ec7bd27bf43251490d5d50c1e834e7ea64d908792f0
+distfiles="https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz"
+checksum=da8e5a16dde8f44966d41449452bcc7bc2466d5945324aca714ecc82827c884a
post_install() {
vlicense LICENSE
From 8dabe9df6c9ecca2660697484070018890349501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 20 Nov 2020 13:13:28 -0300
Subject: [PATCH 036/357] autoconf_cache/musl-linux: fix sigprocmask value.
It was "1", should have been "yes". This fixes building gettext.
---
common/environment/configure/autoconf_cache/musl-linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/environment/configure/autoconf_cache/musl-linux b/common/environment/configure/autoconf_cache/musl-linux
index 396c51c538c..58cc913109c 100644
--- a/common/environment/configure/autoconf_cache/musl-linux
+++ b/common/environment/configure/autoconf_cache/musl-linux
@@ -40,7 +40,7 @@ gl_cv_func_gettimeofday_posix_signature=yes
gl_cv_func_lseek_pipe=yes
gl_cv_func_mbrtowc_retval=yes
gl_cv_func_posix_spawn_works=yes
-gl_cv_func_sigprocmask=1
+gl_cv_func_sigprocmask=yes
gl_cv_func_spawnattr_setschedparam=yes
gl_cv_func_spawnattr_setschedpolicy=yes
gl_cv_func_stat_dir_slash=yes
From 27aaada9a92e900be760f0910aed5e27b04b6378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 20 Nov 2020 18:57:56 -0300
Subject: [PATCH 037/357] srcpkgs: remove execute permission from leftover
templates.
---
srcpkgs/aspell-pl/template | 0
srcpkgs/colord-kde/template | 0
srcpkgs/dolphin-plugins/template | 0
srcpkgs/emacs/template | 0
srcpkgs/font-vazir/template | 0
srcpkgs/libtd/template | 0
6 files changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 srcpkgs/aspell-pl/template
mode change 100755 => 100644 srcpkgs/colord-kde/template
mode change 100755 => 100644 srcpkgs/dolphin-plugins/template
mode change 100755 => 100644 srcpkgs/emacs/template
mode change 100755 => 100644 srcpkgs/font-vazir/template
mode change 100755 => 100644 srcpkgs/libtd/template
diff --git a/srcpkgs/aspell-pl/template b/srcpkgs/aspell-pl/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/colord-kde/template b/srcpkgs/colord-kde/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/font-vazir/template b/srcpkgs/font-vazir/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
old mode 100755
new mode 100644
From 5112644b3c374b267c9233b46989eaf5fbf10324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 16 Nov 2020 23:42:30 -0300
Subject: [PATCH 038/357] Disable Travis CI.
- Remove .travis.yml, common/travis/docker.sh.
- Change references to travis to be more generic.
- Manual.md: Orient against using CI logs in broken= or nocross=.
---
.travis.yml | 41 -----------------------------------------
Manual.md | 6 ++----
README.md | 2 +-
common/travis/docker.sh | 18 ------------------
xbps-src | 2 +-
5 files changed, 4 insertions(+), 65 deletions(-)
delete mode 100644 .travis.yml
delete mode 100755 common/travis/docker.sh
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 42ef134aa4d..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-language: bash
-dist: bionic
-
-git:
- depth: 200
-
-env:
- global:
- - PATH=$PATH:/tmp/bin
- - DOCKER_BASE=voidlinux/masterdir
- - TAG=20200607RC01
-
- matrix:
- - XLINT=1 LICENSE_LIST=common/travis/license.lst
- - ARCH=x86_64 BOOTSTRAP=x86_64
- - ARCH=i686 BOOTSTRAP=i686
- - ARCH=aarch64 BOOTSTRAP=x86_64
- - ARCH=armv7l BOOTSTRAP=x86_64
- - ARCH=x86_64-musl BOOTSTRAP=x86_64-musl
- - ARCH=armv6l-musl BOOTSTRAP=x86_64-musl
- - ARCH=aarch64-musl BOOTSTRAP=x86_64-musl
-
-install:
- - common/travis/docker.sh
-
-before_script:
- - common/travis/set_mirror.sh
- - common/travis/prepare.sh
- - common/travis/fetch_upstream.sh
- - common/travis/changed_templates.sh
- - common/travis/fetch-xtools.sh
- - common/travis/xlint.sh
-
-script:
- - if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/build.sh $BOOTSTRAP $ARCH; fi
-
-after_script:
- - if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/show_files.sh $BOOTSTRAP $ARCH; fi
-
-notifications:
- email: false
diff --git a/Manual.md b/Manual.md
index 0833d5fdd1c..c520d06c133 100644
--- a/Manual.md
+++ b/Manual.md
@@ -631,8 +631,7 @@ in /usr/share directory specified by absolute path, which are expected and allow
specified by absolute path, which are expected and allowed to contain machine code files.
- `nocross` If set, cross compilation won't be allowed and will exit immediately.
-This should be set to a string describing why it fails, or a link to a travis
-buildlog demonstrating the failure.
+This should be set to a string describing why it fails, or a link to a buildlog (from the official builders, CI buildlogs can vanish) demonstrating the failure.
- `restricted` If set, xbps-src will refuse to build the package unless
`etc/conf` has `XBPS_ALLOW_RESTRICTED=yes`. The primary builders for Void
@@ -645,8 +644,7 @@ to override the guessed list. Only use this if a specific order of subpackages i
otherwise the default would work in most cases.
- `broken` If set, building the package won't be allowed because its state is currently broken.
-This should be set to a string describing why it is broken, or a link to a travis
-buildlog demonstrating the failure.
+This should be set to a string describing why it is broken, or a link to a buildlog demonstrating the failure.
- `shlib_provides` A white space separated list of additional sonames the package provides on.
This appends to the generated file rather than replacing it.
diff --git a/README.md b/README.md
index 9238b1918ef..ce2d49d2a4a 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ into a `masterdir` that is used as its main `chroot` directory. `xbps-src` suppo
multiple utilities to accomplish this task:
- `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with travis).
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
- `proot(1)` - utility that implements chroot/bind mounts in user space, see https://proot-me.github.io/.
diff --git a/common/travis/docker.sh b/common/travis/docker.sh
deleted file mode 100755
index 9b98b42c016..00000000000
--- a/common/travis/docker.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# docker.sh
-
-[ "$XLINT" ] && exit 0
-
-DOCKER_NAME=${DOCKER_NAME:-void}
-
-/bin/echo -e "\x1b[32mPulling docker image $DOCKER_BASE-$BOOTSTRAP:$TAG...\x1b[0m"
-docker pull $DOCKER_BASE-$BOOTSTRAP:$TAG
-docker run -d \
- --name $DOCKER_NAME \
- -v "$(pwd)":/hostrepo \
- -v /tmp:/tmp \
- -e XLINT="$XLINT" \
- -e PATH="$PATH" \
- $DOCKER_BASE-$BOOTSTRAP:$TAG \
- /bin/sh -c 'sleep inf'
diff --git a/xbps-src b/xbps-src
index 3cd19dc42ec..ad999439d3a 100755
--- a/xbps-src
+++ b/xbps-src
@@ -486,7 +486,7 @@ if [ -z "$IN_CHROOT" ]; then
fi
# Forbid root unless XBPS_ALLOW_CHROOT_BREAKOUT is set
-# (for travis CI).
+# (for CI).
if [ -z "$IN_CHROOT" -a "$UID" -eq 0 -a -z "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
echo "ERROR: xbps-src cannot be used as root." 1>&2
exit 1
From bb013ceeb85e7b754ee992bfa987b656f4ebe8b7 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 12 Nov 2020 19:21:04 +0100
Subject: [PATCH 039/357] wireshark: update to 3.4.0
---
common/shlibs | 6 +++---
srcpkgs/wireshark/template | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e7c727838ab..8b31eaafdc4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1625,9 +1625,9 @@ libdovecot-lda.so.0 dovecot-2.2.11_2
libnetapi.so.0 samba-3.6.23_1
libsmbsharemodes.so.0 samba-3.6.23_1
libmysqld.so.18 libmariadbclient-5.5.36_1
-libwiretap.so.10 libwireshark-3.2.0_1
-libwireshark.so.13 libwireshark-3.2.0_1
-libwsutil.so.11 libwireshark-3.2.0_1
+libwiretap.so.11 libwireshark-3.4.0_1
+libwireshark.so.14 libwireshark-3.4.0_1
+libwsutil.so.12 libwireshark-3.4.0_1
libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1
libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1
libKF5Prison.so.5 prison-5.43.0_1
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index e8615545c6b..7e6e9e24218 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,6 +1,6 @@
# Template file for 'wireshark'
pkgname=wireshark
-version=3.2.7
+version=3.4.0
revision=1
build_style=cmake
hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.wireshark.org"
distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz"
-checksum=be832fb86d9c455c5be8b225a755cdc77cb0e92356bdfc1fe4b000d93f7d70da
+checksum=67e4ebbd9153fc589fd67dc21b93176674c73adc3d5a43934c3ac69d8594a8ae
system_groups="wireshark"
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
From 368ce206b3f69861dce30156cbf2deacb4d85496 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 21:30:13 +0100
Subject: [PATCH 040/357] xterm: update to 362.
---
srcpkgs/xterm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 5ece04ebed9..00e9362f1ba 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
# Template file for 'xterm'
pkgname=xterm
-version=361
+version=362
revision=1
build_style=gnu-configure
configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -20,7 +20,7 @@ license="MIT"
homepage="http://invisible-island.net/xterm/"
changelog="http://invisible-island.net/xterm/xterm.log.html"
distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=85610f20d5e47205cc1b6876f7a4da28d6ae051bd8eac0b932e92c37a73a623f
+checksum=1d4ffe226fa8f021859bbc3007788ff63a46a31242d9bd9a7bd7ebe24e81aca2
post_install() {
for f in {u,}xterm.desktop; do
From 56b8a2e615a7d25469da79e05168db49137c334d 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, 21 Nov 2020 07:24:03 +0700
Subject: [PATCH 041/357] mutt: update to 2.0.2. CVE-2020-28896
---
srcpkgs/mutt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 11b690bfab9..6003181d3b7 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
# Template file for 'mutt'
pkgname=mutt
-version=2.0.1
+version=2.0.2
revision=1
build_style=gnu-configure
configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="http://www.mutt.org"
changelog="http://mutt.org/relnotes/${version%.*}"
distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=0cf5fdea5616f655b101de3b5ed45412bc2cc721d517466ca6c645a829b021db
+checksum=471218babe97968a45704f1e1e17523c4620ad1f92bae4143a4c9749ab1411c8
post_install() {
# provided by mime-types
From df8f4f0c65bf8af7f98ebafb45d031c6c42a99fc 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, 19 Nov 2020 23:16:50 +0700
Subject: [PATCH 042/357] choosenim: update to 0.7.4.
---
...3cd106185441604a55ef34968a2a37d6258a.patch | 25 -----
...ba5b72f8434eb690ae3b84f43968b8041a95.patch | 22 ----
srcpkgs/choosenim/patches/ftbfs.patch | 56 ----------
.../choosenim/patches/system-libarchive.patch | 103 ++++++++++++++++++
srcpkgs/choosenim/template | 42 ++++---
5 files changed, 132 insertions(+), 116 deletions(-)
delete mode 100644 srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch
delete mode 100644 srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch
delete mode 100644 srcpkgs/choosenim/patches/ftbfs.patch
create mode 100644 srcpkgs/choosenim/patches/system-libarchive.patch
diff --git a/srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch b/srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch
deleted file mode 100644
index a7445e39527..00000000000
--- a/srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cfc83cd106185441604a55ef34968a2a37d6258a Mon Sep 17 00:00:00 2001
-From: Dominik Picheta <dominikpicheta@googlemail.com>
-Date: Mon, 14 Oct 2019 21:09:23 +0100
-Subject: [PATCH] Fixes #142.
-
-Fixes regression in choosenim install script.
----
- scripts/choosenim-unix-init.sh | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/scripts/choosenim-unix-init.sh b/scripts/choosenim-unix-init.sh
-index a60b74b..89912cf 100755
---- scripts/choosenim-unix-init.sh
-+++ scripts/choosenim-unix-init.sh
-@@ -59,9 +59,8 @@ install() {
- fi
-
- # Install Nim from desired channel.
-- "$temp_prefix/$filename" $CHOOSE_VERSION --firstInstall -y < /dev/tty
-+ "$temp_prefix/$filename" $CHOOSE_VERSION --firstInstall < /dev/tty
- else
-- # TODO: Use the -y switch when choosenim gets support for it.
- "$temp_prefix/$filename" $CHOOSE_VERSION --firstInstall -y
- fi
-
diff --git a/srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch b/srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch
deleted file mode 100644
index a9e8c153eb2..00000000000
--- a/srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f7aeba5b72f8434eb690ae3b84f43968b8041a95 Mon Sep 17 00:00:00 2001
-From: Dominik Picheta <dominikpicheta@gmail.com>
-Date: Sun, 21 Apr 2019 20:29:41 +0100
-Subject: [PATCH] Fixes osinfo dependency conflict.
-
----
- choosenim.nimble | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/choosenim.nimble b/choosenim.nimble
-index d826357..b775d88 100644
---- choosenim.nimble
-+++ choosenim.nimble
-@@ -15,7 +15,7 @@ skipExt = @["nim"]
-
- requires "nim >= 0.16.1", "nimble >= 0.8.5", "untar >= 0.1.0"
- requires "libcurl >= 1.0.0"
--requires "analytics >= 0.1.1"
-+requires "analytics >= 0.2.0"
- requires "osinfo >= 0.3.0"
-
- task test, "Run the choosenim tester!":
diff --git a/srcpkgs/choosenim/patches/ftbfs.patch b/srcpkgs/choosenim/patches/ftbfs.patch
deleted file mode 100644
index f5bbc6ace2b..00000000000
--- a/srcpkgs/choosenim/patches/ftbfs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 53472069126088cd1d23d84aa4fdee9dc780f7d2
-Author: q66 <daniel@octaforge.org>
-Date: Tue Dec 17 22:21:04 2019 +0100
-
- fix build: undeclared identifier: 'NimbleError'
-
-diff --git choosenim.nimble choosenim.nimble
-index d826357..b91fac8 100644
---- choosenim.nimble
-+++ choosenim.nimble
-@@ -13,7 +13,7 @@ skipExt = @["nim"]
-
- # Dependencies
-
--requires "nim >= 0.16.1", "nimble >= 0.8.5", "untar >= 0.1.0"
-+requires "nim >= 0.16.1", "nimble#5bb795a", "untar >= 0.1.0"
- requires "libcurl >= 1.0.0"
- requires "analytics >= 0.1.1"
- requires "osinfo >= 0.3.0"
-diff --git src/choosenim/common.nim src/choosenim/common.nim
-index 197bfac..059d210 100644
---- src/choosenim/common.nim
-+++ src/choosenim/common.nim
-@@ -1,4 +1,4 @@
--import nimblepkg/common
-+import nimblepkg/version
-
- type
- ChooseNimError* = object of NimbleError
-@@ -19,4 +19,4 @@ const
- "g++",
- "gdb",
- "ld"
-- ]
-\ No newline at end of file
-+ ]
-diff --git src/choosenim/proxyexe.nim src/choosenim/proxyexe.nim
-index 9c9c761..829df8f 100644
---- src/choosenim/proxyexe.nim
-+++ src/choosenim/proxyexe.nim
-@@ -4,7 +4,7 @@
-
- import strutils, os, osproc
-
--import nimblepkg/[cli, options]
-+import nimblepkg/[cli, options, version]
- import nimblepkg/common as nimbleCommon
- import cliparams
- from common import ChooseNimError, mingwProxies
-@@ -71,4 +71,4 @@ when isMainModule:
-
- display("Info:", "If unexpected, please report this error to " &
- "https://github.com/dom96/choosenim", Warning, HighPriority)
-- quit(1)
-\ No newline at end of file
-+ quit(1)
diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
new file mode 100644
index 00000000000..a102f0c13b3
--- /dev/null
+++ b/srcpkgs/choosenim/patches/system-libarchive.patch
@@ -0,0 +1,103 @@
+diff --git choosenim.nimble choosenim.nimble
+index 7ba9b36..dc47faa 100644
+--- choosenim.nimble
++++ choosenim.nimble
+@@ -14,7 +14,7 @@ skipExt = @["nim"]
+ # Dependencies
+
+ requires "nim >= 1.2.6", "nimble#8f7af86"
+-requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
++requires "nimterop >= 0.6.12"
+ #requires "libcurl >= 1.0.0" - OSX now uses httpclient
+ requires "analytics >= 0.2.0"
+ requires "osinfo >= 0.3.0"
+diff --git nimarchive/nimarchive/archive.nim nimarchive/nimarchive/archive.nim
+index 1d45140..d5361e0 100644
+--- nimarchive/nimarchive/archive.nim
++++ nimarchive/nimarchive/archive.nim
+@@ -2,28 +2,6 @@ import os, strutils
+
+ import nimterop/[build, cimport]
+
+-const
+- baseDir = getProjectCacheDir("nimarchive" / "libarchive")
+-
+- defs = """
+- archiveStatic
+- archiveJBB
+- archiveSetVer=3.4.3
+-
+- iconvStatic
+- iconvStd
+- iconvJBB
+- iconvSetVer=1.16.0
+- """
+-
+-setDefines(defs.splitLines())
+-
+-getHeader(
+- header = "archive.h",
+- outdir = baseDir,
+- jbburi = "LibArchive",
+- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=LibArchive-v$1/ skip=libiconv"
+-)
+
+ import iconv
+
+@@ -52,9 +30,7 @@ static:
+ cSkipSymbol(@["archive_read_open_file", "archive_write_open_file"])
+
+ let
+- archiveEntryPath {.compileTime.} = archivePath[0 .. ^3] & "_entry.h"
++ archivePath {.compileTime.} = "archive.h"
++ archiveEntryPath {.compileTime.} = "archive_entry.h"
+
+-when archiveStatic:
+- cImport(@[archivePath, archiveEntryPath], recurse = true)
+-else:
+- cImport(@[archivePath, archiveEntryPath], recurse = true, dynlib = archiveLPath)
++cImport(@[archivePath, archiveEntryPath], recurse = false)
+diff --git nimarchive/nimarchive/iconv.nim nimarchive/nimarchive/iconv.nim
+index d983398..4f61a5b 100644
+--- nimarchive/nimarchive/iconv.nim
++++ nimarchive/nimarchive/iconv.nim
+@@ -2,15 +2,3 @@ import os, strutils
+
+ import nimterop/build
+
+-const
+- baseDir = getProjectCacheDir("nimarchive" / "iconv")
+-
+-getHeader(
+- header = "iconv.h",
+- dlurl = "https://ftp.gnu.org/gnu/libiconv/libiconv-$1.tar.gz",
+- conanuri = "libiconv",
+- jbburi = "Libiconv",
+- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=Libiconv-v$1/",
+- outdir = baseDir,
+- conFlags = "--enable-static=yes --with-pic=yes"
+-)
+diff --git src/choosenimpkg/ssl.nim src/choosenimpkg/ssl.nim
+index f20b246..7576066 100644
+--- src/choosenimpkg/ssl.nim
++++ src/choosenimpkg/ssl.nim
+@@ -2,19 +2,3 @@ import strutils
+
+ import nimterop/[build, cimport]
+
+-# Download openssl from JuliaBinaryWrappers
+-setDefines(@[
+- "cryptoJBB", "cryptoStatic"
+-])
+-
+-getHeader(
+- "crypto.h",
+- jbburi = "openssl",
+- outdir = getProjectCacheDir("nimopenssl")
+-)
+-
+-const
+- sslLPath = cryptoLPath.replace("crypto", "ssl")
+-
+-# Link static binaries
+-{.passL: sslLPath & " " & cryptoLPath.}
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d31e065edf0..fb5e9152b22 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,20 +1,22 @@
# Template file for 'choosenim'
pkgname=choosenim
-version=0.4.0
+version=0.7.4
revision=1
-hostmakedepends="git nim"
-makedepends="libressl-devel zlib-devel"
+hostmakedepends="git nim libressl-devel pkg-config"
+makedepends="libressl-devel zlib-devel libarchive-devel"
depends="gcc"
short_desc="Nim toolchain installer"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="MIT"
homepage="https://github.com/dom96/choosenim"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d7b04314666a3647c255f89031deabe53f8e281b6cfbf3a0848272fc1799c0f3
+distfiles="${homepage}/archive/v${version}.tar.gz>choosenim-${version}.tar.gz
+ https://github.com/genotrance/nimarchive/archive/v0.5.4.tar.gz>nimarchive-0.5.4.tar.gz"
+checksum="0e78a59cfb3cf7926f8dff3a4215949ccfaecd6c6dddc3b2e062098b5da03edb
+ c38e8c66c2eac2bc021d450f2b60d0e45c5355df963d0133930448639c0bd8d4"
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" libressl-devel"
-fi
+post_extract() {
+ mv ../nimarchive-0.5.4 nimarchive
+}
do_build() {
local arch args
@@ -26,14 +28,28 @@ do_build() {
ppc64*) arch=powerpc64;;
ppc*) arch=powerpc;;
esac
+ LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
+ LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
+ LDFLAGS+=" -lrt -ldl"
+ : >nim.cfg
+ if [ -z "$CROSS_BUILD" ]; then
+ cat >>nim.cfg <<-EOF
+ gcc.options.always = "$CPPFLAGS $CFLAGS -pthread"
+ gcc.options.linker = "$LDFLAGS"
+ EOF
+ fi
if [ -n "$arch" ]; then
- cat > nim.cfg <<EOF
-$arch.linux.gcc.exe = "$CC"
-$arch.linux.gcc.linkerexe = "$CC"
-EOF
+ cat >>nim.cfg <<-EOF
+ $arch.linux.gcc.exe = "$CC"
+ $arch.linux.gcc.linkerexe = "$CC"
+ $arch.linux.gcc.options.always = "$CPPFLAGS $CFLAGS -pthread"
+ $arch.linux.gcc.options.linker = "$LDFLAGS"
+ EOF
args="--cpu:$arch"
fi
- nimble -y build -d:release --passC:-flto "$args"
+ ln -sf $XBPS_CROSS_BASE/usr/include/archive.h src
+ ln -sf $XBPS_CROSS_BASE/usr/include/archive_entry.h src
+ nimble -y build -d:release --passC:-flto "$args" --path:$wrksrc/nimarchive
}
do_install() {
From d5eb739bed3358c52d33ef6f9610b6409189465d 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, 19 Nov 2020 22:07:29 +0700
Subject: [PATCH 043/357] JAI: move to restricted
The license requires us to defend and indemnify Sun and its licensors.
---
srcpkgs/JAI/template | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/JAI/template b/srcpkgs/JAI/template
index ce50a8c183c..2b7fcb61068 100644
--- a/srcpkgs/JAI/template
+++ b/srcpkgs/JAI/template
@@ -1,12 +1,21 @@
# Template file for 'JAI'
pkgname=JAI
version=1.1.3
-revision=3
+revision=4
+archs="i686 x86_64"
short_desc="Java Advanced Imaging Library - binary version"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
-license="Apache-2.0"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+license="custom:Oracle Binary Code License"
homepage="https://java.net/projects/jai-core"
-archs="i686 x86_64"
+repository=nonfree
+# DISTRIBUTIONREADME-jai.txt
+# (e) You agree to defend and indemnify Sun and its licensors from and against
+# any damages, costs, liabilities, settlement amounts and/or expenses
+# (including attorneys' fees) incurred in connection with any claim, lawsuit or
+# action by any third party that arises or results from the use or distribution
+# of any and all Programs and/or Redistributable.
+restricted=yes
+ignore_elf_dirs="/usr/share/java/lib"
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
_arch="amd64"
@@ -32,5 +41,7 @@ do_install() {
vcopy lib/libmlib_jai.so usr/share/java/lib/${_jarch}
# put the license files in place
vmkdir usr/share/licenses/${pkgname}
- vcopy *-jai.txt usr/share/licenses/${pkgname}
+ for _license in *.txt; do
+ vlicense "$_license"
+ done
}
From 39d305301c3a56f35d4dc567f4cfdb3018fbf1c6 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, 21 Nov 2020 09:29:10 +0700
Subject: [PATCH 044/357] katarakt: fix build for poppler-qt5 20.09.0
---
.../katarakt/patches/not-an-octal-number.patch | 15 +++++++++++++++
srcpkgs/katarakt/template | 12 ++++--------
2 files changed, 19 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/katarakt/patches/not-an-octal-number.patch
diff --git a/srcpkgs/katarakt/patches/not-an-octal-number.patch b/srcpkgs/katarakt/patches/not-an-octal-number.patch
new file mode 100644
index 00000000000..95b9f016951
--- /dev/null
+++ b/srcpkgs/katarakt/patches/not-an-octal-number.patch
@@ -0,0 +1,15 @@
+--- katarakt.pro.orig 2020-11-21 07:57:05.333858604 +0700
++++ katarakt.pro 2020-11-21 07:58:23.713527253 +0700
+@@ -17,9 +17,9 @@
+
+ isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config # same as in link_pkgconfig.prf
+ POPPLER_VERSION = $$system($$PKG_CONFIG --modversion $$POPPLER)
+- POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1)
+- POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2)
+- POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3)
++ POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1 | sed 's/^0*//' | sed 's/^$/0/')
++ POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2 | sed 's/^0*//' | sed 's/^$/0/')
++ POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3 | sed 's/^0*//' | sed 's/^$/0/')
+
+ DEFINES += POPPLER_VERSION_MAJOR=$$POPPLER_VERSION_MAJOR
+ DEFINES += POPPLER_VERSION_MINOR=$$POPPLER_VERSION_MINOR
diff --git a/srcpkgs/katarakt/template b/srcpkgs/katarakt/template
index 48e528c8d97..13fc25ba662 100644
--- a/srcpkgs/katarakt/template
+++ b/srcpkgs/katarakt/template
@@ -1,23 +1,19 @@
# Template file for 'katarakt'
pkgname=katarakt
version=0.2
-revision=2
+revision=3
wrksrc="katarakt-v${version}"
build_style=qmake
-hostmakedepends="qt5-qmake pkg-config asciidoc"
+hostmakedepends="qt5-qmake pkg-config asciidoc qt5-host-tools"
makedepends="qt5-devel poppler-qt5-devel"
-short_desc="A simple PDF viewer"
+short_desc="Simple PDF viewer"
maintainer="Lukas Braun <void-packages@moshbit.net>"
-license="BSD"
+license="BSD-2-Clause"
homepage="https://wwwcip.cs.fau.de/~go18gomu/katarakt"
#distfiles="https://wwwcip.cs.fau.de/~go18gomu/katarakt/tarballs/katarakt-${version}.tar.xz"
distfiles="https://gitlab.cs.fau.de/Qui_Sum/katarakt/-/archive/v${version}/katarakt-v${version}.tar.gz"
checksum=f60b3b7477975301a6c6657eb0a24d5cc28d321cca70e9746d4d1ea91e239c46
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-devel"
-fi
-
post_build() {
make doc
}
From 7adc08abfcf30d09e23b4684c5b2cee61105f0a5 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, 21 Nov 2020 10:04:58 +0700
Subject: [PATCH 045/357] minisign: fix build
---
srcpkgs/minisign/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/minisign/template b/srcpkgs/minisign/template
index b502ceeaab2..f86361d85db 100644
--- a/srcpkgs/minisign/template
+++ b/srcpkgs/minisign/template
@@ -3,6 +3,7 @@ pkgname=minisign
version=0.9
revision=1
build_style=cmake
+hostmakedepends="pkg-config"
makedepends="libsodium-devel"
short_desc="Simple tool to sign files and verify signatures"
maintainer="Orphaned <orphan@voidlinux.org>"
From a72ccb5accb9bf9ebc4e4200ec201c320ca87333 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, 21 Nov 2020 10:12:00 +0700
Subject: [PATCH 046/357] libgaminggear: fix build
---
srcpkgs/libgaminggear/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/libgaminggear/template b/srcpkgs/libgaminggear/template
index e6a59c5281a..36ab8eccfea 100644
--- a/srcpkgs/libgaminggear/template
+++ b/srcpkgs/libgaminggear/template
@@ -15,6 +15,8 @@ homepage="https://sourceforge.net/projects/libgaminggear/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=ffbd59c62e3107b09ec99f1e5147529c61931987abc7f86a140449b46388c549
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/harfbuzz"
+
libgaminggear-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision} gtk+-devel libglib-devel
From 0d5c9d20d7445a3562db34eda8a0257cd04db81d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Nov 2020 16:27:01 -0600
Subject: [PATCH 047/357] wine: update to 5.22.
---
srcpkgs/wine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 536e52e67ba..fc753289c02 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=5.21
+version=5.22
revision=1
build_style=gnu-configure
configure_args="--bindir=/usr/libexec/wine"
@@ -9,7 +9,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
-checksum=5a1a5c2549d11bce0d6640220ed6fd31042afcbcb366f475e0ccb4781d2d2840
+checksum=09bd06c87c8c974e6ad34507cec875d7217eb56fc09df838d5453e0ebbce4d21
lib32mode=full
archs="i686 x86_64*"
From 5599dea108732433467fc2f74f3d163270e8968f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Nov 2020 08:00:53 -0600
Subject: [PATCH 048/357] timeshift: update to 20.11.1.
---
srcpkgs/timeshift/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index fb6bf744b94..9a01c60cf05 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,9 +1,8 @@
# Template file for 'timeshift'
pkgname=timeshift
-version=20.03
-revision=2
+version=20.11.1
+revision=1
build_style=gnu-makefile
-conf_files="/etc/default/timeshift.json"
hostmakedepends="gettext pkg-config vala which"
makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
depends="rsync psmisc"
@@ -12,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.teejeetech.in/p/timeshift.html"
distfiles="https://github.com/teejee2008/timeshift/archive/v${version}.tar.gz"
-checksum=6516150481fc3e69c090ff25426e85d99d10035949446368918076b19335b391
+checksum=c6dcca80b42f80a8c8d9d03e91eb17aa634be2f1031f667bba3f483410297abb
# Remove hard-dep on crontab, leave up to user to decide
post_extract() {
From f8bffd708722beb77ce83dd39114365cd8197057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 21 Nov 2020 00:29:32 -0300
Subject: [PATCH 049/357] rclone: update to 1.53.3.
Fixes CVE-2020-28924.
---
srcpkgs/rclone/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 22c4857e669..3c7ea20e5bc 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,6 +1,6 @@
# Template file for 'rclone'
pkgname=rclone
-version=1.53.1
+version=1.53.3
revision=1
wrksrc="rclone-v${version}"
build_style=go
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://rclone.org/"
changelog="https://raw.githubusercontent.com/rclone/rclone/master/docs/content/changelog.md"
distfiles="https://github.com/rclone/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
-checksum=d72d74a90a191fc0964705270ff59d58094e2bf4982f9fa0bc150f7296620caf
+checksum=f1e213bc6fb7c46f9a4cc8604ae0856718434bdafe07fa3ce449ae9a510a5763
post_install() {
vlicense COPYING
From 25fc164f409d3a297b0882d3326940670cb64c1e 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, 21 Nov 2020 10:52:48 +0700
Subject: [PATCH 050/357] musikcube: fix build with libmicrohttpd 0.9.70
---
srcpkgs/musikcube/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 78cf86fe80d..a3da40c134b 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -25,6 +25,10 @@ fi
# SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
makedepends+=" libglvnd"
+post_patch() {
+ vsed -i -e 's/00097000/00097001/' src/plugins/server/HttpServer.h
+}
+
post_install() {
vlicense LICENSE.txt
}
From e6d3dd8c2c35693d3433413c414f7a991ab4c8eb 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, 16 Nov 2020 08:35:37 +0700
Subject: [PATCH 051/357] nss: update to 3.59.
---
srcpkgs/nss/patches/fix-bug1672703.patch | 137 -----------------------
srcpkgs/nss/template | 6 +-
2 files changed, 3 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/nss/patches/fix-bug1672703.patch
diff --git a/srcpkgs/nss/patches/fix-bug1672703.patch b/srcpkgs/nss/patches/fix-bug1672703.patch
deleted file mode 100644
index 42347c8f91a..00000000000
--- a/srcpkgs/nss/patches/fix-bug1672703.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-commit b03a4fc5b902498414b02640dcb2717dfef9682f
-Author: Daiki Ueno <dueno@redhat.com>
-Date: Mon Oct 26 06:46:11 2020 +0100
-
- Bug 1672703, always tolerate the first CCS in TLS 1.3, r=mt
-
- Summary:
- This flips the meaning of the flag for checking excessive CCS
- messages, so it only rejects multiple CCS messages while the first CCS
- message is always accepted.
-
- Reviewers: mt
-
- Reviewed By: mt
-
- Bug #: 1672703
-
- Differential Revision: https://phabricator.services.mozilla.com/D94603
----
- gtests/ssl_gtest/ssl_tls13compat_unittest.cc | 18 +++++++++---------
- lib/ssl/ssl3con.c | 20 +++++++-------------
- lib/ssl/sslimpl.h | 5 +----
- 3 files changed, 17 insertions(+), 26 deletions(-)
-
-diff --git gtests/ssl_gtest/ssl_tls13compat_unittest.cc gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-index dcede798cc..645f84ff02 100644
---- nss/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-+++ nss/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-@@ -348,8 +348,8 @@ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecBeforeClientHelloTwice) {
- client_->CheckErrorCode(SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT);
- }
-
--// The server rejects a ChangeCipherSpec if the client advertises an
--// empty session ID.
-+// The server accepts a ChangeCipherSpec even if the client advertises
-+// an empty session ID.
- TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterClientHelloEmptySid) {
- EnsureTlsSetup();
- ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
-@@ -358,9 +358,8 @@ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterClientHelloEmptySid) {
- client_->Handshake(); // Send ClientHello
- client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs))); // Send CCS
-
-- server_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
-- server_->Handshake(); // Consume ClientHello and CCS
-- server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-+ Handshake();
-+ CheckConnected();
- }
-
- // The server rejects multiple ChangeCipherSpec even if the client
-@@ -381,7 +380,7 @@ TEST_F(Tls13CompatTest, ChangeCipherSpecAfterClientHelloTwice) {
- server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
- }
-
--// The client rejects a ChangeCipherSpec if it advertises an empty
-+// The client accepts a ChangeCipherSpec even if it advertises an empty
- // session ID.
- TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterServerHelloEmptySid) {
- EnsureTlsSetup();
-@@ -398,9 +397,10 @@ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterServerHelloEmptySid) {
- // send ServerHello..CertificateVerify
- // Send CCS
- server_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
-- client_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
-- client_->Handshake(); // Consume ClientHello and CCS
-- client_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-+
-+ // No alert is sent from the client. As Finished is dropped, we
-+ // can't use Handshake() and CheckConnected().
-+ client_->Handshake();
- }
-
- // The client rejects multiple ChangeCipherSpec in a row even if the
-diff --git lib/ssl/ssl3con.c lib/ssl/ssl3con.c
-index 767ffc30f1..b652dcea34 100644
---- nss/lib/ssl/ssl3con.c
-+++ nss/lib/ssl/ssl3con.c
-@@ -6645,11 +6645,7 @@ ssl_CheckServerSessionIdCorrectness(sslSocket *ss, SECItem *sidBytes)
-
- /* TLS 1.3: We sent a session ID. The server's should match. */
- if (!IS_DTLS(ss) && (sentRealSid || sentFakeSid)) {
-- if (sidMatch) {
-- ss->ssl3.hs.allowCcs = PR_TRUE;
-- return PR_TRUE;
-- }
-- return PR_FALSE;
-+ return sidMatch;
- }
-
- /* TLS 1.3 (no SID)/DTLS 1.3: The server shouldn't send a session ID. */
-@@ -8696,7 +8692,6 @@ ssl3_HandleClientHello(sslSocket *ss, PRUint8 *b, PRUint32 length)
- errCode = PORT_GetError();
- goto alert_loser;
- }
-- ss->ssl3.hs.allowCcs = PR_TRUE;
- }
-
- /* TLS 1.3 requires that compression include only null. */
-@@ -13066,15 +13061,14 @@ ssl3_HandleRecord(sslSocket *ss, SSL3Ciphertext *cText)
- ss->ssl3.hs.ws != idle_handshake &&
- cText->buf->len == 1 &&
- cText->buf->buf[0] == change_cipher_spec_choice) {
-- if (ss->ssl3.hs.allowCcs) {
-- /* Ignore the first CCS. */
-- ss->ssl3.hs.allowCcs = PR_FALSE;
-+ if (!ss->ssl3.hs.rejectCcs) {
-+ /* Allow only the first CCS. */
-+ ss->ssl3.hs.rejectCcs = PR_TRUE;
- return SECSuccess;
-+ } else {
-+ alert = unexpected_message;
-+ PORT_SetError(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
- }
--
-- /* Compatibility mode is not negotiated. */
-- alert = unexpected_message;
-- PORT_SetError(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
- }
-
- if ((IS_DTLS(ss) && !dtls13_AeadLimitReached(spec)) ||
-diff --git lib/ssl/sslimpl.h lib/ssl/sslimpl.h
-index 44c43a0e6c..35d0c2d6bc 100644
---- nss/lib/ssl/sslimpl.h
-+++ nss/lib/ssl/sslimpl.h
-@@ -710,10 +710,7 @@ typedef struct SSL3HandshakeStateStr {
- * or received. */
- PRBool receivedCcs; /* A server received ChangeCipherSpec
- * before the handshake started. */
-- PRBool allowCcs; /* A server allows ChangeCipherSpec
-- * as the middlebox compatibility mode
-- * is explicitly indicarted by
-- * legacy_session_id in TLS 1.3 ClientHello. */
-+ PRBool rejectCcs; /* Excessive ChangeCipherSpecs are rejected. */
- PRBool clientCertRequested; /* True if CertificateRequest received. */
- PRBool endOfFlight; /* Processed a full flight (DTLS 1.3). */
- ssl3KEADef kea_def_mutable; /* Used to hold the writable kea_def
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c755eb7fa33..635e67a610e 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,8 +3,8 @@
_nsprver=4.29
pkgname=nss
-version=3.58
-revision=2
+version=3.59
+revision=1
hostmakedepends="perl"
makedepends="nspr-devel sqlite-devel zlib-devel"
depends="nspr>=${_nsprver}"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="https://www.mozilla.org/projects/security/pki/nss"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=9f73cf789b5f109b978e5239551b609b0cafa88d18f0bc8ce3f976cb629353c0
+checksum=e6298174caa8527beacdc2858f77ed098d7047c1792846040e27e420fed0ce24
export NS_USE_GCC=1
export LIBRUNPATH=
From de0df57f520550436ba684bbc19ee2648fe9a6dd 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, 21 Nov 2020 13:44:03 +0700
Subject: [PATCH 052/357] notes-up: fix ftbfs vala 0.50
---
srcpkgs/notes-up/patches/vala-0.50.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/notes-up/patches/vala-0.50.patch
diff --git a/srcpkgs/notes-up/patches/vala-0.50.patch b/srcpkgs/notes-up/patches/vala-0.50.patch
new file mode 100644
index 00000000000..3cb0a75b521
--- /dev/null
+++ b/srcpkgs/notes-up/patches/vala-0.50.patch
@@ -0,0 +1,18 @@
+--- vapi/libmarkdown.vapi.orig 2020-11-21 13:32:35.540125253 +0700
++++ vapi/libmarkdown.vapi 2020-11-21 13:40:04.961780640 +0700
+@@ -41,7 +41,7 @@
+ public void initialize ();
+ public void with_html5_tags ();
+ public void shlib_destructor ();
+- public char markdown_version[];
++ public string markdown_version;
+
+ [Compact]
+ [CCode (cname = "MMIOT", cprefix = "mkd_", free_function = "mkd_cleanup")]
+@@ -125,4 +125,4 @@
+ NOSTYLE,
+ EMBED
+ }
+-}
+\ No newline at end of file
++}
From 286849a797e5cfb3a95a703c2d5b9f74e957dce0 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, 21 Nov 2020 14:09:06 +0700
Subject: [PATCH 053/357] olsrd: fix ftbfs
---
srcpkgs/olsrd/patches/bison-header.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 srcpkgs/olsrd/patches/bison-header.patch
diff --git a/srcpkgs/olsrd/patches/bison-header.patch b/srcpkgs/olsrd/patches/bison-header.patch
new file mode 100644
index 00000000000..882edeef007
--- /dev/null
+++ b/srcpkgs/olsrd/patches/bison-header.patch
@@ -0,0 +1,10 @@
+--- src/cfgparser/local.mk.orig 2020-11-21 14:03:26.244348554 +0700
++++ src/cfgparser/local.mk 2020-11-21 14:06:09.976236365 +0700
+@@ -77,6 +77,7 @@
+ $(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<"
+ $(MAKECMDPREFIX)sed -e 's/register //' \
+ -e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \
++ -e '/include.*h-tmp/s/-tmp"$$/"/' \
+ < "$@-tmp" >"$@"
+ $(MAKECMDPREFIX)mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)"
+ $(MAKECMDPREFIX)$(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)"
From d2377fd4ac6247316c2af135df4e9fc1c41d723b 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, 21 Nov 2020 16:04:43 +0700
Subject: [PATCH 054/357] pulseview: fix build with qt 5.15
---
srcpkgs/pulseview/patches/qt-5.15.patch | 20 ++++++++++++++++++++
srcpkgs/pulseview/template | 6 +-----
2 files changed, 21 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/pulseview/patches/qt-5.15.patch
diff --git a/srcpkgs/pulseview/patches/qt-5.15.patch b/srcpkgs/pulseview/patches/qt-5.15.patch
new file mode 100644
index 00000000000..986ed098ab5
--- /dev/null
+++ b/srcpkgs/pulseview/patches/qt-5.15.patch
@@ -0,0 +1,20 @@
+--- pv/util.cpp.orig 2020-11-21 15:56:56.690899190 +0700
++++ pv/util.cpp 2020-11-21 16:00:40.981375801 +0700
+@@ -137,7 +137,7 @@
+ QString s;
+ QTextStream ts(&s);
+ if (sign && !v.is_zero())
+- ts << forcesign;
++ Qt::forcesign(ts);
+ ts << qSetRealNumberPrecision(precision) << (v * multiplier);
+ ts << ' ' << prefix << unit;
+
+@@ -175,7 +175,7 @@
+ QString s;
+ QTextStream ts(&s);
+ if (sign && (v != 0))
+- ts << forcesign;
++ Qt::forcesign(ts);
+ ts.setRealNumberNotation(QTextStream::FixedNotation);
+ ts.setRealNumberPrecision(precision);
+ ts << (v * multiplier) << ' ' << prefix << unit;
diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template
index 975b69054ac..83ce80bc39d 100644
--- a/srcpkgs/pulseview/template
+++ b/srcpkgs/pulseview/template
@@ -4,7 +4,7 @@ version=0.4.2
revision=1
build_style=cmake
configure_args="-DDISABLE_WERROR=TRUE"
-hostmakedepends="pkg-config qt5-qmake"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="glib-devel libzip-devel glibmm-devel qt5-devel
qt5-svg-devel qt5-tools-devel boost-devel libsigrok-devel
libsigrokdecode-devel"
@@ -16,8 +16,4 @@ homepage="https://sigrok.org/"
distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=f042f77a3e1b35bf30666330e36ec38fab8d248c3693c37b7e35d401c3bfabcb
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
CXXFLAGS+=" -fext-numeric-literals"
From 04932914b8f466af09da2dda8c48ee3bddca097a 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, 21 Nov 2020 16:22:41 +0700
Subject: [PATCH 055/357] qtikz: use SPDX 3.0 license, fix build Qt 5.15
---
srcpkgs/qtikz/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qtikz/template b/srcpkgs/qtikz/template
index 490b0c183d9..a724860cc42 100644
--- a/srcpkgs/qtikz/template
+++ b/srcpkgs/qtikz/template
@@ -1,15 +1,20 @@
# Template file for 'qtikz'
pkgname=qtikz
version=0.12
-revision=1
+revision=2
wrksrc=ktikz-${version}
build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-plugin-sqlite qt5-devel
+hostmakedepends="qt5-qmake pkg-config qt5-plugin-sqlite qt5-host-tools
qt5-tools"
makedepends="poppler-qt5-devel qt5-devel"
short_desc="Editor for graphics set in TikZ"
maintainer="Piraty <piraty1@inbox.ru>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/"
distfiles="https://github.com/fhackenberger/ktikz/archive/${version}.tar.gz"
checksum=ef15fe70f4e057eab74ed738886f8e4a53d5b1bcdf1ee329930bf06e22f56e9d
+
+post_patch() {
+ vsed -e '/include.*QPainter/a #include <QtGui/QPainterPath>' \
+ -i app/tikzeditor.cpp
+}
From e9d4ede8c9ce2fd99a2cdcf034d74d30637106ab 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, 21 Nov 2020 16:31:36 +0700
Subject: [PATCH 056/357] abcde: remove noarch
---
srcpkgs/abcde/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/abcde/template b/srcpkgs/abcde/template
index 49fe4f97768..d42020e308f 100644
--- a/srcpkgs/abcde/template
+++ b/srcpkgs/abcde/template
@@ -1,8 +1,7 @@
# Template file for 'abcde'
pkgname=abcde
version=2.9.3
-revision=1
-archs=noarch
+revision=2
conf_files="/etc/${pkgname}.conf"
depends="cd-discid perl-MusicBrainz-DiscID perl-WebService-MusicBrainz vorbis-tools"
short_desc="CLI audio CD encoder and tagger"
From b949b4dc42d5a46ec3025953c979c70cc8b9a739 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, 21 Nov 2020 16:31:36 +0700
Subject: [PATCH 057/357] acpilight: remove noarch
---
srcpkgs/acpilight/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/acpilight/template b/srcpkgs/acpilight/template
index 89236bd4c3f..40467c506ea 100644
--- a/srcpkgs/acpilight/template
+++ b/srcpkgs/acpilight/template
@@ -1,8 +1,7 @@
# Template file for 'acpilight'
pkgname=acpilight
version=1.2
-revision=1
-archs=noarch
+revision=2
wrksrc="acpilight-v${version}"
depends="python3"
short_desc="Backward-compatibile xbacklight replacement"
From e598b0580fc478ff869dfb8c1c35a01aeacb0dd4 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 058/357] acr: remove noarch
---
srcpkgs/acr/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/acr/template b/srcpkgs/acr/template
index 773799454b6..b2090f67f32 100644
--- a/srcpkgs/acr/template
+++ b/srcpkgs/acr/template
@@ -1,8 +1,7 @@
# Template file for 'acr'
pkgname=acr
version=1.9.3
-revision=1
-archs=noarch
+revision=2
build_style=gnu-configure
short_desc="AutoConf Replacement"
maintainer="Felipe Nogueira <contato.fnog@gmail.com>"
From 15e95b7f6dc567e9279b215658652304b701ffc5 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 059/357] adapta-kde: remove noarch
---
srcpkgs/adapta-kde/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/adapta-kde/template b/srcpkgs/adapta-kde/template
index 1fc16324be1..f2b427b358e 100644
--- a/srcpkgs/adapta-kde/template
+++ b/srcpkgs/adapta-kde/template
@@ -1,8 +1,7 @@
# Template file for 'adapta-kde'
pkgname=adapta-kde
version=20180828
-revision=1
-archs=noarch
+revision=2
short_desc="Port of the popular GTK theme Adapta for Plasma 5 desktop"
maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
license="GPL-3.0-or-later"
From 216f90e192a18f2610cd075f8192e40622aa2d76 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 060/357] adwaita-plus: remove noarch
---
srcpkgs/adwaita-plus/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/adwaita-plus/template b/srcpkgs/adwaita-plus/template
index c5faf56aeb2..5d861183516 100644
--- a/srcpkgs/adwaita-plus/template
+++ b/srcpkgs/adwaita-plus/template
@@ -1,8 +1,7 @@
# Template file for 'adwaita-plus'
pkgname=adwaita-plus
version=5.0
-revision=1
-archs=noarch
+revision=2
short_desc="Modern third-party icons theme based on GNOME's Adwaita"
maintainer="Gustavo Costa <gusbemacbe@gmail.com>"
license="GPL-3.0-or-later"
From a9d6c97e4fe7377c0d3014fcdb10ad9e4c41a71d 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 061/357] alacritty: remove noarch
---
srcpkgs/alacritty/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 74ddfcd6d65..86626f44080 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,7 +1,7 @@
# Template file for 'alacritty'
pkgname=alacritty
version=0.5.0
-revision=1
+revision=2
build_wrksrc="${pkgname}"
build_style=cargo
hostmakedepends="pkg-config python3"
@@ -28,7 +28,6 @@ post_install() {
alacritty-terminfo_package() {
short_desc+=" - terminfo data"
- archs=noarch
pkg_install() {
vmove usr/share/terminfo
}
From ebc9db0c8ea5ecb2e6695beb4de7ca578c89501d 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 062/357] albatross-themes: remove noarch
---
srcpkgs/albatross-themes/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/albatross-themes/template b/srcpkgs/albatross-themes/template
index ca8ff1b363c..ce8a344c343 100644
--- a/srcpkgs/albatross-themes/template
+++ b/srcpkgs/albatross-themes/template
@@ -1,8 +1,7 @@
# Template file for 'albatross-themes'
pkgname=albatross-themes
version=1.7.4
-revision=2
-archs=noarch
+revision=3
build_style=fetch
depends="gtk+"
short_desc="Elegant black GTK2/3/Metacity/Xfwm theme"
From b8ecdca5da820f985e73eeba8337b4a98fb6142e 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 063/357] angrysearch: remove noarch
---
srcpkgs/angrysearch/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/angrysearch/template b/srcpkgs/angrysearch/template
index 88a6954ac85..96b6b6604ba 100644
--- a/srcpkgs/angrysearch/template
+++ b/srcpkgs/angrysearch/template
@@ -1,19 +1,18 @@
# Template file for 'angrysearch'
pkgname=angrysearch
version=1.0.1
-revision=2
+revision=3
wrksrc="ANGRYsearch-${version}"
+pycompile_dirs="usr/share/angrysearch"
hostmakedepends="python3"
depends="python3-PyQt5 xdg-utils"
-archs=noarch
short_desc="Instant file search"
maintainer="DirectorX <void.directorx@protonmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
homepage="https://github.com/dotheevo/angrysearch/"
-python_version=3
-pycompile_dirs="usr/share/angrysearch"
distfiles="http://github.com/dotheevo/${pkgname}/archive/v${version}.tar.gz"
checksum=9a550649c3efafb26660860758f2e75702ce96a0a0c50dc34ced2967b51a843f
+python_version=3
do_install() {
vinstall angrysearch.desktop 644 "usr/share/applications"
From ff253350c61c3ac81178b2a43c690e0d75f94f64 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 064/357] ansi: remove noarch
---
srcpkgs/ansi/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ansi/template b/srcpkgs/ansi/template
index be114d5203b..acc41f9251c 100644
--- a/srcpkgs/ansi/template
+++ b/srcpkgs/ansi/template
@@ -1,8 +1,7 @@
# Template file for 'ansi'
pkgname=ansi
version=2.0.4
-revision=1
-archs=noarch
+revision=2
depends="bash"
short_desc="ANSI escape codes in pure Bash"
maintainer="Orphaned <orphan@voidlinux.org>"
From 2eb2e6aa9480dfab82c129a93af568d4d5bdb01a 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 065/357] antlr3-bin: remove noarch
---
srcpkgs/antlr3-bin/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/antlr3-bin/template b/srcpkgs/antlr3-bin/template
index 305df8ae69e..e6725f610ab 100644
--- a/srcpkgs/antlr3-bin/template
+++ b/srcpkgs/antlr3-bin/template
@@ -1,8 +1,7 @@
# Template file for 'antlr3-bin'
pkgname=antlr3-bin
version=3.4
-revision=1
-archs=noarch
+revision=2
build_style=fetch
depends="virtual?java-runtime"
short_desc="Parser generator for C++, C#, Java, and Python"
From c3fd54782ebc869810828150e2072036466da002 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 066/357] apache-ant: remove noarch
---
srcpkgs/apache-ant/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/apache-ant/template b/srcpkgs/apache-ant/template
index 80a738985a0..a4ec359fe20 100644
--- a/srcpkgs/apache-ant/template
+++ b/srcpkgs/apache-ant/template
@@ -1,15 +1,14 @@
# Template file for 'apache-ant'
pkgname=apache-ant
version=1.10.8
-revision=1
-archs=noarch
+revision=2
hostmakedepends="openjdk8"
depends="virtual?java-runtime"
short_desc="Java library and command-line tool that help building software"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
-homepage="http://ant.apache.org"
-distfiles="http://mirror.dkd.de/apache/ant/source/apache-ant-${version}-src.tar.xz"
+homepage="https://ant.apache.org"
+distfiles="https://archive.apache.org/dist/ant/source/apache-ant-${version}-src.tar.xz"
checksum=40570314bad3b46abe4ee0669a8f8feb56fe767f1642a801fa7fd4fafcd362ca
python_version=2 # only script uses python2-isms like print ""
@@ -42,7 +41,6 @@ do_install() {
apache-ant-doc_package() {
short_desc+=" - documentation"
depends="${sourcepkg}>=${version}_${revision}"
- archs=noarch
pkg_install() {
vmove $_prefix/manual
}
From 0aa429ff1e24f85a8fd1c8ce450c0fe0221f6252 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 067/357] apache-storm: remove noarch
---
srcpkgs/apache-storm/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index 6ae346a0557..bcb06f4ee08 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -1,8 +1,7 @@
# Template file for 'apache-storm'
pkgname=apache-storm
version=2.2.0
-revision=2
-archs=noarch
+revision=3
depends="virtual?java-runtime python3 bash"
short_desc="Distributed realtime computation system"
maintainer="bougyman <bougyman@voidlinux.org>"
From de206316ed11ecfa32a4b503a1ca51e8c6f9e30c 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 068/357] archlabs-themes: remove noarch
---
srcpkgs/archlabs-themes/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/archlabs-themes/template b/srcpkgs/archlabs-themes/template
index aa648d35457..95f056e6d4e 100644
--- a/srcpkgs/archlabs-themes/template
+++ b/srcpkgs/archlabs-themes/template
@@ -1,10 +1,9 @@
# Template file for 'archlabs-themes'
pkgname=archlabs-themes
version=20180503
-revision=2
+revision=3
_commit=73d0900117daefedf6c76dd0e71538bb954f1b10
wrksrc="ArchLabs-Themes-${_commit}"
-archs=noarch
depends="gnome-themes-standard gtk-engine-murrine gtk2-engines"
short_desc="Themes used in ArchLabs"
maintainer="Orphaned <orphan@voidlinux.org>"
From 714f49da7b120f764fad28df6347d94f1ca08941 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 069/357] argtable: remove noarch
---
srcpkgs/argtable/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/argtable/template b/srcpkgs/argtable/template
index 7083e703a50..b283361b889 100644
--- a/srcpkgs/argtable/template
+++ b/srcpkgs/argtable/template
@@ -1,12 +1,12 @@
# Template file for 'argtable'
pkgname=argtable
version=2.13
-revision=1
+revision=2
wrksrc="${pkgname}${version//./-}"
build_style=gnu-configure
short_desc="ANSI C command line parser"
maintainer="Simon Whelan <si.whelan@gmail.com>"
-license="LGPL-v2"
+license="LGPL-2.0-or-later"
homepage="http://argtable.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/argtable/argtable2-13.tar.gz"
checksum=8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf
@@ -26,7 +26,6 @@ argtable-devel_package() {
argtable-doc_package() {
short_desc+=" - documentation"
depends="${sourcepkg}>=${version}_${revision}"
- archs=noarch
pkg_install() {
vmove usr/share/doc
}
From 3689348b60f9aebdd6cfbacdec4d710ee73da1bd 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 070/357] asciiquarium: remove noarch
---
srcpkgs/asciiquarium/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/asciiquarium/template b/srcpkgs/asciiquarium/template
index 128674e7a6e..32de4aca596 100644
--- a/srcpkgs/asciiquarium/template
+++ b/srcpkgs/asciiquarium/template
@@ -1,8 +1,7 @@
# Template file for 'asciiquarium'
pkgname=asciiquarium
version=1.1
-revision=2
-archs=noarch
+revision=3
wrksrc="${pkgname}_${version}"
depends="perl perl-Term-Animation perl-Curses"
short_desc="Enjoy the mysteries of the sea from the safety of your own terminal"
From d69bb41d3b449249416190b7d600d5e0bf2a73aa 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 071/357] aspell-ru: remove noarch
---
srcpkgs/aspell-ru/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/aspell-ru/template b/srcpkgs/aspell-ru/template
index f0a6d0fa52d..c6592338f38 100644
--- a/srcpkgs/aspell-ru/template
+++ b/srcpkgs/aspell-ru/template
@@ -1,7 +1,7 @@
# Template file for 'aspell-ru'
pkgname=aspell-ru
version=0.99f7
-revision=2
+revision=3
wrksrc="aspell6-ru-${version}-1"
build_style=configure
hostmakedepends="aspell-devel which"
@@ -14,7 +14,6 @@ checksum=5c29b6ccce57bc3f7c4fb0510d330446b9c769e59c92bdfede27333808b6e646
words-ru_package() {
short_desc="Russian dictionary word list"
- archs=noarch
pkg_install() {
vmkdir usr/share/dict
precat *.cwl |
From 1538fc78599d10c19948a885255724ef714c3d36 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 072/357] astromenace: remove noarch
---
srcpkgs/astromenace-data | 1 -
srcpkgs/astromenace/template | 13 ++-----------
2 files changed, 2 insertions(+), 12 deletions(-)
delete mode 120000 srcpkgs/astromenace-data
diff --git a/srcpkgs/astromenace-data b/srcpkgs/astromenace-data
deleted file mode 120000
index 6c0834e519d..00000000000
--- a/srcpkgs/astromenace-data
+++ /dev/null
@@ -1 +0,0 @@
-astromenace
\ No newline at end of file
diff --git a/srcpkgs/astromenace/template b/srcpkgs/astromenace/template
index ae6bbc38330..5008426e40b 100644
--- a/srcpkgs/astromenace/template
+++ b/srcpkgs/astromenace/template
@@ -1,19 +1,19 @@
# Template file for 'astromenace'
pkgname=astromenace
version=1.4.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DDATADIR=/usr/share/astromenace -DDONTCREATEVFS=TRUE"
hostmakedepends="pkg-config"
makedepends="SDL2-devel glu-devel libopenal-devel freealut-devel libvorbis-devel
fontconfig-devel freetype-devel libXinerama-devel"
-depends="astromenace-data>=${version}_${revision}"
short_desc="Hardcore 3D space shooter"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-3.0-or-later, OFL-1.1, CC-BY-SA-3.0"
homepage="http://www.viewizard.com/"
distfiles="https://github.com/viewizard/astromenace/archive/v${version}.tar.gz"
checksum=0aca5211c9f333acf698807f597e5ad8e9d1455ba8ad202940890bff5b6c9507
+replaces="astromenace-data>=0"
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/GL"
@@ -31,12 +31,3 @@ do_install() {
vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
vinstall share/astromenace.appdata.xml 644 usr/share/appdata
}
-
-astromenace-data_package() {
- short_desc+=" - data file"
- archs=noarch
- pkg_install() {
- vmkdir usr/share/astromenace
- vcopy ${wrksrc}/gamedata usr/share/astromenace
- }
-}
From 42f8f5b12c45869b706ff60998d6620ebaaae650 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 073/357] asus-kbd-backlight: remove noarch
---
srcpkgs/asus-kbd-backlight/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/asus-kbd-backlight/template b/srcpkgs/asus-kbd-backlight/template
index e58e8341650..a3d116b0539 100644
--- a/srcpkgs/asus-kbd-backlight/template
+++ b/srcpkgs/asus-kbd-backlight/template
@@ -1,13 +1,12 @@
# Template file for 'asus-kbd-backlight'
pkgname=asus-kbd-backlight
version=1.2
-revision=1
+revision=2
create_wrksrc=yes
-archs=noarch
depends="bash"
short_desc="Helper for adjusting keyboard backlight brightness in Asus Zenbook"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="FDL1.3"
+license="GFDL-1.3-or-later"
homepage="https://wiki.archlinux.org/index.php/ASUS_Zenbook_Prime_UX31A#keyboard_backlight_script"
do_install() {
From 7fb22424e0041760d713576c2f06dbd1000e21b9 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 074/357] atool: remove noarch
---
srcpkgs/atool/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/atool/template b/srcpkgs/atool/template
index 56264dd3e16..6e20f366e7e 100644
--- a/srcpkgs/atool/template
+++ b/srcpkgs/atool/template
@@ -1,12 +1,11 @@
# Template file for 'atool'
pkgname=atool
version=0.39.0
-revision=5
-archs=noarch
+revision=6
build_style=gnu-configure
hostmakedepends="perl"
depends="perl"
-short_desc="A script for managing file archives of various types"
+short_desc="Script for managing file archives of various types"
maintainer="Georg Schabel <gescha@posteo.de>"
license="GPL-2.0-or-later"
homepage="http://www.nongnu.org/atool/"
From 00943f678a24d4bfd0bd69298cc8a9903a9004bb 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 075/357] auto-auto-complete: remove noarch
---
srcpkgs/auto-auto-complete/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/auto-auto-complete/template b/srcpkgs/auto-auto-complete/template
index 2fa45c4fc47..065d615c2b5 100644
--- a/srcpkgs/auto-auto-complete/template
+++ b/srcpkgs/auto-auto-complete/template
@@ -1,8 +1,7 @@
# Template file for 'auto-auto-complete'
pkgname=auto-auto-complete
version=7.2
-revision=4
-archs=noarch
+revision=5
build_style=gnu-makefile
hostmakedepends="python3 texinfo"
depends="python3"
From 53b34f2833c79df9c4e08fb13bc7cab6ae06d13d 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 076/357] autojump: remove noarch
---
srcpkgs/autojump/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/autojump/template b/srcpkgs/autojump/template
index 2448a2dd894..5b17e447df4 100644
--- a/srcpkgs/autojump/template
+++ b/srcpkgs/autojump/template
@@ -1,8 +1,7 @@
# Template file for 'autojump'
pkgname=autojump
version=22.5.3
-revision=2
-archs=noarch
+revision=3
wrksrc="${pkgname}-release-v${version}"
hostmakedepends="python3"
depends="python3"
From eea2055535052b74729b87e613551e112174d16c 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 077/357] awoken-icons: remove noarch
---
srcpkgs/awoken-icons/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/awoken-icons/template b/srcpkgs/awoken-icons/template
index f52c4f48187..c2d159acc08 100644
--- a/srcpkgs/awoken-icons/template
+++ b/srcpkgs/awoken-icons/template
@@ -1,13 +1,13 @@
# Template file for 'awoken-icons'
pkgname=awoken-icons
version=2.5.2
-revision=4
-archs=noarch
+revision=5
wrksrc=AwOken-2.5
hostmakedepends="unzip"
short_desc="Simple and quite complete icon set, Token-style"
maintainer="Steven R <dev@styez.com>"
-license="CCPL:by-sa"
+# https://github.com/alecive/FlatWoken
+license="CC-BY-SA-4.0"
homepage="http://alecive.deviantart.com/art/AwOken-163570862"
distfiles="https://dl.dropbox.com/s/p3hfu7jw3vv7os9/AwOken-2.5.zip"
checksum=d122ee0457079aaa30a664ae582fbc6208414e8728f497dce399ed9f33f9b36e
@@ -39,7 +39,6 @@ do_install() {
awoken-icons-dark_package() {
depends="awoken-icons>=${version}"
short_desc+=" - Dark icons"
- archs=noarch
pkg_install() {
vmove usr/share/icons/AwOkenDark
}
@@ -48,7 +47,6 @@ awoken-icons-dark_package() {
awoken-icons-white_package() {
depends="awoken-icons>=${version}"
short_desc+=" - White icons"
- archs=noarch
pkg_install() {
vmove usr/share/icons/AwOkenWhite
}
From f0a1b8e00d965cc91a9355333518d204b1c5743d 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 078/357] b43-firmware-classic: remove noarch
---
srcpkgs/b43-firmware-classic/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/b43-firmware-classic/template b/srcpkgs/b43-firmware-classic/template
index b38e6ac7ee6..80459fc2b71 100644
--- a/srcpkgs/b43-firmware-classic/template
+++ b/srcpkgs/b43-firmware-classic/template
@@ -1,8 +1,7 @@
# Template file for 'b43-firmware-classic'
pkgname=b43-firmware-classic
version=5.100.138
-revision=1
-archs=noarch
+revision=2
wrksrc="broadcom-wl-${version}"
hostmakedepends="b43-fwcutter"
short_desc="Firmware for Broadcom B43 wireless (trusted release)"
From 7172c5bbda5c4323a4ca89fd7cf022c595432b8c 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 079/357] b43-firmware: remove noarch
---
srcpkgs/b43-firmware/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/b43-firmware/template b/srcpkgs/b43-firmware/template
index e5f894b81e7..a527b48f94a 100644
--- a/srcpkgs/b43-firmware/template
+++ b/srcpkgs/b43-firmware/template
@@ -1,8 +1,7 @@
# Template file for 'b43-firmware'
pkgname=b43-firmware
version=6.30.163.46
-revision=1
-archs=noarch
+revision=2
wrksrc="${pkgname}"
create_wrksrc=yes
hostmakedepends="b43-fwcutter"
From 4b909977b8b134b1b87bb809278f19c54361ad1c 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 080/357] bash-preexec: remove noarch
---
srcpkgs/bash-preexec/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/bash-preexec/template b/srcpkgs/bash-preexec/template
index 771ff0426ff..71a5f696c12 100644
--- a/srcpkgs/bash-preexec/template
+++ b/srcpkgs/bash-preexec/template
@@ -1,8 +1,7 @@
# Template file for 'bash-preexec'
pkgname=bash-preexec
version=0.3.7
-revision=1
-archs=noarch
+revision=2
depends="bash"
short_desc="Preexec and Precmd functions for Bash just like Zsh"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 04a2ef1202d37d140555bbd7548ec61a3782edce 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 081/357] bats: remove noarch
---
srcpkgs/bats/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/bats/template b/srcpkgs/bats/template
index 890b0d14e54..ee85a77bb19 100644
--- a/srcpkgs/bats/template
+++ b/srcpkgs/bats/template
@@ -1,8 +1,7 @@
# Template file for 'bats'
pkgname=bats
version=1.2.0
-revision=1
-archs=noarch
+revision=2
wrksrc="bats-core-${version}"
depends="bash"
short_desc="Bash Automated Testing System"
From 3c74a0ad58083099d972a59ce0d544d6549added 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 082/357] beard: remove noarch
---
srcpkgs/beard/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/beard/template b/srcpkgs/beard/template
index 93d69607399..306a6394e56 100644
--- a/srcpkgs/beard/template
+++ b/srcpkgs/beard/template
@@ -1,8 +1,7 @@
# Template file for 'beard'
pkgname=beard
version=0.3
-revision=1
-archs=noarch
+revision=2
short_desc="Simple hibernation daemon"
maintainer="Samantha Baldwin <fuhsaz+void@cryptic.li>"
license="Unlicense"
From c60d9449930a51536d08f0d75eee699515742d63 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 083/357] betterlockscreen: remove noarch
---
srcpkgs/betterlockscreen/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/betterlockscreen/template b/srcpkgs/betterlockscreen/template
index c38dd536e77..c0e5d710f15 100644
--- a/srcpkgs/betterlockscreen/template
+++ b/srcpkgs/betterlockscreen/template
@@ -1,8 +1,7 @@
# Template file for 'betterlockscreen'
pkgname=betterlockscreen
version=3.0.1
-revision=2
-archs=noarch
+revision=3
depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb"
short_desc="Sweet looking lockscreen for linux system"
maintainer="Aleksander Zien <Aleks@nderZien.com>"
From 1a520869d1cf6d134cb71acabaf43e6160c1af4b 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 084/357] biosdisk: remove noarch
---
srcpkgs/biosdisk/template | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/biosdisk/template b/srcpkgs/biosdisk/template
index 324d249d36c..0b22e56f313 100644
--- a/srcpkgs/biosdisk/template
+++ b/srcpkgs/biosdisk/template
@@ -1,18 +1,13 @@
# Template file for 'biosdisk'
pkgname=biosdisk
version=1.01
-revision=1
+revision=2
+archs="i686* x86_64*"
build_style=gnu-makefile
-archs=noarch
depends="syslinux wget cdrtools"
short_desc="Utility for creating Dell BIOS flash disks"
maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
homepage="https://github.com/dell/biosdisk"
distfiles="https://github.com/dell/biosdisk/archive/${version}.tar.gz"
checksum=e89cf680914ab3d5bbb549c124c6c29594ef495880befc0d059ec8a3aaf1e3e7
-
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
- *) broken="only for x86";;
-esac
From cac202237445a73fbbdee30d0c2efd45e7b22932 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 085/357] bitfighter: remove noarch
---
srcpkgs/bitfighter-data | 1 -
srcpkgs/bitfighter/template | 15 ++++-----------
2 files changed, 4 insertions(+), 12 deletions(-)
delete mode 120000 srcpkgs/bitfighter-data
diff --git a/srcpkgs/bitfighter-data b/srcpkgs/bitfighter-data
deleted file mode 120000
index 0ed1e91d70b..00000000000
--- a/srcpkgs/bitfighter-data
+++ /dev/null
@@ -1 +0,0 @@
-bitfighter
\ No newline at end of file
diff --git a/srcpkgs/bitfighter/template b/srcpkgs/bitfighter/template
index a91443cbc3c..c3b2cc22a26 100644
--- a/srcpkgs/bitfighter/template
+++ b/srcpkgs/bitfighter/template
@@ -1,7 +1,7 @@
# Template file for 'bitfighter'
pkgname=bitfighter
version=019g
-revision=1
+revision=2
build_style=cmake
configure_args="-DMASTER_MINIMAL=1 -DLUAJIT_BUILTIN=OFF"
hostmakedepends="pkg-config unzip"
@@ -9,7 +9,7 @@ makedepends="boost-devel MesaLib-devel SDL2-devel LuaJIT-devel
libopenal-devel libmariadbclient-devel libmodplug-devel
libpng-devel libtomcrypt-devel speex-devel
clipper-devel alure-devel"
-depends="desktop-file-utils libmpg123 bitfighter-data"
+depends="desktop-file-utils libmpg123"
short_desc="Fast-paced team-based outer-space multi-player arcade game"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -18,18 +18,11 @@ distfiles="http://bitfighter.org/files/${pkgname}-${version}.tar.gz
http://bitfighter.org/files/classic_level_pack.zip"
checksum="cd47c453d9e6875ded627b987a645e2ff2c757363f394b152f62d868e1d81427
d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b"
-python_version=2 #unverified
+python_version=2
+replaces="bitfighter-data>=0"
CXXFLAGS="-Wno-narrowing"
post_install() {
vcopy ../classic_level_pack/* usr/share/bitfighter/levels
}
-
-bitfighter-data_package() {
- short_desc+=" - classic level pack"
- archs=noarch
- pkg_install() {
- vmove usr/share/bitfighter
- }
-}
From 666d3a41cacd52babcfd02c57fabba85507d09ee 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 086/357] blackbird-themes: remove noarch
---
srcpkgs/blackbird-themes/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/blackbird-themes/template b/srcpkgs/blackbird-themes/template
index 0e4de2ad703..68ced568cbc 100644
--- a/srcpkgs/blackbird-themes/template
+++ b/srcpkgs/blackbird-themes/template
@@ -1,8 +1,7 @@
# Template file for 'blackbird-themes'
pkgname=blackbird-themes
version=0.4
-revision=3
-archs=noarch
+revision=4
build_style=fetch
depends="gtk+"
short_desc="Elegant dark GTK2/3/Metacity/Xfwm theme"
From 1161d491a8ddfd085ad3f1e2bb4d895c9ca1ee70 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 087/357] blackbox: remove noarch
---
srcpkgs/blackbox/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/blackbox/template b/srcpkgs/blackbox/template
index cc7fbdc68b0..e0d94abf4a5 100644
--- a/srcpkgs/blackbox/template
+++ b/srcpkgs/blackbox/template
@@ -1,8 +1,7 @@
# Template file for 'blackbox'
pkgname=blackbox
version=1.20181219
-revision=1
-archs=noarch
+revision=2
depends="bash"
short_desc="Safely store secrets in Git/Mercurial/Subversion"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
From ea3ba819fb43768b68727d343c71c159e9d1bf22 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 088/357] blazeblogger: remove noarch
---
srcpkgs/blazeblogger/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blazeblogger/template b/srcpkgs/blazeblogger/template
index 0eb8d776fc8..df2c50a91a9 100644
--- a/srcpkgs/blazeblogger/template
+++ b/srcpkgs/blazeblogger/template
@@ -1,15 +1,14 @@
# Template file for 'blazeblogger'
pkgname=blazeblogger
version=1.2.0
-revision=2
-archs=noarch
+revision=3
hostmakedepends="perl"
depends="perl"
short_desc="CLI blogging CMS"
maintainer="Logen K <logen@sudotask.com>"
-license="GPL-3"
+license="GPL-3.0-only"
homepage="http://blaze.blackened.cz/"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/blazeblogger/blazeblogger-1.2.0.tar.gz"
+distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/blazeblogger/blazeblogger-$version.tar.gz"
checksum=39024b70708be6073e8aeb3943eb3b73d441fbb7b8113e145c0cf7540c4921aa
do_install() {
From 161278631f5bec65a75f2f19628aafcdcd12901e 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 089/357] bluebird-themes: remove noarch
---
srcpkgs/bluebird-themes/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/bluebird-themes/template b/srcpkgs/bluebird-themes/template
index 47034af481c..ad67f8bc960 100644
--- a/srcpkgs/bluebird-themes/template
+++ b/srcpkgs/bluebird-themes/template
@@ -1,8 +1,7 @@
# Template file for 'bluebird-themes'
pkgname=bluebird-themes
version=1.3
-revision=1
-archs=noarch
+revision=2
build_style=fetch
depends="gtk+"
short_desc="Elegant blue GTK2/3/Metacity/Xfwm theme"
From cc98ab2eff03916fac5c8e1b91f3ed49dceabe72 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 090/357] breeze-cursors: remove noarch
---
srcpkgs/breeze-cursors/template | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/srcpkgs/breeze-cursors/template b/srcpkgs/breeze-cursors/template
index 579ad8ffaa8..f1a95c1d113 100644
--- a/srcpkgs/breeze-cursors/template
+++ b/srcpkgs/breeze-cursors/template
@@ -1,8 +1,7 @@
# Template file for 'breeze-cursors'
pkgname=breeze-cursors
version=1.0
-revision=2
-archs=noarch
+revision=3
create_wrksrc=yes
build_style=meta
depends="breeze-amber-cursor-theme
@@ -56,49 +55,42 @@ do_install() {
}
breeze-amber-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Amber cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Amber
}
}
breeze-blue-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Blue cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Blue
}
}
breeze-contrast-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Contrast cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Contrast
}
}
breeze-hacked-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Hacked cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Hacked
}
}
breeze-obsidian-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Obsidian cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Obsidian
}
}
breeze-purple-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Purple cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Purple
}
}
breeze-red-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Red cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Red
From a01f58145af7976d99a8b9b5009979517a9f5d46 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 091/357] broadcom-bt-firmware: remove noarch
---
srcpkgs/broadcom-bt-firmware/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/broadcom-bt-firmware/template b/srcpkgs/broadcom-bt-firmware/template
index 8aeef706d15..2345f00f7a5 100644
--- a/srcpkgs/broadcom-bt-firmware/template
+++ b/srcpkgs/broadcom-bt-firmware/template
@@ -1,9 +1,8 @@
# Template file for 'broadcom-bt-firmware'
pkgname=broadcom-bt-firmware
version=12.0.1.1105
-revision=1
+revision=2
_patch=_p1
-archs=noarch
wrksrc="${pkgname}-${version}${_patch}"
hostmakedepends="perl"
short_desc="Broadcom Bluetooth firmware for Linux kernel"
From efd332a84c58d1cb77297aaf2711cf65640d45d6 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 092/357] bsdbuild: remove noarch
---
srcpkgs/bsdbuild/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/bsdbuild/template b/srcpkgs/bsdbuild/template
index 11115999c94..8ece9e701b9 100644
--- a/srcpkgs/bsdbuild/template
+++ b/srcpkgs/bsdbuild/template
@@ -1,8 +1,7 @@
# Template file for 'bsdbuild'
pkgname=bsdbuild
version=3.1
-revision=2
-archs=noarch
+revision=3
build_style=gnu-configure
configure_args="--with-manpages --with-manlinks"
hostmakedepends="groff perl"
From 95f83d96c17a18bb1d1254438553d1767202f840 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 093/357] bucklespring: remove noarch
---
srcpkgs/bucklespring/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/bucklespring/template b/srcpkgs/bucklespring/template
index ac9bfd3b499..2e4568bb746 100644
--- a/srcpkgs/bucklespring/template
+++ b/srcpkgs/bucklespring/template
@@ -1,7 +1,7 @@
# Template file for 'bucklespring'
pkgname=bucklespring
version=1.4.0
-revision=1
+revision=2
build_style=gnu-makefile
make_use_env=yes
make_build_args="PATH_AUDIO=/usr/share/${pkgname}/wav"
@@ -27,7 +27,6 @@ do_install() {
bucklespring-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share
}
From 3391acbeba953d40a2f403b734e485b5e8a0c9fa 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 094/357] buku: remove noarch
---
srcpkgs/buku/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/buku/template b/srcpkgs/buku/template
index 5a5be1e8d2c..9925789acb2 100644
--- a/srcpkgs/buku/template
+++ b/srcpkgs/buku/template
@@ -1,8 +1,7 @@
# Template file for 'buku'
pkgname=buku
version=4.3
-revision=1
-archs=noarch
+revision=2
depends="python3-urllib3 python3-BeautifulSoup4 python3-cryptography python3-html5lib"
short_desc="Cmdline bookmark management utility"
maintainer="Diogo Leal <diogo@diogoleal.com>"
From dce5e9dc21c8b27c831def6179e9af12eb9e73c8 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 095/357] burp2-server: remove noarch
---
srcpkgs/burp2-server/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index 9845f6afe9e..edda1f11f7e 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,7 +3,7 @@ _desc="Network-based backup and restore program"
pkgname=burp2-server
version=2.2.18
-revision=3
+revision=4
wrksrc="burp-${version}"
build_style=gnu-configure
make_install_target=install-all
@@ -79,7 +79,6 @@ burp2-client_package() {
burp2-doc_package() {
short_desc="${_desc} - Doc and examples"
- archs=noarch
pkg_install() {
vmove usr/share/doc/burp
vmove usr/share/examples
From b6cbe53230809b5740845274ef3cdf04c7a050e7 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 096/357] bwidget: remove noarch, update checksum.
Everything is the same but permission (755 -> 644)
---
srcpkgs/bwidget/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/bwidget/template b/srcpkgs/bwidget/template
index b6c57fccb25..c365e64d225 100644
--- a/srcpkgs/bwidget/template
+++ b/srcpkgs/bwidget/template
@@ -1,8 +1,7 @@
# Template file for 'bwidget'
pkgname=bwidget
version=1.9.14
-revision=1
-archs=noarch
+revision=2
makedepends="tk"
depends="tk"
short_desc="Set of extension widgets for Tcl/Tk"
@@ -10,14 +9,11 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="TCL"
homepage="http://tcllib.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/tcllib/BWidget/${version}/${pkgname}-${version}.tar.gz"
-checksum=531a6ecfa33114471dd58b0bedd5f9ff6f311c792fc1a030d8e454c5ebb5d44e
+checksum=8e9692140167161877601445e7a5b9da5bb738ce8d08ee99b016629bc784a672
do_install() {
local _tclversion=8.6
vmkdir usr/lib/tcl8.6/BWidget
- bsdtar xzvf $XBPS_SRCDISTDIR/${pkgname}-${version}/$pkgname-$version.tar.gz -C $DESTDIR/usr/lib/tcl$_tclversion/
- mv $DESTDIR/usr/lib/tcl$_tclversion/$pkgname-$version/* \
- $DESTDIR/usr/lib/tcl$_tclversion/BWidget
- rmdir $DESTDIR/usr/lib/tcl8.6/$pkgname-$version
+ vcopy "*" usr/lib/tcl8.6/BWidget
}
From 60b76659ed77ddc1d5f93803c82746d657c438ae 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, 21 Nov 2020 17:20:14 +0700
Subject: [PATCH 097/357] byobu: remove noarch
---
srcpkgs/byobu/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/byobu/template b/srcpkgs/byobu/template
index 29c355cb943..1436dfccbcc 100644
--- a/srcpkgs/byobu/template
+++ b/srcpkgs/byobu/template
@@ -1,8 +1,7 @@
# Template file for 'byobu'
pkgname=byobu
version=5.133
-revision=1
-archs=noarch
+revision=2
build_style=gnu-configure
depends="tmux"
short_desc="Open source text-based window manager and terminal multiplexer"
From bef091665652e09a51701b76f2171c34fb9018b6 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, 21 Nov 2020 17:20:14 +0700
Subject: [PATCH 098/357] bzrtools: remove noarch
---
srcpkgs/bzrtools/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/bzrtools/template b/srcpkgs/bzrtools/template
index 0c31b0fa84e..05492b1b5e2 100644
--- a/srcpkgs/bzrtools/template
+++ b/srcpkgs/bzrtools/template
@@ -1,11 +1,9 @@
# Template file for 'bzrtools'
pkgname=bzrtools
version=2.6.0
-revision=3
-archs=noarch
+revision=4
wrksrc=bzrtools
build_style=python2-module
-pycompile_module="bzrlib/plugins/bzrtools"
hostmakedepends="python"
makedepends="python bzr"
depends="${makedepends}"
From 93f0c6e1cff63aa2e5b81828afa6477b7d5d1fea 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, 21 Nov 2020 17:39:30 +0700
Subject: [PATCH 099/357] soundkonverter: fix ftbfs
---
srcpkgs/soundkonverter/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
index 7a26b9a48a8..e11cd964264 100644
--- a/srcpkgs/soundkonverter/template
+++ b/srcpkgs/soundkonverter/template
@@ -4,7 +4,9 @@ version=3.0.1
revision=2
build_wrksrc=src
build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
+ qt5-host-tools pkg-config"
makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
qt5-devel taglib-devel ksolid-devel"
depends="hicolor-icon-theme"
@@ -15,6 +17,4 @@ homepage="https://github.com/dfaust/soundkonverter"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-qmake qt5-host-tools"
-fi
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From b0856be328e0383373409da1438459eb80edf43a 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, 21 Nov 2020 19:37:13 +0700
Subject: [PATCH 100/357] splint: fix build with new bison
---
srcpkgs/splint/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/splint/template b/srcpkgs/splint/template
index d51bba366a5..4e3a93eaf29 100644
--- a/srcpkgs/splint/template
+++ b/srcpkgs/splint/template
@@ -15,6 +15,7 @@ checksum=51cd7ba978a366ae1ededac2b927058fd5f45d5455e5a9d640b75ab4e45b748a
disable_parallel_build=yes
nocross=yes
-post_extract() {
- sed -i 's/__pid_t/pid_t/g' src/osd.c
+post_patch() {
+ vsed -i 's/__pid_t/pid_t/g' src/osd.c
+ vsed -i -e '/RM.*[.]tab[.]h/d' src/Makefile.am src/Makefile.in
}
From 19bd78007bf23b32dc1c2a58c47a5283bf88f1ec 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, 21 Nov 2020 19:46:24 +0700
Subject: [PATCH 101/357] telepathy-salut: fix ftbfs, expand license
---
srcpkgs/telepathy-salut/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index 93bcbd233ed..e5cf92d2d0c 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,21 +1,20 @@
# Template file for 'telepathy-salut'
pkgname=telepathy-salut
version=0.8.1
-revision=18
+revision=19
lib32disabled=yes
build_style=gnu-configure
configure_args="--disable-tests --disable-plugins --with-tls=openssl
--disable-avahi-tests --disable-static"
-hostmakedepends="pkg-config xmldiff glib-devel"
+hostmakedepends="pkg-config python xmldiff glib-devel"
makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
libressl-devel libuuid-devel sqlite-devel"
depends="avahi"
-short_desc="A link-local XMPP connection manager for Telepathy"
+short_desc="Link-local XMPP connection manager for Telepathy"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://telepathy.freedesktop.org"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=70b9108ac8b511b7688e1b580de4ddb8981603c3cbde01f287ef8f9cb708618e
-# http://build.voidlinux.org/builders/armv7l_builder/builds/16213/steps/shell_3/logs/stdio
-nocross=yes
+nocross="http://build.voidlinux.org/builders/armv7l_builder/builds/16213/steps/shell_3/logs/stdio"
From e11a40944d8330dd99aef1cdf0d37f307783d6e6 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, 21 Nov 2020 19:51:33 +0700
Subject: [PATCH 102/357] vala-panel: fix ftbfs
---
srcpkgs/vala-panel/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/vala-panel/template b/srcpkgs/vala-panel/template
index 9d681d5ae1a..86ac40b49a7 100644
--- a/srcpkgs/vala-panel/template
+++ b/srcpkgs/vala-panel/template
@@ -12,6 +12,8 @@ homepage="https://gitlab.com/vala-panel-project/vala-panel"
distfiles="https://gitlab.com/vala-panel-project/vala-panel/uploads/c42b5fbbfb42c5889e7184f5ead03f65/vala-panel-${version}.tar.xz"
checksum=09635f557e3d52894267a66297552119e874a25f9366bf5a1eeda8cfba948462
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/harfbuzz"
+
vala-panel-devel_package() {
short_desc+=" - development files"
depends="vala-panel-${version}_${revision}"
From 8ba919a7f982f0228c6321baa5d9dc3deb638a9c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 13:41:36 +0100
Subject: [PATCH 103/357] awsume: update to 4.5.0.
---
srcpkgs/awsume/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/awsume/template b/srcpkgs/awsume/template
index 3c216c098b5..b7c5edb6b59 100644
--- a/srcpkgs/awsume/template
+++ b/srcpkgs/awsume/template
@@ -1,18 +1,18 @@
# Template file for 'awsume'
pkgname=awsume
-version=4.4.1
-revision=3
+version=4.5.0
+revision=1
build_style=python3-module
hostmakedepends="python3 python3-setuptools"
makedepends="python3-argcomplete python3-boto3 python3-colorama python3-coverage
python3-pluggy python3-psutil python3-xmltodict python3-yaml"
-depends="$makedepends"
+depends="${makedepends}"
short_desc="Utility for easily assuming AWS IAM roles from the command line"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://awsu.me/"
distfiles="https://github.com/trek10inc/awsume/archive/${version}.tar.gz"
-checksum=66d698b4716a1dc7c927778a8fe124a6ac2d99334aff2be5dac6b13598b4e08f
+checksum=3b506e08727400f32886db522477e3ae73d5941266611abbd9a470f3bb17d80b
post_install() {
rm ${DESTDIR}/usr/bin/awsume.*
From b693daa0b9da2e294bcb71ee6f504acc6701825c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 13:47:12 +0100
Subject: [PATCH 104/357] djview: update to 4.12.
---
srcpkgs/djview/template | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index e39d2a23576..136bcced9fb 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -1,18 +1,19 @@
# Template file for 'djview'
pkgname=djview
-version=4.10.6
-revision=2
+version=4.12
+revision=1
+wrksrc="djview4-${version}"
build_style=gnu-configure
build_helper=qmake
configure_args="QMAKE=qmake-qt5"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
+hostmakedepends="automake pkg-config qt5-host-tools qt5-qmake libtool"
makedepends="qt5-devel djvulibre-devel libxkbcommon-devel libSM-devel libXt-devel"
short_desc="Portable DjVu viewer and browser plugin"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://djvu.sourceforge.net/djview4.html"
distfiles="${SOURCEFORGE_SITE}/djvu/${pkgname}-${version}.tar.gz"
-checksum=8446f3cd692238421a342f12baa365528445637bffb96899f319fe762fda7c21
+checksum=5673c6a8b7e195b91a1720b24091915b8145de34879db1158bc936b100eaf3e3
if [ "${CROSS_BUILD}" ]; then
configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
@@ -23,3 +24,7 @@ post_extract() {
-e '/StartupWMClass/s/Djview4/DjView/' \
desktopfiles/djvulibre-djview4.desktop
}
+
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
From 10c2085f4e62fd4a306c44c35cb6e535f0ea1684 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 14:04:49 +0100
Subject: [PATCH 105/357] libX11: update to 1.7.0.
---
srcpkgs/libX11/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 407b2199106..2c62d583432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
# Template file for 'libX11'
pkgname=libX11
-version=1.6.12
+version=1.7.0
revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=f108227469419ac04d196df0f3b80ce1f7f65059bb54c0de811f4d8e03fd6ec7
+checksum=36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libtool automake xorgproto xtrans"
From db4588a30aabb1003f49656328815f6920ffd711 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 14:04:53 +0100
Subject: [PATCH 106/357] python3-boto3: update to 1.16.23.
---
srcpkgs/python3-boto3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 8d32ad71612..4c8a67faabc 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
# Template file for 'python3-boto3'
pkgname=python3-boto3
-version=1.16.19
+version=1.16.23
revision=1
wrksrc="boto3-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/boto/boto3"
distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=5593164dc333131059c338e525eefeabe1d5195479e963e3a6cfb45ccff13c45
+checksum=370f7c8aaf9c31f683a8aa5fa3c0a3e616e633f9e0d23778ed8a32564086cba7
post_install() {
vlicense LICENSE
From 5297c77ef94822e15e09e9067a2899d3080c42a8 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sat, 21 Nov 2020 02:25:40 +0200
Subject: [PATCH 107/357] R-cran-R6: update to 2.5.0.
---
srcpkgs/R-cran-R6/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 8c06f5a3cf7..3c35ffadb06 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-R6'
pkgname=R-cran-R6
-version=2.4.1
-revision=2
+version=2.5.0
+revision=1
build_style=R-cran
short_desc="Classes with Reference Semantics"
maintainer="Florian Wagner <florian@wagner-flo.net>"
license="MIT"
homepage="https://github.com/r-lib/R6"
-checksum=26b0fd64827655c28c903f7ff623e839447387f3ad9b04939a02f41ac82faa3e
+checksum=aec1af9626ec532cb883b544bf9eff4cb2d89c343c7ce0fa31761ec5a7882e02
post_install() {
vlicense LICENSE
From 24cef97fa8756873e0fd9d5071e0e8a184944519 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sat, 21 Nov 2020 02:25:50 +0200
Subject: [PATCH 108/357] R-cran-ps: update to 1.4.0.
---
srcpkgs/R-cran-ps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index 1f95a5d7f2c..d4497a4d234 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-ps'
pkgname=R-cran-ps
-version=1.3.4
+version=1.4.0
revision=1
build_style=R-cran
short_desc="List, Query, Manipulate System Processes"
maintainer="Luke Hannan <lukehannan@gmail.com>"
-license="BSD-3-Clause"
+license="MIT"
homepage="https://github.com/r-lib/ps"
-checksum=8468c6994e199053050c614fb3e6ee0e670833a0185abf53d6cb09e19c85aeb3
+checksum=5f79ae4489090e07abbea892049ec0db900d31955237b388664289e6dc00da7a
post_install() {
vlicense LICENSE
From 578e9b44cf23c4ec007a5f8c76d0fedb3b18a8e2 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sat, 21 Nov 2020 02:26:01 +0200
Subject: [PATCH 109/357] R-cran-processx: update to 3.4.4.
---
srcpkgs/R-cran-processx/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index e051b4b3682..9560ded758b 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -1,7 +1,7 @@
# Template file for 'R-cran-processx'
pkgname=R-cran-processx
-version=3.4.3
-revision=2
+version=3.4.4
+revision=1
build_style=R-cran
hostmakedepends="R-cran-ps R-cran-R6"
depends="R-cran-ps R-cran-R6"
@@ -9,7 +9,7 @@ short_desc="Execute and Control System Processes"
maintainer="Luke Hannan <lukehannan@gmail.com>"
license="MIT"
homepage="https://github.com/r-lib/processx"
-checksum=f247f2180f72e59f1e6d7149ddb44796698eb6be97cc8c479d5f488b65fcb01d
+checksum=aaa40f10a6670eeb451e038bc0eb7c16f263dacb797f76d965b9fc75dda7482b
post_install() {
vlicense LICENSE
From bcdd1f0f1025fd04a87875446f87b7defbd27367 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sat, 21 Nov 2020 08:09:43 -0800
Subject: [PATCH 110/357] NetAuth-ldap: update to 0.2.0
---
srcpkgs/NetAuth-ldap/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index 105d5c6ee0f..425ccf49079 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,6 +1,6 @@
# Template file for 'NetAuth-ldap'
pkgname=NetAuth-ldap
-version=0.1.0
+version=0.2.0
revision=1
wrksrc=ldap-$version
build_style=go
@@ -8,11 +8,11 @@ go_import_path=github.com/netauth/ldap
go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"
hostmakedepends="git"
short_desc="LDAP Proxy for NetAuth"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+maintainer="Michael Aldridge <maldridge@netauth.org>"
license="MIT"
homepage="https://www.netauth.org/ecosystem/ldap"
distfiles="https://github.com/netauth/ldap/archive/v$version.tar.gz"
-checksum=e179918429f133f8360bf9ee6a1ceefa283f245bf5ee0b705676fff9e1442fb4
+checksum=581b60475e940efff673edd3a0fb5ab34fef28f4872fc51a0720013f2004c2f0
system_accounts="_netauth_ldap"
post_install() {
From cefa5e3050b80b16a0372fdb4c07ede57d4482aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 17:55:31 +0100
Subject: [PATCH 111/357] xtools: update to 0.62.
---
srcpkgs/xtools/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index d1b5e0fe4f2..f6b143d8aba 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,8 +1,7 @@
# Template file for 'xtools'
pkgname=xtools
-version=0.61
+version=0.62
revision=1
-archs="noarch"
build_style=gnu-makefile
depends="bash curl findutils git make spdx-licenses-list xbps"
short_desc="Opinionated helpers for working with XBPS"
@@ -10,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Public Domain"
homepage="http://git.vuxu.org/xtools"
distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
-checksum=03de4897b9f2189c4164a49e0d595580ad0a587054c2d1591003992741835409
+checksum=befbe27f4b8091f04ab79024b76c0bad15f86a5f5e6f3624648d633b854696df
From b75bbbf88aeccf8175297e46bf38fae4e8bf25a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 21 Nov 2020 14:06:36 -0300
Subject: [PATCH 112/357] djview: mark broken temporarily.
There's an issue when fetching due to sourceforge's redirects, mark
broken for now.
---
srcpkgs/djview/template | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index 136bcced9fb..c7b0cd84bcf 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -19,6 +19,13 @@ if [ "${CROSS_BUILD}" ]; then
configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
fi
+case "$XBPS_TARGET_MACHINE" in
+ armv6l-musl|armv7l-musl|x86_64-musl)
+ # error while fetching with xbps-fetch
+ broken="djview-4.12.tar.gz: Temporary Redirect"
+ ;;
+esac
+
post_extract() {
vsed -i -e '/Exec/s/djview4/djview/' \
-e '/StartupWMClass/s/Djview4/DjView/' \
From a38a89789d1a7e9775362f3a2e1bb06270f0812a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 21 Nov 2020 19:14:24 +0400
Subject: [PATCH 113/357] osinfo-db: update to 20201119.
---
srcpkgs/osinfo-db/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 300f6bbc960..75462422bf4 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,15 +1,15 @@
# Template file for 'osinfo-db'
pkgname=osinfo-db
-version=20201015
+version=20201119
revision=1
build_style=fetch
hostmakedepends="osinfo-db-tools"
short_desc="Osinfo database about operating systems"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://libosinfo.org"
distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=0a07a9eceebfb058528cb7092f30d7b843595715e2e053acde03acbc62a640c4
+checksum=74f01379359248cb253f86d1126fffc89f319136e35d483c1fd4aa01b3200ca8
skip_extraction="${pkgname}-${version}.tar.xz"
do_install() {
From cd35a09e14b0df4020471306195267e977ca23b1 Mon Sep 17 00:00:00 2001
From: aktsbot <box.ashishk@gmail.com>
Date: Sat, 21 Nov 2020 16:00:45 +0530
Subject: [PATCH 114/357] font-manjari: update to 1.920
---
srcpkgs/font-manjari/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/font-manjari/template b/srcpkgs/font-manjari/template
index ad89f8bebbb..3303e7b2e0d 100644
--- a/srcpkgs/font-manjari/template
+++ b/srcpkgs/font-manjari/template
@@ -1,7 +1,7 @@
# Template file for 'font-manjari'
pkgname=font-manjari
-version=1.910
-revision=2
+version=1.920
+revision=1
create_wrksrc=yes
depends="font-util"
short_desc="Malayalam font with smooth curves"
@@ -10,7 +10,7 @@ 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="943c2dfc3afb9e32d3e4baa132d3b49825cbaf1a39ae9220b73df11255c5d13e
+checksum="77cfe8fbb18ed5325e228d96b4b69cfd21cc9434eab18656fb9bc48ce691b9c3
3ff5ecb5ffbfe008bcc1e2861f2124aabd5571ad1ae9badc245a4e383727ccd2"
font_dirs="/usr/share/fonts/TTF"
From 853416af01e2d6795aa5439bbe64f2340c4c57d0 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Fri, 20 Nov 2020 22:16:48 -0500
Subject: [PATCH 115/357] chezmoi: update to 1.8.9.
---
srcpkgs/chezmoi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 836a483d71a..395eedd19e7 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
# Template file for 'chezmoi'
pkgname=chezmoi
-version=1.8.8
+version=1.8.9
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/${pkgname}/archive/v${version}.tar.gz"
-checksum=1cdd0a4d77714c5003e7abdb46cb3c0c64eb3dfe198d45d36dc5764c2c5c0fcd
+checksum=6e9d341672bc375ad2e9594a689c0c8ae8ebad0c964d699dfbd408fc93058b93
post_install() {
vlicense LICENSE
From 3329d99ea5a2795ded93c7882ab93631d42a3c39 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Fri, 20 Nov 2020 10:42:19 -0300
Subject: [PATCH 116/357] tty-solitaire: update to 1.3.0.
---
srcpkgs/tty-solitaire/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tty-solitaire/template b/srcpkgs/tty-solitaire/template
index 3203baa6585..00c4a9d6386 100644
--- a/srcpkgs/tty-solitaire/template
+++ b/srcpkgs/tty-solitaire/template
@@ -1,16 +1,16 @@
# Template file for 'tty-solitaire'
pkgname=tty-solitaire
-version=1.1.1
+version=1.3.0
revision=1
build_style=gnu-makefile
make_use_env=yes
makedepends="ncurses-devel"
short_desc="Play solitaire in your terminal"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Glaulher <glaulher.developer@gmail.com>"
license="MIT"
homepage="https://github.com/mpereira/tty-solitaire"
distfiles="https://github.com/mpereira/tty-solitaire/archive/v${version}.tar.gz"
-checksum=146f9ed6ee9d79dfd936c213e3a413a967daba3978fb1021e05a1c52c7684e9c
+checksum=a270ee639e911a89add6a3c765b0548c9d762e0388c323807708d2509cfa64a0
CFLAGS="-fcommon"
From 16dfe93c22ded83c470e1e47c1268abc855c2187 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 19 Nov 2020 09:44:25 +0100
Subject: [PATCH 117/357] catgirl: update to 1.3
---
srcpkgs/catgirl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index f3d7c469d01..c4f242f1b5f 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
# Template file for 'catgirl'
pkgname=catgirl
-version=1.2
+version=1.3
revision=1
build_style=gnu-configure
make_build_target="all"
@@ -11,4 +11,4 @@ maintainer="Paper <paper@tilde.institute>"
license="GPL-3.0-or-later"
homepage="https://git.causal.agency/catgirl/"
distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=d1265d023cffa4d997907b86b42760f30f44419fa1d5273267e9b16f67b46fb6
+checksum=be00ea0bd3c8a9582c792d2767bc1a671e05dff839a246b533797742fcda8cec
From c6f0512d89068d02f9127b346705329dbf627200 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 18 Nov 2020 15:50:53 -0600
Subject: [PATCH 118/357] gitea: update to 1.12.6
Fixes CVE-2020-14144
---
srcpkgs/gitea/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 7f7a4e687de..e96ecf7d08b 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
# Template file for 'gitea'
pkgname=gitea
-version=1.12.2
+version=1.12.6
revision=1
create_wrksrc=yes
build_style=go
@@ -32,7 +32,7 @@ license="MIT"
homepage="https://gitea.io"
changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=695dae81327bdfaa4adaa9d3dc9d2bdcb78d54ac73abac3a630750465858ff8b
+checksum=98486d15c58b52177e58af300e1ac6afa46f2f85f61b8d96eacbbf73ccf1191e
system_accounts="_gitea"
_gitea_homedir="/var/lib/gitea"
From a5ffbee63460e1a4176cbe19f2031dc058ae792c Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Fri, 20 Nov 2020 21:29:00 +0600
Subject: [PATCH 119/357] opera: update to 72.0.3815.378.
---
srcpkgs/opera/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index fbda63d3d76..124cab7777c 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
# Template file for 'opera'
pkgname=opera
-version=72.0.3815.320
+version=72.0.3815.378
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=520cc476126af6b324f3f0a290003d323c22fec70feb19c357ccddd884d840ad
+checksum=c2fa6f20c1380f4b95452c260eb0266ff83de4f3f40d42c1556f3806a10b666d
repository="nonfree"
nostrip=yes
From e07e564f8bb024220bf9014da643ff938d0fa48c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 Nov 2020 16:02:51 -0500
Subject: [PATCH 120/357] influxdb: update to 1.8.3.
---
srcpkgs/influxdb/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index e77b36ed222..eb1a592c1d1 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,6 +1,6 @@
# Template file for 'influxdb'
pkgname=influxdb
-version=1.7.9
+version=1.8.3
revision=1
build_style=go
go_import_path=github.com/influxdata/influxdb
@@ -10,27 +10,28 @@ go_package="${go_import_path}/cmd/influx
${go_import_path}/cmd/influx_inspect
${go_import_path}/cmd/influx_stress"
go_ldflags="-X main.version=${version}"
-hostmakedepends="dep"
+hostmakedepends="asciidoc xmlto"
short_desc="Scalable datastore for metrics, events, and real-time analytics"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MIT"
homepage="https://influxdata.com/time-series-platform/influxdb/"
changelog="https://raw.githubusercontent.com/influxdata/influxdb/master/CHANGELOG.md"
distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=fad5107985395353a584978f6c0ad1fbd4f41ea71bdc9cf55a006cc9a88d2b61
+checksum=d8b89e324ed7343c1397124ac3cc68c405406faf74e7369e733611cada54656d
system_accounts="_influxdb"
_influxdb_homedir="/var/lib/influxdb"
make_dirs="${_influxdb_homedir} 0755 _influxdb _influxdb"
conf_files="/etc/${pkgname}/${pkgname}.conf"
-pre_build() {
- cd $GOSRCPATH
- dep ensure
+post_build() {
+ make -C man build
}
post_install() {
vlicense LICENSE
vsv ${pkgname}
vinstall etc/config.sample.toml 644 etc/${pkgname} ${pkgname}.conf
+
+ make -C man DESTDIR="${DESTDIR}/usr" install
}
From a05cf93f23f007ada93794d765cdaef272809bd8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 19:33:05 +0200
Subject: [PATCH 121/357] tomb: update to 2.8.
---
srcpkgs/tomb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tomb/template b/srcpkgs/tomb/template
index 8c67f338b2b..5c72ec7c7e0 100644
--- a/srcpkgs/tomb/template
+++ b/srcpkgs/tomb/template
@@ -1,6 +1,6 @@
# Template file for 'tomb'
pkgname=tomb
-version=2.7
+version=2.8
revision=1
wrksrc=Tomb-${version}
build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later"
homepage="https://www.dyne.org/software/tomb/"
distfiles="https://files.dyne.org/tomb/releases/Tomb-${version}.tar.gz"
-checksum=960107427e42cf0ac10b876cdec0e9f898c10a32d078e3370b7d9b7404a06a74
+checksum=2c064bcb121001dcdd2113c7b728f697e5e5bf8e887a6a4eb633ba5bf1ffef2d
pre_build() {
sed -i extras/gtk-tray/Makefile \
From 7b1687e886221175b751f660164505ebd6973a5f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 19:27:13 +0200
Subject: [PATCH 122/357] yabasic: update to 2.87.1.
---
srcpkgs/yabasic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yabasic/template b/srcpkgs/yabasic/template
index c91db99da22..c06e991d774 100644
--- a/srcpkgs/yabasic/template
+++ b/srcpkgs/yabasic/template
@@ -1,7 +1,7 @@
# Template file for 'yabasic'
pkgname=yabasic
reverts="2.769_1"
-version=2.87.0
+version=2.87.1
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="MIT, GPL-3.0-or-later"
homepage="https://2484.de/yabasic/"
distfiles="https://2484.de/yabasic/download/yabasic-${version}.tar.gz"
-checksum=7206b188f7f6d0ac7f20963bc73806af6f78a2829560172a114144b40f8419f7
+checksum=432f912d80ca00ae00a93ede197d45fde4db1345a61dc42976d10f2b7f9e1dce
do_install() {
vbin yabasic
From c0df7feec164c461d86a7be818176b4f927ac320 Mon Sep 17 00:00:00 2001
From: Reg Tiangha <reg@reginaldtiangha.com>
Date: Thu, 19 Nov 2020 17:22:03 -0700
Subject: [PATCH 123/357] sigil: update to 1.4.1.
---
srcpkgs/sigil/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index b94cbfa6ff1..0fecc98fba7 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,7 +1,7 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.3.0
-revision=2
+version=1.4.1
+revision=1
wrksrc="Sigil-${version}"
build_style=cmake
pycompile_dirs="usr/share/sigil/python3lib"
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/Sigil-Ebook/Sigil"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ac302328f0d0e0144e67bd4cbd7834650eb219f81a623f393271bf6f0686cc56
+checksum=8e4919bde7b0e530e12a6feb8956e92e662270187d924a0102e505e942acacb1
python_version=3
case "$XBPS_TARGET_MACHINE" in
From d80c72a0f1e7dcbb18d0fede98bcb8068f84d32b Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Wed, 18 Nov 2020 13:15:01 +1100
Subject: [PATCH 124/357] android-studio: update to 4.1.1.
---
srcpkgs/android-studio/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 8b255050240..37ab37daf6b 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,11 +1,11 @@
# Template file for 'android-studio'
pkgname=android-studio
-version=4.1.0
+version=4.1.1
revision=1
# _studio_build and _studio_rev are for downloading the zip from dl.google.com
# https://developer.android.com/studio/#resources as of 2018-07-12
-_studio_build=201.6858069
-_studio_rev=19
+_studio_build=201.6953283
+_studio_rev=0
archs="x86_64 i686"
create_wrksrc=yes
hostmakedepends="tar"
@@ -16,7 +16,7 @@ license="Apache-2.0"
homepage="http://tools.android.com/"
# changelog="https://developer.android.com/studio/releases/index.html"
distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz"
-checksum=4b9521fc4a6313ad65ff3e14b0f3fb50427d464fe14227555565f46e0ffad202
+checksum=68032184959c54576f119b7c7c8ded175d848374f3954fa450530d78260dd68b
repository=nonfree
restricted=yes
python_version=2
From b7d07d7e236c25bb6c6c8ea82f494ef82c0a8f3e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 11:56:54 +0200
Subject: [PATCH 125/357] sublime-merge-bin: update to 2039.
---
srcpkgs/sublime-merge-bin/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index aecc6b436c0..a57b827e614 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
# Template file for 'sublime-merge-bin'
pkgname=sublime-merge-bin
-version=2038
+version=2039
revision=1
archs="x86_64"
wrksrc=sublime_merge
@@ -11,8 +11,8 @@ maintainer="Adelmo Junior <noblehelm@gmail.com>"
license="custom:EULA"
homepage="https://www.sublimemerge.com"
distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=3bfa0ca8a322d76117f824587761c57596b2b38a1c98e6a94963ba12f5e07197
-_license_checksum=aaf2f4a457945145bfea1ff06498806bd91951f76ec3cefec169f904ff4cb158
+checksum=289218c5a06ad7516477456d7e372d01fc0fbeb5761d239835ef442a11200251
+_license_checksum=d2ee1cc3f8af74d1eacc960a81fdf1ebe58a9b801bf0b2e2a2302fdefb0ee370
nopie=yes
repository=nonfree
restricted=yes
From 5500c98af099c186fac6432339d97cc2b9995ce1 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 18:07:02 -0600
Subject: [PATCH 126/357] jdupes: update to 1.19.0
[ci skip]
---
srcpkgs/jdupes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 859fc70fa8c..0cba17ea701 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
# Template file for 'jdupes'
pkgname=jdupes
-version=1.14.0
+version=1.19.0
revision=1
build_style=gnu-makefile
make_build_args="ENABLE_BTRFS=1"
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/jbruchon/jdupes"
changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
-checksum=b83285d97f1df5602647749829fdcdbcf21ece273c669bdb8e62544238b1f54e
+checksum=98676d3455c89882c3f7f4934602f9e7aca2b054caf3f0deaf286552ce9b276b
post_install() {
vlicense LICENSE
From 1887ea2a27f2ee48db85b514d59529f507f17b41 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 10:04:40 -0600
Subject: [PATCH 127/357] poedit: update to 2.4.2
---
srcpkgs/poedit/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index eb5084c41f6..4b0fe5d6cbc 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,24 +1,23 @@
# Template file for 'poedit'
pkgname=poedit
-version=2.4.1
+version=2.4.2
revision=1
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
makedepends="boost-devel cld2-devel db-devel enchant2-devel gtk+3-devel
- gtkspell3-devel Lucene++-devel wxWidgets-gtk3-devel"
+ gtkspell3-devel libharfbuzz libxml2 Lucene++-devel webkit2gtk
+ wxWidgets-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cross-platform gettext catalogs (.po files) editor"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.poedit.net/"
distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz"
-checksum=70143e55c16a88b9b29f48e12b0b9e55714177b60ba367fc29d5fa6dc28429c3
+checksum=fed9932a9228b381aa363d8340eb5193d61ffc761f4f328d3cf3cce8f7fbcd4e
CPPFLAGS="-DUCHAR_TYPE=uint16_t -Wno-deprecated-copy"
-makedepends+=" libharfbuzz libxml2 webkit2gtk"
-
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" wxWidgets-common-devel"
configure_args+=" WXRC=/usr/bin/wxrc --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
From c2824a5e887241368d200c947d965987f998ac82 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 09:33:25 -0600
Subject: [PATCH 128/357] clipgrab: update to 3.9.2
[ci skip]
---
srcpkgs/clipgrab/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template
index 72938c814bb..7fbb10204ff 100644
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@@ -1,10 +1,9 @@
# Template file for 'clipgrab'
pkgname=clipgrab
-version=3.8.15
+version=3.9.2
revision=1
build_style=qmake
configure_args=clipgrab.pro
-hostmakedepends="qt5-qmake qt5-devel"
makedepends="qt5-webengine-devel qt5-webchannel-devel
qt5-location-devel qt5-devel qt5-quickcontrols2-devel
qt5-declarative-devel"
@@ -14,12 +13,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://clipgrab.org"
distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz"
-checksum=769812558342ebf4dee0f1deb2fe2ea801278e9821d87ad8d639cec52144d7aa
+checksum=c5bfcb0f6c3bff52ea68c2b978812bcbd43718fd2bcd2dcad1d6a4c970be6cb2
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-location-devel qt5-quickcontrols2-devel
+ hostmakedepends=" qt5-location-devel qt5-quickcontrols2-devel
qt5-declarative-devel qt5-webchannel-devel qt5-webengine-devel
- qt5-host-tools"
+ qt5-host-tools qt5-devel"
fi
case "$XBPS_TARGET_MACHINE" in
From a8840cefbe8fd315a6f747cc5acb76c7fc8f1e8c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 10:32:15 -0600
Subject: [PATCH 129/357] minetest: update to 5.3.0
Adopt
LuaJIT with aarch64* causes PIE breakage; disable use of
LuaJIT for aarc64* due to CMakeLists.txt setting
---
srcpkgs/minetest/template | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/minetest/template b/srcpkgs/minetest/template
index 7f559cdf86a..15a26e0d1ef 100644
--- a/srcpkgs/minetest/template
+++ b/srcpkgs/minetest/template
@@ -1,22 +1,30 @@
# Template file for 'minetest'
pkgname=minetest
-version=5.2.0
+version=5.3.0
revision=1
build_style=cmake
-configure_args="-DRUN_IN_PLACE=0 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DBUILD_SERVER=TRUE"
+configure_args="-DRUN_IN_PLACE=0 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1
+ -DBUILD_SERVER=TRUE"
hostmakedepends="pkg-config tar"
-makedepends="LuaJIT-devel MesaLib-devel freetype-devel gmp-devel irrlicht-devel
+makedepends="MesaLib-devel freetype-devel gmp-devel irrlicht-devel
libcurl-devel libjpeg-turbo-devel libopenal-devel libvorbis-devel lua52-devel
sqlite-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="InfiniMiner/Minecraft inspired game"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Nathan <ndowens@artixlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://www.minetest.net"
distfiles="https://github.com/minetest/minetest/archive/${version}.tar.gz
https://github.com/minetest/minetest_game/archive/${version}.tar.gz>minetest_game-${version}.tar.gz"
-checksum="4996c7c50a6600d0c7140680d4bd995cb9aae910f216b46373953b49d6b13a5d
- 0c49fd6e310de1aba2e8cb8ae72efe0e06bb6bc8d7c5efea23bc201b6a80ce94"
+checksum="65dc2049f24c93fa544500f310a61e289c1b8fa47bf60877b746a2c27a7238d6
+ 06c6c1d4b97af211dd0fa518a3e68a205f594e9816a4b2477e48d4d21d278e2d"
+
+# LuaJIT enabled causes PIE to
+# be broken/not-used on aarch64*
+case "$XBPS_TARGET_MACHINE" in
+ aarch64*) ;;
+ *) makedepends+=" LuaJIT-devel" ;;
+esac
pre_install() {
# Install the minetest_game subgame.
From 0e56b1ae98ce05659156672a9c82078da7408720 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 18 Nov 2020 11:53:05 +0100
Subject: [PATCH 130/357] davfs2: update to 1.6.0
---
srcpkgs/davfs2/patches/100-musl-compat.patch | 7 ++++---
srcpkgs/davfs2/patches/neon-0.31.patch | 11 -----------
srcpkgs/davfs2/template | 4 ++--
3 files changed, 6 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/davfs2/patches/neon-0.31.patch
diff --git a/srcpkgs/davfs2/patches/100-musl-compat.patch b/srcpkgs/davfs2/patches/100-musl-compat.patch
index 646a883a9fb..6d56821f2ff 100644
--- a/srcpkgs/davfs2/patches/100-musl-compat.patch
+++ b/srcpkgs/davfs2/patches/100-musl-compat.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig 2020-04-02 12:05:25.019234433 +0200
-+++ configure.ac 2020-04-02 12:06:27.138863342 +0200
+--- configure.ac
++++ configure.ac
@@ -42,7 +42,7 @@ DAV_CHECK_NEON
# Checks for header files.
AC_HEADER_DIRENT
@@ -53,7 +53,8 @@
#include "config.h"
+#include "compat.h"
-
+
+ #include <errno.h>
-#include <error.h>
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
diff --git a/srcpkgs/davfs2/patches/neon-0.31.patch b/srcpkgs/davfs2/patches/neon-0.31.patch
deleted file mode 100644
index 8a8d5691640..00000000000
--- a/srcpkgs/davfs2/patches/neon-0.31.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig 2020-04-02 12:00:27.586207223 +0200
-+++ configure.ac 2020-04-02 12:00:37.057303637 +0200
-@@ -36,7 +36,7 @@ AC_PROG_LN_S
- # Checks for libraries.
- AM_GNU_GETTEXT_VERSION(0.18.1)
- AM_GNU_GETTEXT([external])
--NE_REQUIRE_VERSIONS([0], [27 28 29 30])
-+NE_REQUIRE_VERSIONS([0], [27 28 29 30 31])
- DAV_CHECK_NEON
-
- # Checks for header files.
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index d94b71a70e6..01eb6336fc4 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,6 +1,6 @@
# Template file for 'davfs2'
pkgname=davfs2
-version=1.5.6
+version=1.6.0
revision=1
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
@@ -12,7 +12,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
license="GPL-3.0-or-later"
homepage="https://savannah.nongnu.org/projects/davfs2"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=417476cdcfd53966b2dcfaf12455b54f315959b488a89255ab4b44586153d801
+checksum=2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50
CFLAGS="-fcommon"
From dc17ce55845eb699db1bf88d3b8652a2e4b0d9f9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 16:21:34 -0600
Subject: [PATCH 131/357] guake: update to 3.7.0
---
srcpkgs/guake/template | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/guake/template b/srcpkgs/guake/template
index ae5192edb0f..8f0fbe4d2be 100644
--- a/srcpkgs/guake/template
+++ b/srcpkgs/guake/template
@@ -1,10 +1,8 @@
# Template file for 'guake'
pkgname=guake
-version=3.6.3
-revision=4
+version=3.7.0
+revision=1
build_style=python3-module
-wrksrc="Guake-${version}"
-pycompile_module="guake"
hostmakedepends="gettext python3-setuptools"
makedepends="python3-devel python3-pbr"
depends="desktop-file-utils libkeybinder3 libnotify python3-dbus python3-gobject
@@ -14,14 +12,18 @@ short_desc="Drop-down terminal for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://guake-project.org/"
-distfiles="${PYPI_SITE}/G/Guake/Guake-${version}.tar.gz"
-checksum=dabfb58070c721b3e2d8fc9621afdd9de74ed7929d2453a9d08058baab5b7791
+distfiles="${PYPI_SITE}/g/guake/guake-${version}.tar.gz"
+checksum=31fd7d6f62aa0a5e0121e240682e6a9e5ce61cdb266f9438987837f52d552e47
pre_build() {
GUAKE_SCHEMA_DIR="/usr/share/glib-2.0/schemas"
make generate-desktop generate-mo prefix=/usr COMPILE_SCHEMA=0
- make generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)' COMPILE_SCHEMA=0
- sed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' guake/paths.py
+
+ make generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' \
+ DEV_SCHEMA_DIR='$(gsettingsschemadir)' COMPILE_SCHEMA=0
+
+ vsed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' \
+ guake/paths.py
}
do_check() {
@@ -30,5 +32,5 @@ do_check() {
}
pre_install() {
- make prefix=/usr DESTDIR=${DESTDIR} COMPILE_SCHEMA=0 install-locale install-schemas
+ make PREFIX=/usr DESTDIR=${DESTDIR} COMPILE_SCHEMA=0 install-locale install-schemas
}
From 55ae0b875484178c3fbf613afd4df1690900e053 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 09:31:48 -0600
Subject: [PATCH 132/357] oil: update to 0.8.4
Use system python instead of internal
---
srcpkgs/oil/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 0e13b5d103f..b68eca52034 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,19 +1,20 @@
# Template file for 'oil'
pkgname=oil
-version=0.8.3
+version=0.8.4
revision=1
build_style=configure
configure_args="--prefix=/usr $(vopt_with readline)"
-makedepends="$(vopt_if readline readline-devel)"
+hostmakedepends="$(vopt_if readline readline-devel) python"
+makedepends="$hostmakedepends"
short_desc="Oil, a new unix shell"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=3f78c606cde84ef0e90d1744d400c8428941eaab6515f382fabc28cf16453ccb
-python_version=2 #unverified
+checksum=08fd1c6d653ea594a5dcecb7bf40037e683845cf7627129bbeeb4d0b9fe7b879
+python_version=2
register_shell="/usr/bin/osh"
-nocross="oil is nocross"
+nocross="Binaries doesn't build if cross built"
nostrip=yes
build_options="readline"
@@ -22,6 +23,8 @@ build_options_default="readline"
pre_build() {
# Remove the strip wrapper
rm -f "${XBPS_WRAPPERDIR}"/strip
+ # Use system python
+ vsed -i 's|$PREPARE_DIR/python|python|g' build/actions.sh
}
do_install() {
From f07d96c54f4e276b60d82c7481ed8e5062427dfb Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 16:34:35 -0600
Subject: [PATCH 133/357] hydrogen: update to 1.0.1
---
srcpkgs/hydrogen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index 1b46559cdc6..2f4005fd125 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -1,6 +1,6 @@
# Template file for 'hydrogen'
pkgname=hydrogen
-version=1.0.0
+version=1.0.1
revision=1
build_style=cmake
# Our flags has -g already, DEBUG=ON will add -O0
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.hydrogen-music.org/"
distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"
-checksum=c4eac296a0d20578c274faf7816cf35c16ed43b634d91d2d19686bf9bbfeb970
+checksum=de6e8ba259ff340037f24e80f8b34592138603b080b02cfa3214ef9b0d66ac63
post_patch() {
vsed -i '/INSTALL/s,"data,"/usr/share/hydrogen/data,' \
From 251c84a3e45704d1a8c39cb76d664249110879af Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 21:27:42 -0600
Subject: [PATCH 134/357] oxipng: update to 4.0.0
---
srcpkgs/oxipng/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/oxipng/template b/srcpkgs/oxipng/template
index 71b10a0a6de..9c583ba571e 100644
--- a/srcpkgs/oxipng/template
+++ b/srcpkgs/oxipng/template
@@ -1,6 +1,6 @@
# Template file for 'oxipng'
pkgname=oxipng
-version=3.0.1
+version=4.0.0
revision=1
build_style=cargo
short_desc="Multithreaded lossless PNG compression optimizer"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/shssoichiro/oxipng"
changelog="https://raw.githubusercontent.com/shssoichiro/oxipng/master/CHANGELOG.md"
distfiles="https://github.com/shssoichiro/oxipng/archive/v${version}.tar.gz"
-checksum=31b036b146d087b989c22111637129ab8cb29a26719bfff1290427ff8b595e11
+checksum=10308fb78bc5b1b00b7450d812f652bfe6fb6d98d68a0c540bb5d3b9cfd56e68
post_install() {
vlicense LICENSE
From af102b71dba268a8bbba599554834bdf8a1a8057 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 15 Nov 2020 10:32:29 +0100
Subject: [PATCH 135/357] perl-File-Listing: update to 6.11
---
srcpkgs/perl-File-Listing/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-File-Listing/template b/srcpkgs/perl-File-Listing/template
index 27ea1427ef8..1cf6d3f5275 100644
--- a/srcpkgs/perl-File-Listing/template
+++ b/srcpkgs/perl-File-Listing/template
@@ -1,7 +1,7 @@
# Template file for 'perl-File-Listing'
pkgname=perl-File-Listing
-version=6.04
-revision=6
+version=6.11
+revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/File-Listing"
distfiles="${CPAN_SITE}/File/File-Listing-$version.tar.gz"
-checksum=1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5
+checksum=c24c14ece10b949e1cb52d64bc28b42cbaebf87e00293a3f7500950d6be0bf6e
From 4666fe8d5a8cc3e6eeac8b2f575d1220060c68ad Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 14 Nov 2020 20:46:45 -0800
Subject: [PATCH 136/357] pinebookpro-firmware: include clm_blob
Ship the clm_blob so that the correct frequencies are used for the
relevant wireless jurisdiction. Otherwise, only limited frequences are
supported.
---
srcpkgs/pinebookpro-firmware/template | 28 +++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/pinebookpro-firmware/template b/srcpkgs/pinebookpro-firmware/template
index 8fd4fbf5f30..4d29df0915b 100644
--- a/srcpkgs/pinebookpro-firmware/template
+++ b/srcpkgs/pinebookpro-firmware/template
@@ -1,20 +1,36 @@
# Template file for 'pinebookpro-firmware'
pkgname=pinebookpro-firmware
reverts=20200215_1
-version=0.0.20200215
+version=0.0.20201114
revision=1
-_commit=58820c428d2ecae6aaf5e4f00997652b9479853a
+_rockchip_commit=72c91aa297a10140781e3f83419c077d4bf8890c
+_manjaro_commit=7074a2e21dd804e229eab1c031bc00246e9173e0
archs="aarch64*"
-wrksrc="rkwifibt-${_commit}"
+create_wrksrc=yes
short_desc="Firmware files for the Pinebook Pro"
maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="Apache-2.0"
homepage="https://github.com/rockchip-linux/rkwifibt"
-distfiles="https://github.com/rockchip-linux/rkwifibt/archive/${_commit}.tar.gz"
-checksum=20161cf3011f57dc9912db7270be1a83e543a61ea8757c23eaf983542fb021e0
+distfiles="
+ https://github.com/rockchip-linux/rkwifibt/archive/${_rockchip_commit}.tar.gz
+ https://gitlab.manjaro.org/manjaro-arm/packages/community/ap6256-firmware/-/archive/${_manjaro_commit}/ap6256-firmware-${_manjaro_commit}.tar.gz"
+checksum="
+ f73a89b09cccb283b92911e978188987859c97cb78957ab1dbc2f169a0a5ec05
+ 190653595f0dbf564bf726bc0de3d3f06aa9a6fcd7743a9b3fdd5b3b233b6c6b"
do_install() {
+ cd "${wrksrc}"
+ cd "ap6256-firmware-${_manjaro_commit}"
+ vinstall brcmfmac43456-sdio.clm_blob 644 usr/lib/firmware/brcm
+ cd ..
+ cd "rkwifibt-${_rockchip_commit}"
vinstall firmware/broadcom/AP6256/bt/BCM4345C5.hcd 644 usr/lib/firmware/brcm
vinstall firmware/broadcom/AP6256/wifi/fw_bcm43456c5_ag.bin 644 usr/lib/firmware/brcm brcmfmac43456-sdio.bin
- vinstall firmware/broadcom/AP6256/wifi/nvram_ap6256.txt 644 usr/lib/firmware/brcm brcmfmac43456-sdio.pine64,pinebook-pro.txt
+ cp -f firmware/broadcom/AP6256/wifi/nvram_ap6256.txt .
+ vsed -i 's/ccode=DE/ccode=all/' nvram_ap6256.txt
+ vinstall nvram_ap6256.txt 644 usr/lib/firmware/brcm brcmfmac43456-sdio.txt
+ cd ..
+ for dev in pine64,pinebook-pro radxa,rockpi4b radxa,rockpi4c rockpro64-v2.1 rk3399-orangepi; do
+ ln -sf brcmfmac43456-sdio.txt "${DESTDIR}/usr/lib/firmware/brcm/brcmfmac43456-sdio.${dev}.txt"
+ done
}
From 2697d4598723899414482f88dea2e0200d22e3e8 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Fri, 20 Nov 2020 23:08:28 +0100
Subject: [PATCH 137/357] qtkeychain-qt5: update to 0.11.1, adopt
closes #26275
---
srcpkgs/qtkeychain-qt5/INSTALL.msg | 2 +-
.../patches/use-kwallet-dbus-def.patch | 15 +++++++++++++++
srcpkgs/qtkeychain-qt5/template | 16 +++++++++++-----
3 files changed, 27 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
diff --git a/srcpkgs/qtkeychain-qt5/INSTALL.msg b/srcpkgs/qtkeychain-qt5/INSTALL.msg
index 87e12556a84..b358ca1a984 100644
--- a/srcpkgs/qtkeychain-qt5/INSTALL.msg
+++ b/srcpkgs/qtkeychain-qt5/INSTALL.msg
@@ -1,2 +1,2 @@
To actually use qtkeychain-qt5 you need to either have kwallet or
-libgnome-keyring installed.
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 00000000000..d97fcc7890b
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- CMakeLists.txt.ORIG 2020-09-08 15:13:16.000000000 +0200
++++ CMakeLists.txt 2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+
+ add_definitions(-DKEYCHAIN_DBUS=1)
+ list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+- qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++ qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+ list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+
diff --git a/srcpkgs/qtkeychain-qt5/template b/srcpkgs/qtkeychain-qt5/template
index 9bac2f766d0..4e4c982850a 100644
--- a/srcpkgs/qtkeychain-qt5/template
+++ b/srcpkgs/qtkeychain-qt5/template
@@ -1,22 +1,27 @@
# Template file for 'qtkeychain-qt5'
pkgname=qtkeychain-qt5
-version=0.9.1
-revision=2
+version=0.11.1
+revision=1
wrksrc="${pkgname%-*}-${version}"
build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config kwallet"
makedepends="libsecret-devel qt5-tools-devel"
short_desc="Platform-independent Qt5 API for storing passwords securely"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="yopito <pierre.bourgin@free.fr>"
license="BSD-2-Clause"
homepage="https://github.com/frankosterfeld/qtkeychain"
distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/v${version}.tar.gz"
-checksum=9c2762d9d0759a65cdb80106d547db83c6e9fdea66f1973c6e9014f867c6f28e
+checksum=77fc6841c1743d9e6bd499989481cd9239c21bc9bf0760d41a4f4068d2f0a49d
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-tools-devel"
fi
+post_patch() {
+ # ensure it's not used (see dedicated patch)
+ rm org.kde.KWallet.xml
+}
+
post_install() {
vlicense COPYING
}
@@ -28,5 +33,6 @@ qtkeychain-qt5-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/*.so
+ vmove usr/lib/qt5/mkspecs
}
}
From c3ce392715dddca917196172b0acebd0a244f46c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 18:58:40 -0600
Subject: [PATCH 138/357] partclone: update to 0.3.17
---
srcpkgs/partclone/patches/0001-musl.patch | 40 +++++++++++++++++++++++
srcpkgs/partclone/patches/musl.patch | 23 -------------
srcpkgs/partclone/template | 6 ++--
3 files changed, 43 insertions(+), 26 deletions(-)
create mode 100644 srcpkgs/partclone/patches/0001-musl.patch
delete mode 100644 srcpkgs/partclone/patches/musl.patch
diff --git a/srcpkgs/partclone/patches/0001-musl.patch b/srcpkgs/partclone/patches/0001-musl.patch
new file mode 100644
index 00000000000..6720add1959
--- /dev/null
+++ b/srcpkgs/partclone/patches/0001-musl.patch
@@ -0,0 +1,40 @@
+From 3ea1aa99242204e3c1841ac11d9f7064591d3bff Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 18:53:54 -0600
+Subject: [PATCH] musl
+
+---
+ src/btrfs/kernel-lib/rbtree.h | 4 ++++
+ src/main.c | 1 -
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git src/btrfs/kernel-lib/rbtree.h src/btrfs/kernel-lib/rbtree.h
+index 6d68907..affab1d 100644
+--- src/btrfs/kernel-lib/rbtree.h
++++ src/btrfs/kernel-lib/rbtree.h
+@@ -38,6 +38,10 @@
+ extern "C" {
+ #endif
+
++#ifndef __always_inline
++#define __always_inline inline__attribute__((always_inline))
++#endif
++
+ struct rb_node {
+ unsigned long __rb_parent_color;
+ struct rb_node *rb_right;
+diff --git src/main.c src/main.c
+index babcf0c..8a543f3 100644
+--- src/main.c
++++ src/main.c
+@@ -22,7 +22,6 @@
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <mcheck.h>
+ #include <stdint.h>
+ #include <stdarg.h>
+ #include <string.h>
+--
+2.29.2
+
diff --git a/srcpkgs/partclone/patches/musl.patch b/srcpkgs/partclone/patches/musl.patch
deleted file mode 100644
index 815bc7fe356..00000000000
--- a/srcpkgs/partclone/patches/musl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/main.c.orig
-+++ src/main.c
-@@ -20,7 +20,6 @@
- #include <sys/types.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <mcheck.h>
- #include <stdint.h>
- #include <stdarg.h>
- #include <string.h>
---- src/btrfs/rbtree.h.orig
-+++ src/btrfs/rbtree.h
-@@ -38,6 +38,10 @@
- extern "C" {
- #endif
-
-+#ifndef __always_inline
-+#define __always_inline inline __attribute__((always_inline))
-+#endif
-+
- struct rb_node {
- unsigned long __rb_parent_color;
- struct rb_node *rb_right;
diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 3c504c88a71..59c975d9354 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,7 +1,7 @@
# Template file for 'partclone'
pkgname=partclone
-version=0.3.14
-revision=2
+version=0.3.17
+revision=1
build_style=gnu-configure
configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
--enable-extfs --enable-hfsp --enable-fat --enable-exfat
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.partclone.org/"
distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz"
-checksum=c298d2e7a6da97660325ca9296174e94e78dfc161df01bfdb1ea36c7001a6879
+checksum=ef1391db3801e4b3ef82fc9417f1d7f0542b7229b3394120072b2dfeae0bbbb0
CFLAGS="-DBTRFS_DISABLE_BACKTRACE"
pre_configure() {
From 2b4a05df485ce7829b04402107cc7c90aeee9c4d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:58:18 +0200
Subject: [PATCH 139/357] pelican: update to 4.5.1.
---
srcpkgs/pelican/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index 1c47e8d711a..baa4f603c4f 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -1,9 +1,8 @@
# Template file for 'pelican'
pkgname=pelican
-version=4.2.0
-revision=3
+version=4.5.1
+revision=1
build_style=python3-module
-pycompile_module="pelican"
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-feedgenerator python3-Jinja2 python3-Pygments
python3-docutils python3-pytz python3-blinker python3-Unidecode python3-six
@@ -20,7 +19,7 @@ changelog="https://raw.githubusercontent.com/getpelican/pelican/${version}/docs/
# We can live with it.
# distfiles="${PYPI_SITE}/p/pelican/pelican-${version}.tar.gz"
distfiles="https://github.com/getpelican/pelican/archive/${version}.tar.gz"
-checksum=4b0d4c9439217b49ace89f4f8b52c90e13fa283a786d7b12e2020a11f32f9a33
+checksum=b47c65f663bf6f2513b8ebc1f096e51f4d7865c17b36c370f83eadd80b6ba702
post_extract() {
# This test is problematic,
From 94d7985a0b7a079f5055a3043f5778fdec7d8660 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:47:57 +0200
Subject: [PATCH 140/357] dragon-player: update to 20.08.3.
---
srcpkgs/dragon-player/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index 39bb3dc5945..165fc060bb0 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
# Template file for 'dragon-player'
pkgname=dragon-player
-version=20.08.1
+version=20.08.3
revision=1
wrksrc="dragon-${version}"
build_style=cmake
@@ -13,4 +13,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://kde.org/applications/en/multimedia/org.kde.dragonplayer"
distfiles="${KDE_SITE}/release-service/${version}/src/dragon-${version}.tar.xz"
-checksum=691bc338ca25e70e9a43cbcdf50f2e0aa92643bdad0329bdc3e09373ac287040
+checksum=36a755be402d7b811483a17887ebf0c73fc92f92ecbe00b54c11158ee0591a93
From e7d5670595893399978e2fb7aeda1a19a0da27ad Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:21:56 +0200
Subject: [PATCH 141/357] juk: update to 20.08.3.
---
srcpkgs/juk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index 1614b90ccca..e9486b1edcf 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
# Template file for 'juk'
pkgname=juk
-version=20.08.1
+version=20.08.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://juk.kde.org/"
distfiles="${KDE_SITE}/release-service/${version}/src/juk-${version}.tar.xz"
-checksum=aa9a93a0befacf401cf41d8358b4987d8b370b4c153f3b66e05e922472e004a8
+checksum=2ecee3680b92c753e0ccf95e50990fbb12021d81f62a329965a5d4fc480672cb
From 83657a67fd769b2b2caacfcc15cfa7b0acf15933 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 21 Nov 2020 09:55:58 -0800
Subject: [PATCH 142/357] pinebookpro-base: update to 0.3
Mark asound.state file as mutable.
Rename udev hwdb to denote pinebookpro specificity.
Rather than using an evdev hwdb match, set up a custom match via a udev
rule so that only the keyboard (and not other devices are matched).
Without the custom rule, lines like the following appear in dmesg:
udevd[...]: Error calling EVIOCSKEYCODE on device node [...]: Invalid argument
---
.../files/{10-usb-kbd.hwdb => 10-pinebookpro.hwdb} | 2 +-
srcpkgs/pinebookpro-base/files/60-pinebookpro.rules | 7 +++++++
srcpkgs/pinebookpro-base/template | 6 ++++--
3 files changed, 12 insertions(+), 3 deletions(-)
rename srcpkgs/pinebookpro-base/files/{10-usb-kbd.hwdb => 10-pinebookpro.hwdb} (76%)
create mode 100644 srcpkgs/pinebookpro-base/files/60-pinebookpro.rules
diff --git a/srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb b/srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb
similarity index 76%
rename from srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb
rename to srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb
index f8348e6fb3e..65f4b3ed317 100644
--- a/srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb
+++ b/srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb
@@ -1,4 +1,4 @@
-evdev:input:b0003v258Ap001E*
+pinebookpro:keyboard
KEYBOARD_KEY_700a5=brightnessdown
KEYBOARD_KEY_700a6=brightnessup
KEYBOARD_KEY_70066=sleep
diff --git a/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules b/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules
new file mode 100644
index 00000000000..63d3e9ea21f
--- /dev/null
+++ b/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules
@@ -0,0 +1,7 @@
+ACTION=="remove", GOTO="pinebookpro_end"
+KERNEL!="event*", GOTO="pinebookpro_end"
+
+ENV{idVendor}=="258a", ENV{idProduct}=="001e", ENV{ID_INPUT_KEYBOARD}=="1", \
+ IMPORT{builtin}="hwdb 'pinebookpro:keyboard'", RUN{builtin}+="keyboard"
+
+LABEL="pinebookpro_end"
diff --git a/srcpkgs/pinebookpro-base/template b/srcpkgs/pinebookpro-base/template
index 9b4a41eb9a6..fce0a329b98 100644
--- a/srcpkgs/pinebookpro-base/template
+++ b/srcpkgs/pinebookpro-base/template
@@ -1,6 +1,6 @@
# Template file for 'pinebookpro-base'
pkgname=pinebookpro-base
-version=0.2
+version=0.3
revision=1
archs="aarch64*"
build_style=meta
@@ -9,8 +9,10 @@ short_desc="Void Linux Pinebook Pro platform package"
maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="Public Domain"
homepage="https://www.voidlinux.org"
+mutable_files="/var/lib/alsa/asound.state"
do_install() {
- vinstall "${FILESDIR}/10-usb-kbd.hwdb" 644 usr/lib/udev/hwdb.d
+ vinstall "${FILESDIR}/60-pinebookpro.rules" 644 usr/lib/udev/rules.d
+ vinstall "${FILESDIR}/10-pinebookpro.hwdb" 644 usr/lib/udev/hwdb.d
vinstall "${FILESDIR}/asound.state" 644 var/lib/alsa
}
From 68943ea8565d0e6de43fabb45d2d836d5df4a860 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, 21 Nov 2020 22:46:21 +0700
Subject: [PATCH 143/357] cvs2svn: remove package
- Abandon upstream, the homepage is timed-out from my local machine
- Python 2 only
- People could import via git: cvs -> git -> svn
- Other distro dropped this package, too.
---
srcpkgs/cvs2svn/template | 21 ---------------------
srcpkgs/cvs2svn/update | 1 -
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/cvs2svn/template
delete mode 100644 srcpkgs/cvs2svn/update
diff --git a/srcpkgs/cvs2svn/template b/srcpkgs/cvs2svn/template
deleted file mode 100644
index 55e679f2abe..00000000000
--- a/srcpkgs/cvs2svn/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'cvs2svn'
-pkgname=cvs2svn
-version=2.5.0
-revision=1
-archs=noarch
-build_style=gnu-makefile
-make_build_args="man"
-hostmakedepends="python"
-depends="cvs python"
-short_desc="CVS to Subversion, git and bazaar repository conversion tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
-homepage="http://cvs2svn.tigris.org/"
-distfiles="http://cvs2svn.tigris.org/files/documents/1462/49543/cvs2svn-${version}.tar.gz"
-checksum=6409d118730722f439760d41c08a5bfd05e5d3ff4a666050741e4a5dc2076aea
-
-post_install() {
- vmkdir usr/share/man/man1
- install -m644 *.1 ${DESTDIR}/usr/share/man/man1
- vlicense COPYING
-}
diff --git a/srcpkgs/cvs2svn/update b/srcpkgs/cvs2svn/update
deleted file mode 100644
index d8edb80d8d9..00000000000
--- a/srcpkgs/cvs2svn/update
+++ /dev/null
@@ -1 +0,0 @@
-site="http://cvs2svn.tigris.org/servlets/ProjectDocumentList?folderID=2976"
From 62e6d3bab68d28ccddc71cafd858551ecc3b9da3 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Sat, 21 Nov 2020 09:33:37 -0800
Subject: [PATCH 144/357] jetbrains-jdk-bin: update to 11.0.9b1183.9.
---
srcpkgs/jetbrains-jdk-bin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index 68cba46aaf6..c895bfa4fe0 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk-bin/template
@@ -1,6 +1,6 @@
# Template file for 'jetbrains-jdk-bin'
pkgname=jetbrains-jdk-bin
-version=11.0.8b1031.1
+version=11.0.9b1183.9
revision=1
archs="x86_64"
wrksrc="jbrsdk"
@@ -12,7 +12,7 @@ homepage="https://github.com/JetBrains/JetBrainsRuntime"
_jdk_ver=${version%b*}
_jdk_build=${version#*b}
distfiles="https://dl.bintray.com/jetbrains/intellij-jbr/jbrsdk-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
-checksum=0f72e1005648b020cec95957d1b6534158e06e6202e78263aed0976287d2488d
+checksum=aec4dbcf20f47bfe6e1f26dd84e17e395a8e31fda45c981ec8c2ba7767108494
fetch_cmd="wget"
# This JDK appears to link to libs that do not exist, but functions well even in their absence.
# Best guess is that they are optional. ¯\_(ツ)_/¯
From f75f71d31023e97d1dbc0ffaeb32418b5325be21 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Fri, 13 Nov 2020 19:28:22 -0700
Subject: [PATCH 145/357] New package: wbg-1.0.0
---
srcpkgs/wbg/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/wbg/template
diff --git a/srcpkgs/wbg/template b/srcpkgs/wbg/template
new file mode 100644
index 00000000000..28fd6b2d9dc
--- /dev/null
+++ b/srcpkgs/wbg/template
@@ -0,0 +1,15 @@
+# Template file for 'wbg'
+pkgname=wbg
+version=1.0.1
+revision=1
+wrksrc=$pkgname
+build_style=meson
+hostmakedepends="pkg-config wayland-devel"
+makedepends="libjpeg-turbo-devel libpng-devel pixman-devel
+ tllist wayland-devel wayland-protocols"
+short_desc="Simple wallpaper application for Wayland compositors"
+maintainer="travankor <travankor@tuta.io>"
+license="GPL-3.0-or-later"
+homepage="https://codeberg.org/dnkl/wbg"
+distfiles="https://codeberg.org/dnkl/wbg/archive/${version}.tar.gz"
+checksum=20411bb0aead3775616ceaccd48c2a3028400e33094571acf7b6c0005154ac9d
From 5b3f466a2e2e6485254e49bcd5450d992d089608 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Thu, 19 Nov 2020 21:58:24 +0900
Subject: [PATCH 146/357] New package: terraform-ls-0.10.0
Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
srcpkgs/terraform-ls/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/terraform-ls/template
diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
new file mode 100644
index 00000000000..d2e000bf24a
--- /dev/null
+++ b/srcpkgs/terraform-ls/template
@@ -0,0 +1,16 @@
+# Template file for 'terraform-ls'
+pkgname=terraform-ls
+version=0.10.0
+revision=1
+build_style=go
+go_import_path="github.com/hashicorp/$pkgname"
+short_desc="Terraform Language Server"
+maintainer="Sora Morimoto <sora@morimoto.io>"
+license="MPL-2.0"
+homepage="https://github.com/hashicorp/terraform-ls"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=4f6975960dab0d47297fb1cab5685482a12a1f04e148056bdba548d014dd5cd7
+
+post_install() {
+ vlicense LICENSE
+}
From d6d526963e233f604dcea3d42a8e96fd48187220 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Fri, 13 Nov 2020 13:01:05 +0900
Subject: [PATCH 147/357] New package: tflint-0.20.3
Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
srcpkgs/tflint/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/tflint/template
diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
new file mode 100644
index 00000000000..305bbc146b9
--- /dev/null
+++ b/srcpkgs/tflint/template
@@ -0,0 +1,16 @@
+# Template file for 'tflint'
+pkgname=tflint
+version=0.20.3
+revision=1
+build_style=go
+go_import_path="github.com/terraform-linters/$pkgname"
+short_desc="Terraform linter focused on possible errors, best practices, etc"
+maintainer="Sora Morimoto <sora@morimoto.io>"
+license="MPL-2.0"
+homepage="https://github.com/terraform-linters/tflint"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=a375bdcae4276e39607a026da9b50ddca6656586baed2c7c667ed77acf570985
+
+post_install() {
+ vlicense LICENSE
+}
From 375f68ba8955bc3edfe514a5ca6819509fb61329 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Thu, 12 Nov 2020 18:00:00 +0530
Subject: [PATCH 148/357] New package: loudgain-0.6.8
---
srcpkgs/loudgain/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
new file mode 100644
index 00000000000..f2916788343
--- /dev/null
+++ b/srcpkgs/loudgain/template
@@ -0,0 +1,17 @@
+# Template file for 'loudgain'
+pkgname=loudgain
+version=0.6.8
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libebur128-devel taglib-devel ffmpeg-devel"
+short_desc="ReplayGain 2.0 loudness normalizer"
+maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/Moonbase59/loudgain"
+distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
+checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
+
+post_install() {
+ vlicense COPYING
+}
From 7cd02478710a499442d8a48e6460be0762b1f167 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 9 Nov 2020 12:57:30 -0600
Subject: [PATCH 149/357] iptraf-ng: update to 1.2.1
---
srcpkgs/iptraf-ng/patches/musl.patch | 230 ---------------------------
srcpkgs/iptraf-ng/template | 9 +-
2 files changed, 5 insertions(+), 234 deletions(-)
delete mode 100644 srcpkgs/iptraf-ng/patches/musl.patch
diff --git a/srcpkgs/iptraf-ng/patches/musl.patch b/srcpkgs/iptraf-ng/patches/musl.patch
deleted file mode 100644
index 9dbc36fac96..00000000000
--- a/srcpkgs/iptraf-ng/patches/musl.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-From bc0001050b7c2dd92c5b0e78840efbaac5b8c1bb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 19 Dec 2019 03:18:52 +0100
-Subject: [PATCH] Use POSIX instead of Linux/GNU style fields
-
-This allows compilation on current musl, without breaking it on
-glibc. The fields are all in a union and refer to the same thing.
----
- src/ipfrag.c | 8 ++++----
- src/itrafmon.c | 6 +++---
- src/othptab.c | 12 ++++++------
- src/packet.c | 16 ++++++++--------
- src/tcptable.c | 20 ++++++++++----------
- 5 files changed, 31 insertions(+), 31 deletions(-)
-
-diff --git src/ipfrag.c src/ipfrag.c
-index 76196e6..f9c28ad 100644
---- src/ipfrag.c
-+++ src/ipfrag.c
-@@ -190,11 +190,11 @@ unsigned int processfragment(struct iphdr *packet, in_port_t *sport,
- ftmp->firstin = 1;
- tpacket = ((char *) (packet)) + (packet->ihl * 4);
- if (packet->protocol == IPPROTO_TCP) {
-- ftmp->s_port = ntohs(((struct tcphdr *) tpacket)->source);
-- ftmp->d_port = ntohs(((struct tcphdr *) tpacket)->dest);
-+ ftmp->s_port = ntohs(((struct tcphdr *) tpacket)->th_sport);
-+ ftmp->d_port = ntohs(((struct tcphdr *) tpacket)->th_dport);
- } else if (packet->protocol == IPPROTO_UDP) {
-- ftmp->s_port = ntohs(((struct udphdr *) tpacket)->source);
-- ftmp->d_port = ntohs(((struct udphdr *) tpacket)->dest);
-+ ftmp->s_port = ntohs(((struct udphdr *) tpacket)->uh_sport);
-+ ftmp->d_port = ntohs(((struct udphdr *) tpacket)->uh_dport);
- }
- }
- while (dtmp != NULL) {
-diff --git src/itrafmon.c src/itrafmon.c
-index 670ab6d..fe4c5a8 100644
---- src/itrafmon.c
-+++ src/itrafmon.c
-@@ -1017,7 +1017,7 @@ void ipmon(time_t facilitytime, char *ifptr)
-
- if (((ntohs(frag_off) & 0x3fff) == 0) /* first frag only */
- && (tcpentry == NULL)
-- && (!(transpacket->fin))) {
-+ && (!(transpacket->th_flags & TH_FIN))) {
-
- /*
- * Ok, so we have a packet. Add it if this connection
-@@ -1078,7 +1078,7 @@ void ipmon(time_t facilitytime, char *ifptr)
- && (tcpentry->pcount == 1)
- && (!(tcpentry->stat & FLAG_RST))) {
- strcpy(msgstring, "first packet");
-- if (transpacket->syn)
-+ if (transpacket->th_flags & TH_SYN)
- strcat(msgstring, " (SYN)");
-
- writetcplog(logging, logfile, tcpentry,
-@@ -1108,7 +1108,7 @@ void ipmon(time_t facilitytime, char *ifptr)
-
- if (((tcpentry->oth_connection->finsent == 2)
- && /* FINed and ACKed */
-- (ntohl(transpacket->seq) == tcpentry->oth_connection->finack))
-+ (ntohl(transpacket->th_seq) == tcpentry->oth_connection->finack))
- || ((revlook)
- && (((p_sstat != RESOLVED)
- && (tcpentry->s_fstat == RESOLVED))
-diff --git src/othptab.c src/othptab.c
-index 142c9c2..479a55a 100644
---- src/othptab.c
-+++ src/othptab.c
-@@ -140,9 +140,9 @@ void process_dest_unreach(struct tcptable *table, char *packet, char *ifname)
- tcp = (struct tcphdr *) (packet + 48);
- struct sockaddr_storage saddr, daddr;
- sockaddr_make_ipv6(&saddr, &ip6->ip6_src);
-- sockaddr_set_port(&saddr, ntohs(tcp->source));
-+ sockaddr_set_port(&saddr, ntohs(tcp->th_sport));
- sockaddr_make_ipv6(&daddr, &ip6->ip6_dst);
-- sockaddr_set_port(&daddr, ntohs(tcp->dest));
-+ sockaddr_set_port(&daddr, ntohs(tcp->th_dport));
- tcpentry =
- in_table(table, &saddr, &daddr, ifname, 0, NULL, 0);
- } else {
-@@ -151,9 +151,9 @@ void process_dest_unreach(struct tcptable *table, char *packet, char *ifname)
- tcp = (struct tcphdr *) (packet + 8 + (ip->ihl * 4));
- struct sockaddr_storage saddr, daddr;
- sockaddr_make_ipv4(&saddr, ip->saddr);
-- sockaddr_set_port(&saddr, ntohs(tcp->source));
-+ sockaddr_set_port(&saddr, ntohs(tcp->th_sport));
- sockaddr_make_ipv4(&daddr, ip->daddr);
-- sockaddr_set_port(&daddr, ntohs(tcp->dest));
-+ sockaddr_set_port(&daddr, ntohs(tcp->th_dport));
- tcpentry =
- in_table(table, &saddr, &daddr, ifname, 0, NULL, 0);
- }
-@@ -212,10 +212,10 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt,
- new_entry->un.icmp6.code =
- ((struct icmp6_hdr *) packet2)->icmp6_code;
- } else if (protocol == IPPROTO_UDP) {
-- servlook(ntohs(((struct udphdr *) packet2)->source),
-+ servlook(ntohs(((struct udphdr *) packet2)->uh_sport),
- IPPROTO_UDP, new_entry->un.udp.s_sname,
- 10);
-- servlook(ntohs(((struct udphdr *) packet2)->dest),
-+ servlook(ntohs(((struct udphdr *) packet2)->uh_dport),
- IPPROTO_UDP, new_entry->un.udp.d_sname,
- 10);
- } else if (protocol == IPPROTO_OSPFIGP) {
-diff --git src/packet.c src/packet.c
-index bc8ed21..b0d552b 100644
---- src/packet.c
-+++ src/packet.c
-@@ -247,13 +247,13 @@ again:
- switch (ip->protocol) {
- case IPPROTO_TCP:
- tcp = (struct tcphdr *) ip_payload;
-- sport_tmp = ntohs(tcp->source);
-- dport_tmp = ntohs(tcp->dest);
-+ sport_tmp = ntohs(tcp->th_sport);
-+ dport_tmp = ntohs(tcp->th_dport);
- break;
- case IPPROTO_UDP:
- udp = (struct udphdr *) ip_payload;
-- sport_tmp = ntohs(udp->source);
-- dport_tmp = ntohs(udp->dest);
-+ sport_tmp = ntohs(udp->uh_sport);
-+ dport_tmp = ntohs(udp->uh_dport);
- break;
- default:
- sport_tmp = 0;
-@@ -299,16 +299,16 @@ again:
- case IPPROTO_TCP:
- tcp = (struct tcphdr *) ip_payload;
- if (sport)
-- *sport = ntohs(tcp->source);
-+ *sport = ntohs(tcp->th_sport);
- if (dport)
-- *dport = ntohs(tcp->dest);
-+ *dport = ntohs(tcp->th_dport);
- break;
- case IPPROTO_UDP:
- udp = (struct udphdr *) ip_payload;
- if (sport)
-- *sport = ntohs(udp->source);
-+ *sport = ntohs(udp->uh_sport);
- if (dport)
-- *dport = ntohs(udp->dest);
-+ *dport = ntohs(udp->uh_dport);
- break;
- default:
- if (sport)
-diff --git src/tcptable.c src/tcptable.c
-index 956866c..3ef8508 100644
---- src/tcptable.c
-+++ src/tcptable.c
-@@ -613,19 +613,19 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- */
-
- if (tableentry->pcount == 1) {
-- if ((transpacket->syn) || (transpacket->rst))
-+ if ((transpacket->th_flags & TH_SYN) || (transpacket->th_flags & TH_RST))
- tableentry->partial = 0;
- else
- tableentry->partial = 1;
- }
-- tableentry->win = ntohs(transpacket->window);
-+ tableentry->win = ntohs(transpacket->th_win);
-
- tableentry->stat = 0;
-
-- if (transpacket->syn)
-+ if (transpacket->th_flags & TH_SYN)
- tableentry->stat |= FLAG_SYN;
-
-- if (transpacket->ack) {
-+ if (transpacket->th_flags & TH_ACK) {
- tableentry->stat |= FLAG_ACK;
-
- /*
-@@ -639,7 +639,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- */
-
- if ((tableentry->oth_connection->finsent == 1)
-- && (ntohl(transpacket->seq) ==
-+ && (ntohl(transpacket->th_seq) ==
- tableentry->oth_connection->finack)) {
- tableentry->oth_connection->finsent = 2;
-
-@@ -660,7 +660,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- * in ACK above.
- */
-
-- if (transpacket->fin) {
-+ if (transpacket->th_flags & TH_FIN) {
-
- /*
- * First, we check if the opposite direction has no counts, in which
-@@ -688,7 +688,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- */
-
- tableentry->finsent = 1;
-- tableentry->finack = ntohl(transpacket->ack_seq);
-+ tableentry->finack = ntohl(transpacket->th_ack);
- }
- if (logging) {
- char flowrate[64];
-@@ -701,7 +701,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- tableentry->psize, msgstring);
- }
- }
-- if (transpacket->rst) {
-+ if (transpacket->th_flags & TH_RST) {
- tableentry->stat |= FLAG_RST;
- if (!(tableentry->inclosed))
- addtoclosedlist(table, tableentry);
-@@ -720,10 +720,10 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- tableentry->psize, msgstring);
- }
- }
-- if (transpacket->psh)
-+ if (transpacket->th_flags & TH_PUSH)
- tableentry->stat |= FLAG_PSH;
-
-- if (transpacket->urg)
-+ if (transpacket->th_flags & TH_URG)
- tableentry->stat |= FLAG_URG;
-
- tableentry->lastupdate = tableentry->oth_connection->lastupdate =
---
-2.24.0
-
diff --git a/srcpkgs/iptraf-ng/template b/srcpkgs/iptraf-ng/template
index 4fcb86ec182..89a17ed1723 100644
--- a/srcpkgs/iptraf-ng/template
+++ b/srcpkgs/iptraf-ng/template
@@ -1,14 +1,15 @@
# Template file for 'iptraf-ng'
pkgname=iptraf-ng
-version=1.1.4
-revision=3
-build_style=gnu-configure
+version=1.2.1
+revision=1
+build_style=gnu-makefile
+make_install_args="prefix=${DESTDIR}/usr sbindir=${DESTDIR}/usr/bin"
makedepends="ncurses-devel"
short_desc="IP traffic monitor (iptraf-3.0.0 fork)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://tracker.debian.org/pkg/iptraf-ng"
distfiles="http://http.debian.net/debian/pool/main/i/iptraf-ng/iptraf-ng_${version}.orig.tar.gz"
-checksum=79140cf07c0cceb1b5723242847a73aa86f5e4f9dccfe8970fda6801d347eb09
+checksum=9f5cef584065420dea1ba32c86126aede1fa9bd25b0f8362b0f9fd9754f00870
LDFLAGS="-lncursesw -lpanelw -lmenuw"
From cc73cf1e5ab5e1cd48569f892c1f49e375425bb1 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sun, 8 Nov 2020 07:32:27 +0000
Subject: [PATCH 150/357] global: update to 6.6.5
---
srcpkgs/global/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/global/template b/srcpkgs/global/template
index 983db1bec97..dcaaa11b15d 100644
--- a/srcpkgs/global/template
+++ b/srcpkgs/global/template
@@ -1,6 +1,6 @@
# Template file for 'global'
pkgname=global
-version=6.6.4
+version=6.6.5
revision=1
build_style=gnu-configure
configure_args="--disable-static --with-exuberant-ctags=/usr/bin/ctags
@@ -12,7 +12,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/global/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=987e8cb956c53f8ebe4453b778a8fde2037b982613aba7f3e8e74bcd05312594
-python_version=2 #unverified
+checksum=9c3730bd9e975d94231f3402d5526b79c0b23cc665d624c9829c948dfad37b83
+python_version=3
CFLAGS="-fcommon"
From d1541b9ded13e7dd67b88ade49946e3832424470 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sun, 8 Nov 2020 07:20:14 +0000
Subject: [PATCH 151/357] delve: update to 1.5.0
---
srcpkgs/delve/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index 7de8cad55bb..00360982335 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,6 +1,6 @@
# Template file for 'delve'
pkgname=delve
-version=1.4.1
+version=1.5.0
revision=1
build_style=go
go_import_path=github.com/go-delve/delve/cmd/dlv
@@ -9,7 +9,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="MIT"
homepage="https://github.com/go-delve/delve"
distfiles="https://github.com/go-delve/delve/archive/v${version}.tar.gz"
-checksum=6d9da41a18905c9819e33f475bf911facba1297674d2312ab5d7e2488fac685a
+checksum=f8bbaecdfc9d1ff6148900d3dea44b6dd06a7f0197be4e9a75c289b7f62682ab
case "$XBPS_TARGET_MACHINE" in
i686*|arm*|ppc*) broken=yes ;;
From bdf5376c91b7851ffb5e140f6395f6a0d1e63bd8 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sun, 8 Nov 2020 07:08:25 +0000
Subject: [PATCH 152/357] loksh: update to 6.8.1
---
srcpkgs/loksh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template
index a3dd27e5a3a..9089c868036 100644
--- a/srcpkgs/loksh/template
+++ b/srcpkgs/loksh/template
@@ -1,6 +1,6 @@
# Template file for 'loksh'
pkgname=loksh
-version=6.7.5
+version=6.8.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="custom:Public Domain"
homepage="https://github.com/dimkr/loksh"
distfiles="https://github.com/dimkr/loksh/releases/download/${version}/loksh-${version}.tar.xz"
-checksum=1a36bafc2bfb9dee11ca65f955528960283ed12f9b00c57c523c49b2a1c91dd5
+checksum=ceeda4913febdb7e5f42db6a465835178221417e9f24865b0017e89a1a6a610e
register_shell="/bin/loksh"
alternatives="
From 2feb718ff7ac1d8975dde50400651f1f42268893 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:03:49 +0200
Subject: [PATCH 153/357] kdegraphics-thumbnailers: update to 20.08.3.
---
srcpkgs/kdegraphics-thumbnailers/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 93ac206401b..9b11c64eb10 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
# Template file for 'kdegraphics-thumbnailers'
pkgname=kdegraphics-thumbnailers
-version=20.08.1
+version=20.08.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=8303231f2fc44c071b3f6a477ae5335f2657dbfaba52362529aaba20973a5995
+checksum=aed7570a2af795d1f14b54782c578572e639bb850aee88d69dd5b17e0f9f7f55
From 4183cc3ab9fe5e9fddde9f2682044f0b3ee0c3fd Mon Sep 17 00:00:00 2001
From: cptpcrd <31829097+cptpcrd@users.noreply.github.com>
Date: Wed, 11 Nov 2020 21:44:13 -0500
Subject: [PATCH 154/357] New package: watchexec-1.14.1
(Based off of bat's template)
---
srcpkgs/watchexec/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/watchexec/template
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
new file mode 100644
index 00000000000..8b62e5ee01d
--- /dev/null
+++ b/srcpkgs/watchexec/template
@@ -0,0 +1,17 @@
+# Template file for 'watchexec'
+pkgname=watchexec
+version=1.14.1
+revision=1
+build_style=cargo
+short_desc="Executes commands in response to file modifications"
+maintainer="cptpcrd <cptpcrd.git@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/watchexec/watchexec"
+distfiles="https://github.com/watchexec/watchexec/archive/${version}.tar.gz"
+checksum=23ca90f1f070b0d30e821667c8b9deaf174d020373ea032e9e22f1a78adcfa1c
+
+post_install() {
+ vdoc README.md
+ vman doc/watchexec.1
+ vcompletion completions/zsh zsh
+}
From e591a338c31f072ac64b63f37788e2ed42f13f59 Mon Sep 17 00:00:00 2001
From: rc-05 <rc23@email.it>
Date: Sat, 20 Jun 2020 01:33:34 +0200
Subject: [PATCH 155/357] adobe-flash-plugin: update to 32.0.0.453.
---
srcpkgs/adobe-flash-plugin/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template
index 4460be81e58..3c2d29c7db5 100644
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@@ -1,6 +1,6 @@
# Template file for 'adobe-flash-plugin'
pkgname=adobe-flash-plugin
-version=32.0.0.433
+version=32.0.0.453
revision=1
depends="curl hicolor-icon-theme desktop-file-utils"
short_desc="Adobe Flash Player plugin for Netscape compatible browsers"
@@ -23,15 +23,15 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
${_url}/flash_player_npapi_linux.x86_64.tar.gz
${_url}/flash_player_ppapi_linux.x86_64.tar.gz"
checksum="
- ee022c4b1a96eecbfc0e022396cdcb713dddc2fb82abe00dc9c6ddf9518a004d
- ccb865f3a2d39012ec36d13df236e67a0043c43368f4b4b60465d5664870f570"
+ 587fe7027ef410e6833a9428b61ea28d4047bce6e8ed4bff3127cb9e08723e37
+ cab3d2b3a02b1348d991259a7602ffb1d12ec1912984a68bcab0f7ccdf27a9f7"
else
distfiles="
${_url}/flash_player_npapi_linux.i386.tar.gz
${_url}/flash_player_ppapi_linux.i386.tar.gz"
checksum="
- 79dc936f5c1a3af91cd5a2eb31d0d4eb7bee4ebbd49239c6c8f8f8b4b98486e3
- e1d36f768cc6435b9a13b595a41df3f5fedfa6d1b984084163bb56f73baaff7c"
+ 4151cdbba10488978aa2baae19ec147012e17d79c59a6bb40453e35435571df8
+ 88f71944d5c08d1b36446c9c865fc82bcb89d55cd148f62afee8dd928943caf6"
fi
distfiles+=" ${_eula}"
checksum+=" ${_eulacksum}"
From 12e7d397ff1f8684aa4c6d3f7efb935ba1da292d Mon Sep 17 00:00:00 2001
From: wundrweapon <whhacker.dcx@gmail.com>
Date: Fri, 30 Oct 2020 16:30:56 -0400
Subject: [PATCH 156/357] highlight: update to 3.58.
---
srcpkgs/highlight/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/highlight/template b/srcpkgs/highlight/template
index 487d6195561..5bfc991799b 100644
--- a/srcpkgs/highlight/template
+++ b/srcpkgs/highlight/template
@@ -1,16 +1,16 @@
# Template file for 'highlight'
pkgname=highlight
-version=3.57
-revision=3
+version=3.58
+revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config swig perl"
-makedepends="boost-devel lua53-devel perl"
+makedepends="boost-devel lua54-devel perl"
short_desc="Fast and flexible source code highlighter (CLI version)"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.andre-simon.de/doku/highlight/en/highlight.php"
distfiles="http://www.andre-simon.de/zip/${pkgname}-${version}.tar.bz2"
-checksum=f203f75e7e35ce381d0a13270bfdc9ee53fa965c39cc137a9927b9ff0e3be913
+checksum=df80251be1f83adfc58aaad589fd9a8f9a3866b0d89b9f3c81b1696f07db45f8
conf_files="/etc/highlight/filetypes.conf"
post_extract() {
@@ -30,7 +30,7 @@ pre_build() {
}
do_check() {
- # No check target, fails spetarcularly when asked
+ # No check target, fails spectacularly when asked
:
}
From 12bf178b802084e0c6e6e85f752188fd5b79356f Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Sun, 1 Nov 2020 14:27:17 -0800
Subject: [PATCH 157/357] json-c++: build with multi-header support
---
srcpkgs/json-c++/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 1ec838d59a9..23c0d56fc8e 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -1,9 +1,10 @@
# Template file for 'json-c++'
pkgname=json-c++
version=3.9.1
-revision=1
+revision=2
wrksrc="json-${version}"
build_style=cmake
+configure_args="-DJSON_MultipleHeaders=ON"
checkdepends="git"
short_desc="JSON for modern C++"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
From 0d3d1f90a20bbb050833b5d8e35bbb745493b49d Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Wed, 28 Oct 2020 12:54:51 -0700
Subject: [PATCH 158/357] OpenRCT2: update to 0.3.2
---
srcpkgs/OpenRCT2/template | 40 ++++++++++++++++++++++++---------------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index a6e9d10f5bd..5dc6d249853 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,33 +2,41 @@
# based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template
# and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
pkgname=OpenRCT2
-_objects_version=1.0.15
-_titles_version=0.1.2
-version=0.2.6
-revision=3
+_objects_version=1.0.18
+_titles_version=0.1.2c
+version=0.3.2
+revision=1
build_style=cmake
-configure_args="$(vopt_if multiplayer "" "-DDISABLE_HTTP_TWITCH=1 -DDISABLE_NETWORK=1")"
+configure_args="
+ -DOPENRCT2_VERSION_TAG=${version}
+ -DDOWNLOAD_TITLE_SEQUENCES=0
+ -DDOWNLOAD_OBJECTS=0
+ $(vopt_if multiplayer '' '-DDISABLE_NETWORK=1')
+ $(vopt_if scripting '-DENABLE_SCRIPTING=1' '')"
hostmakedepends="pkg-config unzip"
makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel
- $(vopt_if multiplayer libcurl-devel) $(vopt_if multiplayer libressl-devel)"
+ libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
+ $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if scripting duktape-devel)"
short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
maintainer="klardotsh <josh@klar.sh>"
license="GPL-3.0-or-later"
homepage="https://openrct2.io"
+# use title-sequences.zip to match CMakeLists instruction
distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
- https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequence-v${_titles_version}.zip"
-checksum="0e05a709d3e07343cd72e4db4cb4f1a6d9956f8acf7da682d2a3940c3112776e
- 0171907a267c564071e587fc683bfe75f36b891a6769e0bd49a6fc46f2ae7ded
- dcb1648739b351e857e2d19fed1626bec561d5e9f4b49201568f42c475ee7e61"
-skip_extraction="objects.zip title-sequence-v${_titles_version}.zip"
+ https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
+checksum="66c1c7ae8c765397e324b1aac59907bd5197dbad88597133aaba8a9480627c36
+ bf8a28b7ccebaf58e4e9eb2540534632830534cf0b3f73677521dc555878c682
+ 5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
+skip_extraction="objects.zip title-sequences.zip"
replaces="OpenRCT2-data>=0"
-build_options="multiplayer"
-build_options_default="multiplayer"
+build_options="multiplayer scripting"
+build_options_default="multiplayer scripting"
desc_option_multiplayer="Enable multiplayer support"
+desc_option_scripting="Enable script / plugin support"
if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
broken="not yet implemented"
@@ -49,5 +57,7 @@ post_extract() {
_srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
mkdir -p data/object data/title
unzip -qd data/object "${_srcdir}/objects.zip"
- unzip -qd data/title "${_srcdir}/title-sequence-v${_titles_version}.zip"
+ unzip -qd data/sequence "${_srcdir}/title-sequences.zip"
+
+ vsed -i CMakeLists.txt -e "s; -Werror;;"
}
From d2d64eaf8ae58d9bdbe3891eb40828aabee61977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 5 Nov 2020 20:04:23 -0300
Subject: [PATCH 159/357] ngspice: update to 33.
---
srcpkgs/ngspice/patches/windows-only.patch | 15 +++++++++++++++
srcpkgs/ngspice/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/ngspice/patches/windows-only.patch
diff --git a/srcpkgs/ngspice/patches/windows-only.patch b/srcpkgs/ngspice/patches/windows-only.patch
new file mode 100644
index 00000000000..5f661864184
--- /dev/null
+++ b/srcpkgs/ngspice/patches/windows-only.patch
@@ -0,0 +1,15 @@
+libshlwapi is Windows-only
+
+diff --git src/xspice/cmpp/Makefile.in src/xspice/cmpp/Makefile.in
+index b450e8c..2ea8716 100644
+--- src/xspice/cmpp/Makefile.in
++++ src/xspice/cmpp/Makefile.in
+@@ -753,7 +753,7 @@ ifs_yacc.c : ifs_yacc.y
+
+ @CROSS_COMPILING_TRUE@build/cmpp$(BUILD_EXEEXT) : $(BUILD_CMPP_FILES)
+ @CROSS_COMPILING_TRUE@ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
+-@CROSS_COMPILING_TRUE@ $(AM_CPPFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ $^ -lshlwapi
++@CROSS_COMPILING_TRUE@ $(AM_CPPFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ $^
+
+ @CROSS_COMPILING_TRUE@distclean-local:
+ @CROSS_COMPILING_TRUE@ -rm -rf build
diff --git a/srcpkgs/ngspice/template b/srcpkgs/ngspice/template
index 86dfb7d7c7d..05beffd8f84 100644
--- a/srcpkgs/ngspice/template
+++ b/srcpkgs/ngspice/template
@@ -1,6 +1,6 @@
# Template file for 'ngspice'
pkgname=ngspice
-version=32
+version=33
revision=1
build_style=gnu-configure
configure_args="--with-readline=yes --with-ngshared --enable-xspice --enable-cider"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://ngspice.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/ngspice/ng-spice-rework/${version}/${pkgname}-${version}.tar.gz"
-checksum=3cd90c4e94516d87c5b4d02a3a6405b1136b25d05c871d4fee1fd7c4c0d03ef2
+checksum=b99db66cc1c57c44e9af1ef6ccb1dcbc8ae1df3e35acf570af578f606f8541f1
post_install() {
vlicense COPYING
From 64cc221cc5ca910befaabf21a4ce0d6526cf7cf4 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 15:39:22 -0600
Subject: [PATCH 160/357] poedit: remove un-needed makedepends
---
srcpkgs/poedit/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 4b0fe5d6cbc..4616503a942 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -6,8 +6,7 @@ build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
makedepends="boost-devel cld2-devel db-devel enchant2-devel gtk+3-devel
- gtkspell3-devel libharfbuzz libxml2 Lucene++-devel webkit2gtk
- wxWidgets-gtk3-devel"
+ gtkspell3-devel Lucene++-devel wxWidgets-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cross-platform gettext catalogs (.po files) editor"
maintainer="Orphaned <orphan@voidlinux.org>"
From 8d72b3481ba219c60bb01d3a12954b0a95843b85 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:53:28 +0200
Subject: [PATCH 161/357] New package: nocurses-2.0.4.
---
common/shlibs | 2 ++
srcpkgs/notcurses-devel | 1 +
srcpkgs/notcurses-progs | 1 +
srcpkgs/notcurses/template | 40 ++++++++++++++++++++++++++++++++++++++
4 files changed, 44 insertions(+)
create mode 120000 srcpkgs/notcurses-devel
create mode 120000 srcpkgs/notcurses-progs
create mode 100644 srcpkgs/notcurses/template
diff --git a/common/shlibs b/common/shlibs
index 8b31eaafdc4..03e11add039 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3993,3 +3993,5 @@ liburing.so.1 liburing-0.7_1
libbson-1.0.so.0 libbson-1.17.0_1
libsonic.so.0 libsonic-0.2.0_1
libtickit.so.3 libtickit-0.4.1_1
+libnotcurses.so.2 notcurses-2.0.4_1
+libnotcurses++.so.2 notcurses-2.0.4_1
diff --git a/srcpkgs/notcurses-devel b/srcpkgs/notcurses-devel
new file mode 120000
index 00000000000..609dfe4d9c5
--- /dev/null
+++ b/srcpkgs/notcurses-devel
@@ -0,0 +1 @@
+notcurses
\ No newline at end of file
diff --git a/srcpkgs/notcurses-progs b/srcpkgs/notcurses-progs
new file mode 120000
index 00000000000..609dfe4d9c5
--- /dev/null
+++ b/srcpkgs/notcurses-progs
@@ -0,0 +1 @@
+notcurses
\ No newline at end of file
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
new file mode 100644
index 00000000000..bb2d9419da8
--- /dev/null
+++ b/srcpkgs/notcurses/template
@@ -0,0 +1,40 @@
+# Template file for 'notcurses'
+pkgname=notcurses
+version=2.0.4
+revision=1
+build_style=cmake
+configure_args="-DUSE_STATIC=ON"
+hostmakedepends="pkg-config pandoc"
+makedepends="libunistring-devel ffmpeg-devel ncurses-libtinfo-devel qrcodegen-devel doctest-devel"
+depends="ncurses-base"
+short_desc="Blingful character graphics/TUI library"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="Apache-2.0"
+homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
+changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
+distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
+checksum=6bb38ca0affc6425cd8e248c5b81aa4281713362c45202a450a89ab751833c98
+
+notcurses-devel_package() {
+ depends="notcurses-${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove /usr/lib/cmake
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/doc
+ vmove usr/share/man/man3
+ }
+}
+
+notcurses-progs_package() {
+ depends="notcurses-${version}_${revision}"
+ short_desc+=" - programs"
+ pkg_install() {
+ vmove usr/bin
+ vmove usr/share/notcurses
+ vmove usr/share/man/man1
+ }
+}
From c4ac0867eb03e1089a1ece0b57017c3a960f2ada Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:54:10 +0200
Subject: [PATCH 162/357] New package: growlight-1.2.18.
---
srcpkgs/growlight/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/growlight/template
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
new file mode 100644
index 00000000000..65e5f69d52a
--- /dev/null
+++ b/srcpkgs/growlight/template
@@ -0,0 +1,16 @@
+# Template file for 'growlight'
+pkgname=growlight
+version=1.2.18
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config pandoc"
+makedepends="libatasmart-devel libblkid-devel libcap-devel cryptsetup-devel
+ nettle-devel notcurses-devel libpciaccess-devel eudev-libudev-devel zlib-devel
+ device-mapper-devel pciutils-devel zfs-devel"
+depends="ntfs-3g jfsutils xfsprogs nvme-cli hdparm f2fs-tools btrfs-progs e2fsprogs"
+short_desc="Block device manager and system installation tool"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://nick-black.com/dankwiki/index.php/Growlight"
+distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
+checksum=c6c08556e6838226b81300e177c49d7a382e9eb30cfdb19f99790106e426a032
From 4d1fa9e9f6932ce415c91d960264c7ebe119c451 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:54:48 +0200
Subject: [PATCH 163/357] New package: doctest-2.4.1.
---
srcpkgs/doctest-devel | 1 +
srcpkgs/doctest/template | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 120000 srcpkgs/doctest-devel
create mode 100644 srcpkgs/doctest/template
diff --git a/srcpkgs/doctest-devel b/srcpkgs/doctest-devel
new file mode 120000
index 00000000000..79086729892
--- /dev/null
+++ b/srcpkgs/doctest-devel
@@ -0,0 +1 @@
+doctest
\ No newline at end of file
diff --git a/srcpkgs/doctest/template b/srcpkgs/doctest/template
new file mode 100644
index 00000000000..eeb20eab623
--- /dev/null
+++ b/srcpkgs/doctest/template
@@ -0,0 +1,25 @@
+# Template file for 'doctest'
+pkgname=doctest
+version=2.4.1
+revision=1
+build_style=cmake
+short_desc="Doctest C++ testing framework"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md#reference"
+changelog="https://raw.githubusercontent.com/onqtam/doctest/master/CHANGELOG.md"
+distfiles="https://github.com/onqtam/doctest/archive/${version}.tar.gz"
+checksum=0a0f0be21ee23e36ff6b8b9d63c06a7792e04cce342e1df3dee0e40d1e21b9f0
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+doctest-devel_package() {
+ depends="doctest-${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From 6517c67a5f7c8faf0a6a1f0e9931e2265dfee7e3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:55:19 +0200
Subject: [PATCH 164/357] qrcodegen: enable C library build.
---
srcpkgs/qrcodegen/template | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/qrcodegen/template b/srcpkgs/qrcodegen/template
index 53627a2b98f..d181e9cdb52 100644
--- a/srcpkgs/qrcodegen/template
+++ b/srcpkgs/qrcodegen/template
@@ -1,10 +1,8 @@
# Template file for 'qrcodegen'
pkgname=qrcodegen
version=1.6.0
-revision=2
+revision=3
wrksrc="QR-Code-generator-${version}"
-build_wrksrc="cpp"
-build_style=gnu-makefile
short_desc="QR Code generator library"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="MIT"
@@ -14,11 +12,20 @@ checksum=8acee5a77325e075b910747ad4b1fdb1491b7e22d0b8f1b5a6ea15ea08ba33a8
CXXFLAGS="-fPIC"
+do_build() {
+ for dir in c cpp
+ do
+ cd $dir && make && cd ..
+ done
+}
+
do_install() {
- sed -n "/^License/,/xxxx/p" ../Readme.markdown > LICENSE
+ sed -n "/^License/,/xxxx/p" Readme.markdown > LICENSE
vlicense LICENSE
- vinstall QrCode.hpp 644 usr/include/qrcodegen
- vinstall libqrcodegen.a 644 usr/lib libqrcodegencpp.a
+ vinstall cpp/QrCode.hpp 644 usr/include/qrcodegen
+ vinstall cpp/libqrcodegen.a 644 usr/lib libqrcodegencpp.a
+ vinstall c/qrcodegen.h 644 usr/include/qrcodegen
+ vinstall c/libqrcodegen.a 644 usr/lib
}
qrcodegen-devel_package() {
From 5895cee48b5ce80510e89d5fdaa80fd077ef88a7 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:42:08 -0600
Subject: [PATCH 165/357] php: rebuild against libnet-snmp [ci skip]
---
srcpkgs/php/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index db56578a49f..613e0215751 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
version=7.4.11
-revision=1
+revision=2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmysqlclient-devel
From 9060da8bd19511f6bfefcd9c632cbd6abceaafa0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:36:11 -0600
Subject: [PATCH 166/357] collectd: rebuild against libnet-snmp
---
srcpkgs/collectd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index f0ff336a74d..84ce3ef4ecd 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
# Template file for 'collectd'
pkgname=collectd
version=5.11.0
-revision=4
+revision=5
build_style=gnu-configure
configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
$(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
From 6f01dd3b763f1cc349cbd5b99900188013edd770 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:39:50 -0600
Subject: [PATCH 167/357] hplip: rebuild against libnet-snmp
---
srcpkgs/hplip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index bf66601fe64..8ebc49b7a8f 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
# Template file for 'hplip'
pkgname=hplip
version=3.20.9
-revision=3
+revision=4
build_style=gnu-configure
pycompile_dirs="usr/share/hplip"
configure_args="
From 95a131fef92b23e4d204b77e73ff4ab94e02a22e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:41:01 -0600
Subject: [PATCH 168/357] network-ups-tools: rebuild against libnet-snmp
---
srcpkgs/network-ups-tools/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index cc100bbde6e..bf2e50a540e 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
# Template file for 'network-ups-tools'
pkgname=network-ups-tools
version=2.7.4
-revision=10
+revision=11
wrksrc="nut-${version}"
build_style=gnu-configure
configure_args="
@@ -13,7 +13,6 @@ configure_args="
hostmakedepends="pkg-config"
makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
-system_accounts="nut"
conf_files="
/etc/ups/ups.conf
/etc/ups/upsd.users
@@ -23,10 +22,11 @@ conf_files="
/etc/ups/nut.conf"
short_desc="UPS control and monitoring features (NUT)"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://www.networkupstools.org/"
distfiles="${homepage}source/${version%.*}/nut-${version}.tar.gz"
checksum=980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7
+system_accounts="nut"
nopie=yes
build_options="cgi"
From 56667f279975c299cb1304cc0445990b8555090a Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:43:24 -0600
Subject: [PATCH 169/357] zabbix: rebuild against libnet-snmp
---
srcpkgs/zabbix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index 05e7461a9d3..cbc49634215 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
# Template file for 'zabbix'
pkgname=zabbix
version=4.4.10
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
--with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent
From 3d6ee651840b28c90b6be303bc0a9cff1acb28df Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:44:28 -0600
Subject: [PATCH 170/357] wmnd: rebuild against libnet-snmp
---
srcpkgs/wmnd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wmnd/template b/srcpkgs/wmnd/template
index 76eeba429a3..c922189a374 100644
--- a/srcpkgs/wmnd/template
+++ b/srcpkgs/wmnd/template
@@ -1,7 +1,7 @@
# Template file for 'wmnd'
pkgname=wmnd
version=0.4.18
-revision=1
+revision=2
build_style=gnu-configure
configure_args="ac_cv_file__proc_net_dev=yes
ac_cv_file__dev_ppp=no"
From 5e6ff39d7ee39a47ee31eed140e8e8dc1ab54544 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:09:27 -0600
Subject: [PATCH 171/357] net-snmp: update to 5.9
[ci skip]
---
common/shlibs | 12 ++++++------
srcpkgs/net-snmp/template | 7 ++++---
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 03e11add039..012cbd0e6fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1102,12 +1102,12 @@ libijs-0.35.so libijs-0.8_1
libgs.so.9 libgs-0.8_1
libssh2.so.1 libssh2-1.4.1_1
libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
-libsnmp.so.35 libnet-snmp-5.8_1
-libnetsnmp.so.35 libnet-snmp-5.8_1
-libnetsnmpagent.so.35 libnet-snmp-5.8_1
-libnetsnmpmibs.so.35 libnet-snmp-5.8_1
-libnetsnmptrapd.so.35 libnet-snmp-5.8_1
-libnetsnmphelpers.so.35 libnet-snmp-5.8_1
+libsnmp.so.40 libnet-snmp-5.9_1
+libnetsnmp.so.40 libnet-snmp-5.9_1
+libnetsnmpagent.so.40 libnet-snmp-5.9_1
+libnetsnmpmibs.so.40 libnet-snmp-5.9_1
+libnetsnmptrapd.so.40 libnet-snmp-5.9_1
+libnetsnmphelpers.so.40 libnet-snmp-5.9_1
libieee1284.so.3 libieee1284-0.2.10_1
libsane.so.1 libsane-1.0.22_1
libfltk.so.1.3 fltk-1.3.0_1
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index 7b8e3185fba..b5c06106fb2 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,7 +1,7 @@
# Template file for 'net-snmp'
pkgname=net-snmp
-version=5.8
-revision=5
+version=5.9
+revision=1
hostmakedepends="pkg-config unzip"
makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
libsensors-devel pcre-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Net-SNMP"
homepage="http://www.net-snmp.org/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf
+checksum=04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071
LDFLAGS="-lpthread"
@@ -51,5 +51,6 @@ net-snmp-devel_package() {
vmove usr/include
vmove usr/share/man/man3
vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
}
}
From feb9a2ef9b4a1b0901a39ec2a67af6a216f5ce3a Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 21 Nov 2020 14:51:20 -0800
Subject: [PATCH 172/357] atf-rk3328-bl31: update to 2.4.
---
srcpkgs/atf-rk3328-bl31/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/atf-rk3328-bl31/template b/srcpkgs/atf-rk3328-bl31/template
index b257d5fae24..89397958a62 100644
--- a/srcpkgs/atf-rk3328-bl31/template
+++ b/srcpkgs/atf-rk3328-bl31/template
@@ -1,6 +1,6 @@
# Template file for 'atf-rk3328-bl31'
pkgname=atf-rk3328-bl31
-version=2.3
+version=2.4
revision=1
archs="aarch64*"
wrksrc="trusted-firmware-a-${version}"
@@ -9,7 +9,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="BSD-3-Clause"
homepage="https://developer.trustedfirmware.org/dashboard/view/6/"
distfiles="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-${version}.tar.gz"
-checksum=37f917922bcef181164908c470a2f941006791c0113d738c498d39d95d543b21
+checksum=bf3eb3617a74cddd7fb0e0eacbfe38c3258ee07d4c8ed730deef7a175cc3d55b
nostrip=yes
do_build() {
From c408d74ae2573dd142b8415f83b4a0a770ddaea9 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 1 Nov 2020 19:07:15 +0000
Subject: [PATCH 173/357] rock64-uboot: update to 2020.10
---
srcpkgs/rock64-uboot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rock64-uboot/template b/srcpkgs/rock64-uboot/template
index d0c03cb2688..625660c7706 100644
--- a/srcpkgs/rock64-uboot/template
+++ b/srcpkgs/rock64-uboot/template
@@ -1,6 +1,6 @@
# Template file for 'rock64-uboot'
pkgname=rock64-uboot
-version=2020.07
+version=2020.10
revision=1
archs="aarch64*"
wrksrc="u-boot-${version}"
@@ -11,7 +11,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-2.0-or-later, BSD-3-Clause"
homepage="https://www.denx.de/wiki/U-Boot/"
distfiles="https://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
-checksum=c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a
+checksum=0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622
do_configure() {
make rock64-rk3328_defconfig
From 817370dbd9f54660888d03a015a0019b6912d0c9 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, 21 Nov 2020 22:51:09 +0700
Subject: [PATCH 174/357] c: remove noarch
---
srcpkgs/c/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/c/template b/srcpkgs/c/template
index 47c95d3060e..7b0086a5153 100644
--- a/srcpkgs/c/template
+++ b/srcpkgs/c/template
@@ -1,8 +1,7 @@
# Template file for 'c'
pkgname=c
version=0.14
-revision=1
-archs=noarch
+revision=2
depends="bash"
short_desc="Compile and execute C scripts in one go!"
maintainer="Orphaned <orphan@voidlinux.org>"
From f3e8b5d94f67d23bfde78615649c38c3dbbde2b0 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 175/357] catch2: remove noarch
---
srcpkgs/catch2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index f8795cb6c77..ae4c9b2c38d 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,8 +1,7 @@
# Template file for 'catch2'
pkgname=catch2
version=2.11.1
-revision=1
-archs=noarch
+revision=2
wrksrc="Catch2-${version}"
build_style=cmake
configure_args="-DCATCH_USE_VALGRIND=OFF -DCATCH_BUILD_TESTING=ON
From 909813f5a8adc35e31f4a3ba19164c4cbfd95d85 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 176/357] cdemu-client: remove noarch
---
srcpkgs/cdemu-client/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cdemu-client/template b/srcpkgs/cdemu-client/template
index 36d40de4bb5..c070247bc8b 100644
--- a/srcpkgs/cdemu-client/template
+++ b/srcpkgs/cdemu-client/template
@@ -1,8 +1,7 @@
# Template file for 'cdemu-client'
pkgname=cdemu-client
version=3.2.4
-revision=1
-archs=noarch
+revision=2
build_style=cmake
configure_args="-DCMAKE_INSTALL_COMPLETIONSDIR=/usr/share/bash-completion/completions"
hostmakedepends="python3 intltool pkg-config"
From 45071adfd781c2390fddf7757c647e3e2897321a 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 177/357] cdm: remove noarch
---
srcpkgs/cdm/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cdm/template b/srcpkgs/cdm/template
index ae30eaaef91..f1fb8b2f646 100644
--- a/srcpkgs/cdm/template
+++ b/srcpkgs/cdm/template
@@ -1,15 +1,14 @@
# Template file for 'cdm'
pkgname=cdm
version=0.7
-revision=2
+revision=3
+depends="dialog xinit kbd xdpyinfo"
short_desc="Console Display Manager"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-depends="dialog xinit kbd xdpyinfo"
license="GPL-2.0-or-later"
homepage="https://github.com/evertiro/cdm"
distfiles="https://github.com/evertiro/cdm/archive/${version}.tar.gz"
checksum=530042165ce65cdff3ec62ba9f077d0e8c6744c13f5d449d84fe2506a79d2e56
-archs=noarch
do_install() {
sed -i 's| /| $PKGDESTDIR/|g' install.sh
From 7631807e94d3c201189f03f754f58db2f0577e8c 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 178/357] cereal: remove noarch
---
srcpkgs/cereal/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cereal/template b/srcpkgs/cereal/template
index c454ed85833..8588f1ee882 100644
--- a/srcpkgs/cereal/template
+++ b/srcpkgs/cereal/template
@@ -1,8 +1,7 @@
# Template file for 'cereal'
pkgname=cereal
version=1.3.0
-revision=1
-archs=noarch
+revision=2
build_style=cmake
configure_args="-DSKIP_PORTABILITY_TEST=1 -DTHREAD_SAFE=ON -DWITH_WERROR=OFF"
short_desc="Header-only C++ serialization library"
From 1ef10b186f370ea3033dea3d6f9c0b837c450dc1 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 179/357] chatty: remove noarch
---
srcpkgs/chatty/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index 16bbc44096d..00573e1c89f 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -1,8 +1,7 @@
# Template file for 'chatty'
pkgname=chatty
version=0.12
-revision=1
-archs=noarch
+revision=2
hostmakedepends="gradle"
depends="virtual?java-runtime"
short_desc="Twitch Chat Client for Desktop"
From 3cdfa6cd71fa1901798d2d3bd7fe66b6ab66a6a5 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 180/357] cldr-emoji-annotation: remove noarch
---
srcpkgs/cldr-emoji-annotation/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cldr-emoji-annotation/template b/srcpkgs/cldr-emoji-annotation/template
index 7910b83971b..2ce6e53f4e1 100644
--- a/srcpkgs/cldr-emoji-annotation/template
+++ b/srcpkgs/cldr-emoji-annotation/template
@@ -1,9 +1,8 @@
# Template file for 'cldr-emoji-annotation'
pkgname=cldr-emoji-annotation
version=36.12.120191002.0
-revision=1
+revision=2
_tag=${version%.*}_${version##*.}
-archs=noarch
wrksrc="${pkgname}-${_tag}"
build_style=gnu-configure
short_desc="Emoji annotation files in CLDR"
From a95eb67203ab7f08b12e31537a12c1af196b9347 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 181/357] clearlooks-phenix-darkpurpy-theme: remove noarch
---
srcpkgs/clearlooks-phenix-darkpurpy-theme/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/clearlooks-phenix-darkpurpy-theme/template b/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
index a2d541c8896..bbc8c60559e 100644
--- a/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
+++ b/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
@@ -1,10 +1,9 @@
# Template file for 'clearlooks-phenix-darkpurpy-theme'
pkgname=clearlooks-phenix-darkpurpy-theme
version=7.0.2
-revision=1
+revision=2
_devuan_rel="1+devuan2.0"
build_style=fetch
-archs=noarch
depends="gnome-themes-standard gtk-engine-murrine gtk2-engines"
short_desc="Dark-purpified GTK3 port of Clearlooks theme"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,4 +18,3 @@ do_install() {
vmkdir usr/share/themes
vcopy usr/share/themes/Clearlooks-Phenix-DarkPurpy usr/share/themes
}
-
From 0f6fdf90527b5326a10f59e7d38459e705977a0f 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 182/357] clerk: remove noarch
---
srcpkgs/clerk/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/clerk/template b/srcpkgs/clerk/template
index a04c6f2cef6..cad10f86a94 100644
--- a/srcpkgs/clerk/template
+++ b/srcpkgs/clerk/template
@@ -1,8 +1,7 @@
# Template file for 'clerk'
pkgname=clerk
version=4.0.5
-revision=1
-archs=noarch
+revision=2
depends="rofi fzf tmux mpc perl-Net-MPD perl-Data-MessagePack perl-File-Slurper
perl-Config-Simple perl-Try-Tiny perl-IPC-Run perl-HTTP-Date perl-Data-Section-Simple"
short_desc="MPD client written in Perl using rofi or fzf"
From 015921d4d5b52dbc93cdaafd03b25968a144ebe3 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 183/357] cloc: remove noarch
---
srcpkgs/cloc/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template
index 00cf43ef4b1..cf2d1f35d3f 100644
--- a/srcpkgs/cloc/template
+++ b/srcpkgs/cloc/template
@@ -1,8 +1,7 @@
# Template file for 'cloc'
pkgname=cloc
version=1.88
-revision=1
-archs=noarch
+revision=2
hostmakedepends="perl"
depends="perl"
short_desc="Count Lines of Code"
From c5b102ee1af5381c03bc067c6cd7c7ff38e2f496 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, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 184/357] clyrics: remove noarch
---
srcpkgs/clyrics/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/clyrics/template b/srcpkgs/clyrics/template
index 5a0144c5b30..955aaedc7c3 100644
--- a/srcpkgs/clyrics/template
+++ b/srcpkgs/clyrics/template
@@ -1,8 +1,7 @@
# Template file for 'clyrics'
pkgname=clyrics
version=0.12
-revision=1
-archs=noarch
+revision=2
depends="perl-LWP-Protocol-https perl-WWW-Mechanize"
short_desc="Extensible lyrics fetcher, with daemon support for cmus and mocp"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9f521a27bf9ec0e3585bfecb59511331feec81d8 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, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 185/357] cmc: remove noarch
---
srcpkgs/cmc/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cmc/template b/srcpkgs/cmc/template
index 34a50561d1d..d94d241d7f5 100644
--- a/srcpkgs/cmc/template
+++ b/srcpkgs/cmc/template
@@ -1,8 +1,7 @@
# Template file for 'cmc'
pkgname=cmc
version=1.1.4
-revision=1
-archs=noarch
+revision=2
short_desc="SSH ControlMaster Controller"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
license="MIT"
From 32c75006a4520042a1ff00d6e1e875d1a6fe2cbe 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, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 186/357] collectl: remove noarch
---
srcpkgs/collectl/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template
index aec4b83ff46..59af99c7a5d 100644
--- a/srcpkgs/collectl/template
+++ b/srcpkgs/collectl/template
@@ -1,8 +1,7 @@
# Template file for 'collectl'
pkgname=collectl
version=4.3.1
-revision=1
-archs=noarch
+revision=2
conf_files="/etc/collectl.conf"
depends="perl perl-Term-ReadKey"
short_desc="Collects data that describes the current system status"
From 23ba1f52fb8df1ac8c1500bd00c990e4dae45eda 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 187/357] compiz-bcop: remove noarch
---
srcpkgs/compiz-bcop/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/compiz-bcop/template b/srcpkgs/compiz-bcop/template
index c1a82cb881b..7cc20653931 100644
--- a/srcpkgs/compiz-bcop/template
+++ b/srcpkgs/compiz-bcop/template
@@ -1,8 +1,7 @@
# Template file for 'compiz-bcop'
pkgname=compiz-bcop
version=0.8.18
-revision=1
-archs=noarch
+revision=2
build_style=gnu-configure
hostmakedepends="automake intltool libtool pkg-config libxslt"
makedepends="libxslt-devel"
From c67e5b4ae26289699db73c13e5879825cdf6d5b8 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 188/357] coreboot-utils: remove noarch
---
srcpkgs/coreboot-utils/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template
index e6c57472ea1..8368dec2969 100644
--- a/srcpkgs/coreboot-utils/template
+++ b/srcpkgs/coreboot-utils/template
@@ -1,7 +1,7 @@
# Template file for 'coreboot-utils'
pkgname=coreboot-utils
version=4.12
-revision=1
+revision=2
archs="i686* x86_64*"
wrksrc="coreboot-${version}"
build_wrksrc="util"
@@ -32,7 +32,6 @@ do_install() {
}
coreboot-utils-me_cleaner_package() {
- archs=noarch
python_version=3
depends="python3"
short_desc="Tool for partial deblobbing Intel ME/TXE firmware images"
From 7824ea3ac4b24fb2b5588bd48305b784fe47fe71 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 189/357] couchpotato: remove noarch
---
srcpkgs/couchpotato/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/couchpotato/template b/srcpkgs/couchpotato/template
index 3d7e27004d1..5c3d743442a 100644
--- a/srcpkgs/couchpotato/template
+++ b/srcpkgs/couchpotato/template
@@ -1,8 +1,7 @@
# Template file for 'couchpotato'
pkgname=couchpotato
version=3.0.1
-revision=2
-archs=noarch
+revision=3
wrksrc="CouchPotatoServer-build-${version}"
pycompile_dirs="/usr/share/couchpotato"
make_dirs="
@@ -14,12 +13,12 @@ license="GPL-3.0-or-later"
homepage="http://couchpota.to"
distfiles="https://github.com/RuudBurger/CouchPotatoServer/archive/build/${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=f08f9c6ac02f66c6667f17ded1eea4c051a62bbcbadd2a8673394019878e92f7
-python_version=2 #unverified
+python_version=2
couchpotato_homedir="/var/lib/couchpotato"
system_accounts="couchpotato"
do_install() {
vmkdir usr/share/couchpotato
- mv * ${DESTDIR}/usr/share/couchpotato
+ vcopy "*" usr/share/couchpotato
vsv couchpotato
}
From b5a156654a1b5e755b571b567a4d1eb2d7a6b621 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 190/357] create_ap: remove noarch
---
srcpkgs/create_ap/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/create_ap/template b/srcpkgs/create_ap/template
index 481ba622def..fb4d5dc37a8 100644
--- a/srcpkgs/create_ap/template
+++ b/srcpkgs/create_ap/template
@@ -1,8 +1,7 @@
# Template file for 'create_ap'
pkgname=create_ap
version=0.4.6
-revision=2
-archs=noarch
+revision=3
conf_files="/etc/create_ap.conf"
build_style=gnu-makefile
depends="bash dnsmasq hostapd iproute2 iptables iw procps-ng util-linux"
From 3e6f0e1e5db75fd6392c08fb7484585885218e21 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 191/357] culmus: remove noarch
---
srcpkgs/culmus/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/culmus/template b/srcpkgs/culmus/template
index dc6599990ef..68186bb5e60 100644
--- a/srcpkgs/culmus/template
+++ b/srcpkgs/culmus/template
@@ -1,10 +1,9 @@
# Template file for 'culmus'
pkgname=culmus
version=0.133
-revision=1
-archs=noarch
+revision=2
depends="font-util"
-short_desc="A collection of Type1 and TrueType free Hebrew fonts"
+short_desc="Collection of Type1 and TrueType free Hebrew fonts"
maintainer="DirectorX <void.directorx@protonmail.com>"
license="GPL-2.0-or-later"
homepage="http://culmus.sourceforge.net/"
From ef54fee575289ba848e301da990e62fc47e59914 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, 21 Nov 2020 22:51:14 +0700
Subject: [PATCH 192/357] cycle: remove noarch
---
srcpkgs/cycle/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cycle/template b/srcpkgs/cycle/template
index 58649da6482..05008b6047d 100644
--- a/srcpkgs/cycle/template
+++ b/srcpkgs/cycle/template
@@ -1,8 +1,7 @@
# Template file for 'cycle'
pkgname=cycle
version=0.3.2
-revision=1
-archs=noarch
+revision=2
pycompile_dirs="usr/share/cycle"
hostmakedepends="python"
depends="wxPython"
@@ -12,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/jose1711/cycle"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=6ca5a8191653d435ed04968b91b4a52c8e0d3d90d31d2c008aba1e9edcc1adc9
-python_version=2 #unverified
+python_version=2
do_install() {
# Program
From e75f86a2b9360561b854fa965a835b5fad35a8f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 21 Nov 2020 22:10:59 -0300
Subject: [PATCH 193/357] Revert "djview: mark broken temporarily."
This reverts commit 10838be7ab0122e3855c6c524c9a7f67973de84a.
---
srcpkgs/djview/template | 7 -------
1 file changed, 7 deletions(-)
diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index c7b0cd84bcf..136bcced9fb 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -19,13 +19,6 @@ if [ "${CROSS_BUILD}" ]; then
configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
fi
-case "$XBPS_TARGET_MACHINE" in
- armv6l-musl|armv7l-musl|x86_64-musl)
- # error while fetching with xbps-fetch
- broken="djview-4.12.tar.gz: Temporary Redirect"
- ;;
-esac
-
post_extract() {
vsed -i -e '/Exec/s/djview4/djview/' \
-e '/StartupWMClass/s/Djview4/DjView/' \
From 557ab38cfa15d6398bbfba720df1a19d6e941c7c 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, 22 Nov 2020 08:25:42 +0700
Subject: [PATCH 194/357] deerportal: remove noarch
---
srcpkgs/deerportal/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/deerportal/template b/srcpkgs/deerportal/template
index c027c258e68..d38900ff36e 100644
--- a/srcpkgs/deerportal/template
+++ b/srcpkgs/deerportal/template
@@ -1,7 +1,7 @@
# Template file for 'deerportal'
pkgname=deerportal
version=0.8.2
-revision=1
+revision=2
build_style=cmake
makedepends="SFML-devel"
depends="deerportal-data"
@@ -14,7 +14,6 @@ checksum=a79a6286c9be1c6073f5d8fe79e45b309425f597d0532d2a042cd8369f57725d
deerportal-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/games
}
From 0b7754feb92f27bcab1bf577942c74cf2d5a4ad8 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, 22 Nov 2020 08:25:42 +0700
Subject: [PATCH 195/357] deheader: remove noarch
---
srcpkgs/deheader/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/deheader/template b/srcpkgs/deheader/template
index f3809a35a44..6b3a54eaf11 100644
--- a/srcpkgs/deheader/template
+++ b/srcpkgs/deheader/template
@@ -1,9 +1,8 @@
# Template file for 'deheader'
pkgname=deheader
version=1.6
-revision=3
+revision=4
create_wrksrc=yes
-archs=noarch
hostmakedepends="tar"
depends="python"
short_desc="C and C++ header analyzer"
From 264d317a20775f6b3fd09fbe2bc6aaa8d8cd4184 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, 22 Nov 2020 08:25:42 +0700
Subject: [PATCH 196/357] dehydrated: remove noarch
---
srcpkgs/dehydrated/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/dehydrated/template b/srcpkgs/dehydrated/template
index c7b3ce7abb9..b624b1fe226 100644
--- a/srcpkgs/dehydrated/template
+++ b/srcpkgs/dehydrated/template
@@ -1,8 +1,7 @@
# Template file for 'dehydrated'
pkgname=dehydrated
version=0.6.5
-revision=1
-archs=noarch
+revision=2
depends="curl"
short_desc="Acme client implemented as a shell-script – just add water"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
From ba852205bbe7b4e29c32453c116fa7ac2c939061 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 197/357] dex: remove noarch
---
srcpkgs/dex/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/dex/template b/srcpkgs/dex/template
index 88b5552b070..1279d5df366 100644
--- a/srcpkgs/dex/template
+++ b/srcpkgs/dex/template
@@ -1,8 +1,7 @@
# Template file for 'dex'
pkgname=dex
version=0.8.0
-revision=2
-archs=noarch
+revision=3
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
hostmakedepends="python3-Sphinx"
From bed0f8018147cb2da1d2dd06965acae317f25761 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 198/357] dhcpcd-gtk: remove noarch
---
srcpkgs/dhcpcd-gtk/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template
index 80f03c51f8a..08cd8a90dbc 100644
--- a/srcpkgs/dhcpcd-gtk/template
+++ b/srcpkgs/dhcpcd-gtk/template
@@ -1,7 +1,7 @@
# Template file for 'dhcpcd-gtk'
pkgname=dhcpcd-gtk
version=0.7.7
-revision=1
+revision=2
wrksrc=dhcpcd-ui-${version}
build_style=gnu-configure
configure_args="--with-gtk --with-icons --with-notification"
@@ -28,7 +28,6 @@ post_install() {
}
dhcpcd-icons_package() {
- archs=noarch
short_desc+=" - icon set"
depends="hicolor-icon-theme"
replaces="dhcpcd-gtk<0.7.4"
From 6bfd6c91b3b57ca4dbc32de846e77fd4f188cfe8 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 199/357] ditaa: remove noarch
---
srcpkgs/ditaa/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ditaa/template b/srcpkgs/ditaa/template
index c7978f18bd4..8f501a0d452 100644
--- a/srcpkgs/ditaa/template
+++ b/srcpkgs/ditaa/template
@@ -1,8 +1,7 @@
# Template file for 'ditaa'
pkgname=ditaa
version=0.11.0
-revision=1
-archs=noarch
+revision=2
create_wrksrc=yes
build_style=fetch
depends="virtual?java-environment"
From 05b619a9e8ed9c9af15a0998c8907b9de686636c 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 200/357] dkimproxy: remove noarch
---
srcpkgs/dkimproxy/template | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/dkimproxy/template b/srcpkgs/dkimproxy/template
index de0eec306ba..bab8cee6633 100644
--- a/srcpkgs/dkimproxy/template
+++ b/srcpkgs/dkimproxy/template
@@ -1,21 +1,19 @@
# Template file for 'dkimproxy'
pkgname=dkimproxy
version=1.4.1
-revision=1
+revision=2
build_style=gnu-configure
-# dkimproxy is written in perl, so noarch
-archs=noarch
hostmakedepends="perl perl-Net-Server perl-Mail-DKIM"
makedepends="${hostmakedepends}"
depends="${makedepends}"
-system_accounts="_dkim"
-conf_files="/etc/dkimproxy_in.conf /etc/dkimproxy_out.conf"
short_desc="SMTP-proxy that signs and/or verifies emails, using DKIM"
maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="GPL-3"
+license="GPL-2.0-or-later"
homepage="http://dkimproxy.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/dkimproxy/dkimproxy-${version}.tar.gz"
checksum=e5345a1d3cefd32d1fb0face9fa73490118132767253b0ce643463f1e86185bd
+system_accounts="_dkim"
+conf_files="/etc/dkimproxy_in.conf /etc/dkimproxy_out.conf"
post_install() {
vsconf ${DESTDIR}/etc/dkimproxy_in.conf.example
From c90f7321a3602973fdc5eae2b9c60ad935ef4c85 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 201/357] dreampie: remove noarch
---
srcpkgs/dreampie/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/dreampie/template b/srcpkgs/dreampie/template
index edd0f48298b..002f11f842e 100644
--- a/srcpkgs/dreampie/template
+++ b/srcpkgs/dreampie/template
@@ -1,10 +1,8 @@
# Template file for 'dreampie'
pkgname=dreampie
version=1.2.1
-revision=2
-archs=noarch
+revision=3
build_style=python2-module
-pycompile_module="dreampielib"
hostmakedepends="python-setuptools"
depends="pygtksourceview"
short_desc="The Python shell you've always dreamed about"
From 807f686b09af9129f5be5fc2d0c042d71557fa4b 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 202/357] dstat: remove noarch
---
srcpkgs/dstat/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/dstat/template b/srcpkgs/dstat/template
index 3ec983e85db..43a7efd6ded 100644
--- a/srcpkgs/dstat/template
+++ b/srcpkgs/dstat/template
@@ -1,8 +1,7 @@
# Template file for 'dstat'
pkgname=dstat
version=0.7.4
-revision=2
-archs=noarch
+revision=3
makedepends="python3"
depends="python3-six"
short_desc="Versatile tool for generating system resource statistics"
From de6a70e7d48b846327969cb3c8dfdfb50e12057f 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, 22 Nov 2020 08:25:44 +0700
Subject: [PATCH 203/357] durden: remove noarch
---
srcpkgs/durden/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/durden/template b/srcpkgs/durden/template
index 54a4bc1759b..d150a07ce5e 100644
--- a/srcpkgs/durden/template
+++ b/srcpkgs/durden/template
@@ -1,7 +1,7 @@
# Template file for 'durden'
pkgname=durden
version=0.5
-revision=1
+revision=2
depends="aclip aloadimage"
short_desc="Desktop environment for Arcan"
maintainer="Piraty <piraty1@inbox.ru>"
@@ -9,7 +9,6 @@ license="BSD-3-Clause"
homepage="http://durden.arcan-fe.com/"
distfiles="https://github.com/letoram/${pkgname}/archive/${version}.tar.gz"
checksum=f0cb0cdc6d16b4807efab5b6152b9f26813dccd2d66af5f1d80494769f840915
-archs=noarch
do_install() {
vbin distr/durden
From c2329d2658d047dde73e37336697ce22c3ea09d7 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, 22 Nov 2020 09:05:54 +0700
Subject: [PATCH 204/357] i3lock-fancy: remove noarch
---
srcpkgs/i3lock-fancy/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/i3lock-fancy/template b/srcpkgs/i3lock-fancy/template
index 5bb3502b4ed..a9cdfb0d7d2 100644
--- a/srcpkgs/i3lock-fancy/template
+++ b/srcpkgs/i3lock-fancy/template
@@ -1,8 +1,7 @@
# Template file for 'i3lock-fancy'
pkgname=i3lock-fancy
version=0.2
-revision=1
-archs=noarch
+revision=2
depends="util-linux bash ImageMagick i3lock wmctrl gawk"
short_desc="Fancy lockscreen using i3lock"
maintainer="Orphaned <orphan@voidlinux.org>"
From eea2b54d5a39d8b18f0c4a26421bb03758b8bd5b 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, 22 Nov 2020 09:05:54 +0700
Subject: [PATCH 205/357] ice-ssb: remove noarch
---
srcpkgs/ice-ssb/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ice-ssb/template b/srcpkgs/ice-ssb/template
index c06941257c1..f0cac9cafc4 100644
--- a/srcpkgs/ice-ssb/template
+++ b/srcpkgs/ice-ssb/template
@@ -1,8 +1,7 @@
# Template file for 'ice-ssb'
pkgname=ice-ssb
version=6.0.8
-revision=1
-archs=noarch
+revision=2
wrksrc="ice-$version"
depends="gtk+3 python3-BeautifulSoup4 python3-gobject python3-requests"
short_desc="Site Specific Browsers (SSBs) manager"
From 5dd7f21b10c0f7f0277dc03fd0f9d0face05e8f3 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 206/357] icedtea-sound: remove noarch
---
srcpkgs/icedtea-sound/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/icedtea-sound/template b/srcpkgs/icedtea-sound/template
index 4ad965c6806..ceccff2fd94 100644
--- a/srcpkgs/icedtea-sound/template
+++ b/srcpkgs/icedtea-sound/template
@@ -1,21 +1,20 @@
# Template file for 'icedtea-sound'
pkgname=icedtea-sound
version=1.0.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-jdk-home=/usr/lib/jvm/java-1.8-openjdk"
hostmakedepends="openjdk8 zip perl pkg-config"
makedepends="pulseaudio-devel"
short_desc="Plugins for javax.sound"
maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-only WITH Classpath-exception-2.0"
+license="GPL-2.0-only + Classpath-exception-2.0"
homepage="http://icedtea.classpath.org/download/source/"
distfiles="http://icedtea.classpath.org/download/source/${pkgname}-${version}.tar.xz"
checksum=6ff852b82ae7db7a95981271037eb3a3d52c59581e3b27a638a7c6bc8eecb4a3
icedtea-sound-doc_package() {
short_desc+=" - docs"
- archs=noarch
pkg_install() {
vmove usr/share/doc
}
From 2f4affd4a1a6f7f51453e8c822829e9cd97e1e1d 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 207/357] icon-naming-utils: remove noarch
---
srcpkgs/icon-naming-utils/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/icon-naming-utils/template b/srcpkgs/icon-naming-utils/template
index f069d604e37..5a693266459 100644
--- a/srcpkgs/icon-naming-utils/template
+++ b/srcpkgs/icon-naming-utils/template
@@ -1,8 +1,7 @@
# Template file for 'icon-naming-utils'
pkgname=icon-naming-utils
version=0.8.90
-revision=5
-archs=noarch
+revision=6
build_style=gnu-configure
hostmakedepends="perl-XML-Simple"
makedepends="${hostmakedepends}"
From 3fcee2992931deb0ec098d1df1785739af947b83 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 208/357] imgp: remove noarch
---
srcpkgs/imgp/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/imgp/template b/srcpkgs/imgp/template
index 872b3db406c..c81e3f15101 100644
--- a/srcpkgs/imgp/template
+++ b/srcpkgs/imgp/template
@@ -1,8 +1,7 @@
# Template file for 'imgp'
pkgname=imgp
version=2.7
-revision=2
-archs=noarch
+revision=3
build_style=gnu-makefile
depends="python3-Pillow"
short_desc="Multi-core batch image resizer and rotator"
From 8a21fbbcdcd4de47038730817435e2613f2996c8 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 209/357] indic-otf: remove noarch
---
srcpkgs/indic-otf/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/indic-otf/template b/srcpkgs/indic-otf/template
index 4f37e66f3ce..fc5c25b135a 100644
--- a/srcpkgs/indic-otf/template
+++ b/srcpkgs/indic-otf/template
@@ -1,8 +1,7 @@
# Template file for 'indic-otf'
pkgname=indic-otf
version=0.2
-revision=3
-archs=noarch
+revision=4
wrksrc=indic
build_wrksrc=OpenType
makedepends="font-util xbps-triggers"
From 6a7e0db71bed2794480d3935ad4d41650c5090bf 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 210/357] indicator-doom-cpu: remove noarch
---
srcpkgs/indicator-doom-cpu/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index 33158f90a16..a856d82be19 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,12 +1,11 @@
# Template file for 'indicator-doom-cpu'
pkgname=indicator-doom-cpu
version=1.0.1
-revision=1
-archs=noarch
+revision=2
depends="python-gobject"
short_desc="CPU load indicator showing the dying face from the video game DOOM"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-3.0-only"
homepage="https://github.com/ebruck/indicator-doom-cpu"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=87dcb082c5032518b2616c85967ac92cf3618b6e0276266ec413537b6256c7d5
From 3eb8fbdeba4bb7a8b4d948be94b2a249825f95e1 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 211/357] iniparser: remove noarch
---
srcpkgs/iniparser/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/iniparser/template b/srcpkgs/iniparser/template
index 63eb336c7ea..a780d47dbdd 100644
--- a/srcpkgs/iniparser/template
+++ b/srcpkgs/iniparser/template
@@ -1,7 +1,7 @@
# Template file for 'iniparser'
pkgname=iniparser
version=4.1
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen chrpath"
short_desc="Free stand-alone ini file parsing library"
@@ -58,14 +58,12 @@ iniparser-devel_package() {
}
iniparser-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmove usr/share/doc/iniparser
}
}
iniparser-example_package() {
short_desc+=" - example code"
- archs=noarch
pkg_install() {
vmove usr/share/iniparser/example
}
From c11420641ef72bbb2d628ae3e3b397fc2d314cfd 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 212/357] io.elementary.stylesheet: remove noarch
---
srcpkgs/io.elementary.stylesheet/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template
index 6b40406712d..791bca04709 100644
--- a/srcpkgs/io.elementary.stylesheet/template
+++ b/srcpkgs/io.elementary.stylesheet/template
@@ -1,8 +1,7 @@
# Template file for 'io.elementary.stylesheet'
pkgname=io.elementary.stylesheet
version=5.4.2
-revision=1
-archs=noarch
+revision=2
wrksrc="stylesheet-${version}"
build_style=meson
short_desc="GTK Stylesheet for elementary OS"
From 7ecebba871a56ef5417dfdd12f0f9ee54c806aa3 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 213/357] ioprof: remove noarch
---
srcpkgs/ioprof/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ioprof/template b/srcpkgs/ioprof/template
index 32b327b4677..033cf9ee518 100644
--- a/srcpkgs/ioprof/template
+++ b/srcpkgs/ioprof/template
@@ -1,8 +1,7 @@
# Template file for 'ioprof'
pkgname=ioprof
version=2.0.4
-revision=2
-archs=noarch
+revision=3
build_style=fetch
depends="perl blktrace"
short_desc="Linux I/O profiler"
From 215b02427dd1ef5ca3e9324d160cd89e30e4ea8f 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, 22 Nov 2020 09:05:56 +0700
Subject: [PATCH 214/357] ipcalc: remove noarch
---
srcpkgs/ipcalc/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ipcalc/template b/srcpkgs/ipcalc/template
index 6a35f924f0d..5f33dce9905 100644
--- a/srcpkgs/ipcalc/template
+++ b/srcpkgs/ipcalc/template
@@ -1,8 +1,7 @@
# Template file for 'ipcalc'
pkgname=ipcalc
version=0.41
-revision=2
-archs=noarch
+revision=3
depends="perl"
short_desc="Calculator for IPv4 addresses"
maintainer="allan <mail@may.mooo.com>"
From 928421cff3e554d72a30adbe56605fde06cfe7a3 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Thu, 19 Nov 2020 10:08:12 +0100
Subject: [PATCH 215/357] synapse: update to 1.23.0.
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index a1dec681ede..0d11c75cfa7 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.21.2
+version=1.23.0
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=ec7073befcda697428c4d634c7a8637ea7d1b01639b3a943d72821ba8110a0bf
+checksum=afa86ea1332a52d09552ea5825567f910b304d4684692fa8325cefec105b2b4c
system_accounts="synapse"
synapse_homedir="/var/lib/synapse"
From 61843e351d9b3c788237682442d1ed6859119fc3 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Mon, 19 Oct 2020 09:37:39 -0700
Subject: [PATCH 216/357] New package: wlclock-1.0.0
---
srcpkgs/wlclock/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/wlclock/template
diff --git a/srcpkgs/wlclock/template b/srcpkgs/wlclock/template
new file mode 100644
index 00000000000..65eb3325ade
--- /dev/null
+++ b/srcpkgs/wlclock/template
@@ -0,0 +1,14 @@
+# Template file for 'wlclock'
+pkgname=wlclock
+version=1.0.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config scdoc wayland-devel"
+makedepends="cairo-devel wayland-devel wayland-protocols"
+short_desc="Digital analog clock for Wayland desktops"
+maintainer="travankor <travankor@tuta.io>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~leon_plickat/wlclock/"
+distfiles="https://git.sr.ht/~leon_plickat/wlclock/archive/v${version}.tar.gz"
+checksum=cdbc32eb1f68614a09e430eaa24578e4d58475ed8988871fce20a669898a48db
From 9b6dffde3947c3910753cd394dfc17a506db6d69 Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Thu, 22 Oct 2020 16:59:47 -0700
Subject: [PATCH 217/357] clipmenu: update to 6.2.0.
---
srcpkgs/clipmenu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clipmenu/template b/srcpkgs/clipmenu/template
index a7302993521..2befe984790 100644
--- a/srcpkgs/clipmenu/template
+++ b/srcpkgs/clipmenu/template
@@ -1,14 +1,14 @@
# Template file for 'clipmenu'
pkgname=clipmenu
-version=6.1.0
-revision=2
+version=6.2.0
+revision=1
depends="bash dmenu clipnotify xsel"
short_desc="Clipboard management using dmenu"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Public Domain"
homepage="https://github.com/cdown/clipmenu"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=1b5da22fac3bbee254267f9274746f747019c5f9a1f53cde0ddc1591053d2342
+checksum=15830429dbe78da8168e71c6e1cc9fccf5c4d03ebae8ccefb0a5dbaa98adbbb8
do_install() {
vbin clipdel
From 717357e9f46985eece3804db25201fee44706085 Mon Sep 17 00:00:00 2001
From: Justin Berthault <justin.berthault@zaclys.net>
Date: Thu, 22 Oct 2020 21:50:02 +0200
Subject: [PATCH 218/357] picard: update to 2.5
---
srcpkgs/picard/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template
index 53f9daa8fdb..513ab6356cf 100644
--- a/srcpkgs/picard/template
+++ b/srcpkgs/picard/template
@@ -1,7 +1,7 @@
# Template file for 'picard'
pkgname=picard
-version=2.3.2
-revision=2
+version=2.5
+revision=1
wrksrc="${pkgname}-release-${version}"
build_style=python3-module
make_install_args="--disable-autoupdate"
@@ -15,4 +15,4 @@ license="GPL-2.0-or-later"
homepage="https://picard.musicbrainz.org/"
changelog="https://picard.musicbrainz.org/changelog/"
distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version%.0}.tar.gz"
-checksum=a91d9f11f2e5a6a0c579e0749e3a3919694ddeef0f251c1dded32e9331b1b0b7
+checksum=f9df2882c1fcb46d69c89c87485c77bcff7d9c738b004694fa0fb31280677963
From 31499dddf1c9bb49de7112d69c80eb3a4363751e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 22 Oct 2020 19:11:08 +0300
Subject: [PATCH 219/357] butt: update to 0.1.25, add changelog.
---
srcpkgs/butt/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index 98ce59064c2..6e67147ec84 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,6 +1,6 @@
# Template file for 'butt'
pkgname=butt
-version=0.1.22
+version=0.1.25
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,5 +10,6 @@ short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
maintainer="1is7ac3 <isaac.qa13@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://danielnoethen.de"
+changelog="https://danielnoethen.de/butt/Changelog.html"
distfiles="${SOURCEFORGE_SITE}/butt/butt-${version}.tar.gz"
-checksum=71e7fcd89d97f803f05197caa743de4fcf8ab67ec3f3af0a54c2e895d660f62c
+checksum=7c9f44227584e30040315a5c86419bf3e654bd3523634d34b18c9017206334cb
From abfc67595beb795a99b039064f636c9038880051 Mon Sep 17 00:00:00 2001
From: Rich Gannon <rich@rchgannon.net>
Date: Wed, 14 Oct 2020 23:27:24 -0400
Subject: [PATCH 220/357] glusterfs: update to 8.1
---
common/shlibs | 1 +
srcpkgs/glusterfs/template | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 012cbd0e6fa..f39ab671a75 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1486,6 +1486,7 @@ libgfchangelog.so.0 libglusterfs-3.8.0_1
libgfrpc.so.0 libglusterfs-3.8.0_1
libgfxdr.so.0 libglusterfs-3.8.0_1
libgfapi.so.0 libglusterfs-3.8.0_1
+libglusterd.so.0 libglusterfs-8.1_1
libsnapper.so.5 libsnapper-0.4.1_1
libtsm.so.3 libtsm-3_1
libxine.so.2 libxine-1.2.4_1
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 8745513af64..cfdd7d4ab93 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,6 +1,6 @@
# Template file for 'glusterfs'
pkgname=glusterfs
-version=7.8
+version=8.1
revision=1
build_style=gnu-configure
configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=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=ee83f96a7caf10596231dbf2f1e80f257629067485d4ef26216c69bb4a3ed545
+checksum=89bc6d9c933119924f19f2681706883eed331efe0f8a20a2e6b12a290ca00d32
case "$XBPS_TARGET_MACHINE" in
*-musl) broken="not yet supported";;
@@ -36,7 +36,6 @@ glusterfs-server_package() {
/etc/glusterfs/glusterd.vol"
pkg_install() {
vmove etc/glusterfs
- vmove usr/bin/glfsheal
vmove usr/bin/gluster
vmove usr/bin/glusterd
vmove usr/share/man/man8/gluster.8
From 99f8e750f5250b074a5b1b61bd513f4c26ea3fc3 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <aldridge.mac@gmail.com>
Date: Tue, 13 Oct 2020 22:32:18 -0700
Subject: [PATCH 221/357] New package: pppconfig-2.3.24
---
srcpkgs/pppconfig/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/pppconfig/template
diff --git a/srcpkgs/pppconfig/template b/srcpkgs/pppconfig/template
new file mode 100644
index 00000000000..a05f7265291
--- /dev/null
+++ b/srcpkgs/pppconfig/template
@@ -0,0 +1,21 @@
+# Template file for 'pppconfig'
+pkgname=pppconfig
+version=2.3.24
+revision=1
+depends="newt ppp"
+short_desc="Text menu based utility for configuring ppp"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="GPL-2.0-only"
+homepage="https://packages.debian.org/sid/pppconfig"
+distfiles="http://deb.debian.org/debian/pool/main/p/pppconfig/pppconfig_$version.tar.gz"
+checksum=8d7e75b5be044cfae1ed3b0096fea75cee183328b9ace7d949381d89f3e6401d
+make_dirs="
+ /etc/chatscripts 0755 root root
+ /etc/ppp/resolv 0755 root root"
+
+do_install() {
+ vbin pppconfig
+ vinstall 0dns-up 0755 etc/ppp/ip-up.d/
+ vinstall 0dns-down 0755 etc/ppp/ip-down.d/
+ vman man/pppconfig.8
+}
From 4f2e865b04c24fc5ffe52231996fd2f3739fec09 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 9 Oct 2020 16:46:48 -0500
Subject: [PATCH 222/357] New package: fuzzypkg-1.0.2
---
srcpkgs/fuzzypkg/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/fuzzypkg/template
diff --git a/srcpkgs/fuzzypkg/template b/srcpkgs/fuzzypkg/template
new file mode 100644
index 00000000000..6243aa202a7
--- /dev/null
+++ b/srcpkgs/fuzzypkg/template
@@ -0,0 +1,25 @@
+# Template file for 'fuzzypkg'
+pkgname=fuzzypkg
+version=1.0.2
+revision=1
+depends="bash"
+short_desc="XBPS fuzzy package manager"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="MIT"
+homepage="https://github.com/zdykstra/fuzzypkg"
+distfiles="https://github.com/zdykstra/fuzzypkg/archive/v${version}.tar.gz"
+checksum=f9aa5bd0d679f43d7d78654ba579fa460c5625b4504c4221a35a90623d59d90f
+
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|i686*|armv[67]*|aarch64*|ppc64le*)
+ depends+=" fzf"
+ ;;
+ *)
+ depends+=" skim"
+ ;;
+esac
+
+do_install() {
+ vlicense LICENSE
+ vbin fuzzypkg
+}
From c904e447e356b40dc432afe8e105bbd684dfde45 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 8 Oct 2020 20:41:22 +1100
Subject: [PATCH 223/357] cinnamon-settings-daemon: various template cleanups.
- fix the homepage.
- remove the changlog which is not kept up-to-date and is inconsistent
between cinnamon templates AND upstream repos.
- other style fixes.
---
srcpkgs/cinnamon-settings-daemon/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index f9a38da22f5..70f76130dd2 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,10 +1,10 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
version=4.6.4
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
-configure_args=" --disable-static --disable-schemas-compile"
+configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config"
makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
@@ -14,8 +14,7 @@ depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
-changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
+homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-settings-daemon"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=5c3d78c562f60cbd6348d1bbb3f7b0a98dbf0b483961b2f82f6b260b956d9db0
From e1698943fa32698dda8fe907d2975b221bce3cb8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 20 Nov 2020 01:00:39 +0200
Subject: [PATCH 224/357] gettext: update to 0.21.
---
common/shlibs | 4 ++--
srcpkgs/gettext/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f39ab671a75..44f54987a27 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -185,8 +185,8 @@ libgdbm.so.6 gdbm-1.16_1
libgdbm_compat.so.4 gdbm-1.10_1_1
libintl.so.8 gettext-libs-0.19.2_1
libgnuintl.so.8 gettext-libs-0.19.2_1
-libgettextlib-0.20.2.so gettext-libs-0.20.2_1
-libgettextsrc-0.20.2.so gettext-libs-0.20.2_1
+libgettextlib-0.21.so gettext-libs-0.21_1
+libgettextsrc-0.21.so gettext-libs-0.21_1
libgettextpo.so.0 gettext-libs-0.17_1
libtextstyle.so.0 gettext-libs-0.20.1_1
libattr.so.1 attr-2.4.43_1
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 391ceceb9ee..4e0667c1b8c 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
# Template file for 'gettext'
pkgname=gettext
-version=0.20.2
-revision=2
+version=0.21
+revision=1
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/gettext/"
changelog="https://git.savannah.gnu.org/cgit/gettext.git/plain/NEWS"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1
+checksum=c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12
case "$XBPS_TARGET_MACHINE" in
# force libintl
From 3fcfd99a682c9c48e90ac0f6a8c022baf8af02d5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 5 Oct 2020 11:27:47 +1100
Subject: [PATCH 225/357] New package: instaloader-4.5.3.
---
srcpkgs/instaloader/template | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 srcpkgs/instaloader/template
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
new file mode 100644
index 00000000000..034df7073f7
--- /dev/null
+++ b/srcpkgs/instaloader/template
@@ -0,0 +1,27 @@
+# Template file for 'instaloader'
+pkgname=instaloader
+version=4.5.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-idna python3-chardet
+ python3-certifi"
+checkdepends="${depends}"
+short_desc="Download pictures with metadata from Instagram"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://instaloader.github.io"
+distfiles="${PYPI_SITE}/i/${pkgname}/${pkgname}-${version}.tar.gz
+ https://raw.githubusercontent.com/${pkgname}/${pkgname}/v${version}/LICENSE"
+checksum="4cc59b68e7498c778e54599917af749aaac36a6527cbd495b80f843f7eccd8ff
+ 9e721228bbfb782a6b5f3fd8494f5666f3ee8e61c592810b900955b9f1b1bae5"
+skip_extraction="LICENSE"
+
+# ship your licenses, people
+post_extract() {
+ cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE" .
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 34cf22999c8f14d7ed0ad43598e69d163f5396f7 Mon Sep 17 00:00:00 2001
From: Spencer Burris <sburris@posteo.net>
Date: Sun, 4 Oct 2020 13:31:07 -0700
Subject: [PATCH 226/357] New package: signal-backup-decode-0.2.0
---
srcpkgs/signal-backup-decode/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/signal-backup-decode/template
diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
new file mode 100644
index 00000000000..3b5cfb2f526
--- /dev/null
+++ b/srcpkgs/signal-backup-decode/template
@@ -0,0 +1,13 @@
+# Template file for 'signal-backup-decode'
+pkgname=signal-backup-decode
+version=0.2.0
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libressl-devel sqlite-devel"
+short_desc="Decode Signal Android Backups"
+maintainer="Spencer Burris <sburris@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/pajowu/signal-backup-decode"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=9a454bb894963e7f6301bdcd3db2c7978fb0cfb7e6fce3f4f553ccad7f955fe9
From c2df97f0ada0b76ec27bb86328316f0c4d7a5da3 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Fri, 25 Sep 2020 15:41:32 -0300
Subject: [PATCH 227/357] New package: packr2-2.8.0
---
srcpkgs/packr2/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/packr2/template
diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
new file mode 100644
index 00000000000..15b01438d58
--- /dev/null
+++ b/srcpkgs/packr2/template
@@ -0,0 +1,18 @@
+# Template file for 'packr2'
+pkgname=packr2
+_pkgname=packr
+version=2.8.0
+revision=1
+wrksrc=${_pkgname}-${version}
+build_style=go
+go_import_path=github.com/gobuffalo/${_pkgname}/v2/packr2
+short_desc="Static files embedder for Go binaries"
+maintainer="Gabriel Sanches <gabriel@gsr.dev>"
+license="MIT"
+homepage="https://github.com/gobuffalo/packr"
+distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
+checksum=2cab1e8d60734af05d594346f8e4bffcef0ac2aea4895b08bd9f3c40fc24c639
+
+post_install() {
+ vlicense v2/LICENSE.txt
+}
From 2ce3aa6a200d4d8a0bae4368b055da8bad528a62 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 23 Sep 2020 15:07:53 -0300
Subject: [PATCH 228/357] New package: circleci-cli-0.1.9578
---
srcpkgs/circleci-cli/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/circleci-cli/template
diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
new file mode 100644
index 00000000000..0b4049bea15
--- /dev/null
+++ b/srcpkgs/circleci-cli/template
@@ -0,0 +1,29 @@
+# Template file for 'circleci-cli'
+pkgname=circleci-cli
+version=0.1.9578
+revision=1
+build_style=go
+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"
+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=d5dac07d27d97ee41dced89cf2b36dfeea17906343b6a6a21c1d8c4ca34a78a0
+
+pre_build() {
+ packr2
+}
+
+post_build() {
+ packr2 clean
+}
+
+post_install() {
+ vlicense LICENSE
+
+ # Rename the binary according to CircleCI's own releases.
+ mv ${DESTDIR}/usr/bin/circleci{-cli,}
+}
From 13cb7052cbaedc7b5ca66ff8665da24168622cf8 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 21 Oct 2020 17:25:50 +0200
Subject: [PATCH 229/357] apparmor: update to 3.0.0
---
srcpkgs/apparmor/INSTALL.msg | 3 +-
.../apparmor/files/profiles/usr.bin.dhcpcd | 12 ++--
srcpkgs/apparmor/files/profiles/usr.bin.nginx | 22 ++++---
.../apparmor/files/profiles/usr.bin.php-fpm | 17 +++---
.../files/profiles/usr.bin.pulseaudio | 35 +++++++----
srcpkgs/apparmor/files/profiles/usr.bin.uuidd | 12 ++--
.../files/profiles/usr.bin.wpa_supplicant | 14 +++--
.../patches/correct_paths_logprofconf.patch | 60 ++++++++++++++-----
srcpkgs/apparmor/patches/fix-musl.patch | 24 ++++++++
srcpkgs/apparmor/template | 50 ++++++++--------
10 files changed, 160 insertions(+), 89 deletions(-)
create mode 100644 srcpkgs/apparmor/patches/fix-musl.patch
diff --git a/srcpkgs/apparmor/INSTALL.msg b/srcpkgs/apparmor/INSTALL.msg
index c9f763715a6..488f2c40e11 100644
--- a/srcpkgs/apparmor/INSTALL.msg
+++ b/srcpkgs/apparmor/INSTALL.msg
@@ -1,2 +1 @@
-To ensure AppArmor is enabled upon reboot add 'apparmor=1 security=apparmor' to your grub CMDLINE and rebuild your grub config with 'grub-mkconfig -o /boot/grub/grub.cfg'.
-You'll also need to swith 'APPARMOR' setting in /etc/default/apparmor to your taste.
+To configure AppArmor properly, please refer to the Void Linux Handbook: https://docs.voidlinux.org/config/security/apparmor.html
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
index 26364f36385..1d6e1b95d62 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
@@ -1,10 +1,12 @@
# vim:syntax=apparmor
-#include <tunables/global>
+abi <abi/3.0>,
+
+include <tunables/global>
profile dhcpcd /{usr/,}bin/dhcpcd {
- #include <abstractions/base>
- #include <abstractions/nameservice>
+ include <abstractions/base>
+ include <abstractions/nameservice>
capability chown,
capability fowner,
@@ -16,8 +18,10 @@ profile dhcpcd /{usr/,}bin/dhcpcd {
capability setgid,
capability sys_admin,
capability sys_chroot,
+ capability bpf,
network packet dgram,
+ network packet raw,
network inet raw,
network inet6 raw,
@@ -58,5 +62,5 @@ profile dhcpcd /{usr/,}bin/dhcpcd {
owner @{PROC}/@{pid}/stat r,
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.bin.dhcpcd>
+ include if exists <local/usr.bin.dhcpcd>
}
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.nginx b/srcpkgs/apparmor/files/profiles/usr.bin.nginx
index 5e4854d9032..be769703f5d 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.nginx
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.nginx
@@ -1,25 +1,23 @@
# vim:syntax=apparmor
+abi <abi/3.0>,
+
# NOTE: This profile will by default work with pfp-fpm on TCP sockets.
# If you need to make use of php-fpm unix socket, add the following to local/usr.bin.nginx
# /path/to/your/unix/socket rw,
-#include <tunables/global>
+include <tunables/global>
-/usr/bin/nginx {
- #include <abstractions/base>
- #include <abstractions/nameservice>
- #include <abstractions/nis>
- #include <abstractions/openssl>
+profile nginx /usr/bin/nginx {
+ include <abstractions/base>
+ include <abstractions/nameservice>
+ include <abstractions/nis>
+ include <abstractions/openssl>
capability setgid,
capability setuid,
- # XXX: Maybe switch to "/etc/nginx/** r," ?
- /etc/nginx/*.conf r,
- /etc/nginx/*_params r,
- /etc/nginx/conf.d/* r,
- /etc/nginx/mime.types r,
+ /etc/nginx/** r,
/run/nginx.pid rw,
@@ -30,5 +28,5 @@
/var/log/nginx/* w,
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.bin.nginx>
+ include if exists <local/usr.bin.nginx>
}
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm b/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm
index 98366dcaabf..0b036965da1 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm
@@ -1,22 +1,24 @@
# vim:syntax=apparmor
+abi <abi/3.0>,
+
# NOTE: This profile uses TCP sockets by default
# If you wish for php-fpm to listen to unix socket,
# add the following permission to local/usr.bin.php-fpm
# /path/to/your/unix/socket w,
-#include <tunables/global>
+include <tunables/global>
# This is PHP open_basedir where script can only be executed from.
# /home, /tmp have been removed to not open permissions too widely
# /usr/share/pear have been removed to have its own permission
@{PHP_BASEDIRS} = /srv/www/ /var/www/ /usr/share/webapps/
-/usr/bin/php-fpm {
- #include <abstractions/base>
- #include <abstractions/nameservice>
- #include <abstractions/openssl>
- #include <abstractions/php>
+profile php-fpm /usr/bin/php-fpm {
+ include <abstractions/base>
+ include <abstractions/nameservice>
+ include <abstractions/openssl>
+ include <abstractions/php>
capability setgid,
capability setuid,
@@ -38,7 +40,6 @@
/var/log/php-fpm.log w,
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.bin.php-fpm>
+ include if exists <local/usr.bin.php-fpm>
}
-
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio b/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio
index 4b17e6edc08..f8ceb4c2334 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio
@@ -1,12 +1,16 @@
-#include <tunables/global>
+# vim:syntax=apparmor
+
+abi <abi/3.0>,
+
+include <tunables/global>
profile pulseaudio /usr/bin/pulseaudio {
- #include <abstractions/base>
- #include <abstractions/audio>
- #include <abstractions/dbus-session>
- #include <abstractions/dbus-strict>
- #include <abstractions/nameservice>
- #include <abstractions/X>
+ include <abstractions/base>
+ include <abstractions/audio>
+ include <abstractions/dbus-session>
+ include <abstractions/dbus-strict>
+ include <abstractions/nameservice>
+ include <abstractions/X>
dbus send
bus=system
@@ -67,12 +71,17 @@ profile pulseaudio /usr/bin/pulseaudio {
/sys/devices/virtual/sound/**/uevent r,
/usr/share/alsa/** r,
- /usr/share/applications/ r,
- /usr/share/applications/* r,
/usr/share/pulseaudio/** r,
/usr/lib/pulse-[1-9]*.[0-9]/modules/*.so mr,
/usr/libexec/pulse/gsettings-helper Cx,
+ /usr/{,local/}share/applications/ r,
+ /usr/{,local/}share/applications/* r,
+ owner @{HOME}/.local/share/{,flatpak/exports/share/}applications/ r,
+ owner @{HOME}/.local/share/{,flatpak/exports/share/}applications/* r,
+ /var/lib/flatpak/exports/share/applications/ r,
+ /var/lib/flatpak/exports/share/applications/* r,
+
owner /var/lib/gdm3/.config/pulse/ rw,
owner /var/lib/gdm3/.config/pulse/* rw,
owner /var/lib/gdm3/.config/pulse/cookie rwk,
@@ -106,9 +115,9 @@ profile pulseaudio /usr/bin/pulseaudio {
owner /tmp/.esd-@{pid}*/socket rw,
profile pulse-gsettings-helper /usr/libexec/pulse/gsettings-helper {
- #include <abstractions/base>
- #include <abstractions/gnome>
- #include <abstractions/dconf>
+ include <abstractions/base>
+ include <abstractions/gnome>
+ include <abstractions/dconf>
/usr/libexec/pulse/gsettings-helper mr,
owner /{,var/}run/user/*/dconf/user rw,
@@ -118,6 +127,6 @@ profile pulseaudio /usr/bin/pulseaudio {
}
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.bin.pulseaudio>
+ include if exists <local/usr.bin.pulseaudio>
}
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.uuidd b/srcpkgs/apparmor/files/profiles/usr.bin.uuidd
index 8c00a903611..b365c927b65 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.uuidd
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.uuidd
@@ -1,10 +1,12 @@
# vim:syntax=apparmor
-#include <tunables/global>
+abi <abi/3.0>,
-/usr/bin/uuidd {
- #include <abstractions/base>
- #include <abstractions/consoles>
+include <tunables/global>
+
+profile uuid /usr/bin/uuidd {
+ include <abstractions/base>
+ include <abstractions/consoles>
network inet dgram,
@@ -13,5 +15,5 @@
/run/uuidd/request rw,
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.bin.uuidd>
+ include if exists <local/usr.bin.uuidd>
}
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant b/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant
index df53acc82d6..c5bb67d562f 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant
@@ -1,8 +1,12 @@
-#include <tunables/global>
+# vim:syntax=apparmor
-/usr/bin/wpa_supplicant {
- #include <abstractions/base>
- #include <abstractions/dbus-strict>
+abi <abi/3.0>,
+
+include <tunables/global>
+
+profile wpa_supplicant /usr/bin/wpa_supplicant {
+ include <abstractions/base>
+ include <abstractions/dbus-strict>
capability net_admin,
capability net_raw,
@@ -45,5 +49,5 @@
bus=system
path=/fi/epitest/hostap/WPASupplicant/**,
- #include <local/usr.bin.wpa_supplicant>
+ include if exists <local/usr.bin.wpa_supplicant>
}
diff --git a/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch b/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
index 0f25758486a..fb6ce53ffdc 100644
--- a/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
+++ b/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
@@ -1,5 +1,14 @@
+From 6f2649203d6bfc26b79f624b5b4625603923bccd Mon Sep 17 00:00:00 2001
+From: Paper <paper@tilde.institute>
+Date: Wed, 21 Oct 2020 10:20:47 +0200
+Subject: [PATCH] correct paths in logprof.conf
+
+---
+ utils/logprof.conf | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
diff --git a/utils/logprof.conf b/utils/logprof.conf
-index a3d7a31..296dd8b 100644
+index a778792..a9f7b79 100644
--- a/utils/logprof.conf
+++ b/utils/logprof.conf
@@ -14,7 +14,7 @@
@@ -11,19 +20,42 @@ index a3d7a31..296dd8b 100644
ldd = /usr/bin/ldd
logger = /bin/logger /usr/bin/logger
-@@ -36,10 +36,10 @@
- custom_includes =
-
+@@ -51,12 +51,10 @@
+ /bin/mount = u
+ /usr/bin/mount = u
+ /etc/init.d/subdomain = u
+- /sbin/cardmgr = u
+- /usr/sbin/cardmgr = u
+- /sbin/subdomain_parser = u
+- /usr/sbin/subdomain_parser = u
+- /usr/sbin/genprof = u
+- /usr/sbin/logprof = u
++ /usr/bin/cardmgr = u
++ /usr/bin/subdomain_parser = u
++ /usr/bin/genprof = u
++ /usr/bin/logprof = u
+ /usr/lib/YaST2/servers_non_y2/ag_genprof = u
+ /usr/lib/YaST2/servers_non_y2/ag_logprof = u
--[repository]
-- distro = ubuntu-intrepid
-- url = http://apparmor.test.opensuse.org/backend/api
-- preferred_user = ubuntu
-+#[repository]
-+# distro = ubuntu-intrepid
-+# url = http://apparmor.test.opensuse.org/backend/api
-+# preferred_user = ubuntu
+@@ -97,8 +95,7 @@
+ /usr/bin/sed = icn
+ /bin/touch = icn
+ /usr/bin/touch = icn
+- /sbin/killall5 = icn
+- /usr/sbin/killall5 = icn
++ /usr/bin/killall5 = icn
+ /usr/bin/find = icn
+ /usr/bin/killall = icn
+ /usr/bin/nice = icn
+@@ -112,6 +109,8 @@
+ /usr/bin/python3.5 = icn
+ /usr/bin/python3.6 = icn
+ /usr/bin/python3.7 = icn
++ /usr/bin/python3.8 = icn
++ /usr/bin/python3.9 = icn
+ /usr/bin/tr = icn
- [qualifiers]
- # things will be painfully broken if bash has a profile
+ [required_hats]
+--
+2.29.0
diff --git a/srcpkgs/apparmor/patches/fix-musl.patch b/srcpkgs/apparmor/patches/fix-musl.patch
new file mode 100644
index 00000000000..484b67dfea4
--- /dev/null
+++ b/srcpkgs/apparmor/patches/fix-musl.patch
@@ -0,0 +1,24 @@
+diff --git a/binutils/aa_status.c b/binutils/aa_status.c
+index 78b0340..56ecac3 100644
+--- a/binutils/aa_status.c
++++ b/binutils/aa_status.c
+@@ -17,6 +17,7 @@
+ #include <errno.h>
+ #include <ctype.h>
+ #include <dirent.h>
++#include <limits.h>
+
+ #include <sys/apparmor.h>
+ #include <sys/apparmor_private.h>
+diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h
+index 32892d0..dad7664 100644
+--- a/libraries/libapparmor/include/sys/apparmor.h
++++ b/libraries/libapparmor/include/sys/apparmor.h
+@@ -22,6 +22,7 @@
+ #include <stdint.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index b064f78086e..4c260b24a1b 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
# Template file for 'apparmor'
pkgname=apparmor
-version=2.13.4
-revision=6
+version=3.0.0
+revision=1
wrksrc="${pkgname}-v${version}"
build_wrksrc=libraries/libapparmor
build_style=gnu-configure
@@ -16,23 +16,13 @@ maintainer="Olivier Mauras <olivier@mauras.ch>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://gitlab.com/apparmor/apparmor"
distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
-checksum=4f45e5a5de59b72039c6cf218bb61cb4fc42eeb7f47ca109a58238896394a33b
+checksum=8c440ab1848e723483a8550ed2889e18f322e9d7ee9eb4e2e712152ea61da68f
patch_args="-Np1"
if [ -z "$CROSS_BUILD" ]; then
configure_args="--with-perl --with-python"
fi
-post_patch() {
- # Make.rules feeds some system headers to the C preprocessor to produce
- # lists of capability and address-family names that, respectively,
- # populate 'parser/cap_names.h' and 'parser/af_names.h'. The escaping
- # backslash in the '\#include" directives here is seen by the
- # preprocessor, causing it to skip the system headers and produce empty
- # files. Removing the backslash ensures correct behavior.
- vsed -i ${wrksrc}/common/Make.rules -e 's/\\#include </#include </'
-}
-
pre_configure() {
autoreconf -if
}
@@ -40,14 +30,18 @@ pre_configure() {
pre_build() {
# Replace release profiles with our own
cd ${wrksrc}
-
- # Put in place our own profiles
cp ${FILESDIR}/profiles/* profiles/apparmor.d/
+
+ # use the correct syslog path
+ vsed -i utils/logprof.conf -e 's,logfiles = .*,logfiles = /var/log/socklog/kernel/current,'
}
post_build() {
cd ${wrksrc}
- sed -i 's#$(DESTDIR)/sbin#$(DESTDIR)/usr/bin#g' parser/Makefile
+
+ # fix cross compilation
+ vsed -i parser/Makefile -e 's,cpp,$(CPP),'
+
make ${makejobs} -C binutils
make ${makejobs} -C utils
make ${makejobs} -C parser
@@ -56,27 +50,31 @@ post_build() {
post_install() {
cd ${wrksrc}
- make DESTDIR=${DESTDIR} install -C binutils
- make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install -C utils
- make DESTDIR=${DESTDIR} APPARMOR_BIN_PREFIX=${DESTDIR}/usr/lib/apparmor \
- SBINDIR=${DESTDIR}/usr/bin USR_SBINDIR=${DESTDIR}/usr/bin install -C parser
- make DESTDIR=${DESTDIR} install -C profiles
-
- # Put Vim syntax in the correct place
- mkdir -p ${DESTDIR}/usr/share/vim/vim80/syntax/
- mv ${DESTDIR}/usr/share/apparmor/apparmor.vim ${DESTDIR}/usr/share/vim/vim80/syntax/
+ commonflags="DESTDIR=\"${DESTDIR}\" SBINDIR=\"${DESTDIR}/usr/bin\" USR_SBINDIR=\"${DESTDIR}/usr/bin\""
+ make $commonflags install -C binutils
+ make $commonflags \
+ BINDIR="${DESTDIR}/usr/bin" \
+ VIM_INSTALL_PATH="${DESTDIR}/usr/share/vim/vimfiles/syntax" \
+ install -C utils
+ make $commonflags \
+ APPARMOR_BIN_PREFIX="${DESTDIR}/usr/lib/apparmor" \
+ install -C parser
+ make DESTDIR="${DESTDIR}" install -C profiles
# requires perl bindings not generated when cross-compiling
if [ "$CROSS_BUILD" ]; then
rm -f ${DESTDIR}/usr/bin/aa-notify
fi
+
+ # we installed a custom conflicting profile
+ rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
}
apparmor-vim_package() {
short_desc+=" - Vim syntax"
depends="vim"
pkg_install() {
- vmove usr/share/vim/vim80/syntax/apparmor.vim
+ vmove usr/share/vim/vimfiles/syntax/apparmor.vim
vmove usr/share/man/man5/apparmor.vim.5
}
}
From 96b0f4ab9751f984d06178ecd95c6dc843bc7874 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 19:13:44 -0600
Subject: [PATCH 230/357] aqemu: update to 0.9.4
---
srcpkgs/aqemu/patches/memory-leak.patch | 68 -------------------------
srcpkgs/aqemu/patches/stdexcept.patch | 27 +++++++---
srcpkgs/aqemu/template | 8 +--
3 files changed, 25 insertions(+), 78 deletions(-)
delete mode 100644 srcpkgs/aqemu/patches/memory-leak.patch
diff --git a/srcpkgs/aqemu/patches/memory-leak.patch b/srcpkgs/aqemu/patches/memory-leak.patch
deleted file mode 100644
index d2369e18687..00000000000
--- a/srcpkgs/aqemu/patches/memory-leak.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From c031cf9ba4023b2026e5680ddcd0daeca5e6b842 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tobias=20Gl=C3=A4=C3=9Fer?= <tobimensch@yahoo.de>
-Date: Tue, 14 Jun 2016 20:25:24 +0200
-Subject: [PATCH] Small memory leak fixes.
-
----
- src/HDD_Image_Info.cpp | 5 +++++
- src/HDD_Image_Info.h | 1 +
- src/Properties_Window.cpp | 5 +++++
- src/Properties_Window.h | 1 +
- 4 files changed, 12 insertions(+)
-
-diff --git src/HDD_Image_Info.cpp src/HDD_Image_Info.cpp
-index 4cd34b4..9d29c88 100644
---- src/HDD_Image_Info.cpp
-+++ src/HDD_Image_Info.cpp
-@@ -32,6 +32,11 @@ HDD_Image_Info::HDD_Image_Info( QObject *parent )
- QEMU_IMG_Proc = new QProcess( this );
- }
-
-+HDD_Image_Info::~HDD_Image_Info()
-+{
-+ delete QEMU_IMG_Proc;
-+}
-+
- VM::Disk_Info HDD_Image_Info::Get_Disk_Info() const
- {
- return Info;
-diff --git src/HDD_Image_Info.h src/HDD_Image_Info.h
-index 2cfec47..9339464 100644
---- src/HDD_Image_Info.h
-+++ src/HDD_Image_Info.h
-@@ -32,6 +32,7 @@ class HDD_Image_Info : public QObject
-
- public:
- HDD_Image_Info( QObject *parent = 0 );
-+ ~HDD_Image_Info();
- VM::Disk_Info Get_Disk_Info() const;
-
- public slots:
-diff --git src/Properties_Window.cpp src/Properties_Window.cpp
-index 918251f..48d9619 100644
---- src/Properties_Window.cpp
-+++ src/Properties_Window.cpp
-@@ -47,6 +47,11 @@ Properties_Window::Properties_Window( QWidget *parent )
- this, SLOT(on_Button_Update_Info_clicked()) );
- }
-
-+Properties_Window::~Properties_Window()
-+{
-+ delete HDD_Info;
-+}
-+
- const VM_Storage_Device &Properties_Window::Get_Floppy()
- {
- PW_Storage.Set_Enabled( true );
-diff --git src/Properties_Window.h src/Properties_Window.h
-index 75ecbc1..bb9f692 100644
---- src/Properties_Window.h
-+++ src/Properties_Window.h
-@@ -33,6 +33,7 @@ class Properties_Window: public QDialog
-
- public:
- Properties_Window( QWidget *parent = 0 );
-+ ~Properties_Window();
-
- const VM_Storage_Device &Get_Floppy();
- const VM_Storage_Device &Get_CD_ROM();
diff --git a/srcpkgs/aqemu/patches/stdexcept.patch b/srcpkgs/aqemu/patches/stdexcept.patch
index 8b2b015e239..70c87ccd073 100644
--- a/srcpkgs/aqemu/patches/stdexcept.patch
+++ b/srcpkgs/aqemu/patches/stdexcept.patch
@@ -1,10 +1,25 @@
---- src/docopt/docopt_value.h 2016-05-31 14:34:02.000000000 +0200
-+++ src/docopt/docopt_value.h 2020-09-24 20:10:27.152286526 +0200
-@@ -13,6 +13,7 @@
- #include <vector>
- #include <functional> // std::hash
+From fe1fd5c856a79d9f0704ad2b973caf786272dbd4 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sat, 21 Nov 2020 19:08:35 -0600
+Subject: [PATCH] stdexcept
+
+---
+ src/docopt/docopt_value.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/docopt/docopt_value.h src/docopt/docopt_value.h
+index ddb8a8e..99aa545 100644
+--- src/docopt/docopt_value.h
++++ src/docopt/docopt_value.h
+@@ -13,7 +13,7 @@
#include <iosfwd>
+ #include <string>
+ #include <vector>
+-
+#include <stdexcept>
-
namespace docopt {
+ /// A generic type to hold the various types that can be produced by docopt.
+--
+2.29.2
+
diff --git a/srcpkgs/aqemu/template b/srcpkgs/aqemu/template
index a3dcfe64e57..eea61aa562b 100644
--- a/srcpkgs/aqemu/template
+++ b/srcpkgs/aqemu/template
@@ -1,7 +1,7 @@
# Template file for 'aqemu'
pkgname=aqemu
-version=0.9.2
-revision=2
+version=0.9.4
+revision=1
build_style=cmake
configure_args="-DWITHOUT_EMBEDDED_DISPLAY=1"
makedepends="qt5-devel qemu desktop-file-utils"
@@ -10,8 +10,8 @@ short_desc="GUI to QEMU and KVM emulators, written in Qt4"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://aqemu.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/aqemu/${version}/aqemu-$version.tar.gz"
-checksum=e3d54de00ebdce3754f97f7e0e7cce8cebb588e8ce6bc249401cc909281b08de
+distfiles="https://github.com/TBK/aqemu/archive/v${version}.tar.gz"
+checksum=576ae78de936518a1de057355ffc192b59e42be934f0111122b2c5fcafe318a7
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-devel"
From 821daf9ec42bd7d7fd12d64c2d2b12e6852beda9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 19:47:19 -0600
Subject: [PATCH 231/357] apache-fop: update to 2.5
---
srcpkgs/apache-fop/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template
index ab39b281da2..d8b6808a93e 100644
--- a/srcpkgs/apache-fop/template
+++ b/srcpkgs/apache-fop/template
@@ -1,7 +1,7 @@
# Template file for 'apache-fop'
pkgname=apache-fop
-version=2.4
-revision=2
+version=2.5
+revision=1
wrksrc="fop-${version}"
build_wrksrc="fop"
hostmakedepends="openjdk8 apache-ant"
@@ -12,8 +12,8 @@ license="Apache-2.0"
homepage="http://xmlgraphics.apache.org/fop/"
distfiles="http://mirror.dkd.de/apache/xmlgraphics/fop/source/fop-${version}-src.tar.gz
http://mirror.dkd.de/apache/xmlgraphics/fop/binaries/fop-${version}-bin.tar.gz"
-checksum="1d6b323b1c4968a492a234ba1b726e78c96b91cfd871f77cb579d68729443086
- d97f7318ca1aab9937d68aa6ce2a00379d8d4a0b692515246c84d328a6bf4f0c"
+checksum="783077318139d581d5f485566d1b08bfc576003c53cfbf5beaeba503a24b4005
+ 6a3c5f8915be5ef90fff202c818152d8252bb45b96d9c5d6550594903739e5ed"
conf_files="/etc/fop.conf"
do_build() {
From 3171f67cc7fdd684dd211439234827eaa4513a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 22 Nov 2020 05:55:39 +0100
Subject: [PATCH 232/357] libgcrypt: fix cross
---
srcpkgs/libgcrypt/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index 4c8f5c5cc26..650f022ad7a 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -12,9 +12,9 @@ homepage="https://www.gnupg.org"
distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2"
checksum=03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748
-case "$XBPS_TARGET_MACHINE" in
- ppc|ppc-musl) configure_args+=" ac_cv_sys_symbol_underscore=no" ;;
-esac
+if [ "$CROSS_BUILD" ]; then
+ configure_args+=" ac_cv_sys_symbol_underscore=no"
+fi
post_configure() {
case "$XBPS_TARGET_MACHINE" in
From 995fac192ca92fefe7f644e724204ac5a420c574 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Sat, 21 Nov 2020 09:48:35 -0800
Subject: [PATCH 233/357] GoLand: update to 2020.2.3.
---
srcpkgs/GoLand/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index e0bb8b2bade..18ed226159d 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,6 +1,6 @@
# Template file for 'GoLand'
pkgname=GoLand
-version=2020.1
+version=2020.2.3
revision=1
archs="i686 x86_64"
depends="jetbrains-jdk-bin"
@@ -9,10 +9,11 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
homepage="https://www.jetbrains.com/go"
distfiles="https://download.jetbrains.com/go/goland-${version}.tar.gz"
-checksum=c63de783facbf8d96eb6714240218c3c320fdbda1ddaa965f7fe72ecf6e897e2
+checksum=c0ca83c05e156c58483b42eb9a14fd1013434c8936fbba20ffd4b0b722a6bfa2
repository=nonfree
restricted=yes
nopie=yes
+python_version=3
post_extract() {
# Remove files for other CPU architectures
From fd64f61f6d1b3301bb6aae4f9c71aac356107ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 30 Aug 2020 17:28:45 -0300
Subject: [PATCH 234/357] New package: ZMusic-1.1.3.
ZMusic needs libopenal to enable sound playback.
libopenal, libfluidsynth and libsndfile are all loaded dynamically.
Based on and closes #20665.
---
common/shlibs | 2 ++
srcpkgs/ZMusic-devel | 1 +
srcpkgs/ZMusic/patches/ppc-musl.patch | 13 ++++++++++
srcpkgs/ZMusic/template | 35 +++++++++++++++++++++++++++
4 files changed, 51 insertions(+)
create mode 120000 srcpkgs/ZMusic-devel
create mode 100644 srcpkgs/ZMusic/patches/ppc-musl.patch
create mode 100644 srcpkgs/ZMusic/template
diff --git a/common/shlibs b/common/shlibs
index 44f54987a27..a1b2c7e1b9a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2975,6 +2975,8 @@ libpisync.so.1 pilot-link-0.12.5_1
libpitcl.so.0 pilot-link-0.12.5_1
libiscsi.so.9 libiscsi-1.19.0_1
libgme.so.0 libgme-0.6.1_1
+libzmusic.so.1 ZMusic-1.1.2_1
+libzmusiclite.so.1 ZMusic-1.1.2_1
libsidplayfp.so.5 libsidplayfp-2.0.0_1
libstilview.so.0 libsidplayfp-1.8.7_1
libczmq.so.4 czmq-4.0.1_1
diff --git a/srcpkgs/ZMusic-devel b/srcpkgs/ZMusic-devel
new file mode 120000
index 00000000000..023ff24ecd4
--- /dev/null
+++ b/srcpkgs/ZMusic-devel
@@ -0,0 +1 @@
+ZMusic
\ No newline at end of file
diff --git a/srcpkgs/ZMusic/patches/ppc-musl.patch b/srcpkgs/ZMusic/patches/ppc-musl.patch
new file mode 100644
index 00000000000..729b73b155d
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/ppc-musl.patch
@@ -0,0 +1,13 @@
+Taken from libgme package.
+
+--- thirdparty/game-music-emu/gme/blargg_endian.h
++++ thirdparty/game-music-emu/gme/blargg_endian.h
+@@ -36,7 +36,7 @@
+ #endif
+
+ #if defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
+- defined (__sparc__) || BLARGG_CPU_POWERPC || \
++ defined (__sparc__) || \
+ (defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
+ #define BLARGG_BIG_ENDIAN 1
+ #elif !defined (__mips__)
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
new file mode 100644
index 00000000000..b75b6d0c409
--- /dev/null
+++ b/srcpkgs/ZMusic/template
@@ -0,0 +1,35 @@
+# Template file for 'ZMusic'
+pkgname=ZMusic
+version=1.1.3
+revision=1
+build_style=cmake
+configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel alsa-lib-devel libgme-devel libopenal-devel libsndfile-devel"
+# these are dlopened
+depends="libfluidsynth libopenal libsndfile"
+short_desc="GZDoom's music system"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/coelckers/ZMusic"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=5f432b022e023175eae7701625f79287e9ffe889a444179681381026b4fb93bf
+nocross=yes
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ makedepends+=" musl-fts-devel"
+fi
+
+post_install() {
+ vmkdir usr/share/licenses/${pkgname}
+ vcopy "licenses/*" usr/share/licenses/${pkgname}/
+}
+
+ZMusic-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
From 4fb59788d9a2b4e5fc14bd15c5f0cd180ae9909c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH 235/357] gzdoom: update to 4.4.2.
---
...d654ed85fc42ec59c99f760a7da572a95d2d.patch | 21 -----------
srcpkgs/gzdoom/patches/fix-i686.patch | 32 +++++++++++++++++
srcpkgs/gzdoom/patches/i686.patch | 35 -------------------
srcpkgs/gzdoom/patches/ppc-musl.patch | 13 -------
srcpkgs/gzdoom/template | 35 ++++++++++---------
5 files changed, 51 insertions(+), 85 deletions(-)
delete mode 100644 srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
create mode 100644 srcpkgs/gzdoom/patches/fix-i686.patch
delete mode 100644 srcpkgs/gzdoom/patches/i686.patch
delete mode 100644 srcpkgs/gzdoom/patches/ppc-musl.patch
diff --git a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch b/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
deleted file mode 100644
index 92399384298..00000000000
--- a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Tue, 29 Oct 2019 01:02:09 +0100
-Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f6ece0a24..cb8ffc0f3d 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- rendering/polyrenderer/poly_all.cpp
- rendering/swrenderer/r_all.cpp
- utility/x86.cpp
-+ utility/palette.cpp
- PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
- endif()
- endif()
diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch
new file mode 100644
index 00000000000..b66d70db512
--- /dev/null
+++ b/srcpkgs/gzdoom/patches/fix-i686.patch
@@ -0,0 +1,32 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 26c617e..e162638 100644
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -1361,11 +1361,11 @@ endif()
+ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
+ # Need to enable intrinsics for these files.
+ if( SSE_MATTERS )
+- set_property( SOURCE
++ set_source_files_properties(
+ common/rendering/polyrenderer/poly_all.cpp
+ rendering/swrenderer/r_all.cpp
+- utility/palette.cpp
+- utility/x86.cpp
++ common/utility/palette.cpp
++ common/utility/x86.cpp
+ APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mmmx" )
+ endif()
+ endif()
+diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp
+index f2a2987..b8de208 100644
+--- src/common/utility/palette.cpp
++++ src/common/utility/palette.cpp
+@@ -33,6 +33,8 @@
+ */
+
+ #include <algorithm>
++#include <cfloat>
++#include <cmath>
+ #include "palutil.h"
+ #include "palentry.h"
+ #include "sc_man.h"
diff --git a/srcpkgs/gzdoom/patches/i686.patch b/srcpkgs/gzdoom/patches/i686.patch
deleted file mode 100644
index 6f9d839ab06..00000000000
--- a/srcpkgs/gzdoom/patches/i686.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/utility/palette.cpp 2019-10-20 16:16:08.000000000 +0200
-+++ - 2019-10-30 16:45:10.882234214 +0100
-@@ -34,6 +34,10 @@
-
- #include "palette.h"
- #include "palentry.h"
-+#include <cfloat>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cmath>
-
- /****************************/
- /* Palette management stuff */
---- src/CMakeLists.txt 2019-10-30 16:50:46.769763172 +0100
-+++ - 2019-10-30 17:11:18.507995925 +0100
-@@ -1210,7 +1210,7 @@
- endif()
- endif()
-
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} dl gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-
- include_directories( .
- g_statusbar
---- libraries/zmusic/CMakeLists.txt 2019-10-20 16:16:08.000000000 +0200
-+++ - 2019-10-30 17:15:11.581747039 +0100
-@@ -94,7 +94,7 @@
- zmusic/zmusic.cpp
- ${PLAT_SOURCES}
- )
--target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-+target_link_libraries( zmusic dl adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-
- if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
- include_directories( "${SNDFILE_INCLUDE_DIRS}" )
diff --git a/srcpkgs/gzdoom/patches/ppc-musl.patch b/srcpkgs/gzdoom/patches/ppc-musl.patch
deleted file mode 100644
index 978800ac214..00000000000
--- a/srcpkgs/gzdoom/patches/ppc-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from libgme package.
-
---- libraries/game-music-emu/gme/blargg_endian.h
-+++ libraries/game-music-emu/gme/blargg_endian.h
-@@ -36,7 +36,7 @@
- #endif
-
- #if defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
-- defined (__sparc__) || BLARGG_CPU_POWERPC || \
-+ defined (__sparc__) || \
- (defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
- #define BLARGG_BIG_ENDIAN 1
- #elif !defined (__mips__)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..bc644c1e3f2 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,41 +1,44 @@
# Template file for 'gzdoom'
pkgname=gzdoom
-version=4.3.3
+version=4.4.2
revision=1
-_tagdate=2019-07-09
+_tagdate=2020-06-16
wrksrc="${pkgname}-g${version}"
build_style=cmake
configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel ZMusic-devel"
+depends="gtk+3"
short_desc="Advanced Doom source port with OpenGL support"
maintainer="Michael Straube <straubem@gmx.de>"
license="GPL-3.0-or-later"
homepage="https://www.zdoom.org"
distfiles="https://github.com/coelckers/${pkgname}/archive/g${version}.tar.gz
https://github.com/coelckers/${pkgname}/releases/download/g${version}/${pkgname}_${version}_amd64.deb"
-checksum="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
- 6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
+checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+ ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
skip_extraction="${pkgname}_${version}_amd64.deb"
nocross=yes
-case "$XBPS_MACHINE" in
- *-musl)
- configure_args+=" -DCMAKE_CXX_FLAGS=-Wl,-lexecinfo -DCMAKE_EXE_LINKER_FLAGS=-lfts"
- makedepends+=" musl-fts-devel libexecinfo-devel"
- ;;
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ makedepends+=" musl-fts-devel libexecinfo-devel"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*) configure_args+=" -DSSE_MATTERS=true" ;;
esac
post_extract() {
ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
- sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
- sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
- sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
- sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
- sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
+ vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/gitinfo.cpp
+ vsed -e "s|VERSIONSTR|\"${version}\"|g" -i src/gitinfo.cpp
+ vsed -e "s|GIT_TIME|\"${_tagdate}\"|g" -i src/gitinfo.cpp
+ vsed -e 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' \
+ -i src/common/platform/posix/i_system.h
+ vsed -e 's|/usr/share/games/doom|/usr/share/gzdoom|g' -i src/gameconfigfile.cpp
}
post_install() {
From 84459ae5b4ae68fadbaad0ea72346954c9bc83cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 22 Jul 2020 16:36:59 -0300
Subject: [PATCH 236/357] Manual.md: revamp explain_depends section.
Add useful examples of checkdepends that might not be obvious.
---
Manual.md | 69 +++++++++++++++++++++++++++++++------------------------
1 file changed, 39 insertions(+), 30 deletions(-)
diff --git a/Manual.md b/Manual.md
index c520d06c133..7647f957129 100644
--- a/Manual.md
+++ b/Manual.md
@@ -727,36 +727,45 @@ Examples:
Do not use noarch. It is deprecated and being removed.
<a id="explain_depends"></a>
-#### About the many types of `depends` variable.
-
-So far we have listed four types of `depends`, there are `hostmakedepends`,
-`makedepends`, `checkdepends` and plain old `depends`.To understand the difference
-between them, understand this: Void Linux cross compiles for many arches.
-Sometimes in a build process, certain programs must be run, for example `yacc`, or the
-compiler itself for a C program. Those programs get put in `hostmakedepends`.
-When the build runs, those will be installed on the host to help the build
-complete.
-
-Then there are those things for which a package either links against or
-includes header files. These are `makedepends`, and regardless of the
-architecture of the build machine, the architecture of the target machine must
-be used. Typically the `makedepends` will be the only one of the three types of
-`depends` to include `-devel` packages, and typically only `-devel` packages.
-
-Then there are those things that are required for a package to run its testsuite
-`dejagnu` or libraries it must link to when building test binaries like `cmocka`.
-These are `checkdepends` and they are installed like they are part of `makedepends`.
-the difference is that they are only installed when `XBPS_CHECK_PKGS` is defined.
-
-The final variable, `depends`, is for those things the package needs at
-runtime and without which is unusable, and that xbps can't auto-detect.
-These are not all the packages the package needs at runtime, but only those
-that are not linked against. This variable is most useful for non-compiled
-programs.
-
-Finally, as a general rule, if something compiles the exact same way whether or
-not you add a particular package to `makedepends` or `hostmakedepends`, it
-shouldn't be added.
+#### About the many types of `depends` variables
+
+So far, we have listed four types of `depends` variables: `hostmakedepends`,
+`makedepends`, `checkdepends` and `depends`. These different kinds of variables
+are necessary because `xbps-src` supports cross compilation and to avoid
+installing unecessary packages in the build environment.
+
+During a build process, there are programs that must be _run_ on the host, such
+as `yacc` or the C compiler. The packages that contain these programs should be
+listed in `hostmakedepends`, and will be installed on the host when building the
+target package. Some of these packages are dependencies of the `base-chroot`
+package and don't need to be listed. It is possible that some of the programs
+necessary to build a project are located in `-devel` packages.
+
+The target package can also depend on other packages for libraries to link
+against or header files. These packages should be listed in `makedepends` and
+will match the target architecture, regardless of the architecture of the build
+machine. Typically, `makedepends` will contain mainly `-devel` packages.
+
+Furthermore, if `XBPS_CHECK_PKGS` is set or the `-Q` option is passed to
+`xbps-src`, the target package might require specific dependencies or libraries
+that are linked into its test binaries to run its test suite. These dependencies
+should be listed in `checkdepends` and will be installed as if they were part of
+`hostmakedepends`. Some dependencies that can be included in `checkdepends` are:
+
+- `dejagnu`: used for some GNU projects
+- `cmocka-devel`: linked into test binaries
+- `dbus`: makes it possible to run `dbus-run-session <test-command>` to provide
+ a D-Bus session for applications that need it
+- `git`: some test suites run the `git` command
+
+Lastly, a package may require certain dependencies at runtime, without which it
+is unusable. These dependencies, when they aren't detected automatically by
+XBPS, should be listed in `depends`. This is mostly relevant for Perl and Python
+modules and other programs that use `dlopen(3)` instead of dynamically linking.
+
+Finally, as a general rule, if a package is built the exact same way whether or
+not a particular package is present in `makedepends` or `hostmakedepends`, that
+package shouldn't be added as a build time dependency.
<a id="repositories"></a>
#### Repositories
From b3347410a51512decedb03f71cd1353f318ca9c2 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <agausmann@fastmail.com>
Date: Fri, 17 Apr 2020 22:42:41 -0500
Subject: [PATCH 237/357] New package: rpi-imager-1.4
---
srcpkgs/rpi-imager/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/rpi-imager/template
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
new file mode 100644
index 00000000000..799d3803c03
--- /dev/null
+++ b/srcpkgs/rpi-imager/template
@@ -0,0 +1,14 @@
+# Template file for 'rpi-imager'
+pkgname=rpi-imager
+version=1.4
+revision=1
+build_style=cmake
+hostmakedepends="qt5-devel"
+makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel libcurl-devel libarchive-devel util-linux"
+depends="qt5-quickcontrols2 qt5-svg util-linux"
+short_desc="Raspberry Pi Imaging Utility"
+maintainer="Adam Gausmann <agausmann@fastmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/raspberrypi/rpi-imager"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum="f42359fca67a61fa37f0dfd0167749b7d758263b8501c07473d416542d78e004"
From 16b5c4484e67443753a8bd88eb0fb6ac611901b9 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 21 Apr 2020 08:29:19 +0200
Subject: [PATCH 238/357] New package: parprouted-0.7
---
srcpkgs/parprouted/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/parprouted/template
diff --git a/srcpkgs/parprouted/template b/srcpkgs/parprouted/template
new file mode 100644
index 00000000000..34289661036
--- /dev/null
+++ b/srcpkgs/parprouted/template
@@ -0,0 +1,16 @@
+# Template file for 'parprouted'
+pkgname=parprouted
+version=0.7
+revision=1
+build_style=gnu-makefile
+short_desc="Proxy ARP IP bridging daemon"
+maintainer="Pulux <pulux@pf4sh.de>"
+license="GPL-2.0-or-later"
+homepage="http://www.hazard.maks.net/parprouted/"
+distfiles="http://www.hazard.maks.net/parprouted/${pkgname}-${version}.tar.gz"
+checksum=d63643c95d4149a3d71112da5892f459433456bf0279bfa304625f109178defc
+
+do_install() {
+ vbin parprouted
+ vman parprouted.8
+}
From 386bc732ea7bac51c432b794aa427938e8943c1d 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, 22 Nov 2020 13:05:15 +0700
Subject: [PATCH 239/357] rpi-imager: fix ftbfs
Closes: #26597 [via git-merge-pr]
---
srcpkgs/rpi-imager/template | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 799d3803c03..f50227c753a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -3,8 +3,9 @@ pkgname=rpi-imager
version=1.4
revision=1
build_style=cmake
-hostmakedepends="qt5-devel"
-makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel libcurl-devel libarchive-devel util-linux"
+hostmakedepends="qt5-host-tools qt5-qmake"
+makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel
+ libcurl-devel libarchive-devel"
depends="qt5-quickcontrols2 qt5-svg util-linux"
short_desc="Raspberry Pi Imaging Utility"
maintainer="Adam Gausmann <agausmann@fastmail.com>"
@@ -12,3 +13,11 @@ license="Apache-2.0"
homepage="https://github.com/raspberrypi/rpi-imager"
distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
checksum="f42359fca67a61fa37f0dfd0167749b7d758263b8501c07473d416542d78e004"
+
+post_patch() {
+ vsed -i -e 's/CURL REQUIRED \([0-9.]*\)/CURL \1 REQUIRED/' CMakeLists.txt
+}
+
+pre_configure() {
+ ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
+}
From 46c14debd9c987e7f5a92be3fa1437453f13ca2e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 240/357] New package: libnma-1.8.30
---
common/shlibs | 1 +
srcpkgs/libnma-devel | 1 +
srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+)
create mode 120000 srcpkgs/libnma-devel
create mode 100644 srcpkgs/libnma/template
diff --git a/common/shlibs b/common/shlibs
index a1b2c7e1b9a..bf3f9b26575 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,6 +2984,7 @@ liblz.so.1 lzlib-1.8_1
libelogind.so.0 libelogind-238.1_2
libseat.so.1 libseat-0.3.0_1
libnma.so.0 libnm-gtk-1.4.0_1
+libnma.so.0 libnma-1.8.30_1
libgspell-1.so.2 gspell-1.8.0_1
libotf.so.1 libotf-0.9.16_1
libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=da33e72a49e07d855d97a52aa9a8962a4c96f52b9168c4e0027117ad8ffdafb4
+
+if [ "$CROSS_BUILD" ]; then
+ configure_args+="-Dgtk_doc=false"
+ hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+ if [ "$CROSS_BUILD" ]; then
+ vmkdir usr/share/gtk-doc/html 0755
+ vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+ fi
+}
+
+libnma-devel_package() {
+ short_desc+=" - library development files"
+ depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/include
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ vmove usr/share/gtk-doc
+ }
+}
From e60ec8f7f2ea051f87f5628df9ec323113dbe71a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 241/357] network-manager-applet: update to 1.18.0
---
common/shlibs | 1 -
srcpkgs/libnm-gtk | 1 -
srcpkgs/network-manager-applet-devel | 1 -
srcpkgs/network-manager-applet/template | 47 ++++---------------------
4 files changed, 7 insertions(+), 43 deletions(-)
delete mode 120000 srcpkgs/libnm-gtk
delete mode 120000 srcpkgs/network-manager-applet-devel
diff --git a/common/shlibs b/common/shlibs
index bf3f9b26575..51c9ba0635a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
libcolord.so.2 libcolord-1.1.7_1
libcolordprivate.so.2 libcolord-1.1.7_1
libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
libcaribou.so.0 caribou-0.4.0_1
libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
short_desc="NetworkManager panel applet for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
- export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
- short_desc+=" - runtime library"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- if [ "$build_option_gir" ]; then
- vmove usr/lib/girepository-1.0
- fi
- }
-}
-
-network-manager-applet-devel_package() {
- depends="gtk+3-devel NetworkManager-devel>=1.0
- libnm-gtk>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- vmove usr/share/gtk-doc
- }
-}
From bf2a7da1886ed24680fdd2788015d80670916231 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 242/357] NetworkManager-strongswan: update to 1.5.2
---
srcpkgs/NetworkManager-strongswan/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
# Template file for 'NetworkManager-strongswan'
pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-more-warnings --without-libnm-glib
--disable-more-warnings"
hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
depends="strongswan"
short_desc="Strongswan NetworkManager plugin"
maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
license="GPL-2.0-or-later"
homepage="https://www.strongswan.org/"
distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169
From be96b936857e7af1d88077cb80eccf0d2db5a5c3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 243/357] NetworkManager-l2tp: change dependency to
libnma-devel
---
srcpkgs/NetworkManager-l2tp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
# Template file for 'NetworkManager-l2tp'
pkgname=NetworkManager-l2tp
version=1.8.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--runstatedir=/run"
hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
depends="strongswan xl2tpd ppp"
short_desc="NetworkManager VPN plugin for L2TP/IPsec"
maintainer="Douglas Kosovic <doug@uq.edu.au>"
From 86bcd1e12b244d47871cd50cb242585b176e285d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 244/357] NetworkManager-openconnect: change dependency to
libnma-devel
---
srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
pkgname=NetworkManager-openconnect
version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
depends="openconnect"
short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes
From 10c034dfe747996a8e9b668af3a00a0a668ca610 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 245/357] NetworkManager-openvpn: update to 1.8.12
---
...isable-libnm-glib-support-by-default.patch | 52 -------------------
srcpkgs/NetworkManager-openvpn/template | 8 +--
2 files changed, 4 insertions(+), 56 deletions(-)
delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
- NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- fi
- fi
- if test "$with_gnome" != no; then
- with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
-- with_libnm_glib="$with_gnome"
-+ with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
-- with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+ with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
---
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
# Template file for 'NetworkManager-openvpn'
pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
depends="openvpn"
short_desc="NetworkManager VPN plugin for OpenVPN"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
system_accounts="_nm_openvpn"
lib32disabled=yes
_nm_openvpn_homedir="/var/empty"
From d48c1ea7b8c8036d94776bc51c1df2152d682606 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 246/357] NetworkManager-pptp: change dependency to
libnma-devel
---
srcpkgs/NetworkManager-pptp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
version=1.2.8
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-libnm-glib"
hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
depends="pptpclient"
short_desc="NetworkManager VPN plugin for pptp"
maintainer="Enno Boland <gottox@voidlinux.org>"
From f8adeae447dfbc976e8e8943c487cad8114a9dc7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 247/357] gnome-control-center: update to 3.38.1
---
srcpkgs/gnome-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=3.38.0
+version=3.38.1
revision=1
build_style=meson
build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
build_options="cheese"
build_options_default="cheese"
From fdc4740410d3f5e9890077e9e13d414b003801ff Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 248/357] gnome-initial-setup: update to 3.38.1
---
srcpkgs/gnome-initial-setup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=3.38.0
+version=3.38.1
revision=1
build_style=meson
configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
pango-devel"
depends="iso-codes"
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676
From 6d94c349870c8852f2302eb790213f08b7641de6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 249/357] gnome-shell: update to 3.38.1
---
srcpkgs/gnome-shell/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index bc4cd67fae7..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
short_desc="GNOME core user interface"
From 197ffa696aed47305c88a1affda3d16f7b7860d9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 250/357] cinnamon-control-center: change dependency to
libnma-devel
---
srcpkgs/cinnamon-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=4.6.2
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
From 0aa3a2db365887f9b19f44f46696ca2e46dbb74b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 19:45:42 -0400
Subject: [PATCH 251/357] switchboard-plug-network: update to 2.3.2
---
srcpkgs/switchboard-plug-network/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
# Template file for 'switchboard-plug-network'
pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
revision=1
build_style=meson
hostmakedepends="pkg-config vala"
makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
short_desc="Switchboard Network Plug"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"
From 49f27780c0305bbcac94f9e851a616201b5eccd8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 12 Oct 2020 20:52:23 -0400
Subject: [PATCH 252/357] NetworkManager-vpnc: change dependency to
libnma-devel
---
srcpkgs/NetworkManager-vpnc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index a8b8ce12176..b9d17226132 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,11 +1,11 @@
# Template file for 'NetworkManager-vpnc'
pkgname=NetworkManager-vpnc
version=1.2.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
hostmakedepends="pkg-config intltool"
-makedepends="libnm libnm-gtk network-manager-applet-devel libsecret-devel"
+makedepends="gtk+3-devel libnm libnma-devel libsecret-devel"
depends="vpnc"
short_desc="NetworkManager VPN plugin for VPNC"
maintainer="Peter Kuchar <masaj@gmx.com>"
From 439c80e6c033aafbf2303e3fffb5ece54772cd1a Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sat, 21 Nov 2020 23:07:30 -0800
Subject: [PATCH 253/357] growlight: make zfs optional
---
srcpkgs/growlight/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 65e5f69d52a..5ea4a3a42a8 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,12 +1,13 @@
# Template file for 'growlight'
pkgname=growlight
version=1.2.18
-revision=1
+revision=2
build_style=cmake
+configure_args="$(vopt_bool zfs USE_LIBZFS)"
hostmakedepends="pkg-config pandoc"
makedepends="libatasmart-devel libblkid-devel libcap-devel cryptsetup-devel
nettle-devel notcurses-devel libpciaccess-devel eudev-libudev-devel zlib-devel
- device-mapper-devel pciutils-devel zfs-devel"
+ device-mapper-devel pciutils-devel $(vopt_if zfs zfs-devel)"
depends="ntfs-3g jfsutils xfsprogs nvme-cli hdparm f2fs-tools btrfs-progs e2fsprogs"
short_desc="Block device manager and system installation tool"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -14,3 +15,6 @@ license="GPL-3.0-or-later"
homepage="https://nick-black.com/dankwiki/index.php/Growlight"
distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
checksum=c6c08556e6838226b81300e177c49d7a382e9eb30cfdb19f99790106e426a032
+
+build_options="zfs"
+desc_option_zfs="Build with ZFS Support"
From de4e2312d2fc19699877bd325f46c16233c58f25 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Thu, 29 Oct 2020 10:01:31 +1100
Subject: [PATCH 254/357] openvpn: update to 2.5.0
---
srcpkgs/openvpn/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 63a8ce1b77e..f6ebdbb57d6 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,20 +1,19 @@
# Template file for 'openvpn'
pkgname=openvpn
-version=2.4.9
-revision=3
+version=2.5.0
+revision=1
build_style=gnu-configure
-configure_args="$(vopt_enable pkcs11) --enable-iproute2 --disable-systemd
+configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
-hostmakedepends="iproute2 pkg-config"
+hostmakedepends="pkg-config"
makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
$(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
-depends="iproute2"
short_desc="Easy-to-use, robust, and highly configurable VPN"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://www.openvpn.net"
distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz"
-checksum=641f3add8694b2ccc39fd4fd92554e4f089ad16a8db6d2b473ec284839a5ebe2
+checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
build_options="mbedtls pkcs11"
build_options_default="mbedtls"
From cae8f95b729542cff6723cfee59e0ed7c9c6425b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 22 Nov 2020 15:20:05 +0100
Subject: [PATCH 255/357] erlang: update to 23.1.4.
---
srcpkgs/erlang/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 6fb84cb0a8b..6557281ec4c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
# Template file for 'erlang'
pkgname=erlang
-version=23.1.3
+version=23.1.4
revision=1
create_wrksrc=yes
build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="http://www.erlang.org/"
changelog="https://github.com/erlang/otp/releases"
distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=291e0852b71ca593f4015417f6e44c08638633c5af6648bd26582c8590390433
+checksum=8f6718b82bbca72d7dfe0b0de10b6e043cefe9e5ac08d3f84e18f8522d794967
subpackages="erlang-doc"
if [ -z "$CROSS_BUILD" ]; then
@@ -59,7 +59,6 @@ post_install() {
erlang-doc_package() {
short_desc="Erlang programming language documentation and examples"
depends="${sourcepkg}-${version}_${revision}"
- archs=noarch
pkg_install() {
vmove usr/lib/erlang/doc
for i in $(cd ${DESTDIR}; find usr/lib/erlang -type d \( -path '*/examples' -o -path '*/doc/html' \))
From 0999e0839de805e7959856de6a1a76feb9cae2db Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 22 Nov 2020 15:22:52 +0100
Subject: [PATCH 256/357] include-what-you-use: update to 0.15.
---
...de-what-you-use-001-llvm11-stringref.patch | 146 ------------------
...ude-what-you-use-002-clang-astdumper.patch | 54 -------
srcpkgs/include-what-you-use/template | 14 +-
3 files changed, 4 insertions(+), 210 deletions(-)
delete mode 100644 srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch
delete mode 100644 srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch
diff --git a/srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch b/srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch
deleted file mode 100644
index 171dca28e34..00000000000
--- a/srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 53487d209729d5781007dc0fd6076dc585cb3727 Mon Sep 17 00:00:00 2001
-From: Andrea Bocci <andrea.bocci@cern.ch>
-Date: Fri, 28 Feb 2020 17:45:03 +0100
-Subject: [PATCH] Add explicit conversion from llvm::StringRef to std::string
-
-llvm/llvm-project@777180a makes the llvm::StringRef conversion operator
-to std::string explicit.
-These changes add a call to the str() method to perform the conversion.
-
-Signed-off-by: Andrea Bocci <andrea.bocci@cern.ch>
----
- iwyu_driver.cc | 2 +-
- iwyu_globals.cc | 4 ++--
- iwyu_lexer_utils.cc | 2 +-
- iwyu_location_util.h | 2 +-
- iwyu_output.cc | 2 +-
- iwyu_path_util.cc | 6 +++---
- iwyu_preprocessor.cc | 4 ++--
- 7 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/iwyu_driver.cc b/iwyu_driver.cc
-index bd163144..42fea35b 100644
---- a/iwyu_driver.cc
-+++ b/iwyu_driver.cc
-@@ -79,7 +79,7 @@ std::string GetExecutablePath(const char *Argv0) {
- }
-
- const char *SaveStringInSet(std::set<std::string> &SavedStrings, StringRef S) {
-- return SavedStrings.insert(S).first->c_str();
-+ return SavedStrings.insert(S.str()).first->c_str();
- }
-
- void ExpandArgsFromBuf(const char *Arg,
-diff --git a/iwyu_globals.cc b/iwyu_globals.cc
-index 0f58b4dc..26998966 100644
---- a/iwyu_globals.cc
-+++ b/iwyu_globals.cc
-@@ -293,7 +293,7 @@ static vector<HeaderSearchPath> ComputeHeaderSearchPaths(
- for (auto it = header_search->system_dir_begin();
- it != header_search->system_dir_end(); ++it) {
- if (const DirectoryEntry* entry = it->getDir()) {
-- const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName()));
-+ const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName().str()));
- search_path_map[path] = HeaderSearchPath::kSystemPath;
- }
- }
-@@ -303,7 +303,7 @@ static vector<HeaderSearchPath> ComputeHeaderSearchPaths(
- // search_dir_begin()/end() includes both system and user paths.
- // If it's a system path, it's already in the map, so everything
- // new is a user path. The insert only 'takes' for new entries.
-- const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName()));
-+ const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName().str()));
- search_path_map.insert(make_pair(path, HeaderSearchPath::kUserPath));
- }
- }
-diff --git a/iwyu_lexer_utils.cc b/iwyu_lexer_utils.cc
-index fcea2d28..648c9da8 100644
---- a/iwyu_lexer_utils.cc
-+++ b/iwyu_lexer_utils.cc
-@@ -70,7 +70,7 @@ SourceLocation GetLocationAfter(
- string GetIncludeNameAsWritten(
- SourceLocation include_loc,
- const CharacterDataGetterInterface& data_getter) {
-- const string data = GetSourceTextUntilEndOfLine(include_loc, data_getter);
-+ const string data = GetSourceTextUntilEndOfLine(include_loc, data_getter).str();
- if (data.empty())
- return data;
- string::size_type endpos = string::npos;
-diff --git a/iwyu_location_util.h b/iwyu_location_util.h
-index 3892a424..6f8cf81c 100644
---- a/iwyu_location_util.h
-+++ b/iwyu_location_util.h
-@@ -89,7 +89,7 @@ bool IsInScratchSpace(clang::SourceLocation loc);
-
- inline string GetFilePath(const clang::FileEntry* file) {
- return (IsBuiltinFile(file) ? "<built-in>" :
-- NormalizeFilePath(file->getName()));
-+ NormalizeFilePath(file->getName().str()));
- }
-
- //------------------------------------------------------------
-diff --git a/iwyu_output.cc b/iwyu_output.cc
-index ca145710..8666c26c 100644
---- a/iwyu_output.cc
-+++ b/iwyu_output.cc
-@@ -168,7 +168,7 @@ string GetKindName(const clang::TagDecl* tag_decl) {
- if (const FakeNamedDecl* fake = FakeNamedDeclIfItIsOne(named_decl)) {
- return fake->kind_name();
- }
-- return tag_decl->getKindName();
-+ return tag_decl->getKindName().str();
- }
-
- string GetQualifiedNameAsString(const clang::NamedDecl* named_decl) {
-diff --git a/iwyu_path_util.cc b/iwyu_path_util.cc
-index ab4fc800..9987ea47 100644
---- a/iwyu_path_util.cc
-+++ b/iwyu_path_util.cc
-@@ -134,7 +134,7 @@ string NormalizeFilePath(const string& path) {
- std::replace(normalized.begin(), normalized.end(), '\\', '/');
- #endif
-
-- return normalized.str();
-+ return normalized.str().str();
- }
-
- string NormalizeDirPath(const string& path) {
-@@ -154,14 +154,14 @@ string MakeAbsolutePath(const string& path) {
- std::error_code error = llvm::sys::fs::make_absolute(absolute_path);
- CHECK_(!error);
-
-- return absolute_path.str();
-+ return absolute_path.str().str();
- }
-
- string MakeAbsolutePath(const string& base_path, const string& relative_path) {
- llvm::SmallString<128> absolute_path(base_path);
- llvm::sys::path::append(absolute_path, relative_path);
-
-- return absolute_path.str();
-+ return absolute_path.str().str();
- }
-
- string GetParentPath(const string& path) {
-diff --git a/iwyu_preprocessor.cc b/iwyu_preprocessor.cc
-index 58e78595..88b93144 100644
---- a/iwyu_preprocessor.cc
-+++ b/iwyu_preprocessor.cc
-@@ -313,7 +313,7 @@ void IwyuPreprocessorInfo::ProcessHeadernameDirectivesInFile(
- break;
- }
- const string filename = GetSourceTextUntilEndOfLine(current_loc,
-- DefaultDataGetter());
-+ DefaultDataGetter()).str();
- // Use "" or <> based on where the file lives.
- string quoted_private_include;
- if (IsSystemIncludeFile(GetFilePath(current_loc)))
-@@ -332,7 +332,7 @@ void IwyuPreprocessorInfo::ProcessHeadernameDirectivesInFile(
- }
-
- string after_text = GetSourceTextUntilEndOfLine(current_loc,
-- DefaultDataGetter());
-+ DefaultDataGetter()).str();
- const string::size_type close_brace_pos = after_text.find('}');
- if (close_brace_pos == string::npos) {
- Warn(current_loc, "@headername directive missing a closing brace");
diff --git a/srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch b/srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch
deleted file mode 100644
index 663a883fa91..00000000000
--- a/srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 30549c6931972456d1e09ff5dbeecd258a8df72b Mon Sep 17 00:00:00 2001
-From: Kim Grasman <kim.grasman@gmail.com>
-Date: Thu, 9 Jul 2020 18:47:56 +0200
-Subject: [PATCH] Implement Stmt printing with ASTDumper
-
-The Clang API changed in commit 473fbc90d1fbf17e so that Stmt::dump
-takes an ASTContext instead of a SourceManager.
-
-Rather than wire a global ASTContext, reimplement PrintableStmt and
-PrintStmt to duplicate the most trivial implementations not requiring
-ASTContext.
-
-No functional change.
----
- iwyu_ast_util.cc | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/iwyu_ast_util.cc b/iwyu_ast_util.cc
-index d3d4dd1f..b19a11fb 100644
---- a/iwyu_ast_util.cc
-+++ b/iwyu_ast_util.cc
-@@ -25,6 +25,7 @@
- #include "llvm/Support/Casting.h"
- #include "llvm/Support/raw_ostream.h"
- #include "clang/AST/ASTContext.h"
-+#include "clang/AST/ASTDumper.h"
- #include "clang/AST/CanonicalType.h"
- #include "clang/AST/Decl.h"
- #include "clang/AST/DeclBase.h"
-@@ -46,6 +47,7 @@ namespace clang {
- class FileEntry;
- } // namespace clang
-
-+using clang::ASTDumper;
- using clang::BlockPointerType;
- using clang::CXXConstructExpr;
- using clang::CXXConstructorDecl;
-@@ -450,12 +452,14 @@ string PrintableDecl(const Decl* decl, bool terse/*=true*/) {
- string PrintableStmt(const Stmt* stmt) {
- std::string buffer;
- raw_string_ostream ostream(buffer);
-- stmt->dump(ostream, *GlobalSourceManager());
-+ ASTDumper dumper(ostream, /*ShowColors=*/false);
-+ dumper.Visit(stmt);
- return ostream.str();
- }
-
- void PrintStmt(const Stmt* stmt) {
-- stmt->dump(*GlobalSourceManager()); // This prints to errs().
-+ ASTDumper dumper(llvm::errs(), /*ShowColors=*/false);
-+ dumper.Visit(stmt);
- }
-
- string PrintableType(const Type* type) {
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 3811309bdde..4457485233c 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -1,8 +1,8 @@
# Template file for 'include-what-you-use'
pkgname=include-what-you-use
-version=0.14
-revision=2
-wrksrc="${pkgname}"
+version=0.15
+revision=1
+create_wrksrc="yes"
build_style=cmake
configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr "
make_build_args="VERBOSE=1"
@@ -12,15 +12,9 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="NCSA"
homepage="https://include-what-you-use.org/"
distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
-checksum=43184397db57660c32e3298a6b1fd5ab82e808a1f5ab0591d6745f8d256200ef
+checksum=2bd6f2ae0d76e4a9412f468a5fa1af93d5f20bb66b9e7bf73479c31d789ac2e2
python_version=3
-post_extract() {
- for i in ${FILESDIR}/include-what-you-use-*.patch; do
- patch -sNp1 -i ${i}
- done
-}
-
post_install() {
vlicense LICENSE.TXT
}
From 1fdc26745e9d2f5d02e4bb692096397b6d5c1e2b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 22 Nov 2020 15:24:18 +0100
Subject: [PATCH 257/357] sysstat: update to 12.4.1.
---
srcpkgs/sysstat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template
index 5b5b1b9c8c7..70c526312f7 100644
--- a/srcpkgs/sysstat/template
+++ b/srcpkgs/sysstat/template
@@ -1,6 +1,6 @@
# Template file for 'sysstat'
pkgname=sysstat
-version=12.4.0
+version=12.4.1
revision=1
build_style=gnu-configure
configure_args="--enable-copy-only --disable-file-attr
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://pagesperso-orange.fr/sebastien.godard/"
distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.xz"
-checksum=78556c339795ecd07eb10ee09e3f5d52901d3a29f874ae92b45efd0de7b62d16
+checksum=24af8d4eff5118a18f67d5eadda843b9cb9fd29ae4922c0e8b8399621313ce0b
post_extract() {
vsed -i 's/lib64/lib/' configure
From c9df5d773526d63403cb45f8d9997fd01f51e5f4 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 21 Nov 2020 14:52:36 -0700
Subject: [PATCH 258/357] youtube-dl: update to 2020.11.21.1
---
srcpkgs/youtube-dl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 8f2945c9934..d6b4e21143b 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
# Template file for 'youtube-dl'
pkgname=youtube-dl
-version=2020.11.19
+version=2020.11.21.1
revision=1
wrksrc="${pkgname}"
build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
homepage="https://yt-dl.org"
changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
distfiles="${homepage}/downloads/latest/${pkgname}-${version}.tar.gz"
-checksum=f8c14d9eb2fd8fe7242de8b96f2c918810867c518a162405644f483dcd14be9e
+checksum=d4b173bb1113bc1641cf130d088976bb8d1484f6bd5937872c1f89b1e28e3429
do_check() {
PYTHON=/usr/bin/python3 make offlinetest
From 77c06cc1b8dadd144cf3d60dd768c10d5b5d8343 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 22 Nov 2020 09:54:23 -0500
Subject: [PATCH 259/357] python3-scour: update to 0.38.2.
---
srcpkgs/python3-scour/template | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-scour/template b/srcpkgs/python3-scour/template
index cf86a2354b0..5dd2d4f0a48 100644
--- a/srcpkgs/python3-scour/template
+++ b/srcpkgs/python3-scour/template
@@ -1,21 +1,16 @@
# Template file for 'python3-scour'
pkgname=python3-scour
-version=0.38.1.post1
+version=0.38.2
revision=1
wrksrc="scour-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-six"
-checkdepends="python3-six"
short_desc="SVG scrubber (Python3)"
maintainer="Alexander Mamay <alexander@mamay.su>"
license="Apache-2.0"
homepage="https://github.com/scour-project/scour"
changelog="https://raw.githubusercontent.com/scour-project/scour/master/HISTORY.md"
distfiles="${PYPI_SITE}/s/scour/scour-${version}.tar.gz"
-checksum=81b93dcfc57338f1260db4fb62697b653770a8a8bd756dcba3640c9b558a7145
+checksum=6881ec26660c130c5ecd996ac6f6b03939dd574198f50773f2508b81a68e0daf
conflicts="python-scour>=0"
-
-do_check() {
- python3 setup.py test
-}
From 5803b5dc1ab79c1ef0bab641dec2eea619ad7ad7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 22 Nov 2020 10:04:38 -0500
Subject: [PATCH 260/357] python3-virtualenv: update to 20.2.0.
---
srcpkgs/python3-virtualenv/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 37be07a5fb3..91775e9d370 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,20 +1,24 @@
# Template file for 'python3-virtualenv'
pkgname=python3-virtualenv
-version=20.1.0
+version=20.2.0
revision=1
wrksrc="virtualenv-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="python3-setuptools python3-appdirs python3-distlib python3-filelock python3-six"
-checkdepends="$depends"
+checkdepends="tox python3-devel $depends"
short_desc="Virtual Python environment builder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://virtualenv.pypa.io/"
distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=b8d6110f493af256a40d65e29846c69340a947669eec8ce784fcf3dd3af28380
+checksum=fd4147c5ba3f694e2e4fc3c767407dc2226899623bb9b49c2f15637c2ee335b3
alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
+do_check() {
+ tox -e py${py3_ver/./}
+}
+
post_install() {
mv $DESTDIR/usr/bin/virtualenv $DESTDIR/usr/bin/virtualenv3
vlicense LICENSE
From 64dbd76bb914d287489e9fd3476d5219a3cdd0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 14:59:20 +0100
Subject: [PATCH 261/357] tectonic: update to 0.3.3.
---
srcpkgs/tectonic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 98978d07ec8..709c265d4aa 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,6 +1,6 @@
# Template file for 'tectonic'
pkgname=tectonic
-version=0.2.0
+version=0.3.3
revision=1
wrksrc="tectonic-tectonic-${version}"
build_style=cargo
@@ -11,7 +11,7 @@ maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
license="MIT"
homepage="https://tectonic-typesetting.github.io"
distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=fce39a26b8a88c662de114ce38f407f234e255c4cef6ea825e85358e936b9bbd
+checksum=c0aa60186f2e7f37af67dafbdccfc7a99ca5ce084651d8fcabe7561b941dcb97
post_install() {
vlicense LICENSE
From ef10091f084b61665c61da592eaf3a29cc62a7b4 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sun, 22 Nov 2020 18:39:03 +0100
Subject: [PATCH 262/357] font-cozette: update to 1.9.3.
---
srcpkgs/font-cozette/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index 8c721033eb7..88b606f7a69 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -1,6 +1,6 @@
# Template file for 'font-cozette'
pkgname=font-cozette
-version=1.9.2
+version=1.9.3
revision=1
create_wrksrc=yes
hostmakedepends="font-util"
@@ -10,7 +10,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
license="MIT"
homepage="https://github.com/slavfox/Cozette"
distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"
-checksum=25d7a93aca70754c78e9b88ec7b6185b6bbe9f0a9344f109c4cccb6cea89a9d2
+checksum=8104e960dca987c2836c79215c30141e3203d1cf5ac34e0863fa0549ba235f55
font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
do_install() {
From ea21a71d7f554d604577ecf3df398c121ebd94c4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 22 Nov 2020 19:41:34 +0100
Subject: [PATCH 263/357] flinks: update to 0.5.0.
---
srcpkgs/flinks/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/flinks/template b/srcpkgs/flinks/template
index 551b119289d..e4fac93a22e 100644
--- a/srcpkgs/flinks/template
+++ b/srcpkgs/flinks/template
@@ -1,17 +1,17 @@
# Template file for 'flinks'
pkgname=flinks
-version=0.4.3
-revision=6
+version=0.5.0
+revision=1
build_style=python3-module
-pycompile_module="flinkspkg"
hostmakedepends="python3-setuptools"
depends="lynx python3"
short_desc="Text-mode flashing word web browser for speed-reading and/or skimming"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://mbays.freeshell.org/flinks/"
-distfiles="http://mbays.freeshell.org/flinks/flinks-${version}.tar.gz"
-checksum=ca5c3a8bc651befcb75b4f2542519bb34a36caccb52f141ddcc7b184fedcebd0
+homepage="https://mbays.freeshell.org/flinks/"
+changelog="https://mbays.freeshell.org/flinks/ChangeLog"
+distfiles="https://mbays.freeshell.org/flinks/flinks-${version}.tar.gz"
+checksum=e2834ca2309cbc02693f9bdacd860045bb6d3a9ef8bd0a54ee2f1c373a366266
post_install() {
vdoc README
From 9eb9a480d1eb2eaf4fad2089ea390aa05734b25a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 22 Nov 2020 23:15:05 +0100
Subject: [PATCH 264/357] switchboard: rebuild
there was a dependency on libgee, but libgee is long gone from
the void-packages repo (there's probably a lingering package in
the binary repos, so the switchboard-plug-network rebuild did not
fail on the builders, but it failed in my clean repos)
---
srcpkgs/switchboard/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index 295b27a5787..45031a8d8b7 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -1,10 +1,10 @@
# Template file for 'switchboard'
pkgname=switchboard
version=2.3.7
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibunity=false"
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
short_desc="Extensible System Settings app designed for elementary OS"
maintainer="Orphaned <orphan@voidlinux.org>"
From 82d1fc59f0b5633fe3a2846f5a6aaba85514335a Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 03:16:07 +0600
Subject: [PATCH 265/357] gnome-calculator: update to 3.38.2.
---
srcpkgs/gnome-calculator/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index de81e48969e..220324d3e3c 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-calculator'
pkgname=gnome-calculator
-version=3.38.0
+version=3.38.2
revision=1
build_style=meson
build_helper="gir"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Calculator"
changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=902e23ff550692b02459e14d6ebba8b670663a9f4af0d98ee52fadea895b57fe
+checksum=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b
From 7a3c503e5c1b59a3a47fde52f683bd34cb726ddd Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 03:40:49 +0600
Subject: [PATCH 266/357] gnome-maps: update to 3.38.2.
---
srcpkgs/gnome-maps/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index 48fe66691d1..6f15a99ba1d 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Maps"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9ef0e3705e00b5ff47d743452e5f550e726112aaf43c385bed3c599fa877e7b
+checksum=a1a73ca6a47435add25f8fa022ed016c84dd2db3ef4976a8280721d3ea80465d
From e0fa319ef955908c6ff87237a42069ade40b05b0 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 03:53:57 +0600
Subject: [PATCH 267/357] gnome-2048: update to 3.38.2.
---
srcpkgs/gnome-2048/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-2048/template b/srcpkgs/gnome-2048/template
index 9bc161700a6..6c7a9889c01 100644
--- a/srcpkgs/gnome-2048/template
+++ b/srcpkgs/gnome-2048/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-2048'
pkgname=gnome-2048
-version=3.38.0
+version=3.38.2
revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/2048"
distfiles="${GNOME_SITE}/gnome-2048/${version%.*}/gnome-2048-${version}.tar.xz"
-checksum=4c257f9799085263070a88acf5fbc8f7aae075ac8d56dca3e63dd982607123c9
+checksum=e27367f5c09a0136581d335f57913aaf5a5f180e3299cc5c1a30d8583e79ae68
From d6e9e6f45259eeff1a05d28192544248a15daf10 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 04:26:16 +0600
Subject: [PATCH 268/357] gnome-tetravex: update to 3.38.2.
---
srcpkgs/gnome-tetravex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-tetravex/template b/srcpkgs/gnome-tetravex/template
index c667354e090..78f0ef176f3 100644
--- a/srcpkgs/gnome-tetravex/template
+++ b/srcpkgs/gnome-tetravex/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-tetravex'
pkgname=gnome-tetravex
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
hostmakedepends="gettext itstool pkg-config vala glib-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Tetravex"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0e92b8a7e7a175f441980daa8fa2035cb47bb2df777bce6ffe31252ad7e068
+checksum=1fcdf10979b9a3526009d783a1c88a389918f360da4edb44fba25c71f186911b
From 30f9fb33a281437ffed0d900556981d55dd9fd81 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 04:37:15 +0600
Subject: [PATCH 269/357] gnome-klotski: update to 3.38.2.
---
srcpkgs/gnome-klotski/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-klotski/template b/srcpkgs/gnome-klotski/template
index d3577c0e802..c1ddd4a7d11 100644
--- a/srcpkgs/gnome-klotski/template
+++ b/srcpkgs/gnome-klotski/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-klotski'
pkgname=gnome-klotski
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Klotski"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9bda0d438b98ae8df3fc280e4cfd801a33e7121a4d601d005e171900be893c03
+checksum=91637845649f3ca709d29f71ee775b946d1112087209f32264e8fad21a0ca0e2
From 394c09f9d70aaff65f872c3731f1697c58d2c062 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 04:55:52 +0600
Subject: [PATCH 270/357] gnome-mahjongg: update to 3.38.3.
---
srcpkgs/gnome-mahjongg/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template
index bc00cfc81c1..3c8f2e7039e 100644
--- a/srcpkgs/gnome-mahjongg/template
+++ b/srcpkgs/gnome-mahjongg/template
@@ -1,8 +1,9 @@
# Template file for 'gnome-mahjongg'
pkgname=gnome-mahjongg
-version=3.38.2
+version=3.38.3
revision=1
build_style=meson
+configure_args="-Dcompile-schemas=disabled -Dupdate-icon-cache=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config vala"
makedepends="librsvg-devel gtk+3-devel libglib-devel"
short_desc="GNOME Mahjongg solitaire game"
@@ -10,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Mahjongg"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=928708b4c625cad4b05199ca2948f6a545bfab368a1fc576feed0a7432e454f3
+checksum=d2b1e47d85852048b35d89e3ddaba1daeb06aaf97acfb67a501ce664ff509190
From 34fbe0bf0d191fbe6b8792aef384d35ee6a71898 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, 22 Nov 2020 09:15:10 +0700
Subject: [PATCH 271/357] iscan: update to 2.30.4.
---
srcpkgs/iscan/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/iscan/template b/srcpkgs/iscan/template
index 41ed3dc7fa7..18c0d969766 100644
--- a/srcpkgs/iscan/template
+++ b/srcpkgs/iscan/template
@@ -1,30 +1,30 @@
# Template file for 'iscan'
pkgname=iscan
-version=2.30.3
-revision=3
-_srcrev=1
-repository=nonfree
+version=2.30.4
+revision=1
+_srcrev=2
+archs="i686 x86_64"
build_style=gnu-configure
configure_args="--enable-frontend --enable-jpeg --enable-tiff --enable-png --enable-gimp"
-LDFLAGS="-ldl -lpng16"
-maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="pkg-config"
makedepends="gtk+-devel gimp-devel libxml2-devel libjpeg-turbo-devel tiff-devel libltdl-devel libpng-devel sane-devel libusb-devel"
depends="sane-epkowa"
-license="GPL-2, AVASYSPL"
-homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
short_desc="EPSON Image Scan! front-end"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later, custom:EPSON"
+homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
distfiles="http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${version}-${_srcrev}.tar.gz"
-checksum=91a6cc1571e5ec34cee067eabb35f13838e71dfeda416310ecb5b5030d49de67
-archs="i686 x86_64"
+checksum=597b9913de42d7a27f95bc82e533cbe778121ba13e3a03bc037f8d09a43447d5
+repository=nonfree
+LDFLAGS="-ldl -lpng16"
post_configure() {
# fix wrongly created link
- sed -i -e 's/\(libesmod-$${arch}\)$(PACKAGE_CXX_ABI)/\1.c2/' non-free/Makefile
+ vsed -i -e 's/\(libesmod-$${arch}\)$(PACKAGE_CXX_ABI)/\1.c2/' non-free/Makefile
}
post_install() {
- vlicense non-free/AVASYSPL.en.txt
+ vlicense non-free/COPYING.EPSON.en.txt
vmkdir usr/lib/gimp/2.0/plug-ins
ln -s /usr/bin/iscan ${DESTDIR}/usr/lib/gimp/2.0/plug-ins
vinstall iscan.desktop 644 usr/share/applications
@@ -32,7 +32,7 @@ post_install() {
sane-epkowa_package() {
short_desc="SANE backend for EPSON scanners"
- license="GPL-2"
+ license="GPL-2.0-or-later"
unset repository
depends="sane iscan-data"
conf_files="/etc/sane.d/epkowa.conf"
From 91fb68f8a78ab7d0c89a0184208750277070ae9e 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, 22 Nov 2020 09:15:13 +0700
Subject: [PATCH 272/357] iscan-data: update to 1.39.2.
---
srcpkgs/iscan-data/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/iscan-data/template b/srcpkgs/iscan-data/template
index 2953cb34344..b5e90ed990c 100644
--- a/srcpkgs/iscan-data/template
+++ b/srcpkgs/iscan-data/template
@@ -1,14 +1,13 @@
# Template file for 'iscan-data'
pkgname=iscan-data
-version=1.39.0
-revision=2
+version=1.39.2
+revision=1
_srcrev=1
-archs=noarch
build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="libxslt"
-license="GPL-2"
-homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
short_desc="EPSON Image Scan! data files"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
distfiles="http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}-${_srcrev}.tar.gz"
-checksum=61ef9496568c8709cce7687de0d47e4b132a00fa6a398fcbb6f06f8fdf31755f
+checksum=6a62bc6e84257714785d99316a017b8444207e3dcf56d35d0ce13f292d855824
From 71d48a4325e3b48535335aa3a1efa528a8cbc074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 22 Nov 2020 18:31:03 -0300
Subject: [PATCH 273/357] .github/workflows/build: don't skip CI when PR is a
draft.
When a PR is marked as ready for review (no longer a draft), CI isn't
re-run automatically, so no tests are run until the PR is updated. Even
trying to manually re-run the jobs doesn't fix this, since GH appears to
remember the PR state instead of using the current one.
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8c0cdccf5d4..33186037f8d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,7 +26,7 @@ jobs:
build:
name: Build packages
runs-on: ubuntu-18.04
- if: "!github.event.pull_request.draft && !contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
+ if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
container:
image: 'voidlinux/masterdir-${{ matrix.config.bootstrap }}:20200607RC01'
From f2e604b85a48480b27e9ab72a5407e3a467ed9a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 23 Nov 2020 02:18:16 +0100
Subject: [PATCH 274/357] tali: update to 3.38.2
---
srcpkgs/tali/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index fd698c5032d..d3b18e563a3 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -1,6 +1,6 @@
# Template file for 'tali'
pkgname=tali
-version=3.38.0
+version=3.38.2
revision=1
build_style=meson
hostmakedepends="cmake pkg-config gettext glib-devel appstream-glib
@@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Tali"
distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz"
-checksum=29ee0cb37ba7bac7cc3d8356bcdd91a202eac999dcef79326e3a98ab2234cea4
+checksum=4fb9f7ee8cc0eb89010408c42cb0b1f83e839ac8e9b644ec3ddf564508431691
From 59ac43dd623b1f069d96e8f7a69145ebc5fd110b Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 19:39:28 +0100
Subject: [PATCH 275/357] bison: update to 3.7.4.
---
srcpkgs/bison/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template
index 090d35068c6..56f380246b1 100644
--- a/srcpkgs/bison/template
+++ b/srcpkgs/bison/template
@@ -1,6 +1,6 @@
# Template file for 'bison'
pkgname=bison
-version=3.7.3
+version=3.7.4
revision=1
build_style=gnu-configure
hostmakedepends="help2man perl m4"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/bison/bison.html"
distfiles="${GNU_SITE}/bison/bison-${version}.tar.xz"
-checksum=88d9e36856b004c0887a12ba00ea3c47db388519629483dd8c3fce9694d4da6f
+checksum=a3b5813f48a11e540ef26f46e4d288c0c25c7907d9879ae50e430ec49f63c010
alternatives="
yacc:yacc:/usr/bin/bison-yacc
yacc:yacc.1:/usr/share/man/man1/bison-yacc.1"
From af4f9f0cfdca531bf2c83db8c0b11cf194115bb5 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 21 Nov 2020 16:09:38 -0800
Subject: [PATCH 276/357] lxd: update to 4.8.
---
srcpkgs/lxd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template
index bf9b207d7f1..0b3d30a96eb 100644
--- a/srcpkgs/lxd/template
+++ b/srcpkgs/lxd/template
@@ -1,6 +1,6 @@
# Template file for 'lxd'
pkgname=lxd
-version=4.7
+version=4.8
revision=1
build_style=go
go_import_path=github.com/lxc/lxd
@@ -15,7 +15,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="Apache-2.0"
homepage="https://linuxcontainers.org/lxd"
distfiles="https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
-checksum=011745a66e971d95ada088dc42a9154028393de86871ea3ef4ff91a2976525ed
+checksum=de4f096c71448ceb358c0d0d63e34d17ea8e49c15eb9d4f8af5030ce0535337f
system_groups="lxd"
# whitelist libcap LDFLAGS (see: https://github.com/lxc/lxd/issues/6727)
From 8e863c75c7187a2594c162eaac9ffae19a30436f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 19:09:24 -0600
Subject: [PATCH 277/357] python3-pulsectl: update to 20.5.1
---
srcpkgs/python3-pulsectl/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template
index f998bf15d31..79fe26537e8 100644
--- a/srcpkgs/python3-pulsectl/template
+++ b/srcpkgs/python3-pulsectl/template
@@ -1,10 +1,9 @@
# Template file for 'python3-pulsectl'
pkgname=python3-pulsectl
-version=19.10.4
-revision=2
+version=20.5.1
+revision=1
wrksrc="pulsectl-${version}"
build_style=python3-module
-pycompile_module="pulsectl"
hostmakedepends="python3-setuptools"
depends="python3-setuptools"
short_desc="Python3 high-level interfaces and ctypes bindings for libpulse"
@@ -13,7 +12,7 @@ license="MIT"
homepage="https://github.com/mk-fg/python-pulse-control"
changelog="https://github.com/mk-fg/python-pulse-control/raw/master/CHANGES.rst"
distfiles="${PYPI_SITE}/p/pulsectl/pulsectl-${version}.tar.gz"
-checksum=137e38017960d7fc42677da12b703da42359c94803c80407ea5dddae363ba1f6
+checksum=39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db
post_install() {
vlicense COPYING
From 86e815bdfa7e3b1c4e4e8d1af70ffba26f085a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 14:29:32 +0100
Subject: [PATCH 278/357] bfs: update to 2.1.
---
srcpkgs/bfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index bad966eee44..68ccaff63a4 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
# Template file for 'bfs'
pkgname=bfs
-version=2.0
+version=2.1
revision=1
build_style=gnu-makefile
makedepends="acl-devel libcap-devel"
@@ -11,7 +11,7 @@ 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=afbde70742f4bac3f3b030b36531fe0bd67dbdda61ce0457f3a1e5681405df33
+checksum=be51966ca3bcc0167fb16c89f81fa37ee13c6326c616c31b87fd564a54bdc5f2
post_install() {
vlicense LICENSE
From 76efe3ac76fcec69aed1c10c6881d629ddca85c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 15:05:27 +0100
Subject: [PATCH 279/357] btfs: update to 2.23.
---
srcpkgs/btfs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index 35884c436b9..b70ea7d79be 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,7 +1,7 @@
# Template file for 'btfs'
pkgname=btfs
-version=2.22
-revision=2
+version=2.23
+revision=1
build_style=gnu-configure
hostmakedepends="automake pkg-config"
makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"
@@ -11,7 +11,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/johang/btfs"
distfiles="https://github.com/johang/btfs/archive/v${version}.tar.gz"
-checksum=03ebfffd7cbd91e2113d0c43d8d129ad7851753c287c326416ecf622789c4a8d
+checksum=2832817ea3aa73ff7af60a547736d0a681111816d95b76a999935b6f90491fa6
pre_configure() {
autoreconf -fi
From 37f104ef9a0f31d2778d681632c6330e0e514cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 15:14:20 +0100
Subject: [PATCH 280/357] mpd: update to 0.22.3.
---
srcpkgs/mpd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 8e3de99fec6..8ce4f1799a7 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.22.1
+version=0.22.3
revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v${version}/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=408464093d09c73ceecafc201defcbaba2193cb30ad0aaf1241459a410fecaf3
+checksum=338012037b5e67730529187c555a54cc567a85b15a7e8ddb3a807b1971566ccf
LDFLAGS+=" -Wl,-z,stack-size=1048576"
patch_args="-Np1"
From e8a2908ff56c5d488cbf62d11d8151ef966f2291 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 22:56:08 +0200
Subject: [PATCH 281/357] gmusicbrowser: update to 1.1.16.
---
...840eb9dad0b59ad2dac5d303f5929b2f09f21.diff | 26 -------------------
srcpkgs/gmusicbrowser/template | 9 +++----
2 files changed, 4 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff
diff --git a/srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff b/srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff
deleted file mode 100644
index b27e8cccf80..00000000000
--- a/srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/gmusicbrowser.pl b/gmusicbrowser.pl
-index bbf16d7..18fab6a 100755
---- gmusicbrowser.pl
-+++ gmusicbrowser.pl
-@@ -9020,7 +9020,7 @@ sub Set
-
- ($cmd,my $pattern)= split /:/,$cmd,2;
- $pattern='' unless defined $pattern;
-- my ($basecmd,my $prop)= Songs::filter_properties($field,"$cmd:$pattern");
-+ my ($basecmd, $prop)= Songs::filter_properties($field,"$cmd:$pattern");
- if (!$prop)
- { $cmd= Songs::Field_property($field,'default_filter');
- ($basecmd,$prop)= Songs::filter_properties($field,$cmd);
-diff --git a/gmusicbrowser_list.pm b/gmusicbrowser_list.pm
-index 76d2f86..26d21ae 100644
---- gmusicbrowser_list.pm
-+++ gmusicbrowser_list.pm
-@@ -8052,7 +8052,7 @@ sub Make
- unless ($notnow)
- { #warn "$key ---found in ($code,@deps)\n";
- if (ref $code)
-- { my ($func,my @keys)=@$code; #warn " -> ($func, @keys)\n";
-+ { my ($func, @keys)=@$code; #warn " -> ($func, @keys)\n";
- my $out=join ',',map "'$_'", @keys;
- my $in= join ',',map "'$_'", @deps; $in=~s#\?##g;
- $out= @keys>1 ? "\@var{$out}" : "\$var{$out}";
diff --git a/srcpkgs/gmusicbrowser/template b/srcpkgs/gmusicbrowser/template
index a84cce8f01a..050a2272ae7 100644
--- a/srcpkgs/gmusicbrowser/template
+++ b/srcpkgs/gmusicbrowser/template
@@ -1,17 +1,16 @@
# Template file for 'gmusicbrowser'
pkgname=gmusicbrowser
-version=1.1.15
-revision=7
-archs=noarch
+version=1.1.16
+revision=1
hostmakedepends="perl gettext"
depends="perl-Gtk2 perl-Glib-Object-Introspection gst-plugins-good1
- gst-plugins-bad1 gst-plugins-ugly1"
+ gst-plugins-bad1 gst-plugins-ugly1 perl-Net-DBus"
short_desc="Open-source jukebox for large collections"
maintainer="Logen K <logen@sudotask.com>"
license="GPL-3.0-only"
homepage="http://gmusicbrowser.org"
distfiles="http://gmusicbrowser.org/download/${pkgname}-${version}.tar.gz"
-checksum=1ec881d148ccc26bdbab66ca701fd2216e034c3b613d6e66c17ac702271c677b
+checksum=c7f10578ca3008e966e66c33a4887020e4b99b6aa5580c4b4771ee228ff603fe
do_install() {
make prefix=${DESTDIR}/usr install
From b4e639552b98f2346dfb63677031eabcb0f0dc30 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 14:47:41 -0600
Subject: [PATCH 282/357] gmsh: update to 4.7.1
---
srcpkgs/gmsh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template
index 2b11cd57cf3..0a499e40b13 100644
--- a/srcpkgs/gmsh/template
+++ b/srcpkgs/gmsh/template
@@ -1,6 +1,6 @@
# Template file for 'gmsh'
pkgname=gmsh
-version=4.7.0
+version=4.7.1
revision=1
wrksrc="${pkgname}-${version}-source"
build_style=cmake
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://gmsh.info"
changelog="http://gmsh.info/CHANGELOG.txt"
distfiles="https://gmsh.info/src/gmsh-${version}-source.tgz"
-checksum=e27f32f92b374ba2a746a9d9c496401c13f66ac6e3e70753e16fa4012d14320e
+checksum=c984c295116c757ed165d77149bd5fdd1068cbd7835e9bcd077358b503891c6a
build_options="fltk hxt zipper"
build_options_default="hxt"
From d34d0af8a8833a80e67f54349922d939225851f3 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 20:06:06 -0600
Subject: [PATCH 283/357] krfb: update to 20.08.3
---
srcpkgs/krfb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index fff3d2107de..39382d322d3 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
# Template file for 'krfb'
pkgname=krfb
-version=20.08.1
+version=20.08.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
homepage="https://kde.org/applications/en/system/org.kde.krfb"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a80b9bab47f2a7299e33b0e2a10b117605ec1cc572ca72e914c7f01dde383eda
+checksum=d32986a6952723c5a5ae3744ef090f2f0165082e3f152e0ee6a340d8d8bade8e
From 6f7595e1c1fa9ab884bc30fc859330c7f3849daa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 19 Nov 2020 23:41:20 +0200
Subject: [PATCH 284/357] k3b: update to 20.08.3.
---
srcpkgs/k3b/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 6fca88b4f29..3ec3c3bd56b 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
# Template file for 'k3b'
pkgname=k3b
-version=20.08.1
+version=20.08.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=66fad59f4e35c24dc8868c46ff45ffa66048501e0a6ac0c23a8b9e957033e50f
+checksum=9d81f1b859dca68a781903f35b3186a9864222c8bb2c85cd7e9481d79eb9e261
From 40954c67c9c7f7ae8a73f7771b3b32db2ca0a217 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 20 Nov 2020 00:06:45 +0200
Subject: [PATCH 285/357] gist: update to 6.0.0.
---
srcpkgs/gist/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gist/template b/srcpkgs/gist/template
index 39759f57e23..d5eaaffa360 100644
--- a/srcpkgs/gist/template
+++ b/srcpkgs/gist/template
@@ -1,8 +1,7 @@
# Template file for 'gist'
pkgname=gist
-version=5.1.0
+version=6.0.0
revision=1
-archs=noarch
hostmakedepends="ruby"
depends="ruby"
short_desc="Uploads content to gist.github.com"
@@ -10,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://defunkt.io/gist/"
distfiles="https://github.com/defunkt/gist/archive/v${version}.tar.gz"
-checksum=843cea035c137d23d786965688afc9ee70610ac6c3d6f6615cb958d6c792fbb2
+checksum=ddfb33c039f8825506830448a658aa22685fc0c25dbe6d0240490982c4721812
do_build() {
rake standalone
From 2edfff5e5062074e1ea93021905538c3c99c70f2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 19:17:27 +0200
Subject: [PATCH 286/357] geany: update to 1.37.1.
---
srcpkgs/geany/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index 9eef9728d52..4a3ac7f2ac9 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -1,6 +1,6 @@
# Template file for 'geany'
pkgname=geany
-version=1.37
+version=1.37.1
revision=1
build_style=gnu-configure
configure_args="--enable-vte --enable-gtk3"
@@ -12,8 +12,9 @@ short_desc="Fast and lightweight IDE"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://www.geany.org"
+changelog="https://raw.githubusercontent.com/geany/geany/master/NEWS"
distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
-checksum=dde52584823b769c56704c27dbedddb7a6bbaf4eacb9587d10bbc387816e3d51
+checksum=18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18
python_version=3
pre_configure() {
From d496caabeeed426bf04969eda7cc36e85133bc19 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 19:19:45 +0200
Subject: [PATCH 287/357] geany-plugins: update to 1.37.0.
---
.../geany-plugins/patches/libgit2-1.0.patch | 54 -------------------
srcpkgs/geany-plugins/template | 7 +--
2 files changed, 4 insertions(+), 57 deletions(-)
delete mode 100644 srcpkgs/geany-plugins/patches/libgit2-1.0.patch
diff --git a/srcpkgs/geany-plugins/patches/libgit2-1.0.patch b/srcpkgs/geany-plugins/patches/libgit2-1.0.patch
deleted file mode 100644
index 2cd070e1041..00000000000
--- a/srcpkgs/geany-plugins/patches/libgit2-1.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit c5840bc94d5870b2f8b38ea16853e0c2dd0ac981
-Author: q66 <daniel@octaforge.org>
-Date: Sun May 3 19:36:54 2020 +0200
-
- fix build on libgit2-1.0
-
-diff --git git-changebar/src/gcb-plugin.c git-changebar/src/gcb-plugin.c
-index b708319..8d3abaf 100644
---- git-changebar/src/gcb-plugin.c
-+++ git-changebar/src/gcb-plugin.c
-@@ -32,25 +32,6 @@
- #include <geany.h>
- #include <document.h>
-
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
--# define git_libgit2_init git_threads_init
--# define git_libgit2_shutdown git_threads_shutdown
--#endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23
--/* 0.23 added @p binary_cb */
--# define git_diff_buffers(old_buffer, old_len, old_as_path, \
-- new_buffer, new_len, new_as_path, options, \
-- file_cb, binary_cb, hunk_cb, line_cb, payload) \
-- git_diff_buffers (old_buffer, old_len, old_as_path, \
-- new_buffer, new_len, new_as_path, options, \
-- file_cb, hunk_cb, line_cb, payload)
--#endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28
--# define git_buf_dispose git_buf_free
--# define git_error_last giterr_last
--#endif
--
--
- GeanyPlugin *geany_plugin;
- GeanyData *geany_data;
-
-diff --git workbench/src/plugin_main.c workbench/src/plugin_main.c
-index 6fa6fc8..b620666 100644
---- workbench/src/plugin_main.c
-+++ workbench/src/plugin_main.c
-@@ -35,13 +35,6 @@
- #include "idle_queue.h"
- #include "tm_control.h"
-
--
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
--# define git_libgit2_init git_threads_init
--# define git_libgit2_shutdown git_threads_shutdown
--#endif
--
--
- GeanyPlugin *geany_plugin;
- GeanyData *geany_data;
-
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index 8af71c85368..8038f5f3704 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
-version=1.36.0
-revision=2
+version=1.37.0
+revision=1
build_style=gnu-configure
configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
@@ -14,8 +14,9 @@ short_desc="Geany IDE plugins"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://plugins.geany.org"
+changelog="https://raw.githubusercontent.com/geany/geany-plugins/master/NEWS"
distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz"
-checksum=39409e948502a7d6d88a290f201b7c6c678ce8ecaff7c73589ee0f6dcc059568
+checksum=14df1dda3760eedd3a28daba0788f3bee5b83ae31f042c57a78c20f37a77eb28
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
From 459510bed4240434848f4cf4dcb114e0b7e15add Mon Sep 17 00:00:00 2001
From: Dakota Walsh <kota@nilsu.org>
Date: Wed, 18 Nov 2020 18:04:52 -0500
Subject: [PATCH 288/357] amfora: update to 1.6.0.
---
srcpkgs/amfora/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 55a83e1798a..f44c714be21 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,6 +1,6 @@
# Template file for 'amfora'
pkgname=amfora
-version=1.5.0
+version=1.6.0
revision=1
build_style=go
go_import_path="github.com/makeworld-the-better-one/${pkgname}"
@@ -9,4 +9,4 @@ maintainer="Stacy Harper <contact@stacyharper.net>"
license="GPL-3.0-only"
homepage="https://github.com/makeworld-the-better-one/amfora"
distfiles="https://github.com/makeworld-the-better-one/${pkgname}/archive/v${version}.tar.gz"
-checksum=c8478b00155ad74712b957444b7afe025a74030907b77cca0903b6477f79843d
+checksum=a02b070679718953a4184ef2b7fbeccfcdf9bf227ca1efab34ee0d7fa21e9bd9
From 13e682d970d1dec269215b7ca9d334e4bbc1fe97 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 16:22:25 -0600
Subject: [PATCH 289/357] rabbitmq-c: update to 0.10.0
---
.../rabbitmq-c/patches/CVE-2019-18609.patch | 47 ----------
srcpkgs/rabbitmq-c/patches/test.patch | 89 +++++++++++++++++++
srcpkgs/rabbitmq-c/template | 13 +--
3 files changed, 96 insertions(+), 53 deletions(-)
delete mode 100644 srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch
create mode 100644 srcpkgs/rabbitmq-c/patches/test.patch
diff --git a/srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch b/srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch
deleted file mode 100644
index 7f26bfde463..00000000000
--- a/srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fc85be7123050b91b054e45b91c78d3241a5047a Mon Sep 17 00:00:00 2001
-From: Alan Antonuk <alan.antonuk@gmail.com>
-Date: Sun, 3 Nov 2019 23:50:07 -0800
-Subject: [PATCH] lib: check frame_size is >= INT32_MAX
-
-When parsing a frame header, validate that the frame_size is less than
-or equal to INT32_MAX. Given frame_max is limited between 0 and
-INT32_MAX in amqp_login and friends, this does not change the API.
-
-This prevents a potential buffer overflow when a malicious client sends
-a frame_size that is close to UINT32_MAX, in which causes an overflow
-when computing state->target_size resulting in a small value there. A
-buffer is then allocated with the small amount, then memcopy copies the
-frame_size writing to memory beyond the end of the buffer.
----
- librabbitmq/amqp_connection.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git librabbitmq/amqp_connection.c librabbitmq/amqp_connection.c
-index 034b2e96..b106f70a 100644
---- librabbitmq/amqp_connection.c
-+++ librabbitmq/amqp_connection.c
-@@ -287,12 +287,21 @@ int amqp_handle_input(amqp_connection_state_t state, amqp_bytes_t received_data,
- case CONNECTION_STATE_HEADER: {
- amqp_channel_t channel;
- amqp_pool_t *channel_pool;
-- /* frame length is 3 bytes in */
-+ uint32_t frame_size;
-+
- channel = amqp_d16(amqp_offset(raw_frame, 1));
-
-- state->target_size =
-- amqp_d32(amqp_offset(raw_frame, 3)) + HEADER_SIZE + FOOTER_SIZE;
-+ /* frame length is 3 bytes in */
-+ frame_size = amqp_d32(amqp_offset(raw_frame, 3));
-+ /* To prevent the target_size calculation below from overflowing, check
-+ * that the stated frame_size is smaller than a signed 32-bit. Given
-+ * the library only allows configuring frame_max as an int32_t, and
-+ * frame_size is uint32_t, the math below is safe from overflow. */
-+ if (frame_size >= INT32_MAX) {
-+ return AMQP_STATUS_BAD_AMQP_DATA;
-+ }
-
-+ state->target_size = frame_size + HEADER_SIZE + FOOTER_SIZE;
- if ((size_t)state->frame_max < state->target_size) {
- return AMQP_STATUS_BAD_AMQP_DATA;
- }
diff --git a/srcpkgs/rabbitmq-c/patches/test.patch b/srcpkgs/rabbitmq-c/patches/test.patch
new file mode 100644
index 00000000000..5f87d166798
--- /dev/null
+++ b/srcpkgs/rabbitmq-c/patches/test.patch
@@ -0,0 +1,89 @@
+From 26ecf6d3012be81f5dfb8a2d822c722e916a86cb Mon Sep 17 00:00:00 2001
+From: Simon Lepasteur <simon.lepasteur@swissdotnet.ch>
+Date: Wed, 11 Mar 2020 15:13:29 +0100
+Subject: [PATCH] Add option to run system tests (disabled by default).
+
+System tests require a RabbitMQ or other AMQP server to be running on
+`localhost` at TCP port number 5672 and therefore fails if no such
+server is running on the build machine.
+
+This is surprising for everyone running the standard `make test`
+to ensure the library is built correctly.
+---
+ .travis.yml | 2 +-
+ CMakeLists.txt | 1 +
+ README.md | 2 ++
+ appveyor.yml | 2 +-
+ tests/CMakeLists.txt | 8 +++++---
+ 5 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git .travis.yml .travis.yml
+index 52a66b9c..5f56cb03 100644
+--- .travis.yml
++++ .travis.yml
+@@ -19,7 +19,7 @@ addons:
+ name: "alanxz/rabbitmq-c"
+ description: "C AMQP client for RabbitMQ"
+ notification_email: alan.antonuk@gmail.com
+- build_command_prepend: mkdir build && pushd build && cmake .. && popd
++ build_command_prepend: mkdir build && pushd build && cmake .. -DRUN_SYSTEM_TESTS=ON && popd
+ build_command: cmake --build ./build
+ branch_pattern: coverity_scan
+
+diff --git CMakeLists.txt CMakeLists.txt
+index f620ddc8..a39645f4 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -266,6 +266,7 @@ option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND})
+ option(BUILD_TOOLS_DOCS "Build man pages for Tools (requires xmlto)" ${DO_DOCS})
+ option(BUILD_TESTS "Build tests (run tests with make test)" ON)
+ option(BUILD_API_DOCS "Build Doxygen API docs" ${DOXYGEN_FOUND})
++option(RUN_SYSTEM_TESTS "Run system tests (i.e. tests requiring an accessible RabbitMQ server instance on localhost)" OFF)
+
+ if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
+ message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
+diff --git README.md README.md
+index b7776c65..31347b15 100644
+--- README.md
++++ README.md
+@@ -84,6 +84,8 @@ Other interesting flags that can be passed to CMake:
+ default this is ON if the OpenSSL headers and library can be found.
+ * `BUILD_API_DOCS=ON/OFF` - toggles building the Doxygen API documentation, by
+ default this is OFF
++* `RUN_SYSTEM_TESTS=ON/OFF` toggles building the system tests (i.e. tests requiring
++ an accessible RabbitMQ server instance on localhost), by default this is OFF
+
+ ## Running the examples
+
+diff --git appveyor.yml appveyor.yml
+index 7e41c099..af315227 100644
+--- appveyor.yml
++++ appveyor.yml
+@@ -30,7 +30,7 @@ install:
+ - "Win%BITS%OpenSSL-%OPENSSL_VER%.exe /SP- /SILENT /SUPPRESSMSGBOXES /NORESTART"
+
+ before_build:
+- - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=ON -DENABLE_SSL_SUPPORT=True -G"%GENERATOR%" .
++ - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=ON -DRUN_SYSTEM_TESTS=ON -DENABLE_SSL_SUPPORT=True -G"%GENERATOR%" .
+
+ build:
+ project: ALL_BUILD.vcxproj
+diff --git tests/CMakeLists.txt tests/CMakeLists.txt
+index cf042b04..320a73d7 100644
+--- tests/CMakeLists.txt
++++ tests/CMakeLists.txt
+@@ -33,9 +33,11 @@ add_executable(test_basic
+ test_basic.c)
+ target_link_libraries(test_basic rabbitmq-static)
+
+-if (NOT APPLE)
+- add_test(basic test_basic)
+-endif()
++if (RUN_SYSTEM_TESTS)
++ if (NOT APPLE)
++ add_test(basic test_basic)
++ endif()
++endif(RUN_SYSTEM_TESTS)
+
+ add_executable(test_sasl_mechanism test_sasl_mechanism.c)
+ target_link_libraries(test_sasl_mechanism rabbitmq-static)
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 4d6533bf209..606905e2161 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,8 +1,9 @@
# Template file for 'rabbitmq-c'
pkgname=rabbitmq-c
-version=0.9.0
-revision=3
+version=0.10.0
+revision=1
build_style=cmake
+make_check_target=test
hostmakedepends="popt xmlto doxygen"
makedepends="libressl-devel"
short_desc="RabbitMQ C client"
@@ -10,10 +11,10 @@ maintainer="Hans-J. Schmid <knock@myopendoor.de>"
license="MIT"
homepage="https://github.com/alanxz/rabbitmq-c"
distfiles="https://github.com/alanxz/${pkgname}/archive/v${version}.tar.gz"
-checksum=316c0d156452b488124806911a62e0c2aa8a546d38fc8324719cd29aaa493024
+checksum=6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0
post_install() {
- vlicense LICENSE-MIT
+ vlicense LICENSE-MIT LICENSE
}
rabbitmq-c-devel_package() {
@@ -22,7 +23,7 @@ rabbitmq-c-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
}
}
From e99067c34e75d70cf354cf1689a987d1df315938 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Thu, 19 Nov 2020 13:23:12 +0900
Subject: [PATCH 290/357] coq: remove an unnecessary make argument
Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
srcpkgs/coq/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index 01a7829b50f..469975f5119 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -22,7 +22,7 @@ do_configure() {
}
do_build() {
- make PR_O=
+ make
}
do_install() {
From 0ea8bc3e4033e1846b1f74f13f861c8dce92f754 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Thu, 19 Nov 2020 13:23:31 +0900
Subject: [PATCH 291/357] ocaml-num: fix xlint errors and license type
Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
srcpkgs/ocaml-num/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index 1a9282ac2e5..736c1361b3d 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -2,22 +2,23 @@
pkgname=ocaml-num
version=1.4
revision=1
+wrksrc="num-${version}"
build_style=gnu-makefile
-makedepends="ocaml ocaml-findlib"
make_install_target="findlib-install"
+makedepends="ocaml ocaml-findlib"
short_desc="OCaml legacy Num library for arbitrary-precision integers"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="LGPL-2.1"
+license="custom: LGPL-2.1-only with OCaml-LGPL-linking-exception"
homepage="https://github.com/ocaml/num"
distfiles="https://github.com/ocaml/num/archive/v${version}.tar.gz"
checksum=015088b68e717b04c07997920e33c53219711dfaf36d1196d02313f48ea00f24
-wrksrc="num-${version}"
nocross=yes
pre_install() {
export OCAMLFIND_DESTDIR=${DESTDIR}/usr/lib/ocaml
vmkdir /usr/lib/ocaml/stublibs
}
+
post_install() {
vlicense LICENSE
}
From 6cc31d64cc8e8a4fa095e76880dd73bfa362c63d Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Sat, 14 Nov 2020 19:02:38 -0600
Subject: [PATCH 292/357] teamspeak3: update to 3.5.5.
---
srcpkgs/teamspeak3/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/teamspeak3/template b/srcpkgs/teamspeak3/template
index a86d62c1ef1..f24ae7ccfec 100644
--- a/srcpkgs/teamspeak3/template
+++ b/srcpkgs/teamspeak3/template
@@ -1,6 +1,6 @@
# Template file for 'teamspeak3'
pkgname=teamspeak3
-version=3.5.3
+version=3.5.5
revision=1
archs="i686 x86_64"
wrksrc=teamspeak3
@@ -21,11 +21,11 @@ noverifyrdeps=yes
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
_pkg="TeamSpeak3-Client-linux_amd64-${version}"
distfiles="https://files.teamspeak-services.com/releases/client/${version}/${_pkg}.run"
- checksum=ca9cdb5409042c86f2981dd32e046b7f8de4aab6a8333edc7e1fb83eb3d8e93a
+ checksum=53626d9b1f3614f165b0a0469e211e13e5d7f885bb4564a8387ea4184bb1c98d
elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
_pkg="TeamSpeak3-Client-linux_x86-${version}"
distfiles="https://files.teamspeak-services.com/releases/client/${version}/${_pkg}.run"
- checksum=86a6513d36b9d454171278b03229a290f3548343a604f2fdf31db17c6584275a
+ checksum=875b936da806477af88d837db6960ac353a9c3596280a2f1399569f2b1122c3b
else
broken="No known upstream client for this architecture"
fi
From 7036fa577ec52ab66ca6db7c460aa7a19bd91893 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 13:50:22 +0200
Subject: [PATCH 293/357] ktuberling: update to 20.08.3.
---
srcpkgs/ktuberling/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 2b63ca9f9d0..12421ca27c5 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
# Template file for 'ktuberling'
pkgname=ktuberling
-version=20.08.1
+version=20.08.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=62d3d8db7b1db7f9d58df44acf61342ce42fb081038fc48f8f6e45d9167ceaa6
+checksum=bfe6092dc7238a55fb733f2c212cad31738dfb4e1661778e2a06176e6cb5de60
From bdace02a9eb295128f7fd5ab04a321df06206c1f Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Thu, 5 Nov 2020 10:28:54 +0000
Subject: [PATCH 294/357] surf: add "xprop" runtime dependency
Without `xprop` visiting sites via Ctrl-g fails.
---
srcpkgs/surf/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/surf/template b/srcpkgs/surf/template
index 9470efecbbf..b4937c4894f 100644
--- a/srcpkgs/surf/template
+++ b/srcpkgs/surf/template
@@ -1,10 +1,11 @@
# Template file for 'surf'
pkgname=surf
version=2.0
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="webkit2gtk-devel"
+depends="xprop"
short_desc="Simple web browser based on WebKit/GTK+"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From b060cc6530da6d16fe431bc1279d2fc24c73bf9b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 21 Nov 2020 18:38:32 +0400
Subject: [PATCH 295/357] libksba: update to 1.5.0.
---
srcpkgs/libksba/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index 4848f837d62..61037bbd4aa 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -1,6 +1,6 @@
# Template file for 'libksba'
pkgname=libksba
-version=1.4.0
+version=1.5.0
revision=1
build_style=gnu-configure
makedepends="libgpg-error-devel"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-or-later,LGPL-3.0-or-later"
homepage="https://www.gnupg.org/related_software/libksba/index.html"
distfiles="https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=bfe6a8e91ff0f54d8a329514db406667000cb207238eded49b599761bfca41b6
+checksum=ae4af129216b2d7fdea0b5bf2a788cd458a79c983bb09a43f4d525cc87aba0ba
libksba-devel_package() {
depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"
@@ -17,6 +17,7 @@ libksba-devel_package() {
pkg_install() {
vmove usr/bin/ksba-config
vmove usr/include
+ vmove usr/lib/pkgconfig
vmove usr/share/aclocal
vmove "usr/lib/*.so"
}
From ace6e3459e0b7f26d4212ade821d0991067f411e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 20 Nov 2020 22:26:48 +0100
Subject: [PATCH 296/357] mit-krb5: update to 1.18.3.
---
srcpkgs/mit-krb5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 89168f65093..004e0e02dbe 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,7 +2,7 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.2
+version=1.18.3
revision=1
wrksrc="krb5-${version}"
build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=c6e4c9ec1a98141c3f5d66ddf1a135549050c9fab4e9a4620ee9b22085873ae0
+checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From 9740ffae52d5285844fa32d810020ae83830fbd7 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 20 Nov 2020 22:26:13 +0100
Subject: [PATCH 297/357] nnn: update to 3.5.
---
srcpkgs/nnn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index a340ccd3d75..ba12cad5ee5 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,6 +1,6 @@
# Template file for 'nnn'
pkgname=nnn
-version=3.4
+version=3.5
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
homepage="https://github.com/jarun/nnn"
changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=7803ae6e974aeb4008507d9d1afbcca8d084a435f36ff636b459ca50414930a1
+checksum=e636d4035499a112a0ad33f1557838132ed2e39d8857c5b219714fe9f64681f3
post_install() {
vinstall misc/auto-completion/bash/nnn-completion.bash 644 \
From 65de01f49d64bf58569ebfb5429cb3ac13451777 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 20 Nov 2020 16:44:53 +0100
Subject: [PATCH 298/357] chroma: update to 0.8.2.
---
srcpkgs/chroma/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index 88642c709bf..8215a0ac027 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,6 +1,6 @@
# Template file for 'chroma'
pkgname=chroma
-version=0.8.1
+version=0.8.2
revision=1
build_style=go
go_import_path="github.com/alecthomas/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://github.com/alecthomas/chroma"
distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
-checksum=8d2981e4d0f223f1ab6e5308940308ca9d8bf6d06660a19a2345cfe133f9e17e
+checksum=b7b9bd2ff49a18127dd00cee0d8e1d262b861b0641f711cbf9c615431f2b9499
do_check() {
go test -v
From 644454ed2907e941a8952c0043043d7e28f42e2f Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Fri, 20 Nov 2020 20:05:53 +0600
Subject: [PATCH 299/357] Komikku: update to 0.23.0.
---
srcpkgs/Komikku/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index c2be0f5173f..a0f5e00ec7d 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=0.22.1
+version=0.23.0
revision=1
wrksrc=Komikku-v${version}
build_style=meson
@@ -15,4 +15,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=c09726b0bf7f51412e98b193389d8de9554ec807916c99c170cda3b9e362fc6c
+checksum=a37d91a23ae6ddbff0784557d74b0c502b31c3504b673f248456786502c7ab4f
From e3314910a54f771e669fc87a77c4792f20b68d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 20 Nov 2020 16:23:29 +0100
Subject: [PATCH 300/357] bombadillo: update to 2.3.3.
---
srcpkgs/bombadillo/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 721fae09f54..0214af5131d 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,6 +1,6 @@
# Template file for 'bombadillo'
pkgname=bombadillo
-version=2.3.1
+version=2.3.3
revision=1
wrksrc=${pkgname}
build_style=go
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://bombadillo.colorfield.space/"
distfiles="https://tildegit.org/sloum/${pkgname}/archive/${version}.tar.gz"
-checksum=e8076493e924bd5860d3e17884b0675ea514eea75e7b4e96da1c79ab9805731f
+checksum=2d4ec15cac6d3324f13a4039cca86fecf3141503f556a6fa48bdbafb86325f1c
post_install() {
vman bombadillo.1
From 6ad6fff3ef179de165dbc4cdf12b3d154fa49f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 20 Nov 2020 16:27:25 +0100
Subject: [PATCH 301/357] nudoku: update to 2.1.0.
---
srcpkgs/nudoku/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nudoku/template b/srcpkgs/nudoku/template
index ab21861d5a6..7c4eea77c29 100644
--- a/srcpkgs/nudoku/template
+++ b/srcpkgs/nudoku/template
@@ -1,6 +1,6 @@
# Template file for 'nudoku'
pkgname=nudoku
-version=2.0.0
+version=2.1.0
revision=1
build_style=gnu-configure
hostmakedepends="automake pkg-config tar xz gettext gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/jubalh/nudoku"
distfiles="https://github.com/jubalh/${pkgname}/archive/${version}.tar.gz"
-checksum=44d3ec1ff34a010910ac7a92f6d84e8a7a4678a966999b7be27d224609ae54e1
+checksum=eeff7f3adea5bfe7b88bf7683d68e9a597aabd1442d1621f21760c746400b924
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" --disable-nls"
From a0dc07fa22c3b58b25d232d4fe2434a9659bcacd Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 20 Nov 2020 22:23:59 +0100
Subject: [PATCH 302/357] verilator: update to 4.104.
---
srcpkgs/verilator/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/verilator/template b/srcpkgs/verilator/template
index 74b448a5519..dc61d2c8326 100644
--- a/srcpkgs/verilator/template
+++ b/srcpkgs/verilator/template
@@ -1,6 +1,6 @@
# Template file for 'verilator'
pkgname=verilator
-version=4.102
+version=4.104
revision=1
build_style=gnu-configure
hostmakedepends="autoconf flex"
@@ -10,7 +10,7 @@ maintainer="Sasha Krassovsky <krassovskysasha@gmail.com>"
license="LGPL-3.0-only"
homepage="https://veripool.org/wiki/verilator"
distfiles="https://github.com/verilator/verilator/archive/v${version}.tar.gz"
-checksum="4e4f4aff00af9a15a61c94b67ed070cd6312ddcc0f0d340a6df2199480064cef"
+checksum=6d42fa468234461e4a0c3154d5602cdded7b22d57f14be92c27a65d418a4a010
pre_configure() {
autoconf
From 326cf6c479f563181470e3f25cf48c927ef51b04 Mon Sep 17 00:00:00 2001
From: Ronald Leppink <ronaldleppink@gmail.com>
Date: Sat, 21 Nov 2020 12:05:41 +0100
Subject: [PATCH 303/357] telegram-desktop: update to 2.4.7.
Also update license
---
.../telegram-desktop/patches/0001-musl.patch | 50 ++++++++++---------
srcpkgs/telegram-desktop/template | 6 +--
2 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/srcpkgs/telegram-desktop/patches/0001-musl.patch b/srcpkgs/telegram-desktop/patches/0001-musl.patch
index 5746a911ab9..35b7c90b955 100644
--- a/srcpkgs/telegram-desktop/patches/0001-musl.patch
+++ b/srcpkgs/telegram-desktop/patches/0001-musl.patch
@@ -1,48 +1,50 @@
---- Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-06-03 09:28:30.000000000 +0200
-+++ - 2020-06-08 00:40:30.503197310 +0200
-@@ -13,7 +13,6 @@
- #include <QtCore/QVersionNumber>
+--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-11-21 11:09:51.647955733 +0100
++++ - 2020-11-21 11:09:50.935306092 +0100
+@@ -12,11 +12,6 @@
#include <QtCore/QDate>
#include <QtGui/QGuiApplication>
--#include <gnu/libc-version.h>
+-// this file is used on both Linux & BSD
+-#ifdef Q_OS_LINUX
+-#include <gnu/libc-version.h>
+-#endif // Q_OS_LINUX
+-
namespace Platform {
namespace {
-@@ -84,8 +74,7 @@
- return "Linux "
- + (list.isEmpty() ? QString() : list[0] + ' ')
- + (IsWayland() ? "Wayland " : "X11 ")
-- + "glibc "
-- + GetGlibCVersion();
-+ + "void ";
- }
- QString SystemCountry() {
-@@ -103,11 +92,7 @@
- QDate WhenSystemBecomesOutdated() {
+@@ -95,11 +90,7 @@
+
if (IsLinux32Bit()) {
return QDate(2020, 9, 1);
-- } else if (const auto version = GetGlibCVersion(); !version.isEmpty()) {
-- if (QVersionNumber::fromString(version) < QVersionNumber(2, 23)) {
+- } else if (libcName == qstr("glibc") && !libcVersion.isEmpty()) {
+- if (QVersionNumber::fromString(libcVersion) < QVersionNumber(2, 23)) {
- return QDate(2020, 9, 1); // Older than Ubuntu 16.04.
- }
- }
+ }
+
return QDate();
}
+@@ -123,22 +114,10 @@
+ }
-@@ -129,14 +114,6 @@
- }
+ QString GetLibcName() {
+-#ifdef Q_OS_LINUX
+- return "glibc";
+-#endif // Q_OS_LINUX
+-
+ return QString();
}
--QString GetGlibCVersion() {
+ QString GetLibcVersion() {
+-#ifdef Q_OS_LINUX
- static const auto result = [&] {
- const auto version = QString::fromLatin1(gnu_get_libc_version());
- return QVersionNumber::fromString(version).isNull() ? QString() : version;
- }();
- return result;
--}
+-#endif // Q_OS_LINUX
-
- bool IsWayland() {
- return QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive);
+ return QString();
}
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index cd685fdb7e3..dbadaded1fb 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
-version=2.4.3
+version=2.4.7
revision=1
wrksrc="tdesktop-${version}-full"
build_style=cmake
@@ -21,11 +21,11 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
depends="qt5-imageformats qt5-core>=5.15.1<5.15.2"
short_desc="Telegram Desktop messaging app"
maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later WITH OpenSSL"
+license="GPL-3.0-or-later, OpenSSL"
homepage="https://desktop.telegram.org/"
changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=56de48ea5332b3e113423e286f42a7b06e3059cadfed862c3164384ebebd4895
+checksum=7b13df53be5d6b58d07d730c9429e415be2fea7f7be37bcaa80a505152125bc8
build_options="spellcheck"
build_options_default="spellcheck"
From b18ad4edaf4dd3c0218182c5d437903a3b12c846 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 6 Nov 2020 11:40:22 +0100
Subject: [PATCH 304/357] vscode: update to 1.51.1. [ci skip]
---
srcpkgs/vscode/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 96a0c349229..8c72a514d5b 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,9 +1,9 @@
# Template file for 'vscode'
pkgname=vscode
-version=1.50.1
+version=1.51.1
revision=1
_electronver=9.3.1
-hostmakedepends="pkg-config python nodejs-lts-10 yarn tar git"
+hostmakedepends="pkg-config python nodejs yarn tar git"
makedepends="libxkbfile-devel libsecret-devel electron9"
depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron9"
short_desc="Microsoft Code for Linux"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="MIT"
homepage="https://code.visualstudio.com/"
distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7d874637055e2425fe981f387165b7c7949db0821b1135f9cd7ccd5c70903af7
+checksum=3a7127983fac7c8e44b5b26b026341b8fd91c65ff34a4664e65ae43ae358d31b
patch_args="-Np1"
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
From eca216447237a9448e5cef47263a05f5daf88752 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Nov 2020 11:34:58 +0100
Subject: [PATCH 305/357] libimagequant: update to 2.13.1.
---
srcpkgs/libimagequant/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libimagequant/template b/srcpkgs/libimagequant/template
index 871191c6ecd..e6fe4f23ca9 100644
--- a/srcpkgs/libimagequant/template
+++ b/srcpkgs/libimagequant/template
@@ -1,6 +1,6 @@
# Template file for 'libimagequant'
pkgname=libimagequant
-version=2.13.0
+version=2.13.1
revision=1
build_style=configure
configure_args="--with-openmp"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://pngquant.org/lib/"
distfiles="https://github.com/ImageOptim/libimagequant/archive/${version}.tar.gz"
-checksum=1dcd874f97758472d5282ea1241f50959a6e643b8b5ad07dad100b7a85633efd
+checksum=1f46deec3fa280335cf7f0be3ede6006bb420ba8159a03d1f6938e8d283d03ae
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --enable-sse";;
From 4c62296db05b2e86658723e67347ff7957eaeb5f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Nov 2020 11:35:12 +0100
Subject: [PATCH 306/357] pngquant: update to 2.13.1.
---
srcpkgs/pngquant/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template
index 669eab71859..382eeecf7a9 100644
--- a/srcpkgs/pngquant/template
+++ b/srcpkgs/pngquant/template
@@ -1,6 +1,6 @@
# Template file for 'pngquant'
pkgname=pngquant
-version=2.13.0
+version=2.13.1
revision=1
build_style=gnu-configure
configure_args="--with-openmp"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://pngquant.org/"
distfiles="https://github.com/pornel/${pkgname}/archive/${version}.tar.gz"
-checksum=aebf96914dcce978f23da5ce3542f4ef30e635e24e386f2e5673a3d7215c646a
+checksum=2d462ca5739ac0afe5a6851914a48ff9d06d4fbd3c4883e8308de5dcc6d444bc
make_check_target=test
case "$XBPS_TARGET_MACHINE" in
From 69d367870d3a2f928d6659b291f3037c90487aba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Nov 2020 11:36:25 +0100
Subject: [PATCH 307/357] parallel: update to 20201122.
---
srcpkgs/parallel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index e9b4ae98749..0b4348ed34f 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
# Template file for 'parallel'
pkgname=parallel
-version=20201022
+version=20201122
revision=1
build_style=gnu-configure
depends="perl"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/parallel/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=35fe29864af62b5331affb84d8be683d52a7bf5fd3532fe0b6a4207a481af061
+checksum=4da0bf42c466493b44dcbd8750e7bf99c31da4c701e8be272276c16ec4caff30
pre_configure() {
# no html and pdf doc
From f207e1a1b928eaef7fe4f59f123f510403521fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 23 Nov 2020 11:38:58 +0100
Subject: [PATCH 308/357] ccache: update to 4.1
---
...uild-and-install-man-page-by-default.patch | 32 -------------------
srcpkgs/ccache/template | 13 ++------
2 files changed, 3 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch
diff --git a/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch b/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch
deleted file mode 100644
index 1a1456c86d9..00000000000
--- a/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-upstream: yes
-
-From 294ff2face26448afa68e3ef7b68bf4898d6dc77 Mon Sep 17 00:00:00 2001
-From: Erik Flodin <erik@ejohansson.se>
-Date: Fri, 30 Oct 2020 10:23:08 +0100
-Subject: [PATCH] Build and install man page by default (#705)
-
-Fixes #684.
----
- doc/CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index fb0f316..b5c9f24 100644
---- doc/CMakeLists.txt
-+++ doc/CMakeLists.txt
-@@ -58,7 +58,11 @@ else()
- COMMAND ${A2X_EXE} --doctype manpage --format manpage MANUAL.xml
- MAIN_DEPENDENCY MANUAL.xml
- )
-- add_custom_target(doc-man-page DEPENDS ccache.1)
-+ add_custom_target(doc-man-page ALL DEPENDS ccache.1)
-+ install(
-+ FILES "${CMAKE_CURRENT_BINARY_DIR}/ccache.1"
-+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-+ )
- set(doc_files "${doc_files}" ccache.1)
- endif()
-
---
-2.29.2
-
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 7cf3ca186b7..d745cb36cc8 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,7 +1,7 @@
# Template file for 'ccache'
pkgname=ccache
-version=4.0
-revision=2
+version=4.1
+revision=1
bootstrap=yes
build_style=cmake
configure_args="-DENABLE_TESTING=OFF"
@@ -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=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+checksum=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99
if [ -z "$CHROOT_READY" ]; then
hostmakedepends="cmake-bootstrap"
@@ -26,15 +26,8 @@ fi
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
- configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
fi
-post_build() {
- if [ "$CHROOT_READY" ]; then
- mv build/doc/Ccache.1 build/doc/ccache.1
- fi
-}
-
post_install() {
vmkdir usr/lib/ccache/bin
# clang
From e560a9b4f92dd368d2275ec5edefc9bee94da0ec 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, 23 Nov 2020 17:54:17 +0700
Subject: [PATCH 309/357] numix-themes: build with sassc
- fix ftbfs on i686
- remove noarch
---
srcpkgs/numix-themes/patches/sassc.patch | 57 ++++++++++++++++++++++++
srcpkgs/numix-themes/template | 21 +++------
2 files changed, 64 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/numix-themes/patches/sassc.patch
diff --git a/srcpkgs/numix-themes/patches/sassc.patch b/srcpkgs/numix-themes/patches/sassc.patch
new file mode 100644
index 00000000000..9546e272de4
--- /dev/null
+++ b/srcpkgs/numix-themes/patches/sassc.patch
@@ -0,0 +1,57 @@
+From b950d9f66cf6f901729025c5e63aa02b4d209d41 Mon Sep 17 00:00:00 2001
+From: KTB <ktb83@users.noreply.github.com>
+Date: Fri, 15 Nov 2019 08:13:13 -0500
+Subject: [PATCH] Updates Makefile to replace Ruby Sass with SassC
+
+This commit replaces the use of the Ruby Sass scss command with SassC's sassc command. Due to the more limited functionality of sassc, output directories must be created prior to running the command and only one file may be processed at a time unlike the many-to-many mode functionality of the scss command.
+---
+ Makefile | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d2735a91..c580a2a7 100755
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-SASS=scss
+-SASSFLAGS=--sourcemap=none
++SASS=sassc
++SASSFLAGS=-M -t expanded
+ GLIB_COMPILE_RESOURCES=glib-compile-resources
+ RES_DIR=src/gtk-3.0
+ SCSS_DIR=$(RES_DIR)/scss
+@@ -14,8 +14,12 @@ UTILS=scripts/utils.sh
+ all: clean gresource
+
+ css:
+- $(SASS) --update $(SASSFLAGS) $(SCSS_DIR):$(DIST_DIR)
+- $(SASS) --update $(SASSFLAGS) $(SCSS_DIR320):$(DIST_DIR320)
++ mkdir $(DIST_DIR)
++ $(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk.scss $(DIST_DIR)/gtk.css
++ $(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk-dark.scss $(DIST_DIR)/gtk-dark.css
++ mkdir $(DIST_DIR320)
++ $(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk.scss $(DIST_DIR320)/gtk.css
++ $(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk-dark.scss $(DIST_DIR320)/gtk-dark.css
+
+ gresource: css
+ $(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR) $(RES_DIR)/gtk.gresource.xml
+From 6ba019fae4b8c90ed721dfe2dad279752f454968 Mon Sep 17 00:00:00 2001
+From: KTB <ktb83@users.noreply.github.com>
+Date: Fri, 15 Nov 2019 08:19:32 -0500
+Subject: [PATCH] Makes import directive relative in _gnome-terminal.scss
+
+This commit changes the "widgets/button" import directive to be relative in the gtk-3.20 _gnome-terminal.scss file which is necessary when using SassC.
+---
+ src/gtk-3.20/scss/apps/_gnome-terminal.scss | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gtk-3.20/scss/apps/_gnome-terminal.scss b/src/gtk-3.20/scss/apps/_gnome-terminal.scss
+index fd3af1c5..704faf5d 100644
+--- a/src/gtk-3.20/scss/apps/_gnome-terminal.scss
++++ b/src/gtk-3.20/scss/apps/_gnome-terminal.scss
+@@ -1,4 +1,4 @@
+-@import "widgets/button";
++@import "../widgets/button";
+
+ /**********************
+ ! Genome Terminal *
diff --git a/srcpkgs/numix-themes/template b/srcpkgs/numix-themes/template
index f993b7949a4..0e5b7b436c7 100644
--- a/srcpkgs/numix-themes/template
+++ b/srcpkgs/numix-themes/template
@@ -1,22 +1,15 @@
+# Template file for 'numix-themes'
pkgname=numix-themes
version=2.6.7
-revision=1
+revision=2
wrksrc="numix-gtk-theme-${version}"
-archs=noarch
build_style=gnu-makefile
-short_desc="A modern flat theme with a combination of light and dark elements"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-3"
+hostmakedepends="glib-devel gdk-pixbuf sassc"
depends="gtk+3 gtk-engine-murrine"
-hostmakedepends="glib-devel gdk-pixbuf-devel ruby-devel"
+short_desc="Modern flat theme with a combination of light and dark elements"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-3.0-or-later"
homepage="https://github.com/numixproject/numix-gtk-theme"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=2b997ad3eee0b802d0dd49dd772127fd3c337cca32d8863efd4897928e38879a
-
-pre_build() {
- gem install sass
-}
-
-post_install() {
- vlicense LICENSE
-}
+patch_args=-Np1
From 494d6b6e22e30e6249e1b9d698edc53d5dbb67f9 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, 22 Nov 2020 09:25:09 +0700
Subject: [PATCH 310/357] kadu: remove noarch
---
srcpkgs/kadu-data | 1 -
srcpkgs/kadu/template | 21 +++------------------
2 files changed, 3 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/kadu-data
diff --git a/srcpkgs/kadu-data b/srcpkgs/kadu-data
deleted file mode 120000
index c6b22664110..00000000000
--- a/srcpkgs/kadu-data
+++ /dev/null
@@ -1 +0,0 @@
-kadu
\ No newline at end of file
diff --git a/srcpkgs/kadu/template b/srcpkgs/kadu/template
index da8c8c086ff..8587198ae71 100644
--- a/srcpkgs/kadu/template
+++ b/srcpkgs/kadu/template
@@ -1,7 +1,7 @@
# Template file for 'kadu'
pkgname=kadu
version=4.3
-revision=5
+revision=6
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
-DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -19,7 +19,7 @@ makedepends="libao-devel libsndfile-devel libarchive-devel
qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
libmpdclient-devel qca-qt5-devel qxmpp-devel phonon-qt5-devel
libX11-devel libXfixes-devel libXScrnSaver-devel"
-depends="${pkgname}-data-${version}_${revision} hicolor-icon-theme qca-qt5-ossl
+depends="hicolor-icon-theme qca-qt5-ossl
$(vopt_if mysql qt5-plugin-mysql) $(vopt_if odbc qt5-plugin-odbc)
$(vopt_if pgsql qt5-plugin-pgsql) $(vopt_if sqlite qt5-plugin-sqlite)
$(vopt_if tds qt5-plugin-tds)"
@@ -29,6 +29,7 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://sourceforge.net/projects/kadu/"
distfiles="${SOURCEFORGE_SITE}/kadu/${version}/kadu-${version}.tar.bz2"
checksum=ad5d1cbb908c3cd07f2955d343d44b993cd5639427a48a2912441955cfd2bd6e
+replaces="kadu-data>=0"
build_options="mysql odbc pgsql sqlite tds"
build_options_default="sqlite"
@@ -53,22 +54,6 @@ pre_configure() {
-e "s;word_fix$;;"
}
-kadu-data_package() {
- short_desc+=" - data files"
- archs=noarch
- pkg_install() {
- vmove usr/share/icons
- vmove "usr/share/kadu/configuration/*.ui"
- vmove usr/share/kadu/themes
- vmove usr/share/kadu/scripts
- vmove usr/share/kadu/syntax
- vmove "usr/share/kadu/plugins/*.desc"
- vmove "usr/share/kadu/plugins/configuration/*.ui"
- vmove usr/share/kadu/translations
- vmove usr/share/kadu/plugins/data
- vmove usr/share/kadu/plugins/translations
- }
-}
kadu-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
From 00e00cd61008b85b61b12166a75d7b36fa3b3519 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, 22 Nov 2020 09:25:09 +0700
Subject: [PATCH 311/357] kobodeluxe: remove noarch
---
srcpkgs/kobodeluxe-data | 1 -
srcpkgs/kobodeluxe/template | 14 +++-----------
2 files changed, 3 insertions(+), 12 deletions(-)
delete mode 120000 srcpkgs/kobodeluxe-data
diff --git a/srcpkgs/kobodeluxe-data b/srcpkgs/kobodeluxe-data
deleted file mode 120000
index a6b8725b11b..00000000000
--- a/srcpkgs/kobodeluxe-data
+++ /dev/null
@@ -1 +0,0 @@
-kobodeluxe
\ No newline at end of file
diff --git a/srcpkgs/kobodeluxe/template b/srcpkgs/kobodeluxe/template
index 60539b09390..3de0311b8e5 100644
--- a/srcpkgs/kobodeluxe/template
+++ b/srcpkgs/kobodeluxe/template
@@ -1,19 +1,19 @@
# Template file for 'kobodeluxe'
pkgname=kobodeluxe
version=0.5.1
-revision=2
+revision=3
wrksrc="KoboDeluxe-${version}"
build_style=gnu-configure
configure_args="--sharedstatedir=/var/games"
hostmakedepends="pkg-config"
makedepends="SDL_image-devel"
-depends="${pkgname}-data"
short_desc="Space shooter in 2D"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://olofson.net/kobodl"
distfiles="${homepage}/download/KoboDeluxe-${version}.tar.bz2"
checksum=0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c
+replaces="kobodeluxe-data>=0"
post_extract() {
bsdtar xf icons.tar.gz
@@ -26,11 +26,3 @@ post_install() {
done
vinstall icons/KDE/icons/32x32/kobodl.png 644 usr/share/pixmaps
}
-
-kobodeluxe-data_package() {
- short_desc+=" - data files"
- archs=noarch
- pkg_install() {
- vmove usr/share/kobo-deluxe
- }
-}
From 64d98a87aea6ec6d3130b470f3a64a7bbaf9f33d 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, 22 Nov 2020 09:25:10 +0700
Subject: [PATCH 312/357] kpcli: remove noarch
---
srcpkgs/kpcli/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/kpcli/template b/srcpkgs/kpcli/template
index 3201920ce88..193c227462e 100644
--- a/srcpkgs/kpcli/template
+++ b/srcpkgs/kpcli/template
@@ -1,8 +1,7 @@
# Template file for 'kpcli'
pkgname=kpcli
version=3.3
-revision=1
-archs=noarch
+revision=2
build_style=fetch
depends="perl perl-Crypt-Rijndael perl-Sort-Naturally perl-Term-ReadKey perl-Term-ShellUI perl-File-KeePass perl-Clone perl-Term-ReadLine-Gnu perl-XML-Parser"
short_desc="KeePass Command Line Interface"
From 830887b346cbfbe0730ce1fff2ce10ee80875b7e 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, 22 Nov 2020 09:25:10 +0700
Subject: [PATCH 313/357] kupfer: remove noarch
---
srcpkgs/kupfer/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/kupfer/template b/srcpkgs/kupfer/template
index 03e80e9fdc9..f66ed5c37ee 100644
--- a/srcpkgs/kupfer/template
+++ b/srcpkgs/kupfer/template
@@ -1,14 +1,13 @@
# Template file for 'kupfer'
pkgname=kupfer
version=319
-revision=2
-archs=noarch
-build_style=waf3
+revision=3
wrksrc="${pkgname}-v${version}"
-python_version=3
+build_style=waf3
pycompile_dirs="usr/share/kupfer/kupfer"
configure_args="--no-update-mime --no-update-icon-cache"
-hostmakedepends="intltool python3-docutils"
+hostmakedepends="intltool python3-docutils python3-gobject python3-xdg
+ python3-dbus gtk+3"
makedepends="libkeybinder3 libwnck python3-gobject python3-xdg python3-dbus"
depends="$makedepends"
short_desc="Interface for quick and convenient access to applications"
@@ -17,3 +16,4 @@ license="GPL-3.0-or-later"
homepage="https://kupferlauncher.github.io/"
distfiles="https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz"
checksum=22357233984a6588a9f9743002363af38ea63b5c2684af487693a13c42973d31
+python_version=3
From 7f1cdb2c5e099149067955a954557492a95df9fd 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, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 314/357] neofetch: remove noarch
---
srcpkgs/neofetch/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/neofetch/template b/srcpkgs/neofetch/template
index 60862481a28..1529e9ceef6 100644
--- a/srcpkgs/neofetch/template
+++ b/srcpkgs/neofetch/template
@@ -1,8 +1,7 @@
# Template file for 'neofetch'
pkgname=neofetch
version=7.1.0
-revision=1
-archs=noarch
+revision=2
build_style=gnu-makefile
depends="bash"
short_desc="Simple system information script"
From 22098091291de26801c09e7784beee4f1c8c6bde 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, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 315/357] netbsd-wtf: remove noarch
---
srcpkgs/netbsd-wtf/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template
index 87708e08847..be1b0c28c5c 100644
--- a/srcpkgs/netbsd-wtf/template
+++ b/srcpkgs/netbsd-wtf/template
@@ -1,13 +1,12 @@
# Template file for 'netbsd-wtf'
pkgname=netbsd-wtf
version=20180621
-revision=2
+revision=3
_commit=b1e5be48e340146f63b174cc14fef892a783168b
-archs=noarch
build_style=gnu-makefile
-short_desc="The NetBSD's wtf(6) utility"
+short_desc="NetBSD's wtf(6) utility"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
+license="Public Domain"
homepage="https://www.netbsd.org"
distfiles="https://github.com/void-linux/netbsd-wtf/archive/$_commit.tar.gz"
checksum=5da7c6c286673baa8cc0ce2840c16895eef3e884e038a6cb7dedabdd15753de7
From 2b0855e8f19011c918dc5067d1af42a15f2546a5 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, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 316/357] netdata: remove noarch
---
srcpkgs/netdata/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index 205d7985614..f6386f3e519 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,7 +1,7 @@
# Template file for 'netdata'
pkgname=netdata
version=1.24.0
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=gnu-configure
configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
@@ -53,7 +53,6 @@ post_install() {
netdata-plugins-nodejs_package() {
short_desc+=" - NodeJS Plugins"
depends="${sourcepkg}>=${version}_${revision} virtual?nodejs-runtime"
- archs=noarch
pkg_install() {
vmove usr/libexec/netdata/plugins.d/node.d.plugin
vmove usr/libexec/netdata/node.d
@@ -63,7 +62,6 @@ netdata-plugins-nodejs_package() {
netdata-plugins-python_package() {
short_desc+=" - Python Plugins"
depends="${sourcepkg}>=${version}_${revision} python3"
- archs=noarch
pkg_install() {
vmove usr/libexec/netdata/plugins.d/python.d.plugin
vmove usr/libexec/netdata/python.d
From 3e09feec8a6ffb101dc1a9cfe8c95071c716a496 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, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 317/357] netsurf-buildsystem: remove noarch
---
srcpkgs/netsurf-buildsystem/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/netsurf-buildsystem/template b/srcpkgs/netsurf-buildsystem/template
index b65615497e2..9bb7863b9c6 100644
--- a/srcpkgs/netsurf-buildsystem/template
+++ b/srcpkgs/netsurf-buildsystem/template
@@ -1,8 +1,7 @@
# Template file for 'netsurf-buildsystem'
pkgname=netsurf-buildsystem
version=1.9
-revision=1
-archs=noarch
+revision=2
wrksrc="${pkgname#netsurf-}-${version}"
short_desc="Netsurf buildsystem"
maintainer="Orphaned <orphan@voidlinux.org>"
From 0c9ba39b8b5f23b86cf1edbd749e0f8cf0809c4b 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, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 318/357] novaboot: remove noarch
---
srcpkgs/novaboot/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/novaboot/template b/srcpkgs/novaboot/template
index f93c1ebe23b..78372f9230f 100644
--- a/srcpkgs/novaboot/template
+++ b/srcpkgs/novaboot/template
@@ -1,8 +1,7 @@
# Template file for 'novaboot'
pkgname=novaboot
version=20191023
-revision=1
-archs=noarch
+revision=2
build_style=gnu-makefile
hostmakedepends="perl"
makedepends="perl"
From 447527ee6fa33b11a6761c684eec7150086b1954 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, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 319/357] ntp: remove noarch
---
srcpkgs/ntp/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index c1cd814ea9d..a2cc0f62441 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
@@ -42,7 +42,6 @@ post_install() {
ntp-perl_package() {
depends="ntp>=$version perl"
- archs=noarch
short_desc+=" - perl scripts"
pkg_install() {
vmove usr/bin/ntp-wait
From 779104c0562821ac74d3dc92a3a8d138c61c8714 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, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 320/357] num-utils: remove noarch
---
srcpkgs/num-utils/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/num-utils/template b/srcpkgs/num-utils/template
index d7b542fa7af..a0103d6e4a6 100644
--- a/srcpkgs/num-utils/template
+++ b/srcpkgs/num-utils/template
@@ -1,16 +1,15 @@
# Template file for 'num-utils'
pkgname=num-utils
version=0.5
-revision=1
+revision=2
hostmakedepends="perl"
depends="perl"
short_desc="Programs for dealing with numbers from the Unix command line"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://suso.suso.org/xulu/Num-utils"
distfiles="http://suso.suso.org/programs/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
checksum=03592760fc7844492163b14ddc9bb4e4d6526e17b468b5317b4a702ea7f6c64e
-archs=noarch
post_extract() {
sed -i 's/\$new_number\^\$1/$new_number**$1/g' numprocess
From e2a284ffcd9ce6ffa5e6daf59add0b63c0db6a1f 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, 22 Nov 2020 09:42:52 +0700
Subject: [PATCH 321/357] sbt: remove noarch
---
srcpkgs/sbt/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index df79423b267..6847c2efefe 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,8 +1,7 @@
# Template file for 'sbt'
pkgname=sbt
version=1.3.10
-revision=1
-archs=noarch
+revision=2
wrksrc="$pkgname"
depends="virtual?java-environment"
short_desc="Interactive build tool for Scala and Java"
From cf3f43d7f73e934a525b8e9b61ddb624325ee9c2 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, 22 Nov 2020 09:42:52 +0700
Subject: [PATCH 322/357] scanmem: remove noarch
---
srcpkgs/scanmem/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/scanmem/template b/srcpkgs/scanmem/template
index b9bbb2f89fc..d694f33d372 100644
--- a/srcpkgs/scanmem/template
+++ b/srcpkgs/scanmem/template
@@ -1,7 +1,7 @@
# Template file for 'scanmem'
pkgname=scanmem
version=0.17
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-static --enable-gui"
hostmakedepends="automake gettext-devel intltool libtool m4 python"
@@ -41,7 +41,6 @@ libscanmem-devel_package() {
gameconqueror_package() {
short_desc="GameConqueror is a GUI front-end for scanmem, providing more features"
depends="polkit gtk+3 python3-gobject lib${sourcepkg}>=${version}_${revision}"
- archs=noarch
python_version=3
pkg_install() {
cd $DESTDIR
From 7c3e86ba8467590954311ba52d9bae0ef0ffb3ee 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 323/357] screenFetch: remove noarch
---
srcpkgs/screenFetch/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/screenFetch/template b/srcpkgs/screenFetch/template
index 4a3d5a9dcaa..a9749569135 100644
--- a/srcpkgs/screenFetch/template
+++ b/srcpkgs/screenFetch/template
@@ -1,8 +1,7 @@
# Template file for 'screenFetch'
pkgname=screenFetch
version=3.9.1
-revision=1
-archs=noarch
+revision=2
depends="bash bc xdpyinfo"
short_desc="Bash screenshot information tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From 666248bf9c2f9705dc4c18fec248843d8d294c73 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 324/357] sendEmail: remove noarch
---
srcpkgs/sendEmail/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/sendEmail/template b/srcpkgs/sendEmail/template
index a60e0941572..be7d5425e0c 100644
--- a/srcpkgs/sendEmail/template
+++ b/srcpkgs/sendEmail/template
@@ -1,8 +1,7 @@
# Template file for 'sendEmail'
pkgname=sendEmail
version=1.56
-revision=1
-archs=noarch
+revision=2
wrksrc="${pkgname}-v${version}"
depends="perl-Net-SSLeay"
short_desc="Lightweight, command line SMTP email client"
From 9929b62b17e98c458f86968ca943f8e472082d6b 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 325/357] shorewall: remove noarch
---
srcpkgs/shorewall/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index 30efdba8869..932c9281c2b 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -1,8 +1,7 @@
# Template file for 'shorewall'
pkgname=shorewall
version=5.2.7
-revision=1
-archs=noarch
+revision=2
create_wrksrc=yes
depends="shorewall-core perl"
short_desc="Iptables-based firewall for Linux systems"
@@ -37,7 +36,6 @@ do_install() {
}
shorewall-core_package() {
- archs=noarch
depends="iptables iproute2"
short_desc+=" - Core Shorewall files"
pkg_install() {
@@ -47,7 +45,6 @@ shorewall-core_package() {
}
shorewall6_package() {
- archs=noarch
depends="shorewall"
conf_files="/etc/$pkgname/*"
short_desc+=" - IPv6 support"
From f6b2eb13bc376a68ccf9e119d309c0e9b29a0ac7 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 326/357] shunit2: remove noarch
---
srcpkgs/shunit2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/shunit2/template b/srcpkgs/shunit2/template
index f909503b0f6..3b90bad7259 100644
--- a/srcpkgs/shunit2/template
+++ b/srcpkgs/shunit2/template
@@ -1,8 +1,7 @@
# Template file for 'shunit2'
pkgname=shunit2
version=2.1.8
-revision=1
-archs=noarch
+revision=2
depends="bash"
checkdepends="zsh ksh"
short_desc="Unit testing framework for Unix shell scripts based on xUnit"
From 503dd1c3c55e1a3c7656f0c84ebc5b5d4fc11f6a 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 327/357] signond: remove noarch
---
srcpkgs/signond/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/signond/template b/srcpkgs/signond/template
index fc1bdebe712..183c3b9481e 100644
--- a/srcpkgs/signond/template
+++ b/srcpkgs/signond/template
@@ -1,7 +1,7 @@
# Template file for 'signond'
pkgname=signond
version=8.60
-revision=2
+revision=3
wrksrc="signond-VERSION_${version}-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe"
build_style=qmake
configure_args="LIBDIR=/usr/lib"
@@ -25,7 +25,6 @@ pre_configure() {
}
signond-doc_package() {
- archs=noarch
short_desc+=" - documentation"
pkg_install() {
vmove usr/share/doc
From b0a4ace9e38087d503296545b90c8aab8fa96579 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 328/357] sigrok-firmware-fx2lafw: remove noarch
---
srcpkgs/sigrok-firmware-fx2lafw/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/sigrok-firmware-fx2lafw/template b/srcpkgs/sigrok-firmware-fx2lafw/template
index 5c92bc1c0ac..3f767d70ef4 100644
--- a/srcpkgs/sigrok-firmware-fx2lafw/template
+++ b/srcpkgs/sigrok-firmware-fx2lafw/template
@@ -1,8 +1,7 @@
# Template file for 'sigrok-firmware-fx2lafw'
pkgname=sigrok-firmware-fx2lafw
version=0.1.7
-revision=1
-archs=noarch
+revision=2
wrksrc="${pkgname}-bin-${version}"
short_desc="Sigrok fx2lafw Firmware files"
maintainer="lemmi <lemmi@nerd2nerd.org>"
From 0b698fda84e18c6bf9bfa3a363a4da4e14f0d8fe 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, 22 Nov 2020 09:42:54 +0700
Subject: [PATCH 329/357] snazzer: remove noarch
---
srcpkgs/snazzer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/snazzer/template b/srcpkgs/snazzer/template
index 40828a47362..df1451b6f2f 100644
--- a/srcpkgs/snazzer/template
+++ b/srcpkgs/snazzer/template
@@ -1,8 +1,7 @@
# Template file for 'snazzer'
pkgname=snazzer
version=0.0.3
-revision=1
-archs=noarch
+revision=2
build_style=gnu-makefile
hostmakedepends="perl pod2mdoc"
depends="sudo btrfs-progs"
From 23c4328349e620a313e1c3fefa0dae5d97bf50da 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, 22 Nov 2020 09:42:54 +0700
Subject: [PATCH 330/357] soundconverter: remove noarch
---
srcpkgs/soundconverter/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/soundconverter/template b/srcpkgs/soundconverter/template
index 1bda4743513..9e933929f97 100644
--- a/srcpkgs/soundconverter/template
+++ b/srcpkgs/soundconverter/template
@@ -1,8 +1,7 @@
# Template file for 'soundconverter'
pkgname=soundconverter
version=3.0.2
-revision=1
-archs=noarch
+revision=2
build_style=gnu-configure
pycompile_dirs="/usr/lib/${pkgname}/python/${pkgname}"
hostmakedepends="glib intltool pkg-config python3-gobject"
From d10b49a83dc78222569eea43c4d8b50e50e39f38 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 331/357] speedometer: remove noarch
---
srcpkgs/speedometer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/speedometer/template b/srcpkgs/speedometer/template
index 3c287fcdca7..c0fe822bee9 100644
--- a/srcpkgs/speedometer/template
+++ b/srcpkgs/speedometer/template
@@ -1,8 +1,7 @@
# Template file for 'speedometer'
pkgname=speedometer
version=2.8
-revision=3
-archs=noarch
+revision=4
wrksrc="speedometer-release-${version}"
depends="python-urwid"
short_desc="Monitor network traffic or speed/progress of a file transfer"
From da86bc969a2a3f2ed62c79ecd7edd9bbc690c2e0 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 332/357] spice-protocol: remove noarch
---
srcpkgs/spice-protocol/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/spice-protocol/template b/srcpkgs/spice-protocol/template
index 819c2977712..f94ce7f8d7e 100644
--- a/srcpkgs/spice-protocol/template
+++ b/srcpkgs/spice-protocol/template
@@ -1,8 +1,7 @@
# Template file for 'spice-protocol'
pkgname=spice-protocol
version=0.14.0
-revision=1
-archs=noarch
+revision=2
wrksrc="spice-protocol-v${version}"
build_style=meson
short_desc="SPICE protocol headers"
From b3033df8c64e7ddd06ad76c1801298df1c25e681 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 333/357] starfighter: remove noarch
---
srcpkgs/starfighter-data | 1 -
srcpkgs/starfighter/template | 13 +++----------
2 files changed, 3 insertions(+), 11 deletions(-)
delete mode 120000 srcpkgs/starfighter-data
diff --git a/srcpkgs/starfighter-data b/srcpkgs/starfighter-data
deleted file mode 120000
index 8c24b109c9b..00000000000
--- a/srcpkgs/starfighter-data
+++ /dev/null
@@ -1 +0,0 @@
-starfighter
\ No newline at end of file
diff --git a/srcpkgs/starfighter/template b/srcpkgs/starfighter/template
index 1b357256b2f..0b13c857864 100644
--- a/srcpkgs/starfighter/template
+++ b/srcpkgs/starfighter/template
@@ -1,28 +1,21 @@
# Template file for 'starfighter'
pkgname=starfighter
version=2.0.0.2
-revision=1
+revision=2
_version="${version%.*.*}"
build_style=gnu-configure
configure_args="exec_prefix=/usr"
hostmakedepends="pkg-config automake"
makedepends="SDL2_image-devel SDL2_mixer-devel"
-depends="starfighter-data desktop-file-utils"
+depends="desktop-file-utils"
short_desc="Side-scrolling shoot 'em up space game"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://pr-starfighter.github.io"
distfiles="https://github.com/pr-starfighter/starfighter/archive/v${version}.tar.gz"
checksum=100562f2e12530ff4e360898ec5aace7f2c99806a9cba68d02466e82f8c1ae83
+replaces="starfighter-data>=0"
pre_configure() {
autoreconf -fi
}
-
-starfighter-data_package() {
- short_desc+=" - data files"
- archs=noarch
- pkg_install() {
- vmove usr/share/starfighter
- }
-}
From 5be0e1286719bab3371574501c6b767a955fa300 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 334/357] startup: remove noarch
---
srcpkgs/startup/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/startup/template b/srcpkgs/startup/template
index 4a163d65afc..eeeee53501a 100644
--- a/srcpkgs/startup/template
+++ b/srcpkgs/startup/template
@@ -1,7 +1,7 @@
# Template file for 'startup'
pkgname=startup
version=2.0.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-sysvcompat --disable-dconf-bridge --disable-cgroups"
make_dirs="/var/log/startup 0750 root adm"
@@ -25,7 +25,6 @@ post_install() {
}
startup-tools_package() {
- archs=noarch
depends="${sourcepkg}>=${version}_${revision} python3-dbus python3-gobject"
short_desc+=" - monitoring and analysis tools"
pkg_install() {
From 44f6f3fe5797d7d6e1a762d7226e2cb6a72a5a3d 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 335/357] statnot: remove noarch
---
srcpkgs/statnot/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/statnot/template b/srcpkgs/statnot/template
index e1817d8f43a..a634cb1eb2d 100644
--- a/srcpkgs/statnot/template
+++ b/srcpkgs/statnot/template
@@ -1,8 +1,7 @@
# Template file for 'statnot'
pkgname=statnot
version=0.0.4
-revision=3
-archs=noarch
+revision=4
build_style=gnu-makefile
depends="pygtk python3-dbus xsetroot"
short_desc="Notification system for lightweight window managers"
From 23b2d454256c5e60bde28fc0f65f97b39465f554 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 336/357] stk: remove noarch
---
srcpkgs/stk-data | 1 -
srcpkgs/stk/template | 13 +++----------
2 files changed, 3 insertions(+), 11 deletions(-)
delete mode 120000 srcpkgs/stk-data
diff --git a/srcpkgs/stk-data b/srcpkgs/stk-data
deleted file mode 120000
index e69eabc8478..00000000000
--- a/srcpkgs/stk-data
+++ /dev/null
@@ -1 +0,0 @@
-stk
\ No newline at end of file
diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index 8df159eb8a9..70ff45b42f6 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -1,18 +1,19 @@
# Template file for 'stk'
pkgname=stk
version=4.6.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-alsa --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
hostmakedepends="automake libtool pkg-config"
makedepends="alsa-lib-devel jack-devel"
-depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
+depends="libstk-${version}_${revision}"
short_desc="Synthesis ToolKit in C++"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="custom:MIT-like"
homepage="https://ccrma.stanford.edu/software/stk/"
distfiles="https://github.com/thestk/stk/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=8e0c362dd82421bae8f3e789d238a1c27aeac1a2697d7830eb51abc90fc17281
+replaces="stk-data>=0"
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
@@ -64,14 +65,6 @@ post_install() {
vlicense LICENSE
}
-stk-data_package() {
- short_desc+=" - data files"
- archs=noarch
- pkg_install() {
- vmove usr/share/stk
- }
-}
-
stk-examples_package() {
short_desc+=" - examples"
depends="${sourcepkg}>=${version}_${revision}"
From 9763d391bbd29a0721a93cb67f63acdd042977d3 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 337/357] syncplay: remove noarch
---
srcpkgs/syncplay/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/syncplay/template b/srcpkgs/syncplay/template
index 83accc1983a..1c459b94d53 100644
--- a/srcpkgs/syncplay/template
+++ b/srcpkgs/syncplay/template
@@ -1,8 +1,7 @@
# Template file for 'syncplay'
pkgname=syncplay
version=1.6.5
-revision=1
-archs=noarch
+revision=2
build_style=gnu-makefile
pycompile_dirs="usr/lib/syncplay/syncplay"
depends="desktop-file-utils python3-pyside2 python3-Twisted
From 9a71d35b2ad08f43258c01fdff8deec939afe693 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, 22 Nov 2020 09:42:56 +0700
Subject: [PATCH 338/357] syncthing-gtk: remove noarch
---
srcpkgs/syncthing-gtk/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index aaaa57a1c9e..90e9f21cf4a 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -2,8 +2,7 @@
pkgname=syncthing-gtk
reverts="0.14.36_1"
version=0.9.4.4
-revision=2
-archs=noarch
+revision=3
build_style=python2-module
hostmakedepends="python-setuptools"
depends="syncthing python-dateutil libnotify librsvg python-bcrypt
From 3900f9c7e1ce5aa4f4f1fe8f6429d675ef3cc240 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, 23 Nov 2020 19:00:58 +0700
Subject: [PATCH 339/357] Partial revert "stk: remove noarch"
This reverts commit b792c5f78cd9f768810987df2cb16dbb8b64e01f.
Some other packages depends on stk-data.
---
srcpkgs/stk-data | 1 +
srcpkgs/stk/template | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/stk-data
diff --git a/srcpkgs/stk-data b/srcpkgs/stk-data
new file mode 120000
index 00000000000..e69eabc8478
--- /dev/null
+++ b/srcpkgs/stk-data
@@ -0,0 +1 @@
+stk
\ No newline at end of file
diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index 70ff45b42f6..f726e3a5340 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -6,14 +6,13 @@ build_style=gnu-configure
configure_args="--with-alsa --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
hostmakedepends="automake libtool pkg-config"
makedepends="alsa-lib-devel jack-devel"
-depends="libstk-${version}_${revision}"
+depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
short_desc="Synthesis ToolKit in C++"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="custom:MIT-like"
homepage="https://ccrma.stanford.edu/software/stk/"
distfiles="https://github.com/thestk/stk/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=8e0c362dd82421bae8f3e789d238a1c27aeac1a2697d7830eb51abc90fc17281
-replaces="stk-data>=0"
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
@@ -65,6 +64,13 @@ post_install() {
vlicense LICENSE
}
+stk-data_package() {
+ short_desc+=" - data files"
+ pkg_install() {
+ vmove usr/share/stk
+ }
+}
+
stk-examples_package() {
short_desc+=" - examples"
depends="${sourcepkg}>=${version}_${revision}"
From bcbc5c91e18e1fd8af46cd52954994ffa2be7a7e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 22 Nov 2020 15:34:34 +0200
Subject: [PATCH 340/357] notcurses: update to 2.0.7.
---
srcpkgs/notcurses/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index bb2d9419da8..388a1181abf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
# Template file for 'notcurses'
pkgname=notcurses
-version=2.0.4
+version=2.0.7
revision=1
build_style=cmake
configure_args="-DUSE_STATIC=ON"
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=6bb38ca0affc6425cd8e248c5b81aa4281713362c45202a450a89ab751833c98
+checksum=cc87e66f9dc3e9d0e591de70870dec5d8b36e660f18f10adae7f45abb0f0320a
notcurses-devel_package() {
depends="notcurses-${version}_${revision}"
From 6ed97a7c4011e247f39b653e634d41d135cb183f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 22 Nov 2020 15:34:43 +0200
Subject: [PATCH 341/357] growlight: update to 1.2.20.
---
srcpkgs/growlight/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 5ea4a3a42a8..3a45507e11c 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,7 +1,7 @@
# Template file for 'growlight'
pkgname=growlight
-version=1.2.18
-revision=2
+version=1.2.21
+revision=1
build_style=cmake
configure_args="$(vopt_bool zfs USE_LIBZFS)"
hostmakedepends="pkg-config pandoc"
@@ -14,7 +14,11 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://nick-black.com/dankwiki/index.php/Growlight"
distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
-checksum=c6c08556e6838226b81300e177c49d7a382e9eb30cfdb19f99790106e426a032
+checksum=a225266b98a7c438a04d79951b3a58834027fcc6174baa31e315265b2e7b1d30
+
+pre_configure() {
+ vsed -i 's#sbin#bin#' CMakeLists.txt
+}
build_options="zfs"
desc_option_zfs="Build with ZFS Support"
From 9f72ee9dd7ab8e93254956169a3407b14f76e698 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Mon, 23 Nov 2020 11:19:48 +0100
Subject: [PATCH 342/357] gemget: update to 1.7.0
---
srcpkgs/gemget/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index 985c497b821..ae91001d9d5 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,6 +1,6 @@
# Template file for 'gemget'
pkgname=gemget
-version=1.6.0
+version=1.7.0
revision=1
build_style=go
go_import_path="github.com/makeworld-the-better-one/gemget"
@@ -9,7 +9,7 @@ maintainer="Paper <paper@tilde.institute>"
license="MIT"
homepage="https://github.com/makeworld-the-better-one/gemget/"
distfiles="https://github.com/makeworld-the-better-one/gemget/archive/v$version.tar.gz"
-checksum=2a435af153272c53e82508a1e294142c15259224e94294d15f09c8a0c6f10f7b
+checksum=271e89cf4bf76a78c6efffce4b307c24edae4a04147a3ec3aed2bf0289cc4e12
post_install() {
vlicense LICENSE
From a95c17f8e1da4cb05f7f9e978610e4cca528e038 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 23 Nov 2020 14:06:41 +0200
Subject: [PATCH 343/357] FAudio: update to 20.11.
---
srcpkgs/FAudio/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/FAudio/template b/srcpkgs/FAudio/template
index 4605f7a5a00..b60a953b4ca 100644
--- a/srcpkgs/FAudio/template
+++ b/srcpkgs/FAudio/template
@@ -1,18 +1,18 @@
# Template file for 'FAudio'
pkgname=FAudio
-version=20.02
+version=20.11
revision=1
build_style=cmake
-configure_args="-DFFMPEG=ON -DSDL2_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include/SDL2
+configure_args="-DGSTREAMER=ON -DSDL2_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include/SDL2
-DSDL2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
-makedepends="SDL2-devel ffmpeg-devel"
+makedepends="SDL2-devel gstreamer1-devel gst-plugins-base1-devel"
short_desc="Accuracy-focused XAudio reimplementation for open platforms"
maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
license="Zlib"
homepage="https://github.com/FNA-XNA/FAudio"
distfiles="https://github.com/FNA-XNA/FAudio/archive/${version}.tar.gz"
-checksum=103a6d278921ce757e5427133626f60ce4876b30d81186f78af35d9f1ca4ef16
+checksum=551f1573a98082973e8e2f0ef14be8f34299c9813d58387f9edd32142e6f913b
# sdl2 cmake file appears to be broken for cross compilation
CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/SDL2 "
From 8e067ad069866931fea6d12241ea9f488ed57218 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 21:37:04 -0600
Subject: [PATCH 344/357] python3-fuse: update to 1.0.0
---
srcpkgs/python3-fuse/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-fuse/template b/srcpkgs/python3-fuse/template
index 6b39962f4e3..7147b39d7ae 100644
--- a/srcpkgs/python3-fuse/template
+++ b/srcpkgs/python3-fuse/template
@@ -1,7 +1,7 @@
# Template file for 'python3-fuse'
pkgname=python3-fuse
-version=0.3.1
-revision=6
+version=1.0.0
+revision=1
wrksrc=python-fuse-$version
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/libfuse/python-fuse"
distfiles="https://github.com/libfuse/python-fuse/archive/v${version}.tar.gz"
-checksum=243cfab15ee357dbcdac98c2ee5929f6e8c65d2ec9d77597e3732f79ce649eec
+checksum=caa90dd931128407df12b2c090200e49a67b9afb4176211aad03e2a19209a506
From 0f4be588a17f8f38b407feff7cbb4dad3f4e0f24 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 23 Nov 2020 16:19:00 +0100
Subject: [PATCH 345/357] gzdoom: use bsdtar instead of ar
since ar p/x is prone to freezing at least on some musl targets,
just use equivalent bsdtar; the ar issue needs figuring out...
---
srcpkgs/gzdoom/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index bc644c1e3f2..8ee85e03174 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -30,7 +30,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
+ bsdtar xOf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/gitinfo.cpp
From c641d5a88e72f57f907c0ed9d38a9e0463c23128 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 23 Nov 2020 15:54:17 +0100
Subject: [PATCH 346/357] choosenim: fix build on ppc* and rebuild on other
archs
See https://github.com/q66/cligen/commit/deee68fdc8ec5f34de7054a029739d3933fc551b
---
srcpkgs/choosenim/patches/system-libarchive.patch | 2 +-
srcpkgs/choosenim/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
index a102f0c13b3..97bbf2a62ba 100644
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ b/srcpkgs/choosenim/patches/system-libarchive.patch
@@ -7,7 +7,7 @@ index 7ba9b36..dc47faa 100644
requires "nim >= 1.2.6", "nimble#8f7af86"
-requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-+requires "nimterop >= 0.6.12"
++requires "https://github.com/q66/nimterop#fcc79ac796e647998f5d6910ca9b7f951d40a8d1"
#requires "libcurl >= 1.0.0" - OSX now uses httpclient
requires "analytics >= 0.2.0"
requires "osinfo >= 0.3.0"
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index fb5e9152b22..10cdb557589 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,7 +1,7 @@
# Template file for 'choosenim'
pkgname=choosenim
version=0.7.4
-revision=1
+revision=2
hostmakedepends="git nim libressl-devel pkg-config"
makedepends="libressl-devel zlib-devel libarchive-devel"
depends="gcc"
From 8e65bb56b9d81dbdadbc94039c8bb77efa081fc1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 23 Nov 2020 16:28:12 +0100
Subject: [PATCH 347/357] choosenim: go back to upstream nimterop
upstream issued 1.3.1 hotfix version, which fixes this
---
srcpkgs/choosenim/patches/system-libarchive.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
index 97bbf2a62ba..a102f0c13b3 100644
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ b/srcpkgs/choosenim/patches/system-libarchive.patch
@@ -7,7 +7,7 @@ index 7ba9b36..dc47faa 100644
requires "nim >= 1.2.6", "nimble#8f7af86"
-requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-+requires "https://github.com/q66/nimterop#fcc79ac796e647998f5d6910ca9b7f951d40a8d1"
++requires "nimterop >= 0.6.12"
#requires "libcurl >= 1.0.0" - OSX now uses httpclient
requires "analytics >= 0.2.0"
requires "osinfo >= 0.3.0"
From 6d2f93fac4a37a524b43561b6e942152f56c5777 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 21:23:43 -0600
Subject: [PATCH 348/357] python3-httmock: update to 1.4.0
---
srcpkgs/python3-httmock/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-httmock/template b/srcpkgs/python3-httmock/template
index db9c09060ad..1ae09446ee7 100644
--- a/srcpkgs/python3-httmock/template
+++ b/srcpkgs/python3-httmock/template
@@ -1,7 +1,7 @@
# Template file for 'python3-httmock'
pkgname=python3-httmock
-version=1.3.0
-revision=4
+version=1.4.0
+revision=1
wrksrc="httmock-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,8 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/patrys/httmock"
distfiles="https://github.com/patrys/httmock/archive/${version}.tar.gz"
-checksum=4716729f0d07f3f6043dde43545a5381c4c6031a62e9dc9eed21e73c63d86722
-
-do_check() {
- python3 setup.py test
-}
+checksum=e1f094f555fe5e17c82c102dcd9093f3a041f5457f8ac75829c17f32db362bf1
From 814db45e91dca7f5397632b42eaccddd43466d68 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 10:28:39 -0500
Subject: [PATCH 349/357] python3-virtualenv: update to 20.2.1.
---
srcpkgs/python3-virtualenv/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 91775e9d370..3c607934257 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
# Template file for 'python3-virtualenv'
pkgname=python3-virtualenv
-version=20.2.0
+version=20.2.1
revision=1
wrksrc="virtualenv-${version}"
build_style=python3-module
@@ -11,8 +11,9 @@ short_desc="Virtual Python environment builder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://virtualenv.pypa.io/"
+changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=fd4147c5ba3f694e2e4fc3c767407dc2226899623bb9b49c2f15637c2ee335b3
+checksum=e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5
alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
do_check() {
From 23fadb00cce7cf9b3b48e7eb0aeb63401308a44c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 10:39:54 -0500
Subject: [PATCH 350/357] python3-wsproto: update to 1.0.0.
---
srcpkgs/python3-wsproto/template | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-wsproto/template b/srcpkgs/python3-wsproto/template
index 6d2dab99f60..1da34b94340 100644
--- a/srcpkgs/python3-wsproto/template
+++ b/srcpkgs/python3-wsproto/template
@@ -1,17 +1,23 @@
# Template file for 'python3-wsproto'
pkgname=python3-wsproto
-version=0.15.0
-revision=4
+version=1.0.0
+revision=1
wrksrc="wsproto-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3 python3-h11"
+depends="python3-h11"
+checkdepends="tox ${depends}"
short_desc="Sans-IO WebSocket protocol implementation (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://wsproto.readthedocs.io"
-distfiles="https://github.com/python-hyper/wsproto/archive/${version}.tar.gz"
-checksum=954e46ac07134d4f67832b17c14164e1771f106b078413e5fb8a2bd2738eb25c
+changelog="https://raw.githubusercontent.com/python-hyper/wsproto/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/w/wsproto/wsproto-${version}.tar.gz"
+checksum=868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38
+
+do_check() {
+ tox -e py${py3_ver/./}
+}
post_install() {
vlicense LICENSE
From 47aed177b69d9662c9e15262faeffe12ea82c6fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 11:03:44 -0500
Subject: [PATCH 351/357] sshguard: update to 2.4.1.
---
srcpkgs/sshguard/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sshguard/template b/srcpkgs/sshguard/template
index 235a6129393..7fa96dbcaa9 100644
--- a/srcpkgs/sshguard/template
+++ b/srcpkgs/sshguard/template
@@ -1,7 +1,7 @@
# Template file for 'sshguard'
pkgname=sshguard
-version=2.4.0
-revision=2
+version=2.4.1
+revision=1
build_style=gnu-configure
hostmakedepends="flex"
short_desc="Protects networked hosts from brute force attacks"
@@ -9,7 +9,7 @@ maintainer="Lodvær <lodvaer@gmail.com>"
license="BSD-3-Clause"
homepage="https://www.sshguard.net/"
distfiles="${SOURCEFORGE_SITE}/sshguard/sshguard-${version}.tar.gz"
-checksum=065ca4091b3a96802714b560dbbc3d9f0e67574e99e2b6e8857aa1027d17d6c0
+checksum=875d02e6e67dced614790ed5e36aef1160edea940f353a79306cbb1852af3c67
make_dirs="/var/db/sshguard 0755 root root"
conf_files="/etc/sshguard.conf"
From 716b4a633d9c667dffcb94e4b3858be1086db751 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 11:14:05 -0500
Subject: [PATCH 352/357] unison: update to 2.51.3.
---
srcpkgs/unison/patches/ocaml408.patch | 46 ---------------------------
srcpkgs/unison/template | 11 ++++---
2 files changed, 6 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/unison/patches/ocaml408.patch
diff --git a/srcpkgs/unison/patches/ocaml408.patch b/srcpkgs/unison/patches/ocaml408.patch
deleted file mode 100644
index 7c197454c64..00000000000
--- a/srcpkgs/unison/patches/ocaml408.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 23fa129254a3304902739fc989950cc747d1e0b3 Mon Sep 17 00:00:00 2001
-From: Jaap Boender <jaapb@kerguelen.org>
-Date: Thu, 21 Mar 2019 12:26:51 +0000
-Subject: [PATCH] Compatibility with OCaml 4.08
-
----
- src/files.ml | 2 +-
- src/recon.ml | 4 ++--
- src/system/system_generic.ml | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
---- src/files.ml
-+++ src/files.ml
-@@ -734,7 +734,7 @@ let get_files_in_directory dir =
- with End_of_file ->
- dirh.System.closedir ()
- end;
-- Sort.list (<) !files
-+ List.sort String.compare !files
-
- let ls dir pattern =
- Util.convertUnixErrorsToTransient
---- src/recon.ml
-+++ src/recon.ml
-@@ -662,8 +662,8 @@ let rec reconcile
-
- (* Sorts the paths so that they will be displayed in order *)
- let sortPaths pathUpdatesList =
-- Sort.list
-- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
-+ List.sort
-+ Path.compare
- pathUpdatesList
-
- let rec enterPath p1 p2 t =
---- src/system/system_generic.ml
-+++ src/system/system_generic.ml
-@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
- let chmod = Unix.chmod
- let chown = Unix.chown
- let utimes = Unix.utimes
--let link = Unix.link
-+let link s d = Unix.link s d
- let openfile = Unix.openfile
- let opendir f =
- let h = Unix.opendir f in
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index a24b2cf3552..c3cb8e454c8 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,19 +1,20 @@
# Template file for 'unison'
pkgname="unison"
-version=2.51.2
-revision=6
+version=2.51.3
+revision=1
hostmakedepends="ocaml"
short_desc="A file-synchronization tool"
maintainer="allan <mail@may.mooo.com>"
license="GPL-3"
homepage="http://www.cis.upenn.edu/~bcpierce/unison/"
distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
-checksum=a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e
-nocross=yes
+checksum=0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b
+nocross="OCaml does not cross compile"
do_build() {
- CFLAGS= make UISTYLE=text DEBUGGING=false THREADS=true
+ CFLAGS= make ${makejobs} UISTYLE=text DEBUGGING=false THREADS=true
}
+
do_install() {
vbin src/unison
vbin src/unison-fsmonitor
From 860053eef8faf073b5ac01f17e9c3749c0d8113c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 12 Nov 2020 18:55:44 +0100
Subject: [PATCH 353/357] electron9: update to 9.3.4.
[ci skip]
---
srcpkgs/electron9/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/electron9/template b/srcpkgs/electron9/template
index 727f8ba95b2..d598cf62ff7 100644
--- a/srcpkgs/electron9/template
+++ b/srcpkgs/electron9/template
@@ -1,6 +1,6 @@
# Template file for 'electron9'
pkgname=electron9
-version=9.3.1
+version=9.3.4
_nodever=12.14.1
_chromiumver=83.0.4103.119
revision=1
@@ -30,7 +30,7 @@ homepage="https://electronjs.org"
distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="74292816dbccc1cc973d36f8bc101c31616b3c4c484056efb558a7a5e8fd1f60
+checksum="067399edbbadf7d975e293230ee716a441dc63bcc0bbf1ad41bd0e1063588867
452cbc58895a46b2b87ba450a3f86897de92ad08ce28ffdbed6b3f12101d3788
01e4a960be3e26b87c55509ee1cb44a14946a4169d5cdec046dd05058d995b26"
From 6b20f7d615977957e641bd14b40884c7081d278c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 23 Nov 2020 11:17:10 -0600
Subject: [PATCH 354/357] steam: update to 1.0.0.67.
---
srcpkgs/steam/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index 90a856864fb..6aeeb9471d7 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -1,6 +1,6 @@
# Template file for 'steam'
pkgname=steam
-version=1.0.0.66
+version=1.0.0.67
revision=1
archs="i686 x86_64"
wrksrc=steam-launcher
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom: Proprietary license"
homepage="https://steampowered.com/"
distfiles="http://repo.steampowered.com/${pkgname}/pool/${pkgname}/s/${pkgname}/${pkgname}_${version}.tar.gz"
-checksum=738c855f73168d0bce0b9297c75d9dbf56419b722264d8ca3f7737657754c710
+checksum=583c7791d67ac9e8539a16d29bd5055bb5f3823888fe92e07a869f1ffc4f925b
repository=nonfree
do_install() {
From 7dd0281d54d64f9a43e9f201768e68931cf249bd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 23 Nov 2020 11:20:06 -0600
Subject: [PATCH 355/357] nfdump: update to 1.6.22.
---
srcpkgs/nfdump/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nfdump/template b/srcpkgs/nfdump/template
index 31db7feb0d0..b2d73d25fed 100644
--- a/srcpkgs/nfdump/template
+++ b/srcpkgs/nfdump/template
@@ -1,6 +1,6 @@
# Template file for 'nfdump'
pkgname=nfdump
-version=1.6.21
+version=1.6.22
revision=1
build_style=gnu-configure
hostmakedepends="automake flex libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/phaag/nfdump"
distfiles="https://github.com/phaag/nfdump/archive/v${version}.tar.gz"
-checksum=7ad5dd6a7c226865b5cafe317684e4c61ea95093f943fd46cd896977f234ca5c
+checksum=437536acb02258f8e2cd1e63c801428c65e1c33100e349acbf718c5b04734bd0
configure_args+="--enable-sflow --enable-readpcap --enable-nfcapd"
pre_configure() {
From e29f74e58771d25a2b5e8c6c303aa656c7035e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 23 Nov 2020 11:27:08 -0300
Subject: [PATCH 356/357] rclone: fix segfault in musl cross targets.
For some reason, the cross built binaries have a TEXTREL in their
dynamic section, which musl's runtime linker doesn't support at all,
causing a segfault at launch. Fix this by disabling CGO_ENABLED for now.
---
srcpkgs/rclone/template | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 3c7ea20e5bc..56b4353c1aa 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
# Template file for 'rclone'
pkgname=rclone
version=1.53.3
-revision=1
+revision=2
wrksrc="rclone-v${version}"
build_style=go
go_import_path=github.com/rclone/rclone
@@ -14,6 +14,15 @@ changelog="https://raw.githubusercontent.com/rclone/rclone/master/docs/content/c
distfiles="https://github.com/rclone/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
checksum=f1e213bc6fb7c46f9a4cc8604ae0856718434bdafe07fa3ce449ae9a510a5763
+pre_build() {
+ if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then
+ # XXX: when cross building, the binary has a textrel, which segfaults when
+ # launched on musl
+ # FIXME: linkers for the musl toolchains should reject textrels entirely
+ export CGO_ENABLED=0
+ fi
+}
+
post_install() {
vlicense COPYING
vman rclone.1
From b63045dd99366f4a15352e83f0c3aa7b61cfc311 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 357/357] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl.patch | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index 1716584b8c8..b4f6f7b5ba4 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,4 +29,3 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
-
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (11 preceding siblings ...)
2020-11-23 19:01 ` glaulher
@ 2020-11-23 20:01 ` glaulher
2020-11-23 20:15 ` ericonr
` (11 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-23 20:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New comment by glaulher on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#issuecomment-732394046
Comment:
for some reason trying to rebase I pushed the push up incorrectly, how do I fix it?
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (12 preceding siblings ...)
2020-11-23 20:01 ` glaulher
@ 2020-11-23 20:15 ` ericonr
2020-11-24 0:22 ` [PR PATCH] [Updated] " glaulher
` (10 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-23 20:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#issuecomment-732401680
Comment:
`git rebase upstream/master` should do it
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (13 preceding siblings ...)
2020-11-23 20:15 ` ericonr
@ 2020-11-24 0:22 ` glaulher
2020-11-24 21:14 ` ahesford
` (9 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-24 0:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by glaulher against master on the void-packages repository
https://github.com/glaulher/void-packages rpm
https://github.com/void-linux/void-packages/pull/26642
rpm: update to 4.16.0
A patch file from https://github.com/void-linux/void-packages/pull/26642.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-26642.patch --]
[-- Type: text/x-diff, Size: 577543 bytes --]
From 63acccd447e0fd99b7df67f4b00fd3c49d53a1fc Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 001/358] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++
srcpkgs/rpm/patches/fix-musl.patch | 1 +
srcpkgs/rpm/template | 12 ++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..e1e48b3b0d4
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,12 @@
+--- rpmdb.c
++++ rpmdb.c
+@@ -1,7 +1,9 @@
+#include "system.h"
+
++#include <fcntl.h>
++#include <sys / stat.h>
+#include <popt.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include "cliutils.h"
+#include "debug.h"
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index b4f6f7b5ba4..1716584b8c8 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
+
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..48f954d1172 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
From e6b0dec6e4235cc87afb9b7f96cfd3d9a4a3cdbf Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 002/358] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++
srcpkgs/rpm/template | 12 ++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..e1e48b3b0d4
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,12 @@
+--- rpmdb.c
++++ rpmdb.c
+@@ -1,7 +1,9 @@
+#include "system.h"
+
++#include <fcntl.h>
++#include <sys / stat.h>
+#include <popt.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include "cliutils.h"
+#include "debug.h"
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..48f954d1172 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
From 0a8e714a46969d805692e155bc054ccc79e95be8 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 003/358] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 21 ++++++++++-----------
srcpkgs/rpm/patches/fix-musl.patch | 1 +
srcpkgs/rpm/template | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
index e1e48b3b0d4..2c0317ee5a1 100644
--- a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -1,12 +1,11 @@
---- rpmdb.c
-+++ rpmdb.c
-@@ -1,7 +1,9 @@
-#include "system.h"
-
+--- lib/rpmdb.c
++++ lib/rpmdb.c
+@@ -8,6 +8,8 @@
+ #include <utime.h>
+ #include <errno.h>
+ #include <dirent.h>
++#include <sys/stat.h>
+#include <fcntl.h>
-+#include <sys / stat.h>
-#include <popt.h>
-#include <rpm/rpmcli.h>
-#include <rpm/rpmdb.h>
-#include "cliutils.h"
-#include "debug.h"
+
+ #ifndef DYING /* XXX already in "system.h" */
+ #include <fnmatch.h>
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index b4f6f7b5ba4..1716584b8c8 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
+
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 48f954d1172..6a8aa5f6d4b 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,7 +1,7 @@
# Template file for 'rpm'
pkgname=rpm
version=4.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
From 465355b96f13cfbf44262815dd2450f42daf3fd5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 17 Nov 2020 22:28:47 +0100
Subject: [PATCH 004/358] giada: update to 0.17.0.
---
srcpkgs/giada/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/giada/template b/srcpkgs/giada/template
index 83d1aab438e..558097e3a0e 100644
--- a/srcpkgs/giada/template
+++ b/srcpkgs/giada/template
@@ -1,10 +1,10 @@
# Template file for 'giada'
pkgname=giada
-version=0.16.4
+version=0.17.0
revision=1
-build_style=gnu-configure
-configure_args="--target=linux"
-hostmakedepends="automake"
+build_style=cmake
+# configure_args="--target=linux"
+hostmakedepends="cmake"
makedepends="fltk-devel jack-devel libsamplerate-devel
libsndfile-devel libXpm-devel pulseaudio-devel rtmidi-devel libXcursor-devel
json-c++"
@@ -12,8 +12,9 @@ short_desc="Loop machine, audio tool for DJs, live performers and musicians"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-only"
homepage="https://www.giadamusic.com/"
+changelog="https://github.com/monocasual/giada/raw/master/ChangeLog"
distfiles="https://github.com/monocasual/giada/archive/v${version}.tar.gz"
-checksum=a425151ff571d4b0e79a3faaa6dd872c8f2693ffcada975b282365c865130b38
+checksum=b879f5ba7e9f34d7422aedd89d1d0baa91387b3528e057b4df25e1f2f8d661ef
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
@@ -21,7 +22,7 @@ fi
post_extract() {
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- vsed -e 's/\($(ldAdd)\)/\1 -latomic/g' -i Makefile.am
+ vsed -e '/list(APPEND LIBRARIES)/a list(APPEND LIBRARIES atomic)' -i CMakeLists.txt
fi
vsed -e 's;deps/json/single_include/\(nlohmann/json.hpp\);\1;' -i \
src/core/init.cpp \
@@ -30,6 +31,6 @@ post_extract() {
src/core/patch.cpp
}
-pre_configure() {
- autoreconf -fi
+do_install() {
+ vbin build/giada
}
From 55067dfe25fe62ba3c06e707079b54f73166a5ed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 19 Nov 2020 23:52:39 +0100
Subject: [PATCH 005/358] flatpak: update to 1.8.3.
---
srcpkgs/flatpak/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 6dd4ec1e6bb..98538dbb116 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,6 +1,6 @@
# Template file for 'flatpak'
pkgname=flatpak
-version=1.8.2
+version=1.8.3
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -14,14 +14,14 @@ hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison
makedepends="appstream-glib-devel gpgme-devel json-glib-devel libcap-devel
libostree-devel libseccomp-devel polkit-devel dconf-devel fuse-devel"
depends="bubblewrap gnupg2"
-checkdepends="bubblewrap dbus"
+checkdepends="bubblewrap dbus socat which"
short_desc="Application sandboxing and distribution framework"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://flatpak.org/"
-changelog="https://github.com/flatpak/flatpak/blob/master/NEWS"
+changelog="https://github.com/flatpak/flatpak/raw/master/NEWS"
distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=7926625df7c2282a5ee1a8b3c317af53d40a663b1bc6b18a2dc8747e265085b0
+checksum=33667fdd5cf65914209488bf3e7e574ddb57667bb7939863b4fcb40ca8b66edd
build_options="gir"
build_options_default="gir"
From b5dc7bbfe7ea4a60eda0f6e36fcc388cdcf0cf00 Mon Sep 17 00:00:00 2001
From: "Issam E. Maghni" <issam.e.maghni@mailbox.org>
Date: Tue, 22 Sep 2020 18:36:38 -0400
Subject: [PATCH 006/358] xdg-desktop-portal: update to 1.8.0
---
.../patches/pipewire-0.3.patch | 551 ------------------
srcpkgs/xdg-desktop-portal/template | 19 +-
2 files changed, 11 insertions(+), 559 deletions(-)
delete mode 100644 srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch
diff --git a/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch b/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch
deleted file mode 100644
index 94ebe083598..00000000000
--- a/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch
+++ /dev/null
@@ -1,551 +0,0 @@
-From a38901e5e7f835efe7b7a06c55790c8c20bc91a2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 14 Jan 2020 09:37:09 +0100
-Subject: [PATCH] PipeWire: update to 0.3 API
-
----
- configure.ac | 2 +-
- src/camera.c | 24 ++++----
- src/pipewire.c | 141 +++++++++++++---------------------------------
- src/pipewire.h | 10 ++--
- src/screen-cast.c | 98 ++++++--------------------------
- 5 files changed, 72 insertions(+), 203 deletions(-)
-
-diff --git configure.ac configure.ac
-index 89902fa..62d7960 100644
---- configure.ac
-+++ configure.ac
-@@ -97,7 +97,7 @@ AC_ARG_ENABLE(pipewire,
- [AS_HELP_STRING([--enable-pipewire],[Enable PipeWire support. Needed for screen cast portal])],
- enable_pipewire=$enableval, enable_pipewire=yes)
- if test x$enable_pipewire = xyes ; then
-- PKG_CHECK_MODULES(PIPEWIRE, [libpipewire-0.2 >= 0.2.6])
-+ PKG_CHECK_MODULES(PIPEWIRE, [libpipewire-0.3 >= 0.2.90])
- AC_DEFINE([HAVE_PIPEWIRE],[1], [Define to enable PipeWire support])
- fi
- AM_CONDITIONAL([HAVE_PIPEWIRE],[test "$enable_pipewire" = "yes"])
-diff --git src/camera.c src/camera.c
-index c2b392c..20fe3aa 100644
---- src/camera.c
-+++ src/camera.c
-@@ -141,7 +141,7 @@ open_pipewire_camera_remote (const char *app_id,
- GError **error)
- {
- PipeWireRemote *remote;
-- struct spa_dict_item permission_items[1];
-+ struct pw_permission permission_items[2];
- struct pw_properties *pipewire_properties;
-
- pipewire_properties =
-@@ -158,12 +158,12 @@ open_pipewire_camera_remote (const char *app_id,
- * Hide all existing and future nodes by default. PipeWire will use the
- * permission store to set up permissions.
- */
-- permission_items[0].key = PW_CORE_PROXY_PERMISSIONS_DEFAULT;
-- permission_items[0].value = "---";
-+ permission_items[0] = PW_PERMISSION_INIT (PW_ID_CORE, PW_PERM_RWX);
-+ permission_items[1] = PW_PERMISSION_INIT (PW_ID_ANY, 0);
-
-- pw_core_proxy_permissions (pw_remote_get_core_proxy (remote->remote),
-- &SPA_DICT_INIT (permission_items,
-- G_N_ELEMENTS (permission_items)));
-+ pw_client_update_permissions (pw_core_get_client(remote->core),
-+ G_N_ELEMENTS (permission_items),
-+ permission_items);
-
- pipewire_remote_roundtrip (remote);
-
-@@ -219,7 +219,7 @@ handle_open_pipewire_remote (XdpCamera *object,
- }
-
- out_fd_list = g_unix_fd_list_new ();
-- fd = pw_remote_steal_fd (remote->remote);
-+ fd = pw_core_steal_fd (remote->core);
- fd_id = g_unix_fd_list_append (out_fd_list, fd, &error);
- close (fd);
- pipewire_remote_destroy (remote);
-@@ -250,29 +250,28 @@ camera_iface_init (XdpCameraIface *iface)
- static void
- global_added_cb (PipeWireRemote *remote,
- uint32_t id,
-- uint32_t type,
-+ const char *type,
- const struct spa_dict *props,
- gpointer user_data)
- {
- Camera *camera = user_data;
-- struct pw_type *core_type = pw_core_get_type (remote->core);
- const struct spa_dict_item *media_class;
- const struct spa_dict_item *media_role;
-
-- if (type != core_type->node)
-+ if (strcmp(type, PW_TYPE_INTERFACE_Node) != 0)
- return;
-
- if (!props)
- return;
-
-- media_class = spa_dict_lookup_item (props, "media.class");
-+ media_class = spa_dict_lookup_item (props, PW_KEY_MEDIA_CLASS);
- if (!media_class)
- return;
-
- if (g_strcmp0 (media_class->value, "Video/Source") != 0)
- return;
-
-- media_role = spa_dict_lookup_item (props, "media.role");
-+ media_role = spa_dict_lookup_item (props, PW_KEY_MEDIA_ROLE);
- if (!media_role)
- return;
-
-@@ -342,6 +341,7 @@ create_pipewire_remote (Camera *camera,
- }
-
- pipewire_properties = pw_properties_new ("pipewire.access.portal.is_portal", "true",
-+ "portal.monitor", "Camera",
- NULL);
- camera->pipewire_remote = pipewire_remote_new_sync (pipewire_properties,
- global_added_cb,
-diff --git src/pipewire.c src/pipewire.c
-index 793a378..162cd55 100644
---- src/pipewire.c
-+++ src/pipewire.c
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #include <glib.h>
- #include <pipewire/pipewire.h>
-+#include <spa/utils/result.h>
-
- #include "pipewire.h"
-
-@@ -36,27 +37,25 @@ static gboolean is_pipewire_initialized = FALSE;
- static void
- registry_event_global (void *user_data,
- uint32_t id,
-- uint32_t parent_id,
- uint32_t permissions,
-- uint32_t type,
-+ const char *type,
- uint32_t version,
- const struct spa_dict *props)
- {
- PipeWireRemote *remote = user_data;
-- struct pw_type *core_type = pw_core_get_type (remote->core);
- const struct spa_dict_item *factory_object_type;
- PipeWireGlobal *global;
-
- global = g_new0 (PipeWireGlobal, 1);
- *global = (PipeWireGlobal) {
-- .parent_id = parent_id,
-+ .parent_id = id,
- };
-
- g_hash_table_insert (remote->globals, GINT_TO_POINTER (id), global);
- if (remote->global_added_cb)
- remote->global_added_cb (remote, id, type, props, remote->user_data);
-
-- if (type != core_type->factory)
-+ if (strcmp(type, PW_TYPE_INTERFACE_Factory) != 0)
- return;
-
- factory_object_type = spa_dict_lookup_item (props, "factory.type.name");
-@@ -81,8 +80,8 @@ registry_event_global_remove (void *user_data,
- g_hash_table_remove (remote->globals, GINT_TO_POINTER (id));
- }
-
--static const struct pw_registry_proxy_events registry_events = {
-- PW_VERSION_REGISTRY_PROXY_EVENTS,
-+static const struct pw_registry_events registry_events = {
-+ PW_VERSION_REGISTRY_EVENTS,
- .global = registry_event_global,
- .global_remove = registry_event_global_remove,
- };
-@@ -90,7 +89,7 @@ static const struct pw_registry_proxy_events registry_events = {
- void
- pipewire_remote_roundtrip (PipeWireRemote *remote)
- {
-- pw_core_proxy_sync (remote->core_proxy, ++remote->sync_seq);
-+ remote->sync_seq = pw_core_sync (remote->core, PW_ID_CORE, remote->sync_seq);
- pw_main_loop_run (remote->loop);
- }
-
-@@ -98,16 +97,13 @@ static gboolean
- discover_node_factory_sync (PipeWireRemote *remote,
- GError **error)
- {
-- struct pw_type *core_type = pw_core_get_type (remote->core);
-- struct pw_registry_proxy *registry_proxy;
-+ struct pw_registry *registry;
-
-- registry_proxy = pw_core_proxy_get_registry (remote->core_proxy,
-- core_type->registry,
-- PW_VERSION_REGISTRY, 0);
-- pw_registry_proxy_add_listener (registry_proxy,
-- &remote->registry_listener,
-- ®istry_events,
-- remote);
-+ registry = pw_core_get_registry (remote->core, PW_VERSION_REGISTRY, 0);
-+ pw_registry_add_listener (registry,
-+ &remote->registry_listener,
-+ ®istry_events,
-+ remote);
-
- pipewire_remote_roundtrip (remote);
-
-@@ -122,59 +118,35 @@ discover_node_factory_sync (PipeWireRemote *remote,
- }
-
- static void
--on_state_changed (void *user_data,
-- enum pw_remote_state old,
-- enum pw_remote_state state,
-- const char *error)
-+core_event_error (void *user_data,
-+ uint32_t id,
-+ int seq,
-+ int res,
-+ const char *message)
- {
- PipeWireRemote *remote = user_data;
-
-- switch (state)
-+ if (id == PW_ID_CORE)
- {
-- case PW_REMOTE_STATE_ERROR:
-- if (!remote->error)
-- {
-- g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "%s", error);
-- }
-+ g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED,
-+ "%s", message);
- pw_main_loop_quit (remote->loop);
-- break;
-- case PW_REMOTE_STATE_UNCONNECTED:
-- if (!remote->error)
-- {
-- g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "Disconnected");
-- }
-- pw_main_loop_quit (remote->loop);
-- break;
-- case PW_REMOTE_STATE_CONNECTING:
-- break;
-- case PW_REMOTE_STATE_CONNECTED:
-- pw_main_loop_quit (remote->loop);
-- break;
-- default:
-- g_warning ("Unknown PipeWire state");
-- break;
- }
- }
-
--static const struct pw_remote_events remote_events = {
-- PW_VERSION_REMOTE_EVENTS,
-- .state_changed = on_state_changed,
--};
--
- static void
- core_event_done (void *user_data,
-- uint32_t seq)
-+ uint32_t id, int seq)
- {
- PipeWireRemote *remote = user_data;
-
-- if (remote->sync_seq == seq)
-+ if (id == PW_ID_CORE && remote->sync_seq == seq)
- pw_main_loop_quit (remote->loop);
- }
-
--static const struct pw_core_proxy_events core_events = {
-- PW_VERSION_CORE_PROXY_EVENTS,
-+static const struct pw_core_events core_events = {
-+ PW_VERSION_CORE_EVENTS,
-+ .error = core_event_error,
- .done = core_event_done,
- };
-
-@@ -237,8 +209,8 @@ void
- pipewire_remote_destroy (PipeWireRemote *remote)
- {
- g_clear_pointer (&remote->globals, g_hash_table_destroy);
-- g_clear_pointer (&remote->remote, pw_remote_destroy);
-- g_clear_pointer (&remote->core, pw_core_destroy);
-+ g_clear_pointer (&remote->core, pw_core_disconnect);
-+ g_clear_pointer (&remote->context, pw_context_destroy);
- g_clear_pointer (&remote->loop, pw_main_loop_destroy);
- g_clear_error (&remote->error);
-
-@@ -307,68 +279,31 @@ pipewire_remote_new_sync (struct pw_properties *pipewire_properties,
- return NULL;
- }
-
-- remote->core = pw_core_new (pw_main_loop_get_loop (remote->loop), NULL);
-- if (!remote->core)
-+ remote->context = pw_context_new (pw_main_loop_get_loop (remote->loop), NULL, 0);
-+ if (!remote->context)
- {
- pipewire_remote_destroy (remote);
- pw_properties_free (pipewire_properties);
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "Couldn't create PipeWire core");
-+ "Couldn't create PipeWire context");
- return NULL;
- }
-
-- remote->remote = pw_remote_new (remote->core, pipewire_properties, 0);
-- if (!remote->remote)
-+ remote->core = pw_context_connect (remote->context, pipewire_properties, 0);
-+ if (!remote->core)
- {
- pipewire_remote_destroy (remote);
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "Couldn't create PipeWire remote");
-+ "Couldn't connect to PipeWire");
- return NULL;
- }
-
- remote->globals = g_hash_table_new_full (NULL, NULL, NULL, g_free);
-
-- pw_remote_add_listener (remote->remote,
-- &remote->remote_listener,
-- &remote_events,
-- remote);
--
-- if (pw_remote_connect (remote->remote) != 0)
-- {
-- pipewire_remote_destroy (remote);
-- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "Couldn't connect PipeWire remote");
-- return NULL;
-- }
--
-- pw_main_loop_run (remote->loop);
--
-- switch (pw_remote_get_state (remote->remote, NULL))
-- {
-- case PW_REMOTE_STATE_ERROR:
-- case PW_REMOTE_STATE_UNCONNECTED:
-- *error = g_steal_pointer (&remote->error);
-- pipewire_remote_destroy (remote);
-- return NULL;
-- case PW_REMOTE_STATE_CONNECTING:
-- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "PipeWire loop stopped unexpectedly");
-- pipewire_remote_destroy (remote);
-- return NULL;
-- case PW_REMOTE_STATE_CONNECTED:
-- break;
-- default:
-- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- "Unexpected PipeWire state");
-- pipewire_remote_destroy (remote);
-- return NULL;
-- }
--
-- remote->core_proxy = pw_remote_get_core_proxy (remote->remote);
-- pw_core_proxy_add_listener (remote->core_proxy,
-- &remote->core_listener,
-- &core_events,
-- remote);
-+ pw_core_add_listener (remote->core,
-+ &remote->core_listener,
-+ &core_events,
-+ remote);
-
- if (!discover_node_factory_sync (remote, error))
- {
-diff --git src/pipewire.h src/pipewire.h
-index 0f1bf54..bf48d5e 100644
---- src/pipewire.h
-+++ src/pipewire.h
-@@ -32,7 +32,7 @@ typedef struct _PipeWireGlobal
-
- typedef void (* PipeWireGlobalAddedCallback) (PipeWireRemote *remote,
- uint32_t id,
-- uint32_t type,
-+ const char *type,
- const struct spa_dict *props,
- gpointer user_data);
-
-@@ -43,13 +43,11 @@ typedef void (* PipeWireGlobalRemovedCallback) (PipeWireRemote *remote,
- struct _PipeWireRemote
- {
- struct pw_main_loop *loop;
-+ struct pw_context *context;
- struct pw_core *core;
-- struct pw_remote *remote;
-- struct spa_hook remote_listener;
--
-- struct pw_core_proxy *core_proxy;
- struct spa_hook core_listener;
-- uint32_t sync_seq;
-+
-+ int sync_seq;
-
- struct spa_hook registry_listener;
-
-diff --git src/screen-cast.c src/screen-cast.c
-index 7881ddc..1677050 100644
---- src/screen-cast.c
-+++ src/screen-cast.c
-@@ -31,10 +31,10 @@
- #include "xdp-impl-dbus.h"
- #include "xdp-utils.h"
-
--#define PERMISSION_ITEM(item_key, item_value) \
-- ((struct spa_dict_item) { \
-- .key = item_key, \
-- .value = item_value \
-+#define PERMISSION_ITEM(item_id, item_permissions) \
-+ ((struct pw_permission) { \
-+ .id = item_id, \
-+ .permissions = item_permissions \
- })
-
- typedef struct _ScreenCast ScreenCast;
-@@ -517,42 +517,9 @@ screen_cast_stream_get_pipewire_node_id (ScreenCastStream *stream)
- return stream->id;
- }
-
--static void
--append_parent_permissions (PipeWireRemote *remote,
-- GArray *permission_items,
-- GList **string_stash,
-- PipeWireGlobal *global,
-- const char *permission)
--{
-- PipeWireGlobal *parent;
-- char *parent_permission_value;
--
-- if (global->parent_id == 0)
-- return;
--
-- parent = g_hash_table_lookup (remote->globals, GINT_TO_POINTER (global->parent_id));
--
-- if (parent->permission_set)
-- return;
-- parent->permission_set = TRUE;
--
-- append_parent_permissions (remote, permission_items, string_stash,
-- parent, permission);
--
-- parent_permission_value = g_strdup_printf ("%u:%s",
-- global->parent_id,
-- permission);
-- *string_stash = g_list_prepend (*string_stash, parent_permission_value);
--
-- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
-- parent_permission_value));
--}
--
- static void
- append_stream_permissions (PipeWireRemote *remote,
- GArray *permission_items,
-- GList **string_stash,
- GList *streams)
- {
- GList *l;
-@@ -561,21 +528,10 @@ append_stream_permissions (PipeWireRemote *remote,
- {
- ScreenCastStream *stream = l->data;
- uint32_t stream_id;
-- PipeWireGlobal *stream_global;
-- char *stream_permission_value;
-
- stream_id = screen_cast_stream_get_pipewire_node_id (stream);
-- stream_global = g_hash_table_lookup (remote->globals,
-- GINT_TO_POINTER (stream_id));
--
-- append_parent_permissions (remote, permission_items, string_stash,
-- stream_global, "r--");
--
-- stream_permission_value = g_strdup_printf ("%u:rwx", stream_id);
-- *string_stash = g_list_prepend (*string_stash, stream_permission_value);
- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
-- stream_permission_value));
-+ PERMISSION_ITEM (stream_id, PW_PERM_RWX));
- }
- }
-
-@@ -587,9 +543,6 @@ open_pipewire_screen_cast_remote (const char *app_id,
- struct pw_properties *pipewire_properties;
- PipeWireRemote *remote;
- g_autoptr(GArray) permission_items = NULL;
-- char *node_factory_permission_string;
-- GList *string_stash = NULL;
-- struct spa_dict *permission_dict;
- PipeWireGlobal *node_global;
-
- pipewire_properties = pw_properties_new ("pipewire.access.portal.app_id", app_id,
-@@ -603,48 +556,31 @@ open_pipewire_screen_cast_remote (const char *app_id,
-
- permission_items = g_array_new (FALSE, TRUE, sizeof (struct spa_dict_item));
-
-- /*
-- * Hide all existing and future nodes (except the ones we explicitly list below.
-- */
-- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_EXISTING,
-- "---"));
-- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_DEFAULT,
-- "---"));
--
- /*
- * PipeWire:Interface:Core
- * Needs rwx to be able create the sink node using the create-object method
- */
- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
-- "0:rwx"));
-+ PERMISSION_ITEM (PW_ID_CORE, PW_PERM_RWX));
-
- /*
- * PipeWire:Interface:NodeFactory
- * Needs r-- so it can be passed to create-object when creating the sink node.
- */
-- node_factory_permission_string = g_strdup_printf ("%d:r--",
-- remote->node_factory_id);
-- string_stash = g_list_prepend (string_stash, node_factory_permission_string);
- g_array_append_val (permission_items,
-- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
-- node_factory_permission_string));
-- node_global = g_hash_table_lookup (remote->globals,
-- GINT_TO_POINTER (remote->node_factory_id));
-- append_parent_permissions (remote, permission_items, &string_stash,
-- node_global, "r--");
-+ PERMISSION_ITEM (remote->node_factory_id, PW_PERM_R));
-
-- append_stream_permissions (remote, permission_items, &string_stash, streams);
-+ append_stream_permissions (remote, permission_items, streams);
-
-- permission_dict =
-- &SPA_DICT_INIT ((struct spa_dict_item *) permission_items->data,
-- permission_items->len);
-- pw_core_proxy_permissions (pw_remote_get_core_proxy (remote->remote),
-- permission_dict);
-+ /*
-+ * Hide all existing and future nodes (except the ones we explicitly list above).
-+ */
-+ g_array_append_val (permission_items,
-+ PERMISSION_ITEM (PW_ID_ANY, 0));
-
-- g_list_free_full (string_stash, g_free);
-+ pw_client_update_permissions (pw_core_get_client(remote->core),
-+ permission_items->len,
-+ (const struct pw_permission *)permission_items->data);
-
- pipewire_remote_roundtrip (remote);
-
-@@ -943,7 +879,7 @@ handle_open_pipewire_remote (XdpScreenCast *object,
- }
-
- out_fd_list = g_unix_fd_list_new ();
-- fd = pw_remote_steal_fd (remote->remote);
-+ fd = pw_core_steal_fd (remote->core);
- fd_id = g_unix_fd_list_append (out_fd_list, fd, &error);
- close (fd);
- pipewire_remote_destroy (remote);
diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 1136b6a6e0e..b2b9d77727b 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,20 +1,23 @@
# Template file for 'xdg-desktop-portal'
pkgname=xdg-desktop-portal
-version=1.6.0
-revision=2
+version=1.8.0
+revision=1
build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --disable-libportal"
-hostmakedepends="automake libtool gettext-devel pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+hostmakedepends="pkg-config glib-devel"
+makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+ libportal-devel"
+checkdepends="dbus"
short_desc="Portal frontend service for Flatpak"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/flatpak/xdg-desktop-portal"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=883c9c9a925e48af54812b5347f546dd776ec2e27076a83d5a8126af6bafb9da
+checksum=a2fc5681b3a35078239072a98d6435a4c8404016730cab17c9febfd4ecec3610
-pre_configure() {
- autoreconf -vfi
+do_check() {
+ # some tests require a dbus session
+ make check || :
}
post_install() {
From e3114b3d156741a79fc6150b47ffdade745f8c30 Mon Sep 17 00:00:00 2001
From: Reg Tiangha <reg@reginaldtiangha.com>
Date: Thu, 19 Nov 2020 11:32:05 -0700
Subject: [PATCH 007/358] slack-desktop: update to 4.11.1
---
srcpkgs/slack-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 7624d15a5eb..482e2ff2a89 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'slack-desktop'
pkgname=slack-desktop
-version=4.11.0
+version=4.11.1
revision=1
archs="x86_64"
hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="custom:Proprietary"
homepage="https://slack.com/"
distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=ecfe313c75ceb01c8f142a90efa728a1009b5ade1bd7dd74b84fd05102ebccbe
+checksum=cf549741b6477cca74be04e56b96a8a9bfb02452ebd641d1c0aa286afb7883e4
restricted=yes
repository="nonfree"
nopie=yes
From 3c5ddbec6b3b726b1e9c6667caf0be23423d046e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 20 Nov 2020 00:55:59 +0100
Subject: [PATCH 008/358] musl: add patch for CVE-2020-28928
---
srcpkgs/musl/patches/CVE-2020-28928.patch | 64 +++++++++++++++++++++++
srcpkgs/musl/template | 2 +-
2 files changed, 65 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/patches/CVE-2020-28928.patch
diff --git a/srcpkgs/musl/patches/CVE-2020-28928.patch b/srcpkgs/musl/patches/CVE-2020-28928.patch
new file mode 100644
index 00000000000..9075ae1f897
--- /dev/null
+++ b/srcpkgs/musl/patches/CVE-2020-28928.patch
@@ -0,0 +1,64 @@
+--- src/multibyte/wcsnrtombs.c
++++ src/multibyte/wcsnrtombs.c
+@@ -1,41 +1,33 @@
+ #include <wchar.h>
++#include <limits.h>
++#include <string.h>
+
+ size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, size_t n, mbstate_t *restrict st)
+ {
+- size_t l, cnt=0, n2;
+- char *s, buf[256];
+ const wchar_t *ws = *wcs;
+- const wchar_t *tmp_ws;
+-
+- if (!dst) s = buf, n = sizeof buf;
+- else s = dst;
+-
+- while ( ws && n && ( (n2=wn)>=n || n2>32 ) ) {
+- if (n2>=n) n2=n;
+- tmp_ws = ws;
+- l = wcsrtombs(s, &ws, n2, 0);
+- if (!(l+1)) {
+- cnt = l;
+- n = 0;
++ size_t cnt = 0;
++ if (!dst) n=0;
++ while (ws && wn) {
++ char tmp[MB_LEN_MAX];
++ size_t l = wcrtomb(n<MB_LEN_MAX ? tmp : dst, *ws, 0);
++ if (l==-1) {
++ cnt = -1;
+ break;
+ }
+- if (s != buf) {
+- s += l;
++ if (dst) {
++ if (n<MB_LEN_MAX) {
++ if (l>n) break;
++ memcpy(dst, tmp, l);
++ }
++ dst += l;
+ n -= l;
+ }
+- wn = ws ? wn - (ws - tmp_ws) : 0;
+- cnt += l;
+- }
+- if (ws) while (n && wn) {
+- l = wcrtomb(s, *ws, 0);
+- if ((l+1)<=1) {
+- if (!l) ws = 0;
+- else cnt = l;
++ if (!*ws) {
++ ws = 0;
+ break;
+ }
+- ws++; wn--;
+- /* safe - this loop runs fewer than sizeof(buf) times */
+- s+=l; n-=l;
++ ws++;
++ wn--;
+ cnt += l;
+ }
+ if (dst) *wcs = ws;
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 6a0ac60b03c..a08ef9e0d89 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=4
+revision=5
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
From 32f9f1f9242cfdb3ed3224b5618e87ed4167e418 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 20 Nov 2020 00:59:15 +0100
Subject: [PATCH 009/358] musl-bootstrap: rebuild with patches including
CVE-2020-28928
---
srcpkgs/musl-bootstrap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 67cc82e1474..6f0e1b1ef68 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -1,7 +1,7 @@
# Template file for 'musl-bootstrap'.
pkgname=musl-bootstrap
version=1.1.24
-revision=1
+revision=2
lib32disabled=yes
wrksrc="musl-${version}"
build_style=configure
From 7fa2bf8e9c1fc4525700adc09328669bfb09882c Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 19 Nov 2020 08:06:02 -0500
Subject: [PATCH 010/358] chromium: update to 87.0.4280.66.
[ci skip]
- Built for x86_64, x86_64-musl, i686.
- Tested on x86_64.
---
.../files/musl-patches/no-mallinfo.patch | 10 +-
.../patches/chromium-86-nearby-include.patch | 24 ---
.../chromium-87-CursorFactory-include.patch | 36 +++++
...-87-ServiceWorkerContainerHost-crash.patch | 22 +++
.../chromium-87-openscreen-include.patch | 25 ++++
...remove-unsupported-compiler-warnings.patch | 22 +--
...le-accelerated-video-decode-on-Linux.patch | 43 ------
...-end-iterator-usage-in-CookieMonster.patch | 78 ----------
...k-to-the-i965-driver-if-we-re-on-iHD.patch | 139 ------------------
...move-dead-reloc-in-nonalloc-LD-flags.patch | 37 -----
...roto-fix-underflow-in-Fp1616ToDouble.patch | 37 -----
.../chromium/patches/xxx-ppc64le-libvpx.patch | 9 --
.../patches/xxx-ppc64le-support.patch | 26 ++--
srcpkgs/chromium/template | 4 +-
14 files changed, 104 insertions(+), 408 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/chromium-86-nearby-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
create mode 100644 srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 61d5d7a77ca..254a1f632da 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -9,14 +9,14 @@
struct mallinfo info = mallinfo();
DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
---- base/process/process_metrics_posix.cc.orig 2019-10-24 11:10:48.553159245 -0400
-+++ base/process/process_metrics_posix.cc 2019-10-24 11:14:29.025025854 -0400
-@@ -110,14 +110,14 @@
+--- base/process/process_metrics_posix.cc.orig 2020-11-18 23:50:33.958223497 -0500
++++ base/process/process_metrics_posix.cc 2020-11-18 23:53:52.024589316 -0500
+@@ -119,14 +119,14 @@
malloc_statistics_t stats = {0};
malloc_zone_statistics(nullptr, &stats);
return stats.size_in_use;
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(__GLIBC__) || defined(OS_ANDROID)
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
struct mallinfo minfo = mallinfo();
#if BUILDFLAG(USE_TCMALLOC)
return minfo.uordblks;
diff --git a/srcpkgs/chromium/patches/chromium-86-nearby-include.patch b/srcpkgs/chromium/patches/chromium-86-nearby-include.patch
deleted file mode 100644
index b200a7ebd96..00000000000
--- a/srcpkgs/chromium/patches/chromium-86-nearby-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a5b2ee9dd7dfb186e26ec6c0c06c2ae1a9d27195 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 18 Jul 2020 14:15:50 +0000
-Subject: [PATCH] IWYU: memcpy is defined in cstring
-
----
- third_party/nearby/src/cpp/platform_v2/base/byte_array.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/nearby/src/cpp/platform_v2/base/byte_array.h b/third_party/nearby/src/cpp/platform_v2/base/byte_array.h
-index ee5d0eb..4b1d79b 100644
---- third_party/nearby/src/cpp/platform_v2/base/byte_array.h
-+++ third_party/nearby/src/cpp/platform_v2/base/byte_array.h
-@@ -17,6 +17,7 @@
-
- #include <array>
- #include <cstdint>
-+#include <cstring>
- #include <string>
- #include <type_traits>
- #include <utility>
---
-2.26.2
-
diff --git a/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch b/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
new file mode 100644
index 00000000000..d345e584830
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
@@ -0,0 +1,36 @@
+From c4f6e8cd34a245c3640b86a91c9694d69594d80b Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 16 Sep 2020 15:05:02 +0000
+Subject: [PATCH] IWYU: ui::CursorFactory is now required independent from
+ Ozone
+
+---
+ .../ui/views/chrome_browser_main_extra_parts_views_linux.cc | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
+index 5a97d61..ccedd2a 100644
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
++++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
+@@ -7,6 +7,7 @@
+ #include "chrome/browser/themes/theme_service_aura_linux.h"
+ #include "chrome/browser/ui/browser_list.h"
+ #include "chrome/browser/ui/views/theme_profile_key.h"
++#include "ui/base/cursor/cursor_factory.h"
+ #include "ui/display/screen.h"
+ #include "ui/views/linux_ui/linux_ui.h"
+
+@@ -15,10 +16,6 @@
+ #include "ui/gtk/gtk_ui_delegate.h"
+ #endif
+
+-#if defined(USE_OZONE)
+-#include "ui/base/cursor/cursor_factory.h"
+-#endif
+-
+ #if defined(USE_X11)
+ #include "ui/gfx/x/connection.h" // nogncheck
+ #if BUILDFLAG(USE_GTK)
+--
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch b/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
new file mode 100644
index 00000000000..286b86691f1
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/750038
+Upstream bug: https://crbug.com/1135070
+
+--- content/browser/service_worker/service_worker_container_host.cc
++++ content/browser/service_worker/service_worker_container_host.cc
+@@ -626,6 +626,16 @@
+ int64_t registration_id) {
+ DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId());
+ DCHECK(base::Contains(registration_object_hosts_, registration_id));
++
++ // ServiceWorkerRegistrationObjectHost to be deleted may have the last reference to
++ // ServiceWorkerRegistration that indirectly owns this ServiceWorkerContainerHost.
++ // If we erase the object host directly from the map, |this| could be deleted
++ // during the map operation and may crash. To avoid the case, we take the
++ // ownership of the object host from the map first, and then erase the entry
++ // from the map. See https://crbug.com/1135070 for details.
++ std::unique_ptr<ServiceWorkerRegistrationObjectHost> to_be_deleted =
++ std::move(registration_object_hosts_[registration_id]);
++ DCHECK(to_be_deleted);
+ registration_object_hosts_.erase(registration_id);
+ }
+
diff --git a/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch b/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
new file mode 100644
index 00000000000..03ae0e9eda7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
@@ -0,0 +1,25 @@
+From 0c0af4cabb7490db473cd2c28f069956974a4d98 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 2 Oct 2020 12:11:58 +0000
+Subject: [PATCH] IWYU: uint8_t is defined in stdint.h
+
+---
+ third_party/openscreen/src/util/crypto/random_bytes.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/openscreen/src/util/crypto/random_bytes.h b/third_party/openscreen/src/util/crypto/random_bytes.h
+index 3cb2fa8..025b52c 100644
+--- third_party/openscreen/src/util/crypto/random_bytes.h
++++ third_party/openscreen/src/util/crypto/random_bytes.h
+@@ -7,6 +7,8 @@
+
+ #include <array>
+
++#include <stdint.h>
++
+ namespace openscreen {
+
+ std::array<uint8_t, 16> GenerateRandomBytes16();
+--
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
index 86a6e2d8fd7..4286b16b13f 100644
--- a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
+++ b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
@@ -1,28 +1,12 @@
---- build/config/compiler/BUILD.gn.orig 2020-10-09 11:20:12.892910174 -0400
-+++ build/config/compiler/BUILD.gn 2020-10-09 11:59:20.403349122 -0400
-@@ -1518,12 +1518,6 @@
- # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
- # recognize.
- cflags += [
-- # An ABI compat warning we don't care about, https://crbug.com/1102157
-- # TODO(thakis): Push this to the (few) targets that need it,
-- # instead of having a global flag.
-- "-Wno-psabi",
--
-- # Ignore warnings about MSVC optimization pragmas.
- # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
- "-Wno-ignored-pragma-optimize",
-
-@@ -1538,25 +1532,12 @@
+--- build/config/compiler/BUILD.gn.orig 2020-11-17 13:39:13.000000000 -0500
++++ build/config/compiler/BUILD.gn 2020-11-18 20:54:58.313154596 -0500
+@@ -1536,22 +1530,12 @@
# TODO(https://crbug.com/1028110): Evaluate and possible enable.
"-Wno-deprecated-copy",
-
- # TODO(https://crbug.com/1050281): Clean up, enable.
- "-Wno-non-c-typedef-for-linkage",
--
-- # TODO(https://crbug.com/1114873): Clean up, enable.
-- "-Wno-string-concatenation",
]
cflags_c += [
diff --git a/srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch b/srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch
deleted file mode 100644
index e7d05e84b04..00000000000
--- a/srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 54deb9811ca9bd2327def5c05ba6987b8c7a0897 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Tue, 29 Sep 2020 01:02:22 +0000
-Subject: [PATCH] Check for enable-accelerated-video-decode on Linux
-
-Video decoding was being accelerated on Linux even though the newly
-added "enable-accelerated-video-decode" flag was not specified. The
-chrome://gpu page was misleadingly showing this feature as disabled:
-
- > Video Decode: Software only. Hardware acceleration disabled
-
-This change adds a check for --enable-accelerated-video-decode when
-considering if video decoding should be activated. (Only on Linux.)
-
-Extra context: https://crbug.com/1097029#c18 (and also comment 20).
-
-Bug: 1066176, 1097029
-Change-Id: I534115f5f6ceed0ee3511fcf5c2d0f1dd04b9b7e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431434
-Reviewed-by: John Abd-El-Malek <jam@chromium.org>
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#811480}
----
- content/renderer/render_thread_impl.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index f13c94ddab7..0352f127171 100644
---- content/renderer/render_thread_impl.cc
-+++ content/renderer/render_thread_impl.cc
-@@ -1121,7 +1121,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl::GetGpuFactories() {
- kGpuStreamPriorityMedia);
-
- const bool enable_video_accelerator =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ cmd_line->HasSwitch(switches::kEnableAcceleratedVideoDecode) &&
-+#else
- !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-+#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
- (gpu_channel_host->gpu_feature_info()
- .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
- gpu::kGpuFeatureStatusEnabled);
diff --git a/srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch b/srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch
deleted file mode 100644
index 7494dc9b7c3..00000000000
--- a/srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 53478caee862624fc6d73516f8d64253854b146f Mon Sep 17 00:00:00 2001
-From: Piotr Tworek <ptworek@vewd.com>
-Date: Mon, 31 Aug 2020 21:03:58 +0000
-Subject: [PATCH] Fix invalid "end" iterator usage in CookieMonster.
-
-Commit 229623d76e8baf714c8569c9f4efc5de266cef8b has introduced the following
-code in cookie_monster.cc.
-
-// If this is the first cookie in |cookies_| with this key, increment the
-// |num_keys_| counter.
-bool different_prev =
- inserted == cookies_.begin() || std::prev(inserted)->first != key;
-bool different_next =
- inserted == cookies_.end() || std::next(inserted)->first != key;
-if (different_prev && different_next)
- ++num_keys_;
-
-The "inserted" iterator is something that has been returned from
-std::multimap::insert. At first glance it looks reasonable. The code
-tries to determine if there are already similar elements with the same
-key in the map. Unfortunately the expression calculating the value of
-different_next can potentially use the end iterator to the map. The
-"inserted == cookies_.end()" part of the expression will always evaluate
-to false since the newly inserted element has to be in the map and
-cookies_.end() points to the first element outside the map. If the
-inserted happens to be the last element in the map the second part of
-the expression will grab the end iterator by calling std::next(inserted)
-and then will try to use it leading to invalid memory access.
-
-Given the fact that cookies_ is a std::multimap we should not even need
-to calculate the value of different_next. It should always be true.
-
- "If the container has elements with equivalent key, inserts at the
- upper bound of that range.(since C++11)"
-
-See: https://en.cppreference.com/w/cpp/container/multimap/insert
-
-Bug: 1120240
-Change-Id: I8928c294ac4daf72349a2331b31b017c1d015da0
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368872
-Reviewed-by: Maksim Orlovich <morlovich@chromium.org>
-Commit-Queue: Piotr Tworek <ptworek@vewd.com>
-Cr-Commit-Position: refs/heads/master@{#803260}
----
- net/cookies/cookie_monster.cc | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
-index 265deed0e52..140b61a81dc 100644
---- net/cookies/cookie_monster.cc
-+++ net/cookies/cookie_monster.cc
-@@ -1151,9 +1151,14 @@ CookieMonster::CookieMap::iterator CookieMonster::InternalInsertCookie(
- // |num_keys_| counter.
- bool different_prev =
- inserted == cookies_.begin() || std::prev(inserted)->first != key;
-- bool different_next =
-- inserted == cookies_.end() || std::next(inserted)->first != key;
-- if (different_prev && different_next)
-+ // According to std::multiqueue documentation:
-+ // "If the container has elements with equivalent key, inserts at the upper
-+ // bound of that range. (since C++11)"
-+ // This means that "inserted" iterator either points to the last element in
-+ // the map, or the element succeeding it has to have different key.
-+ DCHECK(std::next(inserted) == cookies_.end() ||
-+ std::next(inserted)->first != key);
-+ if (different_prev)
- ++num_keys_;
-
- return inserted;
-@@ -1381,7 +1386,7 @@ void CookieMonster::InternalDeleteCookie(CookieMap::iterator it,
- bool different_prev =
- it == cookies_.begin() || std::prev(it)->first != it->first;
- bool different_next =
-- it == cookies_.end() || std::next(it)->first != it->first;
-+ std::next(it) == cookies_.end() || std::next(it)->first != it->first;
- if (different_prev && different_next)
- --num_keys_;
-
diff --git a/srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch b/srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
deleted file mode 100644
index 5c517e4a8eb..00000000000
--- a/srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From fbd756ab55f9351165f923b0411c31dd71319c78 Mon Sep 17 00:00:00 2001
-From: Ted Meyer <tmathmeyer@chromium.org>
-Date: Wed, 16 Sep 2020 17:42:03 +0000
-Subject: [PATCH] Only fall back to the i965 driver if we're on iHD
-
-I got my hands on an old AMD laptop, and the gallium driver worked very
-well and was saving power even at 720p, so there's no reason to block
-that for now.
-
-Bug: 1116703
-Change-Id: Ib15bc2b93f33e99adad7569dd825e167b503a0ea
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2409967
-Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
-Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#807550}
----
- media/gpu/vaapi/vaapi_wrapper.cc | 73 ++++++++++++++++++++------------
- 1 file changed, 47 insertions(+), 26 deletions(-)
-
-diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
-index 2ad0b997e56..e30d1dfb73b 100644
---- media/gpu/vaapi/vaapi_wrapper.cc
-+++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -409,6 +409,8 @@ class VADisplayState {
-
- // Implementation of Initialize() called only once.
- bool InitializeOnce() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
-+ bool InitializeVaDisplay_Locked() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
-+ bool InitializeVaDriver_Locked() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
-
- int refcount_ GUARDED_BY(va_lock_);
-
-@@ -472,11 +474,7 @@ bool VADisplayState::Initialize() {
- return success;
- }
-
--bool VADisplayState::InitializeOnce() {
-- static_assert(
-- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
-- "Requires VA-API >= 1.1.0");
--
-+bool VADisplayState::InitializeVaDisplay_Locked() {
- switch (gl::GetGLImplementation()) {
- case gl::kGLImplementationEGLGLES2:
- va_display_ = vaGetDisplayDRM(drm_fd_.get());
-@@ -519,25 +517,10 @@ bool VADisplayState::InitializeOnce() {
- return false;
- }
-
-- // Set VA logging level and driver name, unless already set.
-- constexpr char libva_log_level_env[] = "LIBVA_MESSAGING_LEVEL";
-- std::unique_ptr<base::Environment> env(base::Environment::Create());
-- if (!env->HasVar(libva_log_level_env))
-- env->SetVar(libva_log_level_env, "1");
--
--#if defined(USE_X11)
-- if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE) {
-- DCHECK(!features::IsUsingOzonePlatform());
-- constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
-- // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
-- // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
-- // is discussion of the issue here:
-- // https://github.com/intel/media-driver/issues/818
-- if (!env->HasVar(libva_driver_impl_env))
-- env->SetVar(libva_driver_impl_env, "i965");
-- }
--#endif // USE_X11
-+ return true;
-+}
-
-+bool VADisplayState::InitializeVaDriver_Locked() {
- // The VAAPI version.
- int major_version, minor_version;
- VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
-@@ -545,9 +528,6 @@ bool VADisplayState::InitializeOnce() {
- LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
- return false;
- }
--
-- va_initialized_ = true;
--
- const std::string va_vendor_string = vaQueryVendorString(va_display_);
- DLOG_IF(WARNING, va_vendor_string.empty())
- << "Vendor string empty or error reading.";
-@@ -555,6 +535,8 @@ bool VADisplayState::InitializeOnce() {
- << va_vendor_string;
- implementation_type_ = VendorStringToImplementationType(va_vendor_string);
-
-+ va_initialized_ = true;
-+
- // The VAAPI version is determined from what is loaded on the system by
- // calling vaInitialize(). Since the libva is now ABI-compatible, relax the
- // version check which helps in upgrading the libva, without breaking any
-@@ -571,6 +553,45 @@ bool VADisplayState::InitializeOnce() {
- return true;
- }
-
-+bool VADisplayState::InitializeOnce() {
-+ static_assert(
-+ VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
-+ "Requires VA-API >= 1.1.0");
-+
-+ // Set VA logging level, unless already set.
-+ constexpr char libva_log_level_env[] = "LIBVA_MESSAGING_LEVEL";
-+ std::unique_ptr<base::Environment> env(base::Environment::Create());
-+ if (!env->HasVar(libva_log_level_env))
-+ env->SetVar(libva_log_level_env, "1");
-+
-+ if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
-+ return false;
-+
-+#if defined(USE_X11)
-+ if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE &&
-+ implementation_type_ == VAImplementation::kIntelIHD) {
-+ DCHECK(!features::IsUsingOzonePlatform());
-+ constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
-+ // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
-+ // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
-+ // is discussion of the issue here:
-+ // https://github.com/intel/media-driver/issues/818
-+ if (!env->HasVar(libva_driver_impl_env))
-+ env->SetVar(libva_driver_impl_env, "i965");
-+
-+ // Re-initialize with the new driver.
-+ va_display_ = nullptr;
-+ va_initialized_ = false;
-+ implementation_type_ = VAImplementation::kInvalid;
-+
-+ if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
-+ return false;
-+ }
-+#endif // USE_X11
-+
-+ return true;
-+}
-+
- VAStatus VADisplayState::Deinitialize() {
- base::AutoLock auto_lock(va_lock_);
- VAStatus va_res = VA_STATUS_SUCCESS;
diff --git a/srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch b/srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch
deleted file mode 100644
index 4ad4f6e23bb..00000000000
--- a/srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 74b0cb5b86f7d7f8f7c1172d85b09096bef147b7 Mon Sep 17 00:00:00 2001
-From: Daniel Nicoara <dnicoara@chromium.org>
-Date: Thu, 24 Sep 2020 02:34:24 +0000
-Subject: [PATCH] Remove dead-reloc-in-nonalloc LD flags
-
-Breakpad change landed. Revert workaround.
-
-Bug: 1105559
-Test: components/crash/content/tools/generate_breakpad_symbols.py --build-dir=out/andrd --binary=out/andrd/lib.unstripped/libcontent_shell_content_view.so --symbols-dir=/tmp/foo --platform=android
-Change-Id: I519534002898a97b15a57b9b87ac78ef3f216dee
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427349
-Commit-Queue: Nico Weber <thakis@chromium.org>
-Reviewed-by: Nico Weber <thakis@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#810066}
----
- build/config/compiler/BUILD.gn | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index aa9eca20bd2..42839cfba3f 100644
---- build/config/compiler/BUILD.gn
-+++ build/config/compiler/BUILD.gn
-@@ -396,14 +396,6 @@ config("compiler") {
- "-Wl,--as-needed",
- ]
- }
-- if (use_lld && !is_chromeos_device) {
-- # TODO(thakis): Fix dump_syms to not need this and then remove it,
-- # https://crbug.com/1105559
-- ldflags += [
-- "-Wl,-z,dead-reloc-in-nonalloc=*=0",
-- "-Wl,-z,dead-reloc-in-nonalloc=.debug_ranges=1",
-- ]
-- }
- }
-
- # Linux-specific compiler flags setup.
diff --git a/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch b/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch
deleted file mode 100644
index 00300a4a919..00000000000
--- a/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5ade494a9966c7a9675af86dc42aca62fb4d806d Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Wed, 21 Oct 2020 22:02:35 +0000
-Subject: [PATCH] [XProto] Fix underflow in Fp1616ToDouble
-
-x11::Input::Fp1616 should be treated as a signed integer, otherwise
--1 will underflow to 65535. When dragging a scrollbar, this would
-cause the scrollbar to snap to the bottom when the cursor is dragged
-above the window's y=0 coordinate. Verified that the issue is fixed
-after this CL.
-
-BUG=1139623,1136352
-R=sky
-
-Change-Id: Ie318006ceadde9b9ce3e267fb453ddeba0e81da0
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485620
-Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Scott Violet <sky@chromium.org>
-Reviewed-by: Scott Violet <sky@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#819538}
----
- ui/events/x/events_x_utils.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ui/events/x/events_x_utils.cc b/ui/events/x/events_x_utils.cc
-index 3010db5f40c..856dfb221e7 100644
---- ui/events/x/events_x_utils.cc
-+++ ui/events/x/events_x_utils.cc
-@@ -376,7 +376,7 @@ base::TimeTicks TimeTicksFromXEvent(const x11::Event& xev) {
-
- // This is ported from libxi's FP1616toDBL in XExtInt.c
- double Fp1616ToDouble(x11::Input::Fp1616 x) {
-- auto x32 = static_cast<uint32_t>(x);
-+ auto x32 = static_cast<int32_t>(x);
- return x32 * 1.0 / (1 << 16);
- }
-
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
index b6a43980c04..792befb3a39 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
@@ -26,15 +26,6 @@ index 7198e59..3300485 100644
}
configs -= [ "//build/config/compiler:chromium_code" ]
-@@ -401,6 +403,8 @@ static_library("libvp9rc") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_ppc64
- }
- sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.cc" ]
- sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.h" ]
diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh
index bcf84b0..8a3f4f1 100755
--- third_party/libvpx/generate_gni.sh
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 1f5fca76ea3..b64640e0d1f 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3248,9 +3248,9 @@ index 9fc5db28..5f69f8dc 100644
diff --git third_party/crashpad/crashpad/util/posix/signals_test.cc third_party/crashpad/crashpad/util/posix/signals_test.cc
index 58bfa8f8..8fc37c46 100644
---- third_party/crashpad/crashpad/util/posix/signals_test.cc
-+++ third_party/crashpad/crashpad/util/posix/signals_test.cc
-@@ -46,12 +46,12 @@ bool CanCauseSignal(int sig) {
+--- third_party/crashpad/crashpad/util/posix/signals_test.cc.orig 2020-11-17 13:39:47.000000000 -0500
++++ third_party/crashpad/crashpad/util/posix/signals_test.cc 2020-11-18 21:06:33.433408623 -0500
+@@ -46,9 +46,9 @@
return sig == SIGABRT ||
sig == SIGALRM ||
sig == SIGBUS ||
@@ -3261,12 +3261,8 @@ index 58bfa8f8..8fc37c46 100644
+#endif // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
sig == SIGILL ||
--#endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL
-+#endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
- sig == SIGPIPE ||
- sig == SIGSEGV ||
- #if defined(OS_MACOSX)
-@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+ #endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@
break;
}
@@ -3279,7 +3275,7 @@ index 58bfa8f8..8fc37c46 100644
case SIGFPE: {
// Optimization makes this tricky, so get zero from a system call likely
// to succeed, and try to do something with the result.
-@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+@@ -137,7 +139,7 @@
fstat(quotient, &stat_buf);
break;
}
@@ -3544,9 +3540,9 @@ index 122e26ad..ec21dcb5 100644
defined(__ARMEB__) || defined(__AARCH64EB__)
diff --git third_party/webrtc/modules/desktop_capture/differ_block.cc third_party/webrtc/modules/desktop_capture/differ_block.cc
index dd9ab457..c005d959 100644
---- third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
+--- third_party/webrtc/modules/desktop_capture/differ_block.cc.orig 2020-11-17 13:42:02.000000000 -0500
++++ third_party/webrtc/modules/desktop_capture/differ_block.cc 2020-11-18 21:11:03.039905360 -0500
+@@ -30,11 +30,7 @@
static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
if (!diff_proc) {
@@ -3556,10 +3552,10 @@ index dd9ab457..c005d959 100644
- diff_proc = &VectorDifference_C;
-#else
+#if defined(WEBRTC_ARCH_X86_FAMILY)
- bool have_sse2 = WebRtc_GetCPUInfo(kSSE2) != 0;
+ bool have_sse2 = GetCPUInfo(kSSE2) != 0;
// For x86 processors, check if SSE2 is supported.
if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
+@@ -44,6 +40,10 @@
} else {
diff_proc = &VectorDifference_C;
}
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index e9db11e215c..b31a09ed1f6 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See http://www.chromium.org/developers/calendar for the latest version
-version=86.0.4240.193
+version=87.0.4280.66
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=203dd5097f5873cb4881e2e838034f0dac5ff13e7fafa286baf87937f8eca534
+checksum=29a8e4ea82edec2fdcf34ece68323bec7ab90f3d5669e6b77f58cff9c278f741
nocross=yes
lib32disabled=yes
From ef8fad206195ae8aa7b759863849778799d9f4ec Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 19 Nov 2020 12:51:05 -0500
Subject: [PATCH 011/358] chromium-widevine: update to 87.0.4280.66.
---
srcpkgs/chromium-widevine/INSTALL | 2 +-
srcpkgs/chromium-widevine/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chromium-widevine/INSTALL b/srcpkgs/chromium-widevine/INSTALL
index aff7dc79c3c..a8de96756c4 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
# INSTALL
-checksum=fc4a4717ddf9623eeb2ebd4cf0f3a845a20fab34bb2831af2a264507b6432ef4
+checksum=e7e4c6a2108140c572562867f522d0311a25ce03ea36c5452cb8431865871226
_baseUrl="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable"
_filename="google-chrome-stable_${VERSION%_*}-1_amd64.deb"
DISTFILE="${_baseUrl}/${_filename}"
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index 03908e02ca5..66626f83af3 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
_channel="stable"
pkgname=chromium-widevine
-version=86.0.4240.193
+version=87.0.4280.66
revision=1
archs="x86_64"
create_wrksrc=yes
From 0e3d8c0e62c622d9898a4fa008de75fddbcc7e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 19 Nov 2020 23:43:25 -0300
Subject: [PATCH 012/358] elfutils: fix vmove for libdebuginfod.
Applications linked against libdebuginfod will be linked against its
soname, which is a symlink that was ending up in the libelf subpackage.
---
srcpkgs/elfutils/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index a2a10ab6e63..3dfea2970a5 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,7 +1,7 @@
# Template file for 'elfutils'
pkgname=elfutils
version=0.182
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--program-prefix=eu-"
hostmakedepends="automake libtool pkg-config"
@@ -14,6 +14,8 @@ license="GPL-3.0-or-later"
homepage="https://sourceware.org/elfutils/"
distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
checksum=ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858
+# subpackages require explicit ordering
+subpackages="debuginfod libdebuginfod libelf elfutils-devel"
CFLAGS="-Wno-error"
CXXFLAGS="-Wl,-z,stack-size=2097152"
@@ -38,7 +40,7 @@ pre_configure() {
libdebuginfod_package() {
short_desc+=" - debuginfod library"
pkg_install() {
- vmove "usr/lib/libdebuginfod-*.so*"
+ vmove "usr/lib/libdebuginfod*.so*"
vmove etc/profile.d
}
}
From 222ac12f8b64e013c8cfd0b6a895fba4c072944d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Nov 2020 15:41:15 +0100
Subject: [PATCH 013/358] tcsh: update to 6.22.03.
---
srcpkgs/tcsh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index 2979c859232..ba88789c632 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,6 +1,6 @@
# Template file for 'tcsh'
pkgname=tcsh
-version=6.22.02
+version=6.22.03
revision=1
build_style=gnu-configure
conf_files="/etc/csh.login /etc/csh.cshrc"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://www.tcsh.org/"
distfiles="http://ftp.astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b
+checksum=be2cfd653d2a0c7f506d2dd14c12324ba749bd484037be6df44a3973f52262b7
register_shell="/bin/tcsh /bin/csh"
CFLAGS="-fcommon"
From 36ea0175b78be345d4e52cffd042be8b11481f71 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Nov 2020 16:08:26 +0100
Subject: [PATCH 014/358] erlang: update to 23.1.3.
---
srcpkgs/erlang/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2364220ebf4..6fb84cb0a8b 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
# Template file for 'erlang'
pkgname=erlang
-version=23.1.2
+version=23.1.3
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=afff83ab51830cb7d9ed995d0c98a3947896471cde9af000befd78b390f109be
+checksum=291e0852b71ca593f4015417f6e44c08638633c5af6648bd26582c8590390433
subpackages="erlang-doc"
if [ -z "$CROSS_BUILD" ]; then
From fce72d3d72aed8199c9eae8f70993037e252a954 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 20 Nov 2020 10:56:44 +0100
Subject: [PATCH 015/358] perl-Search-Xapian: update to 1.2.25.4.
---
srcpkgs/perl-Search-Xapian/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Search-Xapian/template b/srcpkgs/perl-Search-Xapian/template
index fd7bcb15ace..6e7a8db4a20 100644
--- a/srcpkgs/perl-Search-Xapian/template
+++ b/srcpkgs/perl-Search-Xapian/template
@@ -1,7 +1,7 @@
# Template build file for 'perl-Search-Xapian'
pkgname=perl-Search-Xapian
-version=1.2.25.2
-revision=3
+version=1.2.25.4
+revision=1
wrksrc="Search-Xapian-$version"
build_style=perl-module
hostmakedepends="perl"
@@ -12,6 +12,6 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
homepage="https://metacpan.org/release/Search-Xapian"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
distfiles="${CPAN_SITE}/Search/Search-Xapian-${version}.tar.gz"
-checksum=24955a284279fdbc5a324a5b73b09585ae506932be19a7105e114834e243ea42
+checksum=871943199b80efd98e31f4b4711bb070a576c91be692193d8a43affad64574dd
make_build_args='CC=$(CXX)' # ugh
From 998dbc6ab2157520cb673806b35d6c55b7c576fd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 20 Nov 2020 11:00:55 +0100
Subject: [PATCH 016/358] crash: update to 7.2.9.
---
srcpkgs/crash/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index d1961f950f4..2326da52c3e 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,7 +1,7 @@
# Template file for 'crash'
pkgname=crash
-version=7.2.8
-revision=2
+version=7.2.9
+revision=1
archs="i686 x86_64" # broken on musl
build_style=gnu-makefile
hostmakedepends="flex tar wget"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://crash-utility.github.io/"
changelog="https://crash-utility.github.io/crash.changelog.html"
distfiles="https://github.com/crash-utility/crash/archive/${version}.tar.gz"
-checksum=996d3367764c77e23921c164725e4d0221acc7a15a92a3f825053ea37f2452dc
+checksum=6c07634f7357906dcb21ff3decd1760d7b0b1a11c01472cd17aba2e67f3ce16e
nocross=yes
LDFLAGS=-llzo2
From 32d1c2848a193bca5de9fca212efbf22ecb3ca06 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 20 Nov 2020 11:04:51 +0100
Subject: [PATCH 017/358] ipset: update to 7.9.
---
common/shlibs | 2 +-
srcpkgs/ipset/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9a576f18d0f..70a762811dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3645,7 +3645,7 @@ libgaminggearwidget.so.0 libgaminggear-0.15.1_1
libopkg.so.1 libopkg-0.4.0_1
libkodiplatform.so.18.0 kodi-platform-17.1.0_1
libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
-libipset.so.12 libipset-7.7_1
+libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
libliquid.so.1 liquid-dsp-1.3.1_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 6a47b78c6cc..3b892b478f0 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
# Template file for 'ipset'
pkgname=ipset
-version=7.7
+version=7.9
revision=1
build_style=gnu-configure
configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="http://ipset.netfilter.org/"
distfiles="${homepage}${pkgname}-${version}.tar.bz2"
-checksum=45a50d581ba4d6688081e2b0328245914ba9807f8ec682c1aa619040d1316c32
+checksum=b75c13689eddf1d95b396840a69dc04fd7ae4112b10b70594bc0405df7b9b30a
libipset_package() {
short_desc+=" - library files"
From 04f041907b165418a82087a24760e75fe123f5d3 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 20 Nov 2020 07:37:31 +0100
Subject: [PATCH 018/358] kotlin-bin: update to 1.4.20.
---
srcpkgs/kotlin-bin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kotlin-bin/template b/srcpkgs/kotlin-bin/template
index 40760715daf..5492c2eb096 100644
--- a/srcpkgs/kotlin-bin/template
+++ b/srcpkgs/kotlin-bin/template
@@ -1,6 +1,6 @@
# Template file for 'kotlin-bin'
pkgname=kotlin-bin
-version=1.4.10
+version=1.4.20
revision=1
archs="x86_64"
wrksrc=kotlinc
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="Apache-2.0"
homepage="https://kotlinlang.org/"
distfiles="https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"
-checksum=bb1a21d70e521a01ae104e99a082a6e7bb58699b86347049da521d175d0dace7
+checksum=11db93a4d6789e3406c7f60b9f267eba26d6483dcd771eff9f85bb7e9837011f
nostrip=yes
replaces="kotlin>=0"
From 470b8b546c2c80d852311e48f7f7699b9bb1e9ae Mon Sep 17 00:00:00 2001
From: xXR01I1Xx <xxr01i1xx@tuta.io>
Date: Mon, 8 Jun 2020 18:34:18 +0200
Subject: [PATCH 019/358] New package: emptty-0.3.0
---
srcpkgs/emptty/template | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/emptty/template
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
new file mode 100644
index 00000000000..c68a5c53eb1
--- /dev/null
+++ b/srcpkgs/emptty/template
@@ -0,0 +1,23 @@
+# Template file for 'emptty'
+pkgname=emptty
+version=0.3.0
+revision=1
+build_style=go
+go_import_path=github.com/tvrzna/emptty
+makedepends="pam-devel libX11-devel"
+short_desc="Dead simple Display Manager running in CLI as TTY login"
+maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
+license="MIT"
+homepage="https://github.com/tvrzna/emptty"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=fa8a6336e150f0f74813ccf71817228deed9e06f1c8362e41634def959ff6c2b
+conf_files="/etc/emptty/conf /etc/pam.d/emptty"
+
+post_install() {
+ vinstall res/pam 644 etc/pam.d emptty
+ vinstall res/runit-run 755 etc/sv/emptty run
+ vinstall res/conf 644 etc/emptty
+ vman res/emptty.1
+ vlicense LICENSE
+ ln -s /run/runit/supervise.emptty ${DESTDIR}/etc/sv/emptty/supervise
+}
From c334ab92ac6106a224f2e9816ed34fa803d7e542 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 20 Nov 2020 07:38:39 +0100
Subject: [PATCH 020/358] git-secret: update to 0.3.3.
---
srcpkgs/git-secret/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/git-secret/template b/srcpkgs/git-secret/template
index 01541c9b061..4dcb69ebf6a 100644
--- a/srcpkgs/git-secret/template
+++ b/srcpkgs/git-secret/template
@@ -1,8 +1,7 @@
# Template file for 'git-secret'
pkgname=git-secret
-version=0.3.2
+version=0.3.3
revision=1
-archs=noarch
build_style=gnu-makefile
make_install_args="PREFIX=/usr"
depends="bash gawk gnupg coreutils"
@@ -11,7 +10,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="MIT"
homepage="http://git-secret.io/"
distfiles="https://github.com/sobolevn/git-secret/archive/v${version}.tar.gz"
-checksum=07b32b096e5ff5b4818096b1858c1f69df4684bb0f256e620514cf88f44ded85
+checksum=d8c19a5cbd174e95484a4233605985dd3b060a8a83d14d41c3bad1d534c6ab39
do_install() {
vbin git-secret
From a529644d002fd6637b5776eaa3d0039cafecf864 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, 20 Nov 2020 23:59:17 +0700
Subject: [PATCH 021/358] imapfilter: fix build
---
srcpkgs/imapfilter/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 850327bba1d..77e36d4d1e5 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -3,7 +3,7 @@ pkgname=imapfilter
version=2.6.12
revision=5
build_style=gnu-makefile
-make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr"
+make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
hostmakedepends="lua53-devel"
makedepends="pcre-devel lua53-devel libressl-devel"
short_desc="Mail filtering utility"
@@ -13,6 +13,8 @@ homepage="https://github.com/lefcha/imapfilter"
distfiles="https://github.com/lefcha/imapfilter/archive/v${version}.tar.gz"
checksum=764a68c737e555d7b164644a4c491fd66cffb93d6077d58f502b94e1a022a884
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/lua5.3"
+
post_configure() {
sed -i \
-e '/^MANDIR/s:/man:/share/man:' \
From 89095c1e44ee6ed095c2e101474ecd28d097a7e3 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Nov 2020 12:46:01 -0500
Subject: [PATCH 022/358] neomutt: update to 20201120.
---
srcpkgs/neomutt/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 25c57cea6cc..786c88fab1d 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
# Template file for 'neomutt'
pkgname=neomutt
-version=20200925
+version=20201120
revision=1
wrksrc="neomutt-${version}"
create_wrksrc=true
@@ -23,7 +23,7 @@ homepage="https://neomutt.org/"
_test_files_hash=8629adab700a75c54e8e28bf05ad092503a98f75
distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="dcec98ea2454d7695ff92184c33a0051c2b3c46320f81f7889c4580c943140dd
+checksum="48191d4f17cb1e5fd094ca92c581e1bb9599f058c122cc0e35df4e1c0cb53f47
a53d6447cf4e8f60bd9a3caf68a1cfe1bfda878b5bcb8c60b965b5214de73ff9"
python_version=3
@@ -41,7 +41,7 @@ esac
post_install() {
# move dist to examples dir
- vsconf contrib/gpg.rc Muttrc.gpg.dist
+ vsconf contrib/samples/gpg.rc Muttrc.gpg.dist
}
pre_check() {
From e4a4874470816e075b4018b05f4fb00576c2e9ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 20 Nov 2020 14:34:15 -0500
Subject: [PATCH 023/358] python3-pyopencl: update to 2020.3.1.
---
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 43a5a3b8426..49ef0a074a7 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pyopencl'
pkgname=python3-pyopencl
-version=2020.3
+version=2020.3.1
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=4aa3031c17fc99aa2f3018ef2c9e1d535c3cfdc7a01bb987b1ea3826ef42bd59
+checksum=abc689307cf34d3dcc94d43815f64e2265469b50ecce6c903a3180589666fb36
do_configure() {
./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \
From 93d1df37f47783c87a7ce9e62967d326c93dac48 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Tue, 17 Nov 2020 08:58:33 -0700
Subject: [PATCH 024/358] youtube-dl: update to 2020.11.19
---
srcpkgs/youtube-dl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 54187e923c8..8f2945c9934 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
# Template file for 'youtube-dl'
pkgname=youtube-dl
-version=2020.11.12
+version=2020.11.19
revision=1
wrksrc="${pkgname}"
build_style=python3-module
@@ -11,9 +11,9 @@ short_desc="CLI program to download videos from YouTube and other sites"
maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
license="Unlicense"
homepage="https://yt-dl.org"
-changelog="https://gitlab.com/dstftw/youtube-dl/-/raw/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
distfiles="${homepage}/downloads/latest/${pkgname}-${version}.tar.gz"
-checksum=aeb00b2079c4711de7eea2a91f6923ebade84c5e985b0caeb47d572395d42831
+checksum=f8c14d9eb2fd8fe7242de8b96f2c918810867c518a162405644f483dcd14be9e
do_check() {
PYTHON=/usr/bin/python3 make offlinetest
From 0a0a26374948a54ea4ed9fd21cf8ae433be72e69 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 20 Nov 2020 21:54:08 +0100
Subject: [PATCH 025/358] libostree: update to 2020.8.
---
srcpkgs/libostree/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index df9fd6e8bba..abad94721be 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,14 +1,17 @@
# Template file for 'libostree'
pkgname=libostree
-version=2020.3
-revision=2
+version=2020.8
+revision=1
build_style=gnu-configure
build_helper="gir"
-configure_args="--with-builtin-grub2-mkconfig --with-openssl
+configure_args="
+ --with-builtin-grub2-mkconfig
+ --with-ed25519-libsodium
+ --with-openssl
$(vopt_enable gir introspection)"
hostmakedepends="bison docbook-xsl glib-devel libxslt pkg-config"
makedepends="e2fsprogs-devel fuse-devel glib-devel gpgme-devel libarchive-devel
- libsoup-devel $(vopt_if gir 'gobject-introspection')"
+ libsoup-devel libsodium-devel $(vopt_if gir 'gobject-introspection')"
checkdepends="attr-progs cpio elfutils python3-yaml"
short_desc="Operating system and container binary deployment and upgrades"
maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -16,7 +19,7 @@ license="LGPL-2.0-or-later"
homepage="https://ostree.readthedocs.io/en/latest/"
changelog="https://github.com/ostreedev/ostree/releases"
distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"
-checksum=5877396ea092f5b6701c17bd20280746cad20f55a94c760dbeba0fa115818c05
+checksum=fdaa5992d0a6f62157152355449ac8476c50df6602be398e9ad10438cc1e679b
build_options="gir"
build_options_default="gir"
From d804bd04bd4585eba65d4c5f639ec349dccf45fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 16:24:31 +0100
Subject: [PATCH 026/358] wlroots: update to 0.12.0
---
common/shlibs | 2 +-
srcpkgs/wlroots/template | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 70a762811dd..e7c727838ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3565,7 +3565,7 @@ libcodecore.so.0 libio.elementary.code-3.0_1
libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1
libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1
-libwlroots.so.6 wlroots-0.11.0_1
+libwlroots.so.7 wlroots-0.12.0_1
libbaseencode.so.1 libbaseencode-1.0.9_1
libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index 8968bba8cef..a73b5f21a13 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,13 +1,13 @@
# Template file for 'wlroots'
pkgname=wlroots
-version=0.11.0
-revision=2
+version=0.12.0
+revision=1
build_style=meson
-configure_args="-Dlogind=enabled -Dlogind-provider=elogind
+configure_args="-Dlogind=disabled -Dlibseat=enabled
-Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled
-Dx11-backend=enabled -Dexamples=false"
hostmakedepends="pkg-config wayland-devel"
-_devel_depends="MesaLib-devel elogind-devel eudev-libudev-devel libdrm-devel
+_devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols
xcb-util-errors-devel xcb-util-wm-devel"
makedepends="${_devel_depends}
@@ -18,7 +18,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
license="MIT"
homepage="https://github.com/swaywm/wlroots"
distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz"
-checksum=a7645e77229aab4942748c621be8bdb8b073d94f35f3e032b867246862bf2d01
+checksum=c9e9f4f6d2f526d0b2886daf3ec37e64831773059aa669fb98a88522a1626bdb
post_install() {
vlicense LICENSE
From 0824958a1b7993e9f128ecdfc32aa260d0617e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 18:26:29 +0100
Subject: [PATCH 027/358] cage: disable SUID
---
srcpkgs/cage/INSTALL.msg | 6 ++++++
srcpkgs/cage/template | 10 +++-------
2 files changed, 9 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/cage/INSTALL.msg
diff --git a/srcpkgs/cage/INSTALL.msg b/srcpkgs/cage/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/cage/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index a4085ac8483..960ccfac215 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,12 +1,12 @@
# Template file for 'cage'
pkgname=cage
version=0.1.2.1
-revision=2
+revision=3
build_style=meson
configure_args="$(vopt_bool xwayland xwayland)"
hostmakedepends="pkg-config wayland-devel scdoc"
makedepends="wlroots-devel"
-depends="$(vopt_if xwayland xorg-server-xwayland) $(vopt_if elogind elogind)"
+depends="$(vopt_if xwayland xorg-server-xwayland)"
short_desc="Kiosk compositor for Wayland"
maintainer="Illia Shestakov <ishestakov@airmail.cc>"
license="MIT"
@@ -14,14 +14,10 @@ homepage="https://www.hjdskes.nl/projects/cage/"
distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz"
checksum=38a3e3968f00cc58fe1d9448e972cfac7d1efa30c48699f09032f264101a55ac
-build_options="elogind xwayland"
+build_options="xwayland"
build_options_default="xwayland"
desc_option_xwayland="Enable Xwayland support in cage"
post_install() {
- if [ -z "$build_option_elogind" ]; then
- # must be setuid without logind!
- chmod u+s ${DESTDIR}/usr/bin/cage
- fi
vlicense LICENSE
}
From 2b66fdcc3c42ef618fbc4f5d03752ea590c8900b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 18:31:14 +0100
Subject: [PATCH 028/358] hikari: disable suid
---
srcpkgs/hikari/INSTALL.msg | 6 ++++++
srcpkgs/hikari/template | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/hikari/INSTALL.msg
diff --git a/srcpkgs/hikari/INSTALL.msg b/srcpkgs/hikari/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/hikari/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index b071ccf75bb..0828aa3aade 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,13 +1,13 @@
# Template file for 'hikari'
pkgname=hikari
version=2.2.2
-revision=1
+revision=2
build_style=gnu-makefile
make_cmd=bmake
make_use_env=yes
make_build_args="WITH_POSIX_C_SOURCE=YES WITH_XWAYLAND=YES
WITH_SCREENCOPY=YES WITH_GAMMACONTROL=YES WITH_LAYERSHELL=YES ETC_PREFIX="
-make_install_args="ETC_PREFIX="
+make_install_args="ETC_PREFIX= WITHOUT_SUID=YES"
hostmakedepends="bmake pkg-config wayland-devel"
makedepends="wlroots-devel pango-devel cairo-devel pam-devel glib-devel libucl-devel"
short_desc="Stacking Wayland compositor with tiling features"
From a9035fff540fd120f2948ed5b06873d5e0b0d00f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:01:36 +0100
Subject: [PATCH 029/358] wf-config: update to 0.6.0
---
srcpkgs/wf-config/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index ce7fce82dc1..bc6a2c8b870 100644
--- a/srcpkgs/wf-config/template
+++ b/srcpkgs/wf-config/template
@@ -1,6 +1,6 @@
# Template file for 'wf-config'
pkgname=wf-config
-version=0.5.0
+version=0.6.0
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
license="MIT"
homepage="https://wayfire.org"
distfiles="https://github.com/WayfireWM/wf-config/archive/${version}.tar.gz"
-checksum=bf690477ff0d8928ddeca6a278b9153a39ade1e13fd32cc6d04552db4d65cbf0
+checksum=73af6d803044d4e5907974ece019ae0d1b4020a057f6c27be0594fb70d86653b
post_install() {
vlicense LICENSE
From 1924d3a33f106fa32eddc71b2c673c0a3d12fe97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:38:01 +0100
Subject: [PATCH 030/358] wayfire: update to 0.6.0
---
srcpkgs/wayfire/INSTALL.msg | 9 ++++---
srcpkgs/wayfire/patches/fix_switcher.patch | 30 ++++++++++++++++++++++
srcpkgs/wayfire/template | 23 +++++++++--------
3 files changed, 47 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/wayfire/patches/fix_switcher.patch
diff --git a/srcpkgs/wayfire/INSTALL.msg b/srcpkgs/wayfire/INSTALL.msg
index 164d23c2b3a..05274ffcc3a 100644
--- a/srcpkgs/wayfire/INSTALL.msg
+++ b/srcpkgs/wayfire/INSTALL.msg
@@ -1,5 +1,6 @@
-Before running Wayfire, copy the default configuration file to your user:
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
- cp /usr/share/examples/wayfire/wayfire.ini ~/.config/wayfire.ini
-
-You also probably want to install elogind, then restart your computer
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/wayfire/patches/fix_switcher.patch b/srcpkgs/wayfire/patches/fix_switcher.patch
new file mode 100644
index 00000000000..a09e43d12e6
--- /dev/null
+++ b/srcpkgs/wayfire/patches/fix_switcher.patch
@@ -0,0 +1,30 @@
+--- plugins/single_plugins/switcher.cpp 2020-11-18 15:30:44.970379825 +0100
++++ plugins/single_plugins/switcher.cpp 2020-11-18 15:30:31.068223026 +0100
+@@ -201,7 +201,8 @@ class WayfireSwitcher : public wf::plugi
+ active = true;
+
+ // grabs shouldn't fail if we could successfully activate plugin
+- assert(grab_interface->grab());
++ auto grab = grab_interface->grab();
++ assert(grab);
+
+ focus_next(dir);
+ arrange();
+--- src/view/layer-shell.cpp 2020-11-18 15:30:44.970379825 +0100
++++ src/view/layer-shell.cpp 2020-11-18 15:30:40.404328323 +0100
+@@ -1,5 +1,6 @@
+ #include <algorithm>
+ #include <cstring>
++#include <cstdlib>
+
+ #include "xdg-shell.hpp"
+ #include "wayfire/core.hpp"
+@@ -69,7 +70,7 @@ wf::workspace_manager::anchored_edge anc
+ return wf::workspace_manager::ANCHORED_EDGE_RIGHT;
+ }
+
+- assert(false);
++ abort();
+ }
+
+ struct wf_layer_shell_manager
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index c48069fdb11..22c5494af07 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,23 +1,26 @@
# Template file for 'wayfire'
pkgname=wayfire
-version=0.5.0
+version=0.6.0
revision=2
-_utils_commit=f9b5eba437a04a0d1fb9f00a0fdb88c12b9f6b27
+_utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
+_touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
build_style=meson
hostmakedepends="pkg-config wayland-devel"
makedepends="wf-config-devel wlroots-devel cairo-devel
$(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
-depends="xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="xorg-server-xwayland"
short_desc="3D wayland compositor"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://wayfire.org"
distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz
- https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz"
-checksum="24c1a2c963dac5af762f87cd024bc3dd736ec9a28a6735d357a05e8f6502e8aa
- 5c3e8bfefd74083a2548b6a95a070000cf73591bfe78335413da5c7fb82340cb"
+ https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz
+ https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz"
+checksum="9c2bf92e6aecc9b800b87e4c086ff7a275393f7315501b8c39196baf9d245b33
+ d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1
+ 2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be"
-build_options="elogind image"
+build_options="image"
build_options_default="image"
desc_option_image="Enable JPEG and PNG support"
@@ -27,14 +30,12 @@ fi
post_extract() {
rmdir subprojects/wf-utils
+ rmdir subprojects/wf-touch
mv ../wf-utils-${_utils_commit} subprojects/wf-utils
+ mv ../wf-touch-${_touch_commit} subprojects/wf-touch
}
post_install() {
- if [ -z "$build_option_elogind" ]; then
- # must be setuid without logind!
- chmod u+s ${DESTDIR}/usr/bin/wayfire
- fi
vlicense LICENSE
vsconf wayfire.ini
vinstall wayfire.desktop 0644 usr/share/wayland-sessions
From 152bc4c24ca33e37e1b942bb5d7087715b83578a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:45:24 +0100
Subject: [PATCH 031/358] wayfire-plugins-extra: update to 0.6.0
---
srcpkgs/wayfire-plugins-extra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index 2eaa4bbbea6..ff0e06c655c 100644
--- a/srcpkgs/wayfire-plugins-extra/template
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -1,6 +1,6 @@
# Template file for 'wayfire-plugins-extra'
pkgname=wayfire-plugins-extra
-version=0.5.0
+version=0.6.0
revision=1
build_style=meson
hostmakedepends="pkg-config wayland-devel"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://wayfire.org/"
distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/${version}.tar.gz"
-checksum=64c56ffa66df26a7cbee1af41c34ae123abe8252deeaf02687237688a8281a9e
+checksum=d1ac42c0b2d212a7523f2aeb63285ab8b95ffb6efd564bf27877310eeab1ab0e
post_install() {
vlicense LICENSE
From d089caa31fc928475a414752ec7835bde57ae896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Tue, 10 Nov 2020 17:43:47 +0100
Subject: [PATCH 032/358] sway: update to 1.5.1
---
srcpkgs/sway/INSTALL.msg | 6 ++++++
srcpkgs/sway/template | 15 ++++-----------
2 files changed, 10 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/sway/INSTALL.msg
diff --git a/srcpkgs/sway/INSTALL.msg b/srcpkgs/sway/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/sway/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index fa8e1850c50..4255e6ed724 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,21 +1,19 @@
# Template file for 'sway'
pkgname=sway
-version=1.5
-revision=2
+version=1.5.1
+revision=1
build_style=meson
conf_files="/etc/sway/config"
hostmakedepends="pkg-config wayland-devel scdoc git"
makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel
gdk-pixbuf-devel"
-depends="swaybg xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="swaybg xorg-server-xwayland"
short_desc="Tiling Wayland compositor compatible with i3"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://swaywm.org"
distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=c80644774d612d7d377093d4990061d36c36673862c06318a7b0e37fa47b0178
-
-build_options="elogind"
+checksum=095f983c9a5f80d761bc2fb19df8166839b9290124ccd47f3e74119a1335490f
post_patch() {
vsed -e 's/werror=true/werror=false/g' -i meson.build
@@ -23,10 +21,6 @@ post_patch() {
post_install() {
vlicense LICENSE
- if [ -z "$build_option_elogind" ]; then
- # must be setuid without logind!
- chmod u+s ${DESTDIR}/usr/bin/sway
- fi
vbin contrib/grimshot
vman contrib/grimshot.1
}
@@ -34,7 +28,6 @@ post_install() {
grimshot_package() {
short_desc="Helper for screenshots within sway"
depends="grim slurp sway wl-clipboard jq libnotify"
- archs="noarch"
pkg_install() {
vmove usr/bin/grimshot
vmove usr/share/man/man1/grimshot.1
From 093f15cb7215a8505880ede0019619f4cc493165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Tue, 10 Nov 2020 20:21:04 +0100
Subject: [PATCH 033/358] wcm: update to 0.6.0
---
srcpkgs/wcm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index d74eba5e556..b32e76ccff1 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -1,6 +1,6 @@
# Template file for 'wcm'
pkgname=wcm
-version=0.5.0
+version=0.6.0
revision=1
build_style=meson
hostmakedepends="pkg-config wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://wayfire.org/"
distfiles="https://github.com/WayfireWM/wcm/archive/v${version}.tar.gz"
-checksum=9cfcceefc838c8a0d547f5e40206901b282680da02a96490f756f7ad7da79341
+checksum=bfead0b617f46306ad3bc15b8e9c7e8f13996de6b5bdd3f2d18f066a9033740f
post_install() {
vlicense LICENSE
From 205e8941086da3ddebfff064ee3efa302d563566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Fri, 13 Nov 2020 11:19:28 +0100
Subject: [PATCH 034/358] wofi: update to 1.2.3
---
srcpkgs/wofi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wofi/template b/srcpkgs/wofi/template
index 4c21a047785..80863c765ef 100644
--- a/srcpkgs/wofi/template
+++ b/srcpkgs/wofi/template
@@ -1,7 +1,7 @@
# Template file for 'wofi'
pkgname=wofi
-version=1.2.2
-revision=2
+version=1.2.3
+revision=1
wrksrc="${pkgname}-v${version}"
build_style=meson
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://hg.sr.ht/~scoopta/wofi"
distfiles="https://hg.sr.ht/~scoopta/wofi/archive/v${version}.tar.gz"
-checksum=@4e5193fe7eb29d08ee0249aa1d6dbb343b9b1fe54b11abfeb06f7c2015270431
+checksum=@3ef3ff39eb6c72f20a70486a40f0060150044b701db84489f9773f309673f8e7
From de47cff73e89427c3965516c0bf854c8b03b5d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Wed, 18 Nov 2020 15:21:02 +0100
Subject: [PATCH 035/358] wf-shell: update to 0.6.1
---
srcpkgs/wf-shell/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index f88d967d172..47f0a42376b 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -1,9 +1,10 @@
# Template file for 'wf-shell'
pkgname=wf-shell
-version=0.5.0
+version=0.6.1
revision=1
build_style=meson
build_helper="gir"
+configure_args="-Dwayland-logout:implementation=c"
hostmakedepends="gobject-introspection pkg-config wayland-devel"
makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel wayfire-devel
gtk+3-devel gtk-layer-shell-devel"
@@ -11,8 +12,8 @@ short_desc="Wayfire shell with GTK-based panel and background client"
maintainer="Young Jin Park <youngjinpark20@gmail.com>"
license="MIT"
homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wf-shell/releases/download/${version}/wf-shell-${version}.tar.xz"
-checksum=fa481e867784b94b08857ec7bd27bf43251490d5d50c1e834e7ea64d908792f0
+distfiles="https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz"
+checksum=da8e5a16dde8f44966d41449452bcc7bc2466d5945324aca714ecc82827c884a
post_install() {
vlicense LICENSE
From 8dabe9df6c9ecca2660697484070018890349501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 20 Nov 2020 13:13:28 -0300
Subject: [PATCH 036/358] autoconf_cache/musl-linux: fix sigprocmask value.
It was "1", should have been "yes". This fixes building gettext.
---
common/environment/configure/autoconf_cache/musl-linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/environment/configure/autoconf_cache/musl-linux b/common/environment/configure/autoconf_cache/musl-linux
index 396c51c538c..58cc913109c 100644
--- a/common/environment/configure/autoconf_cache/musl-linux
+++ b/common/environment/configure/autoconf_cache/musl-linux
@@ -40,7 +40,7 @@ gl_cv_func_gettimeofday_posix_signature=yes
gl_cv_func_lseek_pipe=yes
gl_cv_func_mbrtowc_retval=yes
gl_cv_func_posix_spawn_works=yes
-gl_cv_func_sigprocmask=1
+gl_cv_func_sigprocmask=yes
gl_cv_func_spawnattr_setschedparam=yes
gl_cv_func_spawnattr_setschedpolicy=yes
gl_cv_func_stat_dir_slash=yes
From 27aaada9a92e900be760f0910aed5e27b04b6378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 20 Nov 2020 18:57:56 -0300
Subject: [PATCH 037/358] srcpkgs: remove execute permission from leftover
templates.
---
srcpkgs/aspell-pl/template | 0
srcpkgs/colord-kde/template | 0
srcpkgs/dolphin-plugins/template | 0
srcpkgs/emacs/template | 0
srcpkgs/font-vazir/template | 0
srcpkgs/libtd/template | 0
6 files changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 srcpkgs/aspell-pl/template
mode change 100755 => 100644 srcpkgs/colord-kde/template
mode change 100755 => 100644 srcpkgs/dolphin-plugins/template
mode change 100755 => 100644 srcpkgs/emacs/template
mode change 100755 => 100644 srcpkgs/font-vazir/template
mode change 100755 => 100644 srcpkgs/libtd/template
diff --git a/srcpkgs/aspell-pl/template b/srcpkgs/aspell-pl/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/colord-kde/template b/srcpkgs/colord-kde/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/font-vazir/template b/srcpkgs/font-vazir/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
old mode 100755
new mode 100644
From 5112644b3c374b267c9233b46989eaf5fbf10324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 16 Nov 2020 23:42:30 -0300
Subject: [PATCH 038/358] Disable Travis CI.
- Remove .travis.yml, common/travis/docker.sh.
- Change references to travis to be more generic.
- Manual.md: Orient against using CI logs in broken= or nocross=.
---
.travis.yml | 41 -----------------------------------------
Manual.md | 6 ++----
README.md | 2 +-
common/travis/docker.sh | 18 ------------------
xbps-src | 2 +-
5 files changed, 4 insertions(+), 65 deletions(-)
delete mode 100644 .travis.yml
delete mode 100755 common/travis/docker.sh
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 42ef134aa4d..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-language: bash
-dist: bionic
-
-git:
- depth: 200
-
-env:
- global:
- - PATH=$PATH:/tmp/bin
- - DOCKER_BASE=voidlinux/masterdir
- - TAG=20200607RC01
-
- matrix:
- - XLINT=1 LICENSE_LIST=common/travis/license.lst
- - ARCH=x86_64 BOOTSTRAP=x86_64
- - ARCH=i686 BOOTSTRAP=i686
- - ARCH=aarch64 BOOTSTRAP=x86_64
- - ARCH=armv7l BOOTSTRAP=x86_64
- - ARCH=x86_64-musl BOOTSTRAP=x86_64-musl
- - ARCH=armv6l-musl BOOTSTRAP=x86_64-musl
- - ARCH=aarch64-musl BOOTSTRAP=x86_64-musl
-
-install:
- - common/travis/docker.sh
-
-before_script:
- - common/travis/set_mirror.sh
- - common/travis/prepare.sh
- - common/travis/fetch_upstream.sh
- - common/travis/changed_templates.sh
- - common/travis/fetch-xtools.sh
- - common/travis/xlint.sh
-
-script:
- - if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/build.sh $BOOTSTRAP $ARCH; fi
-
-after_script:
- - if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/show_files.sh $BOOTSTRAP $ARCH; fi
-
-notifications:
- email: false
diff --git a/Manual.md b/Manual.md
index 0833d5fdd1c..c520d06c133 100644
--- a/Manual.md
+++ b/Manual.md
@@ -631,8 +631,7 @@ in /usr/share directory specified by absolute path, which are expected and allow
specified by absolute path, which are expected and allowed to contain machine code files.
- `nocross` If set, cross compilation won't be allowed and will exit immediately.
-This should be set to a string describing why it fails, or a link to a travis
-buildlog demonstrating the failure.
+This should be set to a string describing why it fails, or a link to a buildlog (from the official builders, CI buildlogs can vanish) demonstrating the failure.
- `restricted` If set, xbps-src will refuse to build the package unless
`etc/conf` has `XBPS_ALLOW_RESTRICTED=yes`. The primary builders for Void
@@ -645,8 +644,7 @@ to override the guessed list. Only use this if a specific order of subpackages i
otherwise the default would work in most cases.
- `broken` If set, building the package won't be allowed because its state is currently broken.
-This should be set to a string describing why it is broken, or a link to a travis
-buildlog demonstrating the failure.
+This should be set to a string describing why it is broken, or a link to a buildlog demonstrating the failure.
- `shlib_provides` A white space separated list of additional sonames the package provides on.
This appends to the generated file rather than replacing it.
diff --git a/README.md b/README.md
index 9238b1918ef..ce2d49d2a4a 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ into a `masterdir` that is used as its main `chroot` directory. `xbps-src` suppo
multiple utilities to accomplish this task:
- `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with travis).
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
- `proot(1)` - utility that implements chroot/bind mounts in user space, see https://proot-me.github.io/.
diff --git a/common/travis/docker.sh b/common/travis/docker.sh
deleted file mode 100755
index 9b98b42c016..00000000000
--- a/common/travis/docker.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# docker.sh
-
-[ "$XLINT" ] && exit 0
-
-DOCKER_NAME=${DOCKER_NAME:-void}
-
-/bin/echo -e "\x1b[32mPulling docker image $DOCKER_BASE-$BOOTSTRAP:$TAG...\x1b[0m"
-docker pull $DOCKER_BASE-$BOOTSTRAP:$TAG
-docker run -d \
- --name $DOCKER_NAME \
- -v "$(pwd)":/hostrepo \
- -v /tmp:/tmp \
- -e XLINT="$XLINT" \
- -e PATH="$PATH" \
- $DOCKER_BASE-$BOOTSTRAP:$TAG \
- /bin/sh -c 'sleep inf'
diff --git a/xbps-src b/xbps-src
index 3cd19dc42ec..ad999439d3a 100755
--- a/xbps-src
+++ b/xbps-src
@@ -486,7 +486,7 @@ if [ -z "$IN_CHROOT" ]; then
fi
# Forbid root unless XBPS_ALLOW_CHROOT_BREAKOUT is set
-# (for travis CI).
+# (for CI).
if [ -z "$IN_CHROOT" -a "$UID" -eq 0 -a -z "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
echo "ERROR: xbps-src cannot be used as root." 1>&2
exit 1
From bb013ceeb85e7b754ee992bfa987b656f4ebe8b7 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 12 Nov 2020 19:21:04 +0100
Subject: [PATCH 039/358] wireshark: update to 3.4.0
---
common/shlibs | 6 +++---
srcpkgs/wireshark/template | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e7c727838ab..8b31eaafdc4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1625,9 +1625,9 @@ libdovecot-lda.so.0 dovecot-2.2.11_2
libnetapi.so.0 samba-3.6.23_1
libsmbsharemodes.so.0 samba-3.6.23_1
libmysqld.so.18 libmariadbclient-5.5.36_1
-libwiretap.so.10 libwireshark-3.2.0_1
-libwireshark.so.13 libwireshark-3.2.0_1
-libwsutil.so.11 libwireshark-3.2.0_1
+libwiretap.so.11 libwireshark-3.4.0_1
+libwireshark.so.14 libwireshark-3.4.0_1
+libwsutil.so.12 libwireshark-3.4.0_1
libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1
libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1
libKF5Prison.so.5 prison-5.43.0_1
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index e8615545c6b..7e6e9e24218 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,6 +1,6 @@
# Template file for 'wireshark'
pkgname=wireshark
-version=3.2.7
+version=3.4.0
revision=1
build_style=cmake
hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.wireshark.org"
distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz"
-checksum=be832fb86d9c455c5be8b225a755cdc77cb0e92356bdfc1fe4b000d93f7d70da
+checksum=67e4ebbd9153fc589fd67dc21b93176674c73adc3d5a43934c3ac69d8594a8ae
system_groups="wireshark"
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
From 368ce206b3f69861dce30156cbf2deacb4d85496 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 21:30:13 +0100
Subject: [PATCH 040/358] xterm: update to 362.
---
srcpkgs/xterm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 5ece04ebed9..00e9362f1ba 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
# Template file for 'xterm'
pkgname=xterm
-version=361
+version=362
revision=1
build_style=gnu-configure
configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -20,7 +20,7 @@ license="MIT"
homepage="http://invisible-island.net/xterm/"
changelog="http://invisible-island.net/xterm/xterm.log.html"
distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=85610f20d5e47205cc1b6876f7a4da28d6ae051bd8eac0b932e92c37a73a623f
+checksum=1d4ffe226fa8f021859bbc3007788ff63a46a31242d9bd9a7bd7ebe24e81aca2
post_install() {
for f in {u,}xterm.desktop; do
From 56b8a2e615a7d25469da79e05168db49137c334d 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, 21 Nov 2020 07:24:03 +0700
Subject: [PATCH 041/358] mutt: update to 2.0.2. CVE-2020-28896
---
srcpkgs/mutt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 11b690bfab9..6003181d3b7 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
# Template file for 'mutt'
pkgname=mutt
-version=2.0.1
+version=2.0.2
revision=1
build_style=gnu-configure
configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="http://www.mutt.org"
changelog="http://mutt.org/relnotes/${version%.*}"
distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=0cf5fdea5616f655b101de3b5ed45412bc2cc721d517466ca6c645a829b021db
+checksum=471218babe97968a45704f1e1e17523c4620ad1f92bae4143a4c9749ab1411c8
post_install() {
# provided by mime-types
From df8f4f0c65bf8af7f98ebafb45d031c6c42a99fc 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, 19 Nov 2020 23:16:50 +0700
Subject: [PATCH 042/358] choosenim: update to 0.7.4.
---
...3cd106185441604a55ef34968a2a37d6258a.patch | 25 -----
...ba5b72f8434eb690ae3b84f43968b8041a95.patch | 22 ----
srcpkgs/choosenim/patches/ftbfs.patch | 56 ----------
.../choosenim/patches/system-libarchive.patch | 103 ++++++++++++++++++
srcpkgs/choosenim/template | 42 ++++---
5 files changed, 132 insertions(+), 116 deletions(-)
delete mode 100644 srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch
delete mode 100644 srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch
delete mode 100644 srcpkgs/choosenim/patches/ftbfs.patch
create mode 100644 srcpkgs/choosenim/patches/system-libarchive.patch
diff --git a/srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch b/srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch
deleted file mode 100644
index a7445e39527..00000000000
--- a/srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cfc83cd106185441604a55ef34968a2a37d6258a Mon Sep 17 00:00:00 2001
-From: Dominik Picheta <dominikpicheta@googlemail.com>
-Date: Mon, 14 Oct 2019 21:09:23 +0100
-Subject: [PATCH] Fixes #142.
-
-Fixes regression in choosenim install script.
----
- scripts/choosenim-unix-init.sh | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/scripts/choosenim-unix-init.sh b/scripts/choosenim-unix-init.sh
-index a60b74b..89912cf 100755
---- scripts/choosenim-unix-init.sh
-+++ scripts/choosenim-unix-init.sh
-@@ -59,9 +59,8 @@ install() {
- fi
-
- # Install Nim from desired channel.
-- "$temp_prefix/$filename" $CHOOSE_VERSION --firstInstall -y < /dev/tty
-+ "$temp_prefix/$filename" $CHOOSE_VERSION --firstInstall < /dev/tty
- else
-- # TODO: Use the -y switch when choosenim gets support for it.
- "$temp_prefix/$filename" $CHOOSE_VERSION --firstInstall -y
- fi
-
diff --git a/srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch b/srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch
deleted file mode 100644
index a9e8c153eb2..00000000000
--- a/srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f7aeba5b72f8434eb690ae3b84f43968b8041a95 Mon Sep 17 00:00:00 2001
-From: Dominik Picheta <dominikpicheta@gmail.com>
-Date: Sun, 21 Apr 2019 20:29:41 +0100
-Subject: [PATCH] Fixes osinfo dependency conflict.
-
----
- choosenim.nimble | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/choosenim.nimble b/choosenim.nimble
-index d826357..b775d88 100644
---- choosenim.nimble
-+++ choosenim.nimble
-@@ -15,7 +15,7 @@ skipExt = @["nim"]
-
- requires "nim >= 0.16.1", "nimble >= 0.8.5", "untar >= 0.1.0"
- requires "libcurl >= 1.0.0"
--requires "analytics >= 0.1.1"
-+requires "analytics >= 0.2.0"
- requires "osinfo >= 0.3.0"
-
- task test, "Run the choosenim tester!":
diff --git a/srcpkgs/choosenim/patches/ftbfs.patch b/srcpkgs/choosenim/patches/ftbfs.patch
deleted file mode 100644
index f5bbc6ace2b..00000000000
--- a/srcpkgs/choosenim/patches/ftbfs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 53472069126088cd1d23d84aa4fdee9dc780f7d2
-Author: q66 <daniel@octaforge.org>
-Date: Tue Dec 17 22:21:04 2019 +0100
-
- fix build: undeclared identifier: 'NimbleError'
-
-diff --git choosenim.nimble choosenim.nimble
-index d826357..b91fac8 100644
---- choosenim.nimble
-+++ choosenim.nimble
-@@ -13,7 +13,7 @@ skipExt = @["nim"]
-
- # Dependencies
-
--requires "nim >= 0.16.1", "nimble >= 0.8.5", "untar >= 0.1.0"
-+requires "nim >= 0.16.1", "nimble#5bb795a", "untar >= 0.1.0"
- requires "libcurl >= 1.0.0"
- requires "analytics >= 0.1.1"
- requires "osinfo >= 0.3.0"
-diff --git src/choosenim/common.nim src/choosenim/common.nim
-index 197bfac..059d210 100644
---- src/choosenim/common.nim
-+++ src/choosenim/common.nim
-@@ -1,4 +1,4 @@
--import nimblepkg/common
-+import nimblepkg/version
-
- type
- ChooseNimError* = object of NimbleError
-@@ -19,4 +19,4 @@ const
- "g++",
- "gdb",
- "ld"
-- ]
-\ No newline at end of file
-+ ]
-diff --git src/choosenim/proxyexe.nim src/choosenim/proxyexe.nim
-index 9c9c761..829df8f 100644
---- src/choosenim/proxyexe.nim
-+++ src/choosenim/proxyexe.nim
-@@ -4,7 +4,7 @@
-
- import strutils, os, osproc
-
--import nimblepkg/[cli, options]
-+import nimblepkg/[cli, options, version]
- import nimblepkg/common as nimbleCommon
- import cliparams
- from common import ChooseNimError, mingwProxies
-@@ -71,4 +71,4 @@ when isMainModule:
-
- display("Info:", "If unexpected, please report this error to " &
- "https://github.com/dom96/choosenim", Warning, HighPriority)
-- quit(1)
-\ No newline at end of file
-+ quit(1)
diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
new file mode 100644
index 00000000000..a102f0c13b3
--- /dev/null
+++ b/srcpkgs/choosenim/patches/system-libarchive.patch
@@ -0,0 +1,103 @@
+diff --git choosenim.nimble choosenim.nimble
+index 7ba9b36..dc47faa 100644
+--- choosenim.nimble
++++ choosenim.nimble
+@@ -14,7 +14,7 @@ skipExt = @["nim"]
+ # Dependencies
+
+ requires "nim >= 1.2.6", "nimble#8f7af86"
+-requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
++requires "nimterop >= 0.6.12"
+ #requires "libcurl >= 1.0.0" - OSX now uses httpclient
+ requires "analytics >= 0.2.0"
+ requires "osinfo >= 0.3.0"
+diff --git nimarchive/nimarchive/archive.nim nimarchive/nimarchive/archive.nim
+index 1d45140..d5361e0 100644
+--- nimarchive/nimarchive/archive.nim
++++ nimarchive/nimarchive/archive.nim
+@@ -2,28 +2,6 @@ import os, strutils
+
+ import nimterop/[build, cimport]
+
+-const
+- baseDir = getProjectCacheDir("nimarchive" / "libarchive")
+-
+- defs = """
+- archiveStatic
+- archiveJBB
+- archiveSetVer=3.4.3
+-
+- iconvStatic
+- iconvStd
+- iconvJBB
+- iconvSetVer=1.16.0
+- """
+-
+-setDefines(defs.splitLines())
+-
+-getHeader(
+- header = "archive.h",
+- outdir = baseDir,
+- jbburi = "LibArchive",
+- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=LibArchive-v$1/ skip=libiconv"
+-)
+
+ import iconv
+
+@@ -52,9 +30,7 @@ static:
+ cSkipSymbol(@["archive_read_open_file", "archive_write_open_file"])
+
+ let
+- archiveEntryPath {.compileTime.} = archivePath[0 .. ^3] & "_entry.h"
++ archivePath {.compileTime.} = "archive.h"
++ archiveEntryPath {.compileTime.} = "archive_entry.h"
+
+-when archiveStatic:
+- cImport(@[archivePath, archiveEntryPath], recurse = true)
+-else:
+- cImport(@[archivePath, archiveEntryPath], recurse = true, dynlib = archiveLPath)
++cImport(@[archivePath, archiveEntryPath], recurse = false)
+diff --git nimarchive/nimarchive/iconv.nim nimarchive/nimarchive/iconv.nim
+index d983398..4f61a5b 100644
+--- nimarchive/nimarchive/iconv.nim
++++ nimarchive/nimarchive/iconv.nim
+@@ -2,15 +2,3 @@ import os, strutils
+
+ import nimterop/build
+
+-const
+- baseDir = getProjectCacheDir("nimarchive" / "iconv")
+-
+-getHeader(
+- header = "iconv.h",
+- dlurl = "https://ftp.gnu.org/gnu/libiconv/libiconv-$1.tar.gz",
+- conanuri = "libiconv",
+- jbburi = "Libiconv",
+- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=Libiconv-v$1/",
+- outdir = baseDir,
+- conFlags = "--enable-static=yes --with-pic=yes"
+-)
+diff --git src/choosenimpkg/ssl.nim src/choosenimpkg/ssl.nim
+index f20b246..7576066 100644
+--- src/choosenimpkg/ssl.nim
++++ src/choosenimpkg/ssl.nim
+@@ -2,19 +2,3 @@ import strutils
+
+ import nimterop/[build, cimport]
+
+-# Download openssl from JuliaBinaryWrappers
+-setDefines(@[
+- "cryptoJBB", "cryptoStatic"
+-])
+-
+-getHeader(
+- "crypto.h",
+- jbburi = "openssl",
+- outdir = getProjectCacheDir("nimopenssl")
+-)
+-
+-const
+- sslLPath = cryptoLPath.replace("crypto", "ssl")
+-
+-# Link static binaries
+-{.passL: sslLPath & " " & cryptoLPath.}
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d31e065edf0..fb5e9152b22 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,20 +1,22 @@
# Template file for 'choosenim'
pkgname=choosenim
-version=0.4.0
+version=0.7.4
revision=1
-hostmakedepends="git nim"
-makedepends="libressl-devel zlib-devel"
+hostmakedepends="git nim libressl-devel pkg-config"
+makedepends="libressl-devel zlib-devel libarchive-devel"
depends="gcc"
short_desc="Nim toolchain installer"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="MIT"
homepage="https://github.com/dom96/choosenim"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d7b04314666a3647c255f89031deabe53f8e281b6cfbf3a0848272fc1799c0f3
+distfiles="${homepage}/archive/v${version}.tar.gz>choosenim-${version}.tar.gz
+ https://github.com/genotrance/nimarchive/archive/v0.5.4.tar.gz>nimarchive-0.5.4.tar.gz"
+checksum="0e78a59cfb3cf7926f8dff3a4215949ccfaecd6c6dddc3b2e062098b5da03edb
+ c38e8c66c2eac2bc021d450f2b60d0e45c5355df963d0133930448639c0bd8d4"
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" libressl-devel"
-fi
+post_extract() {
+ mv ../nimarchive-0.5.4 nimarchive
+}
do_build() {
local arch args
@@ -26,14 +28,28 @@ do_build() {
ppc64*) arch=powerpc64;;
ppc*) arch=powerpc;;
esac
+ LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
+ LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
+ LDFLAGS+=" -lrt -ldl"
+ : >nim.cfg
+ if [ -z "$CROSS_BUILD" ]; then
+ cat >>nim.cfg <<-EOF
+ gcc.options.always = "$CPPFLAGS $CFLAGS -pthread"
+ gcc.options.linker = "$LDFLAGS"
+ EOF
+ fi
if [ -n "$arch" ]; then
- cat > nim.cfg <<EOF
-$arch.linux.gcc.exe = "$CC"
-$arch.linux.gcc.linkerexe = "$CC"
-EOF
+ cat >>nim.cfg <<-EOF
+ $arch.linux.gcc.exe = "$CC"
+ $arch.linux.gcc.linkerexe = "$CC"
+ $arch.linux.gcc.options.always = "$CPPFLAGS $CFLAGS -pthread"
+ $arch.linux.gcc.options.linker = "$LDFLAGS"
+ EOF
args="--cpu:$arch"
fi
- nimble -y build -d:release --passC:-flto "$args"
+ ln -sf $XBPS_CROSS_BASE/usr/include/archive.h src
+ ln -sf $XBPS_CROSS_BASE/usr/include/archive_entry.h src
+ nimble -y build -d:release --passC:-flto "$args" --path:$wrksrc/nimarchive
}
do_install() {
From d5eb739bed3358c52d33ef6f9610b6409189465d 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, 19 Nov 2020 22:07:29 +0700
Subject: [PATCH 043/358] JAI: move to restricted
The license requires us to defend and indemnify Sun and its licensors.
---
srcpkgs/JAI/template | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/JAI/template b/srcpkgs/JAI/template
index ce50a8c183c..2b7fcb61068 100644
--- a/srcpkgs/JAI/template
+++ b/srcpkgs/JAI/template
@@ -1,12 +1,21 @@
# Template file for 'JAI'
pkgname=JAI
version=1.1.3
-revision=3
+revision=4
+archs="i686 x86_64"
short_desc="Java Advanced Imaging Library - binary version"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
-license="Apache-2.0"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+license="custom:Oracle Binary Code License"
homepage="https://java.net/projects/jai-core"
-archs="i686 x86_64"
+repository=nonfree
+# DISTRIBUTIONREADME-jai.txt
+# (e) You agree to defend and indemnify Sun and its licensors from and against
+# any damages, costs, liabilities, settlement amounts and/or expenses
+# (including attorneys' fees) incurred in connection with any claim, lawsuit or
+# action by any third party that arises or results from the use or distribution
+# of any and all Programs and/or Redistributable.
+restricted=yes
+ignore_elf_dirs="/usr/share/java/lib"
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
_arch="amd64"
@@ -32,5 +41,7 @@ do_install() {
vcopy lib/libmlib_jai.so usr/share/java/lib/${_jarch}
# put the license files in place
vmkdir usr/share/licenses/${pkgname}
- vcopy *-jai.txt usr/share/licenses/${pkgname}
+ for _license in *.txt; do
+ vlicense "$_license"
+ done
}
From 39d305301c3a56f35d4dc567f4cfdb3018fbf1c6 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, 21 Nov 2020 09:29:10 +0700
Subject: [PATCH 044/358] katarakt: fix build for poppler-qt5 20.09.0
---
.../katarakt/patches/not-an-octal-number.patch | 15 +++++++++++++++
srcpkgs/katarakt/template | 12 ++++--------
2 files changed, 19 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/katarakt/patches/not-an-octal-number.patch
diff --git a/srcpkgs/katarakt/patches/not-an-octal-number.patch b/srcpkgs/katarakt/patches/not-an-octal-number.patch
new file mode 100644
index 00000000000..95b9f016951
--- /dev/null
+++ b/srcpkgs/katarakt/patches/not-an-octal-number.patch
@@ -0,0 +1,15 @@
+--- katarakt.pro.orig 2020-11-21 07:57:05.333858604 +0700
++++ katarakt.pro 2020-11-21 07:58:23.713527253 +0700
+@@ -17,9 +17,9 @@
+
+ isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config # same as in link_pkgconfig.prf
+ POPPLER_VERSION = $$system($$PKG_CONFIG --modversion $$POPPLER)
+- POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1)
+- POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2)
+- POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3)
++ POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1 | sed 's/^0*//' | sed 's/^$/0/')
++ POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2 | sed 's/^0*//' | sed 's/^$/0/')
++ POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3 | sed 's/^0*//' | sed 's/^$/0/')
+
+ DEFINES += POPPLER_VERSION_MAJOR=$$POPPLER_VERSION_MAJOR
+ DEFINES += POPPLER_VERSION_MINOR=$$POPPLER_VERSION_MINOR
diff --git a/srcpkgs/katarakt/template b/srcpkgs/katarakt/template
index 48e528c8d97..13fc25ba662 100644
--- a/srcpkgs/katarakt/template
+++ b/srcpkgs/katarakt/template
@@ -1,23 +1,19 @@
# Template file for 'katarakt'
pkgname=katarakt
version=0.2
-revision=2
+revision=3
wrksrc="katarakt-v${version}"
build_style=qmake
-hostmakedepends="qt5-qmake pkg-config asciidoc"
+hostmakedepends="qt5-qmake pkg-config asciidoc qt5-host-tools"
makedepends="qt5-devel poppler-qt5-devel"
-short_desc="A simple PDF viewer"
+short_desc="Simple PDF viewer"
maintainer="Lukas Braun <void-packages@moshbit.net>"
-license="BSD"
+license="BSD-2-Clause"
homepage="https://wwwcip.cs.fau.de/~go18gomu/katarakt"
#distfiles="https://wwwcip.cs.fau.de/~go18gomu/katarakt/tarballs/katarakt-${version}.tar.xz"
distfiles="https://gitlab.cs.fau.de/Qui_Sum/katarakt/-/archive/v${version}/katarakt-v${version}.tar.gz"
checksum=f60b3b7477975301a6c6657eb0a24d5cc28d321cca70e9746d4d1ea91e239c46
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-devel"
-fi
-
post_build() {
make doc
}
From 7adc08abfcf30d09e23b4684c5b2cee61105f0a5 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, 21 Nov 2020 10:04:58 +0700
Subject: [PATCH 045/358] minisign: fix build
---
srcpkgs/minisign/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/minisign/template b/srcpkgs/minisign/template
index b502ceeaab2..f86361d85db 100644
--- a/srcpkgs/minisign/template
+++ b/srcpkgs/minisign/template
@@ -3,6 +3,7 @@ pkgname=minisign
version=0.9
revision=1
build_style=cmake
+hostmakedepends="pkg-config"
makedepends="libsodium-devel"
short_desc="Simple tool to sign files and verify signatures"
maintainer="Orphaned <orphan@voidlinux.org>"
From a72ccb5accb9bf9ebc4e4200ec201c320ca87333 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, 21 Nov 2020 10:12:00 +0700
Subject: [PATCH 046/358] libgaminggear: fix build
---
srcpkgs/libgaminggear/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/libgaminggear/template b/srcpkgs/libgaminggear/template
index e6a59c5281a..36ab8eccfea 100644
--- a/srcpkgs/libgaminggear/template
+++ b/srcpkgs/libgaminggear/template
@@ -15,6 +15,8 @@ homepage="https://sourceforge.net/projects/libgaminggear/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=ffbd59c62e3107b09ec99f1e5147529c61931987abc7f86a140449b46388c549
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/harfbuzz"
+
libgaminggear-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision} gtk+-devel libglib-devel
From 0d5c9d20d7445a3562db34eda8a0257cd04db81d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Nov 2020 16:27:01 -0600
Subject: [PATCH 047/358] wine: update to 5.22.
---
srcpkgs/wine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 536e52e67ba..fc753289c02 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=5.21
+version=5.22
revision=1
build_style=gnu-configure
configure_args="--bindir=/usr/libexec/wine"
@@ -9,7 +9,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
-checksum=5a1a5c2549d11bce0d6640220ed6fd31042afcbcb366f475e0ccb4781d2d2840
+checksum=09bd06c87c8c974e6ad34507cec875d7217eb56fc09df838d5453e0ebbce4d21
lib32mode=full
archs="i686 x86_64*"
From 5599dea108732433467fc2f74f3d163270e8968f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Nov 2020 08:00:53 -0600
Subject: [PATCH 048/358] timeshift: update to 20.11.1.
---
srcpkgs/timeshift/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index fb6bf744b94..9a01c60cf05 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,9 +1,8 @@
# Template file for 'timeshift'
pkgname=timeshift
-version=20.03
-revision=2
+version=20.11.1
+revision=1
build_style=gnu-makefile
-conf_files="/etc/default/timeshift.json"
hostmakedepends="gettext pkg-config vala which"
makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
depends="rsync psmisc"
@@ -12,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.teejeetech.in/p/timeshift.html"
distfiles="https://github.com/teejee2008/timeshift/archive/v${version}.tar.gz"
-checksum=6516150481fc3e69c090ff25426e85d99d10035949446368918076b19335b391
+checksum=c6dcca80b42f80a8c8d9d03e91eb17aa634be2f1031f667bba3f483410297abb
# Remove hard-dep on crontab, leave up to user to decide
post_extract() {
From f8bffd708722beb77ce83dd39114365cd8197057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 21 Nov 2020 00:29:32 -0300
Subject: [PATCH 049/358] rclone: update to 1.53.3.
Fixes CVE-2020-28924.
---
srcpkgs/rclone/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 22c4857e669..3c7ea20e5bc 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,6 +1,6 @@
# Template file for 'rclone'
pkgname=rclone
-version=1.53.1
+version=1.53.3
revision=1
wrksrc="rclone-v${version}"
build_style=go
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://rclone.org/"
changelog="https://raw.githubusercontent.com/rclone/rclone/master/docs/content/changelog.md"
distfiles="https://github.com/rclone/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
-checksum=d72d74a90a191fc0964705270ff59d58094e2bf4982f9fa0bc150f7296620caf
+checksum=f1e213bc6fb7c46f9a4cc8604ae0856718434bdafe07fa3ce449ae9a510a5763
post_install() {
vlicense COPYING
From 25fc164f409d3a297b0882d3326940670cb64c1e 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, 21 Nov 2020 10:52:48 +0700
Subject: [PATCH 050/358] musikcube: fix build with libmicrohttpd 0.9.70
---
srcpkgs/musikcube/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 78cf86fe80d..a3da40c134b 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -25,6 +25,10 @@ fi
# SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
makedepends+=" libglvnd"
+post_patch() {
+ vsed -i -e 's/00097000/00097001/' src/plugins/server/HttpServer.h
+}
+
post_install() {
vlicense LICENSE.txt
}
From e6d3dd8c2c35693d3433413c414f7a991ab4c8eb 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, 16 Nov 2020 08:35:37 +0700
Subject: [PATCH 051/358] nss: update to 3.59.
---
srcpkgs/nss/patches/fix-bug1672703.patch | 137 -----------------------
srcpkgs/nss/template | 6 +-
2 files changed, 3 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/nss/patches/fix-bug1672703.patch
diff --git a/srcpkgs/nss/patches/fix-bug1672703.patch b/srcpkgs/nss/patches/fix-bug1672703.patch
deleted file mode 100644
index 42347c8f91a..00000000000
--- a/srcpkgs/nss/patches/fix-bug1672703.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-commit b03a4fc5b902498414b02640dcb2717dfef9682f
-Author: Daiki Ueno <dueno@redhat.com>
-Date: Mon Oct 26 06:46:11 2020 +0100
-
- Bug 1672703, always tolerate the first CCS in TLS 1.3, r=mt
-
- Summary:
- This flips the meaning of the flag for checking excessive CCS
- messages, so it only rejects multiple CCS messages while the first CCS
- message is always accepted.
-
- Reviewers: mt
-
- Reviewed By: mt
-
- Bug #: 1672703
-
- Differential Revision: https://phabricator.services.mozilla.com/D94603
----
- gtests/ssl_gtest/ssl_tls13compat_unittest.cc | 18 +++++++++---------
- lib/ssl/ssl3con.c | 20 +++++++-------------
- lib/ssl/sslimpl.h | 5 +----
- 3 files changed, 17 insertions(+), 26 deletions(-)
-
-diff --git gtests/ssl_gtest/ssl_tls13compat_unittest.cc gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-index dcede798cc..645f84ff02 100644
---- nss/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-+++ nss/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-@@ -348,8 +348,8 @@ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecBeforeClientHelloTwice) {
- client_->CheckErrorCode(SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT);
- }
-
--// The server rejects a ChangeCipherSpec if the client advertises an
--// empty session ID.
-+// The server accepts a ChangeCipherSpec even if the client advertises
-+// an empty session ID.
- TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterClientHelloEmptySid) {
- EnsureTlsSetup();
- ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
-@@ -358,9 +358,8 @@ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterClientHelloEmptySid) {
- client_->Handshake(); // Send ClientHello
- client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs))); // Send CCS
-
-- server_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
-- server_->Handshake(); // Consume ClientHello and CCS
-- server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-+ Handshake();
-+ CheckConnected();
- }
-
- // The server rejects multiple ChangeCipherSpec even if the client
-@@ -381,7 +380,7 @@ TEST_F(Tls13CompatTest, ChangeCipherSpecAfterClientHelloTwice) {
- server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
- }
-
--// The client rejects a ChangeCipherSpec if it advertises an empty
-+// The client accepts a ChangeCipherSpec even if it advertises an empty
- // session ID.
- TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterServerHelloEmptySid) {
- EnsureTlsSetup();
-@@ -398,9 +397,10 @@ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterServerHelloEmptySid) {
- // send ServerHello..CertificateVerify
- // Send CCS
- server_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
-- client_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
-- client_->Handshake(); // Consume ClientHello and CCS
-- client_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-+
-+ // No alert is sent from the client. As Finished is dropped, we
-+ // can't use Handshake() and CheckConnected().
-+ client_->Handshake();
- }
-
- // The client rejects multiple ChangeCipherSpec in a row even if the
-diff --git lib/ssl/ssl3con.c lib/ssl/ssl3con.c
-index 767ffc30f1..b652dcea34 100644
---- nss/lib/ssl/ssl3con.c
-+++ nss/lib/ssl/ssl3con.c
-@@ -6645,11 +6645,7 @@ ssl_CheckServerSessionIdCorrectness(sslSocket *ss, SECItem *sidBytes)
-
- /* TLS 1.3: We sent a session ID. The server's should match. */
- if (!IS_DTLS(ss) && (sentRealSid || sentFakeSid)) {
-- if (sidMatch) {
-- ss->ssl3.hs.allowCcs = PR_TRUE;
-- return PR_TRUE;
-- }
-- return PR_FALSE;
-+ return sidMatch;
- }
-
- /* TLS 1.3 (no SID)/DTLS 1.3: The server shouldn't send a session ID. */
-@@ -8696,7 +8692,6 @@ ssl3_HandleClientHello(sslSocket *ss, PRUint8 *b, PRUint32 length)
- errCode = PORT_GetError();
- goto alert_loser;
- }
-- ss->ssl3.hs.allowCcs = PR_TRUE;
- }
-
- /* TLS 1.3 requires that compression include only null. */
-@@ -13066,15 +13061,14 @@ ssl3_HandleRecord(sslSocket *ss, SSL3Ciphertext *cText)
- ss->ssl3.hs.ws != idle_handshake &&
- cText->buf->len == 1 &&
- cText->buf->buf[0] == change_cipher_spec_choice) {
-- if (ss->ssl3.hs.allowCcs) {
-- /* Ignore the first CCS. */
-- ss->ssl3.hs.allowCcs = PR_FALSE;
-+ if (!ss->ssl3.hs.rejectCcs) {
-+ /* Allow only the first CCS. */
-+ ss->ssl3.hs.rejectCcs = PR_TRUE;
- return SECSuccess;
-+ } else {
-+ alert = unexpected_message;
-+ PORT_SetError(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
- }
--
-- /* Compatibility mode is not negotiated. */
-- alert = unexpected_message;
-- PORT_SetError(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
- }
-
- if ((IS_DTLS(ss) && !dtls13_AeadLimitReached(spec)) ||
-diff --git lib/ssl/sslimpl.h lib/ssl/sslimpl.h
-index 44c43a0e6c..35d0c2d6bc 100644
---- nss/lib/ssl/sslimpl.h
-+++ nss/lib/ssl/sslimpl.h
-@@ -710,10 +710,7 @@ typedef struct SSL3HandshakeStateStr {
- * or received. */
- PRBool receivedCcs; /* A server received ChangeCipherSpec
- * before the handshake started. */
-- PRBool allowCcs; /* A server allows ChangeCipherSpec
-- * as the middlebox compatibility mode
-- * is explicitly indicarted by
-- * legacy_session_id in TLS 1.3 ClientHello. */
-+ PRBool rejectCcs; /* Excessive ChangeCipherSpecs are rejected. */
- PRBool clientCertRequested; /* True if CertificateRequest received. */
- PRBool endOfFlight; /* Processed a full flight (DTLS 1.3). */
- ssl3KEADef kea_def_mutable; /* Used to hold the writable kea_def
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c755eb7fa33..635e67a610e 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,8 +3,8 @@
_nsprver=4.29
pkgname=nss
-version=3.58
-revision=2
+version=3.59
+revision=1
hostmakedepends="perl"
makedepends="nspr-devel sqlite-devel zlib-devel"
depends="nspr>=${_nsprver}"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="https://www.mozilla.org/projects/security/pki/nss"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=9f73cf789b5f109b978e5239551b609b0cafa88d18f0bc8ce3f976cb629353c0
+checksum=e6298174caa8527beacdc2858f77ed098d7047c1792846040e27e420fed0ce24
export NS_USE_GCC=1
export LIBRUNPATH=
From de0df57f520550436ba684bbc19ee2648fe9a6dd 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, 21 Nov 2020 13:44:03 +0700
Subject: [PATCH 052/358] notes-up: fix ftbfs vala 0.50
---
srcpkgs/notes-up/patches/vala-0.50.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/notes-up/patches/vala-0.50.patch
diff --git a/srcpkgs/notes-up/patches/vala-0.50.patch b/srcpkgs/notes-up/patches/vala-0.50.patch
new file mode 100644
index 00000000000..3cb0a75b521
--- /dev/null
+++ b/srcpkgs/notes-up/patches/vala-0.50.patch
@@ -0,0 +1,18 @@
+--- vapi/libmarkdown.vapi.orig 2020-11-21 13:32:35.540125253 +0700
++++ vapi/libmarkdown.vapi 2020-11-21 13:40:04.961780640 +0700
+@@ -41,7 +41,7 @@
+ public void initialize ();
+ public void with_html5_tags ();
+ public void shlib_destructor ();
+- public char markdown_version[];
++ public string markdown_version;
+
+ [Compact]
+ [CCode (cname = "MMIOT", cprefix = "mkd_", free_function = "mkd_cleanup")]
+@@ -125,4 +125,4 @@
+ NOSTYLE,
+ EMBED
+ }
+-}
+\ No newline at end of file
++}
From 286849a797e5cfb3a95a703c2d5b9f74e957dce0 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, 21 Nov 2020 14:09:06 +0700
Subject: [PATCH 053/358] olsrd: fix ftbfs
---
srcpkgs/olsrd/patches/bison-header.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 srcpkgs/olsrd/patches/bison-header.patch
diff --git a/srcpkgs/olsrd/patches/bison-header.patch b/srcpkgs/olsrd/patches/bison-header.patch
new file mode 100644
index 00000000000..882edeef007
--- /dev/null
+++ b/srcpkgs/olsrd/patches/bison-header.patch
@@ -0,0 +1,10 @@
+--- src/cfgparser/local.mk.orig 2020-11-21 14:03:26.244348554 +0700
++++ src/cfgparser/local.mk 2020-11-21 14:06:09.976236365 +0700
+@@ -77,6 +77,7 @@
+ $(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<"
+ $(MAKECMDPREFIX)sed -e 's/register //' \
+ -e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \
++ -e '/include.*h-tmp/s/-tmp"$$/"/' \
+ < "$@-tmp" >"$@"
+ $(MAKECMDPREFIX)mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)"
+ $(MAKECMDPREFIX)$(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)"
From d2377fd4ac6247316c2af135df4e9fc1c41d723b 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, 21 Nov 2020 16:04:43 +0700
Subject: [PATCH 054/358] pulseview: fix build with qt 5.15
---
srcpkgs/pulseview/patches/qt-5.15.patch | 20 ++++++++++++++++++++
srcpkgs/pulseview/template | 6 +-----
2 files changed, 21 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/pulseview/patches/qt-5.15.patch
diff --git a/srcpkgs/pulseview/patches/qt-5.15.patch b/srcpkgs/pulseview/patches/qt-5.15.patch
new file mode 100644
index 00000000000..986ed098ab5
--- /dev/null
+++ b/srcpkgs/pulseview/patches/qt-5.15.patch
@@ -0,0 +1,20 @@
+--- pv/util.cpp.orig 2020-11-21 15:56:56.690899190 +0700
++++ pv/util.cpp 2020-11-21 16:00:40.981375801 +0700
+@@ -137,7 +137,7 @@
+ QString s;
+ QTextStream ts(&s);
+ if (sign && !v.is_zero())
+- ts << forcesign;
++ Qt::forcesign(ts);
+ ts << qSetRealNumberPrecision(precision) << (v * multiplier);
+ ts << ' ' << prefix << unit;
+
+@@ -175,7 +175,7 @@
+ QString s;
+ QTextStream ts(&s);
+ if (sign && (v != 0))
+- ts << forcesign;
++ Qt::forcesign(ts);
+ ts.setRealNumberNotation(QTextStream::FixedNotation);
+ ts.setRealNumberPrecision(precision);
+ ts << (v * multiplier) << ' ' << prefix << unit;
diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template
index 975b69054ac..83ce80bc39d 100644
--- a/srcpkgs/pulseview/template
+++ b/srcpkgs/pulseview/template
@@ -4,7 +4,7 @@ version=0.4.2
revision=1
build_style=cmake
configure_args="-DDISABLE_WERROR=TRUE"
-hostmakedepends="pkg-config qt5-qmake"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="glib-devel libzip-devel glibmm-devel qt5-devel
qt5-svg-devel qt5-tools-devel boost-devel libsigrok-devel
libsigrokdecode-devel"
@@ -16,8 +16,4 @@ homepage="https://sigrok.org/"
distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=f042f77a3e1b35bf30666330e36ec38fab8d248c3693c37b7e35d401c3bfabcb
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
CXXFLAGS+=" -fext-numeric-literals"
From 04932914b8f466af09da2dda8c48ee3bddca097a 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, 21 Nov 2020 16:22:41 +0700
Subject: [PATCH 055/358] qtikz: use SPDX 3.0 license, fix build Qt 5.15
---
srcpkgs/qtikz/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qtikz/template b/srcpkgs/qtikz/template
index 490b0c183d9..a724860cc42 100644
--- a/srcpkgs/qtikz/template
+++ b/srcpkgs/qtikz/template
@@ -1,15 +1,20 @@
# Template file for 'qtikz'
pkgname=qtikz
version=0.12
-revision=1
+revision=2
wrksrc=ktikz-${version}
build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-plugin-sqlite qt5-devel
+hostmakedepends="qt5-qmake pkg-config qt5-plugin-sqlite qt5-host-tools
qt5-tools"
makedepends="poppler-qt5-devel qt5-devel"
short_desc="Editor for graphics set in TikZ"
maintainer="Piraty <piraty1@inbox.ru>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/"
distfiles="https://github.com/fhackenberger/ktikz/archive/${version}.tar.gz"
checksum=ef15fe70f4e057eab74ed738886f8e4a53d5b1bcdf1ee329930bf06e22f56e9d
+
+post_patch() {
+ vsed -e '/include.*QPainter/a #include <QtGui/QPainterPath>' \
+ -i app/tikzeditor.cpp
+}
From e9d4ede8c9ce2fd99a2cdcf034d74d30637106ab 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, 21 Nov 2020 16:31:36 +0700
Subject: [PATCH 056/358] abcde: remove noarch
---
srcpkgs/abcde/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/abcde/template b/srcpkgs/abcde/template
index 49fe4f97768..d42020e308f 100644
--- a/srcpkgs/abcde/template
+++ b/srcpkgs/abcde/template
@@ -1,8 +1,7 @@
# Template file for 'abcde'
pkgname=abcde
version=2.9.3
-revision=1
-archs=noarch
+revision=2
conf_files="/etc/${pkgname}.conf"
depends="cd-discid perl-MusicBrainz-DiscID perl-WebService-MusicBrainz vorbis-tools"
short_desc="CLI audio CD encoder and tagger"
From b949b4dc42d5a46ec3025953c979c70cc8b9a739 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, 21 Nov 2020 16:31:36 +0700
Subject: [PATCH 057/358] acpilight: remove noarch
---
srcpkgs/acpilight/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/acpilight/template b/srcpkgs/acpilight/template
index 89236bd4c3f..40467c506ea 100644
--- a/srcpkgs/acpilight/template
+++ b/srcpkgs/acpilight/template
@@ -1,8 +1,7 @@
# Template file for 'acpilight'
pkgname=acpilight
version=1.2
-revision=1
-archs=noarch
+revision=2
wrksrc="acpilight-v${version}"
depends="python3"
short_desc="Backward-compatibile xbacklight replacement"
From e598b0580fc478ff869dfb8c1c35a01aeacb0dd4 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 058/358] acr: remove noarch
---
srcpkgs/acr/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/acr/template b/srcpkgs/acr/template
index 773799454b6..b2090f67f32 100644
--- a/srcpkgs/acr/template
+++ b/srcpkgs/acr/template
@@ -1,8 +1,7 @@
# Template file for 'acr'
pkgname=acr
version=1.9.3
-revision=1
-archs=noarch
+revision=2
build_style=gnu-configure
short_desc="AutoConf Replacement"
maintainer="Felipe Nogueira <contato.fnog@gmail.com>"
From 15e95b7f6dc567e9279b215658652304b701ffc5 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 059/358] adapta-kde: remove noarch
---
srcpkgs/adapta-kde/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/adapta-kde/template b/srcpkgs/adapta-kde/template
index 1fc16324be1..f2b427b358e 100644
--- a/srcpkgs/adapta-kde/template
+++ b/srcpkgs/adapta-kde/template
@@ -1,8 +1,7 @@
# Template file for 'adapta-kde'
pkgname=adapta-kde
version=20180828
-revision=1
-archs=noarch
+revision=2
short_desc="Port of the popular GTK theme Adapta for Plasma 5 desktop"
maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
license="GPL-3.0-or-later"
From 216f90e192a18f2610cd075f8192e40622aa2d76 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 060/358] adwaita-plus: remove noarch
---
srcpkgs/adwaita-plus/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/adwaita-plus/template b/srcpkgs/adwaita-plus/template
index c5faf56aeb2..5d861183516 100644
--- a/srcpkgs/adwaita-plus/template
+++ b/srcpkgs/adwaita-plus/template
@@ -1,8 +1,7 @@
# Template file for 'adwaita-plus'
pkgname=adwaita-plus
version=5.0
-revision=1
-archs=noarch
+revision=2
short_desc="Modern third-party icons theme based on GNOME's Adwaita"
maintainer="Gustavo Costa <gusbemacbe@gmail.com>"
license="GPL-3.0-or-later"
From a9d6c97e4fe7377c0d3014fcdb10ad9e4c41a71d 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 061/358] alacritty: remove noarch
---
srcpkgs/alacritty/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 74ddfcd6d65..86626f44080 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,7 +1,7 @@
# Template file for 'alacritty'
pkgname=alacritty
version=0.5.0
-revision=1
+revision=2
build_wrksrc="${pkgname}"
build_style=cargo
hostmakedepends="pkg-config python3"
@@ -28,7 +28,6 @@ post_install() {
alacritty-terminfo_package() {
short_desc+=" - terminfo data"
- archs=noarch
pkg_install() {
vmove usr/share/terminfo
}
From ebc9db0c8ea5ecb2e6695beb4de7ca578c89501d 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 062/358] albatross-themes: remove noarch
---
srcpkgs/albatross-themes/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/albatross-themes/template b/srcpkgs/albatross-themes/template
index ca8ff1b363c..ce8a344c343 100644
--- a/srcpkgs/albatross-themes/template
+++ b/srcpkgs/albatross-themes/template
@@ -1,8 +1,7 @@
# Template file for 'albatross-themes'
pkgname=albatross-themes
version=1.7.4
-revision=2
-archs=noarch
+revision=3
build_style=fetch
depends="gtk+"
short_desc="Elegant black GTK2/3/Metacity/Xfwm theme"
From b8ecdca5da820f985e73eeba8337b4a98fb6142e 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 063/358] angrysearch: remove noarch
---
srcpkgs/angrysearch/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/angrysearch/template b/srcpkgs/angrysearch/template
index 88a6954ac85..96b6b6604ba 100644
--- a/srcpkgs/angrysearch/template
+++ b/srcpkgs/angrysearch/template
@@ -1,19 +1,18 @@
# Template file for 'angrysearch'
pkgname=angrysearch
version=1.0.1
-revision=2
+revision=3
wrksrc="ANGRYsearch-${version}"
+pycompile_dirs="usr/share/angrysearch"
hostmakedepends="python3"
depends="python3-PyQt5 xdg-utils"
-archs=noarch
short_desc="Instant file search"
maintainer="DirectorX <void.directorx@protonmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
homepage="https://github.com/dotheevo/angrysearch/"
-python_version=3
-pycompile_dirs="usr/share/angrysearch"
distfiles="http://github.com/dotheevo/${pkgname}/archive/v${version}.tar.gz"
checksum=9a550649c3efafb26660860758f2e75702ce96a0a0c50dc34ced2967b51a843f
+python_version=3
do_install() {
vinstall angrysearch.desktop 644 "usr/share/applications"
From ff253350c61c3ac81178b2a43c690e0d75f94f64 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 064/358] ansi: remove noarch
---
srcpkgs/ansi/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ansi/template b/srcpkgs/ansi/template
index be114d5203b..acc41f9251c 100644
--- a/srcpkgs/ansi/template
+++ b/srcpkgs/ansi/template
@@ -1,8 +1,7 @@
# Template file for 'ansi'
pkgname=ansi
version=2.0.4
-revision=1
-archs=noarch
+revision=2
depends="bash"
short_desc="ANSI escape codes in pure Bash"
maintainer="Orphaned <orphan@voidlinux.org>"
From 2eb2e6aa9480dfab82c129a93af568d4d5bdb01a 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 065/358] antlr3-bin: remove noarch
---
srcpkgs/antlr3-bin/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/antlr3-bin/template b/srcpkgs/antlr3-bin/template
index 305df8ae69e..e6725f610ab 100644
--- a/srcpkgs/antlr3-bin/template
+++ b/srcpkgs/antlr3-bin/template
@@ -1,8 +1,7 @@
# Template file for 'antlr3-bin'
pkgname=antlr3-bin
version=3.4
-revision=1
-archs=noarch
+revision=2
build_style=fetch
depends="virtual?java-runtime"
short_desc="Parser generator for C++, C#, Java, and Python"
From c3fd54782ebc869810828150e2072036466da002 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 066/358] apache-ant: remove noarch
---
srcpkgs/apache-ant/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/apache-ant/template b/srcpkgs/apache-ant/template
index 80a738985a0..a4ec359fe20 100644
--- a/srcpkgs/apache-ant/template
+++ b/srcpkgs/apache-ant/template
@@ -1,15 +1,14 @@
# Template file for 'apache-ant'
pkgname=apache-ant
version=1.10.8
-revision=1
-archs=noarch
+revision=2
hostmakedepends="openjdk8"
depends="virtual?java-runtime"
short_desc="Java library and command-line tool that help building software"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
-homepage="http://ant.apache.org"
-distfiles="http://mirror.dkd.de/apache/ant/source/apache-ant-${version}-src.tar.xz"
+homepage="https://ant.apache.org"
+distfiles="https://archive.apache.org/dist/ant/source/apache-ant-${version}-src.tar.xz"
checksum=40570314bad3b46abe4ee0669a8f8feb56fe767f1642a801fa7fd4fafcd362ca
python_version=2 # only script uses python2-isms like print ""
@@ -42,7 +41,6 @@ do_install() {
apache-ant-doc_package() {
short_desc+=" - documentation"
depends="${sourcepkg}>=${version}_${revision}"
- archs=noarch
pkg_install() {
vmove $_prefix/manual
}
From 0aa429ff1e24f85a8fd1c8ce450c0fe0221f6252 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 067/358] apache-storm: remove noarch
---
srcpkgs/apache-storm/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index 6ae346a0557..bcb06f4ee08 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -1,8 +1,7 @@
# Template file for 'apache-storm'
pkgname=apache-storm
version=2.2.0
-revision=2
-archs=noarch
+revision=3
depends="virtual?java-runtime python3 bash"
short_desc="Distributed realtime computation system"
maintainer="bougyman <bougyman@voidlinux.org>"
From de206316ed11ecfa32a4b503a1ca51e8c6f9e30c 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 068/358] archlabs-themes: remove noarch
---
srcpkgs/archlabs-themes/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/archlabs-themes/template b/srcpkgs/archlabs-themes/template
index aa648d35457..95f056e6d4e 100644
--- a/srcpkgs/archlabs-themes/template
+++ b/srcpkgs/archlabs-themes/template
@@ -1,10 +1,9 @@
# Template file for 'archlabs-themes'
pkgname=archlabs-themes
version=20180503
-revision=2
+revision=3
_commit=73d0900117daefedf6c76dd0e71538bb954f1b10
wrksrc="ArchLabs-Themes-${_commit}"
-archs=noarch
depends="gnome-themes-standard gtk-engine-murrine gtk2-engines"
short_desc="Themes used in ArchLabs"
maintainer="Orphaned <orphan@voidlinux.org>"
From 714f49da7b120f764fad28df6347d94f1ca08941 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 069/358] argtable: remove noarch
---
srcpkgs/argtable/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/argtable/template b/srcpkgs/argtable/template
index 7083e703a50..b283361b889 100644
--- a/srcpkgs/argtable/template
+++ b/srcpkgs/argtable/template
@@ -1,12 +1,12 @@
# Template file for 'argtable'
pkgname=argtable
version=2.13
-revision=1
+revision=2
wrksrc="${pkgname}${version//./-}"
build_style=gnu-configure
short_desc="ANSI C command line parser"
maintainer="Simon Whelan <si.whelan@gmail.com>"
-license="LGPL-v2"
+license="LGPL-2.0-or-later"
homepage="http://argtable.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/argtable/argtable2-13.tar.gz"
checksum=8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf
@@ -26,7 +26,6 @@ argtable-devel_package() {
argtable-doc_package() {
short_desc+=" - documentation"
depends="${sourcepkg}>=${version}_${revision}"
- archs=noarch
pkg_install() {
vmove usr/share/doc
}
From 3689348b60f9aebdd6cfbacdec4d710ee73da1bd 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 070/358] asciiquarium: remove noarch
---
srcpkgs/asciiquarium/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/asciiquarium/template b/srcpkgs/asciiquarium/template
index 128674e7a6e..32de4aca596 100644
--- a/srcpkgs/asciiquarium/template
+++ b/srcpkgs/asciiquarium/template
@@ -1,8 +1,7 @@
# Template file for 'asciiquarium'
pkgname=asciiquarium
version=1.1
-revision=2
-archs=noarch
+revision=3
wrksrc="${pkgname}_${version}"
depends="perl perl-Term-Animation perl-Curses"
short_desc="Enjoy the mysteries of the sea from the safety of your own terminal"
From d69bb41d3b449249416190b7d600d5e0bf2a73aa 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 071/358] aspell-ru: remove noarch
---
srcpkgs/aspell-ru/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/aspell-ru/template b/srcpkgs/aspell-ru/template
index f0a6d0fa52d..c6592338f38 100644
--- a/srcpkgs/aspell-ru/template
+++ b/srcpkgs/aspell-ru/template
@@ -1,7 +1,7 @@
# Template file for 'aspell-ru'
pkgname=aspell-ru
version=0.99f7
-revision=2
+revision=3
wrksrc="aspell6-ru-${version}-1"
build_style=configure
hostmakedepends="aspell-devel which"
@@ -14,7 +14,6 @@ checksum=5c29b6ccce57bc3f7c4fb0510d330446b9c769e59c92bdfede27333808b6e646
words-ru_package() {
short_desc="Russian dictionary word list"
- archs=noarch
pkg_install() {
vmkdir usr/share/dict
precat *.cwl |
From 1538fc78599d10c19948a885255724ef714c3d36 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 072/358] astromenace: remove noarch
---
srcpkgs/astromenace-data | 1 -
srcpkgs/astromenace/template | 13 ++-----------
2 files changed, 2 insertions(+), 12 deletions(-)
delete mode 120000 srcpkgs/astromenace-data
diff --git a/srcpkgs/astromenace-data b/srcpkgs/astromenace-data
deleted file mode 120000
index 6c0834e519d..00000000000
--- a/srcpkgs/astromenace-data
+++ /dev/null
@@ -1 +0,0 @@
-astromenace
\ No newline at end of file
diff --git a/srcpkgs/astromenace/template b/srcpkgs/astromenace/template
index ae6bbc38330..5008426e40b 100644
--- a/srcpkgs/astromenace/template
+++ b/srcpkgs/astromenace/template
@@ -1,19 +1,19 @@
# Template file for 'astromenace'
pkgname=astromenace
version=1.4.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DDATADIR=/usr/share/astromenace -DDONTCREATEVFS=TRUE"
hostmakedepends="pkg-config"
makedepends="SDL2-devel glu-devel libopenal-devel freealut-devel libvorbis-devel
fontconfig-devel freetype-devel libXinerama-devel"
-depends="astromenace-data>=${version}_${revision}"
short_desc="Hardcore 3D space shooter"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-3.0-or-later, OFL-1.1, CC-BY-SA-3.0"
homepage="http://www.viewizard.com/"
distfiles="https://github.com/viewizard/astromenace/archive/v${version}.tar.gz"
checksum=0aca5211c9f333acf698807f597e5ad8e9d1455ba8ad202940890bff5b6c9507
+replaces="astromenace-data>=0"
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/GL"
@@ -31,12 +31,3 @@ do_install() {
vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
vinstall share/astromenace.appdata.xml 644 usr/share/appdata
}
-
-astromenace-data_package() {
- short_desc+=" - data file"
- archs=noarch
- pkg_install() {
- vmkdir usr/share/astromenace
- vcopy ${wrksrc}/gamedata usr/share/astromenace
- }
-}
From 42f8f5b12c45869b706ff60998d6620ebaaae650 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 073/358] asus-kbd-backlight: remove noarch
---
srcpkgs/asus-kbd-backlight/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/asus-kbd-backlight/template b/srcpkgs/asus-kbd-backlight/template
index e58e8341650..a3d116b0539 100644
--- a/srcpkgs/asus-kbd-backlight/template
+++ b/srcpkgs/asus-kbd-backlight/template
@@ -1,13 +1,12 @@
# Template file for 'asus-kbd-backlight'
pkgname=asus-kbd-backlight
version=1.2
-revision=1
+revision=2
create_wrksrc=yes
-archs=noarch
depends="bash"
short_desc="Helper for adjusting keyboard backlight brightness in Asus Zenbook"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="FDL1.3"
+license="GFDL-1.3-or-later"
homepage="https://wiki.archlinux.org/index.php/ASUS_Zenbook_Prime_UX31A#keyboard_backlight_script"
do_install() {
From 7fb22424e0041760d713576c2f06dbd1000e21b9 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 074/358] atool: remove noarch
---
srcpkgs/atool/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/atool/template b/srcpkgs/atool/template
index 56264dd3e16..6e20f366e7e 100644
--- a/srcpkgs/atool/template
+++ b/srcpkgs/atool/template
@@ -1,12 +1,11 @@
# Template file for 'atool'
pkgname=atool
version=0.39.0
-revision=5
-archs=noarch
+revision=6
build_style=gnu-configure
hostmakedepends="perl"
depends="perl"
-short_desc="A script for managing file archives of various types"
+short_desc="Script for managing file archives of various types"
maintainer="Georg Schabel <gescha@posteo.de>"
license="GPL-2.0-or-later"
homepage="http://www.nongnu.org/atool/"
From 00943f678a24d4bfd0bd69298cc8a9903a9004bb 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 075/358] auto-auto-complete: remove noarch
---
srcpkgs/auto-auto-complete/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/auto-auto-complete/template b/srcpkgs/auto-auto-complete/template
index 2fa45c4fc47..065d615c2b5 100644
--- a/srcpkgs/auto-auto-complete/template
+++ b/srcpkgs/auto-auto-complete/template
@@ -1,8 +1,7 @@
# Template file for 'auto-auto-complete'
pkgname=auto-auto-complete
version=7.2
-revision=4
-archs=noarch
+revision=5
build_style=gnu-makefile
hostmakedepends="python3 texinfo"
depends="python3"
From 53b34f2833c79df9c4e08fb13bc7cab6ae06d13d 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 076/358] autojump: remove noarch
---
srcpkgs/autojump/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/autojump/template b/srcpkgs/autojump/template
index 2448a2dd894..5b17e447df4 100644
--- a/srcpkgs/autojump/template
+++ b/srcpkgs/autojump/template
@@ -1,8 +1,7 @@
# Template file for 'autojump'
pkgname=autojump
version=22.5.3
-revision=2
-archs=noarch
+revision=3
wrksrc="${pkgname}-release-v${version}"
hostmakedepends="python3"
depends="python3"
From eea2055535052b74729b87e613551e112174d16c 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 077/358] awoken-icons: remove noarch
---
srcpkgs/awoken-icons/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/awoken-icons/template b/srcpkgs/awoken-icons/template
index f52c4f48187..c2d159acc08 100644
--- a/srcpkgs/awoken-icons/template
+++ b/srcpkgs/awoken-icons/template
@@ -1,13 +1,13 @@
# Template file for 'awoken-icons'
pkgname=awoken-icons
version=2.5.2
-revision=4
-archs=noarch
+revision=5
wrksrc=AwOken-2.5
hostmakedepends="unzip"
short_desc="Simple and quite complete icon set, Token-style"
maintainer="Steven R <dev@styez.com>"
-license="CCPL:by-sa"
+# https://github.com/alecive/FlatWoken
+license="CC-BY-SA-4.0"
homepage="http://alecive.deviantart.com/art/AwOken-163570862"
distfiles="https://dl.dropbox.com/s/p3hfu7jw3vv7os9/AwOken-2.5.zip"
checksum=d122ee0457079aaa30a664ae582fbc6208414e8728f497dce399ed9f33f9b36e
@@ -39,7 +39,6 @@ do_install() {
awoken-icons-dark_package() {
depends="awoken-icons>=${version}"
short_desc+=" - Dark icons"
- archs=noarch
pkg_install() {
vmove usr/share/icons/AwOkenDark
}
@@ -48,7 +47,6 @@ awoken-icons-dark_package() {
awoken-icons-white_package() {
depends="awoken-icons>=${version}"
short_desc+=" - White icons"
- archs=noarch
pkg_install() {
vmove usr/share/icons/AwOkenWhite
}
From f0a1b8e00d965cc91a9355333518d204b1c5743d 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 078/358] b43-firmware-classic: remove noarch
---
srcpkgs/b43-firmware-classic/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/b43-firmware-classic/template b/srcpkgs/b43-firmware-classic/template
index b38e6ac7ee6..80459fc2b71 100644
--- a/srcpkgs/b43-firmware-classic/template
+++ b/srcpkgs/b43-firmware-classic/template
@@ -1,8 +1,7 @@
# Template file for 'b43-firmware-classic'
pkgname=b43-firmware-classic
version=5.100.138
-revision=1
-archs=noarch
+revision=2
wrksrc="broadcom-wl-${version}"
hostmakedepends="b43-fwcutter"
short_desc="Firmware for Broadcom B43 wireless (trusted release)"
From 7172c5bbda5c4323a4ca89fd7cf022c595432b8c 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 079/358] b43-firmware: remove noarch
---
srcpkgs/b43-firmware/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/b43-firmware/template b/srcpkgs/b43-firmware/template
index e5f894b81e7..a527b48f94a 100644
--- a/srcpkgs/b43-firmware/template
+++ b/srcpkgs/b43-firmware/template
@@ -1,8 +1,7 @@
# Template file for 'b43-firmware'
pkgname=b43-firmware
version=6.30.163.46
-revision=1
-archs=noarch
+revision=2
wrksrc="${pkgname}"
create_wrksrc=yes
hostmakedepends="b43-fwcutter"
From 4b909977b8b134b1b87bb809278f19c54361ad1c 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 080/358] bash-preexec: remove noarch
---
srcpkgs/bash-preexec/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/bash-preexec/template b/srcpkgs/bash-preexec/template
index 771ff0426ff..71a5f696c12 100644
--- a/srcpkgs/bash-preexec/template
+++ b/srcpkgs/bash-preexec/template
@@ -1,8 +1,7 @@
# Template file for 'bash-preexec'
pkgname=bash-preexec
version=0.3.7
-revision=1
-archs=noarch
+revision=2
depends="bash"
short_desc="Preexec and Precmd functions for Bash just like Zsh"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 04a2ef1202d37d140555bbd7548ec61a3782edce 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 081/358] bats: remove noarch
---
srcpkgs/bats/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/bats/template b/srcpkgs/bats/template
index 890b0d14e54..ee85a77bb19 100644
--- a/srcpkgs/bats/template
+++ b/srcpkgs/bats/template
@@ -1,8 +1,7 @@
# Template file for 'bats'
pkgname=bats
version=1.2.0
-revision=1
-archs=noarch
+revision=2
wrksrc="bats-core-${version}"
depends="bash"
short_desc="Bash Automated Testing System"
From 3c74a0ad58083099d972a59ce0d544d6549added 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 082/358] beard: remove noarch
---
srcpkgs/beard/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/beard/template b/srcpkgs/beard/template
index 93d69607399..306a6394e56 100644
--- a/srcpkgs/beard/template
+++ b/srcpkgs/beard/template
@@ -1,8 +1,7 @@
# Template file for 'beard'
pkgname=beard
version=0.3
-revision=1
-archs=noarch
+revision=2
short_desc="Simple hibernation daemon"
maintainer="Samantha Baldwin <fuhsaz+void@cryptic.li>"
license="Unlicense"
From c60d9449930a51536d08f0d75eee699515742d63 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 083/358] betterlockscreen: remove noarch
---
srcpkgs/betterlockscreen/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/betterlockscreen/template b/srcpkgs/betterlockscreen/template
index c38dd536e77..c0e5d710f15 100644
--- a/srcpkgs/betterlockscreen/template
+++ b/srcpkgs/betterlockscreen/template
@@ -1,8 +1,7 @@
# Template file for 'betterlockscreen'
pkgname=betterlockscreen
version=3.0.1
-revision=2
-archs=noarch
+revision=3
depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb"
short_desc="Sweet looking lockscreen for linux system"
maintainer="Aleksander Zien <Aleks@nderZien.com>"
From 1a520869d1cf6d134cb71acabaf43e6160c1af4b 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 084/358] biosdisk: remove noarch
---
srcpkgs/biosdisk/template | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/biosdisk/template b/srcpkgs/biosdisk/template
index 324d249d36c..0b22e56f313 100644
--- a/srcpkgs/biosdisk/template
+++ b/srcpkgs/biosdisk/template
@@ -1,18 +1,13 @@
# Template file for 'biosdisk'
pkgname=biosdisk
version=1.01
-revision=1
+revision=2
+archs="i686* x86_64*"
build_style=gnu-makefile
-archs=noarch
depends="syslinux wget cdrtools"
short_desc="Utility for creating Dell BIOS flash disks"
maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
homepage="https://github.com/dell/biosdisk"
distfiles="https://github.com/dell/biosdisk/archive/${version}.tar.gz"
checksum=e89cf680914ab3d5bbb549c124c6c29594ef495880befc0d059ec8a3aaf1e3e7
-
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
- *) broken="only for x86";;
-esac
From cac202237445a73fbbdee30d0c2efd45e7b22932 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 085/358] bitfighter: remove noarch
---
srcpkgs/bitfighter-data | 1 -
srcpkgs/bitfighter/template | 15 ++++-----------
2 files changed, 4 insertions(+), 12 deletions(-)
delete mode 120000 srcpkgs/bitfighter-data
diff --git a/srcpkgs/bitfighter-data b/srcpkgs/bitfighter-data
deleted file mode 120000
index 0ed1e91d70b..00000000000
--- a/srcpkgs/bitfighter-data
+++ /dev/null
@@ -1 +0,0 @@
-bitfighter
\ No newline at end of file
diff --git a/srcpkgs/bitfighter/template b/srcpkgs/bitfighter/template
index a91443cbc3c..c3b2cc22a26 100644
--- a/srcpkgs/bitfighter/template
+++ b/srcpkgs/bitfighter/template
@@ -1,7 +1,7 @@
# Template file for 'bitfighter'
pkgname=bitfighter
version=019g
-revision=1
+revision=2
build_style=cmake
configure_args="-DMASTER_MINIMAL=1 -DLUAJIT_BUILTIN=OFF"
hostmakedepends="pkg-config unzip"
@@ -9,7 +9,7 @@ makedepends="boost-devel MesaLib-devel SDL2-devel LuaJIT-devel
libopenal-devel libmariadbclient-devel libmodplug-devel
libpng-devel libtomcrypt-devel speex-devel
clipper-devel alure-devel"
-depends="desktop-file-utils libmpg123 bitfighter-data"
+depends="desktop-file-utils libmpg123"
short_desc="Fast-paced team-based outer-space multi-player arcade game"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -18,18 +18,11 @@ distfiles="http://bitfighter.org/files/${pkgname}-${version}.tar.gz
http://bitfighter.org/files/classic_level_pack.zip"
checksum="cd47c453d9e6875ded627b987a645e2ff2c757363f394b152f62d868e1d81427
d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b"
-python_version=2 #unverified
+python_version=2
+replaces="bitfighter-data>=0"
CXXFLAGS="-Wno-narrowing"
post_install() {
vcopy ../classic_level_pack/* usr/share/bitfighter/levels
}
-
-bitfighter-data_package() {
- short_desc+=" - classic level pack"
- archs=noarch
- pkg_install() {
- vmove usr/share/bitfighter
- }
-}
From 666d3a41cacd52babcfd02c57fabba85507d09ee 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 086/358] blackbird-themes: remove noarch
---
srcpkgs/blackbird-themes/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/blackbird-themes/template b/srcpkgs/blackbird-themes/template
index 0e4de2ad703..68ced568cbc 100644
--- a/srcpkgs/blackbird-themes/template
+++ b/srcpkgs/blackbird-themes/template
@@ -1,8 +1,7 @@
# Template file for 'blackbird-themes'
pkgname=blackbird-themes
version=0.4
-revision=3
-archs=noarch
+revision=4
build_style=fetch
depends="gtk+"
short_desc="Elegant dark GTK2/3/Metacity/Xfwm theme"
From 1161d491a8ddfd085ad3f1e2bb4d895c9ca1ee70 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 087/358] blackbox: remove noarch
---
srcpkgs/blackbox/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/blackbox/template b/srcpkgs/blackbox/template
index cc7fbdc68b0..e0d94abf4a5 100644
--- a/srcpkgs/blackbox/template
+++ b/srcpkgs/blackbox/template
@@ -1,8 +1,7 @@
# Template file for 'blackbox'
pkgname=blackbox
version=1.20181219
-revision=1
-archs=noarch
+revision=2
depends="bash"
short_desc="Safely store secrets in Git/Mercurial/Subversion"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
From ea3ba819fb43768b68727d343c71c159e9d1bf22 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 088/358] blazeblogger: remove noarch
---
srcpkgs/blazeblogger/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blazeblogger/template b/srcpkgs/blazeblogger/template
index 0eb8d776fc8..df2c50a91a9 100644
--- a/srcpkgs/blazeblogger/template
+++ b/srcpkgs/blazeblogger/template
@@ -1,15 +1,14 @@
# Template file for 'blazeblogger'
pkgname=blazeblogger
version=1.2.0
-revision=2
-archs=noarch
+revision=3
hostmakedepends="perl"
depends="perl"
short_desc="CLI blogging CMS"
maintainer="Logen K <logen@sudotask.com>"
-license="GPL-3"
+license="GPL-3.0-only"
homepage="http://blaze.blackened.cz/"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/blazeblogger/blazeblogger-1.2.0.tar.gz"
+distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/blazeblogger/blazeblogger-$version.tar.gz"
checksum=39024b70708be6073e8aeb3943eb3b73d441fbb7b8113e145c0cf7540c4921aa
do_install() {
From 161278631f5bec65a75f2f19628aafcdcd12901e 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 089/358] bluebird-themes: remove noarch
---
srcpkgs/bluebird-themes/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/bluebird-themes/template b/srcpkgs/bluebird-themes/template
index 47034af481c..ad67f8bc960 100644
--- a/srcpkgs/bluebird-themes/template
+++ b/srcpkgs/bluebird-themes/template
@@ -1,8 +1,7 @@
# Template file for 'bluebird-themes'
pkgname=bluebird-themes
version=1.3
-revision=1
-archs=noarch
+revision=2
build_style=fetch
depends="gtk+"
short_desc="Elegant blue GTK2/3/Metacity/Xfwm theme"
From cc98ab2eff03916fac5c8e1b91f3ed49dceabe72 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 090/358] breeze-cursors: remove noarch
---
srcpkgs/breeze-cursors/template | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/srcpkgs/breeze-cursors/template b/srcpkgs/breeze-cursors/template
index 579ad8ffaa8..f1a95c1d113 100644
--- a/srcpkgs/breeze-cursors/template
+++ b/srcpkgs/breeze-cursors/template
@@ -1,8 +1,7 @@
# Template file for 'breeze-cursors'
pkgname=breeze-cursors
version=1.0
-revision=2
-archs=noarch
+revision=3
create_wrksrc=yes
build_style=meta
depends="breeze-amber-cursor-theme
@@ -56,49 +55,42 @@ do_install() {
}
breeze-amber-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Amber cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Amber
}
}
breeze-blue-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Blue cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Blue
}
}
breeze-contrast-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Contrast cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Contrast
}
}
breeze-hacked-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Hacked cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Hacked
}
}
breeze-obsidian-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Obsidian cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Obsidian
}
}
breeze-purple-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Purple cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Purple
}
}
breeze-red-cursor-theme_package() {
- archs=noarch
short_desc="Breeze Red cursor theme"
pkg_install() {
vmove usr/share/icons/Breeze_Red
From a01f58145af7976d99a8b9b5009979517a9f5d46 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 091/358] broadcom-bt-firmware: remove noarch
---
srcpkgs/broadcom-bt-firmware/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/broadcom-bt-firmware/template b/srcpkgs/broadcom-bt-firmware/template
index 8aeef706d15..2345f00f7a5 100644
--- a/srcpkgs/broadcom-bt-firmware/template
+++ b/srcpkgs/broadcom-bt-firmware/template
@@ -1,9 +1,8 @@
# Template file for 'broadcom-bt-firmware'
pkgname=broadcom-bt-firmware
version=12.0.1.1105
-revision=1
+revision=2
_patch=_p1
-archs=noarch
wrksrc="${pkgname}-${version}${_patch}"
hostmakedepends="perl"
short_desc="Broadcom Bluetooth firmware for Linux kernel"
From efd332a84c58d1cb77297aaf2711cf65640d45d6 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 092/358] bsdbuild: remove noarch
---
srcpkgs/bsdbuild/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/bsdbuild/template b/srcpkgs/bsdbuild/template
index 11115999c94..8ece9e701b9 100644
--- a/srcpkgs/bsdbuild/template
+++ b/srcpkgs/bsdbuild/template
@@ -1,8 +1,7 @@
# Template file for 'bsdbuild'
pkgname=bsdbuild
version=3.1
-revision=2
-archs=noarch
+revision=3
build_style=gnu-configure
configure_args="--with-manpages --with-manlinks"
hostmakedepends="groff perl"
From 95f83d96c17a18bb1d1254438553d1767202f840 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 093/358] bucklespring: remove noarch
---
srcpkgs/bucklespring/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/bucklespring/template b/srcpkgs/bucklespring/template
index ac9bfd3b499..2e4568bb746 100644
--- a/srcpkgs/bucklespring/template
+++ b/srcpkgs/bucklespring/template
@@ -1,7 +1,7 @@
# Template file for 'bucklespring'
pkgname=bucklespring
version=1.4.0
-revision=1
+revision=2
build_style=gnu-makefile
make_use_env=yes
make_build_args="PATH_AUDIO=/usr/share/${pkgname}/wav"
@@ -27,7 +27,6 @@ do_install() {
bucklespring-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share
}
From 3391acbeba953d40a2f403b734e485b5e8a0c9fa 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 094/358] buku: remove noarch
---
srcpkgs/buku/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/buku/template b/srcpkgs/buku/template
index 5a5be1e8d2c..9925789acb2 100644
--- a/srcpkgs/buku/template
+++ b/srcpkgs/buku/template
@@ -1,8 +1,7 @@
# Template file for 'buku'
pkgname=buku
version=4.3
-revision=1
-archs=noarch
+revision=2
depends="python3-urllib3 python3-BeautifulSoup4 python3-cryptography python3-html5lib"
short_desc="Cmdline bookmark management utility"
maintainer="Diogo Leal <diogo@diogoleal.com>"
From dce5e9dc21c8b27c831def6179e9af12eb9e73c8 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 095/358] burp2-server: remove noarch
---
srcpkgs/burp2-server/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index 9845f6afe9e..edda1f11f7e 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,7 +3,7 @@ _desc="Network-based backup and restore program"
pkgname=burp2-server
version=2.2.18
-revision=3
+revision=4
wrksrc="burp-${version}"
build_style=gnu-configure
make_install_target=install-all
@@ -79,7 +79,6 @@ burp2-client_package() {
burp2-doc_package() {
short_desc="${_desc} - Doc and examples"
- archs=noarch
pkg_install() {
vmove usr/share/doc/burp
vmove usr/share/examples
From b6cbe53230809b5740845274ef3cdf04c7a050e7 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 096/358] bwidget: remove noarch, update checksum.
Everything is the same but permission (755 -> 644)
---
srcpkgs/bwidget/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/bwidget/template b/srcpkgs/bwidget/template
index b6c57fccb25..c365e64d225 100644
--- a/srcpkgs/bwidget/template
+++ b/srcpkgs/bwidget/template
@@ -1,8 +1,7 @@
# Template file for 'bwidget'
pkgname=bwidget
version=1.9.14
-revision=1
-archs=noarch
+revision=2
makedepends="tk"
depends="tk"
short_desc="Set of extension widgets for Tcl/Tk"
@@ -10,14 +9,11 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="TCL"
homepage="http://tcllib.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/tcllib/BWidget/${version}/${pkgname}-${version}.tar.gz"
-checksum=531a6ecfa33114471dd58b0bedd5f9ff6f311c792fc1a030d8e454c5ebb5d44e
+checksum=8e9692140167161877601445e7a5b9da5bb738ce8d08ee99b016629bc784a672
do_install() {
local _tclversion=8.6
vmkdir usr/lib/tcl8.6/BWidget
- bsdtar xzvf $XBPS_SRCDISTDIR/${pkgname}-${version}/$pkgname-$version.tar.gz -C $DESTDIR/usr/lib/tcl$_tclversion/
- mv $DESTDIR/usr/lib/tcl$_tclversion/$pkgname-$version/* \
- $DESTDIR/usr/lib/tcl$_tclversion/BWidget
- rmdir $DESTDIR/usr/lib/tcl8.6/$pkgname-$version
+ vcopy "*" usr/lib/tcl8.6/BWidget
}
From 60b76659ed77ddc1d5f93803c82746d657c438ae 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, 21 Nov 2020 17:20:14 +0700
Subject: [PATCH 097/358] byobu: remove noarch
---
srcpkgs/byobu/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/byobu/template b/srcpkgs/byobu/template
index 29c355cb943..1436dfccbcc 100644
--- a/srcpkgs/byobu/template
+++ b/srcpkgs/byobu/template
@@ -1,8 +1,7 @@
# Template file for 'byobu'
pkgname=byobu
version=5.133
-revision=1
-archs=noarch
+revision=2
build_style=gnu-configure
depends="tmux"
short_desc="Open source text-based window manager and terminal multiplexer"
From bef091665652e09a51701b76f2171c34fb9018b6 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, 21 Nov 2020 17:20:14 +0700
Subject: [PATCH 098/358] bzrtools: remove noarch
---
srcpkgs/bzrtools/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/bzrtools/template b/srcpkgs/bzrtools/template
index 0c31b0fa84e..05492b1b5e2 100644
--- a/srcpkgs/bzrtools/template
+++ b/srcpkgs/bzrtools/template
@@ -1,11 +1,9 @@
# Template file for 'bzrtools'
pkgname=bzrtools
version=2.6.0
-revision=3
-archs=noarch
+revision=4
wrksrc=bzrtools
build_style=python2-module
-pycompile_module="bzrlib/plugins/bzrtools"
hostmakedepends="python"
makedepends="python bzr"
depends="${makedepends}"
From 93f0c6e1cff63aa2e5b81828afa6477b7d5d1fea 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, 21 Nov 2020 17:39:30 +0700
Subject: [PATCH 099/358] soundkonverter: fix ftbfs
---
srcpkgs/soundkonverter/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
index 7a26b9a48a8..e11cd964264 100644
--- a/srcpkgs/soundkonverter/template
+++ b/srcpkgs/soundkonverter/template
@@ -4,7 +4,9 @@ version=3.0.1
revision=2
build_wrksrc=src
build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
+ qt5-host-tools pkg-config"
makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
qt5-devel taglib-devel ksolid-devel"
depends="hicolor-icon-theme"
@@ -15,6 +17,4 @@ homepage="https://github.com/dfaust/soundkonverter"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-qmake qt5-host-tools"
-fi
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From b0856be328e0383373409da1438459eb80edf43a 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, 21 Nov 2020 19:37:13 +0700
Subject: [PATCH 100/358] splint: fix build with new bison
---
srcpkgs/splint/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/splint/template b/srcpkgs/splint/template
index d51bba366a5..4e3a93eaf29 100644
--- a/srcpkgs/splint/template
+++ b/srcpkgs/splint/template
@@ -15,6 +15,7 @@ checksum=51cd7ba978a366ae1ededac2b927058fd5f45d5455e5a9d640b75ab4e45b748a
disable_parallel_build=yes
nocross=yes
-post_extract() {
- sed -i 's/__pid_t/pid_t/g' src/osd.c
+post_patch() {
+ vsed -i 's/__pid_t/pid_t/g' src/osd.c
+ vsed -i -e '/RM.*[.]tab[.]h/d' src/Makefile.am src/Makefile.in
}
From 19bd78007bf23b32dc1c2a58c47a5283bf88f1ec 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, 21 Nov 2020 19:46:24 +0700
Subject: [PATCH 101/358] telepathy-salut: fix ftbfs, expand license
---
srcpkgs/telepathy-salut/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index 93bcbd233ed..e5cf92d2d0c 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,21 +1,20 @@
# Template file for 'telepathy-salut'
pkgname=telepathy-salut
version=0.8.1
-revision=18
+revision=19
lib32disabled=yes
build_style=gnu-configure
configure_args="--disable-tests --disable-plugins --with-tls=openssl
--disable-avahi-tests --disable-static"
-hostmakedepends="pkg-config xmldiff glib-devel"
+hostmakedepends="pkg-config python xmldiff glib-devel"
makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
libressl-devel libuuid-devel sqlite-devel"
depends="avahi"
-short_desc="A link-local XMPP connection manager for Telepathy"
+short_desc="Link-local XMPP connection manager for Telepathy"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://telepathy.freedesktop.org"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=70b9108ac8b511b7688e1b580de4ddb8981603c3cbde01f287ef8f9cb708618e
-# http://build.voidlinux.org/builders/armv7l_builder/builds/16213/steps/shell_3/logs/stdio
-nocross=yes
+nocross="http://build.voidlinux.org/builders/armv7l_builder/builds/16213/steps/shell_3/logs/stdio"
From e11a40944d8330dd99aef1cdf0d37f307783d6e6 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, 21 Nov 2020 19:51:33 +0700
Subject: [PATCH 102/358] vala-panel: fix ftbfs
---
srcpkgs/vala-panel/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/vala-panel/template b/srcpkgs/vala-panel/template
index 9d681d5ae1a..86ac40b49a7 100644
--- a/srcpkgs/vala-panel/template
+++ b/srcpkgs/vala-panel/template
@@ -12,6 +12,8 @@ homepage="https://gitlab.com/vala-panel-project/vala-panel"
distfiles="https://gitlab.com/vala-panel-project/vala-panel/uploads/c42b5fbbfb42c5889e7184f5ead03f65/vala-panel-${version}.tar.xz"
checksum=09635f557e3d52894267a66297552119e874a25f9366bf5a1eeda8cfba948462
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/harfbuzz"
+
vala-panel-devel_package() {
short_desc+=" - development files"
depends="vala-panel-${version}_${revision}"
From 8ba919a7f982f0228c6321baa5d9dc3deb638a9c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 13:41:36 +0100
Subject: [PATCH 103/358] awsume: update to 4.5.0.
---
srcpkgs/awsume/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/awsume/template b/srcpkgs/awsume/template
index 3c216c098b5..b7c5edb6b59 100644
--- a/srcpkgs/awsume/template
+++ b/srcpkgs/awsume/template
@@ -1,18 +1,18 @@
# Template file for 'awsume'
pkgname=awsume
-version=4.4.1
-revision=3
+version=4.5.0
+revision=1
build_style=python3-module
hostmakedepends="python3 python3-setuptools"
makedepends="python3-argcomplete python3-boto3 python3-colorama python3-coverage
python3-pluggy python3-psutil python3-xmltodict python3-yaml"
-depends="$makedepends"
+depends="${makedepends}"
short_desc="Utility for easily assuming AWS IAM roles from the command line"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://awsu.me/"
distfiles="https://github.com/trek10inc/awsume/archive/${version}.tar.gz"
-checksum=66d698b4716a1dc7c927778a8fe124a6ac2d99334aff2be5dac6b13598b4e08f
+checksum=3b506e08727400f32886db522477e3ae73d5941266611abbd9a470f3bb17d80b
post_install() {
rm ${DESTDIR}/usr/bin/awsume.*
From b693daa0b9da2e294bcb71ee6f504acc6701825c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 13:47:12 +0100
Subject: [PATCH 104/358] djview: update to 4.12.
---
srcpkgs/djview/template | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index e39d2a23576..136bcced9fb 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -1,18 +1,19 @@
# Template file for 'djview'
pkgname=djview
-version=4.10.6
-revision=2
+version=4.12
+revision=1
+wrksrc="djview4-${version}"
build_style=gnu-configure
build_helper=qmake
configure_args="QMAKE=qmake-qt5"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
+hostmakedepends="automake pkg-config qt5-host-tools qt5-qmake libtool"
makedepends="qt5-devel djvulibre-devel libxkbcommon-devel libSM-devel libXt-devel"
short_desc="Portable DjVu viewer and browser plugin"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://djvu.sourceforge.net/djview4.html"
distfiles="${SOURCEFORGE_SITE}/djvu/${pkgname}-${version}.tar.gz"
-checksum=8446f3cd692238421a342f12baa365528445637bffb96899f319fe762fda7c21
+checksum=5673c6a8b7e195b91a1720b24091915b8145de34879db1158bc936b100eaf3e3
if [ "${CROSS_BUILD}" ]; then
configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
@@ -23,3 +24,7 @@ post_extract() {
-e '/StartupWMClass/s/Djview4/DjView/' \
desktopfiles/djvulibre-djview4.desktop
}
+
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
From 10c2085f4e62fd4a306c44c35cb6e535f0ea1684 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 14:04:49 +0100
Subject: [PATCH 105/358] libX11: update to 1.7.0.
---
srcpkgs/libX11/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 407b2199106..2c62d583432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
# Template file for 'libX11'
pkgname=libX11
-version=1.6.12
+version=1.7.0
revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=f108227469419ac04d196df0f3b80ce1f7f65059bb54c0de811f4d8e03fd6ec7
+checksum=36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libtool automake xorgproto xtrans"
From db4588a30aabb1003f49656328815f6920ffd711 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 14:04:53 +0100
Subject: [PATCH 106/358] python3-boto3: update to 1.16.23.
---
srcpkgs/python3-boto3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 8d32ad71612..4c8a67faabc 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
# Template file for 'python3-boto3'
pkgname=python3-boto3
-version=1.16.19
+version=1.16.23
revision=1
wrksrc="boto3-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/boto/boto3"
distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=5593164dc333131059c338e525eefeabe1d5195479e963e3a6cfb45ccff13c45
+checksum=370f7c8aaf9c31f683a8aa5fa3c0a3e616e633f9e0d23778ed8a32564086cba7
post_install() {
vlicense LICENSE
From 5297c77ef94822e15e09e9067a2899d3080c42a8 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sat, 21 Nov 2020 02:25:40 +0200
Subject: [PATCH 107/358] R-cran-R6: update to 2.5.0.
---
srcpkgs/R-cran-R6/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 8c06f5a3cf7..3c35ffadb06 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-R6'
pkgname=R-cran-R6
-version=2.4.1
-revision=2
+version=2.5.0
+revision=1
build_style=R-cran
short_desc="Classes with Reference Semantics"
maintainer="Florian Wagner <florian@wagner-flo.net>"
license="MIT"
homepage="https://github.com/r-lib/R6"
-checksum=26b0fd64827655c28c903f7ff623e839447387f3ad9b04939a02f41ac82faa3e
+checksum=aec1af9626ec532cb883b544bf9eff4cb2d89c343c7ce0fa31761ec5a7882e02
post_install() {
vlicense LICENSE
From 24cef97fa8756873e0fd9d5071e0e8a184944519 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sat, 21 Nov 2020 02:25:50 +0200
Subject: [PATCH 108/358] R-cran-ps: update to 1.4.0.
---
srcpkgs/R-cran-ps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index 1f95a5d7f2c..d4497a4d234 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-ps'
pkgname=R-cran-ps
-version=1.3.4
+version=1.4.0
revision=1
build_style=R-cran
short_desc="List, Query, Manipulate System Processes"
maintainer="Luke Hannan <lukehannan@gmail.com>"
-license="BSD-3-Clause"
+license="MIT"
homepage="https://github.com/r-lib/ps"
-checksum=8468c6994e199053050c614fb3e6ee0e670833a0185abf53d6cb09e19c85aeb3
+checksum=5f79ae4489090e07abbea892049ec0db900d31955237b388664289e6dc00da7a
post_install() {
vlicense LICENSE
From 578e9b44cf23c4ec007a5f8c76d0fedb3b18a8e2 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sat, 21 Nov 2020 02:26:01 +0200
Subject: [PATCH 109/358] R-cran-processx: update to 3.4.4.
---
srcpkgs/R-cran-processx/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index e051b4b3682..9560ded758b 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -1,7 +1,7 @@
# Template file for 'R-cran-processx'
pkgname=R-cran-processx
-version=3.4.3
-revision=2
+version=3.4.4
+revision=1
build_style=R-cran
hostmakedepends="R-cran-ps R-cran-R6"
depends="R-cran-ps R-cran-R6"
@@ -9,7 +9,7 @@ short_desc="Execute and Control System Processes"
maintainer="Luke Hannan <lukehannan@gmail.com>"
license="MIT"
homepage="https://github.com/r-lib/processx"
-checksum=f247f2180f72e59f1e6d7149ddb44796698eb6be97cc8c479d5f488b65fcb01d
+checksum=aaa40f10a6670eeb451e038bc0eb7c16f263dacb797f76d965b9fc75dda7482b
post_install() {
vlicense LICENSE
From bcdd1f0f1025fd04a87875446f87b7defbd27367 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sat, 21 Nov 2020 08:09:43 -0800
Subject: [PATCH 110/358] NetAuth-ldap: update to 0.2.0
---
srcpkgs/NetAuth-ldap/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index 105d5c6ee0f..425ccf49079 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,6 +1,6 @@
# Template file for 'NetAuth-ldap'
pkgname=NetAuth-ldap
-version=0.1.0
+version=0.2.0
revision=1
wrksrc=ldap-$version
build_style=go
@@ -8,11 +8,11 @@ go_import_path=github.com/netauth/ldap
go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"
hostmakedepends="git"
short_desc="LDAP Proxy for NetAuth"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+maintainer="Michael Aldridge <maldridge@netauth.org>"
license="MIT"
homepage="https://www.netauth.org/ecosystem/ldap"
distfiles="https://github.com/netauth/ldap/archive/v$version.tar.gz"
-checksum=e179918429f133f8360bf9ee6a1ceefa283f245bf5ee0b705676fff9e1442fb4
+checksum=581b60475e940efff673edd3a0fb5ab34fef28f4872fc51a0720013f2004c2f0
system_accounts="_netauth_ldap"
post_install() {
From cefa5e3050b80b16a0372fdb4c07ede57d4482aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 17:55:31 +0100
Subject: [PATCH 111/358] xtools: update to 0.62.
---
srcpkgs/xtools/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index d1b5e0fe4f2..f6b143d8aba 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,8 +1,7 @@
# Template file for 'xtools'
pkgname=xtools
-version=0.61
+version=0.62
revision=1
-archs="noarch"
build_style=gnu-makefile
depends="bash curl findutils git make spdx-licenses-list xbps"
short_desc="Opinionated helpers for working with XBPS"
@@ -10,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Public Domain"
homepage="http://git.vuxu.org/xtools"
distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
-checksum=03de4897b9f2189c4164a49e0d595580ad0a587054c2d1591003992741835409
+checksum=befbe27f4b8091f04ab79024b76c0bad15f86a5f5e6f3624648d633b854696df
From b75bbbf88aeccf8175297e46bf38fae4e8bf25a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 21 Nov 2020 14:06:36 -0300
Subject: [PATCH 112/358] djview: mark broken temporarily.
There's an issue when fetching due to sourceforge's redirects, mark
broken for now.
---
srcpkgs/djview/template | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index 136bcced9fb..c7b0cd84bcf 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -19,6 +19,13 @@ if [ "${CROSS_BUILD}" ]; then
configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
fi
+case "$XBPS_TARGET_MACHINE" in
+ armv6l-musl|armv7l-musl|x86_64-musl)
+ # error while fetching with xbps-fetch
+ broken="djview-4.12.tar.gz: Temporary Redirect"
+ ;;
+esac
+
post_extract() {
vsed -i -e '/Exec/s/djview4/djview/' \
-e '/StartupWMClass/s/Djview4/DjView/' \
From a38a89789d1a7e9775362f3a2e1bb06270f0812a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 21 Nov 2020 19:14:24 +0400
Subject: [PATCH 113/358] osinfo-db: update to 20201119.
---
srcpkgs/osinfo-db/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 300f6bbc960..75462422bf4 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,15 +1,15 @@
# Template file for 'osinfo-db'
pkgname=osinfo-db
-version=20201015
+version=20201119
revision=1
build_style=fetch
hostmakedepends="osinfo-db-tools"
short_desc="Osinfo database about operating systems"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://libosinfo.org"
distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=0a07a9eceebfb058528cb7092f30d7b843595715e2e053acde03acbc62a640c4
+checksum=74f01379359248cb253f86d1126fffc89f319136e35d483c1fd4aa01b3200ca8
skip_extraction="${pkgname}-${version}.tar.xz"
do_install() {
From cd35a09e14b0df4020471306195267e977ca23b1 Mon Sep 17 00:00:00 2001
From: aktsbot <box.ashishk@gmail.com>
Date: Sat, 21 Nov 2020 16:00:45 +0530
Subject: [PATCH 114/358] font-manjari: update to 1.920
---
srcpkgs/font-manjari/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/font-manjari/template b/srcpkgs/font-manjari/template
index ad89f8bebbb..3303e7b2e0d 100644
--- a/srcpkgs/font-manjari/template
+++ b/srcpkgs/font-manjari/template
@@ -1,7 +1,7 @@
# Template file for 'font-manjari'
pkgname=font-manjari
-version=1.910
-revision=2
+version=1.920
+revision=1
create_wrksrc=yes
depends="font-util"
short_desc="Malayalam font with smooth curves"
@@ -10,7 +10,7 @@ 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="943c2dfc3afb9e32d3e4baa132d3b49825cbaf1a39ae9220b73df11255c5d13e
+checksum="77cfe8fbb18ed5325e228d96b4b69cfd21cc9434eab18656fb9bc48ce691b9c3
3ff5ecb5ffbfe008bcc1e2861f2124aabd5571ad1ae9badc245a4e383727ccd2"
font_dirs="/usr/share/fonts/TTF"
From 853416af01e2d6795aa5439bbe64f2340c4c57d0 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Fri, 20 Nov 2020 22:16:48 -0500
Subject: [PATCH 115/358] chezmoi: update to 1.8.9.
---
srcpkgs/chezmoi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 836a483d71a..395eedd19e7 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
# Template file for 'chezmoi'
pkgname=chezmoi
-version=1.8.8
+version=1.8.9
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/${pkgname}/archive/v${version}.tar.gz"
-checksum=1cdd0a4d77714c5003e7abdb46cb3c0c64eb3dfe198d45d36dc5764c2c5c0fcd
+checksum=6e9d341672bc375ad2e9594a689c0c8ae8ebad0c964d699dfbd408fc93058b93
post_install() {
vlicense LICENSE
From 3329d99ea5a2795ded93c7882ab93631d42a3c39 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Fri, 20 Nov 2020 10:42:19 -0300
Subject: [PATCH 116/358] tty-solitaire: update to 1.3.0.
---
srcpkgs/tty-solitaire/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tty-solitaire/template b/srcpkgs/tty-solitaire/template
index 3203baa6585..00c4a9d6386 100644
--- a/srcpkgs/tty-solitaire/template
+++ b/srcpkgs/tty-solitaire/template
@@ -1,16 +1,16 @@
# Template file for 'tty-solitaire'
pkgname=tty-solitaire
-version=1.1.1
+version=1.3.0
revision=1
build_style=gnu-makefile
make_use_env=yes
makedepends="ncurses-devel"
short_desc="Play solitaire in your terminal"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Glaulher <glaulher.developer@gmail.com>"
license="MIT"
homepage="https://github.com/mpereira/tty-solitaire"
distfiles="https://github.com/mpereira/tty-solitaire/archive/v${version}.tar.gz"
-checksum=146f9ed6ee9d79dfd936c213e3a413a967daba3978fb1021e05a1c52c7684e9c
+checksum=a270ee639e911a89add6a3c765b0548c9d762e0388c323807708d2509cfa64a0
CFLAGS="-fcommon"
From 16dfe93c22ded83c470e1e47c1268abc855c2187 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 19 Nov 2020 09:44:25 +0100
Subject: [PATCH 117/358] catgirl: update to 1.3
---
srcpkgs/catgirl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index f3d7c469d01..c4f242f1b5f 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
# Template file for 'catgirl'
pkgname=catgirl
-version=1.2
+version=1.3
revision=1
build_style=gnu-configure
make_build_target="all"
@@ -11,4 +11,4 @@ maintainer="Paper <paper@tilde.institute>"
license="GPL-3.0-or-later"
homepage="https://git.causal.agency/catgirl/"
distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=d1265d023cffa4d997907b86b42760f30f44419fa1d5273267e9b16f67b46fb6
+checksum=be00ea0bd3c8a9582c792d2767bc1a671e05dff839a246b533797742fcda8cec
From c6f0512d89068d02f9127b346705329dbf627200 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 18 Nov 2020 15:50:53 -0600
Subject: [PATCH 118/358] gitea: update to 1.12.6
Fixes CVE-2020-14144
---
srcpkgs/gitea/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 7f7a4e687de..e96ecf7d08b 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
# Template file for 'gitea'
pkgname=gitea
-version=1.12.2
+version=1.12.6
revision=1
create_wrksrc=yes
build_style=go
@@ -32,7 +32,7 @@ license="MIT"
homepage="https://gitea.io"
changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=695dae81327bdfaa4adaa9d3dc9d2bdcb78d54ac73abac3a630750465858ff8b
+checksum=98486d15c58b52177e58af300e1ac6afa46f2f85f61b8d96eacbbf73ccf1191e
system_accounts="_gitea"
_gitea_homedir="/var/lib/gitea"
From a5ffbee63460e1a4176cbe19f2031dc058ae792c Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Fri, 20 Nov 2020 21:29:00 +0600
Subject: [PATCH 119/358] opera: update to 72.0.3815.378.
---
srcpkgs/opera/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index fbda63d3d76..124cab7777c 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
# Template file for 'opera'
pkgname=opera
-version=72.0.3815.320
+version=72.0.3815.378
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=520cc476126af6b324f3f0a290003d323c22fec70feb19c357ccddd884d840ad
+checksum=c2fa6f20c1380f4b95452c260eb0266ff83de4f3f40d42c1556f3806a10b666d
repository="nonfree"
nostrip=yes
From e07e564f8bb024220bf9014da643ff938d0fa48c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 Nov 2020 16:02:51 -0500
Subject: [PATCH 120/358] influxdb: update to 1.8.3.
---
srcpkgs/influxdb/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index e77b36ed222..eb1a592c1d1 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,6 +1,6 @@
# Template file for 'influxdb'
pkgname=influxdb
-version=1.7.9
+version=1.8.3
revision=1
build_style=go
go_import_path=github.com/influxdata/influxdb
@@ -10,27 +10,28 @@ go_package="${go_import_path}/cmd/influx
${go_import_path}/cmd/influx_inspect
${go_import_path}/cmd/influx_stress"
go_ldflags="-X main.version=${version}"
-hostmakedepends="dep"
+hostmakedepends="asciidoc xmlto"
short_desc="Scalable datastore for metrics, events, and real-time analytics"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MIT"
homepage="https://influxdata.com/time-series-platform/influxdb/"
changelog="https://raw.githubusercontent.com/influxdata/influxdb/master/CHANGELOG.md"
distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=fad5107985395353a584978f6c0ad1fbd4f41ea71bdc9cf55a006cc9a88d2b61
+checksum=d8b89e324ed7343c1397124ac3cc68c405406faf74e7369e733611cada54656d
system_accounts="_influxdb"
_influxdb_homedir="/var/lib/influxdb"
make_dirs="${_influxdb_homedir} 0755 _influxdb _influxdb"
conf_files="/etc/${pkgname}/${pkgname}.conf"
-pre_build() {
- cd $GOSRCPATH
- dep ensure
+post_build() {
+ make -C man build
}
post_install() {
vlicense LICENSE
vsv ${pkgname}
vinstall etc/config.sample.toml 644 etc/${pkgname} ${pkgname}.conf
+
+ make -C man DESTDIR="${DESTDIR}/usr" install
}
From a05cf93f23f007ada93794d765cdaef272809bd8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 19:33:05 +0200
Subject: [PATCH 121/358] tomb: update to 2.8.
---
srcpkgs/tomb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tomb/template b/srcpkgs/tomb/template
index 8c67f338b2b..5c72ec7c7e0 100644
--- a/srcpkgs/tomb/template
+++ b/srcpkgs/tomb/template
@@ -1,6 +1,6 @@
# Template file for 'tomb'
pkgname=tomb
-version=2.7
+version=2.8
revision=1
wrksrc=Tomb-${version}
build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later"
homepage="https://www.dyne.org/software/tomb/"
distfiles="https://files.dyne.org/tomb/releases/Tomb-${version}.tar.gz"
-checksum=960107427e42cf0ac10b876cdec0e9f898c10a32d078e3370b7d9b7404a06a74
+checksum=2c064bcb121001dcdd2113c7b728f697e5e5bf8e887a6a4eb633ba5bf1ffef2d
pre_build() {
sed -i extras/gtk-tray/Makefile \
From 7b1687e886221175b751f660164505ebd6973a5f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 19:27:13 +0200
Subject: [PATCH 122/358] yabasic: update to 2.87.1.
---
srcpkgs/yabasic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yabasic/template b/srcpkgs/yabasic/template
index c91db99da22..c06e991d774 100644
--- a/srcpkgs/yabasic/template
+++ b/srcpkgs/yabasic/template
@@ -1,7 +1,7 @@
# Template file for 'yabasic'
pkgname=yabasic
reverts="2.769_1"
-version=2.87.0
+version=2.87.1
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="MIT, GPL-3.0-or-later"
homepage="https://2484.de/yabasic/"
distfiles="https://2484.de/yabasic/download/yabasic-${version}.tar.gz"
-checksum=7206b188f7f6d0ac7f20963bc73806af6f78a2829560172a114144b40f8419f7
+checksum=432f912d80ca00ae00a93ede197d45fde4db1345a61dc42976d10f2b7f9e1dce
do_install() {
vbin yabasic
From c0df7feec164c461d86a7be818176b4f927ac320 Mon Sep 17 00:00:00 2001
From: Reg Tiangha <reg@reginaldtiangha.com>
Date: Thu, 19 Nov 2020 17:22:03 -0700
Subject: [PATCH 123/358] sigil: update to 1.4.1.
---
srcpkgs/sigil/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index b94cbfa6ff1..0fecc98fba7 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,7 +1,7 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.3.0
-revision=2
+version=1.4.1
+revision=1
wrksrc="Sigil-${version}"
build_style=cmake
pycompile_dirs="usr/share/sigil/python3lib"
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/Sigil-Ebook/Sigil"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ac302328f0d0e0144e67bd4cbd7834650eb219f81a623f393271bf6f0686cc56
+checksum=8e4919bde7b0e530e12a6feb8956e92e662270187d924a0102e505e942acacb1
python_version=3
case "$XBPS_TARGET_MACHINE" in
From d80c72a0f1e7dcbb18d0fede98bcb8068f84d32b Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Wed, 18 Nov 2020 13:15:01 +1100
Subject: [PATCH 124/358] android-studio: update to 4.1.1.
---
srcpkgs/android-studio/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 8b255050240..37ab37daf6b 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,11 +1,11 @@
# Template file for 'android-studio'
pkgname=android-studio
-version=4.1.0
+version=4.1.1
revision=1
# _studio_build and _studio_rev are for downloading the zip from dl.google.com
# https://developer.android.com/studio/#resources as of 2018-07-12
-_studio_build=201.6858069
-_studio_rev=19
+_studio_build=201.6953283
+_studio_rev=0
archs="x86_64 i686"
create_wrksrc=yes
hostmakedepends="tar"
@@ -16,7 +16,7 @@ license="Apache-2.0"
homepage="http://tools.android.com/"
# changelog="https://developer.android.com/studio/releases/index.html"
distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz"
-checksum=4b9521fc4a6313ad65ff3e14b0f3fb50427d464fe14227555565f46e0ffad202
+checksum=68032184959c54576f119b7c7c8ded175d848374f3954fa450530d78260dd68b
repository=nonfree
restricted=yes
python_version=2
From b7d07d7e236c25bb6c6c8ea82f494ef82c0a8f3e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 11:56:54 +0200
Subject: [PATCH 125/358] sublime-merge-bin: update to 2039.
---
srcpkgs/sublime-merge-bin/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index aecc6b436c0..a57b827e614 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
# Template file for 'sublime-merge-bin'
pkgname=sublime-merge-bin
-version=2038
+version=2039
revision=1
archs="x86_64"
wrksrc=sublime_merge
@@ -11,8 +11,8 @@ maintainer="Adelmo Junior <noblehelm@gmail.com>"
license="custom:EULA"
homepage="https://www.sublimemerge.com"
distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=3bfa0ca8a322d76117f824587761c57596b2b38a1c98e6a94963ba12f5e07197
-_license_checksum=aaf2f4a457945145bfea1ff06498806bd91951f76ec3cefec169f904ff4cb158
+checksum=289218c5a06ad7516477456d7e372d01fc0fbeb5761d239835ef442a11200251
+_license_checksum=d2ee1cc3f8af74d1eacc960a81fdf1ebe58a9b801bf0b2e2a2302fdefb0ee370
nopie=yes
repository=nonfree
restricted=yes
From 5500c98af099c186fac6432339d97cc2b9995ce1 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 18:07:02 -0600
Subject: [PATCH 126/358] jdupes: update to 1.19.0
[ci skip]
---
srcpkgs/jdupes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 859fc70fa8c..0cba17ea701 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
# Template file for 'jdupes'
pkgname=jdupes
-version=1.14.0
+version=1.19.0
revision=1
build_style=gnu-makefile
make_build_args="ENABLE_BTRFS=1"
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/jbruchon/jdupes"
changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
-checksum=b83285d97f1df5602647749829fdcdbcf21ece273c669bdb8e62544238b1f54e
+checksum=98676d3455c89882c3f7f4934602f9e7aca2b054caf3f0deaf286552ce9b276b
post_install() {
vlicense LICENSE
From 1887ea2a27f2ee48db85b514d59529f507f17b41 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 10:04:40 -0600
Subject: [PATCH 127/358] poedit: update to 2.4.2
---
srcpkgs/poedit/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index eb5084c41f6..4b0fe5d6cbc 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,24 +1,23 @@
# Template file for 'poedit'
pkgname=poedit
-version=2.4.1
+version=2.4.2
revision=1
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
makedepends="boost-devel cld2-devel db-devel enchant2-devel gtk+3-devel
- gtkspell3-devel Lucene++-devel wxWidgets-gtk3-devel"
+ gtkspell3-devel libharfbuzz libxml2 Lucene++-devel webkit2gtk
+ wxWidgets-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cross-platform gettext catalogs (.po files) editor"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.poedit.net/"
distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz"
-checksum=70143e55c16a88b9b29f48e12b0b9e55714177b60ba367fc29d5fa6dc28429c3
+checksum=fed9932a9228b381aa363d8340eb5193d61ffc761f4f328d3cf3cce8f7fbcd4e
CPPFLAGS="-DUCHAR_TYPE=uint16_t -Wno-deprecated-copy"
-makedepends+=" libharfbuzz libxml2 webkit2gtk"
-
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" wxWidgets-common-devel"
configure_args+=" WXRC=/usr/bin/wxrc --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
From c2824a5e887241368d200c947d965987f998ac82 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 09:33:25 -0600
Subject: [PATCH 128/358] clipgrab: update to 3.9.2
[ci skip]
---
srcpkgs/clipgrab/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template
index 72938c814bb..7fbb10204ff 100644
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@@ -1,10 +1,9 @@
# Template file for 'clipgrab'
pkgname=clipgrab
-version=3.8.15
+version=3.9.2
revision=1
build_style=qmake
configure_args=clipgrab.pro
-hostmakedepends="qt5-qmake qt5-devel"
makedepends="qt5-webengine-devel qt5-webchannel-devel
qt5-location-devel qt5-devel qt5-quickcontrols2-devel
qt5-declarative-devel"
@@ -14,12 +13,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://clipgrab.org"
distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz"
-checksum=769812558342ebf4dee0f1deb2fe2ea801278e9821d87ad8d639cec52144d7aa
+checksum=c5bfcb0f6c3bff52ea68c2b978812bcbd43718fd2bcd2dcad1d6a4c970be6cb2
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-location-devel qt5-quickcontrols2-devel
+ hostmakedepends=" qt5-location-devel qt5-quickcontrols2-devel
qt5-declarative-devel qt5-webchannel-devel qt5-webengine-devel
- qt5-host-tools"
+ qt5-host-tools qt5-devel"
fi
case "$XBPS_TARGET_MACHINE" in
From a8840cefbe8fd315a6f747cc5acb76c7fc8f1e8c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 10:32:15 -0600
Subject: [PATCH 129/358] minetest: update to 5.3.0
Adopt
LuaJIT with aarch64* causes PIE breakage; disable use of
LuaJIT for aarc64* due to CMakeLists.txt setting
---
srcpkgs/minetest/template | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/minetest/template b/srcpkgs/minetest/template
index 7f559cdf86a..15a26e0d1ef 100644
--- a/srcpkgs/minetest/template
+++ b/srcpkgs/minetest/template
@@ -1,22 +1,30 @@
# Template file for 'minetest'
pkgname=minetest
-version=5.2.0
+version=5.3.0
revision=1
build_style=cmake
-configure_args="-DRUN_IN_PLACE=0 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DBUILD_SERVER=TRUE"
+configure_args="-DRUN_IN_PLACE=0 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1
+ -DBUILD_SERVER=TRUE"
hostmakedepends="pkg-config tar"
-makedepends="LuaJIT-devel MesaLib-devel freetype-devel gmp-devel irrlicht-devel
+makedepends="MesaLib-devel freetype-devel gmp-devel irrlicht-devel
libcurl-devel libjpeg-turbo-devel libopenal-devel libvorbis-devel lua52-devel
sqlite-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="InfiniMiner/Minecraft inspired game"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Nathan <ndowens@artixlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://www.minetest.net"
distfiles="https://github.com/minetest/minetest/archive/${version}.tar.gz
https://github.com/minetest/minetest_game/archive/${version}.tar.gz>minetest_game-${version}.tar.gz"
-checksum="4996c7c50a6600d0c7140680d4bd995cb9aae910f216b46373953b49d6b13a5d
- 0c49fd6e310de1aba2e8cb8ae72efe0e06bb6bc8d7c5efea23bc201b6a80ce94"
+checksum="65dc2049f24c93fa544500f310a61e289c1b8fa47bf60877b746a2c27a7238d6
+ 06c6c1d4b97af211dd0fa518a3e68a205f594e9816a4b2477e48d4d21d278e2d"
+
+# LuaJIT enabled causes PIE to
+# be broken/not-used on aarch64*
+case "$XBPS_TARGET_MACHINE" in
+ aarch64*) ;;
+ *) makedepends+=" LuaJIT-devel" ;;
+esac
pre_install() {
# Install the minetest_game subgame.
From 0e56b1ae98ce05659156672a9c82078da7408720 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 18 Nov 2020 11:53:05 +0100
Subject: [PATCH 130/358] davfs2: update to 1.6.0
---
srcpkgs/davfs2/patches/100-musl-compat.patch | 7 ++++---
srcpkgs/davfs2/patches/neon-0.31.patch | 11 -----------
srcpkgs/davfs2/template | 4 ++--
3 files changed, 6 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/davfs2/patches/neon-0.31.patch
diff --git a/srcpkgs/davfs2/patches/100-musl-compat.patch b/srcpkgs/davfs2/patches/100-musl-compat.patch
index 646a883a9fb..6d56821f2ff 100644
--- a/srcpkgs/davfs2/patches/100-musl-compat.patch
+++ b/srcpkgs/davfs2/patches/100-musl-compat.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig 2020-04-02 12:05:25.019234433 +0200
-+++ configure.ac 2020-04-02 12:06:27.138863342 +0200
+--- configure.ac
++++ configure.ac
@@ -42,7 +42,7 @@ DAV_CHECK_NEON
# Checks for header files.
AC_HEADER_DIRENT
@@ -53,7 +53,8 @@
#include "config.h"
+#include "compat.h"
-
+
+ #include <errno.h>
-#include <error.h>
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
diff --git a/srcpkgs/davfs2/patches/neon-0.31.patch b/srcpkgs/davfs2/patches/neon-0.31.patch
deleted file mode 100644
index 8a8d5691640..00000000000
--- a/srcpkgs/davfs2/patches/neon-0.31.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig 2020-04-02 12:00:27.586207223 +0200
-+++ configure.ac 2020-04-02 12:00:37.057303637 +0200
-@@ -36,7 +36,7 @@ AC_PROG_LN_S
- # Checks for libraries.
- AM_GNU_GETTEXT_VERSION(0.18.1)
- AM_GNU_GETTEXT([external])
--NE_REQUIRE_VERSIONS([0], [27 28 29 30])
-+NE_REQUIRE_VERSIONS([0], [27 28 29 30 31])
- DAV_CHECK_NEON
-
- # Checks for header files.
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index d94b71a70e6..01eb6336fc4 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,6 +1,6 @@
# Template file for 'davfs2'
pkgname=davfs2
-version=1.5.6
+version=1.6.0
revision=1
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
@@ -12,7 +12,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
license="GPL-3.0-or-later"
homepage="https://savannah.nongnu.org/projects/davfs2"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=417476cdcfd53966b2dcfaf12455b54f315959b488a89255ab4b44586153d801
+checksum=2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50
CFLAGS="-fcommon"
From dc17ce55845eb699db1bf88d3b8652a2e4b0d9f9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 16:21:34 -0600
Subject: [PATCH 131/358] guake: update to 3.7.0
---
srcpkgs/guake/template | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/guake/template b/srcpkgs/guake/template
index ae5192edb0f..8f0fbe4d2be 100644
--- a/srcpkgs/guake/template
+++ b/srcpkgs/guake/template
@@ -1,10 +1,8 @@
# Template file for 'guake'
pkgname=guake
-version=3.6.3
-revision=4
+version=3.7.0
+revision=1
build_style=python3-module
-wrksrc="Guake-${version}"
-pycompile_module="guake"
hostmakedepends="gettext python3-setuptools"
makedepends="python3-devel python3-pbr"
depends="desktop-file-utils libkeybinder3 libnotify python3-dbus python3-gobject
@@ -14,14 +12,18 @@ short_desc="Drop-down terminal for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://guake-project.org/"
-distfiles="${PYPI_SITE}/G/Guake/Guake-${version}.tar.gz"
-checksum=dabfb58070c721b3e2d8fc9621afdd9de74ed7929d2453a9d08058baab5b7791
+distfiles="${PYPI_SITE}/g/guake/guake-${version}.tar.gz"
+checksum=31fd7d6f62aa0a5e0121e240682e6a9e5ce61cdb266f9438987837f52d552e47
pre_build() {
GUAKE_SCHEMA_DIR="/usr/share/glib-2.0/schemas"
make generate-desktop generate-mo prefix=/usr COMPILE_SCHEMA=0
- make generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)' COMPILE_SCHEMA=0
- sed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' guake/paths.py
+
+ make generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' \
+ DEV_SCHEMA_DIR='$(gsettingsschemadir)' COMPILE_SCHEMA=0
+
+ vsed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' \
+ guake/paths.py
}
do_check() {
@@ -30,5 +32,5 @@ do_check() {
}
pre_install() {
- make prefix=/usr DESTDIR=${DESTDIR} COMPILE_SCHEMA=0 install-locale install-schemas
+ make PREFIX=/usr DESTDIR=${DESTDIR} COMPILE_SCHEMA=0 install-locale install-schemas
}
From 55ae0b875484178c3fbf613afd4df1690900e053 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 09:31:48 -0600
Subject: [PATCH 132/358] oil: update to 0.8.4
Use system python instead of internal
---
srcpkgs/oil/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 0e13b5d103f..b68eca52034 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,19 +1,20 @@
# Template file for 'oil'
pkgname=oil
-version=0.8.3
+version=0.8.4
revision=1
build_style=configure
configure_args="--prefix=/usr $(vopt_with readline)"
-makedepends="$(vopt_if readline readline-devel)"
+hostmakedepends="$(vopt_if readline readline-devel) python"
+makedepends="$hostmakedepends"
short_desc="Oil, a new unix shell"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=3f78c606cde84ef0e90d1744d400c8428941eaab6515f382fabc28cf16453ccb
-python_version=2 #unverified
+checksum=08fd1c6d653ea594a5dcecb7bf40037e683845cf7627129bbeeb4d0b9fe7b879
+python_version=2
register_shell="/usr/bin/osh"
-nocross="oil is nocross"
+nocross="Binaries doesn't build if cross built"
nostrip=yes
build_options="readline"
@@ -22,6 +23,8 @@ build_options_default="readline"
pre_build() {
# Remove the strip wrapper
rm -f "${XBPS_WRAPPERDIR}"/strip
+ # Use system python
+ vsed -i 's|$PREPARE_DIR/python|python|g' build/actions.sh
}
do_install() {
From f07d96c54f4e276b60d82c7481ed8e5062427dfb Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 16:34:35 -0600
Subject: [PATCH 133/358] hydrogen: update to 1.0.1
---
srcpkgs/hydrogen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index 1b46559cdc6..2f4005fd125 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -1,6 +1,6 @@
# Template file for 'hydrogen'
pkgname=hydrogen
-version=1.0.0
+version=1.0.1
revision=1
build_style=cmake
# Our flags has -g already, DEBUG=ON will add -O0
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.hydrogen-music.org/"
distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"
-checksum=c4eac296a0d20578c274faf7816cf35c16ed43b634d91d2d19686bf9bbfeb970
+checksum=de6e8ba259ff340037f24e80f8b34592138603b080b02cfa3214ef9b0d66ac63
post_patch() {
vsed -i '/INSTALL/s,"data,"/usr/share/hydrogen/data,' \
From 251c84a3e45704d1a8c39cb76d664249110879af Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 21:27:42 -0600
Subject: [PATCH 134/358] oxipng: update to 4.0.0
---
srcpkgs/oxipng/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/oxipng/template b/srcpkgs/oxipng/template
index 71b10a0a6de..9c583ba571e 100644
--- a/srcpkgs/oxipng/template
+++ b/srcpkgs/oxipng/template
@@ -1,6 +1,6 @@
# Template file for 'oxipng'
pkgname=oxipng
-version=3.0.1
+version=4.0.0
revision=1
build_style=cargo
short_desc="Multithreaded lossless PNG compression optimizer"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/shssoichiro/oxipng"
changelog="https://raw.githubusercontent.com/shssoichiro/oxipng/master/CHANGELOG.md"
distfiles="https://github.com/shssoichiro/oxipng/archive/v${version}.tar.gz"
-checksum=31b036b146d087b989c22111637129ab8cb29a26719bfff1290427ff8b595e11
+checksum=10308fb78bc5b1b00b7450d812f652bfe6fb6d98d68a0c540bb5d3b9cfd56e68
post_install() {
vlicense LICENSE
From af102b71dba268a8bbba599554834bdf8a1a8057 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 15 Nov 2020 10:32:29 +0100
Subject: [PATCH 135/358] perl-File-Listing: update to 6.11
---
srcpkgs/perl-File-Listing/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-File-Listing/template b/srcpkgs/perl-File-Listing/template
index 27ea1427ef8..1cf6d3f5275 100644
--- a/srcpkgs/perl-File-Listing/template
+++ b/srcpkgs/perl-File-Listing/template
@@ -1,7 +1,7 @@
# Template file for 'perl-File-Listing'
pkgname=perl-File-Listing
-version=6.04
-revision=6
+version=6.11
+revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/File-Listing"
distfiles="${CPAN_SITE}/File/File-Listing-$version.tar.gz"
-checksum=1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5
+checksum=c24c14ece10b949e1cb52d64bc28b42cbaebf87e00293a3f7500950d6be0bf6e
From 4666fe8d5a8cc3e6eeac8b2f575d1220060c68ad Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 14 Nov 2020 20:46:45 -0800
Subject: [PATCH 136/358] pinebookpro-firmware: include clm_blob
Ship the clm_blob so that the correct frequencies are used for the
relevant wireless jurisdiction. Otherwise, only limited frequences are
supported.
---
srcpkgs/pinebookpro-firmware/template | 28 +++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/pinebookpro-firmware/template b/srcpkgs/pinebookpro-firmware/template
index 8fd4fbf5f30..4d29df0915b 100644
--- a/srcpkgs/pinebookpro-firmware/template
+++ b/srcpkgs/pinebookpro-firmware/template
@@ -1,20 +1,36 @@
# Template file for 'pinebookpro-firmware'
pkgname=pinebookpro-firmware
reverts=20200215_1
-version=0.0.20200215
+version=0.0.20201114
revision=1
-_commit=58820c428d2ecae6aaf5e4f00997652b9479853a
+_rockchip_commit=72c91aa297a10140781e3f83419c077d4bf8890c
+_manjaro_commit=7074a2e21dd804e229eab1c031bc00246e9173e0
archs="aarch64*"
-wrksrc="rkwifibt-${_commit}"
+create_wrksrc=yes
short_desc="Firmware files for the Pinebook Pro"
maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="Apache-2.0"
homepage="https://github.com/rockchip-linux/rkwifibt"
-distfiles="https://github.com/rockchip-linux/rkwifibt/archive/${_commit}.tar.gz"
-checksum=20161cf3011f57dc9912db7270be1a83e543a61ea8757c23eaf983542fb021e0
+distfiles="
+ https://github.com/rockchip-linux/rkwifibt/archive/${_rockchip_commit}.tar.gz
+ https://gitlab.manjaro.org/manjaro-arm/packages/community/ap6256-firmware/-/archive/${_manjaro_commit}/ap6256-firmware-${_manjaro_commit}.tar.gz"
+checksum="
+ f73a89b09cccb283b92911e978188987859c97cb78957ab1dbc2f169a0a5ec05
+ 190653595f0dbf564bf726bc0de3d3f06aa9a6fcd7743a9b3fdd5b3b233b6c6b"
do_install() {
+ cd "${wrksrc}"
+ cd "ap6256-firmware-${_manjaro_commit}"
+ vinstall brcmfmac43456-sdio.clm_blob 644 usr/lib/firmware/brcm
+ cd ..
+ cd "rkwifibt-${_rockchip_commit}"
vinstall firmware/broadcom/AP6256/bt/BCM4345C5.hcd 644 usr/lib/firmware/brcm
vinstall firmware/broadcom/AP6256/wifi/fw_bcm43456c5_ag.bin 644 usr/lib/firmware/brcm brcmfmac43456-sdio.bin
- vinstall firmware/broadcom/AP6256/wifi/nvram_ap6256.txt 644 usr/lib/firmware/brcm brcmfmac43456-sdio.pine64,pinebook-pro.txt
+ cp -f firmware/broadcom/AP6256/wifi/nvram_ap6256.txt .
+ vsed -i 's/ccode=DE/ccode=all/' nvram_ap6256.txt
+ vinstall nvram_ap6256.txt 644 usr/lib/firmware/brcm brcmfmac43456-sdio.txt
+ cd ..
+ for dev in pine64,pinebook-pro radxa,rockpi4b radxa,rockpi4c rockpro64-v2.1 rk3399-orangepi; do
+ ln -sf brcmfmac43456-sdio.txt "${DESTDIR}/usr/lib/firmware/brcm/brcmfmac43456-sdio.${dev}.txt"
+ done
}
From 2697d4598723899414482f88dea2e0200d22e3e8 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Fri, 20 Nov 2020 23:08:28 +0100
Subject: [PATCH 137/358] qtkeychain-qt5: update to 0.11.1, adopt
closes #26275
---
srcpkgs/qtkeychain-qt5/INSTALL.msg | 2 +-
.../patches/use-kwallet-dbus-def.patch | 15 +++++++++++++++
srcpkgs/qtkeychain-qt5/template | 16 +++++++++++-----
3 files changed, 27 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
diff --git a/srcpkgs/qtkeychain-qt5/INSTALL.msg b/srcpkgs/qtkeychain-qt5/INSTALL.msg
index 87e12556a84..b358ca1a984 100644
--- a/srcpkgs/qtkeychain-qt5/INSTALL.msg
+++ b/srcpkgs/qtkeychain-qt5/INSTALL.msg
@@ -1,2 +1,2 @@
To actually use qtkeychain-qt5 you need to either have kwallet or
-libgnome-keyring installed.
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 00000000000..d97fcc7890b
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- CMakeLists.txt.ORIG 2020-09-08 15:13:16.000000000 +0200
++++ CMakeLists.txt 2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+
+ add_definitions(-DKEYCHAIN_DBUS=1)
+ list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+- qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++ qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+ list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+
diff --git a/srcpkgs/qtkeychain-qt5/template b/srcpkgs/qtkeychain-qt5/template
index 9bac2f766d0..4e4c982850a 100644
--- a/srcpkgs/qtkeychain-qt5/template
+++ b/srcpkgs/qtkeychain-qt5/template
@@ -1,22 +1,27 @@
# Template file for 'qtkeychain-qt5'
pkgname=qtkeychain-qt5
-version=0.9.1
-revision=2
+version=0.11.1
+revision=1
wrksrc="${pkgname%-*}-${version}"
build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config kwallet"
makedepends="libsecret-devel qt5-tools-devel"
short_desc="Platform-independent Qt5 API for storing passwords securely"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="yopito <pierre.bourgin@free.fr>"
license="BSD-2-Clause"
homepage="https://github.com/frankosterfeld/qtkeychain"
distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/v${version}.tar.gz"
-checksum=9c2762d9d0759a65cdb80106d547db83c6e9fdea66f1973c6e9014f867c6f28e
+checksum=77fc6841c1743d9e6bd499989481cd9239c21bc9bf0760d41a4f4068d2f0a49d
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-tools-devel"
fi
+post_patch() {
+ # ensure it's not used (see dedicated patch)
+ rm org.kde.KWallet.xml
+}
+
post_install() {
vlicense COPYING
}
@@ -28,5 +33,6 @@ qtkeychain-qt5-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/*.so
+ vmove usr/lib/qt5/mkspecs
}
}
From c3ce392715dddca917196172b0acebd0a244f46c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 18:58:40 -0600
Subject: [PATCH 138/358] partclone: update to 0.3.17
---
srcpkgs/partclone/patches/0001-musl.patch | 40 +++++++++++++++++++++++
srcpkgs/partclone/patches/musl.patch | 23 -------------
srcpkgs/partclone/template | 6 ++--
3 files changed, 43 insertions(+), 26 deletions(-)
create mode 100644 srcpkgs/partclone/patches/0001-musl.patch
delete mode 100644 srcpkgs/partclone/patches/musl.patch
diff --git a/srcpkgs/partclone/patches/0001-musl.patch b/srcpkgs/partclone/patches/0001-musl.patch
new file mode 100644
index 00000000000..6720add1959
--- /dev/null
+++ b/srcpkgs/partclone/patches/0001-musl.patch
@@ -0,0 +1,40 @@
+From 3ea1aa99242204e3c1841ac11d9f7064591d3bff Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 18:53:54 -0600
+Subject: [PATCH] musl
+
+---
+ src/btrfs/kernel-lib/rbtree.h | 4 ++++
+ src/main.c | 1 -
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git src/btrfs/kernel-lib/rbtree.h src/btrfs/kernel-lib/rbtree.h
+index 6d68907..affab1d 100644
+--- src/btrfs/kernel-lib/rbtree.h
++++ src/btrfs/kernel-lib/rbtree.h
+@@ -38,6 +38,10 @@
+ extern "C" {
+ #endif
+
++#ifndef __always_inline
++#define __always_inline inline__attribute__((always_inline))
++#endif
++
+ struct rb_node {
+ unsigned long __rb_parent_color;
+ struct rb_node *rb_right;
+diff --git src/main.c src/main.c
+index babcf0c..8a543f3 100644
+--- src/main.c
++++ src/main.c
+@@ -22,7 +22,6 @@
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <mcheck.h>
+ #include <stdint.h>
+ #include <stdarg.h>
+ #include <string.h>
+--
+2.29.2
+
diff --git a/srcpkgs/partclone/patches/musl.patch b/srcpkgs/partclone/patches/musl.patch
deleted file mode 100644
index 815bc7fe356..00000000000
--- a/srcpkgs/partclone/patches/musl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/main.c.orig
-+++ src/main.c
-@@ -20,7 +20,6 @@
- #include <sys/types.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <mcheck.h>
- #include <stdint.h>
- #include <stdarg.h>
- #include <string.h>
---- src/btrfs/rbtree.h.orig
-+++ src/btrfs/rbtree.h
-@@ -38,6 +38,10 @@
- extern "C" {
- #endif
-
-+#ifndef __always_inline
-+#define __always_inline inline __attribute__((always_inline))
-+#endif
-+
- struct rb_node {
- unsigned long __rb_parent_color;
- struct rb_node *rb_right;
diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 3c504c88a71..59c975d9354 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,7 +1,7 @@
# Template file for 'partclone'
pkgname=partclone
-version=0.3.14
-revision=2
+version=0.3.17
+revision=1
build_style=gnu-configure
configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
--enable-extfs --enable-hfsp --enable-fat --enable-exfat
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.partclone.org/"
distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz"
-checksum=c298d2e7a6da97660325ca9296174e94e78dfc161df01bfdb1ea36c7001a6879
+checksum=ef1391db3801e4b3ef82fc9417f1d7f0542b7229b3394120072b2dfeae0bbbb0
CFLAGS="-DBTRFS_DISABLE_BACKTRACE"
pre_configure() {
From 2b4a05df485ce7829b04402107cc7c90aeee9c4d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:58:18 +0200
Subject: [PATCH 139/358] pelican: update to 4.5.1.
---
srcpkgs/pelican/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index 1c47e8d711a..baa4f603c4f 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -1,9 +1,8 @@
# Template file for 'pelican'
pkgname=pelican
-version=4.2.0
-revision=3
+version=4.5.1
+revision=1
build_style=python3-module
-pycompile_module="pelican"
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-feedgenerator python3-Jinja2 python3-Pygments
python3-docutils python3-pytz python3-blinker python3-Unidecode python3-six
@@ -20,7 +19,7 @@ changelog="https://raw.githubusercontent.com/getpelican/pelican/${version}/docs/
# We can live with it.
# distfiles="${PYPI_SITE}/p/pelican/pelican-${version}.tar.gz"
distfiles="https://github.com/getpelican/pelican/archive/${version}.tar.gz"
-checksum=4b0d4c9439217b49ace89f4f8b52c90e13fa283a786d7b12e2020a11f32f9a33
+checksum=b47c65f663bf6f2513b8ebc1f096e51f4d7865c17b36c370f83eadd80b6ba702
post_extract() {
# This test is problematic,
From 94d7985a0b7a079f5055a3043f5778fdec7d8660 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:47:57 +0200
Subject: [PATCH 140/358] dragon-player: update to 20.08.3.
---
srcpkgs/dragon-player/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index 39bb3dc5945..165fc060bb0 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
# Template file for 'dragon-player'
pkgname=dragon-player
-version=20.08.1
+version=20.08.3
revision=1
wrksrc="dragon-${version}"
build_style=cmake
@@ -13,4 +13,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://kde.org/applications/en/multimedia/org.kde.dragonplayer"
distfiles="${KDE_SITE}/release-service/${version}/src/dragon-${version}.tar.xz"
-checksum=691bc338ca25e70e9a43cbcdf50f2e0aa92643bdad0329bdc3e09373ac287040
+checksum=36a755be402d7b811483a17887ebf0c73fc92f92ecbe00b54c11158ee0591a93
From e7d5670595893399978e2fb7aeda1a19a0da27ad Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:21:56 +0200
Subject: [PATCH 141/358] juk: update to 20.08.3.
---
srcpkgs/juk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index 1614b90ccca..e9486b1edcf 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
# Template file for 'juk'
pkgname=juk
-version=20.08.1
+version=20.08.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://juk.kde.org/"
distfiles="${KDE_SITE}/release-service/${version}/src/juk-${version}.tar.xz"
-checksum=aa9a93a0befacf401cf41d8358b4987d8b370b4c153f3b66e05e922472e004a8
+checksum=2ecee3680b92c753e0ccf95e50990fbb12021d81f62a329965a5d4fc480672cb
From 83657a67fd769b2b2caacfcc15cfa7b0acf15933 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 21 Nov 2020 09:55:58 -0800
Subject: [PATCH 142/358] pinebookpro-base: update to 0.3
Mark asound.state file as mutable.
Rename udev hwdb to denote pinebookpro specificity.
Rather than using an evdev hwdb match, set up a custom match via a udev
rule so that only the keyboard (and not other devices are matched).
Without the custom rule, lines like the following appear in dmesg:
udevd[...]: Error calling EVIOCSKEYCODE on device node [...]: Invalid argument
---
.../files/{10-usb-kbd.hwdb => 10-pinebookpro.hwdb} | 2 +-
srcpkgs/pinebookpro-base/files/60-pinebookpro.rules | 7 +++++++
srcpkgs/pinebookpro-base/template | 6 ++++--
3 files changed, 12 insertions(+), 3 deletions(-)
rename srcpkgs/pinebookpro-base/files/{10-usb-kbd.hwdb => 10-pinebookpro.hwdb} (76%)
create mode 100644 srcpkgs/pinebookpro-base/files/60-pinebookpro.rules
diff --git a/srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb b/srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb
similarity index 76%
rename from srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb
rename to srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb
index f8348e6fb3e..65f4b3ed317 100644
--- a/srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb
+++ b/srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb
@@ -1,4 +1,4 @@
-evdev:input:b0003v258Ap001E*
+pinebookpro:keyboard
KEYBOARD_KEY_700a5=brightnessdown
KEYBOARD_KEY_700a6=brightnessup
KEYBOARD_KEY_70066=sleep
diff --git a/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules b/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules
new file mode 100644
index 00000000000..63d3e9ea21f
--- /dev/null
+++ b/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules
@@ -0,0 +1,7 @@
+ACTION=="remove", GOTO="pinebookpro_end"
+KERNEL!="event*", GOTO="pinebookpro_end"
+
+ENV{idVendor}=="258a", ENV{idProduct}=="001e", ENV{ID_INPUT_KEYBOARD}=="1", \
+ IMPORT{builtin}="hwdb 'pinebookpro:keyboard'", RUN{builtin}+="keyboard"
+
+LABEL="pinebookpro_end"
diff --git a/srcpkgs/pinebookpro-base/template b/srcpkgs/pinebookpro-base/template
index 9b4a41eb9a6..fce0a329b98 100644
--- a/srcpkgs/pinebookpro-base/template
+++ b/srcpkgs/pinebookpro-base/template
@@ -1,6 +1,6 @@
# Template file for 'pinebookpro-base'
pkgname=pinebookpro-base
-version=0.2
+version=0.3
revision=1
archs="aarch64*"
build_style=meta
@@ -9,8 +9,10 @@ short_desc="Void Linux Pinebook Pro platform package"
maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="Public Domain"
homepage="https://www.voidlinux.org"
+mutable_files="/var/lib/alsa/asound.state"
do_install() {
- vinstall "${FILESDIR}/10-usb-kbd.hwdb" 644 usr/lib/udev/hwdb.d
+ vinstall "${FILESDIR}/60-pinebookpro.rules" 644 usr/lib/udev/rules.d
+ vinstall "${FILESDIR}/10-pinebookpro.hwdb" 644 usr/lib/udev/hwdb.d
vinstall "${FILESDIR}/asound.state" 644 var/lib/alsa
}
From 68943ea8565d0e6de43fabb45d2d836d5df4a860 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, 21 Nov 2020 22:46:21 +0700
Subject: [PATCH 143/358] cvs2svn: remove package
- Abandon upstream, the homepage is timed-out from my local machine
- Python 2 only
- People could import via git: cvs -> git -> svn
- Other distro dropped this package, too.
---
srcpkgs/cvs2svn/template | 21 ---------------------
srcpkgs/cvs2svn/update | 1 -
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/cvs2svn/template
delete mode 100644 srcpkgs/cvs2svn/update
diff --git a/srcpkgs/cvs2svn/template b/srcpkgs/cvs2svn/template
deleted file mode 100644
index 55e679f2abe..00000000000
--- a/srcpkgs/cvs2svn/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'cvs2svn'
-pkgname=cvs2svn
-version=2.5.0
-revision=1
-archs=noarch
-build_style=gnu-makefile
-make_build_args="man"
-hostmakedepends="python"
-depends="cvs python"
-short_desc="CVS to Subversion, git and bazaar repository conversion tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
-homepage="http://cvs2svn.tigris.org/"
-distfiles="http://cvs2svn.tigris.org/files/documents/1462/49543/cvs2svn-${version}.tar.gz"
-checksum=6409d118730722f439760d41c08a5bfd05e5d3ff4a666050741e4a5dc2076aea
-
-post_install() {
- vmkdir usr/share/man/man1
- install -m644 *.1 ${DESTDIR}/usr/share/man/man1
- vlicense COPYING
-}
diff --git a/srcpkgs/cvs2svn/update b/srcpkgs/cvs2svn/update
deleted file mode 100644
index d8edb80d8d9..00000000000
--- a/srcpkgs/cvs2svn/update
+++ /dev/null
@@ -1 +0,0 @@
-site="http://cvs2svn.tigris.org/servlets/ProjectDocumentList?folderID=2976"
From 62e6d3bab68d28ccddc71cafd858551ecc3b9da3 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Sat, 21 Nov 2020 09:33:37 -0800
Subject: [PATCH 144/358] jetbrains-jdk-bin: update to 11.0.9b1183.9.
---
srcpkgs/jetbrains-jdk-bin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index 68cba46aaf6..c895bfa4fe0 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk-bin/template
@@ -1,6 +1,6 @@
# Template file for 'jetbrains-jdk-bin'
pkgname=jetbrains-jdk-bin
-version=11.0.8b1031.1
+version=11.0.9b1183.9
revision=1
archs="x86_64"
wrksrc="jbrsdk"
@@ -12,7 +12,7 @@ homepage="https://github.com/JetBrains/JetBrainsRuntime"
_jdk_ver=${version%b*}
_jdk_build=${version#*b}
distfiles="https://dl.bintray.com/jetbrains/intellij-jbr/jbrsdk-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
-checksum=0f72e1005648b020cec95957d1b6534158e06e6202e78263aed0976287d2488d
+checksum=aec4dbcf20f47bfe6e1f26dd84e17e395a8e31fda45c981ec8c2ba7767108494
fetch_cmd="wget"
# This JDK appears to link to libs that do not exist, but functions well even in their absence.
# Best guess is that they are optional. ¯\_(ツ)_/¯
From f75f71d31023e97d1dbc0ffaeb32418b5325be21 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Fri, 13 Nov 2020 19:28:22 -0700
Subject: [PATCH 145/358] New package: wbg-1.0.0
---
srcpkgs/wbg/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/wbg/template
diff --git a/srcpkgs/wbg/template b/srcpkgs/wbg/template
new file mode 100644
index 00000000000..28fd6b2d9dc
--- /dev/null
+++ b/srcpkgs/wbg/template
@@ -0,0 +1,15 @@
+# Template file for 'wbg'
+pkgname=wbg
+version=1.0.1
+revision=1
+wrksrc=$pkgname
+build_style=meson
+hostmakedepends="pkg-config wayland-devel"
+makedepends="libjpeg-turbo-devel libpng-devel pixman-devel
+ tllist wayland-devel wayland-protocols"
+short_desc="Simple wallpaper application for Wayland compositors"
+maintainer="travankor <travankor@tuta.io>"
+license="GPL-3.0-or-later"
+homepage="https://codeberg.org/dnkl/wbg"
+distfiles="https://codeberg.org/dnkl/wbg/archive/${version}.tar.gz"
+checksum=20411bb0aead3775616ceaccd48c2a3028400e33094571acf7b6c0005154ac9d
From 5b3f466a2e2e6485254e49bcd5450d992d089608 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Thu, 19 Nov 2020 21:58:24 +0900
Subject: [PATCH 146/358] New package: terraform-ls-0.10.0
Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
srcpkgs/terraform-ls/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/terraform-ls/template
diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
new file mode 100644
index 00000000000..d2e000bf24a
--- /dev/null
+++ b/srcpkgs/terraform-ls/template
@@ -0,0 +1,16 @@
+# Template file for 'terraform-ls'
+pkgname=terraform-ls
+version=0.10.0
+revision=1
+build_style=go
+go_import_path="github.com/hashicorp/$pkgname"
+short_desc="Terraform Language Server"
+maintainer="Sora Morimoto <sora@morimoto.io>"
+license="MPL-2.0"
+homepage="https://github.com/hashicorp/terraform-ls"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=4f6975960dab0d47297fb1cab5685482a12a1f04e148056bdba548d014dd5cd7
+
+post_install() {
+ vlicense LICENSE
+}
From d6d526963e233f604dcea3d42a8e96fd48187220 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Fri, 13 Nov 2020 13:01:05 +0900
Subject: [PATCH 147/358] New package: tflint-0.20.3
Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
srcpkgs/tflint/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/tflint/template
diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
new file mode 100644
index 00000000000..305bbc146b9
--- /dev/null
+++ b/srcpkgs/tflint/template
@@ -0,0 +1,16 @@
+# Template file for 'tflint'
+pkgname=tflint
+version=0.20.3
+revision=1
+build_style=go
+go_import_path="github.com/terraform-linters/$pkgname"
+short_desc="Terraform linter focused on possible errors, best practices, etc"
+maintainer="Sora Morimoto <sora@morimoto.io>"
+license="MPL-2.0"
+homepage="https://github.com/terraform-linters/tflint"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=a375bdcae4276e39607a026da9b50ddca6656586baed2c7c667ed77acf570985
+
+post_install() {
+ vlicense LICENSE
+}
From 375f68ba8955bc3edfe514a5ca6819509fb61329 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Thu, 12 Nov 2020 18:00:00 +0530
Subject: [PATCH 148/358] New package: loudgain-0.6.8
---
srcpkgs/loudgain/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
new file mode 100644
index 00000000000..f2916788343
--- /dev/null
+++ b/srcpkgs/loudgain/template
@@ -0,0 +1,17 @@
+# Template file for 'loudgain'
+pkgname=loudgain
+version=0.6.8
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libebur128-devel taglib-devel ffmpeg-devel"
+short_desc="ReplayGain 2.0 loudness normalizer"
+maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/Moonbase59/loudgain"
+distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
+checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
+
+post_install() {
+ vlicense COPYING
+}
From 7cd02478710a499442d8a48e6460be0762b1f167 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 9 Nov 2020 12:57:30 -0600
Subject: [PATCH 149/358] iptraf-ng: update to 1.2.1
---
srcpkgs/iptraf-ng/patches/musl.patch | 230 ---------------------------
srcpkgs/iptraf-ng/template | 9 +-
2 files changed, 5 insertions(+), 234 deletions(-)
delete mode 100644 srcpkgs/iptraf-ng/patches/musl.patch
diff --git a/srcpkgs/iptraf-ng/patches/musl.patch b/srcpkgs/iptraf-ng/patches/musl.patch
deleted file mode 100644
index 9dbc36fac96..00000000000
--- a/srcpkgs/iptraf-ng/patches/musl.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-From bc0001050b7c2dd92c5b0e78840efbaac5b8c1bb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 19 Dec 2019 03:18:52 +0100
-Subject: [PATCH] Use POSIX instead of Linux/GNU style fields
-
-This allows compilation on current musl, without breaking it on
-glibc. The fields are all in a union and refer to the same thing.
----
- src/ipfrag.c | 8 ++++----
- src/itrafmon.c | 6 +++---
- src/othptab.c | 12 ++++++------
- src/packet.c | 16 ++++++++--------
- src/tcptable.c | 20 ++++++++++----------
- 5 files changed, 31 insertions(+), 31 deletions(-)
-
-diff --git src/ipfrag.c src/ipfrag.c
-index 76196e6..f9c28ad 100644
---- src/ipfrag.c
-+++ src/ipfrag.c
-@@ -190,11 +190,11 @@ unsigned int processfragment(struct iphdr *packet, in_port_t *sport,
- ftmp->firstin = 1;
- tpacket = ((char *) (packet)) + (packet->ihl * 4);
- if (packet->protocol == IPPROTO_TCP) {
-- ftmp->s_port = ntohs(((struct tcphdr *) tpacket)->source);
-- ftmp->d_port = ntohs(((struct tcphdr *) tpacket)->dest);
-+ ftmp->s_port = ntohs(((struct tcphdr *) tpacket)->th_sport);
-+ ftmp->d_port = ntohs(((struct tcphdr *) tpacket)->th_dport);
- } else if (packet->protocol == IPPROTO_UDP) {
-- ftmp->s_port = ntohs(((struct udphdr *) tpacket)->source);
-- ftmp->d_port = ntohs(((struct udphdr *) tpacket)->dest);
-+ ftmp->s_port = ntohs(((struct udphdr *) tpacket)->uh_sport);
-+ ftmp->d_port = ntohs(((struct udphdr *) tpacket)->uh_dport);
- }
- }
- while (dtmp != NULL) {
-diff --git src/itrafmon.c src/itrafmon.c
-index 670ab6d..fe4c5a8 100644
---- src/itrafmon.c
-+++ src/itrafmon.c
-@@ -1017,7 +1017,7 @@ void ipmon(time_t facilitytime, char *ifptr)
-
- if (((ntohs(frag_off) & 0x3fff) == 0) /* first frag only */
- && (tcpentry == NULL)
-- && (!(transpacket->fin))) {
-+ && (!(transpacket->th_flags & TH_FIN))) {
-
- /*
- * Ok, so we have a packet. Add it if this connection
-@@ -1078,7 +1078,7 @@ void ipmon(time_t facilitytime, char *ifptr)
- && (tcpentry->pcount == 1)
- && (!(tcpentry->stat & FLAG_RST))) {
- strcpy(msgstring, "first packet");
-- if (transpacket->syn)
-+ if (transpacket->th_flags & TH_SYN)
- strcat(msgstring, " (SYN)");
-
- writetcplog(logging, logfile, tcpentry,
-@@ -1108,7 +1108,7 @@ void ipmon(time_t facilitytime, char *ifptr)
-
- if (((tcpentry->oth_connection->finsent == 2)
- && /* FINed and ACKed */
-- (ntohl(transpacket->seq) == tcpentry->oth_connection->finack))
-+ (ntohl(transpacket->th_seq) == tcpentry->oth_connection->finack))
- || ((revlook)
- && (((p_sstat != RESOLVED)
- && (tcpentry->s_fstat == RESOLVED))
-diff --git src/othptab.c src/othptab.c
-index 142c9c2..479a55a 100644
---- src/othptab.c
-+++ src/othptab.c
-@@ -140,9 +140,9 @@ void process_dest_unreach(struct tcptable *table, char *packet, char *ifname)
- tcp = (struct tcphdr *) (packet + 48);
- struct sockaddr_storage saddr, daddr;
- sockaddr_make_ipv6(&saddr, &ip6->ip6_src);
-- sockaddr_set_port(&saddr, ntohs(tcp->source));
-+ sockaddr_set_port(&saddr, ntohs(tcp->th_sport));
- sockaddr_make_ipv6(&daddr, &ip6->ip6_dst);
-- sockaddr_set_port(&daddr, ntohs(tcp->dest));
-+ sockaddr_set_port(&daddr, ntohs(tcp->th_dport));
- tcpentry =
- in_table(table, &saddr, &daddr, ifname, 0, NULL, 0);
- } else {
-@@ -151,9 +151,9 @@ void process_dest_unreach(struct tcptable *table, char *packet, char *ifname)
- tcp = (struct tcphdr *) (packet + 8 + (ip->ihl * 4));
- struct sockaddr_storage saddr, daddr;
- sockaddr_make_ipv4(&saddr, ip->saddr);
-- sockaddr_set_port(&saddr, ntohs(tcp->source));
-+ sockaddr_set_port(&saddr, ntohs(tcp->th_sport));
- sockaddr_make_ipv4(&daddr, ip->daddr);
-- sockaddr_set_port(&daddr, ntohs(tcp->dest));
-+ sockaddr_set_port(&daddr, ntohs(tcp->th_dport));
- tcpentry =
- in_table(table, &saddr, &daddr, ifname, 0, NULL, 0);
- }
-@@ -212,10 +212,10 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt,
- new_entry->un.icmp6.code =
- ((struct icmp6_hdr *) packet2)->icmp6_code;
- } else if (protocol == IPPROTO_UDP) {
-- servlook(ntohs(((struct udphdr *) packet2)->source),
-+ servlook(ntohs(((struct udphdr *) packet2)->uh_sport),
- IPPROTO_UDP, new_entry->un.udp.s_sname,
- 10);
-- servlook(ntohs(((struct udphdr *) packet2)->dest),
-+ servlook(ntohs(((struct udphdr *) packet2)->uh_dport),
- IPPROTO_UDP, new_entry->un.udp.d_sname,
- 10);
- } else if (protocol == IPPROTO_OSPFIGP) {
-diff --git src/packet.c src/packet.c
-index bc8ed21..b0d552b 100644
---- src/packet.c
-+++ src/packet.c
-@@ -247,13 +247,13 @@ again:
- switch (ip->protocol) {
- case IPPROTO_TCP:
- tcp = (struct tcphdr *) ip_payload;
-- sport_tmp = ntohs(tcp->source);
-- dport_tmp = ntohs(tcp->dest);
-+ sport_tmp = ntohs(tcp->th_sport);
-+ dport_tmp = ntohs(tcp->th_dport);
- break;
- case IPPROTO_UDP:
- udp = (struct udphdr *) ip_payload;
-- sport_tmp = ntohs(udp->source);
-- dport_tmp = ntohs(udp->dest);
-+ sport_tmp = ntohs(udp->uh_sport);
-+ dport_tmp = ntohs(udp->uh_dport);
- break;
- default:
- sport_tmp = 0;
-@@ -299,16 +299,16 @@ again:
- case IPPROTO_TCP:
- tcp = (struct tcphdr *) ip_payload;
- if (sport)
-- *sport = ntohs(tcp->source);
-+ *sport = ntohs(tcp->th_sport);
- if (dport)
-- *dport = ntohs(tcp->dest);
-+ *dport = ntohs(tcp->th_dport);
- break;
- case IPPROTO_UDP:
- udp = (struct udphdr *) ip_payload;
- if (sport)
-- *sport = ntohs(udp->source);
-+ *sport = ntohs(udp->uh_sport);
- if (dport)
-- *dport = ntohs(udp->dest);
-+ *dport = ntohs(udp->uh_dport);
- break;
- default:
- if (sport)
-diff --git src/tcptable.c src/tcptable.c
-index 956866c..3ef8508 100644
---- src/tcptable.c
-+++ src/tcptable.c
-@@ -613,19 +613,19 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- */
-
- if (tableentry->pcount == 1) {
-- if ((transpacket->syn) || (transpacket->rst))
-+ if ((transpacket->th_flags & TH_SYN) || (transpacket->th_flags & TH_RST))
- tableentry->partial = 0;
- else
- tableentry->partial = 1;
- }
-- tableentry->win = ntohs(transpacket->window);
-+ tableentry->win = ntohs(transpacket->th_win);
-
- tableentry->stat = 0;
-
-- if (transpacket->syn)
-+ if (transpacket->th_flags & TH_SYN)
- tableentry->stat |= FLAG_SYN;
-
-- if (transpacket->ack) {
-+ if (transpacket->th_flags & TH_ACK) {
- tableentry->stat |= FLAG_ACK;
-
- /*
-@@ -639,7 +639,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- */
-
- if ((tableentry->oth_connection->finsent == 1)
-- && (ntohl(transpacket->seq) ==
-+ && (ntohl(transpacket->th_seq) ==
- tableentry->oth_connection->finack)) {
- tableentry->oth_connection->finsent = 2;
-
-@@ -660,7 +660,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- * in ACK above.
- */
-
-- if (transpacket->fin) {
-+ if (transpacket->th_flags & TH_FIN) {
-
- /*
- * First, we check if the opposite direction has no counts, in which
-@@ -688,7 +688,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- */
-
- tableentry->finsent = 1;
-- tableentry->finack = ntohl(transpacket->ack_seq);
-+ tableentry->finack = ntohl(transpacket->th_ack);
- }
- if (logging) {
- char flowrate[64];
-@@ -701,7 +701,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- tableentry->psize, msgstring);
- }
- }
-- if (transpacket->rst) {
-+ if (transpacket->th_flags & TH_RST) {
- tableentry->stat |= FLAG_RST;
- if (!(tableentry->inclosed))
- addtoclosedlist(table, tableentry);
-@@ -720,10 +720,10 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- tableentry->psize, msgstring);
- }
- }
-- if (transpacket->psh)
-+ if (transpacket->th_flags & TH_PUSH)
- tableentry->stat |= FLAG_PSH;
-
-- if (transpacket->urg)
-+ if (transpacket->th_flags & TH_URG)
- tableentry->stat |= FLAG_URG;
-
- tableentry->lastupdate = tableentry->oth_connection->lastupdate =
---
-2.24.0
-
diff --git a/srcpkgs/iptraf-ng/template b/srcpkgs/iptraf-ng/template
index 4fcb86ec182..89a17ed1723 100644
--- a/srcpkgs/iptraf-ng/template
+++ b/srcpkgs/iptraf-ng/template
@@ -1,14 +1,15 @@
# Template file for 'iptraf-ng'
pkgname=iptraf-ng
-version=1.1.4
-revision=3
-build_style=gnu-configure
+version=1.2.1
+revision=1
+build_style=gnu-makefile
+make_install_args="prefix=${DESTDIR}/usr sbindir=${DESTDIR}/usr/bin"
makedepends="ncurses-devel"
short_desc="IP traffic monitor (iptraf-3.0.0 fork)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://tracker.debian.org/pkg/iptraf-ng"
distfiles="http://http.debian.net/debian/pool/main/i/iptraf-ng/iptraf-ng_${version}.orig.tar.gz"
-checksum=79140cf07c0cceb1b5723242847a73aa86f5e4f9dccfe8970fda6801d347eb09
+checksum=9f5cef584065420dea1ba32c86126aede1fa9bd25b0f8362b0f9fd9754f00870
LDFLAGS="-lncursesw -lpanelw -lmenuw"
From cc73cf1e5ab5e1cd48569f892c1f49e375425bb1 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sun, 8 Nov 2020 07:32:27 +0000
Subject: [PATCH 150/358] global: update to 6.6.5
---
srcpkgs/global/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/global/template b/srcpkgs/global/template
index 983db1bec97..dcaaa11b15d 100644
--- a/srcpkgs/global/template
+++ b/srcpkgs/global/template
@@ -1,6 +1,6 @@
# Template file for 'global'
pkgname=global
-version=6.6.4
+version=6.6.5
revision=1
build_style=gnu-configure
configure_args="--disable-static --with-exuberant-ctags=/usr/bin/ctags
@@ -12,7 +12,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/global/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=987e8cb956c53f8ebe4453b778a8fde2037b982613aba7f3e8e74bcd05312594
-python_version=2 #unverified
+checksum=9c3730bd9e975d94231f3402d5526b79c0b23cc665d624c9829c948dfad37b83
+python_version=3
CFLAGS="-fcommon"
From d1541b9ded13e7dd67b88ade49946e3832424470 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sun, 8 Nov 2020 07:20:14 +0000
Subject: [PATCH 151/358] delve: update to 1.5.0
---
srcpkgs/delve/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index 7de8cad55bb..00360982335 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,6 +1,6 @@
# Template file for 'delve'
pkgname=delve
-version=1.4.1
+version=1.5.0
revision=1
build_style=go
go_import_path=github.com/go-delve/delve/cmd/dlv
@@ -9,7 +9,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="MIT"
homepage="https://github.com/go-delve/delve"
distfiles="https://github.com/go-delve/delve/archive/v${version}.tar.gz"
-checksum=6d9da41a18905c9819e33f475bf911facba1297674d2312ab5d7e2488fac685a
+checksum=f8bbaecdfc9d1ff6148900d3dea44b6dd06a7f0197be4e9a75c289b7f62682ab
case "$XBPS_TARGET_MACHINE" in
i686*|arm*|ppc*) broken=yes ;;
From bdf5376c91b7851ffb5e140f6395f6a0d1e63bd8 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sun, 8 Nov 2020 07:08:25 +0000
Subject: [PATCH 152/358] loksh: update to 6.8.1
---
srcpkgs/loksh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template
index a3dd27e5a3a..9089c868036 100644
--- a/srcpkgs/loksh/template
+++ b/srcpkgs/loksh/template
@@ -1,6 +1,6 @@
# Template file for 'loksh'
pkgname=loksh
-version=6.7.5
+version=6.8.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="custom:Public Domain"
homepage="https://github.com/dimkr/loksh"
distfiles="https://github.com/dimkr/loksh/releases/download/${version}/loksh-${version}.tar.xz"
-checksum=1a36bafc2bfb9dee11ca65f955528960283ed12f9b00c57c523c49b2a1c91dd5
+checksum=ceeda4913febdb7e5f42db6a465835178221417e9f24865b0017e89a1a6a610e
register_shell="/bin/loksh"
alternatives="
From 2feb718ff7ac1d8975dde50400651f1f42268893 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:03:49 +0200
Subject: [PATCH 153/358] kdegraphics-thumbnailers: update to 20.08.3.
---
srcpkgs/kdegraphics-thumbnailers/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 93ac206401b..9b11c64eb10 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
# Template file for 'kdegraphics-thumbnailers'
pkgname=kdegraphics-thumbnailers
-version=20.08.1
+version=20.08.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=8303231f2fc44c071b3f6a477ae5335f2657dbfaba52362529aaba20973a5995
+checksum=aed7570a2af795d1f14b54782c578572e639bb850aee88d69dd5b17e0f9f7f55
From 4183cc3ab9fe5e9fddde9f2682044f0b3ee0c3fd Mon Sep 17 00:00:00 2001
From: cptpcrd <31829097+cptpcrd@users.noreply.github.com>
Date: Wed, 11 Nov 2020 21:44:13 -0500
Subject: [PATCH 154/358] New package: watchexec-1.14.1
(Based off of bat's template)
---
srcpkgs/watchexec/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/watchexec/template
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
new file mode 100644
index 00000000000..8b62e5ee01d
--- /dev/null
+++ b/srcpkgs/watchexec/template
@@ -0,0 +1,17 @@
+# Template file for 'watchexec'
+pkgname=watchexec
+version=1.14.1
+revision=1
+build_style=cargo
+short_desc="Executes commands in response to file modifications"
+maintainer="cptpcrd <cptpcrd.git@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/watchexec/watchexec"
+distfiles="https://github.com/watchexec/watchexec/archive/${version}.tar.gz"
+checksum=23ca90f1f070b0d30e821667c8b9deaf174d020373ea032e9e22f1a78adcfa1c
+
+post_install() {
+ vdoc README.md
+ vman doc/watchexec.1
+ vcompletion completions/zsh zsh
+}
From e591a338c31f072ac64b63f37788e2ed42f13f59 Mon Sep 17 00:00:00 2001
From: rc-05 <rc23@email.it>
Date: Sat, 20 Jun 2020 01:33:34 +0200
Subject: [PATCH 155/358] adobe-flash-plugin: update to 32.0.0.453.
---
srcpkgs/adobe-flash-plugin/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template
index 4460be81e58..3c2d29c7db5 100644
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@@ -1,6 +1,6 @@
# Template file for 'adobe-flash-plugin'
pkgname=adobe-flash-plugin
-version=32.0.0.433
+version=32.0.0.453
revision=1
depends="curl hicolor-icon-theme desktop-file-utils"
short_desc="Adobe Flash Player plugin for Netscape compatible browsers"
@@ -23,15 +23,15 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
${_url}/flash_player_npapi_linux.x86_64.tar.gz
${_url}/flash_player_ppapi_linux.x86_64.tar.gz"
checksum="
- ee022c4b1a96eecbfc0e022396cdcb713dddc2fb82abe00dc9c6ddf9518a004d
- ccb865f3a2d39012ec36d13df236e67a0043c43368f4b4b60465d5664870f570"
+ 587fe7027ef410e6833a9428b61ea28d4047bce6e8ed4bff3127cb9e08723e37
+ cab3d2b3a02b1348d991259a7602ffb1d12ec1912984a68bcab0f7ccdf27a9f7"
else
distfiles="
${_url}/flash_player_npapi_linux.i386.tar.gz
${_url}/flash_player_ppapi_linux.i386.tar.gz"
checksum="
- 79dc936f5c1a3af91cd5a2eb31d0d4eb7bee4ebbd49239c6c8f8f8b4b98486e3
- e1d36f768cc6435b9a13b595a41df3f5fedfa6d1b984084163bb56f73baaff7c"
+ 4151cdbba10488978aa2baae19ec147012e17d79c59a6bb40453e35435571df8
+ 88f71944d5c08d1b36446c9c865fc82bcb89d55cd148f62afee8dd928943caf6"
fi
distfiles+=" ${_eula}"
checksum+=" ${_eulacksum}"
From 12e7d397ff1f8684aa4c6d3f7efb935ba1da292d Mon Sep 17 00:00:00 2001
From: wundrweapon <whhacker.dcx@gmail.com>
Date: Fri, 30 Oct 2020 16:30:56 -0400
Subject: [PATCH 156/358] highlight: update to 3.58.
---
srcpkgs/highlight/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/highlight/template b/srcpkgs/highlight/template
index 487d6195561..5bfc991799b 100644
--- a/srcpkgs/highlight/template
+++ b/srcpkgs/highlight/template
@@ -1,16 +1,16 @@
# Template file for 'highlight'
pkgname=highlight
-version=3.57
-revision=3
+version=3.58
+revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config swig perl"
-makedepends="boost-devel lua53-devel perl"
+makedepends="boost-devel lua54-devel perl"
short_desc="Fast and flexible source code highlighter (CLI version)"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.andre-simon.de/doku/highlight/en/highlight.php"
distfiles="http://www.andre-simon.de/zip/${pkgname}-${version}.tar.bz2"
-checksum=f203f75e7e35ce381d0a13270bfdc9ee53fa965c39cc137a9927b9ff0e3be913
+checksum=df80251be1f83adfc58aaad589fd9a8f9a3866b0d89b9f3c81b1696f07db45f8
conf_files="/etc/highlight/filetypes.conf"
post_extract() {
@@ -30,7 +30,7 @@ pre_build() {
}
do_check() {
- # No check target, fails spetarcularly when asked
+ # No check target, fails spectacularly when asked
:
}
From 12bf178b802084e0c6e6e85f752188fd5b79356f Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Sun, 1 Nov 2020 14:27:17 -0800
Subject: [PATCH 157/358] json-c++: build with multi-header support
---
srcpkgs/json-c++/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 1ec838d59a9..23c0d56fc8e 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -1,9 +1,10 @@
# Template file for 'json-c++'
pkgname=json-c++
version=3.9.1
-revision=1
+revision=2
wrksrc="json-${version}"
build_style=cmake
+configure_args="-DJSON_MultipleHeaders=ON"
checkdepends="git"
short_desc="JSON for modern C++"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
From 0d3d1f90a20bbb050833b5d8e35bbb745493b49d Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Wed, 28 Oct 2020 12:54:51 -0700
Subject: [PATCH 158/358] OpenRCT2: update to 0.3.2
---
srcpkgs/OpenRCT2/template | 40 ++++++++++++++++++++++++---------------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index a6e9d10f5bd..5dc6d249853 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,33 +2,41 @@
# based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template
# and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
pkgname=OpenRCT2
-_objects_version=1.0.15
-_titles_version=0.1.2
-version=0.2.6
-revision=3
+_objects_version=1.0.18
+_titles_version=0.1.2c
+version=0.3.2
+revision=1
build_style=cmake
-configure_args="$(vopt_if multiplayer "" "-DDISABLE_HTTP_TWITCH=1 -DDISABLE_NETWORK=1")"
+configure_args="
+ -DOPENRCT2_VERSION_TAG=${version}
+ -DDOWNLOAD_TITLE_SEQUENCES=0
+ -DDOWNLOAD_OBJECTS=0
+ $(vopt_if multiplayer '' '-DDISABLE_NETWORK=1')
+ $(vopt_if scripting '-DENABLE_SCRIPTING=1' '')"
hostmakedepends="pkg-config unzip"
makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel
- $(vopt_if multiplayer libcurl-devel) $(vopt_if multiplayer libressl-devel)"
+ libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
+ $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if scripting duktape-devel)"
short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
maintainer="klardotsh <josh@klar.sh>"
license="GPL-3.0-or-later"
homepage="https://openrct2.io"
+# use title-sequences.zip to match CMakeLists instruction
distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
- https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequence-v${_titles_version}.zip"
-checksum="0e05a709d3e07343cd72e4db4cb4f1a6d9956f8acf7da682d2a3940c3112776e
- 0171907a267c564071e587fc683bfe75f36b891a6769e0bd49a6fc46f2ae7ded
- dcb1648739b351e857e2d19fed1626bec561d5e9f4b49201568f42c475ee7e61"
-skip_extraction="objects.zip title-sequence-v${_titles_version}.zip"
+ https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
+checksum="66c1c7ae8c765397e324b1aac59907bd5197dbad88597133aaba8a9480627c36
+ bf8a28b7ccebaf58e4e9eb2540534632830534cf0b3f73677521dc555878c682
+ 5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
+skip_extraction="objects.zip title-sequences.zip"
replaces="OpenRCT2-data>=0"
-build_options="multiplayer"
-build_options_default="multiplayer"
+build_options="multiplayer scripting"
+build_options_default="multiplayer scripting"
desc_option_multiplayer="Enable multiplayer support"
+desc_option_scripting="Enable script / plugin support"
if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
broken="not yet implemented"
@@ -49,5 +57,7 @@ post_extract() {
_srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
mkdir -p data/object data/title
unzip -qd data/object "${_srcdir}/objects.zip"
- unzip -qd data/title "${_srcdir}/title-sequence-v${_titles_version}.zip"
+ unzip -qd data/sequence "${_srcdir}/title-sequences.zip"
+
+ vsed -i CMakeLists.txt -e "s; -Werror;;"
}
From d2d64eaf8ae58d9bdbe3891eb40828aabee61977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 5 Nov 2020 20:04:23 -0300
Subject: [PATCH 159/358] ngspice: update to 33.
---
srcpkgs/ngspice/patches/windows-only.patch | 15 +++++++++++++++
srcpkgs/ngspice/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/ngspice/patches/windows-only.patch
diff --git a/srcpkgs/ngspice/patches/windows-only.patch b/srcpkgs/ngspice/patches/windows-only.patch
new file mode 100644
index 00000000000..5f661864184
--- /dev/null
+++ b/srcpkgs/ngspice/patches/windows-only.patch
@@ -0,0 +1,15 @@
+libshlwapi is Windows-only
+
+diff --git src/xspice/cmpp/Makefile.in src/xspice/cmpp/Makefile.in
+index b450e8c..2ea8716 100644
+--- src/xspice/cmpp/Makefile.in
++++ src/xspice/cmpp/Makefile.in
+@@ -753,7 +753,7 @@ ifs_yacc.c : ifs_yacc.y
+
+ @CROSS_COMPILING_TRUE@build/cmpp$(BUILD_EXEEXT) : $(BUILD_CMPP_FILES)
+ @CROSS_COMPILING_TRUE@ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
+-@CROSS_COMPILING_TRUE@ $(AM_CPPFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ $^ -lshlwapi
++@CROSS_COMPILING_TRUE@ $(AM_CPPFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ $^
+
+ @CROSS_COMPILING_TRUE@distclean-local:
+ @CROSS_COMPILING_TRUE@ -rm -rf build
diff --git a/srcpkgs/ngspice/template b/srcpkgs/ngspice/template
index 86dfb7d7c7d..05beffd8f84 100644
--- a/srcpkgs/ngspice/template
+++ b/srcpkgs/ngspice/template
@@ -1,6 +1,6 @@
# Template file for 'ngspice'
pkgname=ngspice
-version=32
+version=33
revision=1
build_style=gnu-configure
configure_args="--with-readline=yes --with-ngshared --enable-xspice --enable-cider"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://ngspice.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/ngspice/ng-spice-rework/${version}/${pkgname}-${version}.tar.gz"
-checksum=3cd90c4e94516d87c5b4d02a3a6405b1136b25d05c871d4fee1fd7c4c0d03ef2
+checksum=b99db66cc1c57c44e9af1ef6ccb1dcbc8ae1df3e35acf570af578f606f8541f1
post_install() {
vlicense COPYING
From 64cc221cc5ca910befaabf21a4ce0d6526cf7cf4 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 15:39:22 -0600
Subject: [PATCH 160/358] poedit: remove un-needed makedepends
---
srcpkgs/poedit/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 4b0fe5d6cbc..4616503a942 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -6,8 +6,7 @@ build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
makedepends="boost-devel cld2-devel db-devel enchant2-devel gtk+3-devel
- gtkspell3-devel libharfbuzz libxml2 Lucene++-devel webkit2gtk
- wxWidgets-gtk3-devel"
+ gtkspell3-devel Lucene++-devel wxWidgets-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cross-platform gettext catalogs (.po files) editor"
maintainer="Orphaned <orphan@voidlinux.org>"
From 8d72b3481ba219c60bb01d3a12954b0a95843b85 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:53:28 +0200
Subject: [PATCH 161/358] New package: nocurses-2.0.4.
---
common/shlibs | 2 ++
srcpkgs/notcurses-devel | 1 +
srcpkgs/notcurses-progs | 1 +
srcpkgs/notcurses/template | 40 ++++++++++++++++++++++++++++++++++++++
4 files changed, 44 insertions(+)
create mode 120000 srcpkgs/notcurses-devel
create mode 120000 srcpkgs/notcurses-progs
create mode 100644 srcpkgs/notcurses/template
diff --git a/common/shlibs b/common/shlibs
index 8b31eaafdc4..03e11add039 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3993,3 +3993,5 @@ liburing.so.1 liburing-0.7_1
libbson-1.0.so.0 libbson-1.17.0_1
libsonic.so.0 libsonic-0.2.0_1
libtickit.so.3 libtickit-0.4.1_1
+libnotcurses.so.2 notcurses-2.0.4_1
+libnotcurses++.so.2 notcurses-2.0.4_1
diff --git a/srcpkgs/notcurses-devel b/srcpkgs/notcurses-devel
new file mode 120000
index 00000000000..609dfe4d9c5
--- /dev/null
+++ b/srcpkgs/notcurses-devel
@@ -0,0 +1 @@
+notcurses
\ No newline at end of file
diff --git a/srcpkgs/notcurses-progs b/srcpkgs/notcurses-progs
new file mode 120000
index 00000000000..609dfe4d9c5
--- /dev/null
+++ b/srcpkgs/notcurses-progs
@@ -0,0 +1 @@
+notcurses
\ No newline at end of file
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
new file mode 100644
index 00000000000..bb2d9419da8
--- /dev/null
+++ b/srcpkgs/notcurses/template
@@ -0,0 +1,40 @@
+# Template file for 'notcurses'
+pkgname=notcurses
+version=2.0.4
+revision=1
+build_style=cmake
+configure_args="-DUSE_STATIC=ON"
+hostmakedepends="pkg-config pandoc"
+makedepends="libunistring-devel ffmpeg-devel ncurses-libtinfo-devel qrcodegen-devel doctest-devel"
+depends="ncurses-base"
+short_desc="Blingful character graphics/TUI library"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="Apache-2.0"
+homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
+changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
+distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
+checksum=6bb38ca0affc6425cd8e248c5b81aa4281713362c45202a450a89ab751833c98
+
+notcurses-devel_package() {
+ depends="notcurses-${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove /usr/lib/cmake
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/doc
+ vmove usr/share/man/man3
+ }
+}
+
+notcurses-progs_package() {
+ depends="notcurses-${version}_${revision}"
+ short_desc+=" - programs"
+ pkg_install() {
+ vmove usr/bin
+ vmove usr/share/notcurses
+ vmove usr/share/man/man1
+ }
+}
From c4ac0867eb03e1089a1ece0b57017c3a960f2ada Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:54:10 +0200
Subject: [PATCH 162/358] New package: growlight-1.2.18.
---
srcpkgs/growlight/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/growlight/template
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
new file mode 100644
index 00000000000..65e5f69d52a
--- /dev/null
+++ b/srcpkgs/growlight/template
@@ -0,0 +1,16 @@
+# Template file for 'growlight'
+pkgname=growlight
+version=1.2.18
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config pandoc"
+makedepends="libatasmart-devel libblkid-devel libcap-devel cryptsetup-devel
+ nettle-devel notcurses-devel libpciaccess-devel eudev-libudev-devel zlib-devel
+ device-mapper-devel pciutils-devel zfs-devel"
+depends="ntfs-3g jfsutils xfsprogs nvme-cli hdparm f2fs-tools btrfs-progs e2fsprogs"
+short_desc="Block device manager and system installation tool"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://nick-black.com/dankwiki/index.php/Growlight"
+distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
+checksum=c6c08556e6838226b81300e177c49d7a382e9eb30cfdb19f99790106e426a032
From 4d1fa9e9f6932ce415c91d960264c7ebe119c451 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:54:48 +0200
Subject: [PATCH 163/358] New package: doctest-2.4.1.
---
srcpkgs/doctest-devel | 1 +
srcpkgs/doctest/template | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 120000 srcpkgs/doctest-devel
create mode 100644 srcpkgs/doctest/template
diff --git a/srcpkgs/doctest-devel b/srcpkgs/doctest-devel
new file mode 120000
index 00000000000..79086729892
--- /dev/null
+++ b/srcpkgs/doctest-devel
@@ -0,0 +1 @@
+doctest
\ No newline at end of file
diff --git a/srcpkgs/doctest/template b/srcpkgs/doctest/template
new file mode 100644
index 00000000000..eeb20eab623
--- /dev/null
+++ b/srcpkgs/doctest/template
@@ -0,0 +1,25 @@
+# Template file for 'doctest'
+pkgname=doctest
+version=2.4.1
+revision=1
+build_style=cmake
+short_desc="Doctest C++ testing framework"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md#reference"
+changelog="https://raw.githubusercontent.com/onqtam/doctest/master/CHANGELOG.md"
+distfiles="https://github.com/onqtam/doctest/archive/${version}.tar.gz"
+checksum=0a0f0be21ee23e36ff6b8b9d63c06a7792e04cce342e1df3dee0e40d1e21b9f0
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+doctest-devel_package() {
+ depends="doctest-${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From 6517c67a5f7c8faf0a6a1f0e9931e2265dfee7e3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:55:19 +0200
Subject: [PATCH 164/358] qrcodegen: enable C library build.
---
srcpkgs/qrcodegen/template | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/qrcodegen/template b/srcpkgs/qrcodegen/template
index 53627a2b98f..d181e9cdb52 100644
--- a/srcpkgs/qrcodegen/template
+++ b/srcpkgs/qrcodegen/template
@@ -1,10 +1,8 @@
# Template file for 'qrcodegen'
pkgname=qrcodegen
version=1.6.0
-revision=2
+revision=3
wrksrc="QR-Code-generator-${version}"
-build_wrksrc="cpp"
-build_style=gnu-makefile
short_desc="QR Code generator library"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="MIT"
@@ -14,11 +12,20 @@ checksum=8acee5a77325e075b910747ad4b1fdb1491b7e22d0b8f1b5a6ea15ea08ba33a8
CXXFLAGS="-fPIC"
+do_build() {
+ for dir in c cpp
+ do
+ cd $dir && make && cd ..
+ done
+}
+
do_install() {
- sed -n "/^License/,/xxxx/p" ../Readme.markdown > LICENSE
+ sed -n "/^License/,/xxxx/p" Readme.markdown > LICENSE
vlicense LICENSE
- vinstall QrCode.hpp 644 usr/include/qrcodegen
- vinstall libqrcodegen.a 644 usr/lib libqrcodegencpp.a
+ vinstall cpp/QrCode.hpp 644 usr/include/qrcodegen
+ vinstall cpp/libqrcodegen.a 644 usr/lib libqrcodegencpp.a
+ vinstall c/qrcodegen.h 644 usr/include/qrcodegen
+ vinstall c/libqrcodegen.a 644 usr/lib
}
qrcodegen-devel_package() {
From 5895cee48b5ce80510e89d5fdaa80fd077ef88a7 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:42:08 -0600
Subject: [PATCH 165/358] php: rebuild against libnet-snmp [ci skip]
---
srcpkgs/php/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index db56578a49f..613e0215751 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
version=7.4.11
-revision=1
+revision=2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmysqlclient-devel
From 9060da8bd19511f6bfefcd9c632cbd6abceaafa0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:36:11 -0600
Subject: [PATCH 166/358] collectd: rebuild against libnet-snmp
---
srcpkgs/collectd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index f0ff336a74d..84ce3ef4ecd 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
# Template file for 'collectd'
pkgname=collectd
version=5.11.0
-revision=4
+revision=5
build_style=gnu-configure
configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
$(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
From 6f01dd3b763f1cc349cbd5b99900188013edd770 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:39:50 -0600
Subject: [PATCH 167/358] hplip: rebuild against libnet-snmp
---
srcpkgs/hplip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index bf66601fe64..8ebc49b7a8f 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
# Template file for 'hplip'
pkgname=hplip
version=3.20.9
-revision=3
+revision=4
build_style=gnu-configure
pycompile_dirs="usr/share/hplip"
configure_args="
From 95a131fef92b23e4d204b77e73ff4ab94e02a22e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:41:01 -0600
Subject: [PATCH 168/358] network-ups-tools: rebuild against libnet-snmp
---
srcpkgs/network-ups-tools/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index cc100bbde6e..bf2e50a540e 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
# Template file for 'network-ups-tools'
pkgname=network-ups-tools
version=2.7.4
-revision=10
+revision=11
wrksrc="nut-${version}"
build_style=gnu-configure
configure_args="
@@ -13,7 +13,6 @@ configure_args="
hostmakedepends="pkg-config"
makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
-system_accounts="nut"
conf_files="
/etc/ups/ups.conf
/etc/ups/upsd.users
@@ -23,10 +22,11 @@ conf_files="
/etc/ups/nut.conf"
short_desc="UPS control and monitoring features (NUT)"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://www.networkupstools.org/"
distfiles="${homepage}source/${version%.*}/nut-${version}.tar.gz"
checksum=980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7
+system_accounts="nut"
nopie=yes
build_options="cgi"
From 56667f279975c299cb1304cc0445990b8555090a Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:43:24 -0600
Subject: [PATCH 169/358] zabbix: rebuild against libnet-snmp
---
srcpkgs/zabbix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index 05e7461a9d3..cbc49634215 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
# Template file for 'zabbix'
pkgname=zabbix
version=4.4.10
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
--with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent
From 3d6ee651840b28c90b6be303bc0a9cff1acb28df Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:44:28 -0600
Subject: [PATCH 170/358] wmnd: rebuild against libnet-snmp
---
srcpkgs/wmnd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wmnd/template b/srcpkgs/wmnd/template
index 76eeba429a3..c922189a374 100644
--- a/srcpkgs/wmnd/template
+++ b/srcpkgs/wmnd/template
@@ -1,7 +1,7 @@
# Template file for 'wmnd'
pkgname=wmnd
version=0.4.18
-revision=1
+revision=2
build_style=gnu-configure
configure_args="ac_cv_file__proc_net_dev=yes
ac_cv_file__dev_ppp=no"
From 5e6ff39d7ee39a47ee31eed140e8e8dc1ab54544 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:09:27 -0600
Subject: [PATCH 171/358] net-snmp: update to 5.9
[ci skip]
---
common/shlibs | 12 ++++++------
srcpkgs/net-snmp/template | 7 ++++---
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 03e11add039..012cbd0e6fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1102,12 +1102,12 @@ libijs-0.35.so libijs-0.8_1
libgs.so.9 libgs-0.8_1
libssh2.so.1 libssh2-1.4.1_1
libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
-libsnmp.so.35 libnet-snmp-5.8_1
-libnetsnmp.so.35 libnet-snmp-5.8_1
-libnetsnmpagent.so.35 libnet-snmp-5.8_1
-libnetsnmpmibs.so.35 libnet-snmp-5.8_1
-libnetsnmptrapd.so.35 libnet-snmp-5.8_1
-libnetsnmphelpers.so.35 libnet-snmp-5.8_1
+libsnmp.so.40 libnet-snmp-5.9_1
+libnetsnmp.so.40 libnet-snmp-5.9_1
+libnetsnmpagent.so.40 libnet-snmp-5.9_1
+libnetsnmpmibs.so.40 libnet-snmp-5.9_1
+libnetsnmptrapd.so.40 libnet-snmp-5.9_1
+libnetsnmphelpers.so.40 libnet-snmp-5.9_1
libieee1284.so.3 libieee1284-0.2.10_1
libsane.so.1 libsane-1.0.22_1
libfltk.so.1.3 fltk-1.3.0_1
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index 7b8e3185fba..b5c06106fb2 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,7 +1,7 @@
# Template file for 'net-snmp'
pkgname=net-snmp
-version=5.8
-revision=5
+version=5.9
+revision=1
hostmakedepends="pkg-config unzip"
makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
libsensors-devel pcre-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Net-SNMP"
homepage="http://www.net-snmp.org/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf
+checksum=04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071
LDFLAGS="-lpthread"
@@ -51,5 +51,6 @@ net-snmp-devel_package() {
vmove usr/include
vmove usr/share/man/man3
vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
}
}
From feb9a2ef9b4a1b0901a39ec2a67af6a216f5ce3a Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 21 Nov 2020 14:51:20 -0800
Subject: [PATCH 172/358] atf-rk3328-bl31: update to 2.4.
---
srcpkgs/atf-rk3328-bl31/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/atf-rk3328-bl31/template b/srcpkgs/atf-rk3328-bl31/template
index b257d5fae24..89397958a62 100644
--- a/srcpkgs/atf-rk3328-bl31/template
+++ b/srcpkgs/atf-rk3328-bl31/template
@@ -1,6 +1,6 @@
# Template file for 'atf-rk3328-bl31'
pkgname=atf-rk3328-bl31
-version=2.3
+version=2.4
revision=1
archs="aarch64*"
wrksrc="trusted-firmware-a-${version}"
@@ -9,7 +9,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="BSD-3-Clause"
homepage="https://developer.trustedfirmware.org/dashboard/view/6/"
distfiles="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-${version}.tar.gz"
-checksum=37f917922bcef181164908c470a2f941006791c0113d738c498d39d95d543b21
+checksum=bf3eb3617a74cddd7fb0e0eacbfe38c3258ee07d4c8ed730deef7a175cc3d55b
nostrip=yes
do_build() {
From c408d74ae2573dd142b8415f83b4a0a770ddaea9 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 1 Nov 2020 19:07:15 +0000
Subject: [PATCH 173/358] rock64-uboot: update to 2020.10
---
srcpkgs/rock64-uboot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rock64-uboot/template b/srcpkgs/rock64-uboot/template
index d0c03cb2688..625660c7706 100644
--- a/srcpkgs/rock64-uboot/template
+++ b/srcpkgs/rock64-uboot/template
@@ -1,6 +1,6 @@
# Template file for 'rock64-uboot'
pkgname=rock64-uboot
-version=2020.07
+version=2020.10
revision=1
archs="aarch64*"
wrksrc="u-boot-${version}"
@@ -11,7 +11,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-2.0-or-later, BSD-3-Clause"
homepage="https://www.denx.de/wiki/U-Boot/"
distfiles="https://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
-checksum=c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a
+checksum=0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622
do_configure() {
make rock64-rk3328_defconfig
From 817370dbd9f54660888d03a015a0019b6912d0c9 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, 21 Nov 2020 22:51:09 +0700
Subject: [PATCH 174/358] c: remove noarch
---
srcpkgs/c/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/c/template b/srcpkgs/c/template
index 47c95d3060e..7b0086a5153 100644
--- a/srcpkgs/c/template
+++ b/srcpkgs/c/template
@@ -1,8 +1,7 @@
# Template file for 'c'
pkgname=c
version=0.14
-revision=1
-archs=noarch
+revision=2
depends="bash"
short_desc="Compile and execute C scripts in one go!"
maintainer="Orphaned <orphan@voidlinux.org>"
From f3e8b5d94f67d23bfde78615649c38c3dbbde2b0 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 175/358] catch2: remove noarch
---
srcpkgs/catch2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index f8795cb6c77..ae4c9b2c38d 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,8 +1,7 @@
# Template file for 'catch2'
pkgname=catch2
version=2.11.1
-revision=1
-archs=noarch
+revision=2
wrksrc="Catch2-${version}"
build_style=cmake
configure_args="-DCATCH_USE_VALGRIND=OFF -DCATCH_BUILD_TESTING=ON
From 909813f5a8adc35e31f4a3ba19164c4cbfd95d85 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 176/358] cdemu-client: remove noarch
---
srcpkgs/cdemu-client/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cdemu-client/template b/srcpkgs/cdemu-client/template
index 36d40de4bb5..c070247bc8b 100644
--- a/srcpkgs/cdemu-client/template
+++ b/srcpkgs/cdemu-client/template
@@ -1,8 +1,7 @@
# Template file for 'cdemu-client'
pkgname=cdemu-client
version=3.2.4
-revision=1
-archs=noarch
+revision=2
build_style=cmake
configure_args="-DCMAKE_INSTALL_COMPLETIONSDIR=/usr/share/bash-completion/completions"
hostmakedepends="python3 intltool pkg-config"
From 45071adfd781c2390fddf7757c647e3e2897321a 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 177/358] cdm: remove noarch
---
srcpkgs/cdm/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cdm/template b/srcpkgs/cdm/template
index ae30eaaef91..f1fb8b2f646 100644
--- a/srcpkgs/cdm/template
+++ b/srcpkgs/cdm/template
@@ -1,15 +1,14 @@
# Template file for 'cdm'
pkgname=cdm
version=0.7
-revision=2
+revision=3
+depends="dialog xinit kbd xdpyinfo"
short_desc="Console Display Manager"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-depends="dialog xinit kbd xdpyinfo"
license="GPL-2.0-or-later"
homepage="https://github.com/evertiro/cdm"
distfiles="https://github.com/evertiro/cdm/archive/${version}.tar.gz"
checksum=530042165ce65cdff3ec62ba9f077d0e8c6744c13f5d449d84fe2506a79d2e56
-archs=noarch
do_install() {
sed -i 's| /| $PKGDESTDIR/|g' install.sh
From 7631807e94d3c201189f03f754f58db2f0577e8c 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 178/358] cereal: remove noarch
---
srcpkgs/cereal/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cereal/template b/srcpkgs/cereal/template
index c454ed85833..8588f1ee882 100644
--- a/srcpkgs/cereal/template
+++ b/srcpkgs/cereal/template
@@ -1,8 +1,7 @@
# Template file for 'cereal'
pkgname=cereal
version=1.3.0
-revision=1
-archs=noarch
+revision=2
build_style=cmake
configure_args="-DSKIP_PORTABILITY_TEST=1 -DTHREAD_SAFE=ON -DWITH_WERROR=OFF"
short_desc="Header-only C++ serialization library"
From 1ef10b186f370ea3033dea3d6f9c0b837c450dc1 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 179/358] chatty: remove noarch
---
srcpkgs/chatty/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index 16bbc44096d..00573e1c89f 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -1,8 +1,7 @@
# Template file for 'chatty'
pkgname=chatty
version=0.12
-revision=1
-archs=noarch
+revision=2
hostmakedepends="gradle"
depends="virtual?java-runtime"
short_desc="Twitch Chat Client for Desktop"
From 3cdfa6cd71fa1901798d2d3bd7fe66b6ab66a6a5 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 180/358] cldr-emoji-annotation: remove noarch
---
srcpkgs/cldr-emoji-annotation/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cldr-emoji-annotation/template b/srcpkgs/cldr-emoji-annotation/template
index 7910b83971b..2ce6e53f4e1 100644
--- a/srcpkgs/cldr-emoji-annotation/template
+++ b/srcpkgs/cldr-emoji-annotation/template
@@ -1,9 +1,8 @@
# Template file for 'cldr-emoji-annotation'
pkgname=cldr-emoji-annotation
version=36.12.120191002.0
-revision=1
+revision=2
_tag=${version%.*}_${version##*.}
-archs=noarch
wrksrc="${pkgname}-${_tag}"
build_style=gnu-configure
short_desc="Emoji annotation files in CLDR"
From a95eb67203ab7f08b12e31537a12c1af196b9347 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 181/358] clearlooks-phenix-darkpurpy-theme: remove noarch
---
srcpkgs/clearlooks-phenix-darkpurpy-theme/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/clearlooks-phenix-darkpurpy-theme/template b/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
index a2d541c8896..bbc8c60559e 100644
--- a/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
+++ b/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
@@ -1,10 +1,9 @@
# Template file for 'clearlooks-phenix-darkpurpy-theme'
pkgname=clearlooks-phenix-darkpurpy-theme
version=7.0.2
-revision=1
+revision=2
_devuan_rel="1+devuan2.0"
build_style=fetch
-archs=noarch
depends="gnome-themes-standard gtk-engine-murrine gtk2-engines"
short_desc="Dark-purpified GTK3 port of Clearlooks theme"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,4 +18,3 @@ do_install() {
vmkdir usr/share/themes
vcopy usr/share/themes/Clearlooks-Phenix-DarkPurpy usr/share/themes
}
-
From 0f6fdf90527b5326a10f59e7d38459e705977a0f 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 182/358] clerk: remove noarch
---
srcpkgs/clerk/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/clerk/template b/srcpkgs/clerk/template
index a04c6f2cef6..cad10f86a94 100644
--- a/srcpkgs/clerk/template
+++ b/srcpkgs/clerk/template
@@ -1,8 +1,7 @@
# Template file for 'clerk'
pkgname=clerk
version=4.0.5
-revision=1
-archs=noarch
+revision=2
depends="rofi fzf tmux mpc perl-Net-MPD perl-Data-MessagePack perl-File-Slurper
perl-Config-Simple perl-Try-Tiny perl-IPC-Run perl-HTTP-Date perl-Data-Section-Simple"
short_desc="MPD client written in Perl using rofi or fzf"
From 015921d4d5b52dbc93cdaafd03b25968a144ebe3 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 183/358] cloc: remove noarch
---
srcpkgs/cloc/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template
index 00cf43ef4b1..cf2d1f35d3f 100644
--- a/srcpkgs/cloc/template
+++ b/srcpkgs/cloc/template
@@ -1,8 +1,7 @@
# Template file for 'cloc'
pkgname=cloc
version=1.88
-revision=1
-archs=noarch
+revision=2
hostmakedepends="perl"
depends="perl"
short_desc="Count Lines of Code"
From c5b102ee1af5381c03bc067c6cd7c7ff38e2f496 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, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 184/358] clyrics: remove noarch
---
srcpkgs/clyrics/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/clyrics/template b/srcpkgs/clyrics/template
index 5a0144c5b30..955aaedc7c3 100644
--- a/srcpkgs/clyrics/template
+++ b/srcpkgs/clyrics/template
@@ -1,8 +1,7 @@
# Template file for 'clyrics'
pkgname=clyrics
version=0.12
-revision=1
-archs=noarch
+revision=2
depends="perl-LWP-Protocol-https perl-WWW-Mechanize"
short_desc="Extensible lyrics fetcher, with daemon support for cmus and mocp"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9f521a27bf9ec0e3585bfecb59511331feec81d8 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, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 185/358] cmc: remove noarch
---
srcpkgs/cmc/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cmc/template b/srcpkgs/cmc/template
index 34a50561d1d..d94d241d7f5 100644
--- a/srcpkgs/cmc/template
+++ b/srcpkgs/cmc/template
@@ -1,8 +1,7 @@
# Template file for 'cmc'
pkgname=cmc
version=1.1.4
-revision=1
-archs=noarch
+revision=2
short_desc="SSH ControlMaster Controller"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
license="MIT"
From 32c75006a4520042a1ff00d6e1e875d1a6fe2cbe 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, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 186/358] collectl: remove noarch
---
srcpkgs/collectl/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template
index aec4b83ff46..59af99c7a5d 100644
--- a/srcpkgs/collectl/template
+++ b/srcpkgs/collectl/template
@@ -1,8 +1,7 @@
# Template file for 'collectl'
pkgname=collectl
version=4.3.1
-revision=1
-archs=noarch
+revision=2
conf_files="/etc/collectl.conf"
depends="perl perl-Term-ReadKey"
short_desc="Collects data that describes the current system status"
From 23ba1f52fb8df1ac8c1500bd00c990e4dae45eda 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 187/358] compiz-bcop: remove noarch
---
srcpkgs/compiz-bcop/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/compiz-bcop/template b/srcpkgs/compiz-bcop/template
index c1a82cb881b..7cc20653931 100644
--- a/srcpkgs/compiz-bcop/template
+++ b/srcpkgs/compiz-bcop/template
@@ -1,8 +1,7 @@
# Template file for 'compiz-bcop'
pkgname=compiz-bcop
version=0.8.18
-revision=1
-archs=noarch
+revision=2
build_style=gnu-configure
hostmakedepends="automake intltool libtool pkg-config libxslt"
makedepends="libxslt-devel"
From c67e5b4ae26289699db73c13e5879825cdf6d5b8 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 188/358] coreboot-utils: remove noarch
---
srcpkgs/coreboot-utils/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template
index e6c57472ea1..8368dec2969 100644
--- a/srcpkgs/coreboot-utils/template
+++ b/srcpkgs/coreboot-utils/template
@@ -1,7 +1,7 @@
# Template file for 'coreboot-utils'
pkgname=coreboot-utils
version=4.12
-revision=1
+revision=2
archs="i686* x86_64*"
wrksrc="coreboot-${version}"
build_wrksrc="util"
@@ -32,7 +32,6 @@ do_install() {
}
coreboot-utils-me_cleaner_package() {
- archs=noarch
python_version=3
depends="python3"
short_desc="Tool for partial deblobbing Intel ME/TXE firmware images"
From 7824ea3ac4b24fb2b5588bd48305b784fe47fe71 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 189/358] couchpotato: remove noarch
---
srcpkgs/couchpotato/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/couchpotato/template b/srcpkgs/couchpotato/template
index 3d7e27004d1..5c3d743442a 100644
--- a/srcpkgs/couchpotato/template
+++ b/srcpkgs/couchpotato/template
@@ -1,8 +1,7 @@
# Template file for 'couchpotato'
pkgname=couchpotato
version=3.0.1
-revision=2
-archs=noarch
+revision=3
wrksrc="CouchPotatoServer-build-${version}"
pycompile_dirs="/usr/share/couchpotato"
make_dirs="
@@ -14,12 +13,12 @@ license="GPL-3.0-or-later"
homepage="http://couchpota.to"
distfiles="https://github.com/RuudBurger/CouchPotatoServer/archive/build/${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=f08f9c6ac02f66c6667f17ded1eea4c051a62bbcbadd2a8673394019878e92f7
-python_version=2 #unverified
+python_version=2
couchpotato_homedir="/var/lib/couchpotato"
system_accounts="couchpotato"
do_install() {
vmkdir usr/share/couchpotato
- mv * ${DESTDIR}/usr/share/couchpotato
+ vcopy "*" usr/share/couchpotato
vsv couchpotato
}
From b5a156654a1b5e755b571b567a4d1eb2d7a6b621 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 190/358] create_ap: remove noarch
---
srcpkgs/create_ap/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/create_ap/template b/srcpkgs/create_ap/template
index 481ba622def..fb4d5dc37a8 100644
--- a/srcpkgs/create_ap/template
+++ b/srcpkgs/create_ap/template
@@ -1,8 +1,7 @@
# Template file for 'create_ap'
pkgname=create_ap
version=0.4.6
-revision=2
-archs=noarch
+revision=3
conf_files="/etc/create_ap.conf"
build_style=gnu-makefile
depends="bash dnsmasq hostapd iproute2 iptables iw procps-ng util-linux"
From 3e6f0e1e5db75fd6392c08fb7484585885218e21 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 191/358] culmus: remove noarch
---
srcpkgs/culmus/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/culmus/template b/srcpkgs/culmus/template
index dc6599990ef..68186bb5e60 100644
--- a/srcpkgs/culmus/template
+++ b/srcpkgs/culmus/template
@@ -1,10 +1,9 @@
# Template file for 'culmus'
pkgname=culmus
version=0.133
-revision=1
-archs=noarch
+revision=2
depends="font-util"
-short_desc="A collection of Type1 and TrueType free Hebrew fonts"
+short_desc="Collection of Type1 and TrueType free Hebrew fonts"
maintainer="DirectorX <void.directorx@protonmail.com>"
license="GPL-2.0-or-later"
homepage="http://culmus.sourceforge.net/"
From ef54fee575289ba848e301da990e62fc47e59914 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, 21 Nov 2020 22:51:14 +0700
Subject: [PATCH 192/358] cycle: remove noarch
---
srcpkgs/cycle/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cycle/template b/srcpkgs/cycle/template
index 58649da6482..05008b6047d 100644
--- a/srcpkgs/cycle/template
+++ b/srcpkgs/cycle/template
@@ -1,8 +1,7 @@
# Template file for 'cycle'
pkgname=cycle
version=0.3.2
-revision=1
-archs=noarch
+revision=2
pycompile_dirs="usr/share/cycle"
hostmakedepends="python"
depends="wxPython"
@@ -12,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/jose1711/cycle"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=6ca5a8191653d435ed04968b91b4a52c8e0d3d90d31d2c008aba1e9edcc1adc9
-python_version=2 #unverified
+python_version=2
do_install() {
# Program
From e75f86a2b9360561b854fa965a835b5fad35a8f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 21 Nov 2020 22:10:59 -0300
Subject: [PATCH 193/358] Revert "djview: mark broken temporarily."
This reverts commit 10838be7ab0122e3855c6c524c9a7f67973de84a.
---
srcpkgs/djview/template | 7 -------
1 file changed, 7 deletions(-)
diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index c7b0cd84bcf..136bcced9fb 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -19,13 +19,6 @@ if [ "${CROSS_BUILD}" ]; then
configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
fi
-case "$XBPS_TARGET_MACHINE" in
- armv6l-musl|armv7l-musl|x86_64-musl)
- # error while fetching with xbps-fetch
- broken="djview-4.12.tar.gz: Temporary Redirect"
- ;;
-esac
-
post_extract() {
vsed -i -e '/Exec/s/djview4/djview/' \
-e '/StartupWMClass/s/Djview4/DjView/' \
From 557ab38cfa15d6398bbfba720df1a19d6e941c7c 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, 22 Nov 2020 08:25:42 +0700
Subject: [PATCH 194/358] deerportal: remove noarch
---
srcpkgs/deerportal/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/deerportal/template b/srcpkgs/deerportal/template
index c027c258e68..d38900ff36e 100644
--- a/srcpkgs/deerportal/template
+++ b/srcpkgs/deerportal/template
@@ -1,7 +1,7 @@
# Template file for 'deerportal'
pkgname=deerportal
version=0.8.2
-revision=1
+revision=2
build_style=cmake
makedepends="SFML-devel"
depends="deerportal-data"
@@ -14,7 +14,6 @@ checksum=a79a6286c9be1c6073f5d8fe79e45b309425f597d0532d2a042cd8369f57725d
deerportal-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/games
}
From 0b7754feb92f27bcab1bf577942c74cf2d5a4ad8 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, 22 Nov 2020 08:25:42 +0700
Subject: [PATCH 195/358] deheader: remove noarch
---
srcpkgs/deheader/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/deheader/template b/srcpkgs/deheader/template
index f3809a35a44..6b3a54eaf11 100644
--- a/srcpkgs/deheader/template
+++ b/srcpkgs/deheader/template
@@ -1,9 +1,8 @@
# Template file for 'deheader'
pkgname=deheader
version=1.6
-revision=3
+revision=4
create_wrksrc=yes
-archs=noarch
hostmakedepends="tar"
depends="python"
short_desc="C and C++ header analyzer"
From 264d317a20775f6b3fd09fbe2bc6aaa8d8cd4184 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, 22 Nov 2020 08:25:42 +0700
Subject: [PATCH 196/358] dehydrated: remove noarch
---
srcpkgs/dehydrated/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/dehydrated/template b/srcpkgs/dehydrated/template
index c7b3ce7abb9..b624b1fe226 100644
--- a/srcpkgs/dehydrated/template
+++ b/srcpkgs/dehydrated/template
@@ -1,8 +1,7 @@
# Template file for 'dehydrated'
pkgname=dehydrated
version=0.6.5
-revision=1
-archs=noarch
+revision=2
depends="curl"
short_desc="Acme client implemented as a shell-script – just add water"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
From ba852205bbe7b4e29c32453c116fa7ac2c939061 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 197/358] dex: remove noarch
---
srcpkgs/dex/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/dex/template b/srcpkgs/dex/template
index 88b5552b070..1279d5df366 100644
--- a/srcpkgs/dex/template
+++ b/srcpkgs/dex/template
@@ -1,8 +1,7 @@
# Template file for 'dex'
pkgname=dex
version=0.8.0
-revision=2
-archs=noarch
+revision=3
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
hostmakedepends="python3-Sphinx"
From bed0f8018147cb2da1d2dd06965acae317f25761 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 198/358] dhcpcd-gtk: remove noarch
---
srcpkgs/dhcpcd-gtk/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template
index 80f03c51f8a..08cd8a90dbc 100644
--- a/srcpkgs/dhcpcd-gtk/template
+++ b/srcpkgs/dhcpcd-gtk/template
@@ -1,7 +1,7 @@
# Template file for 'dhcpcd-gtk'
pkgname=dhcpcd-gtk
version=0.7.7
-revision=1
+revision=2
wrksrc=dhcpcd-ui-${version}
build_style=gnu-configure
configure_args="--with-gtk --with-icons --with-notification"
@@ -28,7 +28,6 @@ post_install() {
}
dhcpcd-icons_package() {
- archs=noarch
short_desc+=" - icon set"
depends="hicolor-icon-theme"
replaces="dhcpcd-gtk<0.7.4"
From 6bfd6c91b3b57ca4dbc32de846e77fd4f188cfe8 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 199/358] ditaa: remove noarch
---
srcpkgs/ditaa/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ditaa/template b/srcpkgs/ditaa/template
index c7978f18bd4..8f501a0d452 100644
--- a/srcpkgs/ditaa/template
+++ b/srcpkgs/ditaa/template
@@ -1,8 +1,7 @@
# Template file for 'ditaa'
pkgname=ditaa
version=0.11.0
-revision=1
-archs=noarch
+revision=2
create_wrksrc=yes
build_style=fetch
depends="virtual?java-environment"
From 05b619a9e8ed9c9af15a0998c8907b9de686636c 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 200/358] dkimproxy: remove noarch
---
srcpkgs/dkimproxy/template | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/dkimproxy/template b/srcpkgs/dkimproxy/template
index de0eec306ba..bab8cee6633 100644
--- a/srcpkgs/dkimproxy/template
+++ b/srcpkgs/dkimproxy/template
@@ -1,21 +1,19 @@
# Template file for 'dkimproxy'
pkgname=dkimproxy
version=1.4.1
-revision=1
+revision=2
build_style=gnu-configure
-# dkimproxy is written in perl, so noarch
-archs=noarch
hostmakedepends="perl perl-Net-Server perl-Mail-DKIM"
makedepends="${hostmakedepends}"
depends="${makedepends}"
-system_accounts="_dkim"
-conf_files="/etc/dkimproxy_in.conf /etc/dkimproxy_out.conf"
short_desc="SMTP-proxy that signs and/or verifies emails, using DKIM"
maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="GPL-3"
+license="GPL-2.0-or-later"
homepage="http://dkimproxy.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/dkimproxy/dkimproxy-${version}.tar.gz"
checksum=e5345a1d3cefd32d1fb0face9fa73490118132767253b0ce643463f1e86185bd
+system_accounts="_dkim"
+conf_files="/etc/dkimproxy_in.conf /etc/dkimproxy_out.conf"
post_install() {
vsconf ${DESTDIR}/etc/dkimproxy_in.conf.example
From c90f7321a3602973fdc5eae2b9c60ad935ef4c85 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 201/358] dreampie: remove noarch
---
srcpkgs/dreampie/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/dreampie/template b/srcpkgs/dreampie/template
index edd0f48298b..002f11f842e 100644
--- a/srcpkgs/dreampie/template
+++ b/srcpkgs/dreampie/template
@@ -1,10 +1,8 @@
# Template file for 'dreampie'
pkgname=dreampie
version=1.2.1
-revision=2
-archs=noarch
+revision=3
build_style=python2-module
-pycompile_module="dreampielib"
hostmakedepends="python-setuptools"
depends="pygtksourceview"
short_desc="The Python shell you've always dreamed about"
From 807f686b09af9129f5be5fc2d0c042d71557fa4b 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, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 202/358] dstat: remove noarch
---
srcpkgs/dstat/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/dstat/template b/srcpkgs/dstat/template
index 3ec983e85db..43a7efd6ded 100644
--- a/srcpkgs/dstat/template
+++ b/srcpkgs/dstat/template
@@ -1,8 +1,7 @@
# Template file for 'dstat'
pkgname=dstat
version=0.7.4
-revision=2
-archs=noarch
+revision=3
makedepends="python3"
depends="python3-six"
short_desc="Versatile tool for generating system resource statistics"
From de6a70e7d48b846327969cb3c8dfdfb50e12057f 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, 22 Nov 2020 08:25:44 +0700
Subject: [PATCH 203/358] durden: remove noarch
---
srcpkgs/durden/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/durden/template b/srcpkgs/durden/template
index 54a4bc1759b..d150a07ce5e 100644
--- a/srcpkgs/durden/template
+++ b/srcpkgs/durden/template
@@ -1,7 +1,7 @@
# Template file for 'durden'
pkgname=durden
version=0.5
-revision=1
+revision=2
depends="aclip aloadimage"
short_desc="Desktop environment for Arcan"
maintainer="Piraty <piraty1@inbox.ru>"
@@ -9,7 +9,6 @@ license="BSD-3-Clause"
homepage="http://durden.arcan-fe.com/"
distfiles="https://github.com/letoram/${pkgname}/archive/${version}.tar.gz"
checksum=f0cb0cdc6d16b4807efab5b6152b9f26813dccd2d66af5f1d80494769f840915
-archs=noarch
do_install() {
vbin distr/durden
From c2329d2658d047dde73e37336697ce22c3ea09d7 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, 22 Nov 2020 09:05:54 +0700
Subject: [PATCH 204/358] i3lock-fancy: remove noarch
---
srcpkgs/i3lock-fancy/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/i3lock-fancy/template b/srcpkgs/i3lock-fancy/template
index 5bb3502b4ed..a9cdfb0d7d2 100644
--- a/srcpkgs/i3lock-fancy/template
+++ b/srcpkgs/i3lock-fancy/template
@@ -1,8 +1,7 @@
# Template file for 'i3lock-fancy'
pkgname=i3lock-fancy
version=0.2
-revision=1
-archs=noarch
+revision=2
depends="util-linux bash ImageMagick i3lock wmctrl gawk"
short_desc="Fancy lockscreen using i3lock"
maintainer="Orphaned <orphan@voidlinux.org>"
From eea2b54d5a39d8b18f0c4a26421bb03758b8bd5b 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, 22 Nov 2020 09:05:54 +0700
Subject: [PATCH 205/358] ice-ssb: remove noarch
---
srcpkgs/ice-ssb/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ice-ssb/template b/srcpkgs/ice-ssb/template
index c06941257c1..f0cac9cafc4 100644
--- a/srcpkgs/ice-ssb/template
+++ b/srcpkgs/ice-ssb/template
@@ -1,8 +1,7 @@
# Template file for 'ice-ssb'
pkgname=ice-ssb
version=6.0.8
-revision=1
-archs=noarch
+revision=2
wrksrc="ice-$version"
depends="gtk+3 python3-BeautifulSoup4 python3-gobject python3-requests"
short_desc="Site Specific Browsers (SSBs) manager"
From 5dd7f21b10c0f7f0277dc03fd0f9d0face05e8f3 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 206/358] icedtea-sound: remove noarch
---
srcpkgs/icedtea-sound/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/icedtea-sound/template b/srcpkgs/icedtea-sound/template
index 4ad965c6806..ceccff2fd94 100644
--- a/srcpkgs/icedtea-sound/template
+++ b/srcpkgs/icedtea-sound/template
@@ -1,21 +1,20 @@
# Template file for 'icedtea-sound'
pkgname=icedtea-sound
version=1.0.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-jdk-home=/usr/lib/jvm/java-1.8-openjdk"
hostmakedepends="openjdk8 zip perl pkg-config"
makedepends="pulseaudio-devel"
short_desc="Plugins for javax.sound"
maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-only WITH Classpath-exception-2.0"
+license="GPL-2.0-only + Classpath-exception-2.0"
homepage="http://icedtea.classpath.org/download/source/"
distfiles="http://icedtea.classpath.org/download/source/${pkgname}-${version}.tar.xz"
checksum=6ff852b82ae7db7a95981271037eb3a3d52c59581e3b27a638a7c6bc8eecb4a3
icedtea-sound-doc_package() {
short_desc+=" - docs"
- archs=noarch
pkg_install() {
vmove usr/share/doc
}
From 2f4affd4a1a6f7f51453e8c822829e9cd97e1e1d 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 207/358] icon-naming-utils: remove noarch
---
srcpkgs/icon-naming-utils/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/icon-naming-utils/template b/srcpkgs/icon-naming-utils/template
index f069d604e37..5a693266459 100644
--- a/srcpkgs/icon-naming-utils/template
+++ b/srcpkgs/icon-naming-utils/template
@@ -1,8 +1,7 @@
# Template file for 'icon-naming-utils'
pkgname=icon-naming-utils
version=0.8.90
-revision=5
-archs=noarch
+revision=6
build_style=gnu-configure
hostmakedepends="perl-XML-Simple"
makedepends="${hostmakedepends}"
From 3fcee2992931deb0ec098d1df1785739af947b83 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 208/358] imgp: remove noarch
---
srcpkgs/imgp/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/imgp/template b/srcpkgs/imgp/template
index 872b3db406c..c81e3f15101 100644
--- a/srcpkgs/imgp/template
+++ b/srcpkgs/imgp/template
@@ -1,8 +1,7 @@
# Template file for 'imgp'
pkgname=imgp
version=2.7
-revision=2
-archs=noarch
+revision=3
build_style=gnu-makefile
depends="python3-Pillow"
short_desc="Multi-core batch image resizer and rotator"
From 8a21fbbcdcd4de47038730817435e2613f2996c8 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 209/358] indic-otf: remove noarch
---
srcpkgs/indic-otf/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/indic-otf/template b/srcpkgs/indic-otf/template
index 4f37e66f3ce..fc5c25b135a 100644
--- a/srcpkgs/indic-otf/template
+++ b/srcpkgs/indic-otf/template
@@ -1,8 +1,7 @@
# Template file for 'indic-otf'
pkgname=indic-otf
version=0.2
-revision=3
-archs=noarch
+revision=4
wrksrc=indic
build_wrksrc=OpenType
makedepends="font-util xbps-triggers"
From 6a7e0db71bed2794480d3935ad4d41650c5090bf 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 210/358] indicator-doom-cpu: remove noarch
---
srcpkgs/indicator-doom-cpu/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index 33158f90a16..a856d82be19 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,12 +1,11 @@
# Template file for 'indicator-doom-cpu'
pkgname=indicator-doom-cpu
version=1.0.1
-revision=1
-archs=noarch
+revision=2
depends="python-gobject"
short_desc="CPU load indicator showing the dying face from the video game DOOM"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-3.0-only"
homepage="https://github.com/ebruck/indicator-doom-cpu"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=87dcb082c5032518b2616c85967ac92cf3618b6e0276266ec413537b6256c7d5
From 3eb8fbdeba4bb7a8b4d948be94b2a249825f95e1 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 211/358] iniparser: remove noarch
---
srcpkgs/iniparser/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/iniparser/template b/srcpkgs/iniparser/template
index 63eb336c7ea..a780d47dbdd 100644
--- a/srcpkgs/iniparser/template
+++ b/srcpkgs/iniparser/template
@@ -1,7 +1,7 @@
# Template file for 'iniparser'
pkgname=iniparser
version=4.1
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen chrpath"
short_desc="Free stand-alone ini file parsing library"
@@ -58,14 +58,12 @@ iniparser-devel_package() {
}
iniparser-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmove usr/share/doc/iniparser
}
}
iniparser-example_package() {
short_desc+=" - example code"
- archs=noarch
pkg_install() {
vmove usr/share/iniparser/example
}
From c11420641ef72bbb2d628ae3e3b397fc2d314cfd 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 212/358] io.elementary.stylesheet: remove noarch
---
srcpkgs/io.elementary.stylesheet/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template
index 6b40406712d..791bca04709 100644
--- a/srcpkgs/io.elementary.stylesheet/template
+++ b/srcpkgs/io.elementary.stylesheet/template
@@ -1,8 +1,7 @@
# Template file for 'io.elementary.stylesheet'
pkgname=io.elementary.stylesheet
version=5.4.2
-revision=1
-archs=noarch
+revision=2
wrksrc="stylesheet-${version}"
build_style=meson
short_desc="GTK Stylesheet for elementary OS"
From 7ecebba871a56ef5417dfdd12f0f9ee54c806aa3 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, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 213/358] ioprof: remove noarch
---
srcpkgs/ioprof/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ioprof/template b/srcpkgs/ioprof/template
index 32b327b4677..033cf9ee518 100644
--- a/srcpkgs/ioprof/template
+++ b/srcpkgs/ioprof/template
@@ -1,8 +1,7 @@
# Template file for 'ioprof'
pkgname=ioprof
version=2.0.4
-revision=2
-archs=noarch
+revision=3
build_style=fetch
depends="perl blktrace"
short_desc="Linux I/O profiler"
From 215b02427dd1ef5ca3e9324d160cd89e30e4ea8f 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, 22 Nov 2020 09:05:56 +0700
Subject: [PATCH 214/358] ipcalc: remove noarch
---
srcpkgs/ipcalc/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ipcalc/template b/srcpkgs/ipcalc/template
index 6a35f924f0d..5f33dce9905 100644
--- a/srcpkgs/ipcalc/template
+++ b/srcpkgs/ipcalc/template
@@ -1,8 +1,7 @@
# Template file for 'ipcalc'
pkgname=ipcalc
version=0.41
-revision=2
-archs=noarch
+revision=3
depends="perl"
short_desc="Calculator for IPv4 addresses"
maintainer="allan <mail@may.mooo.com>"
From 928421cff3e554d72a30adbe56605fde06cfe7a3 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Thu, 19 Nov 2020 10:08:12 +0100
Subject: [PATCH 215/358] synapse: update to 1.23.0.
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index a1dec681ede..0d11c75cfa7 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.21.2
+version=1.23.0
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=ec7073befcda697428c4d634c7a8637ea7d1b01639b3a943d72821ba8110a0bf
+checksum=afa86ea1332a52d09552ea5825567f910b304d4684692fa8325cefec105b2b4c
system_accounts="synapse"
synapse_homedir="/var/lib/synapse"
From 61843e351d9b3c788237682442d1ed6859119fc3 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Mon, 19 Oct 2020 09:37:39 -0700
Subject: [PATCH 216/358] New package: wlclock-1.0.0
---
srcpkgs/wlclock/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/wlclock/template
diff --git a/srcpkgs/wlclock/template b/srcpkgs/wlclock/template
new file mode 100644
index 00000000000..65eb3325ade
--- /dev/null
+++ b/srcpkgs/wlclock/template
@@ -0,0 +1,14 @@
+# Template file for 'wlclock'
+pkgname=wlclock
+version=1.0.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config scdoc wayland-devel"
+makedepends="cairo-devel wayland-devel wayland-protocols"
+short_desc="Digital analog clock for Wayland desktops"
+maintainer="travankor <travankor@tuta.io>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~leon_plickat/wlclock/"
+distfiles="https://git.sr.ht/~leon_plickat/wlclock/archive/v${version}.tar.gz"
+checksum=cdbc32eb1f68614a09e430eaa24578e4d58475ed8988871fce20a669898a48db
From 9b6dffde3947c3910753cd394dfc17a506db6d69 Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Thu, 22 Oct 2020 16:59:47 -0700
Subject: [PATCH 217/358] clipmenu: update to 6.2.0.
---
srcpkgs/clipmenu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clipmenu/template b/srcpkgs/clipmenu/template
index a7302993521..2befe984790 100644
--- a/srcpkgs/clipmenu/template
+++ b/srcpkgs/clipmenu/template
@@ -1,14 +1,14 @@
# Template file for 'clipmenu'
pkgname=clipmenu
-version=6.1.0
-revision=2
+version=6.2.0
+revision=1
depends="bash dmenu clipnotify xsel"
short_desc="Clipboard management using dmenu"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Public Domain"
homepage="https://github.com/cdown/clipmenu"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=1b5da22fac3bbee254267f9274746f747019c5f9a1f53cde0ddc1591053d2342
+checksum=15830429dbe78da8168e71c6e1cc9fccf5c4d03ebae8ccefb0a5dbaa98adbbb8
do_install() {
vbin clipdel
From 717357e9f46985eece3804db25201fee44706085 Mon Sep 17 00:00:00 2001
From: Justin Berthault <justin.berthault@zaclys.net>
Date: Thu, 22 Oct 2020 21:50:02 +0200
Subject: [PATCH 218/358] picard: update to 2.5
---
srcpkgs/picard/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template
index 53f9daa8fdb..513ab6356cf 100644
--- a/srcpkgs/picard/template
+++ b/srcpkgs/picard/template
@@ -1,7 +1,7 @@
# Template file for 'picard'
pkgname=picard
-version=2.3.2
-revision=2
+version=2.5
+revision=1
wrksrc="${pkgname}-release-${version}"
build_style=python3-module
make_install_args="--disable-autoupdate"
@@ -15,4 +15,4 @@ license="GPL-2.0-or-later"
homepage="https://picard.musicbrainz.org/"
changelog="https://picard.musicbrainz.org/changelog/"
distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version%.0}.tar.gz"
-checksum=a91d9f11f2e5a6a0c579e0749e3a3919694ddeef0f251c1dded32e9331b1b0b7
+checksum=f9df2882c1fcb46d69c89c87485c77bcff7d9c738b004694fa0fb31280677963
From 31499dddf1c9bb49de7112d69c80eb3a4363751e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 22 Oct 2020 19:11:08 +0300
Subject: [PATCH 219/358] butt: update to 0.1.25, add changelog.
---
srcpkgs/butt/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index 98ce59064c2..6e67147ec84 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,6 +1,6 @@
# Template file for 'butt'
pkgname=butt
-version=0.1.22
+version=0.1.25
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,5 +10,6 @@ short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
maintainer="1is7ac3 <isaac.qa13@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://danielnoethen.de"
+changelog="https://danielnoethen.de/butt/Changelog.html"
distfiles="${SOURCEFORGE_SITE}/butt/butt-${version}.tar.gz"
-checksum=71e7fcd89d97f803f05197caa743de4fcf8ab67ec3f3af0a54c2e895d660f62c
+checksum=7c9f44227584e30040315a5c86419bf3e654bd3523634d34b18c9017206334cb
From abfc67595beb795a99b039064f636c9038880051 Mon Sep 17 00:00:00 2001
From: Rich Gannon <rich@rchgannon.net>
Date: Wed, 14 Oct 2020 23:27:24 -0400
Subject: [PATCH 220/358] glusterfs: update to 8.1
---
common/shlibs | 1 +
srcpkgs/glusterfs/template | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 012cbd0e6fa..f39ab671a75 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1486,6 +1486,7 @@ libgfchangelog.so.0 libglusterfs-3.8.0_1
libgfrpc.so.0 libglusterfs-3.8.0_1
libgfxdr.so.0 libglusterfs-3.8.0_1
libgfapi.so.0 libglusterfs-3.8.0_1
+libglusterd.so.0 libglusterfs-8.1_1
libsnapper.so.5 libsnapper-0.4.1_1
libtsm.so.3 libtsm-3_1
libxine.so.2 libxine-1.2.4_1
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 8745513af64..cfdd7d4ab93 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,6 +1,6 @@
# Template file for 'glusterfs'
pkgname=glusterfs
-version=7.8
+version=8.1
revision=1
build_style=gnu-configure
configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=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=ee83f96a7caf10596231dbf2f1e80f257629067485d4ef26216c69bb4a3ed545
+checksum=89bc6d9c933119924f19f2681706883eed331efe0f8a20a2e6b12a290ca00d32
case "$XBPS_TARGET_MACHINE" in
*-musl) broken="not yet supported";;
@@ -36,7 +36,6 @@ glusterfs-server_package() {
/etc/glusterfs/glusterd.vol"
pkg_install() {
vmove etc/glusterfs
- vmove usr/bin/glfsheal
vmove usr/bin/gluster
vmove usr/bin/glusterd
vmove usr/share/man/man8/gluster.8
From 99f8e750f5250b074a5b1b61bd513f4c26ea3fc3 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <aldridge.mac@gmail.com>
Date: Tue, 13 Oct 2020 22:32:18 -0700
Subject: [PATCH 221/358] New package: pppconfig-2.3.24
---
srcpkgs/pppconfig/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/pppconfig/template
diff --git a/srcpkgs/pppconfig/template b/srcpkgs/pppconfig/template
new file mode 100644
index 00000000000..a05f7265291
--- /dev/null
+++ b/srcpkgs/pppconfig/template
@@ -0,0 +1,21 @@
+# Template file for 'pppconfig'
+pkgname=pppconfig
+version=2.3.24
+revision=1
+depends="newt ppp"
+short_desc="Text menu based utility for configuring ppp"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="GPL-2.0-only"
+homepage="https://packages.debian.org/sid/pppconfig"
+distfiles="http://deb.debian.org/debian/pool/main/p/pppconfig/pppconfig_$version.tar.gz"
+checksum=8d7e75b5be044cfae1ed3b0096fea75cee183328b9ace7d949381d89f3e6401d
+make_dirs="
+ /etc/chatscripts 0755 root root
+ /etc/ppp/resolv 0755 root root"
+
+do_install() {
+ vbin pppconfig
+ vinstall 0dns-up 0755 etc/ppp/ip-up.d/
+ vinstall 0dns-down 0755 etc/ppp/ip-down.d/
+ vman man/pppconfig.8
+}
From 4f2e865b04c24fc5ffe52231996fd2f3739fec09 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 9 Oct 2020 16:46:48 -0500
Subject: [PATCH 222/358] New package: fuzzypkg-1.0.2
---
srcpkgs/fuzzypkg/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/fuzzypkg/template
diff --git a/srcpkgs/fuzzypkg/template b/srcpkgs/fuzzypkg/template
new file mode 100644
index 00000000000..6243aa202a7
--- /dev/null
+++ b/srcpkgs/fuzzypkg/template
@@ -0,0 +1,25 @@
+# Template file for 'fuzzypkg'
+pkgname=fuzzypkg
+version=1.0.2
+revision=1
+depends="bash"
+short_desc="XBPS fuzzy package manager"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="MIT"
+homepage="https://github.com/zdykstra/fuzzypkg"
+distfiles="https://github.com/zdykstra/fuzzypkg/archive/v${version}.tar.gz"
+checksum=f9aa5bd0d679f43d7d78654ba579fa460c5625b4504c4221a35a90623d59d90f
+
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|i686*|armv[67]*|aarch64*|ppc64le*)
+ depends+=" fzf"
+ ;;
+ *)
+ depends+=" skim"
+ ;;
+esac
+
+do_install() {
+ vlicense LICENSE
+ vbin fuzzypkg
+}
From c904e447e356b40dc432afe8e105bbd684dfde45 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 8 Oct 2020 20:41:22 +1100
Subject: [PATCH 223/358] cinnamon-settings-daemon: various template cleanups.
- fix the homepage.
- remove the changlog which is not kept up-to-date and is inconsistent
between cinnamon templates AND upstream repos.
- other style fixes.
---
srcpkgs/cinnamon-settings-daemon/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index f9a38da22f5..70f76130dd2 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,10 +1,10 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
version=4.6.4
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
-configure_args=" --disable-static --disable-schemas-compile"
+configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config"
makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
@@ -14,8 +14,7 @@ depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
-changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
+homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-settings-daemon"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=5c3d78c562f60cbd6348d1bbb3f7b0a98dbf0b483961b2f82f6b260b956d9db0
From e1698943fa32698dda8fe907d2975b221bce3cb8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 20 Nov 2020 01:00:39 +0200
Subject: [PATCH 224/358] gettext: update to 0.21.
---
common/shlibs | 4 ++--
srcpkgs/gettext/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f39ab671a75..44f54987a27 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -185,8 +185,8 @@ libgdbm.so.6 gdbm-1.16_1
libgdbm_compat.so.4 gdbm-1.10_1_1
libintl.so.8 gettext-libs-0.19.2_1
libgnuintl.so.8 gettext-libs-0.19.2_1
-libgettextlib-0.20.2.so gettext-libs-0.20.2_1
-libgettextsrc-0.20.2.so gettext-libs-0.20.2_1
+libgettextlib-0.21.so gettext-libs-0.21_1
+libgettextsrc-0.21.so gettext-libs-0.21_1
libgettextpo.so.0 gettext-libs-0.17_1
libtextstyle.so.0 gettext-libs-0.20.1_1
libattr.so.1 attr-2.4.43_1
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 391ceceb9ee..4e0667c1b8c 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
# Template file for 'gettext'
pkgname=gettext
-version=0.20.2
-revision=2
+version=0.21
+revision=1
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/gettext/"
changelog="https://git.savannah.gnu.org/cgit/gettext.git/plain/NEWS"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1
+checksum=c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12
case "$XBPS_TARGET_MACHINE" in
# force libintl
From 3fcfd99a682c9c48e90ac0f6a8c022baf8af02d5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 5 Oct 2020 11:27:47 +1100
Subject: [PATCH 225/358] New package: instaloader-4.5.3.
---
srcpkgs/instaloader/template | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 srcpkgs/instaloader/template
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
new file mode 100644
index 00000000000..034df7073f7
--- /dev/null
+++ b/srcpkgs/instaloader/template
@@ -0,0 +1,27 @@
+# Template file for 'instaloader'
+pkgname=instaloader
+version=4.5.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-idna python3-chardet
+ python3-certifi"
+checkdepends="${depends}"
+short_desc="Download pictures with metadata from Instagram"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://instaloader.github.io"
+distfiles="${PYPI_SITE}/i/${pkgname}/${pkgname}-${version}.tar.gz
+ https://raw.githubusercontent.com/${pkgname}/${pkgname}/v${version}/LICENSE"
+checksum="4cc59b68e7498c778e54599917af749aaac36a6527cbd495b80f843f7eccd8ff
+ 9e721228bbfb782a6b5f3fd8494f5666f3ee8e61c592810b900955b9f1b1bae5"
+skip_extraction="LICENSE"
+
+# ship your licenses, people
+post_extract() {
+ cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE" .
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 34cf22999c8f14d7ed0ad43598e69d163f5396f7 Mon Sep 17 00:00:00 2001
From: Spencer Burris <sburris@posteo.net>
Date: Sun, 4 Oct 2020 13:31:07 -0700
Subject: [PATCH 226/358] New package: signal-backup-decode-0.2.0
---
srcpkgs/signal-backup-decode/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/signal-backup-decode/template
diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
new file mode 100644
index 00000000000..3b5cfb2f526
--- /dev/null
+++ b/srcpkgs/signal-backup-decode/template
@@ -0,0 +1,13 @@
+# Template file for 'signal-backup-decode'
+pkgname=signal-backup-decode
+version=0.2.0
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libressl-devel sqlite-devel"
+short_desc="Decode Signal Android Backups"
+maintainer="Spencer Burris <sburris@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/pajowu/signal-backup-decode"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=9a454bb894963e7f6301bdcd3db2c7978fb0cfb7e6fce3f4f553ccad7f955fe9
From c2df97f0ada0b76ec27bb86328316f0c4d7a5da3 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Fri, 25 Sep 2020 15:41:32 -0300
Subject: [PATCH 227/358] New package: packr2-2.8.0
---
srcpkgs/packr2/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/packr2/template
diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
new file mode 100644
index 00000000000..15b01438d58
--- /dev/null
+++ b/srcpkgs/packr2/template
@@ -0,0 +1,18 @@
+# Template file for 'packr2'
+pkgname=packr2
+_pkgname=packr
+version=2.8.0
+revision=1
+wrksrc=${_pkgname}-${version}
+build_style=go
+go_import_path=github.com/gobuffalo/${_pkgname}/v2/packr2
+short_desc="Static files embedder for Go binaries"
+maintainer="Gabriel Sanches <gabriel@gsr.dev>"
+license="MIT"
+homepage="https://github.com/gobuffalo/packr"
+distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
+checksum=2cab1e8d60734af05d594346f8e4bffcef0ac2aea4895b08bd9f3c40fc24c639
+
+post_install() {
+ vlicense v2/LICENSE.txt
+}
From 2ce3aa6a200d4d8a0bae4368b055da8bad528a62 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 23 Sep 2020 15:07:53 -0300
Subject: [PATCH 228/358] New package: circleci-cli-0.1.9578
---
srcpkgs/circleci-cli/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/circleci-cli/template
diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
new file mode 100644
index 00000000000..0b4049bea15
--- /dev/null
+++ b/srcpkgs/circleci-cli/template
@@ -0,0 +1,29 @@
+# Template file for 'circleci-cli'
+pkgname=circleci-cli
+version=0.1.9578
+revision=1
+build_style=go
+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"
+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=d5dac07d27d97ee41dced89cf2b36dfeea17906343b6a6a21c1d8c4ca34a78a0
+
+pre_build() {
+ packr2
+}
+
+post_build() {
+ packr2 clean
+}
+
+post_install() {
+ vlicense LICENSE
+
+ # Rename the binary according to CircleCI's own releases.
+ mv ${DESTDIR}/usr/bin/circleci{-cli,}
+}
From 13cb7052cbaedc7b5ca66ff8665da24168622cf8 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 21 Oct 2020 17:25:50 +0200
Subject: [PATCH 229/358] apparmor: update to 3.0.0
---
srcpkgs/apparmor/INSTALL.msg | 3 +-
.../apparmor/files/profiles/usr.bin.dhcpcd | 12 ++--
srcpkgs/apparmor/files/profiles/usr.bin.nginx | 22 ++++---
.../apparmor/files/profiles/usr.bin.php-fpm | 17 +++---
.../files/profiles/usr.bin.pulseaudio | 35 +++++++----
srcpkgs/apparmor/files/profiles/usr.bin.uuidd | 12 ++--
.../files/profiles/usr.bin.wpa_supplicant | 14 +++--
.../patches/correct_paths_logprofconf.patch | 60 ++++++++++++++-----
srcpkgs/apparmor/patches/fix-musl.patch | 24 ++++++++
srcpkgs/apparmor/template | 50 ++++++++--------
10 files changed, 160 insertions(+), 89 deletions(-)
create mode 100644 srcpkgs/apparmor/patches/fix-musl.patch
diff --git a/srcpkgs/apparmor/INSTALL.msg b/srcpkgs/apparmor/INSTALL.msg
index c9f763715a6..488f2c40e11 100644
--- a/srcpkgs/apparmor/INSTALL.msg
+++ b/srcpkgs/apparmor/INSTALL.msg
@@ -1,2 +1 @@
-To ensure AppArmor is enabled upon reboot add 'apparmor=1 security=apparmor' to your grub CMDLINE and rebuild your grub config with 'grub-mkconfig -o /boot/grub/grub.cfg'.
-You'll also need to swith 'APPARMOR' setting in /etc/default/apparmor to your taste.
+To configure AppArmor properly, please refer to the Void Linux Handbook: https://docs.voidlinux.org/config/security/apparmor.html
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
index 26364f36385..1d6e1b95d62 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
@@ -1,10 +1,12 @@
# vim:syntax=apparmor
-#include <tunables/global>
+abi <abi/3.0>,
+
+include <tunables/global>
profile dhcpcd /{usr/,}bin/dhcpcd {
- #include <abstractions/base>
- #include <abstractions/nameservice>
+ include <abstractions/base>
+ include <abstractions/nameservice>
capability chown,
capability fowner,
@@ -16,8 +18,10 @@ profile dhcpcd /{usr/,}bin/dhcpcd {
capability setgid,
capability sys_admin,
capability sys_chroot,
+ capability bpf,
network packet dgram,
+ network packet raw,
network inet raw,
network inet6 raw,
@@ -58,5 +62,5 @@ profile dhcpcd /{usr/,}bin/dhcpcd {
owner @{PROC}/@{pid}/stat r,
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.bin.dhcpcd>
+ include if exists <local/usr.bin.dhcpcd>
}
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.nginx b/srcpkgs/apparmor/files/profiles/usr.bin.nginx
index 5e4854d9032..be769703f5d 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.nginx
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.nginx
@@ -1,25 +1,23 @@
# vim:syntax=apparmor
+abi <abi/3.0>,
+
# NOTE: This profile will by default work with pfp-fpm on TCP sockets.
# If you need to make use of php-fpm unix socket, add the following to local/usr.bin.nginx
# /path/to/your/unix/socket rw,
-#include <tunables/global>
+include <tunables/global>
-/usr/bin/nginx {
- #include <abstractions/base>
- #include <abstractions/nameservice>
- #include <abstractions/nis>
- #include <abstractions/openssl>
+profile nginx /usr/bin/nginx {
+ include <abstractions/base>
+ include <abstractions/nameservice>
+ include <abstractions/nis>
+ include <abstractions/openssl>
capability setgid,
capability setuid,
- # XXX: Maybe switch to "/etc/nginx/** r," ?
- /etc/nginx/*.conf r,
- /etc/nginx/*_params r,
- /etc/nginx/conf.d/* r,
- /etc/nginx/mime.types r,
+ /etc/nginx/** r,
/run/nginx.pid rw,
@@ -30,5 +28,5 @@
/var/log/nginx/* w,
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.bin.nginx>
+ include if exists <local/usr.bin.nginx>
}
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm b/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm
index 98366dcaabf..0b036965da1 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm
@@ -1,22 +1,24 @@
# vim:syntax=apparmor
+abi <abi/3.0>,
+
# NOTE: This profile uses TCP sockets by default
# If you wish for php-fpm to listen to unix socket,
# add the following permission to local/usr.bin.php-fpm
# /path/to/your/unix/socket w,
-#include <tunables/global>
+include <tunables/global>
# This is PHP open_basedir where script can only be executed from.
# /home, /tmp have been removed to not open permissions too widely
# /usr/share/pear have been removed to have its own permission
@{PHP_BASEDIRS} = /srv/www/ /var/www/ /usr/share/webapps/
-/usr/bin/php-fpm {
- #include <abstractions/base>
- #include <abstractions/nameservice>
- #include <abstractions/openssl>
- #include <abstractions/php>
+profile php-fpm /usr/bin/php-fpm {
+ include <abstractions/base>
+ include <abstractions/nameservice>
+ include <abstractions/openssl>
+ include <abstractions/php>
capability setgid,
capability setuid,
@@ -38,7 +40,6 @@
/var/log/php-fpm.log w,
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.bin.php-fpm>
+ include if exists <local/usr.bin.php-fpm>
}
-
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio b/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio
index 4b17e6edc08..f8ceb4c2334 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio
@@ -1,12 +1,16 @@
-#include <tunables/global>
+# vim:syntax=apparmor
+
+abi <abi/3.0>,
+
+include <tunables/global>
profile pulseaudio /usr/bin/pulseaudio {
- #include <abstractions/base>
- #include <abstractions/audio>
- #include <abstractions/dbus-session>
- #include <abstractions/dbus-strict>
- #include <abstractions/nameservice>
- #include <abstractions/X>
+ include <abstractions/base>
+ include <abstractions/audio>
+ include <abstractions/dbus-session>
+ include <abstractions/dbus-strict>
+ include <abstractions/nameservice>
+ include <abstractions/X>
dbus send
bus=system
@@ -67,12 +71,17 @@ profile pulseaudio /usr/bin/pulseaudio {
/sys/devices/virtual/sound/**/uevent r,
/usr/share/alsa/** r,
- /usr/share/applications/ r,
- /usr/share/applications/* r,
/usr/share/pulseaudio/** r,
/usr/lib/pulse-[1-9]*.[0-9]/modules/*.so mr,
/usr/libexec/pulse/gsettings-helper Cx,
+ /usr/{,local/}share/applications/ r,
+ /usr/{,local/}share/applications/* r,
+ owner @{HOME}/.local/share/{,flatpak/exports/share/}applications/ r,
+ owner @{HOME}/.local/share/{,flatpak/exports/share/}applications/* r,
+ /var/lib/flatpak/exports/share/applications/ r,
+ /var/lib/flatpak/exports/share/applications/* r,
+
owner /var/lib/gdm3/.config/pulse/ rw,
owner /var/lib/gdm3/.config/pulse/* rw,
owner /var/lib/gdm3/.config/pulse/cookie rwk,
@@ -106,9 +115,9 @@ profile pulseaudio /usr/bin/pulseaudio {
owner /tmp/.esd-@{pid}*/socket rw,
profile pulse-gsettings-helper /usr/libexec/pulse/gsettings-helper {
- #include <abstractions/base>
- #include <abstractions/gnome>
- #include <abstractions/dconf>
+ include <abstractions/base>
+ include <abstractions/gnome>
+ include <abstractions/dconf>
/usr/libexec/pulse/gsettings-helper mr,
owner /{,var/}run/user/*/dconf/user rw,
@@ -118,6 +127,6 @@ profile pulseaudio /usr/bin/pulseaudio {
}
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.bin.pulseaudio>
+ include if exists <local/usr.bin.pulseaudio>
}
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.uuidd b/srcpkgs/apparmor/files/profiles/usr.bin.uuidd
index 8c00a903611..b365c927b65 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.uuidd
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.uuidd
@@ -1,10 +1,12 @@
# vim:syntax=apparmor
-#include <tunables/global>
+abi <abi/3.0>,
-/usr/bin/uuidd {
- #include <abstractions/base>
- #include <abstractions/consoles>
+include <tunables/global>
+
+profile uuid /usr/bin/uuidd {
+ include <abstractions/base>
+ include <abstractions/consoles>
network inet dgram,
@@ -13,5 +15,5 @@
/run/uuidd/request rw,
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.bin.uuidd>
+ include if exists <local/usr.bin.uuidd>
}
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant b/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant
index df53acc82d6..c5bb67d562f 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant
@@ -1,8 +1,12 @@
-#include <tunables/global>
+# vim:syntax=apparmor
-/usr/bin/wpa_supplicant {
- #include <abstractions/base>
- #include <abstractions/dbus-strict>
+abi <abi/3.0>,
+
+include <tunables/global>
+
+profile wpa_supplicant /usr/bin/wpa_supplicant {
+ include <abstractions/base>
+ include <abstractions/dbus-strict>
capability net_admin,
capability net_raw,
@@ -45,5 +49,5 @@
bus=system
path=/fi/epitest/hostap/WPASupplicant/**,
- #include <local/usr.bin.wpa_supplicant>
+ include if exists <local/usr.bin.wpa_supplicant>
}
diff --git a/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch b/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
index 0f25758486a..fb6ce53ffdc 100644
--- a/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
+++ b/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
@@ -1,5 +1,14 @@
+From 6f2649203d6bfc26b79f624b5b4625603923bccd Mon Sep 17 00:00:00 2001
+From: Paper <paper@tilde.institute>
+Date: Wed, 21 Oct 2020 10:20:47 +0200
+Subject: [PATCH] correct paths in logprof.conf
+
+---
+ utils/logprof.conf | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
diff --git a/utils/logprof.conf b/utils/logprof.conf
-index a3d7a31..296dd8b 100644
+index a778792..a9f7b79 100644
--- a/utils/logprof.conf
+++ b/utils/logprof.conf
@@ -14,7 +14,7 @@
@@ -11,19 +20,42 @@ index a3d7a31..296dd8b 100644
ldd = /usr/bin/ldd
logger = /bin/logger /usr/bin/logger
-@@ -36,10 +36,10 @@
- custom_includes =
-
+@@ -51,12 +51,10 @@
+ /bin/mount = u
+ /usr/bin/mount = u
+ /etc/init.d/subdomain = u
+- /sbin/cardmgr = u
+- /usr/sbin/cardmgr = u
+- /sbin/subdomain_parser = u
+- /usr/sbin/subdomain_parser = u
+- /usr/sbin/genprof = u
+- /usr/sbin/logprof = u
++ /usr/bin/cardmgr = u
++ /usr/bin/subdomain_parser = u
++ /usr/bin/genprof = u
++ /usr/bin/logprof = u
+ /usr/lib/YaST2/servers_non_y2/ag_genprof = u
+ /usr/lib/YaST2/servers_non_y2/ag_logprof = u
--[repository]
-- distro = ubuntu-intrepid
-- url = http://apparmor.test.opensuse.org/backend/api
-- preferred_user = ubuntu
-+#[repository]
-+# distro = ubuntu-intrepid
-+# url = http://apparmor.test.opensuse.org/backend/api
-+# preferred_user = ubuntu
+@@ -97,8 +95,7 @@
+ /usr/bin/sed = icn
+ /bin/touch = icn
+ /usr/bin/touch = icn
+- /sbin/killall5 = icn
+- /usr/sbin/killall5 = icn
++ /usr/bin/killall5 = icn
+ /usr/bin/find = icn
+ /usr/bin/killall = icn
+ /usr/bin/nice = icn
+@@ -112,6 +109,8 @@
+ /usr/bin/python3.5 = icn
+ /usr/bin/python3.6 = icn
+ /usr/bin/python3.7 = icn
++ /usr/bin/python3.8 = icn
++ /usr/bin/python3.9 = icn
+ /usr/bin/tr = icn
- [qualifiers]
- # things will be painfully broken if bash has a profile
+ [required_hats]
+--
+2.29.0
diff --git a/srcpkgs/apparmor/patches/fix-musl.patch b/srcpkgs/apparmor/patches/fix-musl.patch
new file mode 100644
index 00000000000..484b67dfea4
--- /dev/null
+++ b/srcpkgs/apparmor/patches/fix-musl.patch
@@ -0,0 +1,24 @@
+diff --git a/binutils/aa_status.c b/binutils/aa_status.c
+index 78b0340..56ecac3 100644
+--- a/binutils/aa_status.c
++++ b/binutils/aa_status.c
+@@ -17,6 +17,7 @@
+ #include <errno.h>
+ #include <ctype.h>
+ #include <dirent.h>
++#include <limits.h>
+
+ #include <sys/apparmor.h>
+ #include <sys/apparmor_private.h>
+diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h
+index 32892d0..dad7664 100644
+--- a/libraries/libapparmor/include/sys/apparmor.h
++++ b/libraries/libapparmor/include/sys/apparmor.h
+@@ -22,6 +22,7 @@
+ #include <stdint.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index b064f78086e..4c260b24a1b 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
# Template file for 'apparmor'
pkgname=apparmor
-version=2.13.4
-revision=6
+version=3.0.0
+revision=1
wrksrc="${pkgname}-v${version}"
build_wrksrc=libraries/libapparmor
build_style=gnu-configure
@@ -16,23 +16,13 @@ maintainer="Olivier Mauras <olivier@mauras.ch>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://gitlab.com/apparmor/apparmor"
distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
-checksum=4f45e5a5de59b72039c6cf218bb61cb4fc42eeb7f47ca109a58238896394a33b
+checksum=8c440ab1848e723483a8550ed2889e18f322e9d7ee9eb4e2e712152ea61da68f
patch_args="-Np1"
if [ -z "$CROSS_BUILD" ]; then
configure_args="--with-perl --with-python"
fi
-post_patch() {
- # Make.rules feeds some system headers to the C preprocessor to produce
- # lists of capability and address-family names that, respectively,
- # populate 'parser/cap_names.h' and 'parser/af_names.h'. The escaping
- # backslash in the '\#include" directives here is seen by the
- # preprocessor, causing it to skip the system headers and produce empty
- # files. Removing the backslash ensures correct behavior.
- vsed -i ${wrksrc}/common/Make.rules -e 's/\\#include </#include </'
-}
-
pre_configure() {
autoreconf -if
}
@@ -40,14 +30,18 @@ pre_configure() {
pre_build() {
# Replace release profiles with our own
cd ${wrksrc}
-
- # Put in place our own profiles
cp ${FILESDIR}/profiles/* profiles/apparmor.d/
+
+ # use the correct syslog path
+ vsed -i utils/logprof.conf -e 's,logfiles = .*,logfiles = /var/log/socklog/kernel/current,'
}
post_build() {
cd ${wrksrc}
- sed -i 's#$(DESTDIR)/sbin#$(DESTDIR)/usr/bin#g' parser/Makefile
+
+ # fix cross compilation
+ vsed -i parser/Makefile -e 's,cpp,$(CPP),'
+
make ${makejobs} -C binutils
make ${makejobs} -C utils
make ${makejobs} -C parser
@@ -56,27 +50,31 @@ post_build() {
post_install() {
cd ${wrksrc}
- make DESTDIR=${DESTDIR} install -C binutils
- make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install -C utils
- make DESTDIR=${DESTDIR} APPARMOR_BIN_PREFIX=${DESTDIR}/usr/lib/apparmor \
- SBINDIR=${DESTDIR}/usr/bin USR_SBINDIR=${DESTDIR}/usr/bin install -C parser
- make DESTDIR=${DESTDIR} install -C profiles
-
- # Put Vim syntax in the correct place
- mkdir -p ${DESTDIR}/usr/share/vim/vim80/syntax/
- mv ${DESTDIR}/usr/share/apparmor/apparmor.vim ${DESTDIR}/usr/share/vim/vim80/syntax/
+ commonflags="DESTDIR=\"${DESTDIR}\" SBINDIR=\"${DESTDIR}/usr/bin\" USR_SBINDIR=\"${DESTDIR}/usr/bin\""
+ make $commonflags install -C binutils
+ make $commonflags \
+ BINDIR="${DESTDIR}/usr/bin" \
+ VIM_INSTALL_PATH="${DESTDIR}/usr/share/vim/vimfiles/syntax" \
+ install -C utils
+ make $commonflags \
+ APPARMOR_BIN_PREFIX="${DESTDIR}/usr/lib/apparmor" \
+ install -C parser
+ make DESTDIR="${DESTDIR}" install -C profiles
# requires perl bindings not generated when cross-compiling
if [ "$CROSS_BUILD" ]; then
rm -f ${DESTDIR}/usr/bin/aa-notify
fi
+
+ # we installed a custom conflicting profile
+ rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
}
apparmor-vim_package() {
short_desc+=" - Vim syntax"
depends="vim"
pkg_install() {
- vmove usr/share/vim/vim80/syntax/apparmor.vim
+ vmove usr/share/vim/vimfiles/syntax/apparmor.vim
vmove usr/share/man/man5/apparmor.vim.5
}
}
From 96b0f4ab9751f984d06178ecd95c6dc843bc7874 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 19:13:44 -0600
Subject: [PATCH 230/358] aqemu: update to 0.9.4
---
srcpkgs/aqemu/patches/memory-leak.patch | 68 -------------------------
srcpkgs/aqemu/patches/stdexcept.patch | 27 +++++++---
srcpkgs/aqemu/template | 8 +--
3 files changed, 25 insertions(+), 78 deletions(-)
delete mode 100644 srcpkgs/aqemu/patches/memory-leak.patch
diff --git a/srcpkgs/aqemu/patches/memory-leak.patch b/srcpkgs/aqemu/patches/memory-leak.patch
deleted file mode 100644
index d2369e18687..00000000000
--- a/srcpkgs/aqemu/patches/memory-leak.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From c031cf9ba4023b2026e5680ddcd0daeca5e6b842 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tobias=20Gl=C3=A4=C3=9Fer?= <tobimensch@yahoo.de>
-Date: Tue, 14 Jun 2016 20:25:24 +0200
-Subject: [PATCH] Small memory leak fixes.
-
----
- src/HDD_Image_Info.cpp | 5 +++++
- src/HDD_Image_Info.h | 1 +
- src/Properties_Window.cpp | 5 +++++
- src/Properties_Window.h | 1 +
- 4 files changed, 12 insertions(+)
-
-diff --git src/HDD_Image_Info.cpp src/HDD_Image_Info.cpp
-index 4cd34b4..9d29c88 100644
---- src/HDD_Image_Info.cpp
-+++ src/HDD_Image_Info.cpp
-@@ -32,6 +32,11 @@ HDD_Image_Info::HDD_Image_Info( QObject *parent )
- QEMU_IMG_Proc = new QProcess( this );
- }
-
-+HDD_Image_Info::~HDD_Image_Info()
-+{
-+ delete QEMU_IMG_Proc;
-+}
-+
- VM::Disk_Info HDD_Image_Info::Get_Disk_Info() const
- {
- return Info;
-diff --git src/HDD_Image_Info.h src/HDD_Image_Info.h
-index 2cfec47..9339464 100644
---- src/HDD_Image_Info.h
-+++ src/HDD_Image_Info.h
-@@ -32,6 +32,7 @@ class HDD_Image_Info : public QObject
-
- public:
- HDD_Image_Info( QObject *parent = 0 );
-+ ~HDD_Image_Info();
- VM::Disk_Info Get_Disk_Info() const;
-
- public slots:
-diff --git src/Properties_Window.cpp src/Properties_Window.cpp
-index 918251f..48d9619 100644
---- src/Properties_Window.cpp
-+++ src/Properties_Window.cpp
-@@ -47,6 +47,11 @@ Properties_Window::Properties_Window( QWidget *parent )
- this, SLOT(on_Button_Update_Info_clicked()) );
- }
-
-+Properties_Window::~Properties_Window()
-+{
-+ delete HDD_Info;
-+}
-+
- const VM_Storage_Device &Properties_Window::Get_Floppy()
- {
- PW_Storage.Set_Enabled( true );
-diff --git src/Properties_Window.h src/Properties_Window.h
-index 75ecbc1..bb9f692 100644
---- src/Properties_Window.h
-+++ src/Properties_Window.h
-@@ -33,6 +33,7 @@ class Properties_Window: public QDialog
-
- public:
- Properties_Window( QWidget *parent = 0 );
-+ ~Properties_Window();
-
- const VM_Storage_Device &Get_Floppy();
- const VM_Storage_Device &Get_CD_ROM();
diff --git a/srcpkgs/aqemu/patches/stdexcept.patch b/srcpkgs/aqemu/patches/stdexcept.patch
index 8b2b015e239..70c87ccd073 100644
--- a/srcpkgs/aqemu/patches/stdexcept.patch
+++ b/srcpkgs/aqemu/patches/stdexcept.patch
@@ -1,10 +1,25 @@
---- src/docopt/docopt_value.h 2016-05-31 14:34:02.000000000 +0200
-+++ src/docopt/docopt_value.h 2020-09-24 20:10:27.152286526 +0200
-@@ -13,6 +13,7 @@
- #include <vector>
- #include <functional> // std::hash
+From fe1fd5c856a79d9f0704ad2b973caf786272dbd4 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sat, 21 Nov 2020 19:08:35 -0600
+Subject: [PATCH] stdexcept
+
+---
+ src/docopt/docopt_value.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/docopt/docopt_value.h src/docopt/docopt_value.h
+index ddb8a8e..99aa545 100644
+--- src/docopt/docopt_value.h
++++ src/docopt/docopt_value.h
+@@ -13,7 +13,7 @@
#include <iosfwd>
+ #include <string>
+ #include <vector>
+-
+#include <stdexcept>
-
namespace docopt {
+ /// A generic type to hold the various types that can be produced by docopt.
+--
+2.29.2
+
diff --git a/srcpkgs/aqemu/template b/srcpkgs/aqemu/template
index a3dcfe64e57..eea61aa562b 100644
--- a/srcpkgs/aqemu/template
+++ b/srcpkgs/aqemu/template
@@ -1,7 +1,7 @@
# Template file for 'aqemu'
pkgname=aqemu
-version=0.9.2
-revision=2
+version=0.9.4
+revision=1
build_style=cmake
configure_args="-DWITHOUT_EMBEDDED_DISPLAY=1"
makedepends="qt5-devel qemu desktop-file-utils"
@@ -10,8 +10,8 @@ short_desc="GUI to QEMU and KVM emulators, written in Qt4"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://aqemu.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/aqemu/${version}/aqemu-$version.tar.gz"
-checksum=e3d54de00ebdce3754f97f7e0e7cce8cebb588e8ce6bc249401cc909281b08de
+distfiles="https://github.com/TBK/aqemu/archive/v${version}.tar.gz"
+checksum=576ae78de936518a1de057355ffc192b59e42be934f0111122b2c5fcafe318a7
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-devel"
From 821daf9ec42bd7d7fd12d64c2d2b12e6852beda9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 19:47:19 -0600
Subject: [PATCH 231/358] apache-fop: update to 2.5
---
srcpkgs/apache-fop/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template
index ab39b281da2..d8b6808a93e 100644
--- a/srcpkgs/apache-fop/template
+++ b/srcpkgs/apache-fop/template
@@ -1,7 +1,7 @@
# Template file for 'apache-fop'
pkgname=apache-fop
-version=2.4
-revision=2
+version=2.5
+revision=1
wrksrc="fop-${version}"
build_wrksrc="fop"
hostmakedepends="openjdk8 apache-ant"
@@ -12,8 +12,8 @@ license="Apache-2.0"
homepage="http://xmlgraphics.apache.org/fop/"
distfiles="http://mirror.dkd.de/apache/xmlgraphics/fop/source/fop-${version}-src.tar.gz
http://mirror.dkd.de/apache/xmlgraphics/fop/binaries/fop-${version}-bin.tar.gz"
-checksum="1d6b323b1c4968a492a234ba1b726e78c96b91cfd871f77cb579d68729443086
- d97f7318ca1aab9937d68aa6ce2a00379d8d4a0b692515246c84d328a6bf4f0c"
+checksum="783077318139d581d5f485566d1b08bfc576003c53cfbf5beaeba503a24b4005
+ 6a3c5f8915be5ef90fff202c818152d8252bb45b96d9c5d6550594903739e5ed"
conf_files="/etc/fop.conf"
do_build() {
From 3171f67cc7fdd684dd211439234827eaa4513a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 22 Nov 2020 05:55:39 +0100
Subject: [PATCH 232/358] libgcrypt: fix cross
---
srcpkgs/libgcrypt/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index 4c8f5c5cc26..650f022ad7a 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -12,9 +12,9 @@ homepage="https://www.gnupg.org"
distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2"
checksum=03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748
-case "$XBPS_TARGET_MACHINE" in
- ppc|ppc-musl) configure_args+=" ac_cv_sys_symbol_underscore=no" ;;
-esac
+if [ "$CROSS_BUILD" ]; then
+ configure_args+=" ac_cv_sys_symbol_underscore=no"
+fi
post_configure() {
case "$XBPS_TARGET_MACHINE" in
From 995fac192ca92fefe7f644e724204ac5a420c574 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Sat, 21 Nov 2020 09:48:35 -0800
Subject: [PATCH 233/358] GoLand: update to 2020.2.3.
---
srcpkgs/GoLand/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index e0bb8b2bade..18ed226159d 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,6 +1,6 @@
# Template file for 'GoLand'
pkgname=GoLand
-version=2020.1
+version=2020.2.3
revision=1
archs="i686 x86_64"
depends="jetbrains-jdk-bin"
@@ -9,10 +9,11 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
homepage="https://www.jetbrains.com/go"
distfiles="https://download.jetbrains.com/go/goland-${version}.tar.gz"
-checksum=c63de783facbf8d96eb6714240218c3c320fdbda1ddaa965f7fe72ecf6e897e2
+checksum=c0ca83c05e156c58483b42eb9a14fd1013434c8936fbba20ffd4b0b722a6bfa2
repository=nonfree
restricted=yes
nopie=yes
+python_version=3
post_extract() {
# Remove files for other CPU architectures
From fd64f61f6d1b3301bb6aae4f9c71aac356107ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 30 Aug 2020 17:28:45 -0300
Subject: [PATCH 234/358] New package: ZMusic-1.1.3.
ZMusic needs libopenal to enable sound playback.
libopenal, libfluidsynth and libsndfile are all loaded dynamically.
Based on and closes #20665.
---
common/shlibs | 2 ++
srcpkgs/ZMusic-devel | 1 +
srcpkgs/ZMusic/patches/ppc-musl.patch | 13 ++++++++++
srcpkgs/ZMusic/template | 35 +++++++++++++++++++++++++++
4 files changed, 51 insertions(+)
create mode 120000 srcpkgs/ZMusic-devel
create mode 100644 srcpkgs/ZMusic/patches/ppc-musl.patch
create mode 100644 srcpkgs/ZMusic/template
diff --git a/common/shlibs b/common/shlibs
index 44f54987a27..a1b2c7e1b9a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2975,6 +2975,8 @@ libpisync.so.1 pilot-link-0.12.5_1
libpitcl.so.0 pilot-link-0.12.5_1
libiscsi.so.9 libiscsi-1.19.0_1
libgme.so.0 libgme-0.6.1_1
+libzmusic.so.1 ZMusic-1.1.2_1
+libzmusiclite.so.1 ZMusic-1.1.2_1
libsidplayfp.so.5 libsidplayfp-2.0.0_1
libstilview.so.0 libsidplayfp-1.8.7_1
libczmq.so.4 czmq-4.0.1_1
diff --git a/srcpkgs/ZMusic-devel b/srcpkgs/ZMusic-devel
new file mode 120000
index 00000000000..023ff24ecd4
--- /dev/null
+++ b/srcpkgs/ZMusic-devel
@@ -0,0 +1 @@
+ZMusic
\ No newline at end of file
diff --git a/srcpkgs/ZMusic/patches/ppc-musl.patch b/srcpkgs/ZMusic/patches/ppc-musl.patch
new file mode 100644
index 00000000000..729b73b155d
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/ppc-musl.patch
@@ -0,0 +1,13 @@
+Taken from libgme package.
+
+--- thirdparty/game-music-emu/gme/blargg_endian.h
++++ thirdparty/game-music-emu/gme/blargg_endian.h
+@@ -36,7 +36,7 @@
+ #endif
+
+ #if defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
+- defined (__sparc__) || BLARGG_CPU_POWERPC || \
++ defined (__sparc__) || \
+ (defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
+ #define BLARGG_BIG_ENDIAN 1
+ #elif !defined (__mips__)
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
new file mode 100644
index 00000000000..b75b6d0c409
--- /dev/null
+++ b/srcpkgs/ZMusic/template
@@ -0,0 +1,35 @@
+# Template file for 'ZMusic'
+pkgname=ZMusic
+version=1.1.3
+revision=1
+build_style=cmake
+configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel alsa-lib-devel libgme-devel libopenal-devel libsndfile-devel"
+# these are dlopened
+depends="libfluidsynth libopenal libsndfile"
+short_desc="GZDoom's music system"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/coelckers/ZMusic"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=5f432b022e023175eae7701625f79287e9ffe889a444179681381026b4fb93bf
+nocross=yes
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ makedepends+=" musl-fts-devel"
+fi
+
+post_install() {
+ vmkdir usr/share/licenses/${pkgname}
+ vcopy "licenses/*" usr/share/licenses/${pkgname}/
+}
+
+ZMusic-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
From 4fb59788d9a2b4e5fc14bd15c5f0cd180ae9909c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH 235/358] gzdoom: update to 4.4.2.
---
...d654ed85fc42ec59c99f760a7da572a95d2d.patch | 21 -----------
srcpkgs/gzdoom/patches/fix-i686.patch | 32 +++++++++++++++++
srcpkgs/gzdoom/patches/i686.patch | 35 -------------------
srcpkgs/gzdoom/patches/ppc-musl.patch | 13 -------
srcpkgs/gzdoom/template | 35 ++++++++++---------
5 files changed, 51 insertions(+), 85 deletions(-)
delete mode 100644 srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
create mode 100644 srcpkgs/gzdoom/patches/fix-i686.patch
delete mode 100644 srcpkgs/gzdoom/patches/i686.patch
delete mode 100644 srcpkgs/gzdoom/patches/ppc-musl.patch
diff --git a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch b/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
deleted file mode 100644
index 92399384298..00000000000
--- a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Tue, 29 Oct 2019 01:02:09 +0100
-Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f6ece0a24..cb8ffc0f3d 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- rendering/polyrenderer/poly_all.cpp
- rendering/swrenderer/r_all.cpp
- utility/x86.cpp
-+ utility/palette.cpp
- PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
- endif()
- endif()
diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch
new file mode 100644
index 00000000000..b66d70db512
--- /dev/null
+++ b/srcpkgs/gzdoom/patches/fix-i686.patch
@@ -0,0 +1,32 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 26c617e..e162638 100644
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -1361,11 +1361,11 @@ endif()
+ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
+ # Need to enable intrinsics for these files.
+ if( SSE_MATTERS )
+- set_property( SOURCE
++ set_source_files_properties(
+ common/rendering/polyrenderer/poly_all.cpp
+ rendering/swrenderer/r_all.cpp
+- utility/palette.cpp
+- utility/x86.cpp
++ common/utility/palette.cpp
++ common/utility/x86.cpp
+ APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mmmx" )
+ endif()
+ endif()
+diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp
+index f2a2987..b8de208 100644
+--- src/common/utility/palette.cpp
++++ src/common/utility/palette.cpp
+@@ -33,6 +33,8 @@
+ */
+
+ #include <algorithm>
++#include <cfloat>
++#include <cmath>
+ #include "palutil.h"
+ #include "palentry.h"
+ #include "sc_man.h"
diff --git a/srcpkgs/gzdoom/patches/i686.patch b/srcpkgs/gzdoom/patches/i686.patch
deleted file mode 100644
index 6f9d839ab06..00000000000
--- a/srcpkgs/gzdoom/patches/i686.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/utility/palette.cpp 2019-10-20 16:16:08.000000000 +0200
-+++ - 2019-10-30 16:45:10.882234214 +0100
-@@ -34,6 +34,10 @@
-
- #include "palette.h"
- #include "palentry.h"
-+#include <cfloat>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cmath>
-
- /****************************/
- /* Palette management stuff */
---- src/CMakeLists.txt 2019-10-30 16:50:46.769763172 +0100
-+++ - 2019-10-30 17:11:18.507995925 +0100
-@@ -1210,7 +1210,7 @@
- endif()
- endif()
-
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} dl gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-
- include_directories( .
- g_statusbar
---- libraries/zmusic/CMakeLists.txt 2019-10-20 16:16:08.000000000 +0200
-+++ - 2019-10-30 17:15:11.581747039 +0100
-@@ -94,7 +94,7 @@
- zmusic/zmusic.cpp
- ${PLAT_SOURCES}
- )
--target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-+target_link_libraries( zmusic dl adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-
- if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
- include_directories( "${SNDFILE_INCLUDE_DIRS}" )
diff --git a/srcpkgs/gzdoom/patches/ppc-musl.patch b/srcpkgs/gzdoom/patches/ppc-musl.patch
deleted file mode 100644
index 978800ac214..00000000000
--- a/srcpkgs/gzdoom/patches/ppc-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from libgme package.
-
---- libraries/game-music-emu/gme/blargg_endian.h
-+++ libraries/game-music-emu/gme/blargg_endian.h
-@@ -36,7 +36,7 @@
- #endif
-
- #if defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
-- defined (__sparc__) || BLARGG_CPU_POWERPC || \
-+ defined (__sparc__) || \
- (defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
- #define BLARGG_BIG_ENDIAN 1
- #elif !defined (__mips__)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..bc644c1e3f2 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,41 +1,44 @@
# Template file for 'gzdoom'
pkgname=gzdoom
-version=4.3.3
+version=4.4.2
revision=1
-_tagdate=2019-07-09
+_tagdate=2020-06-16
wrksrc="${pkgname}-g${version}"
build_style=cmake
configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel ZMusic-devel"
+depends="gtk+3"
short_desc="Advanced Doom source port with OpenGL support"
maintainer="Michael Straube <straubem@gmx.de>"
license="GPL-3.0-or-later"
homepage="https://www.zdoom.org"
distfiles="https://github.com/coelckers/${pkgname}/archive/g${version}.tar.gz
https://github.com/coelckers/${pkgname}/releases/download/g${version}/${pkgname}_${version}_amd64.deb"
-checksum="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
- 6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
+checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+ ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
skip_extraction="${pkgname}_${version}_amd64.deb"
nocross=yes
-case "$XBPS_MACHINE" in
- *-musl)
- configure_args+=" -DCMAKE_CXX_FLAGS=-Wl,-lexecinfo -DCMAKE_EXE_LINKER_FLAGS=-lfts"
- makedepends+=" musl-fts-devel libexecinfo-devel"
- ;;
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ makedepends+=" musl-fts-devel libexecinfo-devel"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*) configure_args+=" -DSSE_MATTERS=true" ;;
esac
post_extract() {
ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
- sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
- sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
- sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
- sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
- sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
+ vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/gitinfo.cpp
+ vsed -e "s|VERSIONSTR|\"${version}\"|g" -i src/gitinfo.cpp
+ vsed -e "s|GIT_TIME|\"${_tagdate}\"|g" -i src/gitinfo.cpp
+ vsed -e 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' \
+ -i src/common/platform/posix/i_system.h
+ vsed -e 's|/usr/share/games/doom|/usr/share/gzdoom|g' -i src/gameconfigfile.cpp
}
post_install() {
From 84459ae5b4ae68fadbaad0ea72346954c9bc83cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 22 Jul 2020 16:36:59 -0300
Subject: [PATCH 236/358] Manual.md: revamp explain_depends section.
Add useful examples of checkdepends that might not be obvious.
---
Manual.md | 69 +++++++++++++++++++++++++++++++------------------------
1 file changed, 39 insertions(+), 30 deletions(-)
diff --git a/Manual.md b/Manual.md
index c520d06c133..7647f957129 100644
--- a/Manual.md
+++ b/Manual.md
@@ -727,36 +727,45 @@ Examples:
Do not use noarch. It is deprecated and being removed.
<a id="explain_depends"></a>
-#### About the many types of `depends` variable.
-
-So far we have listed four types of `depends`, there are `hostmakedepends`,
-`makedepends`, `checkdepends` and plain old `depends`.To understand the difference
-between them, understand this: Void Linux cross compiles for many arches.
-Sometimes in a build process, certain programs must be run, for example `yacc`, or the
-compiler itself for a C program. Those programs get put in `hostmakedepends`.
-When the build runs, those will be installed on the host to help the build
-complete.
-
-Then there are those things for which a package either links against or
-includes header files. These are `makedepends`, and regardless of the
-architecture of the build machine, the architecture of the target machine must
-be used. Typically the `makedepends` will be the only one of the three types of
-`depends` to include `-devel` packages, and typically only `-devel` packages.
-
-Then there are those things that are required for a package to run its testsuite
-`dejagnu` or libraries it must link to when building test binaries like `cmocka`.
-These are `checkdepends` and they are installed like they are part of `makedepends`.
-the difference is that they are only installed when `XBPS_CHECK_PKGS` is defined.
-
-The final variable, `depends`, is for those things the package needs at
-runtime and without which is unusable, and that xbps can't auto-detect.
-These are not all the packages the package needs at runtime, but only those
-that are not linked against. This variable is most useful for non-compiled
-programs.
-
-Finally, as a general rule, if something compiles the exact same way whether or
-not you add a particular package to `makedepends` or `hostmakedepends`, it
-shouldn't be added.
+#### About the many types of `depends` variables
+
+So far, we have listed four types of `depends` variables: `hostmakedepends`,
+`makedepends`, `checkdepends` and `depends`. These different kinds of variables
+are necessary because `xbps-src` supports cross compilation and to avoid
+installing unecessary packages in the build environment.
+
+During a build process, there are programs that must be _run_ on the host, such
+as `yacc` or the C compiler. The packages that contain these programs should be
+listed in `hostmakedepends`, and will be installed on the host when building the
+target package. Some of these packages are dependencies of the `base-chroot`
+package and don't need to be listed. It is possible that some of the programs
+necessary to build a project are located in `-devel` packages.
+
+The target package can also depend on other packages for libraries to link
+against or header files. These packages should be listed in `makedepends` and
+will match the target architecture, regardless of the architecture of the build
+machine. Typically, `makedepends` will contain mainly `-devel` packages.
+
+Furthermore, if `XBPS_CHECK_PKGS` is set or the `-Q` option is passed to
+`xbps-src`, the target package might require specific dependencies or libraries
+that are linked into its test binaries to run its test suite. These dependencies
+should be listed in `checkdepends` and will be installed as if they were part of
+`hostmakedepends`. Some dependencies that can be included in `checkdepends` are:
+
+- `dejagnu`: used for some GNU projects
+- `cmocka-devel`: linked into test binaries
+- `dbus`: makes it possible to run `dbus-run-session <test-command>` to provide
+ a D-Bus session for applications that need it
+- `git`: some test suites run the `git` command
+
+Lastly, a package may require certain dependencies at runtime, without which it
+is unusable. These dependencies, when they aren't detected automatically by
+XBPS, should be listed in `depends`. This is mostly relevant for Perl and Python
+modules and other programs that use `dlopen(3)` instead of dynamically linking.
+
+Finally, as a general rule, if a package is built the exact same way whether or
+not a particular package is present in `makedepends` or `hostmakedepends`, that
+package shouldn't be added as a build time dependency.
<a id="repositories"></a>
#### Repositories
From b3347410a51512decedb03f71cd1353f318ca9c2 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <agausmann@fastmail.com>
Date: Fri, 17 Apr 2020 22:42:41 -0500
Subject: [PATCH 237/358] New package: rpi-imager-1.4
---
srcpkgs/rpi-imager/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/rpi-imager/template
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
new file mode 100644
index 00000000000..799d3803c03
--- /dev/null
+++ b/srcpkgs/rpi-imager/template
@@ -0,0 +1,14 @@
+# Template file for 'rpi-imager'
+pkgname=rpi-imager
+version=1.4
+revision=1
+build_style=cmake
+hostmakedepends="qt5-devel"
+makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel libcurl-devel libarchive-devel util-linux"
+depends="qt5-quickcontrols2 qt5-svg util-linux"
+short_desc="Raspberry Pi Imaging Utility"
+maintainer="Adam Gausmann <agausmann@fastmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/raspberrypi/rpi-imager"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum="f42359fca67a61fa37f0dfd0167749b7d758263b8501c07473d416542d78e004"
From 16b5c4484e67443753a8bd88eb0fb6ac611901b9 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 21 Apr 2020 08:29:19 +0200
Subject: [PATCH 238/358] New package: parprouted-0.7
---
srcpkgs/parprouted/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/parprouted/template
diff --git a/srcpkgs/parprouted/template b/srcpkgs/parprouted/template
new file mode 100644
index 00000000000..34289661036
--- /dev/null
+++ b/srcpkgs/parprouted/template
@@ -0,0 +1,16 @@
+# Template file for 'parprouted'
+pkgname=parprouted
+version=0.7
+revision=1
+build_style=gnu-makefile
+short_desc="Proxy ARP IP bridging daemon"
+maintainer="Pulux <pulux@pf4sh.de>"
+license="GPL-2.0-or-later"
+homepage="http://www.hazard.maks.net/parprouted/"
+distfiles="http://www.hazard.maks.net/parprouted/${pkgname}-${version}.tar.gz"
+checksum=d63643c95d4149a3d71112da5892f459433456bf0279bfa304625f109178defc
+
+do_install() {
+ vbin parprouted
+ vman parprouted.8
+}
From 386bc732ea7bac51c432b794aa427938e8943c1d 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, 22 Nov 2020 13:05:15 +0700
Subject: [PATCH 239/358] rpi-imager: fix ftbfs
Closes: #26597 [via git-merge-pr]
---
srcpkgs/rpi-imager/template | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 799d3803c03..f50227c753a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -3,8 +3,9 @@ pkgname=rpi-imager
version=1.4
revision=1
build_style=cmake
-hostmakedepends="qt5-devel"
-makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel libcurl-devel libarchive-devel util-linux"
+hostmakedepends="qt5-host-tools qt5-qmake"
+makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel
+ libcurl-devel libarchive-devel"
depends="qt5-quickcontrols2 qt5-svg util-linux"
short_desc="Raspberry Pi Imaging Utility"
maintainer="Adam Gausmann <agausmann@fastmail.com>"
@@ -12,3 +13,11 @@ license="Apache-2.0"
homepage="https://github.com/raspberrypi/rpi-imager"
distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
checksum="f42359fca67a61fa37f0dfd0167749b7d758263b8501c07473d416542d78e004"
+
+post_patch() {
+ vsed -i -e 's/CURL REQUIRED \([0-9.]*\)/CURL \1 REQUIRED/' CMakeLists.txt
+}
+
+pre_configure() {
+ ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
+}
From 46c14debd9c987e7f5a92be3fa1437453f13ca2e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 240/358] New package: libnma-1.8.30
---
common/shlibs | 1 +
srcpkgs/libnma-devel | 1 +
srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+)
create mode 120000 srcpkgs/libnma-devel
create mode 100644 srcpkgs/libnma/template
diff --git a/common/shlibs b/common/shlibs
index a1b2c7e1b9a..bf3f9b26575 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,6 +2984,7 @@ liblz.so.1 lzlib-1.8_1
libelogind.so.0 libelogind-238.1_2
libseat.so.1 libseat-0.3.0_1
libnma.so.0 libnm-gtk-1.4.0_1
+libnma.so.0 libnma-1.8.30_1
libgspell-1.so.2 gspell-1.8.0_1
libotf.so.1 libotf-0.9.16_1
libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=da33e72a49e07d855d97a52aa9a8962a4c96f52b9168c4e0027117ad8ffdafb4
+
+if [ "$CROSS_BUILD" ]; then
+ configure_args+="-Dgtk_doc=false"
+ hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+ if [ "$CROSS_BUILD" ]; then
+ vmkdir usr/share/gtk-doc/html 0755
+ vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+ fi
+}
+
+libnma-devel_package() {
+ short_desc+=" - library development files"
+ depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/include
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ vmove usr/share/gtk-doc
+ }
+}
From e60ec8f7f2ea051f87f5628df9ec323113dbe71a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 241/358] network-manager-applet: update to 1.18.0
---
common/shlibs | 1 -
srcpkgs/libnm-gtk | 1 -
srcpkgs/network-manager-applet-devel | 1 -
srcpkgs/network-manager-applet/template | 47 ++++---------------------
4 files changed, 7 insertions(+), 43 deletions(-)
delete mode 120000 srcpkgs/libnm-gtk
delete mode 120000 srcpkgs/network-manager-applet-devel
diff --git a/common/shlibs b/common/shlibs
index bf3f9b26575..51c9ba0635a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
libcolord.so.2 libcolord-1.1.7_1
libcolordprivate.so.2 libcolord-1.1.7_1
libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
libcaribou.so.0 caribou-0.4.0_1
libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
short_desc="NetworkManager panel applet for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
- export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
- short_desc+=" - runtime library"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- if [ "$build_option_gir" ]; then
- vmove usr/lib/girepository-1.0
- fi
- }
-}
-
-network-manager-applet-devel_package() {
- depends="gtk+3-devel NetworkManager-devel>=1.0
- libnm-gtk>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- vmove usr/share/gtk-doc
- }
-}
From bf2a7da1886ed24680fdd2788015d80670916231 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 242/358] NetworkManager-strongswan: update to 1.5.2
---
srcpkgs/NetworkManager-strongswan/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
# Template file for 'NetworkManager-strongswan'
pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-more-warnings --without-libnm-glib
--disable-more-warnings"
hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
depends="strongswan"
short_desc="Strongswan NetworkManager plugin"
maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
license="GPL-2.0-or-later"
homepage="https://www.strongswan.org/"
distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169
From be96b936857e7af1d88077cb80eccf0d2db5a5c3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 243/358] NetworkManager-l2tp: change dependency to
libnma-devel
---
srcpkgs/NetworkManager-l2tp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
# Template file for 'NetworkManager-l2tp'
pkgname=NetworkManager-l2tp
version=1.8.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--runstatedir=/run"
hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
depends="strongswan xl2tpd ppp"
short_desc="NetworkManager VPN plugin for L2TP/IPsec"
maintainer="Douglas Kosovic <doug@uq.edu.au>"
From 86bcd1e12b244d47871cd50cb242585b176e285d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 244/358] NetworkManager-openconnect: change dependency to
libnma-devel
---
srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
pkgname=NetworkManager-openconnect
version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
depends="openconnect"
short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes
From 10c034dfe747996a8e9b668af3a00a0a668ca610 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 245/358] NetworkManager-openvpn: update to 1.8.12
---
...isable-libnm-glib-support-by-default.patch | 52 -------------------
srcpkgs/NetworkManager-openvpn/template | 8 +--
2 files changed, 4 insertions(+), 56 deletions(-)
delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
- NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- fi
- fi
- if test "$with_gnome" != no; then
- with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
-- with_libnm_glib="$with_gnome"
-+ with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
-- with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+ with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
---
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
# Template file for 'NetworkManager-openvpn'
pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
depends="openvpn"
short_desc="NetworkManager VPN plugin for OpenVPN"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
system_accounts="_nm_openvpn"
lib32disabled=yes
_nm_openvpn_homedir="/var/empty"
From d48c1ea7b8c8036d94776bc51c1df2152d682606 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 246/358] NetworkManager-pptp: change dependency to
libnma-devel
---
srcpkgs/NetworkManager-pptp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
version=1.2.8
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-libnm-glib"
hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
depends="pptpclient"
short_desc="NetworkManager VPN plugin for pptp"
maintainer="Enno Boland <gottox@voidlinux.org>"
From f8adeae447dfbc976e8e8943c487cad8114a9dc7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 247/358] gnome-control-center: update to 3.38.1
---
srcpkgs/gnome-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=3.38.0
+version=3.38.1
revision=1
build_style=meson
build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
build_options="cheese"
build_options_default="cheese"
From fdc4740410d3f5e9890077e9e13d414b003801ff Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 248/358] gnome-initial-setup: update to 3.38.1
---
srcpkgs/gnome-initial-setup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=3.38.0
+version=3.38.1
revision=1
build_style=meson
configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
pango-devel"
depends="iso-codes"
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676
From 6d94c349870c8852f2302eb790213f08b7641de6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 249/358] gnome-shell: update to 3.38.1
---
srcpkgs/gnome-shell/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index bc4cd67fae7..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
short_desc="GNOME core user interface"
From 197ffa696aed47305c88a1affda3d16f7b7860d9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 250/358] cinnamon-control-center: change dependency to
libnma-devel
---
srcpkgs/cinnamon-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=4.6.2
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
From 0aa3a2db365887f9b19f44f46696ca2e46dbb74b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 19:45:42 -0400
Subject: [PATCH 251/358] switchboard-plug-network: update to 2.3.2
---
srcpkgs/switchboard-plug-network/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
# Template file for 'switchboard-plug-network'
pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
revision=1
build_style=meson
hostmakedepends="pkg-config vala"
makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
short_desc="Switchboard Network Plug"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"
From 49f27780c0305bbcac94f9e851a616201b5eccd8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 12 Oct 2020 20:52:23 -0400
Subject: [PATCH 252/358] NetworkManager-vpnc: change dependency to
libnma-devel
---
srcpkgs/NetworkManager-vpnc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index a8b8ce12176..b9d17226132 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,11 +1,11 @@
# Template file for 'NetworkManager-vpnc'
pkgname=NetworkManager-vpnc
version=1.2.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
hostmakedepends="pkg-config intltool"
-makedepends="libnm libnm-gtk network-manager-applet-devel libsecret-devel"
+makedepends="gtk+3-devel libnm libnma-devel libsecret-devel"
depends="vpnc"
short_desc="NetworkManager VPN plugin for VPNC"
maintainer="Peter Kuchar <masaj@gmx.com>"
From 439c80e6c033aafbf2303e3fffb5ece54772cd1a Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sat, 21 Nov 2020 23:07:30 -0800
Subject: [PATCH 253/358] growlight: make zfs optional
---
srcpkgs/growlight/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 65e5f69d52a..5ea4a3a42a8 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,12 +1,13 @@
# Template file for 'growlight'
pkgname=growlight
version=1.2.18
-revision=1
+revision=2
build_style=cmake
+configure_args="$(vopt_bool zfs USE_LIBZFS)"
hostmakedepends="pkg-config pandoc"
makedepends="libatasmart-devel libblkid-devel libcap-devel cryptsetup-devel
nettle-devel notcurses-devel libpciaccess-devel eudev-libudev-devel zlib-devel
- device-mapper-devel pciutils-devel zfs-devel"
+ device-mapper-devel pciutils-devel $(vopt_if zfs zfs-devel)"
depends="ntfs-3g jfsutils xfsprogs nvme-cli hdparm f2fs-tools btrfs-progs e2fsprogs"
short_desc="Block device manager and system installation tool"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -14,3 +15,6 @@ license="GPL-3.0-or-later"
homepage="https://nick-black.com/dankwiki/index.php/Growlight"
distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
checksum=c6c08556e6838226b81300e177c49d7a382e9eb30cfdb19f99790106e426a032
+
+build_options="zfs"
+desc_option_zfs="Build with ZFS Support"
From de4e2312d2fc19699877bd325f46c16233c58f25 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Thu, 29 Oct 2020 10:01:31 +1100
Subject: [PATCH 254/358] openvpn: update to 2.5.0
---
srcpkgs/openvpn/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 63a8ce1b77e..f6ebdbb57d6 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,20 +1,19 @@
# Template file for 'openvpn'
pkgname=openvpn
-version=2.4.9
-revision=3
+version=2.5.0
+revision=1
build_style=gnu-configure
-configure_args="$(vopt_enable pkcs11) --enable-iproute2 --disable-systemd
+configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
-hostmakedepends="iproute2 pkg-config"
+hostmakedepends="pkg-config"
makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
$(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
-depends="iproute2"
short_desc="Easy-to-use, robust, and highly configurable VPN"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://www.openvpn.net"
distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz"
-checksum=641f3add8694b2ccc39fd4fd92554e4f089ad16a8db6d2b473ec284839a5ebe2
+checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
build_options="mbedtls pkcs11"
build_options_default="mbedtls"
From cae8f95b729542cff6723cfee59e0ed7c9c6425b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 22 Nov 2020 15:20:05 +0100
Subject: [PATCH 255/358] erlang: update to 23.1.4.
---
srcpkgs/erlang/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 6fb84cb0a8b..6557281ec4c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
# Template file for 'erlang'
pkgname=erlang
-version=23.1.3
+version=23.1.4
revision=1
create_wrksrc=yes
build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="http://www.erlang.org/"
changelog="https://github.com/erlang/otp/releases"
distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=291e0852b71ca593f4015417f6e44c08638633c5af6648bd26582c8590390433
+checksum=8f6718b82bbca72d7dfe0b0de10b6e043cefe9e5ac08d3f84e18f8522d794967
subpackages="erlang-doc"
if [ -z "$CROSS_BUILD" ]; then
@@ -59,7 +59,6 @@ post_install() {
erlang-doc_package() {
short_desc="Erlang programming language documentation and examples"
depends="${sourcepkg}-${version}_${revision}"
- archs=noarch
pkg_install() {
vmove usr/lib/erlang/doc
for i in $(cd ${DESTDIR}; find usr/lib/erlang -type d \( -path '*/examples' -o -path '*/doc/html' \))
From 0999e0839de805e7959856de6a1a76feb9cae2db Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 22 Nov 2020 15:22:52 +0100
Subject: [PATCH 256/358] include-what-you-use: update to 0.15.
---
...de-what-you-use-001-llvm11-stringref.patch | 146 ------------------
...ude-what-you-use-002-clang-astdumper.patch | 54 -------
srcpkgs/include-what-you-use/template | 14 +-
3 files changed, 4 insertions(+), 210 deletions(-)
delete mode 100644 srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch
delete mode 100644 srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch
diff --git a/srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch b/srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch
deleted file mode 100644
index 171dca28e34..00000000000
--- a/srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 53487d209729d5781007dc0fd6076dc585cb3727 Mon Sep 17 00:00:00 2001
-From: Andrea Bocci <andrea.bocci@cern.ch>
-Date: Fri, 28 Feb 2020 17:45:03 +0100
-Subject: [PATCH] Add explicit conversion from llvm::StringRef to std::string
-
-llvm/llvm-project@777180a makes the llvm::StringRef conversion operator
-to std::string explicit.
-These changes add a call to the str() method to perform the conversion.
-
-Signed-off-by: Andrea Bocci <andrea.bocci@cern.ch>
----
- iwyu_driver.cc | 2 +-
- iwyu_globals.cc | 4 ++--
- iwyu_lexer_utils.cc | 2 +-
- iwyu_location_util.h | 2 +-
- iwyu_output.cc | 2 +-
- iwyu_path_util.cc | 6 +++---
- iwyu_preprocessor.cc | 4 ++--
- 7 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/iwyu_driver.cc b/iwyu_driver.cc
-index bd163144..42fea35b 100644
---- a/iwyu_driver.cc
-+++ b/iwyu_driver.cc
-@@ -79,7 +79,7 @@ std::string GetExecutablePath(const char *Argv0) {
- }
-
- const char *SaveStringInSet(std::set<std::string> &SavedStrings, StringRef S) {
-- return SavedStrings.insert(S).first->c_str();
-+ return SavedStrings.insert(S.str()).first->c_str();
- }
-
- void ExpandArgsFromBuf(const char *Arg,
-diff --git a/iwyu_globals.cc b/iwyu_globals.cc
-index 0f58b4dc..26998966 100644
---- a/iwyu_globals.cc
-+++ b/iwyu_globals.cc
-@@ -293,7 +293,7 @@ static vector<HeaderSearchPath> ComputeHeaderSearchPaths(
- for (auto it = header_search->system_dir_begin();
- it != header_search->system_dir_end(); ++it) {
- if (const DirectoryEntry* entry = it->getDir()) {
-- const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName()));
-+ const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName().str()));
- search_path_map[path] = HeaderSearchPath::kSystemPath;
- }
- }
-@@ -303,7 +303,7 @@ static vector<HeaderSearchPath> ComputeHeaderSearchPaths(
- // search_dir_begin()/end() includes both system and user paths.
- // If it's a system path, it's already in the map, so everything
- // new is a user path. The insert only 'takes' for new entries.
-- const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName()));
-+ const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName().str()));
- search_path_map.insert(make_pair(path, HeaderSearchPath::kUserPath));
- }
- }
-diff --git a/iwyu_lexer_utils.cc b/iwyu_lexer_utils.cc
-index fcea2d28..648c9da8 100644
---- a/iwyu_lexer_utils.cc
-+++ b/iwyu_lexer_utils.cc
-@@ -70,7 +70,7 @@ SourceLocation GetLocationAfter(
- string GetIncludeNameAsWritten(
- SourceLocation include_loc,
- const CharacterDataGetterInterface& data_getter) {
-- const string data = GetSourceTextUntilEndOfLine(include_loc, data_getter);
-+ const string data = GetSourceTextUntilEndOfLine(include_loc, data_getter).str();
- if (data.empty())
- return data;
- string::size_type endpos = string::npos;
-diff --git a/iwyu_location_util.h b/iwyu_location_util.h
-index 3892a424..6f8cf81c 100644
---- a/iwyu_location_util.h
-+++ b/iwyu_location_util.h
-@@ -89,7 +89,7 @@ bool IsInScratchSpace(clang::SourceLocation loc);
-
- inline string GetFilePath(const clang::FileEntry* file) {
- return (IsBuiltinFile(file) ? "<built-in>" :
-- NormalizeFilePath(file->getName()));
-+ NormalizeFilePath(file->getName().str()));
- }
-
- //------------------------------------------------------------
-diff --git a/iwyu_output.cc b/iwyu_output.cc
-index ca145710..8666c26c 100644
---- a/iwyu_output.cc
-+++ b/iwyu_output.cc
-@@ -168,7 +168,7 @@ string GetKindName(const clang::TagDecl* tag_decl) {
- if (const FakeNamedDecl* fake = FakeNamedDeclIfItIsOne(named_decl)) {
- return fake->kind_name();
- }
-- return tag_decl->getKindName();
-+ return tag_decl->getKindName().str();
- }
-
- string GetQualifiedNameAsString(const clang::NamedDecl* named_decl) {
-diff --git a/iwyu_path_util.cc b/iwyu_path_util.cc
-index ab4fc800..9987ea47 100644
---- a/iwyu_path_util.cc
-+++ b/iwyu_path_util.cc
-@@ -134,7 +134,7 @@ string NormalizeFilePath(const string& path) {
- std::replace(normalized.begin(), normalized.end(), '\\', '/');
- #endif
-
-- return normalized.str();
-+ return normalized.str().str();
- }
-
- string NormalizeDirPath(const string& path) {
-@@ -154,14 +154,14 @@ string MakeAbsolutePath(const string& path) {
- std::error_code error = llvm::sys::fs::make_absolute(absolute_path);
- CHECK_(!error);
-
-- return absolute_path.str();
-+ return absolute_path.str().str();
- }
-
- string MakeAbsolutePath(const string& base_path, const string& relative_path) {
- llvm::SmallString<128> absolute_path(base_path);
- llvm::sys::path::append(absolute_path, relative_path);
-
-- return absolute_path.str();
-+ return absolute_path.str().str();
- }
-
- string GetParentPath(const string& path) {
-diff --git a/iwyu_preprocessor.cc b/iwyu_preprocessor.cc
-index 58e78595..88b93144 100644
---- a/iwyu_preprocessor.cc
-+++ b/iwyu_preprocessor.cc
-@@ -313,7 +313,7 @@ void IwyuPreprocessorInfo::ProcessHeadernameDirectivesInFile(
- break;
- }
- const string filename = GetSourceTextUntilEndOfLine(current_loc,
-- DefaultDataGetter());
-+ DefaultDataGetter()).str();
- // Use "" or <> based on where the file lives.
- string quoted_private_include;
- if (IsSystemIncludeFile(GetFilePath(current_loc)))
-@@ -332,7 +332,7 @@ void IwyuPreprocessorInfo::ProcessHeadernameDirectivesInFile(
- }
-
- string after_text = GetSourceTextUntilEndOfLine(current_loc,
-- DefaultDataGetter());
-+ DefaultDataGetter()).str();
- const string::size_type close_brace_pos = after_text.find('}');
- if (close_brace_pos == string::npos) {
- Warn(current_loc, "@headername directive missing a closing brace");
diff --git a/srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch b/srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch
deleted file mode 100644
index 663a883fa91..00000000000
--- a/srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 30549c6931972456d1e09ff5dbeecd258a8df72b Mon Sep 17 00:00:00 2001
-From: Kim Grasman <kim.grasman@gmail.com>
-Date: Thu, 9 Jul 2020 18:47:56 +0200
-Subject: [PATCH] Implement Stmt printing with ASTDumper
-
-The Clang API changed in commit 473fbc90d1fbf17e so that Stmt::dump
-takes an ASTContext instead of a SourceManager.
-
-Rather than wire a global ASTContext, reimplement PrintableStmt and
-PrintStmt to duplicate the most trivial implementations not requiring
-ASTContext.
-
-No functional change.
----
- iwyu_ast_util.cc | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/iwyu_ast_util.cc b/iwyu_ast_util.cc
-index d3d4dd1f..b19a11fb 100644
---- a/iwyu_ast_util.cc
-+++ b/iwyu_ast_util.cc
-@@ -25,6 +25,7 @@
- #include "llvm/Support/Casting.h"
- #include "llvm/Support/raw_ostream.h"
- #include "clang/AST/ASTContext.h"
-+#include "clang/AST/ASTDumper.h"
- #include "clang/AST/CanonicalType.h"
- #include "clang/AST/Decl.h"
- #include "clang/AST/DeclBase.h"
-@@ -46,6 +47,7 @@ namespace clang {
- class FileEntry;
- } // namespace clang
-
-+using clang::ASTDumper;
- using clang::BlockPointerType;
- using clang::CXXConstructExpr;
- using clang::CXXConstructorDecl;
-@@ -450,12 +452,14 @@ string PrintableDecl(const Decl* decl, bool terse/*=true*/) {
- string PrintableStmt(const Stmt* stmt) {
- std::string buffer;
- raw_string_ostream ostream(buffer);
-- stmt->dump(ostream, *GlobalSourceManager());
-+ ASTDumper dumper(ostream, /*ShowColors=*/false);
-+ dumper.Visit(stmt);
- return ostream.str();
- }
-
- void PrintStmt(const Stmt* stmt) {
-- stmt->dump(*GlobalSourceManager()); // This prints to errs().
-+ ASTDumper dumper(llvm::errs(), /*ShowColors=*/false);
-+ dumper.Visit(stmt);
- }
-
- string PrintableType(const Type* type) {
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 3811309bdde..4457485233c 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -1,8 +1,8 @@
# Template file for 'include-what-you-use'
pkgname=include-what-you-use
-version=0.14
-revision=2
-wrksrc="${pkgname}"
+version=0.15
+revision=1
+create_wrksrc="yes"
build_style=cmake
configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr "
make_build_args="VERBOSE=1"
@@ -12,15 +12,9 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="NCSA"
homepage="https://include-what-you-use.org/"
distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
-checksum=43184397db57660c32e3298a6b1fd5ab82e808a1f5ab0591d6745f8d256200ef
+checksum=2bd6f2ae0d76e4a9412f468a5fa1af93d5f20bb66b9e7bf73479c31d789ac2e2
python_version=3
-post_extract() {
- for i in ${FILESDIR}/include-what-you-use-*.patch; do
- patch -sNp1 -i ${i}
- done
-}
-
post_install() {
vlicense LICENSE.TXT
}
From 1fdc26745e9d2f5d02e4bb692096397b6d5c1e2b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 22 Nov 2020 15:24:18 +0100
Subject: [PATCH 257/358] sysstat: update to 12.4.1.
---
srcpkgs/sysstat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template
index 5b5b1b9c8c7..70c526312f7 100644
--- a/srcpkgs/sysstat/template
+++ b/srcpkgs/sysstat/template
@@ -1,6 +1,6 @@
# Template file for 'sysstat'
pkgname=sysstat
-version=12.4.0
+version=12.4.1
revision=1
build_style=gnu-configure
configure_args="--enable-copy-only --disable-file-attr
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://pagesperso-orange.fr/sebastien.godard/"
distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.xz"
-checksum=78556c339795ecd07eb10ee09e3f5d52901d3a29f874ae92b45efd0de7b62d16
+checksum=24af8d4eff5118a18f67d5eadda843b9cb9fd29ae4922c0e8b8399621313ce0b
post_extract() {
vsed -i 's/lib64/lib/' configure
From c9df5d773526d63403cb45f8d9997fd01f51e5f4 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 21 Nov 2020 14:52:36 -0700
Subject: [PATCH 258/358] youtube-dl: update to 2020.11.21.1
---
srcpkgs/youtube-dl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 8f2945c9934..d6b4e21143b 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
# Template file for 'youtube-dl'
pkgname=youtube-dl
-version=2020.11.19
+version=2020.11.21.1
revision=1
wrksrc="${pkgname}"
build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
homepage="https://yt-dl.org"
changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
distfiles="${homepage}/downloads/latest/${pkgname}-${version}.tar.gz"
-checksum=f8c14d9eb2fd8fe7242de8b96f2c918810867c518a162405644f483dcd14be9e
+checksum=d4b173bb1113bc1641cf130d088976bb8d1484f6bd5937872c1f89b1e28e3429
do_check() {
PYTHON=/usr/bin/python3 make offlinetest
From 77c06cc1b8dadd144cf3d60dd768c10d5b5d8343 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 22 Nov 2020 09:54:23 -0500
Subject: [PATCH 259/358] python3-scour: update to 0.38.2.
---
srcpkgs/python3-scour/template | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-scour/template b/srcpkgs/python3-scour/template
index cf86a2354b0..5dd2d4f0a48 100644
--- a/srcpkgs/python3-scour/template
+++ b/srcpkgs/python3-scour/template
@@ -1,21 +1,16 @@
# Template file for 'python3-scour'
pkgname=python3-scour
-version=0.38.1.post1
+version=0.38.2
revision=1
wrksrc="scour-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-six"
-checkdepends="python3-six"
short_desc="SVG scrubber (Python3)"
maintainer="Alexander Mamay <alexander@mamay.su>"
license="Apache-2.0"
homepage="https://github.com/scour-project/scour"
changelog="https://raw.githubusercontent.com/scour-project/scour/master/HISTORY.md"
distfiles="${PYPI_SITE}/s/scour/scour-${version}.tar.gz"
-checksum=81b93dcfc57338f1260db4fb62697b653770a8a8bd756dcba3640c9b558a7145
+checksum=6881ec26660c130c5ecd996ac6f6b03939dd574198f50773f2508b81a68e0daf
conflicts="python-scour>=0"
-
-do_check() {
- python3 setup.py test
-}
From 5803b5dc1ab79c1ef0bab641dec2eea619ad7ad7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 22 Nov 2020 10:04:38 -0500
Subject: [PATCH 260/358] python3-virtualenv: update to 20.2.0.
---
srcpkgs/python3-virtualenv/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 37be07a5fb3..91775e9d370 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,20 +1,24 @@
# Template file for 'python3-virtualenv'
pkgname=python3-virtualenv
-version=20.1.0
+version=20.2.0
revision=1
wrksrc="virtualenv-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="python3-setuptools python3-appdirs python3-distlib python3-filelock python3-six"
-checkdepends="$depends"
+checkdepends="tox python3-devel $depends"
short_desc="Virtual Python environment builder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://virtualenv.pypa.io/"
distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=b8d6110f493af256a40d65e29846c69340a947669eec8ce784fcf3dd3af28380
+checksum=fd4147c5ba3f694e2e4fc3c767407dc2226899623bb9b49c2f15637c2ee335b3
alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
+do_check() {
+ tox -e py${py3_ver/./}
+}
+
post_install() {
mv $DESTDIR/usr/bin/virtualenv $DESTDIR/usr/bin/virtualenv3
vlicense LICENSE
From 64dbd76bb914d287489e9fd3476d5219a3cdd0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 14:59:20 +0100
Subject: [PATCH 261/358] tectonic: update to 0.3.3.
---
srcpkgs/tectonic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 98978d07ec8..709c265d4aa 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,6 +1,6 @@
# Template file for 'tectonic'
pkgname=tectonic
-version=0.2.0
+version=0.3.3
revision=1
wrksrc="tectonic-tectonic-${version}"
build_style=cargo
@@ -11,7 +11,7 @@ maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
license="MIT"
homepage="https://tectonic-typesetting.github.io"
distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=fce39a26b8a88c662de114ce38f407f234e255c4cef6ea825e85358e936b9bbd
+checksum=c0aa60186f2e7f37af67dafbdccfc7a99ca5ce084651d8fcabe7561b941dcb97
post_install() {
vlicense LICENSE
From ef10091f084b61665c61da592eaf3a29cc62a7b4 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sun, 22 Nov 2020 18:39:03 +0100
Subject: [PATCH 262/358] font-cozette: update to 1.9.3.
---
srcpkgs/font-cozette/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index 8c721033eb7..88b606f7a69 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -1,6 +1,6 @@
# Template file for 'font-cozette'
pkgname=font-cozette
-version=1.9.2
+version=1.9.3
revision=1
create_wrksrc=yes
hostmakedepends="font-util"
@@ -10,7 +10,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
license="MIT"
homepage="https://github.com/slavfox/Cozette"
distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"
-checksum=25d7a93aca70754c78e9b88ec7b6185b6bbe9f0a9344f109c4cccb6cea89a9d2
+checksum=8104e960dca987c2836c79215c30141e3203d1cf5ac34e0863fa0549ba235f55
font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
do_install() {
From ea21a71d7f554d604577ecf3df398c121ebd94c4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 22 Nov 2020 19:41:34 +0100
Subject: [PATCH 263/358] flinks: update to 0.5.0.
---
srcpkgs/flinks/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/flinks/template b/srcpkgs/flinks/template
index 551b119289d..e4fac93a22e 100644
--- a/srcpkgs/flinks/template
+++ b/srcpkgs/flinks/template
@@ -1,17 +1,17 @@
# Template file for 'flinks'
pkgname=flinks
-version=0.4.3
-revision=6
+version=0.5.0
+revision=1
build_style=python3-module
-pycompile_module="flinkspkg"
hostmakedepends="python3-setuptools"
depends="lynx python3"
short_desc="Text-mode flashing word web browser for speed-reading and/or skimming"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://mbays.freeshell.org/flinks/"
-distfiles="http://mbays.freeshell.org/flinks/flinks-${version}.tar.gz"
-checksum=ca5c3a8bc651befcb75b4f2542519bb34a36caccb52f141ddcc7b184fedcebd0
+homepage="https://mbays.freeshell.org/flinks/"
+changelog="https://mbays.freeshell.org/flinks/ChangeLog"
+distfiles="https://mbays.freeshell.org/flinks/flinks-${version}.tar.gz"
+checksum=e2834ca2309cbc02693f9bdacd860045bb6d3a9ef8bd0a54ee2f1c373a366266
post_install() {
vdoc README
From 9eb9a480d1eb2eaf4fad2089ea390aa05734b25a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 22 Nov 2020 23:15:05 +0100
Subject: [PATCH 264/358] switchboard: rebuild
there was a dependency on libgee, but libgee is long gone from
the void-packages repo (there's probably a lingering package in
the binary repos, so the switchboard-plug-network rebuild did not
fail on the builders, but it failed in my clean repos)
---
srcpkgs/switchboard/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index 295b27a5787..45031a8d8b7 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -1,10 +1,10 @@
# Template file for 'switchboard'
pkgname=switchboard
version=2.3.7
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibunity=false"
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
short_desc="Extensible System Settings app designed for elementary OS"
maintainer="Orphaned <orphan@voidlinux.org>"
From 82d1fc59f0b5633fe3a2846f5a6aaba85514335a Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 03:16:07 +0600
Subject: [PATCH 265/358] gnome-calculator: update to 3.38.2.
---
srcpkgs/gnome-calculator/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index de81e48969e..220324d3e3c 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-calculator'
pkgname=gnome-calculator
-version=3.38.0
+version=3.38.2
revision=1
build_style=meson
build_helper="gir"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Calculator"
changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=902e23ff550692b02459e14d6ebba8b670663a9f4af0d98ee52fadea895b57fe
+checksum=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b
From 7a3c503e5c1b59a3a47fde52f683bd34cb726ddd Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 03:40:49 +0600
Subject: [PATCH 266/358] gnome-maps: update to 3.38.2.
---
srcpkgs/gnome-maps/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index 48fe66691d1..6f15a99ba1d 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Maps"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9ef0e3705e00b5ff47d743452e5f550e726112aaf43c385bed3c599fa877e7b
+checksum=a1a73ca6a47435add25f8fa022ed016c84dd2db3ef4976a8280721d3ea80465d
From e0fa319ef955908c6ff87237a42069ade40b05b0 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 03:53:57 +0600
Subject: [PATCH 267/358] gnome-2048: update to 3.38.2.
---
srcpkgs/gnome-2048/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-2048/template b/srcpkgs/gnome-2048/template
index 9bc161700a6..6c7a9889c01 100644
--- a/srcpkgs/gnome-2048/template
+++ b/srcpkgs/gnome-2048/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-2048'
pkgname=gnome-2048
-version=3.38.0
+version=3.38.2
revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/2048"
distfiles="${GNOME_SITE}/gnome-2048/${version%.*}/gnome-2048-${version}.tar.xz"
-checksum=4c257f9799085263070a88acf5fbc8f7aae075ac8d56dca3e63dd982607123c9
+checksum=e27367f5c09a0136581d335f57913aaf5a5f180e3299cc5c1a30d8583e79ae68
From d6e9e6f45259eeff1a05d28192544248a15daf10 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 04:26:16 +0600
Subject: [PATCH 268/358] gnome-tetravex: update to 3.38.2.
---
srcpkgs/gnome-tetravex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-tetravex/template b/srcpkgs/gnome-tetravex/template
index c667354e090..78f0ef176f3 100644
--- a/srcpkgs/gnome-tetravex/template
+++ b/srcpkgs/gnome-tetravex/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-tetravex'
pkgname=gnome-tetravex
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
hostmakedepends="gettext itstool pkg-config vala glib-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Tetravex"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0e92b8a7e7a175f441980daa8fa2035cb47bb2df777bce6ffe31252ad7e068
+checksum=1fcdf10979b9a3526009d783a1c88a389918f360da4edb44fba25c71f186911b
From 30f9fb33a281437ffed0d900556981d55dd9fd81 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 04:37:15 +0600
Subject: [PATCH 269/358] gnome-klotski: update to 3.38.2.
---
srcpkgs/gnome-klotski/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-klotski/template b/srcpkgs/gnome-klotski/template
index d3577c0e802..c1ddd4a7d11 100644
--- a/srcpkgs/gnome-klotski/template
+++ b/srcpkgs/gnome-klotski/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-klotski'
pkgname=gnome-klotski
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Klotski"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9bda0d438b98ae8df3fc280e4cfd801a33e7121a4d601d005e171900be893c03
+checksum=91637845649f3ca709d29f71ee775b946d1112087209f32264e8fad21a0ca0e2
From 394c09f9d70aaff65f872c3731f1697c58d2c062 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 04:55:52 +0600
Subject: [PATCH 270/358] gnome-mahjongg: update to 3.38.3.
---
srcpkgs/gnome-mahjongg/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template
index bc00cfc81c1..3c8f2e7039e 100644
--- a/srcpkgs/gnome-mahjongg/template
+++ b/srcpkgs/gnome-mahjongg/template
@@ -1,8 +1,9 @@
# Template file for 'gnome-mahjongg'
pkgname=gnome-mahjongg
-version=3.38.2
+version=3.38.3
revision=1
build_style=meson
+configure_args="-Dcompile-schemas=disabled -Dupdate-icon-cache=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config vala"
makedepends="librsvg-devel gtk+3-devel libglib-devel"
short_desc="GNOME Mahjongg solitaire game"
@@ -10,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Mahjongg"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=928708b4c625cad4b05199ca2948f6a545bfab368a1fc576feed0a7432e454f3
+checksum=d2b1e47d85852048b35d89e3ddaba1daeb06aaf97acfb67a501ce664ff509190
From 34fbe0bf0d191fbe6b8792aef384d35ee6a71898 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, 22 Nov 2020 09:15:10 +0700
Subject: [PATCH 271/358] iscan: update to 2.30.4.
---
srcpkgs/iscan/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/iscan/template b/srcpkgs/iscan/template
index 41ed3dc7fa7..18c0d969766 100644
--- a/srcpkgs/iscan/template
+++ b/srcpkgs/iscan/template
@@ -1,30 +1,30 @@
# Template file for 'iscan'
pkgname=iscan
-version=2.30.3
-revision=3
-_srcrev=1
-repository=nonfree
+version=2.30.4
+revision=1
+_srcrev=2
+archs="i686 x86_64"
build_style=gnu-configure
configure_args="--enable-frontend --enable-jpeg --enable-tiff --enable-png --enable-gimp"
-LDFLAGS="-ldl -lpng16"
-maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="pkg-config"
makedepends="gtk+-devel gimp-devel libxml2-devel libjpeg-turbo-devel tiff-devel libltdl-devel libpng-devel sane-devel libusb-devel"
depends="sane-epkowa"
-license="GPL-2, AVASYSPL"
-homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
short_desc="EPSON Image Scan! front-end"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later, custom:EPSON"
+homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
distfiles="http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${version}-${_srcrev}.tar.gz"
-checksum=91a6cc1571e5ec34cee067eabb35f13838e71dfeda416310ecb5b5030d49de67
-archs="i686 x86_64"
+checksum=597b9913de42d7a27f95bc82e533cbe778121ba13e3a03bc037f8d09a43447d5
+repository=nonfree
+LDFLAGS="-ldl -lpng16"
post_configure() {
# fix wrongly created link
- sed -i -e 's/\(libesmod-$${arch}\)$(PACKAGE_CXX_ABI)/\1.c2/' non-free/Makefile
+ vsed -i -e 's/\(libesmod-$${arch}\)$(PACKAGE_CXX_ABI)/\1.c2/' non-free/Makefile
}
post_install() {
- vlicense non-free/AVASYSPL.en.txt
+ vlicense non-free/COPYING.EPSON.en.txt
vmkdir usr/lib/gimp/2.0/plug-ins
ln -s /usr/bin/iscan ${DESTDIR}/usr/lib/gimp/2.0/plug-ins
vinstall iscan.desktop 644 usr/share/applications
@@ -32,7 +32,7 @@ post_install() {
sane-epkowa_package() {
short_desc="SANE backend for EPSON scanners"
- license="GPL-2"
+ license="GPL-2.0-or-later"
unset repository
depends="sane iscan-data"
conf_files="/etc/sane.d/epkowa.conf"
From 91fb68f8a78ab7d0c89a0184208750277070ae9e 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, 22 Nov 2020 09:15:13 +0700
Subject: [PATCH 272/358] iscan-data: update to 1.39.2.
---
srcpkgs/iscan-data/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/iscan-data/template b/srcpkgs/iscan-data/template
index 2953cb34344..b5e90ed990c 100644
--- a/srcpkgs/iscan-data/template
+++ b/srcpkgs/iscan-data/template
@@ -1,14 +1,13 @@
# Template file for 'iscan-data'
pkgname=iscan-data
-version=1.39.0
-revision=2
+version=1.39.2
+revision=1
_srcrev=1
-archs=noarch
build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="libxslt"
-license="GPL-2"
-homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
short_desc="EPSON Image Scan! data files"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
distfiles="http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}-${_srcrev}.tar.gz"
-checksum=61ef9496568c8709cce7687de0d47e4b132a00fa6a398fcbb6f06f8fdf31755f
+checksum=6a62bc6e84257714785d99316a017b8444207e3dcf56d35d0ce13f292d855824
From 71d48a4325e3b48535335aa3a1efa528a8cbc074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 22 Nov 2020 18:31:03 -0300
Subject: [PATCH 273/358] .github/workflows/build: don't skip CI when PR is a
draft.
When a PR is marked as ready for review (no longer a draft), CI isn't
re-run automatically, so no tests are run until the PR is updated. Even
trying to manually re-run the jobs doesn't fix this, since GH appears to
remember the PR state instead of using the current one.
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8c0cdccf5d4..33186037f8d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,7 +26,7 @@ jobs:
build:
name: Build packages
runs-on: ubuntu-18.04
- if: "!github.event.pull_request.draft && !contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
+ if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
container:
image: 'voidlinux/masterdir-${{ matrix.config.bootstrap }}:20200607RC01'
From f2e604b85a48480b27e9ab72a5407e3a467ed9a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 23 Nov 2020 02:18:16 +0100
Subject: [PATCH 274/358] tali: update to 3.38.2
---
srcpkgs/tali/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index fd698c5032d..d3b18e563a3 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -1,6 +1,6 @@
# Template file for 'tali'
pkgname=tali
-version=3.38.0
+version=3.38.2
revision=1
build_style=meson
hostmakedepends="cmake pkg-config gettext glib-devel appstream-glib
@@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Tali"
distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz"
-checksum=29ee0cb37ba7bac7cc3d8356bcdd91a202eac999dcef79326e3a98ab2234cea4
+checksum=4fb9f7ee8cc0eb89010408c42cb0b1f83e839ac8e9b644ec3ddf564508431691
From 59ac43dd623b1f069d96e8f7a69145ebc5fd110b Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 19:39:28 +0100
Subject: [PATCH 275/358] bison: update to 3.7.4.
---
srcpkgs/bison/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template
index 090d35068c6..56f380246b1 100644
--- a/srcpkgs/bison/template
+++ b/srcpkgs/bison/template
@@ -1,6 +1,6 @@
# Template file for 'bison'
pkgname=bison
-version=3.7.3
+version=3.7.4
revision=1
build_style=gnu-configure
hostmakedepends="help2man perl m4"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/bison/bison.html"
distfiles="${GNU_SITE}/bison/bison-${version}.tar.xz"
-checksum=88d9e36856b004c0887a12ba00ea3c47db388519629483dd8c3fce9694d4da6f
+checksum=a3b5813f48a11e540ef26f46e4d288c0c25c7907d9879ae50e430ec49f63c010
alternatives="
yacc:yacc:/usr/bin/bison-yacc
yacc:yacc.1:/usr/share/man/man1/bison-yacc.1"
From af4f9f0cfdca531bf2c83db8c0b11cf194115bb5 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 21 Nov 2020 16:09:38 -0800
Subject: [PATCH 276/358] lxd: update to 4.8.
---
srcpkgs/lxd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template
index bf9b207d7f1..0b3d30a96eb 100644
--- a/srcpkgs/lxd/template
+++ b/srcpkgs/lxd/template
@@ -1,6 +1,6 @@
# Template file for 'lxd'
pkgname=lxd
-version=4.7
+version=4.8
revision=1
build_style=go
go_import_path=github.com/lxc/lxd
@@ -15,7 +15,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="Apache-2.0"
homepage="https://linuxcontainers.org/lxd"
distfiles="https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
-checksum=011745a66e971d95ada088dc42a9154028393de86871ea3ef4ff91a2976525ed
+checksum=de4f096c71448ceb358c0d0d63e34d17ea8e49c15eb9d4f8af5030ce0535337f
system_groups="lxd"
# whitelist libcap LDFLAGS (see: https://github.com/lxc/lxd/issues/6727)
From 8e863c75c7187a2594c162eaac9ffae19a30436f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 19:09:24 -0600
Subject: [PATCH 277/358] python3-pulsectl: update to 20.5.1
---
srcpkgs/python3-pulsectl/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template
index f998bf15d31..79fe26537e8 100644
--- a/srcpkgs/python3-pulsectl/template
+++ b/srcpkgs/python3-pulsectl/template
@@ -1,10 +1,9 @@
# Template file for 'python3-pulsectl'
pkgname=python3-pulsectl
-version=19.10.4
-revision=2
+version=20.5.1
+revision=1
wrksrc="pulsectl-${version}"
build_style=python3-module
-pycompile_module="pulsectl"
hostmakedepends="python3-setuptools"
depends="python3-setuptools"
short_desc="Python3 high-level interfaces and ctypes bindings for libpulse"
@@ -13,7 +12,7 @@ license="MIT"
homepage="https://github.com/mk-fg/python-pulse-control"
changelog="https://github.com/mk-fg/python-pulse-control/raw/master/CHANGES.rst"
distfiles="${PYPI_SITE}/p/pulsectl/pulsectl-${version}.tar.gz"
-checksum=137e38017960d7fc42677da12b703da42359c94803c80407ea5dddae363ba1f6
+checksum=39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db
post_install() {
vlicense COPYING
From 86e815bdfa7e3b1c4e4e8d1af70ffba26f085a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 14:29:32 +0100
Subject: [PATCH 278/358] bfs: update to 2.1.
---
srcpkgs/bfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index bad966eee44..68ccaff63a4 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
# Template file for 'bfs'
pkgname=bfs
-version=2.0
+version=2.1
revision=1
build_style=gnu-makefile
makedepends="acl-devel libcap-devel"
@@ -11,7 +11,7 @@ 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=afbde70742f4bac3f3b030b36531fe0bd67dbdda61ce0457f3a1e5681405df33
+checksum=be51966ca3bcc0167fb16c89f81fa37ee13c6326c616c31b87fd564a54bdc5f2
post_install() {
vlicense LICENSE
From 76efe3ac76fcec69aed1c10c6881d629ddca85c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 15:05:27 +0100
Subject: [PATCH 279/358] btfs: update to 2.23.
---
srcpkgs/btfs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index 35884c436b9..b70ea7d79be 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,7 +1,7 @@
# Template file for 'btfs'
pkgname=btfs
-version=2.22
-revision=2
+version=2.23
+revision=1
build_style=gnu-configure
hostmakedepends="automake pkg-config"
makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"
@@ -11,7 +11,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/johang/btfs"
distfiles="https://github.com/johang/btfs/archive/v${version}.tar.gz"
-checksum=03ebfffd7cbd91e2113d0c43d8d129ad7851753c287c326416ecf622789c4a8d
+checksum=2832817ea3aa73ff7af60a547736d0a681111816d95b76a999935b6f90491fa6
pre_configure() {
autoreconf -fi
From 37f104ef9a0f31d2778d681632c6330e0e514cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 15:14:20 +0100
Subject: [PATCH 280/358] mpd: update to 0.22.3.
---
srcpkgs/mpd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 8e3de99fec6..8ce4f1799a7 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.22.1
+version=0.22.3
revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v${version}/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=408464093d09c73ceecafc201defcbaba2193cb30ad0aaf1241459a410fecaf3
+checksum=338012037b5e67730529187c555a54cc567a85b15a7e8ddb3a807b1971566ccf
LDFLAGS+=" -Wl,-z,stack-size=1048576"
patch_args="-Np1"
From e8a2908ff56c5d488cbf62d11d8151ef966f2291 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 22:56:08 +0200
Subject: [PATCH 281/358] gmusicbrowser: update to 1.1.16.
---
...840eb9dad0b59ad2dac5d303f5929b2f09f21.diff | 26 -------------------
srcpkgs/gmusicbrowser/template | 9 +++----
2 files changed, 4 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff
diff --git a/srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff b/srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff
deleted file mode 100644
index b27e8cccf80..00000000000
--- a/srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/gmusicbrowser.pl b/gmusicbrowser.pl
-index bbf16d7..18fab6a 100755
---- gmusicbrowser.pl
-+++ gmusicbrowser.pl
-@@ -9020,7 +9020,7 @@ sub Set
-
- ($cmd,my $pattern)= split /:/,$cmd,2;
- $pattern='' unless defined $pattern;
-- my ($basecmd,my $prop)= Songs::filter_properties($field,"$cmd:$pattern");
-+ my ($basecmd, $prop)= Songs::filter_properties($field,"$cmd:$pattern");
- if (!$prop)
- { $cmd= Songs::Field_property($field,'default_filter');
- ($basecmd,$prop)= Songs::filter_properties($field,$cmd);
-diff --git a/gmusicbrowser_list.pm b/gmusicbrowser_list.pm
-index 76d2f86..26d21ae 100644
---- gmusicbrowser_list.pm
-+++ gmusicbrowser_list.pm
-@@ -8052,7 +8052,7 @@ sub Make
- unless ($notnow)
- { #warn "$key ---found in ($code,@deps)\n";
- if (ref $code)
-- { my ($func,my @keys)=@$code; #warn " -> ($func, @keys)\n";
-+ { my ($func, @keys)=@$code; #warn " -> ($func, @keys)\n";
- my $out=join ',',map "'$_'", @keys;
- my $in= join ',',map "'$_'", @deps; $in=~s#\?##g;
- $out= @keys>1 ? "\@var{$out}" : "\$var{$out}";
diff --git a/srcpkgs/gmusicbrowser/template b/srcpkgs/gmusicbrowser/template
index a84cce8f01a..050a2272ae7 100644
--- a/srcpkgs/gmusicbrowser/template
+++ b/srcpkgs/gmusicbrowser/template
@@ -1,17 +1,16 @@
# Template file for 'gmusicbrowser'
pkgname=gmusicbrowser
-version=1.1.15
-revision=7
-archs=noarch
+version=1.1.16
+revision=1
hostmakedepends="perl gettext"
depends="perl-Gtk2 perl-Glib-Object-Introspection gst-plugins-good1
- gst-plugins-bad1 gst-plugins-ugly1"
+ gst-plugins-bad1 gst-plugins-ugly1 perl-Net-DBus"
short_desc="Open-source jukebox for large collections"
maintainer="Logen K <logen@sudotask.com>"
license="GPL-3.0-only"
homepage="http://gmusicbrowser.org"
distfiles="http://gmusicbrowser.org/download/${pkgname}-${version}.tar.gz"
-checksum=1ec881d148ccc26bdbab66ca701fd2216e034c3b613d6e66c17ac702271c677b
+checksum=c7f10578ca3008e966e66c33a4887020e4b99b6aa5580c4b4771ee228ff603fe
do_install() {
make prefix=${DESTDIR}/usr install
From b4e639552b98f2346dfb63677031eabcb0f0dc30 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 14:47:41 -0600
Subject: [PATCH 282/358] gmsh: update to 4.7.1
---
srcpkgs/gmsh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template
index 2b11cd57cf3..0a499e40b13 100644
--- a/srcpkgs/gmsh/template
+++ b/srcpkgs/gmsh/template
@@ -1,6 +1,6 @@
# Template file for 'gmsh'
pkgname=gmsh
-version=4.7.0
+version=4.7.1
revision=1
wrksrc="${pkgname}-${version}-source"
build_style=cmake
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://gmsh.info"
changelog="http://gmsh.info/CHANGELOG.txt"
distfiles="https://gmsh.info/src/gmsh-${version}-source.tgz"
-checksum=e27f32f92b374ba2a746a9d9c496401c13f66ac6e3e70753e16fa4012d14320e
+checksum=c984c295116c757ed165d77149bd5fdd1068cbd7835e9bcd077358b503891c6a
build_options="fltk hxt zipper"
build_options_default="hxt"
From d34d0af8a8833a80e67f54349922d939225851f3 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 20:06:06 -0600
Subject: [PATCH 283/358] krfb: update to 20.08.3
---
srcpkgs/krfb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index fff3d2107de..39382d322d3 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
# Template file for 'krfb'
pkgname=krfb
-version=20.08.1
+version=20.08.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
homepage="https://kde.org/applications/en/system/org.kde.krfb"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a80b9bab47f2a7299e33b0e2a10b117605ec1cc572ca72e914c7f01dde383eda
+checksum=d32986a6952723c5a5ae3744ef090f2f0165082e3f152e0ee6a340d8d8bade8e
From 6f7595e1c1fa9ab884bc30fc859330c7f3849daa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 19 Nov 2020 23:41:20 +0200
Subject: [PATCH 284/358] k3b: update to 20.08.3.
---
srcpkgs/k3b/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 6fca88b4f29..3ec3c3bd56b 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
# Template file for 'k3b'
pkgname=k3b
-version=20.08.1
+version=20.08.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=66fad59f4e35c24dc8868c46ff45ffa66048501e0a6ac0c23a8b9e957033e50f
+checksum=9d81f1b859dca68a781903f35b3186a9864222c8bb2c85cd7e9481d79eb9e261
From 40954c67c9c7f7ae8a73f7771b3b32db2ca0a217 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 20 Nov 2020 00:06:45 +0200
Subject: [PATCH 285/358] gist: update to 6.0.0.
---
srcpkgs/gist/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gist/template b/srcpkgs/gist/template
index 39759f57e23..d5eaaffa360 100644
--- a/srcpkgs/gist/template
+++ b/srcpkgs/gist/template
@@ -1,8 +1,7 @@
# Template file for 'gist'
pkgname=gist
-version=5.1.0
+version=6.0.0
revision=1
-archs=noarch
hostmakedepends="ruby"
depends="ruby"
short_desc="Uploads content to gist.github.com"
@@ -10,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://defunkt.io/gist/"
distfiles="https://github.com/defunkt/gist/archive/v${version}.tar.gz"
-checksum=843cea035c137d23d786965688afc9ee70610ac6c3d6f6615cb958d6c792fbb2
+checksum=ddfb33c039f8825506830448a658aa22685fc0c25dbe6d0240490982c4721812
do_build() {
rake standalone
From 2edfff5e5062074e1ea93021905538c3c99c70f2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 19:17:27 +0200
Subject: [PATCH 286/358] geany: update to 1.37.1.
---
srcpkgs/geany/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index 9eef9728d52..4a3ac7f2ac9 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -1,6 +1,6 @@
# Template file for 'geany'
pkgname=geany
-version=1.37
+version=1.37.1
revision=1
build_style=gnu-configure
configure_args="--enable-vte --enable-gtk3"
@@ -12,8 +12,9 @@ short_desc="Fast and lightweight IDE"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://www.geany.org"
+changelog="https://raw.githubusercontent.com/geany/geany/master/NEWS"
distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
-checksum=dde52584823b769c56704c27dbedddb7a6bbaf4eacb9587d10bbc387816e3d51
+checksum=18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18
python_version=3
pre_configure() {
From d496caabeeed426bf04969eda7cc36e85133bc19 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 19:19:45 +0200
Subject: [PATCH 287/358] geany-plugins: update to 1.37.0.
---
.../geany-plugins/patches/libgit2-1.0.patch | 54 -------------------
srcpkgs/geany-plugins/template | 7 +--
2 files changed, 4 insertions(+), 57 deletions(-)
delete mode 100644 srcpkgs/geany-plugins/patches/libgit2-1.0.patch
diff --git a/srcpkgs/geany-plugins/patches/libgit2-1.0.patch b/srcpkgs/geany-plugins/patches/libgit2-1.0.patch
deleted file mode 100644
index 2cd070e1041..00000000000
--- a/srcpkgs/geany-plugins/patches/libgit2-1.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit c5840bc94d5870b2f8b38ea16853e0c2dd0ac981
-Author: q66 <daniel@octaforge.org>
-Date: Sun May 3 19:36:54 2020 +0200
-
- fix build on libgit2-1.0
-
-diff --git git-changebar/src/gcb-plugin.c git-changebar/src/gcb-plugin.c
-index b708319..8d3abaf 100644
---- git-changebar/src/gcb-plugin.c
-+++ git-changebar/src/gcb-plugin.c
-@@ -32,25 +32,6 @@
- #include <geany.h>
- #include <document.h>
-
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
--# define git_libgit2_init git_threads_init
--# define git_libgit2_shutdown git_threads_shutdown
--#endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23
--/* 0.23 added @p binary_cb */
--# define git_diff_buffers(old_buffer, old_len, old_as_path, \
-- new_buffer, new_len, new_as_path, options, \
-- file_cb, binary_cb, hunk_cb, line_cb, payload) \
-- git_diff_buffers (old_buffer, old_len, old_as_path, \
-- new_buffer, new_len, new_as_path, options, \
-- file_cb, hunk_cb, line_cb, payload)
--#endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28
--# define git_buf_dispose git_buf_free
--# define git_error_last giterr_last
--#endif
--
--
- GeanyPlugin *geany_plugin;
- GeanyData *geany_data;
-
-diff --git workbench/src/plugin_main.c workbench/src/plugin_main.c
-index 6fa6fc8..b620666 100644
---- workbench/src/plugin_main.c
-+++ workbench/src/plugin_main.c
-@@ -35,13 +35,6 @@
- #include "idle_queue.h"
- #include "tm_control.h"
-
--
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
--# define git_libgit2_init git_threads_init
--# define git_libgit2_shutdown git_threads_shutdown
--#endif
--
--
- GeanyPlugin *geany_plugin;
- GeanyData *geany_data;
-
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index 8af71c85368..8038f5f3704 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
-version=1.36.0
-revision=2
+version=1.37.0
+revision=1
build_style=gnu-configure
configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
@@ -14,8 +14,9 @@ short_desc="Geany IDE plugins"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://plugins.geany.org"
+changelog="https://raw.githubusercontent.com/geany/geany-plugins/master/NEWS"
distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz"
-checksum=39409e948502a7d6d88a290f201b7c6c678ce8ecaff7c73589ee0f6dcc059568
+checksum=14df1dda3760eedd3a28daba0788f3bee5b83ae31f042c57a78c20f37a77eb28
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
From 459510bed4240434848f4cf4dcb114e0b7e15add Mon Sep 17 00:00:00 2001
From: Dakota Walsh <kota@nilsu.org>
Date: Wed, 18 Nov 2020 18:04:52 -0500
Subject: [PATCH 288/358] amfora: update to 1.6.0.
---
srcpkgs/amfora/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 55a83e1798a..f44c714be21 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,6 +1,6 @@
# Template file for 'amfora'
pkgname=amfora
-version=1.5.0
+version=1.6.0
revision=1
build_style=go
go_import_path="github.com/makeworld-the-better-one/${pkgname}"
@@ -9,4 +9,4 @@ maintainer="Stacy Harper <contact@stacyharper.net>"
license="GPL-3.0-only"
homepage="https://github.com/makeworld-the-better-one/amfora"
distfiles="https://github.com/makeworld-the-better-one/${pkgname}/archive/v${version}.tar.gz"
-checksum=c8478b00155ad74712b957444b7afe025a74030907b77cca0903b6477f79843d
+checksum=a02b070679718953a4184ef2b7fbeccfcdf9bf227ca1efab34ee0d7fa21e9bd9
From 13e682d970d1dec269215b7ca9d334e4bbc1fe97 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 16:22:25 -0600
Subject: [PATCH 289/358] rabbitmq-c: update to 0.10.0
---
.../rabbitmq-c/patches/CVE-2019-18609.patch | 47 ----------
srcpkgs/rabbitmq-c/patches/test.patch | 89 +++++++++++++++++++
srcpkgs/rabbitmq-c/template | 13 +--
3 files changed, 96 insertions(+), 53 deletions(-)
delete mode 100644 srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch
create mode 100644 srcpkgs/rabbitmq-c/patches/test.patch
diff --git a/srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch b/srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch
deleted file mode 100644
index 7f26bfde463..00000000000
--- a/srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fc85be7123050b91b054e45b91c78d3241a5047a Mon Sep 17 00:00:00 2001
-From: Alan Antonuk <alan.antonuk@gmail.com>
-Date: Sun, 3 Nov 2019 23:50:07 -0800
-Subject: [PATCH] lib: check frame_size is >= INT32_MAX
-
-When parsing a frame header, validate that the frame_size is less than
-or equal to INT32_MAX. Given frame_max is limited between 0 and
-INT32_MAX in amqp_login and friends, this does not change the API.
-
-This prevents a potential buffer overflow when a malicious client sends
-a frame_size that is close to UINT32_MAX, in which causes an overflow
-when computing state->target_size resulting in a small value there. A
-buffer is then allocated with the small amount, then memcopy copies the
-frame_size writing to memory beyond the end of the buffer.
----
- librabbitmq/amqp_connection.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git librabbitmq/amqp_connection.c librabbitmq/amqp_connection.c
-index 034b2e96..b106f70a 100644
---- librabbitmq/amqp_connection.c
-+++ librabbitmq/amqp_connection.c
-@@ -287,12 +287,21 @@ int amqp_handle_input(amqp_connection_state_t state, amqp_bytes_t received_data,
- case CONNECTION_STATE_HEADER: {
- amqp_channel_t channel;
- amqp_pool_t *channel_pool;
-- /* frame length is 3 bytes in */
-+ uint32_t frame_size;
-+
- channel = amqp_d16(amqp_offset(raw_frame, 1));
-
-- state->target_size =
-- amqp_d32(amqp_offset(raw_frame, 3)) + HEADER_SIZE + FOOTER_SIZE;
-+ /* frame length is 3 bytes in */
-+ frame_size = amqp_d32(amqp_offset(raw_frame, 3));
-+ /* To prevent the target_size calculation below from overflowing, check
-+ * that the stated frame_size is smaller than a signed 32-bit. Given
-+ * the library only allows configuring frame_max as an int32_t, and
-+ * frame_size is uint32_t, the math below is safe from overflow. */
-+ if (frame_size >= INT32_MAX) {
-+ return AMQP_STATUS_BAD_AMQP_DATA;
-+ }
-
-+ state->target_size = frame_size + HEADER_SIZE + FOOTER_SIZE;
- if ((size_t)state->frame_max < state->target_size) {
- return AMQP_STATUS_BAD_AMQP_DATA;
- }
diff --git a/srcpkgs/rabbitmq-c/patches/test.patch b/srcpkgs/rabbitmq-c/patches/test.patch
new file mode 100644
index 00000000000..5f87d166798
--- /dev/null
+++ b/srcpkgs/rabbitmq-c/patches/test.patch
@@ -0,0 +1,89 @@
+From 26ecf6d3012be81f5dfb8a2d822c722e916a86cb Mon Sep 17 00:00:00 2001
+From: Simon Lepasteur <simon.lepasteur@swissdotnet.ch>
+Date: Wed, 11 Mar 2020 15:13:29 +0100
+Subject: [PATCH] Add option to run system tests (disabled by default).
+
+System tests require a RabbitMQ or other AMQP server to be running on
+`localhost` at TCP port number 5672 and therefore fails if no such
+server is running on the build machine.
+
+This is surprising for everyone running the standard `make test`
+to ensure the library is built correctly.
+---
+ .travis.yml | 2 +-
+ CMakeLists.txt | 1 +
+ README.md | 2 ++
+ appveyor.yml | 2 +-
+ tests/CMakeLists.txt | 8 +++++---
+ 5 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git .travis.yml .travis.yml
+index 52a66b9c..5f56cb03 100644
+--- .travis.yml
++++ .travis.yml
+@@ -19,7 +19,7 @@ addons:
+ name: "alanxz/rabbitmq-c"
+ description: "C AMQP client for RabbitMQ"
+ notification_email: alan.antonuk@gmail.com
+- build_command_prepend: mkdir build && pushd build && cmake .. && popd
++ build_command_prepend: mkdir build && pushd build && cmake .. -DRUN_SYSTEM_TESTS=ON && popd
+ build_command: cmake --build ./build
+ branch_pattern: coverity_scan
+
+diff --git CMakeLists.txt CMakeLists.txt
+index f620ddc8..a39645f4 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -266,6 +266,7 @@ option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND})
+ option(BUILD_TOOLS_DOCS "Build man pages for Tools (requires xmlto)" ${DO_DOCS})
+ option(BUILD_TESTS "Build tests (run tests with make test)" ON)
+ option(BUILD_API_DOCS "Build Doxygen API docs" ${DOXYGEN_FOUND})
++option(RUN_SYSTEM_TESTS "Run system tests (i.e. tests requiring an accessible RabbitMQ server instance on localhost)" OFF)
+
+ if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
+ message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
+diff --git README.md README.md
+index b7776c65..31347b15 100644
+--- README.md
++++ README.md
+@@ -84,6 +84,8 @@ Other interesting flags that can be passed to CMake:
+ default this is ON if the OpenSSL headers and library can be found.
+ * `BUILD_API_DOCS=ON/OFF` - toggles building the Doxygen API documentation, by
+ default this is OFF
++* `RUN_SYSTEM_TESTS=ON/OFF` toggles building the system tests (i.e. tests requiring
++ an accessible RabbitMQ server instance on localhost), by default this is OFF
+
+ ## Running the examples
+
+diff --git appveyor.yml appveyor.yml
+index 7e41c099..af315227 100644
+--- appveyor.yml
++++ appveyor.yml
+@@ -30,7 +30,7 @@ install:
+ - "Win%BITS%OpenSSL-%OPENSSL_VER%.exe /SP- /SILENT /SUPPRESSMSGBOXES /NORESTART"
+
+ before_build:
+- - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=ON -DENABLE_SSL_SUPPORT=True -G"%GENERATOR%" .
++ - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=ON -DRUN_SYSTEM_TESTS=ON -DENABLE_SSL_SUPPORT=True -G"%GENERATOR%" .
+
+ build:
+ project: ALL_BUILD.vcxproj
+diff --git tests/CMakeLists.txt tests/CMakeLists.txt
+index cf042b04..320a73d7 100644
+--- tests/CMakeLists.txt
++++ tests/CMakeLists.txt
+@@ -33,9 +33,11 @@ add_executable(test_basic
+ test_basic.c)
+ target_link_libraries(test_basic rabbitmq-static)
+
+-if (NOT APPLE)
+- add_test(basic test_basic)
+-endif()
++if (RUN_SYSTEM_TESTS)
++ if (NOT APPLE)
++ add_test(basic test_basic)
++ endif()
++endif(RUN_SYSTEM_TESTS)
+
+ add_executable(test_sasl_mechanism test_sasl_mechanism.c)
+ target_link_libraries(test_sasl_mechanism rabbitmq-static)
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 4d6533bf209..606905e2161 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,8 +1,9 @@
# Template file for 'rabbitmq-c'
pkgname=rabbitmq-c
-version=0.9.0
-revision=3
+version=0.10.0
+revision=1
build_style=cmake
+make_check_target=test
hostmakedepends="popt xmlto doxygen"
makedepends="libressl-devel"
short_desc="RabbitMQ C client"
@@ -10,10 +11,10 @@ maintainer="Hans-J. Schmid <knock@myopendoor.de>"
license="MIT"
homepage="https://github.com/alanxz/rabbitmq-c"
distfiles="https://github.com/alanxz/${pkgname}/archive/v${version}.tar.gz"
-checksum=316c0d156452b488124806911a62e0c2aa8a546d38fc8324719cd29aaa493024
+checksum=6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0
post_install() {
- vlicense LICENSE-MIT
+ vlicense LICENSE-MIT LICENSE
}
rabbitmq-c-devel_package() {
@@ -22,7 +23,7 @@ rabbitmq-c-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
}
}
From e99067c34e75d70cf354cf1689a987d1df315938 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Thu, 19 Nov 2020 13:23:12 +0900
Subject: [PATCH 290/358] coq: remove an unnecessary make argument
Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
srcpkgs/coq/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index 01a7829b50f..469975f5119 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -22,7 +22,7 @@ do_configure() {
}
do_build() {
- make PR_O=
+ make
}
do_install() {
From 0ea8bc3e4033e1846b1f74f13f861c8dce92f754 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Thu, 19 Nov 2020 13:23:31 +0900
Subject: [PATCH 291/358] ocaml-num: fix xlint errors and license type
Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
srcpkgs/ocaml-num/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index 1a9282ac2e5..736c1361b3d 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -2,22 +2,23 @@
pkgname=ocaml-num
version=1.4
revision=1
+wrksrc="num-${version}"
build_style=gnu-makefile
-makedepends="ocaml ocaml-findlib"
make_install_target="findlib-install"
+makedepends="ocaml ocaml-findlib"
short_desc="OCaml legacy Num library for arbitrary-precision integers"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="LGPL-2.1"
+license="custom: LGPL-2.1-only with OCaml-LGPL-linking-exception"
homepage="https://github.com/ocaml/num"
distfiles="https://github.com/ocaml/num/archive/v${version}.tar.gz"
checksum=015088b68e717b04c07997920e33c53219711dfaf36d1196d02313f48ea00f24
-wrksrc="num-${version}"
nocross=yes
pre_install() {
export OCAMLFIND_DESTDIR=${DESTDIR}/usr/lib/ocaml
vmkdir /usr/lib/ocaml/stublibs
}
+
post_install() {
vlicense LICENSE
}
From 6cc31d64cc8e8a4fa095e76880dd73bfa362c63d Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Sat, 14 Nov 2020 19:02:38 -0600
Subject: [PATCH 292/358] teamspeak3: update to 3.5.5.
---
srcpkgs/teamspeak3/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/teamspeak3/template b/srcpkgs/teamspeak3/template
index a86d62c1ef1..f24ae7ccfec 100644
--- a/srcpkgs/teamspeak3/template
+++ b/srcpkgs/teamspeak3/template
@@ -1,6 +1,6 @@
# Template file for 'teamspeak3'
pkgname=teamspeak3
-version=3.5.3
+version=3.5.5
revision=1
archs="i686 x86_64"
wrksrc=teamspeak3
@@ -21,11 +21,11 @@ noverifyrdeps=yes
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
_pkg="TeamSpeak3-Client-linux_amd64-${version}"
distfiles="https://files.teamspeak-services.com/releases/client/${version}/${_pkg}.run"
- checksum=ca9cdb5409042c86f2981dd32e046b7f8de4aab6a8333edc7e1fb83eb3d8e93a
+ checksum=53626d9b1f3614f165b0a0469e211e13e5d7f885bb4564a8387ea4184bb1c98d
elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
_pkg="TeamSpeak3-Client-linux_x86-${version}"
distfiles="https://files.teamspeak-services.com/releases/client/${version}/${_pkg}.run"
- checksum=86a6513d36b9d454171278b03229a290f3548343a604f2fdf31db17c6584275a
+ checksum=875b936da806477af88d837db6960ac353a9c3596280a2f1399569f2b1122c3b
else
broken="No known upstream client for this architecture"
fi
From 7036fa577ec52ab66ca6db7c460aa7a19bd91893 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 13:50:22 +0200
Subject: [PATCH 293/358] ktuberling: update to 20.08.3.
---
srcpkgs/ktuberling/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 2b63ca9f9d0..12421ca27c5 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
# Template file for 'ktuberling'
pkgname=ktuberling
-version=20.08.1
+version=20.08.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=62d3d8db7b1db7f9d58df44acf61342ce42fb081038fc48f8f6e45d9167ceaa6
+checksum=bfe6092dc7238a55fb733f2c212cad31738dfb4e1661778e2a06176e6cb5de60
From bdace02a9eb295128f7fd5ab04a321df06206c1f Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Thu, 5 Nov 2020 10:28:54 +0000
Subject: [PATCH 294/358] surf: add "xprop" runtime dependency
Without `xprop` visiting sites via Ctrl-g fails.
---
srcpkgs/surf/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/surf/template b/srcpkgs/surf/template
index 9470efecbbf..b4937c4894f 100644
--- a/srcpkgs/surf/template
+++ b/srcpkgs/surf/template
@@ -1,10 +1,11 @@
# Template file for 'surf'
pkgname=surf
version=2.0
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="webkit2gtk-devel"
+depends="xprop"
short_desc="Simple web browser based on WebKit/GTK+"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From b060cc6530da6d16fe431bc1279d2fc24c73bf9b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 21 Nov 2020 18:38:32 +0400
Subject: [PATCH 295/358] libksba: update to 1.5.0.
---
srcpkgs/libksba/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index 4848f837d62..61037bbd4aa 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -1,6 +1,6 @@
# Template file for 'libksba'
pkgname=libksba
-version=1.4.0
+version=1.5.0
revision=1
build_style=gnu-configure
makedepends="libgpg-error-devel"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-or-later,LGPL-3.0-or-later"
homepage="https://www.gnupg.org/related_software/libksba/index.html"
distfiles="https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=bfe6a8e91ff0f54d8a329514db406667000cb207238eded49b599761bfca41b6
+checksum=ae4af129216b2d7fdea0b5bf2a788cd458a79c983bb09a43f4d525cc87aba0ba
libksba-devel_package() {
depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"
@@ -17,6 +17,7 @@ libksba-devel_package() {
pkg_install() {
vmove usr/bin/ksba-config
vmove usr/include
+ vmove usr/lib/pkgconfig
vmove usr/share/aclocal
vmove "usr/lib/*.so"
}
From ace6e3459e0b7f26d4212ade821d0991067f411e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 20 Nov 2020 22:26:48 +0100
Subject: [PATCH 296/358] mit-krb5: update to 1.18.3.
---
srcpkgs/mit-krb5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 89168f65093..004e0e02dbe 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,7 +2,7 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.2
+version=1.18.3
revision=1
wrksrc="krb5-${version}"
build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=c6e4c9ec1a98141c3f5d66ddf1a135549050c9fab4e9a4620ee9b22085873ae0
+checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From 9740ffae52d5285844fa32d810020ae83830fbd7 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 20 Nov 2020 22:26:13 +0100
Subject: [PATCH 297/358] nnn: update to 3.5.
---
srcpkgs/nnn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index a340ccd3d75..ba12cad5ee5 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,6 +1,6 @@
# Template file for 'nnn'
pkgname=nnn
-version=3.4
+version=3.5
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
homepage="https://github.com/jarun/nnn"
changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=7803ae6e974aeb4008507d9d1afbcca8d084a435f36ff636b459ca50414930a1
+checksum=e636d4035499a112a0ad33f1557838132ed2e39d8857c5b219714fe9f64681f3
post_install() {
vinstall misc/auto-completion/bash/nnn-completion.bash 644 \
From 65de01f49d64bf58569ebfb5429cb3ac13451777 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 20 Nov 2020 16:44:53 +0100
Subject: [PATCH 298/358] chroma: update to 0.8.2.
---
srcpkgs/chroma/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index 88642c709bf..8215a0ac027 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,6 +1,6 @@
# Template file for 'chroma'
pkgname=chroma
-version=0.8.1
+version=0.8.2
revision=1
build_style=go
go_import_path="github.com/alecthomas/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://github.com/alecthomas/chroma"
distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
-checksum=8d2981e4d0f223f1ab6e5308940308ca9d8bf6d06660a19a2345cfe133f9e17e
+checksum=b7b9bd2ff49a18127dd00cee0d8e1d262b861b0641f711cbf9c615431f2b9499
do_check() {
go test -v
From 644454ed2907e941a8952c0043043d7e28f42e2f Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Fri, 20 Nov 2020 20:05:53 +0600
Subject: [PATCH 299/358] Komikku: update to 0.23.0.
---
srcpkgs/Komikku/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index c2be0f5173f..a0f5e00ec7d 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=0.22.1
+version=0.23.0
revision=1
wrksrc=Komikku-v${version}
build_style=meson
@@ -15,4 +15,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=c09726b0bf7f51412e98b193389d8de9554ec807916c99c170cda3b9e362fc6c
+checksum=a37d91a23ae6ddbff0784557d74b0c502b31c3504b673f248456786502c7ab4f
From e3314910a54f771e669fc87a77c4792f20b68d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 20 Nov 2020 16:23:29 +0100
Subject: [PATCH 300/358] bombadillo: update to 2.3.3.
---
srcpkgs/bombadillo/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 721fae09f54..0214af5131d 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,6 +1,6 @@
# Template file for 'bombadillo'
pkgname=bombadillo
-version=2.3.1
+version=2.3.3
revision=1
wrksrc=${pkgname}
build_style=go
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://bombadillo.colorfield.space/"
distfiles="https://tildegit.org/sloum/${pkgname}/archive/${version}.tar.gz"
-checksum=e8076493e924bd5860d3e17884b0675ea514eea75e7b4e96da1c79ab9805731f
+checksum=2d4ec15cac6d3324f13a4039cca86fecf3141503f556a6fa48bdbafb86325f1c
post_install() {
vman bombadillo.1
From 6ad6fff3ef179de165dbc4cdf12b3d154fa49f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 20 Nov 2020 16:27:25 +0100
Subject: [PATCH 301/358] nudoku: update to 2.1.0.
---
srcpkgs/nudoku/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nudoku/template b/srcpkgs/nudoku/template
index ab21861d5a6..7c4eea77c29 100644
--- a/srcpkgs/nudoku/template
+++ b/srcpkgs/nudoku/template
@@ -1,6 +1,6 @@
# Template file for 'nudoku'
pkgname=nudoku
-version=2.0.0
+version=2.1.0
revision=1
build_style=gnu-configure
hostmakedepends="automake pkg-config tar xz gettext gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/jubalh/nudoku"
distfiles="https://github.com/jubalh/${pkgname}/archive/${version}.tar.gz"
-checksum=44d3ec1ff34a010910ac7a92f6d84e8a7a4678a966999b7be27d224609ae54e1
+checksum=eeff7f3adea5bfe7b88bf7683d68e9a597aabd1442d1621f21760c746400b924
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" --disable-nls"
From a0dc07fa22c3b58b25d232d4fe2434a9659bcacd Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 20 Nov 2020 22:23:59 +0100
Subject: [PATCH 302/358] verilator: update to 4.104.
---
srcpkgs/verilator/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/verilator/template b/srcpkgs/verilator/template
index 74b448a5519..dc61d2c8326 100644
--- a/srcpkgs/verilator/template
+++ b/srcpkgs/verilator/template
@@ -1,6 +1,6 @@
# Template file for 'verilator'
pkgname=verilator
-version=4.102
+version=4.104
revision=1
build_style=gnu-configure
hostmakedepends="autoconf flex"
@@ -10,7 +10,7 @@ maintainer="Sasha Krassovsky <krassovskysasha@gmail.com>"
license="LGPL-3.0-only"
homepage="https://veripool.org/wiki/verilator"
distfiles="https://github.com/verilator/verilator/archive/v${version}.tar.gz"
-checksum="4e4f4aff00af9a15a61c94b67ed070cd6312ddcc0f0d340a6df2199480064cef"
+checksum=6d42fa468234461e4a0c3154d5602cdded7b22d57f14be92c27a65d418a4a010
pre_configure() {
autoconf
From 326cf6c479f563181470e3f25cf48c927ef51b04 Mon Sep 17 00:00:00 2001
From: Ronald Leppink <ronaldleppink@gmail.com>
Date: Sat, 21 Nov 2020 12:05:41 +0100
Subject: [PATCH 303/358] telegram-desktop: update to 2.4.7.
Also update license
---
.../telegram-desktop/patches/0001-musl.patch | 50 ++++++++++---------
srcpkgs/telegram-desktop/template | 6 +--
2 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/srcpkgs/telegram-desktop/patches/0001-musl.patch b/srcpkgs/telegram-desktop/patches/0001-musl.patch
index 5746a911ab9..35b7c90b955 100644
--- a/srcpkgs/telegram-desktop/patches/0001-musl.patch
+++ b/srcpkgs/telegram-desktop/patches/0001-musl.patch
@@ -1,48 +1,50 @@
---- Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-06-03 09:28:30.000000000 +0200
-+++ - 2020-06-08 00:40:30.503197310 +0200
-@@ -13,7 +13,6 @@
- #include <QtCore/QVersionNumber>
+--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-11-21 11:09:51.647955733 +0100
++++ - 2020-11-21 11:09:50.935306092 +0100
+@@ -12,11 +12,6 @@
#include <QtCore/QDate>
#include <QtGui/QGuiApplication>
--#include <gnu/libc-version.h>
+-// this file is used on both Linux & BSD
+-#ifdef Q_OS_LINUX
+-#include <gnu/libc-version.h>
+-#endif // Q_OS_LINUX
+-
namespace Platform {
namespace {
-@@ -84,8 +74,7 @@
- return "Linux "
- + (list.isEmpty() ? QString() : list[0] + ' ')
- + (IsWayland() ? "Wayland " : "X11 ")
-- + "glibc "
-- + GetGlibCVersion();
-+ + "void ";
- }
- QString SystemCountry() {
-@@ -103,11 +92,7 @@
- QDate WhenSystemBecomesOutdated() {
+@@ -95,11 +90,7 @@
+
if (IsLinux32Bit()) {
return QDate(2020, 9, 1);
-- } else if (const auto version = GetGlibCVersion(); !version.isEmpty()) {
-- if (QVersionNumber::fromString(version) < QVersionNumber(2, 23)) {
+- } else if (libcName == qstr("glibc") && !libcVersion.isEmpty()) {
+- if (QVersionNumber::fromString(libcVersion) < QVersionNumber(2, 23)) {
- return QDate(2020, 9, 1); // Older than Ubuntu 16.04.
- }
- }
+ }
+
return QDate();
}
+@@ -123,22 +114,10 @@
+ }
-@@ -129,14 +114,6 @@
- }
+ QString GetLibcName() {
+-#ifdef Q_OS_LINUX
+- return "glibc";
+-#endif // Q_OS_LINUX
+-
+ return QString();
}
--QString GetGlibCVersion() {
+ QString GetLibcVersion() {
+-#ifdef Q_OS_LINUX
- static const auto result = [&] {
- const auto version = QString::fromLatin1(gnu_get_libc_version());
- return QVersionNumber::fromString(version).isNull() ? QString() : version;
- }();
- return result;
--}
+-#endif // Q_OS_LINUX
-
- bool IsWayland() {
- return QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive);
+ return QString();
}
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index cd685fdb7e3..dbadaded1fb 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
-version=2.4.3
+version=2.4.7
revision=1
wrksrc="tdesktop-${version}-full"
build_style=cmake
@@ -21,11 +21,11 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
depends="qt5-imageformats qt5-core>=5.15.1<5.15.2"
short_desc="Telegram Desktop messaging app"
maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later WITH OpenSSL"
+license="GPL-3.0-or-later, OpenSSL"
homepage="https://desktop.telegram.org/"
changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=56de48ea5332b3e113423e286f42a7b06e3059cadfed862c3164384ebebd4895
+checksum=7b13df53be5d6b58d07d730c9429e415be2fea7f7be37bcaa80a505152125bc8
build_options="spellcheck"
build_options_default="spellcheck"
From b18ad4edaf4dd3c0218182c5d437903a3b12c846 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 6 Nov 2020 11:40:22 +0100
Subject: [PATCH 304/358] vscode: update to 1.51.1. [ci skip]
---
srcpkgs/vscode/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 96a0c349229..8c72a514d5b 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,9 +1,9 @@
# Template file for 'vscode'
pkgname=vscode
-version=1.50.1
+version=1.51.1
revision=1
_electronver=9.3.1
-hostmakedepends="pkg-config python nodejs-lts-10 yarn tar git"
+hostmakedepends="pkg-config python nodejs yarn tar git"
makedepends="libxkbfile-devel libsecret-devel electron9"
depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron9"
short_desc="Microsoft Code for Linux"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="MIT"
homepage="https://code.visualstudio.com/"
distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7d874637055e2425fe981f387165b7c7949db0821b1135f9cd7ccd5c70903af7
+checksum=3a7127983fac7c8e44b5b26b026341b8fd91c65ff34a4664e65ae43ae358d31b
patch_args="-Np1"
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
From eca216447237a9448e5cef47263a05f5daf88752 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Nov 2020 11:34:58 +0100
Subject: [PATCH 305/358] libimagequant: update to 2.13.1.
---
srcpkgs/libimagequant/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libimagequant/template b/srcpkgs/libimagequant/template
index 871191c6ecd..e6fe4f23ca9 100644
--- a/srcpkgs/libimagequant/template
+++ b/srcpkgs/libimagequant/template
@@ -1,6 +1,6 @@
# Template file for 'libimagequant'
pkgname=libimagequant
-version=2.13.0
+version=2.13.1
revision=1
build_style=configure
configure_args="--with-openmp"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://pngquant.org/lib/"
distfiles="https://github.com/ImageOptim/libimagequant/archive/${version}.tar.gz"
-checksum=1dcd874f97758472d5282ea1241f50959a6e643b8b5ad07dad100b7a85633efd
+checksum=1f46deec3fa280335cf7f0be3ede6006bb420ba8159a03d1f6938e8d283d03ae
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --enable-sse";;
From 4c62296db05b2e86658723e67347ff7957eaeb5f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Nov 2020 11:35:12 +0100
Subject: [PATCH 306/358] pngquant: update to 2.13.1.
---
srcpkgs/pngquant/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template
index 669eab71859..382eeecf7a9 100644
--- a/srcpkgs/pngquant/template
+++ b/srcpkgs/pngquant/template
@@ -1,6 +1,6 @@
# Template file for 'pngquant'
pkgname=pngquant
-version=2.13.0
+version=2.13.1
revision=1
build_style=gnu-configure
configure_args="--with-openmp"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://pngquant.org/"
distfiles="https://github.com/pornel/${pkgname}/archive/${version}.tar.gz"
-checksum=aebf96914dcce978f23da5ce3542f4ef30e635e24e386f2e5673a3d7215c646a
+checksum=2d462ca5739ac0afe5a6851914a48ff9d06d4fbd3c4883e8308de5dcc6d444bc
make_check_target=test
case "$XBPS_TARGET_MACHINE" in
From 69d367870d3a2f928d6659b291f3037c90487aba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Nov 2020 11:36:25 +0100
Subject: [PATCH 307/358] parallel: update to 20201122.
---
srcpkgs/parallel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index e9b4ae98749..0b4348ed34f 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
# Template file for 'parallel'
pkgname=parallel
-version=20201022
+version=20201122
revision=1
build_style=gnu-configure
depends="perl"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/parallel/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=35fe29864af62b5331affb84d8be683d52a7bf5fd3532fe0b6a4207a481af061
+checksum=4da0bf42c466493b44dcbd8750e7bf99c31da4c701e8be272276c16ec4caff30
pre_configure() {
# no html and pdf doc
From f207e1a1b928eaef7fe4f59f123f510403521fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 23 Nov 2020 11:38:58 +0100
Subject: [PATCH 308/358] ccache: update to 4.1
---
...uild-and-install-man-page-by-default.patch | 32 -------------------
srcpkgs/ccache/template | 13 ++------
2 files changed, 3 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch
diff --git a/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch b/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch
deleted file mode 100644
index 1a1456c86d9..00000000000
--- a/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-upstream: yes
-
-From 294ff2face26448afa68e3ef7b68bf4898d6dc77 Mon Sep 17 00:00:00 2001
-From: Erik Flodin <erik@ejohansson.se>
-Date: Fri, 30 Oct 2020 10:23:08 +0100
-Subject: [PATCH] Build and install man page by default (#705)
-
-Fixes #684.
----
- doc/CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index fb0f316..b5c9f24 100644
---- doc/CMakeLists.txt
-+++ doc/CMakeLists.txt
-@@ -58,7 +58,11 @@ else()
- COMMAND ${A2X_EXE} --doctype manpage --format manpage MANUAL.xml
- MAIN_DEPENDENCY MANUAL.xml
- )
-- add_custom_target(doc-man-page DEPENDS ccache.1)
-+ add_custom_target(doc-man-page ALL DEPENDS ccache.1)
-+ install(
-+ FILES "${CMAKE_CURRENT_BINARY_DIR}/ccache.1"
-+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-+ )
- set(doc_files "${doc_files}" ccache.1)
- endif()
-
---
-2.29.2
-
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 7cf3ca186b7..d745cb36cc8 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,7 +1,7 @@
# Template file for 'ccache'
pkgname=ccache
-version=4.0
-revision=2
+version=4.1
+revision=1
bootstrap=yes
build_style=cmake
configure_args="-DENABLE_TESTING=OFF"
@@ -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=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+checksum=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99
if [ -z "$CHROOT_READY" ]; then
hostmakedepends="cmake-bootstrap"
@@ -26,15 +26,8 @@ fi
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
- configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
fi
-post_build() {
- if [ "$CHROOT_READY" ]; then
- mv build/doc/Ccache.1 build/doc/ccache.1
- fi
-}
-
post_install() {
vmkdir usr/lib/ccache/bin
# clang
From e560a9b4f92dd368d2275ec5edefc9bee94da0ec 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, 23 Nov 2020 17:54:17 +0700
Subject: [PATCH 309/358] numix-themes: build with sassc
- fix ftbfs on i686
- remove noarch
---
srcpkgs/numix-themes/patches/sassc.patch | 57 ++++++++++++++++++++++++
srcpkgs/numix-themes/template | 21 +++------
2 files changed, 64 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/numix-themes/patches/sassc.patch
diff --git a/srcpkgs/numix-themes/patches/sassc.patch b/srcpkgs/numix-themes/patches/sassc.patch
new file mode 100644
index 00000000000..9546e272de4
--- /dev/null
+++ b/srcpkgs/numix-themes/patches/sassc.patch
@@ -0,0 +1,57 @@
+From b950d9f66cf6f901729025c5e63aa02b4d209d41 Mon Sep 17 00:00:00 2001
+From: KTB <ktb83@users.noreply.github.com>
+Date: Fri, 15 Nov 2019 08:13:13 -0500
+Subject: [PATCH] Updates Makefile to replace Ruby Sass with SassC
+
+This commit replaces the use of the Ruby Sass scss command with SassC's sassc command. Due to the more limited functionality of sassc, output directories must be created prior to running the command and only one file may be processed at a time unlike the many-to-many mode functionality of the scss command.
+---
+ Makefile | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d2735a91..c580a2a7 100755
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-SASS=scss
+-SASSFLAGS=--sourcemap=none
++SASS=sassc
++SASSFLAGS=-M -t expanded
+ GLIB_COMPILE_RESOURCES=glib-compile-resources
+ RES_DIR=src/gtk-3.0
+ SCSS_DIR=$(RES_DIR)/scss
+@@ -14,8 +14,12 @@ UTILS=scripts/utils.sh
+ all: clean gresource
+
+ css:
+- $(SASS) --update $(SASSFLAGS) $(SCSS_DIR):$(DIST_DIR)
+- $(SASS) --update $(SASSFLAGS) $(SCSS_DIR320):$(DIST_DIR320)
++ mkdir $(DIST_DIR)
++ $(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk.scss $(DIST_DIR)/gtk.css
++ $(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk-dark.scss $(DIST_DIR)/gtk-dark.css
++ mkdir $(DIST_DIR320)
++ $(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk.scss $(DIST_DIR320)/gtk.css
++ $(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk-dark.scss $(DIST_DIR320)/gtk-dark.css
+
+ gresource: css
+ $(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR) $(RES_DIR)/gtk.gresource.xml
+From 6ba019fae4b8c90ed721dfe2dad279752f454968 Mon Sep 17 00:00:00 2001
+From: KTB <ktb83@users.noreply.github.com>
+Date: Fri, 15 Nov 2019 08:19:32 -0500
+Subject: [PATCH] Makes import directive relative in _gnome-terminal.scss
+
+This commit changes the "widgets/button" import directive to be relative in the gtk-3.20 _gnome-terminal.scss file which is necessary when using SassC.
+---
+ src/gtk-3.20/scss/apps/_gnome-terminal.scss | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gtk-3.20/scss/apps/_gnome-terminal.scss b/src/gtk-3.20/scss/apps/_gnome-terminal.scss
+index fd3af1c5..704faf5d 100644
+--- a/src/gtk-3.20/scss/apps/_gnome-terminal.scss
++++ b/src/gtk-3.20/scss/apps/_gnome-terminal.scss
+@@ -1,4 +1,4 @@
+-@import "widgets/button";
++@import "../widgets/button";
+
+ /**********************
+ ! Genome Terminal *
diff --git a/srcpkgs/numix-themes/template b/srcpkgs/numix-themes/template
index f993b7949a4..0e5b7b436c7 100644
--- a/srcpkgs/numix-themes/template
+++ b/srcpkgs/numix-themes/template
@@ -1,22 +1,15 @@
+# Template file for 'numix-themes'
pkgname=numix-themes
version=2.6.7
-revision=1
+revision=2
wrksrc="numix-gtk-theme-${version}"
-archs=noarch
build_style=gnu-makefile
-short_desc="A modern flat theme with a combination of light and dark elements"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-3"
+hostmakedepends="glib-devel gdk-pixbuf sassc"
depends="gtk+3 gtk-engine-murrine"
-hostmakedepends="glib-devel gdk-pixbuf-devel ruby-devel"
+short_desc="Modern flat theme with a combination of light and dark elements"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-3.0-or-later"
homepage="https://github.com/numixproject/numix-gtk-theme"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=2b997ad3eee0b802d0dd49dd772127fd3c337cca32d8863efd4897928e38879a
-
-pre_build() {
- gem install sass
-}
-
-post_install() {
- vlicense LICENSE
-}
+patch_args=-Np1
From 494d6b6e22e30e6249e1b9d698edc53d5dbb67f9 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, 22 Nov 2020 09:25:09 +0700
Subject: [PATCH 310/358] kadu: remove noarch
---
srcpkgs/kadu-data | 1 -
srcpkgs/kadu/template | 21 +++------------------
2 files changed, 3 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/kadu-data
diff --git a/srcpkgs/kadu-data b/srcpkgs/kadu-data
deleted file mode 120000
index c6b22664110..00000000000
--- a/srcpkgs/kadu-data
+++ /dev/null
@@ -1 +0,0 @@
-kadu
\ No newline at end of file
diff --git a/srcpkgs/kadu/template b/srcpkgs/kadu/template
index da8c8c086ff..8587198ae71 100644
--- a/srcpkgs/kadu/template
+++ b/srcpkgs/kadu/template
@@ -1,7 +1,7 @@
# Template file for 'kadu'
pkgname=kadu
version=4.3
-revision=5
+revision=6
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
-DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -19,7 +19,7 @@ makedepends="libao-devel libsndfile-devel libarchive-devel
qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
libmpdclient-devel qca-qt5-devel qxmpp-devel phonon-qt5-devel
libX11-devel libXfixes-devel libXScrnSaver-devel"
-depends="${pkgname}-data-${version}_${revision} hicolor-icon-theme qca-qt5-ossl
+depends="hicolor-icon-theme qca-qt5-ossl
$(vopt_if mysql qt5-plugin-mysql) $(vopt_if odbc qt5-plugin-odbc)
$(vopt_if pgsql qt5-plugin-pgsql) $(vopt_if sqlite qt5-plugin-sqlite)
$(vopt_if tds qt5-plugin-tds)"
@@ -29,6 +29,7 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://sourceforge.net/projects/kadu/"
distfiles="${SOURCEFORGE_SITE}/kadu/${version}/kadu-${version}.tar.bz2"
checksum=ad5d1cbb908c3cd07f2955d343d44b993cd5639427a48a2912441955cfd2bd6e
+replaces="kadu-data>=0"
build_options="mysql odbc pgsql sqlite tds"
build_options_default="sqlite"
@@ -53,22 +54,6 @@ pre_configure() {
-e "s;word_fix$;;"
}
-kadu-data_package() {
- short_desc+=" - data files"
- archs=noarch
- pkg_install() {
- vmove usr/share/icons
- vmove "usr/share/kadu/configuration/*.ui"
- vmove usr/share/kadu/themes
- vmove usr/share/kadu/scripts
- vmove usr/share/kadu/syntax
- vmove "usr/share/kadu/plugins/*.desc"
- vmove "usr/share/kadu/plugins/configuration/*.ui"
- vmove usr/share/kadu/translations
- vmove usr/share/kadu/plugins/data
- vmove usr/share/kadu/plugins/translations
- }
-}
kadu-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
From 00e00cd61008b85b61b12166a75d7b36fa3b3519 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, 22 Nov 2020 09:25:09 +0700
Subject: [PATCH 311/358] kobodeluxe: remove noarch
---
srcpkgs/kobodeluxe-data | 1 -
srcpkgs/kobodeluxe/template | 14 +++-----------
2 files changed, 3 insertions(+), 12 deletions(-)
delete mode 120000 srcpkgs/kobodeluxe-data
diff --git a/srcpkgs/kobodeluxe-data b/srcpkgs/kobodeluxe-data
deleted file mode 120000
index a6b8725b11b..00000000000
--- a/srcpkgs/kobodeluxe-data
+++ /dev/null
@@ -1 +0,0 @@
-kobodeluxe
\ No newline at end of file
diff --git a/srcpkgs/kobodeluxe/template b/srcpkgs/kobodeluxe/template
index 60539b09390..3de0311b8e5 100644
--- a/srcpkgs/kobodeluxe/template
+++ b/srcpkgs/kobodeluxe/template
@@ -1,19 +1,19 @@
# Template file for 'kobodeluxe'
pkgname=kobodeluxe
version=0.5.1
-revision=2
+revision=3
wrksrc="KoboDeluxe-${version}"
build_style=gnu-configure
configure_args="--sharedstatedir=/var/games"
hostmakedepends="pkg-config"
makedepends="SDL_image-devel"
-depends="${pkgname}-data"
short_desc="Space shooter in 2D"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://olofson.net/kobodl"
distfiles="${homepage}/download/KoboDeluxe-${version}.tar.bz2"
checksum=0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c
+replaces="kobodeluxe-data>=0"
post_extract() {
bsdtar xf icons.tar.gz
@@ -26,11 +26,3 @@ post_install() {
done
vinstall icons/KDE/icons/32x32/kobodl.png 644 usr/share/pixmaps
}
-
-kobodeluxe-data_package() {
- short_desc+=" - data files"
- archs=noarch
- pkg_install() {
- vmove usr/share/kobo-deluxe
- }
-}
From 64d98a87aea6ec6d3130b470f3a64a7bbaf9f33d 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, 22 Nov 2020 09:25:10 +0700
Subject: [PATCH 312/358] kpcli: remove noarch
---
srcpkgs/kpcli/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/kpcli/template b/srcpkgs/kpcli/template
index 3201920ce88..193c227462e 100644
--- a/srcpkgs/kpcli/template
+++ b/srcpkgs/kpcli/template
@@ -1,8 +1,7 @@
# Template file for 'kpcli'
pkgname=kpcli
version=3.3
-revision=1
-archs=noarch
+revision=2
build_style=fetch
depends="perl perl-Crypt-Rijndael perl-Sort-Naturally perl-Term-ReadKey perl-Term-ShellUI perl-File-KeePass perl-Clone perl-Term-ReadLine-Gnu perl-XML-Parser"
short_desc="KeePass Command Line Interface"
From 830887b346cbfbe0730ce1fff2ce10ee80875b7e 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, 22 Nov 2020 09:25:10 +0700
Subject: [PATCH 313/358] kupfer: remove noarch
---
srcpkgs/kupfer/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/kupfer/template b/srcpkgs/kupfer/template
index 03e80e9fdc9..f66ed5c37ee 100644
--- a/srcpkgs/kupfer/template
+++ b/srcpkgs/kupfer/template
@@ -1,14 +1,13 @@
# Template file for 'kupfer'
pkgname=kupfer
version=319
-revision=2
-archs=noarch
-build_style=waf3
+revision=3
wrksrc="${pkgname}-v${version}"
-python_version=3
+build_style=waf3
pycompile_dirs="usr/share/kupfer/kupfer"
configure_args="--no-update-mime --no-update-icon-cache"
-hostmakedepends="intltool python3-docutils"
+hostmakedepends="intltool python3-docutils python3-gobject python3-xdg
+ python3-dbus gtk+3"
makedepends="libkeybinder3 libwnck python3-gobject python3-xdg python3-dbus"
depends="$makedepends"
short_desc="Interface for quick and convenient access to applications"
@@ -17,3 +16,4 @@ license="GPL-3.0-or-later"
homepage="https://kupferlauncher.github.io/"
distfiles="https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz"
checksum=22357233984a6588a9f9743002363af38ea63b5c2684af487693a13c42973d31
+python_version=3
From 7f1cdb2c5e099149067955a954557492a95df9fd 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, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 314/358] neofetch: remove noarch
---
srcpkgs/neofetch/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/neofetch/template b/srcpkgs/neofetch/template
index 60862481a28..1529e9ceef6 100644
--- a/srcpkgs/neofetch/template
+++ b/srcpkgs/neofetch/template
@@ -1,8 +1,7 @@
# Template file for 'neofetch'
pkgname=neofetch
version=7.1.0
-revision=1
-archs=noarch
+revision=2
build_style=gnu-makefile
depends="bash"
short_desc="Simple system information script"
From 22098091291de26801c09e7784beee4f1c8c6bde 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, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 315/358] netbsd-wtf: remove noarch
---
srcpkgs/netbsd-wtf/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template
index 87708e08847..be1b0c28c5c 100644
--- a/srcpkgs/netbsd-wtf/template
+++ b/srcpkgs/netbsd-wtf/template
@@ -1,13 +1,12 @@
# Template file for 'netbsd-wtf'
pkgname=netbsd-wtf
version=20180621
-revision=2
+revision=3
_commit=b1e5be48e340146f63b174cc14fef892a783168b
-archs=noarch
build_style=gnu-makefile
-short_desc="The NetBSD's wtf(6) utility"
+short_desc="NetBSD's wtf(6) utility"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
+license="Public Domain"
homepage="https://www.netbsd.org"
distfiles="https://github.com/void-linux/netbsd-wtf/archive/$_commit.tar.gz"
checksum=5da7c6c286673baa8cc0ce2840c16895eef3e884e038a6cb7dedabdd15753de7
From 2b0855e8f19011c918dc5067d1af42a15f2546a5 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, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 316/358] netdata: remove noarch
---
srcpkgs/netdata/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index 205d7985614..f6386f3e519 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,7 +1,7 @@
# Template file for 'netdata'
pkgname=netdata
version=1.24.0
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=gnu-configure
configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
@@ -53,7 +53,6 @@ post_install() {
netdata-plugins-nodejs_package() {
short_desc+=" - NodeJS Plugins"
depends="${sourcepkg}>=${version}_${revision} virtual?nodejs-runtime"
- archs=noarch
pkg_install() {
vmove usr/libexec/netdata/plugins.d/node.d.plugin
vmove usr/libexec/netdata/node.d
@@ -63,7 +62,6 @@ netdata-plugins-nodejs_package() {
netdata-plugins-python_package() {
short_desc+=" - Python Plugins"
depends="${sourcepkg}>=${version}_${revision} python3"
- archs=noarch
pkg_install() {
vmove usr/libexec/netdata/plugins.d/python.d.plugin
vmove usr/libexec/netdata/python.d
From 3e09feec8a6ffb101dc1a9cfe8c95071c716a496 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, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 317/358] netsurf-buildsystem: remove noarch
---
srcpkgs/netsurf-buildsystem/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/netsurf-buildsystem/template b/srcpkgs/netsurf-buildsystem/template
index b65615497e2..9bb7863b9c6 100644
--- a/srcpkgs/netsurf-buildsystem/template
+++ b/srcpkgs/netsurf-buildsystem/template
@@ -1,8 +1,7 @@
# Template file for 'netsurf-buildsystem'
pkgname=netsurf-buildsystem
version=1.9
-revision=1
-archs=noarch
+revision=2
wrksrc="${pkgname#netsurf-}-${version}"
short_desc="Netsurf buildsystem"
maintainer="Orphaned <orphan@voidlinux.org>"
From 0c9ba39b8b5f23b86cf1edbd749e0f8cf0809c4b 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, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 318/358] novaboot: remove noarch
---
srcpkgs/novaboot/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/novaboot/template b/srcpkgs/novaboot/template
index f93c1ebe23b..78372f9230f 100644
--- a/srcpkgs/novaboot/template
+++ b/srcpkgs/novaboot/template
@@ -1,8 +1,7 @@
# Template file for 'novaboot'
pkgname=novaboot
version=20191023
-revision=1
-archs=noarch
+revision=2
build_style=gnu-makefile
hostmakedepends="perl"
makedepends="perl"
From 447527ee6fa33b11a6761c684eec7150086b1954 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, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 319/358] ntp: remove noarch
---
srcpkgs/ntp/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index c1cd814ea9d..a2cc0f62441 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
@@ -42,7 +42,6 @@ post_install() {
ntp-perl_package() {
depends="ntp>=$version perl"
- archs=noarch
short_desc+=" - perl scripts"
pkg_install() {
vmove usr/bin/ntp-wait
From 779104c0562821ac74d3dc92a3a8d138c61c8714 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, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 320/358] num-utils: remove noarch
---
srcpkgs/num-utils/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/num-utils/template b/srcpkgs/num-utils/template
index d7b542fa7af..a0103d6e4a6 100644
--- a/srcpkgs/num-utils/template
+++ b/srcpkgs/num-utils/template
@@ -1,16 +1,15 @@
# Template file for 'num-utils'
pkgname=num-utils
version=0.5
-revision=1
+revision=2
hostmakedepends="perl"
depends="perl"
short_desc="Programs for dealing with numbers from the Unix command line"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://suso.suso.org/xulu/Num-utils"
distfiles="http://suso.suso.org/programs/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
checksum=03592760fc7844492163b14ddc9bb4e4d6526e17b468b5317b4a702ea7f6c64e
-archs=noarch
post_extract() {
sed -i 's/\$new_number\^\$1/$new_number**$1/g' numprocess
From e2a284ffcd9ce6ffa5e6daf59add0b63c0db6a1f 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, 22 Nov 2020 09:42:52 +0700
Subject: [PATCH 321/358] sbt: remove noarch
---
srcpkgs/sbt/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index df79423b267..6847c2efefe 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,8 +1,7 @@
# Template file for 'sbt'
pkgname=sbt
version=1.3.10
-revision=1
-archs=noarch
+revision=2
wrksrc="$pkgname"
depends="virtual?java-environment"
short_desc="Interactive build tool for Scala and Java"
From cf3f43d7f73e934a525b8e9b61ddb624325ee9c2 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, 22 Nov 2020 09:42:52 +0700
Subject: [PATCH 322/358] scanmem: remove noarch
---
srcpkgs/scanmem/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/scanmem/template b/srcpkgs/scanmem/template
index b9bbb2f89fc..d694f33d372 100644
--- a/srcpkgs/scanmem/template
+++ b/srcpkgs/scanmem/template
@@ -1,7 +1,7 @@
# Template file for 'scanmem'
pkgname=scanmem
version=0.17
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-static --enable-gui"
hostmakedepends="automake gettext-devel intltool libtool m4 python"
@@ -41,7 +41,6 @@ libscanmem-devel_package() {
gameconqueror_package() {
short_desc="GameConqueror is a GUI front-end for scanmem, providing more features"
depends="polkit gtk+3 python3-gobject lib${sourcepkg}>=${version}_${revision}"
- archs=noarch
python_version=3
pkg_install() {
cd $DESTDIR
From 7c3e86ba8467590954311ba52d9bae0ef0ffb3ee 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 323/358] screenFetch: remove noarch
---
srcpkgs/screenFetch/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/screenFetch/template b/srcpkgs/screenFetch/template
index 4a3d5a9dcaa..a9749569135 100644
--- a/srcpkgs/screenFetch/template
+++ b/srcpkgs/screenFetch/template
@@ -1,8 +1,7 @@
# Template file for 'screenFetch'
pkgname=screenFetch
version=3.9.1
-revision=1
-archs=noarch
+revision=2
depends="bash bc xdpyinfo"
short_desc="Bash screenshot information tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From 666248bf9c2f9705dc4c18fec248843d8d294c73 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 324/358] sendEmail: remove noarch
---
srcpkgs/sendEmail/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/sendEmail/template b/srcpkgs/sendEmail/template
index a60e0941572..be7d5425e0c 100644
--- a/srcpkgs/sendEmail/template
+++ b/srcpkgs/sendEmail/template
@@ -1,8 +1,7 @@
# Template file for 'sendEmail'
pkgname=sendEmail
version=1.56
-revision=1
-archs=noarch
+revision=2
wrksrc="${pkgname}-v${version}"
depends="perl-Net-SSLeay"
short_desc="Lightweight, command line SMTP email client"
From 9929b62b17e98c458f86968ca943f8e472082d6b 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 325/358] shorewall: remove noarch
---
srcpkgs/shorewall/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index 30efdba8869..932c9281c2b 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -1,8 +1,7 @@
# Template file for 'shorewall'
pkgname=shorewall
version=5.2.7
-revision=1
-archs=noarch
+revision=2
create_wrksrc=yes
depends="shorewall-core perl"
short_desc="Iptables-based firewall for Linux systems"
@@ -37,7 +36,6 @@ do_install() {
}
shorewall-core_package() {
- archs=noarch
depends="iptables iproute2"
short_desc+=" - Core Shorewall files"
pkg_install() {
@@ -47,7 +45,6 @@ shorewall-core_package() {
}
shorewall6_package() {
- archs=noarch
depends="shorewall"
conf_files="/etc/$pkgname/*"
short_desc+=" - IPv6 support"
From f6b2eb13bc376a68ccf9e119d309c0e9b29a0ac7 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 326/358] shunit2: remove noarch
---
srcpkgs/shunit2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/shunit2/template b/srcpkgs/shunit2/template
index f909503b0f6..3b90bad7259 100644
--- a/srcpkgs/shunit2/template
+++ b/srcpkgs/shunit2/template
@@ -1,8 +1,7 @@
# Template file for 'shunit2'
pkgname=shunit2
version=2.1.8
-revision=1
-archs=noarch
+revision=2
depends="bash"
checkdepends="zsh ksh"
short_desc="Unit testing framework for Unix shell scripts based on xUnit"
From 503dd1c3c55e1a3c7656f0c84ebc5b5d4fc11f6a 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 327/358] signond: remove noarch
---
srcpkgs/signond/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/signond/template b/srcpkgs/signond/template
index fc1bdebe712..183c3b9481e 100644
--- a/srcpkgs/signond/template
+++ b/srcpkgs/signond/template
@@ -1,7 +1,7 @@
# Template file for 'signond'
pkgname=signond
version=8.60
-revision=2
+revision=3
wrksrc="signond-VERSION_${version}-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe"
build_style=qmake
configure_args="LIBDIR=/usr/lib"
@@ -25,7 +25,6 @@ pre_configure() {
}
signond-doc_package() {
- archs=noarch
short_desc+=" - documentation"
pkg_install() {
vmove usr/share/doc
From b0a4ace9e38087d503296545b90c8aab8fa96579 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, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 328/358] sigrok-firmware-fx2lafw: remove noarch
---
srcpkgs/sigrok-firmware-fx2lafw/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/sigrok-firmware-fx2lafw/template b/srcpkgs/sigrok-firmware-fx2lafw/template
index 5c92bc1c0ac..3f767d70ef4 100644
--- a/srcpkgs/sigrok-firmware-fx2lafw/template
+++ b/srcpkgs/sigrok-firmware-fx2lafw/template
@@ -1,8 +1,7 @@
# Template file for 'sigrok-firmware-fx2lafw'
pkgname=sigrok-firmware-fx2lafw
version=0.1.7
-revision=1
-archs=noarch
+revision=2
wrksrc="${pkgname}-bin-${version}"
short_desc="Sigrok fx2lafw Firmware files"
maintainer="lemmi <lemmi@nerd2nerd.org>"
From 0b698fda84e18c6bf9bfa3a363a4da4e14f0d8fe 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, 22 Nov 2020 09:42:54 +0700
Subject: [PATCH 329/358] snazzer: remove noarch
---
srcpkgs/snazzer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/snazzer/template b/srcpkgs/snazzer/template
index 40828a47362..df1451b6f2f 100644
--- a/srcpkgs/snazzer/template
+++ b/srcpkgs/snazzer/template
@@ -1,8 +1,7 @@
# Template file for 'snazzer'
pkgname=snazzer
version=0.0.3
-revision=1
-archs=noarch
+revision=2
build_style=gnu-makefile
hostmakedepends="perl pod2mdoc"
depends="sudo btrfs-progs"
From 23c4328349e620a313e1c3fefa0dae5d97bf50da 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, 22 Nov 2020 09:42:54 +0700
Subject: [PATCH 330/358] soundconverter: remove noarch
---
srcpkgs/soundconverter/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/soundconverter/template b/srcpkgs/soundconverter/template
index 1bda4743513..9e933929f97 100644
--- a/srcpkgs/soundconverter/template
+++ b/srcpkgs/soundconverter/template
@@ -1,8 +1,7 @@
# Template file for 'soundconverter'
pkgname=soundconverter
version=3.0.2
-revision=1
-archs=noarch
+revision=2
build_style=gnu-configure
pycompile_dirs="/usr/lib/${pkgname}/python/${pkgname}"
hostmakedepends="glib intltool pkg-config python3-gobject"
From d10b49a83dc78222569eea43c4d8b50e50e39f38 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 331/358] speedometer: remove noarch
---
srcpkgs/speedometer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/speedometer/template b/srcpkgs/speedometer/template
index 3c287fcdca7..c0fe822bee9 100644
--- a/srcpkgs/speedometer/template
+++ b/srcpkgs/speedometer/template
@@ -1,8 +1,7 @@
# Template file for 'speedometer'
pkgname=speedometer
version=2.8
-revision=3
-archs=noarch
+revision=4
wrksrc="speedometer-release-${version}"
depends="python-urwid"
short_desc="Monitor network traffic or speed/progress of a file transfer"
From da86bc969a2a3f2ed62c79ecd7edd9bbc690c2e0 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 332/358] spice-protocol: remove noarch
---
srcpkgs/spice-protocol/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/spice-protocol/template b/srcpkgs/spice-protocol/template
index 819c2977712..f94ce7f8d7e 100644
--- a/srcpkgs/spice-protocol/template
+++ b/srcpkgs/spice-protocol/template
@@ -1,8 +1,7 @@
# Template file for 'spice-protocol'
pkgname=spice-protocol
version=0.14.0
-revision=1
-archs=noarch
+revision=2
wrksrc="spice-protocol-v${version}"
build_style=meson
short_desc="SPICE protocol headers"
From b3033df8c64e7ddd06ad76c1801298df1c25e681 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 333/358] starfighter: remove noarch
---
srcpkgs/starfighter-data | 1 -
srcpkgs/starfighter/template | 13 +++----------
2 files changed, 3 insertions(+), 11 deletions(-)
delete mode 120000 srcpkgs/starfighter-data
diff --git a/srcpkgs/starfighter-data b/srcpkgs/starfighter-data
deleted file mode 120000
index 8c24b109c9b..00000000000
--- a/srcpkgs/starfighter-data
+++ /dev/null
@@ -1 +0,0 @@
-starfighter
\ No newline at end of file
diff --git a/srcpkgs/starfighter/template b/srcpkgs/starfighter/template
index 1b357256b2f..0b13c857864 100644
--- a/srcpkgs/starfighter/template
+++ b/srcpkgs/starfighter/template
@@ -1,28 +1,21 @@
# Template file for 'starfighter'
pkgname=starfighter
version=2.0.0.2
-revision=1
+revision=2
_version="${version%.*.*}"
build_style=gnu-configure
configure_args="exec_prefix=/usr"
hostmakedepends="pkg-config automake"
makedepends="SDL2_image-devel SDL2_mixer-devel"
-depends="starfighter-data desktop-file-utils"
+depends="desktop-file-utils"
short_desc="Side-scrolling shoot 'em up space game"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://pr-starfighter.github.io"
distfiles="https://github.com/pr-starfighter/starfighter/archive/v${version}.tar.gz"
checksum=100562f2e12530ff4e360898ec5aace7f2c99806a9cba68d02466e82f8c1ae83
+replaces="starfighter-data>=0"
pre_configure() {
autoreconf -fi
}
-
-starfighter-data_package() {
- short_desc+=" - data files"
- archs=noarch
- pkg_install() {
- vmove usr/share/starfighter
- }
-}
From 5be0e1286719bab3371574501c6b767a955fa300 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 334/358] startup: remove noarch
---
srcpkgs/startup/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/startup/template b/srcpkgs/startup/template
index 4a163d65afc..eeeee53501a 100644
--- a/srcpkgs/startup/template
+++ b/srcpkgs/startup/template
@@ -1,7 +1,7 @@
# Template file for 'startup'
pkgname=startup
version=2.0.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-sysvcompat --disable-dconf-bridge --disable-cgroups"
make_dirs="/var/log/startup 0750 root adm"
@@ -25,7 +25,6 @@ post_install() {
}
startup-tools_package() {
- archs=noarch
depends="${sourcepkg}>=${version}_${revision} python3-dbus python3-gobject"
short_desc+=" - monitoring and analysis tools"
pkg_install() {
From 44f6f3fe5797d7d6e1a762d7226e2cb6a72a5a3d 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 335/358] statnot: remove noarch
---
srcpkgs/statnot/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/statnot/template b/srcpkgs/statnot/template
index e1817d8f43a..a634cb1eb2d 100644
--- a/srcpkgs/statnot/template
+++ b/srcpkgs/statnot/template
@@ -1,8 +1,7 @@
# Template file for 'statnot'
pkgname=statnot
version=0.0.4
-revision=3
-archs=noarch
+revision=4
build_style=gnu-makefile
depends="pygtk python3-dbus xsetroot"
short_desc="Notification system for lightweight window managers"
From 23b2d454256c5e60bde28fc0f65f97b39465f554 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 336/358] stk: remove noarch
---
srcpkgs/stk-data | 1 -
srcpkgs/stk/template | 13 +++----------
2 files changed, 3 insertions(+), 11 deletions(-)
delete mode 120000 srcpkgs/stk-data
diff --git a/srcpkgs/stk-data b/srcpkgs/stk-data
deleted file mode 120000
index e69eabc8478..00000000000
--- a/srcpkgs/stk-data
+++ /dev/null
@@ -1 +0,0 @@
-stk
\ No newline at end of file
diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index 8df159eb8a9..70ff45b42f6 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -1,18 +1,19 @@
# Template file for 'stk'
pkgname=stk
version=4.6.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-alsa --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
hostmakedepends="automake libtool pkg-config"
makedepends="alsa-lib-devel jack-devel"
-depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
+depends="libstk-${version}_${revision}"
short_desc="Synthesis ToolKit in C++"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="custom:MIT-like"
homepage="https://ccrma.stanford.edu/software/stk/"
distfiles="https://github.com/thestk/stk/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=8e0c362dd82421bae8f3e789d238a1c27aeac1a2697d7830eb51abc90fc17281
+replaces="stk-data>=0"
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
@@ -64,14 +65,6 @@ post_install() {
vlicense LICENSE
}
-stk-data_package() {
- short_desc+=" - data files"
- archs=noarch
- pkg_install() {
- vmove usr/share/stk
- }
-}
-
stk-examples_package() {
short_desc+=" - examples"
depends="${sourcepkg}>=${version}_${revision}"
From 9763d391bbd29a0721a93cb67f63acdd042977d3 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, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 337/358] syncplay: remove noarch
---
srcpkgs/syncplay/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/syncplay/template b/srcpkgs/syncplay/template
index 83accc1983a..1c459b94d53 100644
--- a/srcpkgs/syncplay/template
+++ b/srcpkgs/syncplay/template
@@ -1,8 +1,7 @@
# Template file for 'syncplay'
pkgname=syncplay
version=1.6.5
-revision=1
-archs=noarch
+revision=2
build_style=gnu-makefile
pycompile_dirs="usr/lib/syncplay/syncplay"
depends="desktop-file-utils python3-pyside2 python3-Twisted
From 9a71d35b2ad08f43258c01fdff8deec939afe693 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, 22 Nov 2020 09:42:56 +0700
Subject: [PATCH 338/358] syncthing-gtk: remove noarch
---
srcpkgs/syncthing-gtk/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index aaaa57a1c9e..90e9f21cf4a 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -2,8 +2,7 @@
pkgname=syncthing-gtk
reverts="0.14.36_1"
version=0.9.4.4
-revision=2
-archs=noarch
+revision=3
build_style=python2-module
hostmakedepends="python-setuptools"
depends="syncthing python-dateutil libnotify librsvg python-bcrypt
From 3900f9c7e1ce5aa4f4f1fe8f6429d675ef3cc240 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, 23 Nov 2020 19:00:58 +0700
Subject: [PATCH 339/358] Partial revert "stk: remove noarch"
This reverts commit b792c5f78cd9f768810987df2cb16dbb8b64e01f.
Some other packages depends on stk-data.
---
srcpkgs/stk-data | 1 +
srcpkgs/stk/template | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/stk-data
diff --git a/srcpkgs/stk-data b/srcpkgs/stk-data
new file mode 120000
index 00000000000..e69eabc8478
--- /dev/null
+++ b/srcpkgs/stk-data
@@ -0,0 +1 @@
+stk
\ No newline at end of file
diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index 70ff45b42f6..f726e3a5340 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -6,14 +6,13 @@ build_style=gnu-configure
configure_args="--with-alsa --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
hostmakedepends="automake libtool pkg-config"
makedepends="alsa-lib-devel jack-devel"
-depends="libstk-${version}_${revision}"
+depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
short_desc="Synthesis ToolKit in C++"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="custom:MIT-like"
homepage="https://ccrma.stanford.edu/software/stk/"
distfiles="https://github.com/thestk/stk/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=8e0c362dd82421bae8f3e789d238a1c27aeac1a2697d7830eb51abc90fc17281
-replaces="stk-data>=0"
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
@@ -65,6 +64,13 @@ post_install() {
vlicense LICENSE
}
+stk-data_package() {
+ short_desc+=" - data files"
+ pkg_install() {
+ vmove usr/share/stk
+ }
+}
+
stk-examples_package() {
short_desc+=" - examples"
depends="${sourcepkg}>=${version}_${revision}"
From bcbc5c91e18e1fd8af46cd52954994ffa2be7a7e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 22 Nov 2020 15:34:34 +0200
Subject: [PATCH 340/358] notcurses: update to 2.0.7.
---
srcpkgs/notcurses/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index bb2d9419da8..388a1181abf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
# Template file for 'notcurses'
pkgname=notcurses
-version=2.0.4
+version=2.0.7
revision=1
build_style=cmake
configure_args="-DUSE_STATIC=ON"
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=6bb38ca0affc6425cd8e248c5b81aa4281713362c45202a450a89ab751833c98
+checksum=cc87e66f9dc3e9d0e591de70870dec5d8b36e660f18f10adae7f45abb0f0320a
notcurses-devel_package() {
depends="notcurses-${version}_${revision}"
From 6ed97a7c4011e247f39b653e634d41d135cb183f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 22 Nov 2020 15:34:43 +0200
Subject: [PATCH 341/358] growlight: update to 1.2.20.
---
srcpkgs/growlight/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 5ea4a3a42a8..3a45507e11c 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,7 +1,7 @@
# Template file for 'growlight'
pkgname=growlight
-version=1.2.18
-revision=2
+version=1.2.21
+revision=1
build_style=cmake
configure_args="$(vopt_bool zfs USE_LIBZFS)"
hostmakedepends="pkg-config pandoc"
@@ -14,7 +14,11 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://nick-black.com/dankwiki/index.php/Growlight"
distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
-checksum=c6c08556e6838226b81300e177c49d7a382e9eb30cfdb19f99790106e426a032
+checksum=a225266b98a7c438a04d79951b3a58834027fcc6174baa31e315265b2e7b1d30
+
+pre_configure() {
+ vsed -i 's#sbin#bin#' CMakeLists.txt
+}
build_options="zfs"
desc_option_zfs="Build with ZFS Support"
From 9f72ee9dd7ab8e93254956169a3407b14f76e698 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Mon, 23 Nov 2020 11:19:48 +0100
Subject: [PATCH 342/358] gemget: update to 1.7.0
---
srcpkgs/gemget/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index 985c497b821..ae91001d9d5 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,6 +1,6 @@
# Template file for 'gemget'
pkgname=gemget
-version=1.6.0
+version=1.7.0
revision=1
build_style=go
go_import_path="github.com/makeworld-the-better-one/gemget"
@@ -9,7 +9,7 @@ maintainer="Paper <paper@tilde.institute>"
license="MIT"
homepage="https://github.com/makeworld-the-better-one/gemget/"
distfiles="https://github.com/makeworld-the-better-one/gemget/archive/v$version.tar.gz"
-checksum=2a435af153272c53e82508a1e294142c15259224e94294d15f09c8a0c6f10f7b
+checksum=271e89cf4bf76a78c6efffce4b307c24edae4a04147a3ec3aed2bf0289cc4e12
post_install() {
vlicense LICENSE
From a95c17f8e1da4cb05f7f9e978610e4cca528e038 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 23 Nov 2020 14:06:41 +0200
Subject: [PATCH 343/358] FAudio: update to 20.11.
---
srcpkgs/FAudio/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/FAudio/template b/srcpkgs/FAudio/template
index 4605f7a5a00..b60a953b4ca 100644
--- a/srcpkgs/FAudio/template
+++ b/srcpkgs/FAudio/template
@@ -1,18 +1,18 @@
# Template file for 'FAudio'
pkgname=FAudio
-version=20.02
+version=20.11
revision=1
build_style=cmake
-configure_args="-DFFMPEG=ON -DSDL2_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include/SDL2
+configure_args="-DGSTREAMER=ON -DSDL2_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include/SDL2
-DSDL2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
-makedepends="SDL2-devel ffmpeg-devel"
+makedepends="SDL2-devel gstreamer1-devel gst-plugins-base1-devel"
short_desc="Accuracy-focused XAudio reimplementation for open platforms"
maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
license="Zlib"
homepage="https://github.com/FNA-XNA/FAudio"
distfiles="https://github.com/FNA-XNA/FAudio/archive/${version}.tar.gz"
-checksum=103a6d278921ce757e5427133626f60ce4876b30d81186f78af35d9f1ca4ef16
+checksum=551f1573a98082973e8e2f0ef14be8f34299c9813d58387f9edd32142e6f913b
# sdl2 cmake file appears to be broken for cross compilation
CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/SDL2 "
From 8e067ad069866931fea6d12241ea9f488ed57218 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 21:37:04 -0600
Subject: [PATCH 344/358] python3-fuse: update to 1.0.0
---
srcpkgs/python3-fuse/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-fuse/template b/srcpkgs/python3-fuse/template
index 6b39962f4e3..7147b39d7ae 100644
--- a/srcpkgs/python3-fuse/template
+++ b/srcpkgs/python3-fuse/template
@@ -1,7 +1,7 @@
# Template file for 'python3-fuse'
pkgname=python3-fuse
-version=0.3.1
-revision=6
+version=1.0.0
+revision=1
wrksrc=python-fuse-$version
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/libfuse/python-fuse"
distfiles="https://github.com/libfuse/python-fuse/archive/v${version}.tar.gz"
-checksum=243cfab15ee357dbcdac98c2ee5929f6e8c65d2ec9d77597e3732f79ce649eec
+checksum=caa90dd931128407df12b2c090200e49a67b9afb4176211aad03e2a19209a506
From 0f4be588a17f8f38b407feff7cbb4dad3f4e0f24 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 23 Nov 2020 16:19:00 +0100
Subject: [PATCH 345/358] gzdoom: use bsdtar instead of ar
since ar p/x is prone to freezing at least on some musl targets,
just use equivalent bsdtar; the ar issue needs figuring out...
---
srcpkgs/gzdoom/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index bc644c1e3f2..8ee85e03174 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -30,7 +30,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
+ bsdtar xOf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/gitinfo.cpp
From c641d5a88e72f57f907c0ed9d38a9e0463c23128 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 23 Nov 2020 15:54:17 +0100
Subject: [PATCH 346/358] choosenim: fix build on ppc* and rebuild on other
archs
See https://github.com/q66/cligen/commit/deee68fdc8ec5f34de7054a029739d3933fc551b
---
srcpkgs/choosenim/patches/system-libarchive.patch | 2 +-
srcpkgs/choosenim/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
index a102f0c13b3..97bbf2a62ba 100644
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ b/srcpkgs/choosenim/patches/system-libarchive.patch
@@ -7,7 +7,7 @@ index 7ba9b36..dc47faa 100644
requires "nim >= 1.2.6", "nimble#8f7af86"
-requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-+requires "nimterop >= 0.6.12"
++requires "https://github.com/q66/nimterop#fcc79ac796e647998f5d6910ca9b7f951d40a8d1"
#requires "libcurl >= 1.0.0" - OSX now uses httpclient
requires "analytics >= 0.2.0"
requires "osinfo >= 0.3.0"
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index fb5e9152b22..10cdb557589 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,7 +1,7 @@
# Template file for 'choosenim'
pkgname=choosenim
version=0.7.4
-revision=1
+revision=2
hostmakedepends="git nim libressl-devel pkg-config"
makedepends="libressl-devel zlib-devel libarchive-devel"
depends="gcc"
From 8e65bb56b9d81dbdadbc94039c8bb77efa081fc1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 23 Nov 2020 16:28:12 +0100
Subject: [PATCH 347/358] choosenim: go back to upstream nimterop
upstream issued 1.3.1 hotfix version, which fixes this
---
srcpkgs/choosenim/patches/system-libarchive.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
index 97bbf2a62ba..a102f0c13b3 100644
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ b/srcpkgs/choosenim/patches/system-libarchive.patch
@@ -7,7 +7,7 @@ index 7ba9b36..dc47faa 100644
requires "nim >= 1.2.6", "nimble#8f7af86"
-requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-+requires "https://github.com/q66/nimterop#fcc79ac796e647998f5d6910ca9b7f951d40a8d1"
++requires "nimterop >= 0.6.12"
#requires "libcurl >= 1.0.0" - OSX now uses httpclient
requires "analytics >= 0.2.0"
requires "osinfo >= 0.3.0"
From 6d2f93fac4a37a524b43561b6e942152f56c5777 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 21:23:43 -0600
Subject: [PATCH 348/358] python3-httmock: update to 1.4.0
---
srcpkgs/python3-httmock/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-httmock/template b/srcpkgs/python3-httmock/template
index db9c09060ad..1ae09446ee7 100644
--- a/srcpkgs/python3-httmock/template
+++ b/srcpkgs/python3-httmock/template
@@ -1,7 +1,7 @@
# Template file for 'python3-httmock'
pkgname=python3-httmock
-version=1.3.0
-revision=4
+version=1.4.0
+revision=1
wrksrc="httmock-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,8 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/patrys/httmock"
distfiles="https://github.com/patrys/httmock/archive/${version}.tar.gz"
-checksum=4716729f0d07f3f6043dde43545a5381c4c6031a62e9dc9eed21e73c63d86722
-
-do_check() {
- python3 setup.py test
-}
+checksum=e1f094f555fe5e17c82c102dcd9093f3a041f5457f8ac75829c17f32db362bf1
From 814db45e91dca7f5397632b42eaccddd43466d68 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 10:28:39 -0500
Subject: [PATCH 349/358] python3-virtualenv: update to 20.2.1.
---
srcpkgs/python3-virtualenv/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 91775e9d370..3c607934257 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
# Template file for 'python3-virtualenv'
pkgname=python3-virtualenv
-version=20.2.0
+version=20.2.1
revision=1
wrksrc="virtualenv-${version}"
build_style=python3-module
@@ -11,8 +11,9 @@ short_desc="Virtual Python environment builder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://virtualenv.pypa.io/"
+changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=fd4147c5ba3f694e2e4fc3c767407dc2226899623bb9b49c2f15637c2ee335b3
+checksum=e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5
alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
do_check() {
From 23fadb00cce7cf9b3b48e7eb0aeb63401308a44c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 10:39:54 -0500
Subject: [PATCH 350/358] python3-wsproto: update to 1.0.0.
---
srcpkgs/python3-wsproto/template | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-wsproto/template b/srcpkgs/python3-wsproto/template
index 6d2dab99f60..1da34b94340 100644
--- a/srcpkgs/python3-wsproto/template
+++ b/srcpkgs/python3-wsproto/template
@@ -1,17 +1,23 @@
# Template file for 'python3-wsproto'
pkgname=python3-wsproto
-version=0.15.0
-revision=4
+version=1.0.0
+revision=1
wrksrc="wsproto-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3 python3-h11"
+depends="python3-h11"
+checkdepends="tox ${depends}"
short_desc="Sans-IO WebSocket protocol implementation (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://wsproto.readthedocs.io"
-distfiles="https://github.com/python-hyper/wsproto/archive/${version}.tar.gz"
-checksum=954e46ac07134d4f67832b17c14164e1771f106b078413e5fb8a2bd2738eb25c
+changelog="https://raw.githubusercontent.com/python-hyper/wsproto/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/w/wsproto/wsproto-${version}.tar.gz"
+checksum=868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38
+
+do_check() {
+ tox -e py${py3_ver/./}
+}
post_install() {
vlicense LICENSE
From 47aed177b69d9662c9e15262faeffe12ea82c6fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 11:03:44 -0500
Subject: [PATCH 351/358] sshguard: update to 2.4.1.
---
srcpkgs/sshguard/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sshguard/template b/srcpkgs/sshguard/template
index 235a6129393..7fa96dbcaa9 100644
--- a/srcpkgs/sshguard/template
+++ b/srcpkgs/sshguard/template
@@ -1,7 +1,7 @@
# Template file for 'sshguard'
pkgname=sshguard
-version=2.4.0
-revision=2
+version=2.4.1
+revision=1
build_style=gnu-configure
hostmakedepends="flex"
short_desc="Protects networked hosts from brute force attacks"
@@ -9,7 +9,7 @@ maintainer="Lodvær <lodvaer@gmail.com>"
license="BSD-3-Clause"
homepage="https://www.sshguard.net/"
distfiles="${SOURCEFORGE_SITE}/sshguard/sshguard-${version}.tar.gz"
-checksum=065ca4091b3a96802714b560dbbc3d9f0e67574e99e2b6e8857aa1027d17d6c0
+checksum=875d02e6e67dced614790ed5e36aef1160edea940f353a79306cbb1852af3c67
make_dirs="/var/db/sshguard 0755 root root"
conf_files="/etc/sshguard.conf"
From 716b4a633d9c667dffcb94e4b3858be1086db751 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 11:14:05 -0500
Subject: [PATCH 352/358] unison: update to 2.51.3.
---
srcpkgs/unison/patches/ocaml408.patch | 46 ---------------------------
srcpkgs/unison/template | 11 ++++---
2 files changed, 6 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/unison/patches/ocaml408.patch
diff --git a/srcpkgs/unison/patches/ocaml408.patch b/srcpkgs/unison/patches/ocaml408.patch
deleted file mode 100644
index 7c197454c64..00000000000
--- a/srcpkgs/unison/patches/ocaml408.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 23fa129254a3304902739fc989950cc747d1e0b3 Mon Sep 17 00:00:00 2001
-From: Jaap Boender <jaapb@kerguelen.org>
-Date: Thu, 21 Mar 2019 12:26:51 +0000
-Subject: [PATCH] Compatibility with OCaml 4.08
-
----
- src/files.ml | 2 +-
- src/recon.ml | 4 ++--
- src/system/system_generic.ml | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
---- src/files.ml
-+++ src/files.ml
-@@ -734,7 +734,7 @@ let get_files_in_directory dir =
- with End_of_file ->
- dirh.System.closedir ()
- end;
-- Sort.list (<) !files
-+ List.sort String.compare !files
-
- let ls dir pattern =
- Util.convertUnixErrorsToTransient
---- src/recon.ml
-+++ src/recon.ml
-@@ -662,8 +662,8 @@ let rec reconcile
-
- (* Sorts the paths so that they will be displayed in order *)
- let sortPaths pathUpdatesList =
-- Sort.list
-- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
-+ List.sort
-+ Path.compare
- pathUpdatesList
-
- let rec enterPath p1 p2 t =
---- src/system/system_generic.ml
-+++ src/system/system_generic.ml
-@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
- let chmod = Unix.chmod
- let chown = Unix.chown
- let utimes = Unix.utimes
--let link = Unix.link
-+let link s d = Unix.link s d
- let openfile = Unix.openfile
- let opendir f =
- let h = Unix.opendir f in
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index a24b2cf3552..c3cb8e454c8 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,19 +1,20 @@
# Template file for 'unison'
pkgname="unison"
-version=2.51.2
-revision=6
+version=2.51.3
+revision=1
hostmakedepends="ocaml"
short_desc="A file-synchronization tool"
maintainer="allan <mail@may.mooo.com>"
license="GPL-3"
homepage="http://www.cis.upenn.edu/~bcpierce/unison/"
distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
-checksum=a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e
-nocross=yes
+checksum=0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b
+nocross="OCaml does not cross compile"
do_build() {
- CFLAGS= make UISTYLE=text DEBUGGING=false THREADS=true
+ CFLAGS= make ${makejobs} UISTYLE=text DEBUGGING=false THREADS=true
}
+
do_install() {
vbin src/unison
vbin src/unison-fsmonitor
From 860053eef8faf073b5ac01f17e9c3749c0d8113c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 12 Nov 2020 18:55:44 +0100
Subject: [PATCH 353/358] electron9: update to 9.3.4.
[ci skip]
---
srcpkgs/electron9/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/electron9/template b/srcpkgs/electron9/template
index 727f8ba95b2..d598cf62ff7 100644
--- a/srcpkgs/electron9/template
+++ b/srcpkgs/electron9/template
@@ -1,6 +1,6 @@
# Template file for 'electron9'
pkgname=electron9
-version=9.3.1
+version=9.3.4
_nodever=12.14.1
_chromiumver=83.0.4103.119
revision=1
@@ -30,7 +30,7 @@ homepage="https://electronjs.org"
distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="74292816dbccc1cc973d36f8bc101c31616b3c4c484056efb558a7a5e8fd1f60
+checksum="067399edbbadf7d975e293230ee716a441dc63bcc0bbf1ad41bd0e1063588867
452cbc58895a46b2b87ba450a3f86897de92ad08ce28ffdbed6b3f12101d3788
01e4a960be3e26b87c55509ee1cb44a14946a4169d5cdec046dd05058d995b26"
From 6b20f7d615977957e641bd14b40884c7081d278c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 23 Nov 2020 11:17:10 -0600
Subject: [PATCH 354/358] steam: update to 1.0.0.67.
---
srcpkgs/steam/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index 90a856864fb..6aeeb9471d7 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -1,6 +1,6 @@
# Template file for 'steam'
pkgname=steam
-version=1.0.0.66
+version=1.0.0.67
revision=1
archs="i686 x86_64"
wrksrc=steam-launcher
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom: Proprietary license"
homepage="https://steampowered.com/"
distfiles="http://repo.steampowered.com/${pkgname}/pool/${pkgname}/s/${pkgname}/${pkgname}_${version}.tar.gz"
-checksum=738c855f73168d0bce0b9297c75d9dbf56419b722264d8ca3f7737657754c710
+checksum=583c7791d67ac9e8539a16d29bd5055bb5f3823888fe92e07a869f1ffc4f925b
repository=nonfree
do_install() {
From 7dd0281d54d64f9a43e9f201768e68931cf249bd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 23 Nov 2020 11:20:06 -0600
Subject: [PATCH 355/358] nfdump: update to 1.6.22.
---
srcpkgs/nfdump/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nfdump/template b/srcpkgs/nfdump/template
index 31db7feb0d0..b2d73d25fed 100644
--- a/srcpkgs/nfdump/template
+++ b/srcpkgs/nfdump/template
@@ -1,6 +1,6 @@
# Template file for 'nfdump'
pkgname=nfdump
-version=1.6.21
+version=1.6.22
revision=1
build_style=gnu-configure
hostmakedepends="automake flex libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/phaag/nfdump"
distfiles="https://github.com/phaag/nfdump/archive/v${version}.tar.gz"
-checksum=7ad5dd6a7c226865b5cafe317684e4c61ea95093f943fd46cd896977f234ca5c
+checksum=437536acb02258f8e2cd1e63c801428c65e1c33100e349acbf718c5b04734bd0
configure_args+="--enable-sflow --enable-readpcap --enable-nfcapd"
pre_configure() {
From e29f74e58771d25a2b5e8c6c303aa656c7035e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 23 Nov 2020 11:27:08 -0300
Subject: [PATCH 356/358] rclone: fix segfault in musl cross targets.
For some reason, the cross built binaries have a TEXTREL in their
dynamic section, which musl's runtime linker doesn't support at all,
causing a segfault at launch. Fix this by disabling CGO_ENABLED for now.
---
srcpkgs/rclone/template | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 3c7ea20e5bc..56b4353c1aa 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
# Template file for 'rclone'
pkgname=rclone
version=1.53.3
-revision=1
+revision=2
wrksrc="rclone-v${version}"
build_style=go
go_import_path=github.com/rclone/rclone
@@ -14,6 +14,15 @@ changelog="https://raw.githubusercontent.com/rclone/rclone/master/docs/content/c
distfiles="https://github.com/rclone/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
checksum=f1e213bc6fb7c46f9a4cc8604ae0856718434bdafe07fa3ce449ae9a510a5763
+pre_build() {
+ if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then
+ # XXX: when cross building, the binary has a textrel, which segfaults when
+ # launched on musl
+ # FIXME: linkers for the musl toolchains should reject textrels entirely
+ export CGO_ENABLED=0
+ fi
+}
+
post_install() {
vlicense COPYING
vman rclone.1
From b63045dd99366f4a15352e83f0c3aa7b61cfc311 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 357/358] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl.patch | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index 1716584b8c8..b4f6f7b5ba4 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,4 +29,3 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
-
From 24127a523aaf7636cd49ba2671989f94f0d185e3 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 23 Nov 2020 11:33:02 -0300
Subject: [PATCH 358/358] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl.patch | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
index 1716584b8c8..b4f6f7b5ba4 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/fix-musl.patch
@@ -29,4 +29,3 @@ index 992d9ac..5f43b57 100644
#include <rpm/rpmlog.h>
#include "rpmio/digest.h"
-
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (14 preceding siblings ...)
2020-11-24 0:22 ` [PR PATCH] [Updated] " glaulher
@ 2020-11-24 21:14 ` ahesford
2020-11-25 13:27 ` [PR PATCH] [Updated] " glaulher
` (8 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: ahesford @ 2020-11-24 21:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#issuecomment-733237474
Comment:
Deeper and deeper!
Try this from the root of your clone, while you are in the `rpm` branch:
```
git fetch --all --prune
cp srcpkgs/rpm/{template,patches/fix-musl-rpmdb.patch} .
git reset --hard upstream/master
mv fix-musl-rpmdb.patch srcpkgs/rpm/patches/
mv template srcpkgs/rpm/
git add srcpkgs/rpm
git commit -m 'rpm: update to 4.16.0.'
git push -f
```
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (15 preceding siblings ...)
2020-11-24 21:14 ` ahesford
@ 2020-11-25 13:27 ` glaulher
2020-11-25 13:37 ` glaulher
` (7 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-25 13:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by glaulher against master on the void-packages repository
https://github.com/glaulher/void-packages rpm
https://github.com/void-linux/void-packages/pull/26642
rpm: update to 4.16.0
A patch file from https://github.com/void-linux/void-packages/pull/26642.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-26642.patch --]
[-- Type: text/x-diff, Size: 2319 bytes --]
From 90bdd5283747407889e9d3b317eb26c394e4432b Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Wed, 25 Nov 2020 10:25:35 -0300
Subject: [PATCH] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 11 +++++++++++
srcpkgs/rpm/template | 12 ++++++------
2 files changed, 17 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..2c0317ee5a1
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,11 @@
+--- lib/rpmdb.c
++++ lib/rpmdb.c
+@@ -8,6 +8,8 @@
+ #include <utime.h>
+ #include <errno.h>
+ #include <dirent.h>
++#include <sys/stat.h>
++#include <fcntl.h>
+
+ #ifndef DYING /* XXX already in "system.h" */
+ #include <fnmatch.h>
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..6a8aa5f6d4b 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=2
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (16 preceding siblings ...)
2020-11-25 13:27 ` [PR PATCH] [Updated] " glaulher
@ 2020-11-25 13:37 ` glaulher
2020-11-25 13:39 ` [PR REVIEW] " ericonr
` (6 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-25 13:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 622 bytes --]
New comment by glaulher on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#issuecomment-733710834
Comment:
> Cada vez mais fundo!
>
> Tente fazer isso a partir da raiz do seu clone, enquanto você está no `rpm`branch:
>
> ```
> git fetch --all --prune
> cp srcpkgs/rpm/{template,patches/fix-musl-rpmdb.patch} .
> git reset --hard upstream/master
> mv fix-musl-rpmdb.patch srcpkgs/rpm/patches/
> mv template srcpkgs/rpm/
> git add srcpkgs/rpm
> git commit -m 'rpm: update to 4.16.0.'
> git push -f
> ```
thanks for your help and ericonr's help,
I think it's ok now.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (17 preceding siblings ...)
2020-11-25 13:37 ` glaulher
@ 2020-11-25 13:39 ` ericonr
2020-11-25 14:27 ` ahesford
` (5 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-25 13:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#discussion_r530380462
Comment:
ping here
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (18 preceding siblings ...)
2020-11-25 13:39 ` [PR REVIEW] " ericonr
@ 2020-11-25 14:27 ` ahesford
2020-11-29 23:52 ` [PR PATCH] [Updated] " glaulher
` (4 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: ahesford @ 2020-11-25 14:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 350 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#discussion_r530413177
Comment:
It seems that there is exactly one Python script installed by `rpm`, and it works with Python 3 (I can at least get the help text to display). Please change to `python_version=3` as @ericonr recommends.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (19 preceding siblings ...)
2020-11-25 14:27 ` ahesford
@ 2020-11-29 23:52 ` glaulher
2020-11-29 23:56 ` [PR REVIEW] " glaulher
` (3 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-29 23:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by glaulher against master on the void-packages repository
https://github.com/glaulher/void-packages rpm
https://github.com/void-linux/void-packages/pull/26642
rpm: update to 4.16.0
A patch file from https://github.com/void-linux/void-packages/pull/26642.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-26642.patch --]
[-- Type: text/x-diff, Size: 3006 bytes --]
From e1018e59eae058684985f958fc5b9bb5449909d9 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Fri, 27 Nov 2020 18:21:44 -0300
Subject: [PATCH 1/2] rpm: update to 4.16.0.
---
srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 11 +++++++++++
srcpkgs/rpm/template | 12 ++++++------
2 files changed, 17 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
new file mode 100644
index 00000000000..2c0317ee5a1
--- /dev/null
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -0,0 +1,11 @@
+--- lib/rpmdb.c
++++ lib/rpmdb.c
+@@ -8,6 +8,8 @@
+ #include <utime.h>
+ #include <errno.h>
+ #include <dirent.h>
++#include <sys/stat.h>
++#include <fcntl.h>
+
+ #ifndef DYING /* XXX already in "system.h" */
+ #include <fnmatch.h>
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..3388d116a30 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,22 +1,22 @@
# Template file for 'rpm'
pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=2
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
short_desc="Red Hat Package Management Utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
-python_version=2 #unverified
+distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
+python_version=3
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
From 845668562f8d8a09f17504a980bf9dfc5dddfcae Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sun, 29 Nov 2020 20:50:39 -0300
Subject: [PATCH 2/2] rpm: update to 4.16.0.
---
srcpkgs/rpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 3388d116a30..eaccdaeffe0 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,7 +1,7 @@
# Template file for 'rpm'
pkgname=rpm
version=4.16.0
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--with-lua --with-cap --with-acl --with-external-db
--enable-python PYTHON=python3 --sharedstatedir=/var/lib"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (20 preceding siblings ...)
2020-11-29 23:52 ` [PR PATCH] [Updated] " glaulher
@ 2020-11-29 23:56 ` glaulher
2020-12-17 19:42 ` [PR PATCH] [Closed]: " ericonr
` (2 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-11-29 23:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New review comment by glaulher on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#discussion_r532289350
Comment:
the version has been fixed, thanks.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Closed]: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (21 preceding siblings ...)
2020-11-29 23:56 ` [PR REVIEW] " glaulher
@ 2020-12-17 19:42 ` ericonr
2020-12-17 19:42 ` ericonr
2020-12-19 23:46 ` glaulher
24 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-12-17 19:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
There's a closed pull request on the void-packages repository
rpm: update to 4.16.0
https://github.com/void-linux/void-packages/pull/26642
Description:
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (22 preceding siblings ...)
2020-12-17 19:42 ` [PR PATCH] [Closed]: " ericonr
@ 2020-12-17 19:42 ` ericonr
2020-12-19 23:46 ` glaulher
24 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-12-17 19:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#issuecomment-747658699
Comment:
Você ainda tinha dois commits (pode ver aqui https://github.com/void-linux/void-packages/pull/26642/commits ). Eu juntei os dois e aproveitei para atualizar para 4.16.1.2.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
` (23 preceding siblings ...)
2020-12-17 19:42 ` ericonr
@ 2020-12-19 23:46 ` glaulher
24 siblings, 0 replies; 27+ messages in thread
From: glaulher @ 2020-12-19 23:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New comment by glaulher on void-packages repository
https://github.com/void-linux/void-packages/pull/26642#issuecomment-748540700
Comment:
thank you.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] " glaulher
@ 2020-11-22 22:12 ` ericonr
0 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-22 22:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26612#discussion_r528412628
Comment:
`rpm-${version%.*}.x` could work?
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2020-12-19 23:46 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-23 14:36 [PR PATCH] rpm: update to 4.16.0 glaulher
2020-11-23 14:38 ` [PR REVIEW] " ericonr
2020-11-23 14:39 ` ericonr
2020-11-23 14:43 ` glaulher
2020-11-23 14:47 ` [PR PATCH] [Updated] " glaulher
2020-11-23 14:53 ` [PR REVIEW] " ericonr
2020-11-23 15:05 ` ericonr
2020-11-23 17:32 ` glaulher
2020-11-23 17:40 ` ericonr
2020-11-23 17:40 ` ericonr
2020-11-23 17:57 ` [PR PATCH] [Updated] " glaulher
2020-11-23 18:14 ` glaulher
2020-11-23 19:01 ` glaulher
2020-11-23 20:01 ` glaulher
2020-11-23 20:15 ` ericonr
2020-11-24 0:22 ` [PR PATCH] [Updated] " glaulher
2020-11-24 21:14 ` ahesford
2020-11-25 13:27 ` [PR PATCH] [Updated] " glaulher
2020-11-25 13:37 ` glaulher
2020-11-25 13:39 ` [PR REVIEW] " ericonr
2020-11-25 14:27 ` ahesford
2020-11-29 23:52 ` [PR PATCH] [Updated] " glaulher
2020-11-29 23:56 ` [PR REVIEW] " glaulher
2020-12-17 19:42 ` [PR PATCH] [Closed]: " ericonr
2020-12-17 19:42 ` ericonr
2020-12-19 23:46 ` glaulher
-- strict thread matches above, loose matches on Subject: below --
2020-11-22 21:54 [PR PATCH] " glaulher
2020-11-22 22:12 ` [PR REVIEW] " ericonr
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).